aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-01-14 20:34:15 +0100
committerGitHub <noreply@github.com>2023-01-14 20:34:15 +0100
commit65986ca1419944e1cf14cd39683dd9d723ac6993 (patch)
tree5384bd98e0a2006526a96db417b23c09c12b04b8 /src/main/java/gregtech/api/util
parent834c0b4712a6e533df24d959a48d470db803cf78 (diff)
downloadGT5-Unofficial-65986ca1419944e1cf14cd39683dd9d723ac6993.tar.gz
GT5-Unofficial-65986ca1419944e1cf14cd39683dd9d723ac6993.tar.bz2
GT5-Unofficial-65986ca1419944e1cf14cd39683dd9d723ac6993.zip
Added getter for average voltage (#1653)
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java13
1 files changed, 12 insertions, 1 deletions
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)