Skip to content

Honor inventory-specific max stack sizes in InventoryHelper #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaFuqs merged 1 commit into from
Dec 18, 2025
Merged

Honor inventory-specific max stack sizes in InventoryHelper #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/main/java/de/dafuqs/spectrum/helpers/InventoryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,27 +142,30 @@ public static ItemStack smartAddToInventory(ItemStack itemStack, Inventory inven

public static ItemStack setOrCombineStack(Inventory inventory, int slot, ItemStack addingStack) {
ItemStack existingStack = inventory.getStack(slot);
int max = Math.min(addingStack.getMaxCount(), inventory.getMaxCountPerStack());
if (existingStack.isEmpty()) {
if (addingStack.getCount() > addingStack.getMaxCount()) {
int amount = addingStack.getMaxCount();
amount = Math.min(amount, inventory.getMaxCountPerStack());
if (addingStack.getCount() > max) {
ItemStack newStack = addingStack.copy();
newStack.setCount(amount);
addingStack.decrement(amount);
newStack.setCount(max);
addingStack.decrement(max);
inventory.setStack(slot, newStack);
} else {
inventory.setStack(slot, addingStack);
return ItemStack.EMPTY;
}
} else {
combineStacks(existingStack, addingStack);
combineStacks(existingStack, addingStack, max);
}
return addingStack;
}

public static void combineStacks(ItemStack originalStack, ItemStack addingStack) {
combineStacks(originalStack, addingStack, originalStack.getMaxCount());
}

public static void combineStacks(ItemStack originalStack, ItemStack addingStack, int max) {
if (ItemStack.canCombine(originalStack, addingStack)) {
int leftOverAmountInExistingStack = originalStack.getMaxCount() - originalStack.getCount();
int leftOverAmountInExistingStack = max - originalStack.getCount();
if (leftOverAmountInExistingStack > 0) {
int addAmount = Math.min(leftOverAmountInExistingStack, addingStack.getCount());
originalStack.increment(addAmount);
Expand All @@ -187,7 +190,7 @@ public static boolean addToInventory(Inventory inventory, ItemStack stackToAdd,
inventory.setStack(i, stackToAdd);
return true;
} else if (stackToAdd.isStackable()) {
combineStacks(currentStack, stackToAdd);
combineStacks(currentStack, stackToAdd, inventory.getMaxCountPerStack());
if (stackToAdd.isEmpty()) {
return true;
}
Expand Down Expand Up @@ -218,7 +221,7 @@ public static boolean addToInventory(Inventory inventory, List<ItemStack> stacks
for (int j = 0; j < stacksToAdd.size(); j++) {
ItemStack stackToAdd = stacksToAdd.get(j);
if (stackToAdd.isStackable()) {
combineStacks(inventoryStack, stackToAdd);
combineStacks(inventoryStack, stackToAdd, inventory.getMaxCountPerStack());
if (stackToAdd.isEmpty()) {
stacksToAdd.remove(j);
if (stacksToAdd.isEmpty()) {
Expand Down