diff --git a/AntimatterAPI b/AntimatterAPI index 9f9548ae9..85b160337 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 9f9548ae9be36d2852a3e6dd5c22cbbba06e07d9 +Subproject commit 85b160337819d82589dbb3c3671e59e926cc0956 diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java b/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java index 6c153d02e..78deb5672 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java +++ b/common/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)); } } }