From e31439d0beabdc31e04722c479ddaeb3a2789de2 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Sun, 9 Oct 2022 18:14:38 +0800 Subject: duct tape by right click (#1451) --- .../GT_MetaTileEntity_Hatch_Maintenance.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index fada5a9b7c..d0752d9f0d 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -163,10 +163,20 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch // only allow OC robot fake player if (aPlayer instanceof FakePlayer && !aPlayer.getGameProfile().getName().endsWith(".robot")) return false; - if (aPlayer.getCurrentEquippedItem() != null - && aPlayer.getCurrentEquippedItem().getItem() instanceof ItemToolbox) - applyToolbox(aPlayer.getCurrentEquippedItem(), aPlayer); - else aBaseMetaTileEntity.openGUI(aPlayer); + ItemStack tStack = aPlayer.getCurrentEquippedItem(); + if (tStack != null) { + if (tStack.getItem() instanceof ItemToolbox) { + applyToolbox(tStack, aPlayer); + } else if (ItemList.Duct_Tape.isStackEqual(tStack)) { + mWrench = mScrewdriver = mSoftHammer = mHardHammer = mCrowbar = mSolderingTool = true; + getBaseMetaTileEntity().setActive(false); + if (--tStack.stackSize == 0) { + aPlayer.inventory.mainInventory[aPlayer.inventory.currentItem] = null; + } + } else aBaseMetaTileEntity.openGUI(aPlayer); + } else { + aBaseMetaTileEntity.openGUI(aPlayer); + } return true; } return false; -- cgit