From ebefc70b6d41c19c61fc21f548a942a0331f7fb6 Mon Sep 17 00:00:00 2001
From: joegnis <joegnis.yifan@gmail.com>
Date: Wed, 4 Sep 2024 06:53:16 -0400
Subject: Fixes #17207 (#3041)

Changed methods in OverclockCalculator:
- setEUtDiscount
- setSpeedBoost
- setHeatDiscountMultiplier
Most of other changes are directly related to them.
Adds a unit test.

Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 src/main/java/gregtech/api/logic/AbstractProcessingLogic.java     | 8 ++++----
 src/main/java/gregtech/api/util/OverclockCalculator.java          | 6 +++---
 src/main/java/gregtech/api/util/ParallelHelper.java               | 4 ++--
 .../common/tileentities/machines/multi/MTEPCBFactory.java         | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/main/java/gregtech')

diff --git a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
index ed953d9477..af86e7a9fa 100644
--- a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
@@ -39,8 +39,8 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
     protected Supplier<Integer> maxParallelSupplier;
     protected int calculatedParallels = 0;
     protected int batchSize = 1;
-    protected float euModifier = 1.0f;
-    protected float speedBoost = 1.0f;
+    protected double euModifier = 1.0;
+    protected double speedBoost = 1.0;
     protected boolean amperageOC = true;
     protected boolean isCleanroom;
 
@@ -100,12 +100,12 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
         return getThis();
     }
 
-    public P setEuModifier(float modifier) {
+    public P setEuModifier(double modifier) {
         this.euModifier = modifier;
         return getThis();
     }
 
-    public P setSpeedBonus(float speedModifier) {
+    public P setSpeedBonus(double speedModifier) {
         this.speedBoost = speedModifier;
         return getThis();
     }
diff --git a/src/main/java/gregtech/api/util/OverclockCalculator.java b/src/main/java/gregtech/api/util/OverclockCalculator.java
index 0b27942355..55ac79f730 100644
--- a/src/main/java/gregtech/api/util/OverclockCalculator.java
+++ b/src/main/java/gregtech/api/util/OverclockCalculator.java
@@ -251,7 +251,7 @@ public class OverclockCalculator {
      * Sets an EUtDiscount. 0.9 is 10% less energy. 1.1 is 10% more energy
      */
     @Nonnull
-    public OverclockCalculator setEUtDiscount(float aEUtDiscount) {
+    public OverclockCalculator setEUtDiscount(double aEUtDiscount) {
         this.eutDiscount = aEUtDiscount;
         return this;
     }
@@ -260,7 +260,7 @@ public class OverclockCalculator {
      * Sets a Speed Boost for the multiblock. 0.9 is 10% faster. 1.1 is 10% slower
      */
     @Nonnull
-    public OverclockCalculator setSpeedBoost(float aSpeedBoost) {
+    public OverclockCalculator setSpeedBoost(double aSpeedBoost) {
         this.speedBoost = aSpeedBoost;
         return this;
     }
@@ -279,7 +279,7 @@ public class OverclockCalculator {
      * Discount
      */
     @Nonnull
-    public OverclockCalculator setHeatDiscountMultiplier(float heatDiscountExponent) {
+    public OverclockCalculator setHeatDiscountMultiplier(double heatDiscountExponent) {
         this.heatDiscountExponent = heatDiscountExponent;
         return this;
     }
diff --git a/src/main/java/gregtech/api/util/ParallelHelper.java b/src/main/java/gregtech/api/util/ParallelHelper.java
index 0c995cba7d..de08a59472 100644
--- a/src/main/java/gregtech/api/util/ParallelHelper.java
+++ b/src/main/java/gregtech/api/util/ParallelHelper.java
@@ -121,7 +121,7 @@ public class ParallelHelper {
     /**
      * Modifier which is applied on the recipe eut. Useful for GT++ machines
      */
-    private float eutModifier = 1;
+    private double eutModifier = 1;
     /**
      * Multiplier that is applied on the output chances
      */
@@ -224,7 +224,7 @@ public class ParallelHelper {
      * Sets the modifier for recipe eut. 1 does nothing 0.9 is 10% less. 1.1 is 10% more
      */
     @Nonnull
-    public ParallelHelper setEUtModifier(float aEUtModifier) {
+    public ParallelHelper setEUtModifier(double aEUtModifier) {
         this.eutModifier = aEUtModifier;
         return this;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
index e7221ef4e1..e815c10a03 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
@@ -571,7 +571,7 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase<MTEPCBFactory>
             @Override
             protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) {
                 return super.createOverclockCalculator(recipe).setNoOverclock(isNoOC())
-                    .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled))
+                    .setEUtDiscount(Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled))
                     .setSpeedBoost(getDurationMultiplierFromRoughness())
                     .setDurationDecreasePerOC(mOCTier2 ? 4.0 : 2.0);
             }
@@ -590,8 +590,8 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase<MTEPCBFactory>
         return !mOCTier1 && !mOCTier2;
     }
 
-    private float getDurationMultiplierFromRoughness() {
-        return (float) Math.pow(mRoughnessMultiplier, 2);
+    private double getDurationMultiplierFromRoughness() {
+        return Math.pow(mRoughnessMultiplier, 2);
     }
 
     private int ticker = 0;
-- 
cgit