Update to using Item#ABSOLUTE_MAX_STACK_SIZE instead of hardcoding the old max of 64

pupnewfster · pupnewfster · commit a76be72f91bd · 2024-05-24T12:57:09.000-05:00
diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json
diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java
@@ -1303,7 +1303,7 @@ private void addMisc() {
         add(MekanismLang.ITEM_FILTER_NO_ITEM, "No item");
         add(MekanismLang.SORTER_FILTER_SIZE_MODE, "%1$s!");
         add(MekanismLang.SORTER_FILTER_MAX_LESS_THAN_MIN, "Max < min");
-        add(MekanismLang.SORTER_FILTER_OVER_SIZED, "Max > 64");
+        add(MekanismLang.SORTER_FILTER_OVER_SIZED, "Max > %1$s");
         add(MekanismLang.SORTER_FILTER_SIZE_MISSING, "Max/min");
         add(MekanismLang.OREDICTIONIFICATOR_FILTER, "Oredictionificator Filter");
         add(MekanismLang.OREDICTIONIFICATOR_FILTER_INVALID_NAMESPACE, "Invalid tag namespace");
diff --git a/src/main/java/mekanism/client/gui/element/window/filter/GuiFilter.java b/src/main/java/mekanism/client/gui/element/window/filter/GuiFilter.java
@@ -30,6 +30,7 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -174,14 +175,14 @@ protected static <FILTER extends SorterFilter<FILTER>> void validateAndSaveSorte
             } else {
                 int min = Integer.parseInt(minField.getText());
                 int max = Integer.parseInt(maxField.getText());
-                if (max >= min && max <= 64) {
+                if (max >= min && max <= Item.ABSOLUTE_MAX_STACK_SIZE) {
                     guiFilter.filter.min = min;
                     guiFilter.filter.max = max;
                     guiFilter.saveFilter();
                 } else if (min > max) {
                     guiFilter.filterSaveFailed(MekanismLang.SORTER_FILTER_MAX_LESS_THAN_MIN);
-                } else { //max > 64 || min > 64
-                    guiFilter.filterSaveFailed(MekanismLang.SORTER_FILTER_OVER_SIZED);
+                } else { //max > Item.ABSOLUTE_MAX_STACK_SIZE || min > Item.ABSOLUTE_MAX_STACK_SIZE
+                    guiFilter.filterSaveFailed(MekanismLang.SORTER_FILTER_OVER_SIZED, Item.ABSOLUTE_MAX_STACK_SIZE);
                 }
             }
         } else {
diff --git a/src/main/java/mekanism/client/gui/element/window/filter/transporter/GuiSorterFilterHelper.java b/src/main/java/mekanism/client/gui/element/window/filter/transporter/GuiSorterFilterHelper.java
@@ -24,6 +24,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.ContainerEventHandler;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.world.item.Item;
 
 public interface GuiSorterFilterHelper extends GuiFilterHelper<TileEntityLogisticalSorter>, IFancyFontRenderer, ContainerEventHandler {
 
@@ -52,13 +53,14 @@ default void addSorterDefaults(IGuiWrapper gui, int slotOffset, UnaryOperator<Gu
             filter.allowDefault = !filter.allowDefault;
             return true;
         })).setTooltip(MekanismLang.FILTER_ALLOW_DEFAULT);
+        int maxStackSizeDigits = Integer.toString(Item.ABSOLUTE_MAX_STACK_SIZE).length();
         GuiTextField minField = new GuiTextField(gui, this, relativeX + 169, relativeY + 31, 20, 11);
-        minField.setMaxLength(2);
+        minField.setMaxLength(maxStackSizeDigits);
         minField.setInputValidator(InputValidator.DIGIT);
         minField.setText(Integer.toString(getFilter().min));
         childAdder.apply(minField);
         GuiTextField maxField = new GuiTextField(gui, this, relativeX + 169, relativeY + 43, 20, 11);
-        maxField.setMaxLength(2);
+        maxField.setMaxLength(maxStackSizeDigits);
         maxField.setInputValidator(InputValidator.DIGIT);
         maxField.setText(Integer.toString(getFilter().max));
         childAdder.apply(maxField);
diff --git a/src/main/java/mekanism/common/attachments/containers/item/ComponentBackedInventorySlot.java b/src/main/java/mekanism/common/attachments/containers/item/ComponentBackedInventorySlot.java
@@ -9,14 +9,14 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.inventory.IInventorySlot;
 import mekanism.common.attachments.containers.ComponentBackedContainer;
