diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-25 18:54:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 18:54:57 +0100 |
| commit | 87210137d0c5821c1791f316710f46da5af91744 (patch) | |
| tree | afa588c32c3898b7c69a8cadde8a015fae0b3303 /src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | |
| parent | 5476c4ea3999ebe4b5dd10b002da89b9829e483d (diff) | |
| parent | a2c7e3160262b03a10a655a5925b51f5def5e218 (diff) | |
| download | GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.gz GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.bz2 GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.zip | |
Merge branch 'unstable' into CrackingFollowup
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index e5fba09a82..393009df7d 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -816,8 +816,19 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE return true; } + if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)) { + if (mMetaTileEntity.onWireCutterRightClick(aSide, tSide, aPlayer, aX, aY, aZ)) { + GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer); + GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + } + return true; + } + if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) { - if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) { + if (mMetaTileEntity.onSolderingToolRightClick(aSide, tSide, aPlayer, aX, aY, aZ)) { + GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 500, aPlayer); + GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + } else if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) { mStrongRedstone ^= (1 << tSide); GT_Utility.sendChatToPlayer(aPlayer, trans("091","Redstone Output at Side ") + tSide + trans("092"," set to: ") + ((mStrongRedstone & (1 << tSide)) != 0 ? trans("093","Strong") : trans("094","Weak"))); GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(103), 3.0F, -1, xCoord, yCoord, zCoord); |