aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java13
2 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
index 86ef944a71..955872e596 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
@@ -175,6 +175,10 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<
return GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
}
+ public long getAverageInputVoltage() {
+ return GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+ }
+
public long getMaxInputAmps() {
return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList());
}
diff --git a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
index 8fbb79faff..820ec07487 100644
--- a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
+++ b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
@@ -58,7 +58,7 @@ public class GT_ExoticEnergyInputHelper {
}
public static long getTotalEuMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
- return getMaxWorkingInputAmpsMulti(hatches) * getMaxInputVoltageMulti(hatches);
+ return getMaxWorkingInputAmpsMulti(hatches) * getAverageInputVoltageMulti(hatches);
}
public static long getMaxInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
@@ -69,6 +69,17 @@ public class GT_ExoticEnergyInputHelper {
return rVoltage;
}
+ public static long getAverageInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
+ long rVoltage = 0;
+ if (hatches.size() <= 0) {
+ return rVoltage;
+ }
+ for (GT_MetaTileEntity_Hatch tHatch : hatches)
+ if (isValidMetaTileEntity(tHatch))
+ rVoltage += tHatch.getBaseMetaTileEntity().getInputVoltage();
+ return rVoltage / hatches.size();
+ }
+
public static long getMaxInputAmpsMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) {
long rAmp = 0;
for (GT_MetaTileEntity_Hatch tHatch : hatches)