From 26bc19c207d343dfb75b1303c541351a19840c5a Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 29 Jul 2022 17:24:59 +0800 Subject: [PATCH 1/3] fix craft mode --- .../github/network/CPacketTransferRecipe.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index 0c2f35bc..b74311bb 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -94,13 +94,15 @@ public class CPacketTransferRecipe implements IMessage { outputSlot.setInventorySlotContents(i, null); } - if (combine) { - message.inputs = NEIUtils.compress(message.inputs); - message.outputs = NEIUtils.compress(message.outputs); + if (!cf.isCraftingMode()) { + if (combine) { + message.inputs = NEIUtils.compress(message.inputs); + message.outputs = NEIUtils.compress(message.outputs); + } + message.inputs = NEIUtils.clearNull(message.inputs); + message.outputs = NEIUtils.clearNull(message.outputs); } - message.inputs = NEIUtils.clearNull(message.inputs); - message.outputs = NEIUtils.clearNull(message.outputs); - + for (OrderStack stack : message.inputs) { if (stack != null) { int index = stack.getIndex(); From 411ec6762421fa001c66499e04ce62131249a721 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 29 Jul 2022 17:36:07 +0800 Subject: [PATCH 2/3] wwwaaaaahhh --- .../com/glodblock/github/network/CPacketTransferRecipe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index b74311bb..64a4bbf9 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -94,7 +94,7 @@ public class CPacketTransferRecipe implements IMessage { outputSlot.setInventorySlotContents(i, null); } - if (!cf.isCraftingMode()) { + if (!message.isCraft) { if (combine) { message.inputs = NEIUtils.compress(message.inputs); message.outputs = NEIUtils.compress(message.outputs); @@ -102,7 +102,7 @@ public class CPacketTransferRecipe implements IMessage { message.inputs = NEIUtils.clearNull(message.inputs); message.outputs = NEIUtils.clearNull(message.outputs); } - + for (OrderStack stack : message.inputs) { if (stack != null) { int index = stack.getIndex(); From e8133a85222fc1a457b5905475eac2f7104273ee Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 29 Jul 2022 20:39:34 +0800 Subject: [PATCH 3/3] ignore stack size 0 --- src/main/java/com/glodblock/github/nei/NEIUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/glodblock/github/nei/NEIUtils.java b/src/main/java/com/glodblock/github/nei/NEIUtils.java index 8ce8931c..dbcd6144 100644 --- a/src/main/java/com/glodblock/github/nei/NEIUtils.java +++ b/src/main/java/com/glodblock/github/nei/NEIUtils.java @@ -45,6 +45,8 @@ public class NEIUtils { int upper = 0; for (OrderStack orderStack : list) { if (orderStack != null && orderStack.getStack() != null) { + if (orderStack.getStack() instanceof ItemStack && ((ItemStack) orderStack.getStack()).stackSize == 0) + continue; map.put(orderStack.getIndex(), orderStack.getStack()); upper = Math.max(upper, orderStack.getIndex()); }