From bf43610bb0976b4c2ed4c36278fec6b4cc916719 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Fri, 5 Dec 2025 20:07:36 +0100 Subject: [PATCH] Revert right-click interaction with items in the offhand (Backhand) (#54) Co-authored-by: mM4ri <125275951+mM4ri@users.noreply.github.com> --- .../minecraft/storagedrawers/block/BlockController.java | 6 ------ .../minecraft/storagedrawers/block/BlockDrawers.java | 4 ---- 2 files changed, 10 deletions(-) diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java index ef750ad..4933143 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockController.java @@ -24,12 +24,10 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import com.jaquadro.minecraft.storagedrawers.core.ModItems; -import com.jaquadro.minecraft.storagedrawers.integration.BackhandIntegrationModule; import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import xonin.backhand.api.core.BackhandUtils; public class BlockController extends BlockContainer implements INetworked { @@ -124,10 +122,6 @@ public class BlockController extends BlockContainer implements INetworked { TileEntityController te = getTileEntitySafe(world, x, y, z); ItemStack item = player.inventory.getCurrentItem(); - if (BackhandIntegrationModule.isEnabled() && BackhandUtils.getOffhandItem(player) != null && item == null) { - if ((BackhandUtils.useOffhandItem(player, () -> true))) return false; - } - if (item != null && item.getItem() != null) { if (item.getItem() == ModItems.shroudKey) { if (!world.isRemote) te.toggleShroud(player.getGameProfile()); 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 883f0c0..ddff5db 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -338,10 +338,6 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); ItemStack item = player.inventory.getCurrentItem(); - if (BackhandIntegrationModule.isEnabled() && BackhandUtils.getOffhandItem(player) != null && item == null) { - if ((BackhandUtils.useOffhandItem(player, () -> true))) return false; - } - if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) return false; if (StorageDrawers.config.cache.debugTrace) {