hopefully fixed overclocking issues with blast furnace, updated antim…

…atter
GregTech-Intergalactical · Jul 4, 2024 · 02e5e6f · 02e5e6f
1 parent 625ae7e
commit 02e5e6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/...on/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java b/...on/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java
@@ -22,8 +22,8 @@ protected void calculateDurations() {
                 super.calculateDurations();
                 maxProgress = activeRecipe.getDuration();
                 overclock = 0;
-                //Divide by 2, for amps.
-                int tier = Utils.getVoltageTier(getMaxInputVoltage() / 2);
+                long voltage = getMaxInputVoltage();
+                int tier = Math.max(1, Utils.getVoltageTier(voltage));
                 int recipeTier = Utils.getVoltageTier(activeRecipe.getPower());
                 if (recipeTier == tier) {
                     EUt = activeRecipe.getPower();
@@ -37,10 +37,14 @@ protected void calculateDurations() {
                     } else {
                         EUt = activeRecipe.getPower();
                         maxProgress = activeRecipe.getDuration();
-                        for (int i = 2; i < Ref.V.length; i += 2) {
-                            if (EUt > Ref.V[tier - 1]) break;
+                        int i = 2;
+                        while (EUt <= Ref.V[tier - 1]){
                             EUt *= 4;
                             maxProgress /= (heatDiv >= i ? 4 : 2);
+                            i += 2;
+                        }
+                        if (heatDiv > 0){
+                            EUt = (long) (EUt * Math.pow(0.95, heatDiv));
                         }
                     }
                 }