diff options
author | Antifluxfield <lyj_299792458@163.com> | 2017-10-30 10:03:28 +0800 |
---|---|---|
committer | Antifluxfield <lyj_299792458@163.com> | 2017-10-30 10:03:28 +0800 |
commit | f96993bd339827161960b1528c589271b3d78573 (patch) | |
tree | ae3584ea4a31056d53b131381d1a09588ed9b0a3 /src/main/java/gregtech/api/metatileentity/implementations | |
parent | 22c2f16509e7c1ddbd960275a7f442643e3c9da8 (diff) | |
download | GT5-Unofficial-f96993bd339827161960b1528c589271b3d78573.tar.gz GT5-Unofficial-f96993bd339827161960b1528c589271b3d78573.tar.bz2 GT5-Unofficial-f96993bd339827161960b1528c589271b3d78573.zip |
Soldering Tools for cable connection
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 0f5f4a5ad9..6937dccfd1 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -16,6 +16,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Client; import ic2.api.energy.tile.IEnergySink; @@ -253,10 +254,21 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile @Override public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + return onConnectionToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ); + } + + @Override + public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + return onConnectionToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ); + } + + private boolean onConnectionToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Mod.gregtechproxy.gt6Pipe) { byte tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ); - if ((mConnections & (1 << tSide)) == 0) + if ((mConnections & (1 << tSide)) == 0) { + if (GT_Mod.gregtechproxy.costlyCableConnection && !GT_ModHandler.consumeSolderingMaterial(aPlayer)) return false; connect(tSide); + } else disconnect(tSide); return true; |