Fix stack size overflow in NEI overlay handlers (#36)

* Fix stack size overflow in NEI overlay handlers * update gradle+bs+deps * fix wci --------- Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Dec 3, 2023 · 13e0e65 · 13e0e65
1 parent 233f246
commit 13e0e65
Show file tree

Hide file tree

Showing 26 changed files with 348 additions and 147 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,18 +1,18 @@
 dependencies {
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-217-GTNH:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev")
-    implementation("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
-    implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.9.0:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-291-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev")
+    implementation("com.github.GTNewHorizons:Baubles:1.0.2:dev")
+    implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.1:dev")
 
-    compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.21-gtnh:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.14:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.4.17:dev') {transitive=false}
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.7:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.50:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.16:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.4.3-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Botania:1.9.23-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.67-gtnh:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.6.0-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.16:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:EnderIO:2.5.6:dev') {transitive=false}
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.7.0:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.91:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.34:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.5.3-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false }
     compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false }
     compileOnly("curse.maven:thermal-expansion-69163:2388759") { transitive = false }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;

diff --git a/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java b/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.block.tile;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.stream.IntStream;
 
 import javax.annotation.Nonnull;
@@ -23,7 +27,12 @@
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.*;
+import appeng.api.networking.crafting.CraftingItemList;
+import appeng.api.networking.crafting.ICraftingCPU;
+import appeng.api.networking.crafting.ICraftingGrid;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.networking.crafting.ICraftingProvider;
+import appeng.api.networking.crafting.ICraftingProviderHelper;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkCraftingPatternChange;

diff --git a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java
@@ -4,8 +4,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.resources.I18n;

diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java
@@ -3,7 +3,11 @@
 import static com.github.vfyjxf.nee.processor.RecipeProcessor.NULL_IDENTIFIER;
 import static com.github.vfyjxf.nee.utils.GuiUtils.isPatternTerm;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
@@ -163,7 +167,9 @@ private PacketNEIPatternRecipe packProcessRecipe(IRecipeHandler recipe, int reci
                             currentStack.stackSize = 1;
                         }
 
-                        recipeInputs.setTag("#" + inputIndex, currentStack.writeToNBT(new NBTTagCompound()));
+                        recipeInputs.setTag(
+                                "#" + inputIndex,
+                                ItemUtils.writeItemStackToNBT(currentStack, new NBTTagCompound()));
                         NEECraftingHandler.ingredients.put(INPUT_KEY + inputIndex, positionedStack);
                         inputIndex++;
                     }
@@ -181,7 +187,9 @@ private PacketNEIPatternRecipe packProcessRecipe(IRecipeHandler recipe, int reci
                             outputStack.stackSize = 1;
                         }
 
-                        recipeOutputs.setTag(OUTPUT_KEY + outputIndex, outputStack.writeToNBT(new NBTTagCompound()));
+                        recipeOutputs.setTag(
+                                OUTPUT_KEY + outputIndex,
+                                ItemUtils.writeItemStackToNBT(outputStack, new NBTTagCompound()));
                         outputIndex++;
                     }
                     break;
@@ -220,7 +228,7 @@ private PacketNEIPatternRecipe packCraftingTableRecipe(IRecipeHandler recipe, in
                     stack.setItemDamage(0);
                 }
 
-                recipeInputs.setTag("#" + slotIndex, stack.writeToNBT(new NBTTagCompound()));
+                recipeInputs.setTag("#" + slotIndex, ItemUtils.writeItemStackToNBT(stack, new NBTTagCompound()));
                 NEECraftingHandler.ingredients.put(INPUT_KEY + slotIndex, positionedStack);
             }
         }
@@ -249,7 +257,7 @@ private PacketArcaneRecipe packetArcaneRecipe(IRecipeHandler recipe, int recipeI
                         stack = currentStack.copy();
                     }
                 }
-                recipeInputs.setTag("#" + slotIndex, stack.writeToNBT(new NBTTagCompound()));
+                recipeInputs.setTag("#" + slotIndex, ItemUtils.writeItemStackToNBT(stack, new NBTTagCompound()));
             }
         }
         return new PacketArcaneRecipe(recipeInputs);
@@ -282,7 +290,7 @@ private PacketExtremeRecipe packetExtremeRecipe(IRecipeHandler recipe, int recip
                     currentStack = stack.copy();
                 }
             }
-            recipeInputs.setTag("#" + slotIndex, currentStack.writeToNBT(new NBTTagCompound()));
+            recipeInputs.setTag("#" + slotIndex, ItemUtils.writeItemStackToNBT(currentStack, new NBTTagCompound()));
         }
         return new PacketExtremeRecipe(recipeInputs);
     }

diff --git a/src/main/java/com/github/vfyjxf/nee/network/NEENetworkHandler.java b/src/main/java/com/github/vfyjxf/nee/network/NEENetworkHandler.java
@@ -1,7 +1,17 @@
 package com.github.vfyjxf.nee.network;
 
 import com.github.vfyjxf.nee.NotEnoughEnergistics;
