aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2021-01-08 20:56:11 +0100
committerTec <daniel112092@gmail.com>2021-01-08 20:56:11 +0100
commitaff4087e2a20d69b11c8df254c3636f40889a860 (patch)
tree142946145da8c41382483e3963aafac096290adc /src/main
parent081ca2fc057fc02e73f6c8858d02ec4691d71de8 (diff)
downloadGT5-Unofficial-aff4087e2a20d69b11c8df254c3636f40889a860.tar.gz
GT5-Unofficial-aff4087e2a20d69b11c8df254c3636f40889a860.tar.bz2
GT5-Unofficial-aff4087e2a20d69b11c8df254c3636f40889a860.zip
Cleanup that too
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java22
1 files changed, 21 insertions, 1 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 d805e5f913..c9348d0245 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
@@ -1839,7 +1839,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
}//Use in EM check recipe return statement if you want overclocking
@Override // same as gt sum of all hatches
- public final long getMaxInputVoltage() {
+ public long getMaxInputVoltage() {
+ return getMaxInputVoltageSum();
+ }
+
+ // same as gt sum of all hatches
+ public final long getMaxInputVoltageSum() {
long rVoltage = 0;
for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
@@ -1870,6 +1875,21 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
return energy;
}
+ public final long getMaxInputEnergy_EM() {
+ long energy = 0;
+ for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
+ if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
+ energy += tHatch.maxEUInput();
+ }
+ }
+ for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) {
+ if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
+ energy += tHatch.maxEUInput()*tHatch.Amperes;
+ }
+ }
+ return energy;
+ }
+
//new Method
public final int getMaxEnergyInputTier_EM() {
return getTier(maxEUinputMax);