From f432925ec37fafc51a03bfa407f784aedb54c09c Mon Sep 17 00:00:00 2001
From: HoleFish <48403212+HoleFish@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:33:23 +0800
Subject: Remove old integer methods in OC calculator and parallel helper
 (#2779)

remove old integer method
---
 .../blocks/tileEntity/FuelRefineFactory.java         |  2 +-
 .../gregtech/api/logic/AbstractProcessingLogic.java  | 12 ++++--------
 ...T_MetaTileEntity_ExtendedPowerMultiBlockBase.java |  2 +-
 .../GT_MetaTileEntity_MultiBlockBase.java            |  2 +-
 .../overclockdescriber/FusionOverclockDescriber.java |  8 ++++----
 .../api/util/AdvancedFusionOverclockDescriber.java   |  8 ++++----
 .../gregtech/api/util/GT_OverclockCalculator.java    | 20 --------------------
 .../basic/GT_MetaTileEntity_Massfabricator.java      |  2 +-
 .../machines/multi/GT_MetaTileEntity_NanoForge.java  |  2 +-
 .../machines/multi/GT_MetaTileEntity_PCBFactory.java |  2 +-
 .../GregtechMetaTileEntity_Adv_Fusion_MK4.java       |  2 +-
 .../GregtechMetaTileEntity_Adv_Fusion_MK5.java       |  2 +-
 12 files changed, 20 insertions(+), 44 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
index d8ae889037..d8868bec74 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
@@ -260,7 +260,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E
                 int overclockAmount = Tier - recipe.mSpecialValue;
                 return super.createOverclockCalculator(recipe).limitOverclockCount(overclockAmount);
             }
-        }.setOverclock(1, 1); // Set Overclock to be 2/2
+        }.setOverclock(2.0, 2.0); // Set Overclock to be 2/2
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
index ae78bbacc2..3c05d8bed0 100644
--- a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
@@ -31,8 +31,8 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
     protected int duration;
     protected long availableVoltage;
     protected long availableAmperage;
-    protected int overClockTimeReduction = 1;
-    protected int overClockPowerIncrease = 2;
+    protected double overClockTimeReduction = 2.0;
+    protected double overClockPowerIncrease = 4.0;
     protected boolean protectItems;
     protected boolean protectFluids;
     protected int maxParallel = 1;
@@ -159,11 +159,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
         return getThis();
     }
 