-import mekanism.common.inventory.slot.BasicInventorySlot;
 import mekanism.common.registries.MekanismDataComponents;
 import mekanism.common.util.NBTUtils;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,7 +31,7 @@ public class ComponentBackedInventorySlot extends ComponentBackedContainer<ItemS
 
     public ComponentBackedInventorySlot(ItemStack attachedTo, int slotIndex, BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canExtract,
           BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canInsert, Predicate<@NotNull ItemStack> validator) {
-        this(attachedTo, slotIndex, canExtract, canInsert, validator, true, BasicInventorySlot.DEFAULT_LIMIT);
+        this(attachedTo, slotIndex, canExtract, canInsert, validator, true, Item.ABSOLUTE_MAX_STACK_SIZE);
     }
 
     public ComponentBackedInventorySlot(ItemStack attachedTo, int slotIndex, BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canExtract,
diff --git a/src/main/java/mekanism/common/content/qio/QIOCraftingTransferHelper.java b/src/main/java/mekanism/common/content/qio/QIOCraftingTransferHelper.java
@@ -295,7 +295,7 @@ protected BaseSimulatedInventory(List<HotBarSlot> hotBarSlots, List<MainInventor
                 }
                 stackSizes[slot] = remaining;
                 inventory[slot] = stack;
-                //Note: For our slots the max stack size of the slot itself is always 64, but we look it up anyway just in case things change
+                //Note: For our slots the max stack size of the slot itself is always Item.ABSOLUTE_MAX_STACK_SIZE, but we look it up anyway just in case things change
                 if (stack.isEmpty()) {
                     slotLimits[slot] = inventorySlot.getMaxStackSize(stack);
                 } else {
diff --git a/src/main/java/mekanism/common/content/qio/QIOCraftingWindow.java b/src/main/java/mekanism/common/content/qio/QIOCraftingWindow.java
@@ -244,7 +244,8 @@ private void craftingFinished(@NotNull Level world) {
      */
     private int calculateMaxCraftAmount(@NotNull ItemStack stack, @Nullable QIOFrequency frequency) {
         int outputSize = stack.getCount();
-        int inputSize = 64;
+        //Note: We start at the absolute max stack size, rather than at integer max value just to be a little more accurate
+        int inputSize = Item.ABSOLUTE_MAX_STACK_SIZE;
         for (IInventorySlot inputSlot : inputSlots) {
             int count = inputSlot.getCount();
             if (count > 0 && count < inputSize) {
diff --git a/src/main/java/mekanism/common/content/qio/QIOServerCraftingTransferHandler.java b/src/main/java/mekanism/common/content/qio/QIOServerCraftingTransferHandler.java
@@ -325,7 +325,7 @@ protected int getRemaining(int slot, ItemStack currentStored) {
                     availableItemSpace += slotData.getUsed();
                     if (slotData.getAvailable() == 0) {
                         //If we used all that is available, we need to also free up an item type
-                        //Note: Given we can't use as much as a full integer as we have nine slots that stack up to a max of 64
+                        //Note: Given we can't use as much as a full integer as we have nine slots that stack up to a max of Item.ABSOLUTE_MAX_STACK_SIZE
                         // if we get down to zero then we know that we actually used it all, and it isn't just the case that we
                         // think we are at zero because of clamping a long to an int
                         availableItemTypes++;
diff --git a/src/main/java/mekanism/common/content/transporter/SorterFilter.java b/src/main/java/mekanism/common/content/transporter/SorterFilter.java
@@ -20,6 +20,7 @@
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.util.ExtraCodecs;
+import net.minecraft.world.item.Item;
 import net.neoforged.neoforge.items.IItemHandler;
 import org.jetbrains.annotations.Nullable;
 
@@ -95,7 +96,7 @@ public TransitRequest mapInventory(IItemHandler itemHandler, boolean singleItem)
         if (sizeMode && !singleItem) {
             return TransitRequest.definedItem(itemHandler, min, max, getFinder());
         }
-        return TransitRequest.definedItem(itemHandler, singleItem ? 1 : 64, getFinder());
+        return TransitRequest.definedItem(itemHandler, singleItem ? 1 : Item.ABSOLUTE_MAX_STACK_SIZE, getFinder());
     }
 
     @Override
@@ -116,8 +117,8 @@ public boolean equals(Object o) {
 
     @ComputerMethod(threadSafe = true)
     void setMinMax(int min, int max) throws ComputerException {
-        if (min < 0 || max < 0 || min > max || max > 64) {
-            throw new ComputerException("Invalid or min/max: 0 <= min <= max <= 64");
+        if (min < 0 || max < 0 || min > max || max > Item.ABSOLUTE_MAX_STACK_SIZE) {
+            throw new ComputerException("Invalid or min/max: 0 <= min <= max <= " + Item.ABSOLUTE_MAX_STACK_SIZE);
         }
         this.min = min;
         this.max = max;
diff --git a/src/main/java/mekanism/common/integration/computer/SpecialConverters.java b/src/main/java/mekanism/common/integration/computer/SpecialConverters.java
@@ -179,8 +179,8 @@ private static void decodeSorterFilter(@NotNull Map<?, ?> map, SorterFilter<?> s
         sorterFilter.sizeMode = getBooleanFromRaw(map.get("size"));
         sorterFilter.min = getIntFromRaw(map.get("min"));
         sorterFilter.max = getIntFromRaw(map.get("max"));
-        if (sorterFilter.min < 0 || sorterFilter.max < 0 || sorterFilter.min > sorterFilter.max || sorterFilter.max > 64) {
-            throw new ComputerException("Invalid or min/max: 0 <= min <= max <= 64");
+        if (sorterFilter.min < 0 || sorterFilter.max < 0 || sorterFilter.min > sorterFilter.max || sorterFilter.max > Item.ABSOLUTE_MAX_STACK_SIZE) {
+            throw new ComputerException("Invalid or min/max: 0 <= min <= max <= " + Item.ABSOLUTE_MAX_STACK_SIZE);
         }
         if (sorterFilter instanceof SorterItemStackFilter sorterItemFilter) {
             sorterItemFilter.fuzzyMode = getBooleanFromRaw(map.get("fuzzy"));
diff --git a/src/main/java/mekanism/common/inventory/slot/BasicInventorySlot.java b/src/main/java/mekanism/common/inventory/slot/BasicInventorySlot.java
@@ -19,6 +19,7 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,14 +34,13 @@ public class BasicInventorySlot implements IInventorySlot {
     public static final BiPredicate<@NotNull ItemStack, @NotNull AutomationType> manualOnly = (stack, automationType) -> automationType == AutomationType.MANUAL;
     public static final BiPredicate<@NotNull ItemStack, @NotNull AutomationType> internalOnly = ConstantPredicates.internalOnly();
     public static final BiPredicate<@NotNull ItemStack, @NotNull AutomationType> notExternal = ConstantPredicates.notExternal();
-    public static final int DEFAULT_LIMIT = 64;
 
     public static BasicInventorySlot at(@Nullable IContentsListener listener, int x, int y) {
         return at(alwaysTrue, listener, x, y);
     }
 
     public static BasicInventorySlot at(Predicate<@NotNull ItemStack> validator, @Nullable IContentsListener listener, int x, int y) {
-        return at(validator, listener, x, y, DEFAULT_LIMIT);
+        return at(validator, listener, x, y, Item.ABSOLUTE_MAX_STACK_SIZE);
     }
 
     public static BasicInventorySlot at(Predicate<@NotNull ItemStack> validator, @Nullable IContentsListener listener, int x, int y, int limit) {
@@ -98,7 +98,7 @@ protected BasicInventorySlot(Predicate<@NotNull ItemStack> canExtract, Predicate
 
     protected BasicInventorySlot(BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canExtract, BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canInsert,
           Predicate<@NotNull ItemStack> validator, @Nullable IContentsListener listener, int x, int y) {
-        this(DEFAULT_LIMIT, canExtract, canInsert, validator, listener, x, y);
+        this(Item.ABSOLUTE_MAX_STACK_SIZE, canExtract, canInsert, validator, listener, x, y);
     }
 
     protected BasicInventorySlot(int limit, BiPredicate<@NotNull ItemStack, @NotNull AutomationType> canExtract,
diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
@@ -42,6 +42,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -133,7 +134,8 @@ protected boolean onUpdateServer() {
                     }
 
                     if (!sentItems && autoEject) {
-                        TransitRequest request = TransitRequest.definedItem(back, singleItem ? 1 : 64, strictFinder);
+                        //TODO - 1.20.5: Evaluate if this (and SorterFilter#mapInventory) should use a stack's max stack size or the absolute stack size
+                        TransitRequest request = TransitRequest.definedItem(back, singleItem ? 1 : Item.ABSOLUTE_MAX_STACK_SIZE, strictFinder);
                         TransitResponse response = emitItemToTransporter(frontCap, request, color, 0);
                         if (!response.isEmpty()) {
                             response.useAll();
diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java
@@ -96,7 +96,7 @@ private static <T> void dropItemContents(Level level, BlockPos pos, Collection<T
                 // then we actually end up dropping the stack for each of the items. dropStack handles ensuring that we don't
                 // drop items past their max stack size
                 if (scalar > 1) {
-                    if (stackToDrop.getCount() > 64) {
+                    if (stackToDrop.getCount() > stackToDrop.getMaxStackSize()) {
                         //If it is already a super sized stack (for example bins), we do a bit of extra math just to ensure the value doesn't overflow
                         // though we don't bother making sure we actually drop past MAX_INT of the item, as we really would rather not be dropping that
                         // much in the first place.

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ protected BaseSimulatedInventory(List<HotBarSlot> hotBarSlots, List<MainInventor`
`295`	`295`	`}`
`296`	`296`	`stackSizes[slot] = remaining;`
`297`	`297`	`inventory[slot] = stack;`
`298`		`- //Note: For our slots the max stack size of the slot itself is always 64, but we look it up anyway just in case things change`
	`298`	`+ //Note: For our slots the max stack size of the slot itself is always Item.ABSOLUTE_MAX_STACK_SIZE, but we look it up anyway just in case things change`
`299`	`299`	`if (stack.isEmpty()) {`
`300`	`300`	`slotLimits[slot] = inventorySlot.getMaxStackSize(stack);`
`301`	`301`	`} else {`