Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated ICBM compatibility to 1.12.2-4.0+

Browse source
This commit is contained in:
Unknown 2020-02-19 01:02:18 +01:00 committed by unknown
parent 330b353f04
commit 41dd3e7c98
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -5,7 +5,7 @@ forge_version=14.23.5.2847
CoFHCore_version=1.12.2-4.6.+ CoFHCore_version=1.12.2-4.6.+
CodeChickenLib_version=1.12.2-3.2.+ CodeChickenLib_version=1.12.2-3.2.+
ICBMclassic_version=1.12.2-3.0.+ ICBMclassic_version=1.12.2-4.0.+
ImmersiveEngineering_version=0.12-+ ImmersiveEngineering_version=0.12-+
OpenComputers_version=MC1.12.2-1.7.2.+ OpenComputers_version=MC1.12.2-1.7.2.+
RedstoneFlux_version=1.12-2.1.+ RedstoneFlux_version=1.12-2.1.+

2
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -209,7 +209,7 @@ import javax.annotation.Nullable;
+ "after:enderio@[5.1.52,);" + "after:enderio@[5.1.52,);"
+ "after:gregtech;" + "after:gregtech;"
+ "after:ic2;" + "after:ic2;"
+ "after:icbmclassic;" + "after:icbmclassic@[1.12.2-4.0.0,);"
+ "after:metalchests@[v5.8.1,);" + "after:metalchests@[v5.8.1,);"
+ "after:opencomputers;" + "after:opencomputers;"
// + "after:sgcraft@[2.0.0,);" // + "after:sgcraft@[2.0.0,);"

7
src/main/java/cr0s/warpdrive/event/EMPReceiver.java
View file

@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import icbm.classic.api.caps.IEMPReceiver; import icbm.classic.api.caps.IEMPReceiver;
import icbm.classic.api.explosion.IBlast; import icbm.classic.api.explosion.IBlast;
import icbm.classic.lib.emp.CapabilityEMP; import icbm.classic.api.ICBMClassicAPI;
@Optional.InterfaceList({ @Optional.InterfaceList({
@Optional.Interface(iface = "icbm.classic.api.caps.IEMPReceiver", modid = "icbmclassic"), @Optional.Interface(iface = "icbm.classic.api.caps.IEMPReceiver", modid = "icbmclassic"),
@ -88,8 +88,9 @@ public class EMPReceiver implements IEMPReceiver, ICapabilityProvider {
} }
@Override @Override
@Optional.Method(modid = "icbmclassic")
public boolean hasCapability(@Nonnull final Capability<?> capability, @Nullable final EnumFacing facing) { public boolean hasCapability(@Nonnull final Capability<?> capability, @Nullable final EnumFacing facing) {
return capability == CapabilityEMP.EMP; return capability == ICBMClassicAPI.EMP_CAPABILITY;
} }
@Nullable @Nullable
@ -97,6 +98,6 @@ public class EMPReceiver implements IEMPReceiver, ICapabilityProvider {
@Optional.Method(modid = "icbmclassic") @Optional.Method(modid = "icbmclassic")
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T getCapability(@Nonnull final Capability<T> capability, @Nullable final EnumFacing facing) { public <T> T getCapability(@Nonnull final Capability<T> capability, @Nullable final EnumFacing facing) {
return capability == CapabilityEMP.EMP ? (T) this : null; return capability == ICBMClassicAPI.EMP_CAPABILITY ? (T) this : null;
} }
} }