From 41dd3e7c98944fefd648dafd638ff84c45b11ba4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Feb 2020 01:02:18 +0100 Subject: [PATCH] Updated ICBM compatibility to 1.12.2-4.0+ --- build.properties | 2 +- src/main/java/cr0s/warpdrive/WarpDrive.java | 2 +- src/main/java/cr0s/warpdrive/event/EMPReceiver.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index 222b210e..523750e5 100644 --- a/build.properties +++ b/build.properties @@ -5,7 +5,7 @@ forge_version=14.23.5.2847 CoFHCore_version=1.12.2-4.6.+ 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-+ OpenComputers_version=MC1.12.2-1.7.2.+ RedstoneFlux_version=1.12-2.1.+ diff --git a/src/main/java/cr0s/warpdrive/WarpDrive.java b/src/main/java/cr0s/warpdrive/WarpDrive.java index b4bdd09b..85514142 100644 --- a/src/main/java/cr0s/warpdrive/WarpDrive.java +++ b/src/main/java/cr0s/warpdrive/WarpDrive.java @@ -209,7 +209,7 @@ import javax.annotation.Nullable; + "after:enderio@[5.1.52,);" + "after:gregtech;" + "after:ic2;" - + "after:icbmclassic;" + + "after:icbmclassic@[1.12.2-4.0.0,);" + "after:metalchests@[v5.8.1,);" + "after:opencomputers;" // + "after:sgcraft@[2.0.0,);" diff --git a/src/main/java/cr0s/warpdrive/event/EMPReceiver.java b/src/main/java/cr0s/warpdrive/event/EMPReceiver.java index 4c200162..f7f222fc 100644 --- a/src/main/java/cr0s/warpdrive/event/EMPReceiver.java +++ b/src/main/java/cr0s/warpdrive/event/EMPReceiver.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import icbm.classic.api.caps.IEMPReceiver; import icbm.classic.api.explosion.IBlast; -import icbm.classic.lib.emp.CapabilityEMP; +import icbm.classic.api.ICBMClassicAPI; @Optional.InterfaceList({ @Optional.Interface(iface = "icbm.classic.api.caps.IEMPReceiver", modid = "icbmclassic"), @@ -88,8 +88,9 @@ public class EMPReceiver implements IEMPReceiver, ICapabilityProvider { } @Override + @Optional.Method(modid = "icbmclassic") public boolean hasCapability(@Nonnull final Capability capability, @Nullable final EnumFacing facing) { - return capability == CapabilityEMP.EMP; + return capability == ICBMClassicAPI.EMP_CAPABILITY; } @Nullable @@ -97,6 +98,6 @@ public class EMPReceiver implements IEMPReceiver, ICapabilityProvider { @Optional.Method(modid = "icbmclassic") @SuppressWarnings("unchecked") public T getCapability(@Nonnull final Capability capability, @Nullable final EnumFacing facing) { - return capability == CapabilityEMP.EMP ? (T) this : null; + return capability == ICBMClassicAPI.EMP_CAPABILITY ? (T) this : null; } } \ No newline at end of file