Skip to content

Use passed ItemStack when inserting hand into the item hatch #10466

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

Open
vercte wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
+7 −2
Open

Use passed ItemStack when inserting hand into the item hatch #10466

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
9 changes: 7 additions & 2 deletions src/main/java/com/simibubi/create/content/logistics/itemHatch/ItemHatchBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
continue;
if (depositItemInHand && i != inventory.selected)
continue;
ItemStack item = inventory.getItem(i);
ItemStack item = depositItemInHand ? stack : inventory.getItem(i);
if (item.isEmpty())
continue;
if (!item.getItem()
Expand All @@ -136,10 +136,15 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
if (remainder.getCount() == item.getCount())
continue;

ItemStack extracted = inventory.removeItem(i, item.getCount() - remainder.getCount());
ItemStack extracted = depositItemInHand ? stack.copy() : inventory.removeItem(i, item.getCount() - remainder.getCount());
remainder = ItemHandlerHelper.insertItemStacked(targetInv, extracted, false);
anyInserted = true;

if(depositItemInHand) {
stack.setCount(remainder.getCount());
remainder.setCount(0); // clear it because we already set the count and don't want to duplicate it
}

// remainder might not be empty in itemhandler edge cases
if (!remainder.isEmpty())
failedInsertions.add(remainder);
Expand Down
Loading