aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2018-05-03 13:41:23 +0200
committerTec <daniel112092@gmail.com>2018-05-03 13:41:23 +0200
commitd3c9946318deba81c0b93bd7042211eb08cb036c (patch)
treeae2c9f8d338ea117263f2a0c21c9627552ef559a /src
parent1b55c86a105a4d45cc974b2e4d773cc17e8b89e3 (diff)
downloadGT5-Unofficial-d3c9946318deba81c0b93bd7042211eb08cb036c.tar.gz
GT5-Unofficial-d3c9946318deba81c0b93bd7042211eb08cb036c.tar.bz2
GT5-Unofficial-d3c9946318deba81c0b93bd7042211eb08cb036c.zip
Remove unnecessary field
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java11
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_BuckConverter.java4
2 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
index f90e7ef04f..3faf583630 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
@@ -27,7 +27,6 @@ import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMachineBlock {
private static GT_RenderedTexture BUCK,BUCK_ACTIVE;
public int EUT=0,AMP=0;
- public boolean enabled = true;
public GT_MetaTileEntity_BuckConverter(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, 0, "Power from nothing");
@@ -94,8 +93,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
public void loadNBTData(NBTTagCompound aNBT) {
EUT=aNBT.getInteger("eEUT");
AMP=aNBT.getInteger("eAMP");
- enabled = (long)AMP*EUT >=0;
- getBaseMetaTileEntity().setActive(enabled);
+ getBaseMetaTileEntity().setActive((long)AMP*EUT >=0);
}
@Override
@@ -118,7 +116,6 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
if(aBaseMetaTileEntity.isActive()) {
aBaseMetaTileEntity.decreaseStoredEnergyUnits(CommonValues.V[mTier] >> 2, true);
}
- aBaseMetaTileEntity.setActive(enabled);
}
}
@@ -163,7 +160,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
@Override
public boolean isOutputFacing(byte aSide) {
- return enabled && aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing();
+ return getBaseMetaTileEntity().isActive() && aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing();
}
@Override
@@ -173,7 +170,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
@Override
public long maxAmperesOut() {
- return enabled?Math.min(Math.abs(AMP),64):0;
+ return getBaseMetaTileEntity().isActive()?Math.min(Math.abs(AMP),64):0;
}
@Override
@@ -183,7 +180,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
@Override
public long maxEUOutput() {
- return enabled?Math.min(Math.abs(EUT),maxEUInput()):0;
+ return getBaseMetaTileEntity().isActive()?Math.min(Math.abs(EUT),maxEUInput()):0;
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_BuckConverter.java
index 58e87e3990..2f0325c776 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_BuckConverter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_BuckConverter.java
@@ -102,7 +102,7 @@ public class GT_Container_BuckConverter
break;
default: return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
}
- buck.enabled =(long)AMP*EUT>=0;
+ buck.getBaseMetaTileEntity().setActive((long)AMP*EUT>=0);
return null;
}
return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
@@ -118,7 +118,7 @@ public class GT_Container_BuckConverter
GT_MetaTileEntity_BuckConverter buck = (GT_MetaTileEntity_BuckConverter) mTileEntity.getMetaTileEntity();
EUT=buck.EUT;
AMP=buck.AMP;
- buck.enabled =(long)AMP*EUT>=0;
+ buck.getBaseMetaTileEntity().setActive((long)AMP*EUT>=0);
for (Object crafter : crafters) {
ICrafting var1 = (ICrafting) crafter;