diff --git a/dependencies.gradle b/dependencies.gradle index 179befd..9706cb2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ dependencies { - compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-91-GTNH:dev") - compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev") - compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev") - compile("com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev") + compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-104-GTNH:dev") + compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev") + compile("com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev") + compile("com.github.GTNewHorizons:NotEnoughItems:2.3.2-GTNH:dev") compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.8:dev") - compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.3-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.11:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.32:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.6:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.48:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.32:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.4-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.12:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.40:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.14:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.37:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.90:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev") { transitive = false } compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false } compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false } compileOnly("curse.maven:thermal-expansion-69163:2388759") { transitive = false } diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java index 34ebe48..11009e2 100644 --- a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java +++ b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java @@ -14,6 +14,7 @@ import com.github.vfyjxf.nee.nei.NEECraftingHandler; import com.github.vfyjxf.nee.nei.NEECraftingHelper; import com.github.vfyjxf.nee.processor.IRecipeProcessor; import com.github.vfyjxf.nee.processor.RecipeProcessor; +import com.github.vfyjxf.nee.utils.ModIDs; import cpw.mods.fml.common.Loader; import java.util.*; import net.minecraft.client.gui.inventory.GuiContainer; @@ -114,7 +115,7 @@ public class NEINeeConfig implements IConfigureNEI { } private void installWirelessCraftingTermSupport() { - if (Loader.isModLoaded("ae2wct")) { + if (Loader.isModLoaded(ModIDs.WCT)) { API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, NEECraftingHelper.INSTANCE, "crafting"); API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, NEECraftingHelper.INSTANCE, "crafting2x2"); } diff --git a/src/main/java/com/github/vfyjxf/nee/client/GuiEventHandler.java b/src/main/java/com/github/vfyjxf/nee/client/GuiEventHandler.java index 24d3cb9..237fc04 100644 --- a/src/main/java/com/github/vfyjxf/nee/client/GuiEventHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/client/GuiEventHandler.java @@ -20,10 +20,8 @@ import com.github.vfyjxf.nee.container.ContainerCraftingConfirm; import com.github.vfyjxf.nee.network.NEENetworkHandler; import com.github.vfyjxf.nee.network.packet.PacketSlotStackChange; import com.github.vfyjxf.nee.utils.GuiUtils; -import com.github.vfyjxf.nee.utils.ModIDs; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Collections; import java.util.List; @@ -76,14 +74,6 @@ public class GuiEventHandler implements INEIGuiHandler { tracker = null; } } - - if (GuiUtils.isWirelessGuiCraftConfirm(event.gui)) { - assert event.gui instanceof net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm; - if (getCancelButton((net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm) event.gui) - == event.button) { - tracker = null; - } - } } } @@ -91,12 +81,6 @@ public class GuiEventHandler implements INEIGuiHandler { return ObfuscationReflectionHelper.getPrivateValue(GuiCraftConfirm.class, gui, "cancel"); } - @Optional.Method(modid = ModIDs.WCT) - private GuiButton getCancelButton(net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm gui) { - return ObfuscationReflectionHelper.getPrivateValue( - net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm.class, gui, "cancel"); - } - private boolean isContainerCraftConfirm(Container container) { return (container instanceof ContainerCraftConfirm || GuiUtils.isContainerWirelessCraftingConfirm(container)) && !((container instanceof ContainerCraftingConfirm) diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java index 0afd719..5bd1127 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java @@ -26,6 +26,7 @@ import com.github.vfyjxf.nee.network.packet.PacketValueConfigServer; import com.github.vfyjxf.nee.utils.GuiUtils; import com.github.vfyjxf.nee.utils.IngredientTracker; import com.github.vfyjxf.nee.utils.ItemUtils; +import com.github.vfyjxf.nee.utils.ModIDs; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -229,7 +230,7 @@ public class NEECraftingHelper implements IOverlayHandler { } } - @Optional.Method(modid = "ae2wct") + @Optional.Method(modid = ModIDs.WCT) private void moveItemsForWirelessCrafting(GuiContainer firstGui, List ingredients) { try { net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler.instance.sendToServer( diff --git a/src/main/java/com/github/vfyjxf/nee/network/NEEGuiHandler.java b/src/main/java/com/github/vfyjxf/nee/network/NEEGuiHandler.java index fff4669..3a347b3 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/NEEGuiHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/network/NEEGuiHandler.java @@ -210,7 +210,7 @@ public class NEEGuiHandler implements IGuiHandler { player.openGui(instance, (ID << 4), world, x, y, z); } - @Optional.Method(modid = "ae2wct") + @Optional.Method(modid = ModIDs.WCT) private WirelessTerminalGuiObject getWirelessTerminalGui(EntityPlayer player, World world, int x, int y, int z) { final IWirelessCraftingTermHandler wh = (IWirelessCraftingTermHandler) AEApi.instance() .registries()