diff --git a/gradle.properties b/gradle.properties index 10007c5..af9c12b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon=false mc_version=1.7.10 nei_version=2.1.6-GTNH ae2_version=rv3-beta-52-GTNH -mod_version=1.3.0 +mod_version=1.3.1 forge_version=10.13.4.1614 mod_group=com.github.vfyjxf.neenergistics mod_id=neenergistics diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java index 94e53e6..774cf31 100644 --- a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java +++ b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java @@ -13,7 +13,6 @@ import com.github.vfyjxf.nee.nei.NEECraftingHelper; import com.github.vfyjxf.nee.processor.IRecipeProcessor; import com.github.vfyjxf.nee.processor.RecipeProcessor; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; import org.lwjgl.input.Keyboard; import thaumicenergistics.client.gui.GuiKnowledgeInscriber; diff --git a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java index 4c18307..dc90eee 100644 --- a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java @@ -35,21 +35,14 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler { public static NEEContainerDrawHandler instance = new NEEContainerDrawHandler(); - private final Field overlayButtonsField; - private final Field handlerField; + private Field overlayButtonsField; + private Field handlerField; private Method recipesPerPageMethod; private boolean drawRequestTooltip; private boolean drawCraftableTooltip; public NEEContainerDrawHandler() { - this.overlayButtonsField = ReflectionHelper.findField(GuiRecipe.class, "overlayButtons"); - this.handlerField = ReflectionHelper.findField(GuiRecipe.class, "handler"); - try { - this.recipesPerPageMethod = GuiRecipe.class.getDeclaredMethod("getRecipesPerPage"); - recipesPerPageMethod.setAccessible(true); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } + } @Override @@ -74,11 +67,25 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler { @Override public void renderSlotOverlay(GuiContainer gui, Slot slot) { + + if (this.overlayButtonsField == null || this.handlerField == null || this.recipesPerPageMethod == null) { + this.overlayButtonsField = ReflectionHelper.findField(GuiRecipe.class, "overlayButtons"); + this.handlerField = ReflectionHelper.findField(GuiRecipe.class, "handler"); + try { + this.recipesPerPageMethod = GuiRecipe.class.getDeclaredMethod("getRecipesPerPage"); + recipesPerPageMethod.setAccessible(true); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } + if (NEEConfig.drawHighlight && gui instanceof GuiRecipe) { Minecraft mc = Minecraft.getMinecraft(); GuiRecipe guiRecipe = (GuiRecipe) gui; GuiContainer firstGui = guiRecipe.firstGui; - if (firstGui instanceof GuiPatternTerm || firstGui instanceof GuiCraftingTerm || GuiUtils.isPatternTermExGui(firstGui) || GuiUtils.isGuiWirelessCrafting(firstGui)) { + boolean isGuiPatternTerm = firstGui instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(firstGui); + boolean isCraftingTerm = firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(firstGui); + if (isGuiPatternTerm || isCraftingTerm) { final ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int i = scaledresolution.getScaledWidth(); int j = scaledresolution.getScaledHeight(); diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java index 162ccb3..b5dc357 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java @@ -68,14 +68,15 @@ public class NEECraftingHandler implements IOverlayHandler { ItemStack currentStack = positionedStack.items[0]; boolean find = false; for (PositionedStack storedStack : tInputs) { - ItemStack StoredStack = storedStack.items[0]; - if (StoredStack.isItemEqual(currentStack) && (StoredStack.stackSize + currentStack.stackSize) <= StoredStack.getMaxStackSize()) { + ItemStack firstStack = storedStack.items[0]; + boolean areItemStackEqual = firstStack.isItemEqual(currentStack) && ItemStack.areItemStackTagsEqual(firstStack, currentStack); + if (areItemStackEqual && (firstStack.stackSize + currentStack.stackSize) <= firstStack.getMaxStackSize()) { find = true; - storedStack.items[0].stackSize = StoredStack.stackSize + currentStack.stackSize; + storedStack.items[0].stackSize = firstStack.stackSize + currentStack.stackSize; } } if (!find) { - tInputs.add(positionedStack); + tInputs.add(positionedStack.copy()); } } for (PositionedStack positionedStack : tInputs) { diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingHelper.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingHelper.java index 490087d..a25d9d0 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingHelper.java @@ -14,7 +14,6 @@ import appeng.core.sync.GuiBridge; import appeng.util.Platform; import appeng.util.item.AEItemStack; import com.github.vfyjxf.nee.utils.GuiUtils; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketRecipeItemChange.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketRecipeItemChange.java index 276762b..3cfc722 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketRecipeItemChange.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketRecipeItemChange.java @@ -10,7 +10,6 @@ import io.netty.buffer.ByteBuf; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java index bfa77f1..b815e99 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java @@ -1,14 +1,8 @@ package com.github.vfyjxf.nee.utils; import appeng.client.gui.AEBaseGui; -import appeng.container.implementations.ContainerCraftingTerm; import appeng.container.implementations.ContainerPatternTerm; import appeng.helpers.IContainerCraftingPacket; -import codechicken.nei.PositionedStack; -import com.github.vfyjxf.nee.nei.NEECraftingHandler; -import com.github.vfyjxf.nee.network.NEENetworkHandler; -import com.github.vfyjxf.nee.network.packet.PacketRecipeItemChange; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -17,14 +11,9 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; /** * @author vfyjxf