From c74d7cabd3c84bfb3cd1dc9a83f9a38405306765 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+alexdoru@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:30:11 +0200 Subject: [PATCH 1/4] rm --- .../base/FCContainerEncodeTerminal.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index 57738b7c..ca5c01df 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -548,29 +548,33 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor static boolean canMultiplyOrDivide(SlotFake[] slots, int mult) { if (mult > 0) { for (Slot s : slots) { - if (s.getStack() != null) { - if (s.getStack().getItem() instanceof ItemFluidPacket) { - long result = (long) ItemFluidPacket.getFluidAmount(s.getStack()) * mult; - if (result > Integer.MAX_VALUE) { - return false; - } - } else { - long val = (long) s.getStack().stackSize * mult; - if (val > Integer.MAX_VALUE) return false; - } + ItemStack st = s.getStack(); + if (st == null) continue; + final long count; + if (st.getItem() instanceof ItemFluidPacket) { + count = ItemFluidPacket.getFluidAmount(st); + } else { + count = s.getStack().stackSize; + } + long result = count * mult; + if (result > Integer.MAX_VALUE) { + return false; } } return true; } else if (mult < 0) { - mult = -mult; + mult = Math.abs(mult); for (Slot s : slots) { - if (s.getStack() != null) { // Although % is a very inefficient algorithm, it is not a performance issue - // here. :> - if (s.getStack().getItem() instanceof ItemFluidPacket) { - if (ItemFluidPacket.getFluidAmount(s.getStack()) % mult != 0) return false; - } else { - if (s.getStack().stackSize % mult != 0) return false; - } + ItemStack st = s.getStack(); + if (st == null) continue; + final int count; + if (st.getItem() instanceof ItemFluidPacket) { + count = ItemFluidPacket.getFluidAmount(st); + } else { + count = s.getStack().stackSize; + } + if (count % mult != 0) { + return false; } } return true; @@ -593,7 +597,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor } } } else if (mult < 0) { - mult = -mult; + mult = Math.abs(mult); for (final Slot s : enabledSlots) { ItemStack st = s.getStack(); if (st != null) { From 3f3be51fc4a9d8d4d60017eb89e2b92f887c558c Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Fri, 27 Dec 2024 17:15:26 +0200 Subject: [PATCH 2/4] real --- src/main/java/com/glodblock/github/loader/ChannelLoader.java | 2 -- .../com/glodblock/github/network/CPacketPatternMultiSet.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index 2527be3b..1bccece4 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -81,8 +81,6 @@ public class ChannelLoader implements Runnable { Side.SERVER); netHandler .registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.SERVER); - netHandler - .registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.CLIENT); } public static void sendPacketToAllPlayers(Packet packet, World world) { diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java index 346ab3f1..e3656d2b 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java +++ b/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java @@ -26,10 +26,6 @@ public class CPacketPatternMultiSet implements IMessage { private static GuiType guiType; private static int multi; - public CPacketPatternMultiSet(GuiType guiType) { - this(guiType, 0); - } - public CPacketPatternMultiSet(GuiType guiType, int multi) { CPacketPatternMultiSet.guiType = guiType; CPacketPatternMultiSet.multi = multi; From 6cdc25386779ad15c53cadd60757c984d59efaaf Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Fri, 27 Dec 2024 19:51:48 +0200 Subject: [PATCH 3/4] fix --- .../glodblock/github/inventory/ItemBiggerAppEngInventory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java index 08a070b1..0ae64bea 100644 --- a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java +++ b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java @@ -32,7 +32,9 @@ public class ItemBiggerAppEngInventory extends BiggerAppEngInventory { boolean isCraft = Platform.openNbtData(is).getBoolean("craftingMode"); boolean isCraftingTerm = Platform.openNbtData(is).getString("mode_main") .equals(GuiType.WIRELESS_CRAFTING_TERMINAL.toString()); - if (!isCraftingTerm && isCraft) { + boolean isExPattern = Platform.openNbtData(is).getString("mode_main") + .equals(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX.toString()); + if (!isCraftingTerm && !isExPattern && isCraft) { for (int x = 0; x < this.getSizeInventory(); x++) { final ItemStack is = this.getStackInSlot(x); if (is != null) { From 29b000ff5964dbfb2b8b35a7af372ff840a7f2ac Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Fri, 27 Dec 2024 21:21:30 +0200 Subject: [PATCH 4/4] fix --- .../glodblock/github/network/CPacketTransferRecipe.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index f28486e3..72100395 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -32,7 +32,8 @@ public class CPacketTransferRecipe implements IMessage { private List> inputs; private List> outputs; private boolean isCraft; - private static final int MAX_INDEX = 32; + private static final int MAX_INDEX = 81; + private static final int MAX_SLOTS_INDEX = 32; private boolean shift; public CPacketTransferRecipe() {} @@ -79,11 +80,11 @@ public class CPacketTransferRecipe implements IMessage { NBTTagCompound nbt_o = nbt_m.getCompoundTag("o"); for (int i = 0; i < MAX_INDEX; i++) { OrderStack tmp = OrderStack.readFromNBT(nbt_i, null, i); - if (tmp != null) inputs.add(tmp); + if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) inputs.add(tmp); } for (int i = 0; i < MAX_INDEX; i++) { OrderStack tmp = OrderStack.readFromNBT(nbt_o, null, i); - if (tmp != null) outputs.add(tmp); + if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) outputs.add(tmp); } }