aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-01-27 20:40:58 +0100
committerGitHub <noreply@github.com>2023-01-27 20:40:58 +0100
commit93d1cdecffb02c3b92801317fd1ae9f7378dec3d (patch)
tree52ed4998bfcf495a0a0aa3618fa29d4d0a905f28 /src/main
parent09ebf8a3deb8e2cfb7efce1fefed63c445b78bf1 (diff)
downloadGT5-Unofficial-93d1cdecffb02c3b92801317fd1ae9f7378dec3d.tar.gz
GT5-Unofficial-93d1cdecffb02c3b92801317fd1ae9f7378dec3d.tar.bz2
GT5-Unofficial-93d1cdecffb02c3b92801317fd1ae9f7378dec3d.zip
Replace max voltage with avg voltage (#1694)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java4
2 files changed, 3 insertions, 3 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 feba14b10d..329ba45df5 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
@@ -141,7 +141,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<
maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity();
}
}
- long voltage = getMaxInputVoltage();
+ long voltage = getAverageInputVoltage();
long amps = getMaxInputAmps();
return new String[] {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
index 3c3d2cd0fe..06969bb55b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
@@ -529,7 +529,7 @@ public class GT_MetaTileEntity_PCBFactory
return false;
}
- long voltage = getMaxInputVoltage();
+ long voltage = getAverageInputVoltage();
long amps = getMaxInputAmps();
int tier = GT_Utility.getTier(voltage);
@@ -873,7 +873,7 @@ public class GT_MetaTileEntity_PCBFactory
maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity();
}
}
- long voltage = getMaxInputVoltage();
+ long voltage = getAverageInputVoltage();
long amps = getMaxInputAmps();
return new String[] {