From 222826992ce19f361be49fc8d39a0a3d98c51685 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Sat, 10 Feb 2024 02:38:46 -0500 Subject: [PATCH] Allow clearing empty items from locked drawers (#26) --- .../minecraft/storagedrawers/block/BlockDrawers.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index dc456b0..6c8dda9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -373,6 +373,18 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } else if (item.getItem() == ModItems.upgradeLock) { boolean locked = tileDrawers.isLocked(LockAttribute.LOCK_POPULATED); + + if (locked) { + int slot = getDrawerSlot(side, hitX, hitY, hitZ); + IDrawer drawer = tileDrawers.getDrawer(slot); + ItemStack stack = drawer.getStoredItemPrototype(); + int count = drawer.getStoredItemCount(); + + if (stack != null && count == 0) { + drawer.setStoredItemRedir(null, 0); + return true; + } + } tileDrawers.setLocked(LockAttribute.LOCK_POPULATED, !locked); tileDrawers.setLocked(LockAttribute.LOCK_EMPTY, !locked);