-import com.github.vfyjxf.nee.network.packet.*;
+import com.github.vfyjxf.nee.network.packet.PacketArcaneRecipe;
+import com.github.vfyjxf.nee.network.packet.PacketCraftingRequest;
+import com.github.vfyjxf.nee.network.packet.PacketExtremeRecipe;
+import com.github.vfyjxf.nee.network.packet.PacketNEIPatternRecipe;
+import com.github.vfyjxf.nee.network.packet.PacketOpenCraftAmount;
+import com.github.vfyjxf.nee.network.packet.PacketOpenGui;
+import com.github.vfyjxf.nee.network.packet.PacketSetRecipe;
+import com.github.vfyjxf.nee.network.packet.PacketSlotStackChange;
+import com.github.vfyjxf.nee.network.packet.PacketStackCountChange;
+import com.github.vfyjxf.nee.network.packet.PacketValueConfigClient;
+import com.github.vfyjxf.nee.network.packet.PacketValueConfigServer;
 
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;

diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java
@@ -7,6 +7,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.github.vfyjxf.nee.utils.ItemUtils;
+
 import appeng.container.slot.SlotFakeCraftingMatrix;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
@@ -50,7 +52,7 @@ public IMessage onMessage(PacketArcaneRecipe message, MessageContext ctx) {
                 NBTTagCompound currentStack;
                 for (int i = 0; i < recipeInput.length; i++) {
                     currentStack = (NBTTagCompound) message.input.getTag("#" + i);
-                    recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack);
+                    recipeInput[i] = currentStack == null ? null : ItemUtils.loadItemStackFromNBT(currentStack);
                 }
 
                 Field craftingSlots = ReflectionHelper.findField(ContainerKnowledgeInscriber.class, "craftingSlots");

diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketExtremeRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketExtremeRecipe.java
@@ -11,6 +11,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.github.vfyjxf.nee.utils.ItemUtils;
+
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -58,7 +60,7 @@ public IMessage onMessage(PacketExtremeRecipe message, MessageContext ctx) {
                 NBTTagCompound currentStack;
                 for (int i = 0; i < recipeInputs.length; i++) {
                     currentStack = (NBTTagCompound) message.input.getTag("#" + i);
-                    recipeInputs[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack);
+                    recipeInputs[i] = currentStack == null ? null : ItemUtils.loadItemStackFromNBT(currentStack);
                 }
                 int inputIndex = 0;
                 for (int i = 81; i < 162; i++) {

diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java
@@ -10,6 +10,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.github.vfyjxf.nee.utils.ItemUtils;
 import com.github.vfyjxf.nee.utils.ModIDs;
 import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal;
 import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx;
@@ -103,7 +104,7 @@ private void craftingTableRecipeHandler(AEBaseContainer container, PacketNEIPatt
 
         for (int i = 0; i < recipeInput.length; i++) {
             currentStack = (NBTTagCompound) message.input.getTag("#" + i);
-            recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack);
+            recipeInput[i] = currentStack == null ? null : ItemUtils.loadItemStackFromNBT(currentStack);
         }
 
         final IContainerCraftingPacket cct = (IContainerCraftingPacket) container;
@@ -150,12 +151,12 @@ private void processRecipeHandler(AEBaseContainer container, PacketNEIPatternRec
 
             for (int i = 0; i < recipeInput.length; i++) {
                 NBTTagCompound currentStack = (NBTTagCompound) message.input.getTag("#" + i);
-                recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack);
+                recipeInput[i] = currentStack == null ? null : ItemUtils.loadItemStackFromNBT(currentStack);
             }
 
             for (int i = 0; i < recipeOutput.length; i++) {
                 NBTTagCompound currentStack = (NBTTagCompound) message.output.getTag(OUTPUT_KEY + i);
-                recipeOutput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack);
+                recipeOutput[i] = currentStack == null ? null : ItemUtils.loadItemStackFromNBT(currentStack);
             }
             if (inv != null && message.input != null && security != null) {
                 for (int i = 0; i < craftMatrix.getSizeInventory(); i++) {

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/AppengRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/AppengRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/AvaritiaRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/AvaritiaRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/BloodMagicRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/BloodMagicRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/EnderIORecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/EnderIORecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/ForestryRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/ForestryRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/GTPPRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/GTPPRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/ICRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/ICRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/ImmersiveEngineeringRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/ImmersiveEngineeringRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/MekanismRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/MekanismRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/TCNEIPluginRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/TCNEIPluginRecipeProcessor.java
@@ -1,6 +1,10 @@
 package com.github.vfyjxf.nee.processor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/github/vfyjxf/nee/processor/ThermalExpansionRecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/ThermalExpansionRecipeProcessor.java
@@ -1,7 +1,11 @@
 package com.github.vfyjxf.nee.processor;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;