Skip to content

fix: 修复不可堆叠物品在输出时被堆叠的问题 #191

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

Closed
ProperSAMA wants to merge 1 commit into from
Closed

fix: 修复不可堆叠物品在输出时被堆叠的问题 #191

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
6 changes: 4 additions & 2 deletions src/main/java/hellfirepvp/modularmachinery/common/util/ItemUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ public static int insertAll(@Nonnull ItemStack stack, IItemHandlerModifiable han

int inserted = 0;
for (int i = 0; i < handler.getSlots(); i++) {
int maxStackSize = handler.getSlotLimit(i);
// 避免不可堆叠物品被叠加
int maxStackSize = Math.min(handler.getSlotLimit(i), stack.getMaxStackSize());
ItemStack in = handler.getStackInSlot(i);
int count = in.getCount();
if (count >= maxStackSize) {
Expand All @@ -285,7 +286,8 @@ public static int insertAll(@Nonnull ItemStack stack, IItemHandlerModifiable han
handler.setStackInSlot(i, copyStackWithSize(stack, toInsert));
inserted += toInsert;
} else {
if (stackEqualsNonNBT(stack, in) && matchTags(stack, in)) {
// 不允许对不可堆叠物品进行合并
if (stack.isStackable() && stackEqualsNonNBT(stack, in) && matchTags(stack, in)) {
int toInsert = Math.min(maxInsert - inserted, maxStackSize - count);
handler.setStackInSlot(i, copyStackWithSize(stack, toInsert + count));
inserted += toInsert;
Expand Down
Loading