Increase default inventory max stack size to 99

With the max stack size component, item stacks can be stacked up to 99. This commit increases the default max stack size for slots in virtual inventories to 99 to allow such items. Additionally, the max stack size of referencing inventories now uses the max stack size of the referenced inventory.

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/inventory/Inventory.java

@@ -54,6 +54,13 @@
  */
 public sealed abstract class Inventory implements Observable permits VirtualInventory, CompositeInventory, ObscuredInventory, ReferencingInventory {
 
+    /**
+     * The default maximum stack size of slots in inventories.
+     * Note that the actual maximum stack size of item stacks is also limited
+     * by their max stack size component.
+     */
+    public static int DEFAULT_MAX_STACK_SIZE = 99;
+    
     private final int size;
     private final List<Set<ObserverAtSlot>> observers;
     private @Nullable List<Consumer<? super InventoryClickEvent>> clickHandlers;
@@ -581,11 +588,12 @@ public int getMaxStackSize(int slot, int alternative) {
      * parameter will be used to determine a potential maximum stack size.
      *
      * @param slot            The slot
-     * @param alternativeFrom The alternative {@link ItemStack} to determine the potential maximum stack size. Uses 64 if null.
+     * @param alternativeFrom The alternative {@link ItemStack} to determine the potential maximum stack size.
+     *                       Uses {@link #DEFAULT_MAX_STACK_SIZE} if null.
      * @return The current maximum allowed stack size on the specific slot.
      */
     public int getMaxStackSize(int slot, @Nullable ItemStack alternativeFrom) {
-        int itemMaxStackSize = alternativeFrom == null ? 64 : alternativeFrom.getMaxStackSize();
+        int itemMaxStackSize = alternativeFrom == null ? DEFAULT_MAX_STACK_SIZE : alternativeFrom.getMaxStackSize();
         return getMaxStackSize(slot, itemMaxStackSize);
     }
 
@@ -606,11 +614,12 @@ public int getMaxSlotStackSize(int slot, int alternative) {
      * The returned value will be a minimum of the maximum stack size of both the slot and the alternativeFrom parameter.
      *
      * @param slot            The slot
-     * @param alternativeFrom The alternative {@link ItemStack} to determine the potential maximum stack size. Uses 64 if null.
+     * @param alternativeFrom The alternative {@link ItemStack} to determine the potential maximum stack size.
+     *                       Uses {@link #DEFAULT_MAX_STACK_SIZE} if null.
      * @return The maximum stack size on that slot
      */
     public int getMaxSlotStackSize(int slot, @Nullable ItemStack alternativeFrom) {
-        int itemMaxStackSize = alternativeFrom == null ? 64 : alternativeFrom.getMaxStackSize();
+        int itemMaxStackSize = alternativeFrom == null ? DEFAULT_MAX_STACK_SIZE : alternativeFrom.getMaxStackSize();
         return getMaxSlotStackSize(slot, itemMaxStackSize);
     }
 

invui/src/main/java/xyz/xenondevs/invui/inventory/InventoryAdapter.java

@@ -29,7 +29,7 @@ public int getSize() {
 
     @Override
     public int getMaxStackSize() {
-        return Arrays.stream(inventory.getMaxStackSizes()).max().orElse(64);
+        return Arrays.stream(inventory.getMaxStackSizes()).max().orElse(Inventory.DEFAULT_MAX_STACK_SIZE);
     }
 
     @Override

invui/src/main/java/xyz/xenondevs/invui/inventory/ReferencingInventory.java

@@ -26,8 +26,6 @@
  */
 public sealed class ReferencingInventory extends xyz.xenondevs.invui.inventory.Inventory {
 
-    private static final int MAX_STACK_SIZE = 64;
-    
     protected final Inventory inventory;
     protected final Function<Inventory, @Nullable ItemStack[]> itemsGetter;
     protected final BiFunction<Inventory, Integer, @Nullable ItemStack> itemGetter;
@@ -54,7 +52,7 @@ private ReferencingInventory(
         this.itemGetter = itemGetter;
         this.itemSetter = itemSetter;
         this.maxStackSizes = new int[getSize()];
-        Arrays.fill(maxStackSizes, MAX_STACK_SIZE);
+        Arrays.fill(maxStackSizes, inventory.getMaxStackSize());
     }
 
     /**
@@ -95,7 +93,7 @@ public int[] getMaxStackSizes() {
 
     @Override
     public int getMaxSlotStackSize(int slot) {
-        return MAX_STACK_SIZE;
+        return inventory.getMaxStackSize();
     }
 
     @Override

invui/src/main/java/xyz/xenondevs/invui/inventory/VirtualInventory.java

@@ -37,7 +37,8 @@ public final class VirtualInventory extends Inventory {
      * @param uuid          The {@link UUID} of this {@link VirtualInventory}. Can be null, only used for serialization.
      * @param size          The amount of slots this {@link VirtualInventory} has.
      * @param items         A predefined array of content. Can be null.
-     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}. Can be null for 64.
+     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}.
+     *                      Can be null for {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      * @throws IllegalArgumentException If the given size does not match the length of the items array or the length of the stackSizes array.
      */
     public VirtualInventory(@Nullable UUID uuid, int size, @Nullable ItemStack @Nullable [] items, int @Nullable [] maxStackSizes) {
@@ -51,7 +52,7 @@ public VirtualInventory(@Nullable UUID uuid, int size, @Nullable ItemStack @Null
             this.maxStackSizes = maxStackSizes;
         } else {
             this.maxStackSizes = new int[size];
-            Arrays.fill(this.maxStackSizes, 64);
+            Arrays.fill(this.maxStackSizes, Inventory.DEFAULT_MAX_STACK_SIZE);
         }
 
         if (items != null) {
@@ -73,7 +74,8 @@ public VirtualInventory(@Nullable UUID uuid, int size, @Nullable ItemStack @Null
      *
      * @param size          The amount of slots this {@link VirtualInventory} has.
      * @param items         A predefined array of content. Can be null.
-     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}. Can be null for 64.
+     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}.
+     *                      Can be null for {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      */
     public VirtualInventory(int size, @Nullable ItemStack @Nullable [] items, int @Nullable [] maxStackSizes) {
         this(null, size, items, maxStackSizes);
@@ -84,7 +86,8 @@ public VirtualInventory(int size, @Nullable ItemStack @Nullable [] items, int @N
      *
      * @param uuid          The {@link UUID} of this {@link VirtualInventory}. Can be null, only used for serialization.
      * @param items         A predefined array of content.
-     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}. Can be null for 64.
+     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}.
+     *                      Can be null for {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      */
     public VirtualInventory(@Nullable UUID uuid, @Nullable ItemStack[] items, int @Nullable [] maxStackSizes) {
         this(uuid, items.length, items, maxStackSizes);
@@ -94,7 +97,8 @@ public VirtualInventory(@Nullable UUID uuid, @Nullable ItemStack[] items, int @N
      * Constructs a new {@link VirtualInventory}
      *
      * @param items         A predefined array of content.
-     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}. Can be null for 64.
+     * @param maxStackSizes An array of maximum allowed stack sizes for each slot in the {@link VirtualInventory}.
+     *                      Can be null for {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      */
     public VirtualInventory(@Nullable ItemStack[] items, int @Nullable [] maxStackSizes) {
         this(null, items.length, items, maxStackSizes);

invui/src/main/java/xyz/xenondevs/invui/inventory/VirtualInventoryManager.java

@@ -61,7 +61,7 @@ public VirtualInventory createNew(UUID uuid, int size) {
      * @param items         The items of the {@link VirtualInventory}.
      *                      Can be null for an empty inventory.
      * @param maxStackSizes The max stack sizes of the {@link VirtualInventory}.
-     *                      Can be null for the default stack size of 64.
+     *                      Can be null for the default stack size of {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      * @return The created {@link VirtualInventory}.
      * @throws IllegalArgumentException If a {@link VirtualInventory} with the given UUID already exists.
      */
@@ -106,14 +106,14 @@ public VirtualInventory getOrCreate(UUID uuid, int size) {
      * @param items         The items of the {@link VirtualInventory} to create if no such inventory exists.
      *                      Can be null for an empty inventory.
      * @param maxStackSizes The max stack sizes of the {@link VirtualInventory}.
-     *                      Can be null for the default stack size of 64.
+     *                      Can be null for the default stack size of {@link Inventory#DEFAULT_MAX_STACK_SIZE}.
      * @return The {@link VirtualInventory} with the given UUID or a new one with the given size, items and stack sizes if no such inventory exists.
      */
     public VirtualInventory getOrCreate(UUID uuid, int size, @Nullable ItemStack @Nullable [] items, int @Nullable [] maxStackSizes) {
         VirtualInventory inventory = getByUuid(uuid);
         if (inventory != null) {
             if (maxStackSizes != null) {
-                inventory.setMaxStackSizes(ArrayUtils.copyOf(maxStackSizes, inventory.getSize(), 64));
+                inventory.setMaxStackSizes(ArrayUtils.copyOf(maxStackSizes, inventory.getSize(), Inventory.DEFAULT_MAX_STACK_SIZE));
             }
             return inventory;
         } else {

invui/src/test/java/xyz/xenondevs/invui/inventory/InventoryAdapterTest.java

@@ -50,8 +50,8 @@ void getMaxStackSize() {
         var backingInv = new VirtualInventory(10);
         var adapter = new InventoryAdapter(backingInv);
 
-        // Default max stack size is 64
-        assertEquals(64, adapter.getMaxStackSize());
+        // Default max stack size is 99
+        assertEquals(99, adapter.getMaxStackSize());
 
         // With custom max stack sizes
         var backingInv2 = new VirtualInventory(3, null, new int[] {32, 16, 99});
@@ -66,7 +66,7 @@ void setMaxStackSize() {
         var backingInv = new VirtualInventory(10);
         var adapter = new InventoryAdapter(backingInv);
 
-        assertEquals(64, adapter.getMaxStackSize());
+        assertEquals(99, adapter.getMaxStackSize());
 
         adapter.setMaxStackSize(32);