Skip to content

Fix slot interactivity issue #1890

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
LNatit wants to merge 1 commit into
base: 19.x-1.21.5
Choose a base branch
from
Open

Fix slot interactivity issue #1890

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
13 changes: 10 additions & 3 deletions api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/VanillaSlotAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,19 @@ public ItemStack takeStack(int amount) {
public Slot getSlot() {
return slot;
}


/**
* Since NeoForge implemented slots may not pick up & take when it's empty, although the slot is still modifiable.
* A {@link VanillaSlotAccessor#canPlace(ItemStack)} check is performed later on, so this should not cause illegal modification theoretically.
*
* @see <a href="https://github.com/neoforged/NeoForge/blob/413dad9137f0e3fef53ce7dcf46f361ea5032d1a/src/main/java/net/neoforged/neoforge/items/SlotItemHandler.java#L26">SlotItemHandler::mayPlace</a>,
* <a href="https://github.com/neoforged/NeoForge/blob/413dad9137f0e3fef53ce7dcf46f361ea5032d1a/src/main/java/net/neoforged/neoforge/items/SlotItemHandler.java#L65">SlotItemHandler::mayPickup</a>
*/
@Override
public boolean allowModification(Player player) {
return slot.allowModification(player);
return !slot.hasItem() || slot.allowModification(player);
}

@Override
public boolean canPlace(ItemStack stack) {
return slot.mayPlace(stack);
Expand Down