diff options
author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-08-17 16:05:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-17 10:05:46 +0200 |
commit | d05f822e3c52fa2ae60247a597ac99881b88da90 (patch) | |
tree | 4f757a9a13bff224773550a7e6bd8fd8174b35e5 /src/main/java/gregtech/api/util/GT_ParallelHelper.java | |
parent | 062512e720dec0e5cf24f18d84c1810990707ab1 (diff) | |
download | GT5-Unofficial-d05f822e3c52fa2ae60247a597ac99881b88da90.tar.gz GT5-Unofficial-d05f822e3c52fa2ae60247a597ac99881b88da90.tar.bz2 GT5-Unofficial-d05f822e3c52fa2ae60247a597ac99881b88da90.zip |
Fix OverclockCalculator (#2901)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_ParallelHelper.java')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_ParallelHelper.java | 10 |
1 files changed, 3 insertions, 7 deletions
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; |