diff options
| author | Alex Bee <a.bramley@gmail.com> | 2023-06-21 16:14:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-21 17:14:47 +0200 |
| commit | 2620d126f9cc24c99ea7545410d6c363e007ba00 (patch) | |
| tree | 67924e9d1dd1da900fcd3b5382df7fd50ee9125b | |
| parent | d78e28ef3938d7dfe83a7d2cc07496e99b350436 (diff) | |
| download | GT5-Unofficial-2620d126f9cc24c99ea7545410d6c363e007ba00.tar.gz GT5-Unofficial-2620d126f9cc24c99ea7545410d6c363e007ba00.tar.bz2 GT5-Unofficial-2620d126f9cc24c99ea7545410d6c363e007ba00.zip | |
MassFab: Set efficiency in SCRAP mode. Fixes #12805. (#676)
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index 49490aa97e..58a477b2a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -297,8 +297,8 @@ public class GregtechMetaTileEntity_MassFabricator 0); GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) - .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) - .enableConsumption().enableOutputCalculation().setController(this); + .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setEUtModifier(aEUPercent / 100.0f) + .setMaxParallel(aMaxParallelRecipes).enableConsumption().enableOutputCalculation().setController(this); if (batchMode) { helper.enableBatchMode(128); @@ -310,9 +310,13 @@ public class GregtechMetaTileEntity_MassFabricator return false; } + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + 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()); |