diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java | 25 |
1 files changed, 19 insertions, 6 deletions
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 6d7862909d..94f03f7fe5 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 @@ -48,6 +48,7 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_OverclockCalculator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Casings8; @@ -527,6 +528,7 @@ public class GT_MetaTileEntity_PCBFactory } long voltage = getMaxInputVoltage(); + long amps = getMaxInputAmps(); int tier = GT_Utility.getTier(voltage); GT_Recipe tRecipe = @@ -582,12 +584,23 @@ public class GT_MetaTileEntity_PCBFactory this.mMaxProgresstime = (int) Math.ceil(tRecipe.mDuration * Math.pow(mRoughnessMultiplier, 2)); if (mOCTier1 || mOCTier2) { - calculateOverclockedNessMultiInternal( - (long) Math.ceil(tRecipe.mEUt * aExtraPower), - (int) Math.ceil(tRecipe.mDuration * Math.pow(mRoughnessMultiplier, 2)), - aCurrentParallel, - V[tier], - mOCTier2); + GT_OverclockCalculator calc = new GT_OverclockCalculator() + .setRecipeEUt(tRecipe.mEUt) + .setDuration(tRecipe.mDuration) + .setEUt(voltage) + .setAmperage(amps) + .setEUtDiscount(aExtraPower) + .setSpeedBoost((float) Math.pow(mRoughnessMultiplier, 2)); + if (mOCTier2) { + calc.enablePerfectOC(); + } + calc.calculate(); + try { + this.lEUt = calc.getConsumption(); + this.mMaxProgresstime = calc.getDuration(); + } catch (Exception e) { + e.printStackTrace(); + } } if (this.lEUt == Long.MAX_VALUE - 1 || this.mProgresstime == Integer.MAX_VALUE - 1) return false; |