diff options
| author | Tec <daniel112092@gmail.com> | 2021-01-08 21:27:34 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2021-01-08 21:27:34 +0100 |
| commit | 89e0a8304c2887ebdf1ca4ebc0dbef4b44bdaa21 (patch) | |
| tree | 548c25552b9d566e8c760a559f82805f8d1c3140 | |
| parent | aff4087e2a20d69b11c8df254c3636f40889a860 (diff) | |
| download | GT5-Unofficial-89e0a8304c2887ebdf1ca4ebc0dbef4b44bdaa21.tar.gz GT5-Unofficial-89e0a8304c2887ebdf1ca4ebc0dbef4b44bdaa21.tar.bz2 GT5-Unofficial-89e0a8304c2887ebdf1ca4ebc0dbef4b44bdaa21.zip | |
Adjust a bit more
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 20 |
1 files changed, 9 insertions, 11 deletions
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 c9348d0245..e0bc2e3364 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 @@ -1785,22 +1785,20 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } public boolean drainEnergyInput_EM(long EUtTierVoltage, long EUtEffective, long Amperes) { + long EUuse = EUtEffective * Amperes; + if(EUuse==0){ + return true; + } if(maxEUinputMin==0){ return false; } - if (EUtTierVoltage < 0) { - EUtTierVoltage = -EUtTierVoltage; - } - if (EUtEffective < 0) { - EUtEffective = -EUtEffective; + if (EUuse < 0) { + EUuse = -EUuse; } - if (Amperes < 0) { - Amperes = -Amperes; - } - long EUuse = EUtEffective * Amperes; if (EUuse > getEUVar() || //not enough power - (EUtTierVoltage==0?EUuse> getMaxInputEnergy():EUtTierVoltage > maxEUinputMax) || //TIER IS BASED ON BEST HATCH! not total EUtEffective input - (EUtTierVoltage * Amperes - 1) / maxEUinputMin + 1 > eMaxAmpereFlow) {// EUuse==0? --> (EUuse - 1) / maxEUinputMin + 1 = 1! //if not too much A + (EUtTierVoltage==0? EUuse> getMaxInputEnergy(): + (EUtTierVoltage > maxEUinputMax) || //TIER IS BASED ON BEST HATCH! not total EUtEffective input + (EUtTierVoltage * Amperes - 1) / maxEUinputMin + 1 > eMaxAmpereFlow)) {// EUuse==0? --> (EUuse - 1) / maxEUinputMin + 1 = 1! //if not too much A if (DEBUG_MODE) { TecTech.LOGGER.debug("L1 " + EUuse + ' ' + getEUVar() + ' ' + (EUuse > getEUVar())); TecTech.LOGGER.debug("L2 " + EUtEffective + ' ' + maxEUinputMax + ' ' + (EUtEffective > maxEUinputMax)); |