diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index efe197fad6b..1d24649020e 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -216,7 +216,7 @@ public boolean onUseWithoutItem(Player player, Vec3 pos) { @Override public boolean onUseItemOn(ItemStack heldItem, Player player, InteractionHand hand, Vec3 pos) { - if (!this.isLocked) { + if (!this.isLocked && !InteractionUtil.isInAlternateUseMode(player)) { if (isClientSide()) { return true; } @@ -240,7 +240,7 @@ public boolean onUseItemOn(ItemStack heldItem, Player player, InteractionHand ha return true; } - return super.onUseWithoutItem(player, pos); + return super.onUseItemOn(heldItem, player, hand, pos); } // update the system... diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 1202745393b..306efe546b0 100644 --- a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -78,15 +78,15 @@ public boolean onUseItemOn(ItemStack heldItem, Player player, InteractionHand ha return false; } - if (this.isLocked()) { + if (this.isLocked() && !InteractionUtil.isInAlternateUseMode(player)) { if (InteractionUtil.canWrenchRotate(heldItem) && (this.getDisplayed() == null || !AEItemKey.matches(getDisplayed(), heldItem))) { // wrench it return super.onUseWithoutItem(player, pos); - } else { + } else if (!heldItem.isEmpty()) { this.insertItem(player, heldItem); + return true; } - return true; } else if (this.getDisplayed() != null && AEItemKey.matches(getDisplayed(), heldItem)) { this.insertItem(player, heldItem); return true; @@ -97,7 +97,7 @@ public boolean onUseItemOn(ItemStack heldItem, Player player, InteractionHand ha @Override public boolean onUseWithoutItem(Player player, Vec3 pos) { - if (this.isLocked()) { + if (this.isLocked() && !InteractionUtil.isInAlternateUseMode(player)) { if (isClientSide()) { return true; }