diff options
author | Dream-Master <dream-master@gmx.net> | 2016-06-21 19:32:31 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2016-06-21 19:32:31 +0200 |
commit | fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5 (patch) | |
tree | 1768cb06f91170eeb7cfd76ca9904507b702d734 /src/main/java/gregtech/common/items/behaviors | |
parent | 4f1900142313bf92a82f48fc146bd8c806734d7a (diff) | |
download | GT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.tar.gz GT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.tar.bz2 GT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.zip |
reverse commit
Diffstat (limited to 'src/main/java/gregtech/common/items/behaviors')
-rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java | 17 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java | 3 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index e4773356f6..a5811d3d17 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -1,12 +1,8 @@ package gregtech.common.items.behaviors; import gregtech.api.GregTech_API; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; @@ -42,18 +38,7 @@ public class Behaviour_Plunger_Fluid } } } - - } - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; - IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) { - GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; - if(machine.mFluid!=null&&machine.mFluid.amount>0) - machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); - return true; - } - } + } return false; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index 748a660c15..d72316989c 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -59,7 +59,8 @@ public class Behaviour_Spray_Color Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsed)); tUses = this.mUses; } - if ((GT_Utility.areStacksEqual(aStack, this.mUsed, true)) && (colorize(aWorld, aX, aY, aZ, aSide))) { + if ((GT_Utility.areStacksEqual(aStack, this.mUsed, true)) && + (colorize(aWorld, aX, aY, aZ, aSide))) { GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(102)), 1.0F, 1.0F, aX, aY, aZ); if (!aPlayer.capabilities.isCreativeMode) { tUses -= 1L; |