From 706754be11cb807218f39b5835a92fb8e5f53f02 Mon Sep 17 00:00:00 2001 From: bot Date: Sun, 21 Apr 2024 15:37:18 +0200 Subject: [PATCH] update structure lib deb --- dependencies.gradle | 2 +- .../api/metatileentity/BaseMetaTileEntity.java | 16 +++++++--------- ...GT_MetaTileEntity_EnhancedMultiBlockBase.java | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4f9a13337..e0e2201e5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -13,7 +13,7 @@ def deobfCurse(curseDep) { } dependencies { - implementation("mega:structurelib-mc1.7.10:1.1.2:dev") + implementation("mega:structurelib-mc1.7.10:1.2.0-mega:dev") implementation("codechicken:codechickencore-mc1.7.10:1.0.9-gtmega:dev") implementation("codechicken:codechickenlib-mc1.7.10:1.1.4-gtmega:dev") implementation("codechicken:notenoughitems-mc1.7.10:2.2.0-mega:dev") diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 8ff1b527f..5ec438168 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -1508,15 +1508,13 @@ public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) { if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { - if (mMetaTileEntity.onSoftHammerRightClick(aSide,aPlayer,aX,aY,aZ)) { - if (mWorks) disableWorking(); - else enableWorking(); - { - String tChat = trans("090", "Machine Processing: ") + (isAllowedToWork() ? trans("088", "Enabled") : trans("087", "Disabled")); - if (getMetaTileEntity() != null && getMetaTileEntity().hasAlternativeModeText()) - tChat = getMetaTileEntity().getAlternativeModeText(); - GT_Utility.sendChatToPlayer(aPlayer, tChat); - } + if (mWorks) disableWorking(); + else enableWorking(); + { + String tChat = trans("090", "Machine Processing: ") + (isAllowedToWork() ? trans("088", "Enabled") : trans("087", "Disabled")); + if (getMetaTileEntity() != null && getMetaTileEntity().hasAlternativeModeText()) + tChat = getMetaTileEntity().getAlternativeModeText(); + GT_Utility.sendChatToPlayer(aPlayer, tChat); } GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(101), 1.0F, -1, xCoord, yCoord, zCoord); } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index 8f5411288..08a89123e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -169,12 +169,12 @@ private IStructureDefinition> getCas */ protected final boolean checkPiece(String piece, int horizontalOffset, int verticalOffset, int depthOffset) { IGregTechTileEntity tTile = getBaseMetaTileEntity(); - return getCastedStructureDefinition().check(this, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, !mMachine); + return getCastedStructureDefinition().check(this, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, !mMachine,null); } protected final boolean buildPiece(String piece, ItemStack trigger, boolean hintOnly, int horizontalOffset, int verticalOffset, int depthOffset) { IGregTechTileEntity tTile = getBaseMetaTileEntity(); - return getCastedStructureDefinition().buildOrHints(this, trigger, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, hintOnly); + return getCastedStructureDefinition().buildOrHints(this, trigger, piece, tTile.getWorld(), getExtendedFacing(), tTile.getXCoord(), tTile.getYCoord(), tTile.getZCoord(), horizontalOffset, verticalOffset, depthOffset, hintOnly,null); } @Override