From 1b909de42c6bbf07e7bbf29d5a426703428cb0c0 Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 17 Jul 2019 10:08:02 +0200 Subject: Expose some internal state --- .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 19d64910e1..1fb18ccf50 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -122,6 +122,14 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt //functionality toggles - changed by buttons in gui also protected boolean ePowerPass = false, eSafeVoid = false; + public boolean isPowerPass() { + return ePowerPass; + } + + public boolean isSafeVoid() { + return eSafeVoid; + } + //max amperes machine can take in after computing it to the lowest tier (exchange packets to min tier count) protected long eMaxAmpereFlow = 0,eMaxAmpereGen=0; -- cgit From dfcdcaa0c6aadabdb665d34b74f0eed180600dc8 Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 17 Jul 2019 10:10:07 +0200 Subject: Can be safely exposed --- .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 1fb18ccf50..635107ff28 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -115,20 +115,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt //if u need to force some things to be fixed - u might need to override doRandomMaintenanceDamage protected byte minRepairStatus = 3; - //endregion - - //region READ ONLY unless u really need to change it - //functionality toggles - changed by buttons in gui also - protected boolean ePowerPass = false, eSafeVoid = false; + public boolean ePowerPass = false, eSafeVoid = false; - public boolean isPowerPass() { - return ePowerPass; - } + //endregion - public boolean isSafeVoid() { - return eSafeVoid; - } + //region READ ONLY unless u really need to change it //max amperes machine can take in after computing it to the lowest tier (exchange packets to min tier count) protected long eMaxAmpereFlow = 0,eMaxAmpereGen=0; -- cgit From 1790e69559b659d0050fe95d5df489e6b193ccf0 Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 17 Jul 2019 10:23:45 +0200 Subject: Cleanup particle code --- .../github/technus/tectech/entity/fx/WeightlessParticleFX.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java b/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java index 22b72463f8..f4afa098d9 100644 --- a/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java +++ b/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java @@ -8,8 +8,6 @@ import net.minecraft.world.World; @SideOnly(Side.CLIENT) public class WeightlessParticleFX extends EntityFX { - private static final String __OBFID = "CL_00000903"; - public WeightlessParticleFX(World p_i1205_1_, double p_i1205_2_, double p_i1205_4_, double p_i1205_6_, double p_i1205_8_, double p_i1205_10_, double p_i1205_12_) { super(p_i1205_1_, p_i1205_2_, p_i1205_4_, p_i1205_6_, p_i1205_8_, p_i1205_10_, p_i1205_12_); @@ -41,11 +39,5 @@ public class WeightlessParticleFX extends EntityFX this.motionX *= 0.8999999761581421D; this.motionY *= 0.8999999761581421D; this.motionZ *= 0.8999999761581421D; - - if (this.onGround) - { - this.motionX *= 0.699999988079071D; - this.motionZ *= 0.699999988079071D; - } } } -- cgit From 082fa82c0a7a58f2cef95d5bd2c00920c8ee17e2 Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 17 Jul 2019 21:52:06 +0200 Subject: Adjust clean energy behaviour --- .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 635107ff28..71138bb55a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -1424,9 +1424,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin * hatch.Amperes; } } - if (getEUVar() > maxEUStore()) { - setEUVar(maxEUStore()); - } } else { maxEUinputMin = 0; maxEUinputMax = 0; @@ -1434,7 +1431,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt maxEUoutputMin = 0; maxEUoutputMax = 0; eMaxAmpereGen = 0; - setEUVar(0); + } + if (getEUVar() > maxEUStore()) { + setEUVar(maxEUStore()); } for (GT_MetaTileEntity_Hatch_Uncertainty hatch : eUncertainHatches) { -- cgit