aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-12-19 10:44:39 +0900
committerGitHub <noreply@github.com>2023-12-19 10:44:39 +0900
commit94a6311f63d9ac34d353449cc7fe8e72269a5a8d (patch)
tree4ec3ca1e9f984e52da98bbf1444218faff7697ca /src/main/java/gregtech/api/metatileentity/implementations
parent59abd3c216d6e283738dc009ddcf67bbabb3d93e (diff)
downloadGT5-Unofficial-94a6311f63d9ac34d353449cc7fe8e72269a5a8d.tar.gz
GT5-Unofficial-94a6311f63d9ac34d353449cc7fe8e72269a5a8d.tar.bz2
GT5-Unofficial-94a6311f63d9ac34d353449cc7fe8e72269a5a8d.zip
Fix logic with old OC calculation code (#2408)
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index d23042bb61..645654c609 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -1130,13 +1130,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
* @param aEUt - recipe EUt
* @param aDuration - recipe Duration
* @param mAmperage - should be 1 ?
- * @param maxInputVoltage - Multiblock Max input voltage
+ * @param maxInputVoltage - Multiblock Max input voltage. Voltage is rounded up to higher tier voltage.
* @param perfectOC - If the Multiblock OCs perfectly, i.e. the large Chemical Reactor
*/
protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage,
boolean perfectOC) {
+ byte tier = (byte) Math.max(0, GT_Utility.getTier(maxInputVoltage));
GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
- .setEUt(maxInputVoltage * mAmperage)
+ .setEUt(V[tier] * mAmperage)
.setDuration(aDuration)
.setDurationDecreasePerOC(perfectOC ? 2 : 1)
.calculate();