From d05f822e3c52fa2ae60247a597ac99881b88da90 Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Sat, 17 Aug 2024 16:05:46 +0800 Subject: Fix OverclockCalculator (#2901) Co-authored-by: Martin Robertz --- src/main/java/gregtech/api/util/GT_ParallelHelper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/api/util/GT_ParallelHelper.java') diff --git a/src/main/java/gregtech/api/util/GT_ParallelHelper.java b/src/main/java/gregtech/api/util/GT_ParallelHelper.java index 141ea35e9e..157488a8ca 100644 --- a/src/main/java/gregtech/api/util/GT_ParallelHelper.java +++ b/src/main/java/gregtech/api/util/GT_ParallelHelper.java @@ -469,8 +469,8 @@ public class GT_ParallelHelper { // Save the original max parallel before calculating our overclocking under 1 tick int originalMaxParallel = maxParallel; - double tickTimeAfterOC = calculator.setParallel(originalMaxParallel) - .calculateDurationUnderOneTick(); + calculator.setParallel(originalMaxParallel); + double tickTimeAfterOC = calculator.calculateDurationUnderOneTick(); if (tickTimeAfterOC < 1) { maxParallel = GT_Utility.safeInt((long) (maxParallel / tickTimeAfterOC), 0); } @@ -559,12 +559,8 @@ public class GT_ParallelHelper { return; } - long eutUseAfterOC = calculator.calculateEUtConsumptionUnderOneTick(originalMaxParallel, currentParallel); - calculator.setParallel(Math.min(currentParallel, originalMaxParallel)) + calculator.setCurrentParallel(currentParallel) .calculate(); - if (currentParallel > originalMaxParallel) { - calculator.setRecipeEUt(eutUseAfterOC); - } // If Batch Mode is enabled determine how many extra parallels we can get if (batchMode && currentParallel > 0 && calculator.getDuration() < MAX_BATCH_MODE_TICK_TIME) { int tExtraParallels; -- cgit