diff options
author | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 03:39:20 +0100 |
---|---|---|
committer | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 03:39:20 +0100 |
commit | 8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6 (patch) | |
tree | 80e377c85c8a89edeac671cc6b2f2655a150f41e /src/Java/gtPlusPlus/xmod/gregtech/api | |
parent | d58dc988a2d378cf9c5544f037f074cba169c5f4 (diff) | |
parent | 47816dec7729bde0bf247ff7db8ebf6b25b92048 (diff) | |
download | GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.tar.gz GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.tar.bz2 GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.zip |
Merge branch 'master' of https://bitbucket.org/draknyte1/gtpp-development into AlkWork
# Conflicts:
# src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java index 9f331496b7..34b3e86c70 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java @@ -278,35 +278,6 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered } } - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTimer) { - /*if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isUniversalEnergyStored(getMinimumStoredEU()) && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || aTimer % 200 == 0 || mSuccess > 0)) { - */ - if (aBaseMetaTileEntity.isServerSide() && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || ((aTimer % 200) == 0) || (this.mSuccess > 0))) { - this.value_last = this.value_current; - this.value_current = this.bUnbreakable; - if (this.value_last != this.value_current){ - Logger.WARNING("VALUE CHANGE - Ticking for a moment."); - if (this.bUnbreakable == true){ - //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity); - //Utils.LOG_ERROR("Safe is Indestructible."); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(Float.MAX_VALUE); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setBlockUnbreakable(); - } - else { - //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity); - //Utils.LOG_ERROR("Safe is not Indestructible."); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(1F); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setHardness(2); - - } - } - else { - - } - - } - } @Override public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) { |