diff options
| author | BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> | 2023-02-02 01:05:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 00:05:32 +0100 |
| commit | cc9db2de0b8a7dbb60e689e990ba7b621bdade5a (patch) | |
| tree | 366495a39c54fa8f34be553506d3e528e584fd9c /src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations | |
| parent | 7eabfb342833550857b074d4d9f23073d7ba3037 (diff) | |
| download | GT5-Unofficial-cc9db2de0b8a7dbb60e689e990ba7b621bdade5a.tar.gz GT5-Unofficial-cc9db2de0b8a7dbb60e689e990ba7b621bdade5a.tar.bz2 GT5-Unofficial-cc9db2de0b8a7dbb60e689e990ba7b621bdade5a.zip | |
Fix batch mode parallels. Fix Elemental duplicator not working (#523)
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 84641bd357..75bb0ce94f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -696,7 +696,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy) .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f) - .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent)).setParallel(helper.getCurrentParallel()) + .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent)) + .setParallel((int) Math.floor(helper.getCurrentParallel() / helper.getDurationMultiplier())) .calculate(); lEUt = -calculator.getConsumption(); mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier()); @@ -903,7 +904,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy) .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f) .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent)) - .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate(); + .setParallel((int) Math.floor(helper.getCurrentParallel() / helper.getDurationMultiplier())) + .calculate(); lEUt = -calculator.getConsumption(); mMaxProgresstime = (int) Math.ceil(mMaxProgresstime * helper.getDurationMultiplier()); |