-    /**
-     * Sets custom overclock ratio. 2/4 by default.
-     * Parameters represent number of bit shift, so 1 -> 2x, 2 -> 4x.
-     */
-    public P setOverclock(int timeReduction, int powerIncrease) {
+    public P setOverclock(double timeReduction, double powerIncrease) {
         this.overClockTimeReduction = timeReduction;
         this.overClockPowerIncrease = powerIncrease;
         return getThis();
@@ -173,7 +169,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
      * Sets overclock ratio to 4/4.
      */
     public P enablePerfectOverclock() {
-        return this.setOverclock(2, 2);
+        return this.setOverclock(4.0, 4.0);
     }
 
     /**
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 b7f34f264c..f430114319 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
@@ -62,7 +62,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT
         GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(maxInputVoltage * mAmperage)
             .setDuration(aDuration)
-            .setDurationDecreasePerOC(perfectOC ? 2 : 1)
+            .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
             .calculate();
         lEUt = calculator.getConsumption();
         mMaxProgresstime = calculator.getDuration();
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 ff70633e7d..44e3e4bd52 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
@@ -1192,7 +1192,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
         GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(aEUt)
             .setEUt(V[tier] * mAmperage)
             .setDuration(aDuration)
-            .setDurationDecreasePerOC(perfectOC ? 2 : 1)
+            .setDurationDecreasePerOC(perfectOC ? 4.0 : 2.0)
             .calculate();
         mEUt = (int) calculator.getConsumption();
         mMaxProgresstime = calculator.getDuration();
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
index 8f64f3146e..b570ebcab5 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
@@ -30,12 +30,12 @@ public class FusionOverclockDescriber extends EUOverclockDescriber {
             .setDurationDecreasePerOC(getDurationDecreasePerOC());
     }
 
-    protected int getEUtIncreasePerOC() {
-        return 1;
+    protected double getEUtIncreasePerOC() {
+        return 2.0;
     }
 
-    protected int getDurationDecreasePerOC() {
-        return 1;
+    protected double getDurationDecreasePerOC() {
+        return 2.0;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/util/AdvancedFusionOverclockDescriber.java b/src/main/java/gregtech/api/util/AdvancedFusionOverclockDescriber.java
index 7a6e609f93..606716310f 100644
--- a/src/main/java/gregtech/api/util/AdvancedFusionOverclockDescriber.java
+++ b/src/main/java/gregtech/api/util/AdvancedFusionOverclockDescriber.java
@@ -13,11 +13,11 @@ public class AdvancedFusionOverclockDescriber extends FusionOverclockDescriber {
     }
 
     @Override
-    protected int getEUtIncreasePerOC() {
-        return 2;
+    protected double getEUtIncreasePerOC() {
+        return 4.0;
     }
 
-    protected int getDurationDecreasePerOC() {
-        return 2;
+    protected double getDurationDecreasePerOC() {
+        return 4.0;
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
index 3a08988339..91cdf865ad 100644
--- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
+++ b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
@@ -294,16 +294,6 @@ public class GT_OverclockCalculator {
         return this;
     }
 
-    /**
-     * @deprecated Deprecated in favor of {@link #setEUtIncreasePerOC(double)}. Calls
-     *             {@link #setEUtIncreasePerOC(double)} where the given value is 2^eutIncreasePerOC
-     */
-    @Deprecated
-    @Nonnull
-    public GT_OverclockCalculator setEUtIncreasePerOC(int eutIncreasePerOC) {
-        return setEUtIncreasePerOC(Math.pow(2, eutIncreasePerOC));
-    }
-
     /**
      * Sets the amount that the eut would be multiplied by per overclock. Do not set as 1(ONE) if the duration decrease
      * is also 1(ONE)!
@@ -316,16 +306,6 @@ public class GT_OverclockCalculator {
         return this;
     }
 
-    /**
-     * @deprecated Deprecated in favor of {@link #setDurationDecreasePerOC(double)}. Calls
-     *             {@link #setDurationDecreasePerOC(double)} where the given value is 2^durationDecreasePerOC
-     */
-    @Deprecated
-    @Nonnull
-    public GT_OverclockCalculator setDurationDecreasePerOC(int durationDecreasePerOC) {
-        return setDurationDecreasePerOC(Math.pow(2, durationDecreasePerOC));
-    }
-
     /**
      * Sets the amount that the duration would be divided by per overclock. Do not set as 1(ONE) if the eut increase is
      * also 1(ONE)!
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index 07e9977429..ef0914f6a4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -206,7 +206,7 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
         @Override
         public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
             return super.createCalculator(template, recipe).setEUt(Ints.saturatedCast(V[tier] * amperage))
-                .setEUtIncreasePerOC(1)
+                .setEUtIncreasePerOC(2.0)
                 .limitOverclockCount(tier - 1)
                 .setOneTickDiscount(false);
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
index 4b0dc16943..adceabd70c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
@@ -247,7 +247,7 @@ public class GT_MetaTileEntity_NanoForge extends
             @Override
             protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) {
                 return super.createOverclockCalculator(recipe)
-                    .setDurationDecreasePerOC(mSpecialTier > recipe.mSpecialValue ? 2 : 1);
+                    .setDurationDecreasePerOC(mSpecialTier > recipe.mSpecialValue ? 4.0 : 2.0);
             }
         };
     }
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 cf57691f24..ada01bc002 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
@@ -574,7 +574,7 @@ public class GT_MetaTileEntity_PCBFactory extends
                 return super.createOverclockCalculator(recipe).setNoOverclock(isNoOC())
                     .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled))
                     .setSpeedBoost(getDurationMultiplierFromRoughness())
-                    .setDurationDecreasePerOC(mOCTier2 ? 2 : 1);
+                    .setDurationDecreasePerOC(mOCTier2 ? 4.0 : 2.0);
             }
 
             @Nonnull
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index 0981a34b85..11f56cbd13 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -120,7 +120,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
 
     @Override
     protected ProcessingLogic createProcessingLogic() {
-        return super.createProcessingLogic().setOverclock(2, 2);
+        return super.createProcessingLogic().enablePerfectOverclock();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
index b2c2e5eb27..9b0dce3674 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java
@@ -120,7 +120,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus
 
     @Override
     protected ProcessingLogic createProcessingLogic() {
-        return super.createProcessingLogic().setOverclock(2, 2);
+        return super.createProcessingLogic().enablePerfectOverclock();
     }
 
     @Override
-- 
cgit