diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_OverclockCalculator.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java index 4dd6325817..f721ffc225 100644 --- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java +++ b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java @@ -383,6 +383,7 @@ public class GT_OverclockCalculator { } private void calculateOverclock() { + duration = (int) Math.ceil(duration * speedBoost); if (noOverclock) { recipeVoltage = calculateFinalRecipeEUt(calculateHeatDiscountMultiplier()); return; @@ -391,7 +392,6 @@ public class GT_OverclockCalculator { throw new IllegalStateException("Tried to calculate overclock with both laser and amperage overclocking"); } double heatDiscountMultiplier = calculateHeatDiscountMultiplier(); - duration = (int) Math.ceil(duration * speedBoost); if (heatOC) { heatOverclockCount = calculateAmountOfHeatOverclocks(); } 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 a52421762e..faceb85e46 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 @@ -560,16 +560,10 @@ public class GT_MetaTileEntity_PCBFactory extends @Nonnull @Override protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { - if (isNoOC()) { - return GT_OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled)) - .setSpeedBoost(getDurationMultiplierFromRoughness()); - } - GT_OverclockCalculator calculator = super.createOverclockCalculator(recipe) + return super.createOverclockCalculator(recipe).setNoOverclock(isNoOC()) .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled)) .setSpeedBoost(getDurationMultiplierFromRoughness()) .setDurationDecreasePerOC(mOCTier2 ? 2 : 1); - return calculator; } @Nonnull |