mirror of
https://github.com/GTNewHorizons/NotEnoughEnergistics.git
synced 2026-11-17 10:55:07 +00:00
fix crash (#18)
This commit is contained in:
1 parent
1eceb6e050
commit
7790a92cf8
5 files changed
+16
-30
No files matched your search
@@ -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");
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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<PositionedStack> ingredients) {
|
||||
try {
|
||||
net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler.instance.sendToServer(
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user