limit item types per storage core (1k default)

LITW-Refined · Jan 10, 2025 · 7aabf84 · 7aabf84
1 parent a029d16
commit 7aabf84
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java b/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java
@@ -8,24 +8,26 @@
 @Config(modid = Reference.MOD_ID)
 public class EZConfiguration {
 
-    @Config.Name("capacityStorageBasic")
     @Config.Comment("Count of items that the basic storage box can hold.")
     @Config.DefaultInt(400)
     @Config.RangeInt(min = 1)
     public static int basicCapacity;
 
-    @Config.Name("capacityStorageCondensed")
     @Config.Comment("Count of items that the condensed storage box can hold.")
     @Config.DefaultInt(4000)
     @Config.RangeInt(min = 1)
     public static int condensedCapacity;
 
-    @Config.Name("capacityStorageHyper")
     @Config.Comment("Count of items that the hyper storage box can hold.")
     @Config.DefaultInt(400000)
     @Config.RangeInt(min = 1)
     public static int hyperCapacity;
 
+    @Config.Comment("The maximum amount of different items that can be stored within one storage box.\nThe default value tries to ensure the NBT data wont get too large wich would normally lead to world corruption.")
+    @Config.DefaultInt(1000)
+    @Config.RangeInt(min = 1)
+    public static int maxItemTypes;
+
     public static void init() {
         try {
             ConfigurationManager.registerConfig(EZConfiguration.class);

diff --git a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInventoryProxy.java b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInventoryProxy.java
@@ -7,6 +7,7 @@
 
 import org.joml.Math;
 
+import com.zerofall.ezstorage.configuration.EZConfiguration;
 import com.zerofall.ezstorage.util.EZInventory;
 import com.zerofall.ezstorage.util.ItemGroup;
 
@@ -20,7 +21,8 @@ public int getSizeInventory() {
             return 0;
         }
         int size = core.inventory.inventory.size();
-        if (core.inventory.getTotalCount() < core.inventory.maxItems && core.inventory.slotCount() < 1000) {
+        if (core.inventory.getTotalCount() < core.inventory.maxItems
+            && core.inventory.slotCount() < EZConfiguration.maxItemTypes) {
             size += 1;
         }
         return size;

diff --git a/src/main/java/com/zerofall/ezstorage/util/EZInventory.java b/src/main/java/com/zerofall/ezstorage/util/EZInventory.java
@@ -8,6 +8,8 @@
 
 import org.joml.Math;
 
+import com.zerofall.ezstorage.configuration.EZConfiguration;
+
 public class EZInventory {
 
     public List<ItemGroup> inventory;
@@ -33,19 +35,24 @@ public void sort() {
     }
 
     private ItemStack mergeStack(ItemStack itemStack, int amount) {
+        boolean found = false;
         for (ItemGroup group : inventory) {
             if (stacksEqual(group.itemStack, itemStack)) {
                 group.count += amount;
-                itemStack.stackSize -= amount;
-                if (itemStack.stackSize <= 0) {
-                    return null;
-                } else {
-                    return itemStack;
-                }
+                found = true;
+                break;
             }
         }
-        // Needs to add a space
-        inventory.add(new ItemGroup(itemStack, amount));
+
+        // Add new group, if needed
+        if (!found) {
+            if (slotCount() > EZConfiguration.maxItemTypes) {
+                return null;
+            }
+            inventory.add(new ItemGroup(itemStack, amount));
+        }
+
+        // Adjust input/return stack
         itemStack.stackSize -= amount;
         if (itemStack.stackSize <= 0) {
             return null;