diff --git a/src/main/java/codechicken/nei/NEICPH.java b/src/main/java/codechicken/nei/NEICPH.java index 0223663d..4ad9cc59 100644 --- a/src/main/java/codechicken/nei/NEICPH.java +++ b/src/main/java/codechicken/nei/NEICPH.java @@ -141,6 +141,13 @@ public class NEICPH implements IClientPacketHandler { packet.sendToServer(); } + public static void sendRequestContainer() { + PacketCustom packet = new PacketCustom(channel, 16); + packet.writeInt( + Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size()); + packet.sendToServer(); + } + public static void sendSetSlot(int slot, ItemStack stack, boolean container) { PacketCustom packet = new PacketCustom(channel, 5); packet.writeBoolean(container); diff --git a/src/main/java/codechicken/nei/NEISPH.java b/src/main/java/codechicken/nei/NEISPH.java index 0bef3435..3dc87773 100644 --- a/src/main/java/codechicken/nei/NEISPH.java +++ b/src/main/java/codechicken/nei/NEISPH.java @@ -64,6 +64,9 @@ public class NEISPH implements IServerPacketHandler { case 15: handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString()); break; + case 16: + handleRequestContainer(sender, packet.readInt()); + break; case 21: openEnchantmentGui(sender); break; @@ -99,6 +102,11 @@ public class NEISPH implements IServerPacketHandler { } } + private void handleRequestContainer(EntityPlayerMP sender, int containerSize) { + if (sender.openContainer.getInventory().size() != containerSize) return; + sender.sendContainerToPlayer(sender.openContainer); + } + private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) { String name = packet.readString(); if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name)) diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index 8dedb8a1..d36f7b4a 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -3,6 +3,7 @@ package codechicken.nei.recipe; import codechicken.lib.gui.GuiDraw; import codechicken.nei.GuiNEIButton; import codechicken.nei.LayoutManager; +import codechicken.nei.NEICPH; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; @@ -336,6 +337,7 @@ public abstract class GuiRecipe extends GuiContainer if (i == Keyboard.KEY_ESCAPE) // esc { mc.displayGuiScreen(firstGuiGeneral); + NEICPH.sendRequestContainer(); return; } if (GuiContainerManager.getManager(this).lastKeyTyped(i, c)) return; @@ -346,6 +348,7 @@ public abstract class GuiRecipe extends GuiContainer if (i == mc.gameSettings.keyBindInventory.getKeyCode()) { mc.displayGuiScreen(firstGuiGeneral); + NEICPH.sendRequestContainer(); } else if (NEIClientConfig.isKeyHashDown("gui.back")) { mc.displayGuiScreen(prevGui); } else if (NEIClientConfig.isKeyHashDown("gui.prev_machine")) {