diff options
Diffstat (limited to 'src/main/java/goodgenerator')
4 files changed, 9 insertions, 22 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java index 60dd527f83..6cdca4d140 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java @@ -40,7 +40,6 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; import gregtech.api.util.GT_Recipe; public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @@ -215,8 +214,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe, - @NotNull GT_ParallelHelper helper) { + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { long ocFactor = 1L << (Tier - recipe.mSpecialValue); return GT_OverclockCalculator .ofNoOverclock(((long) recipe.mEUt) * ocFactor, (int) Math.max(recipe.mDuration / ocFactor, 1)); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index e555069e16..780305665b 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -90,10 +90,10 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe, - @NotNull GT_ParallelHelper helper) { + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { return GT_OverclockCalculator.ofNoOverclock(recipe) - .setDuration((int) (recipe.mDuration * Math.pow(0.9f, height - 4))); + .setDuration((int) (recipe.mDuration * Math.pow(0.9f, height - 4))) + .setDurationUnderOneTickSupplier(() -> recipe.mDuration * Math.pow(0.9f, height - 4)); } @NotNull diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index c88e1d43f2..26e71a865f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -53,7 +53,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.machines.IDualInputHatch; @@ -222,9 +221,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe, - @NotNull GT_ParallelHelper helper) { - return super.createOverclockCalculator(recipe, helper).setSpeedBoost(0.5F); + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + return super.createOverclockCalculator(recipe).setSpeedBoost(mode == 0 ? 1 : 0.5F); } }.setMaxParallelSupplier(() -> (int) Math.pow(2, 4 + (casingTier + 1))); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index 694ee9e7ac..abedd9ea1c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -433,22 +433,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override protected GT_ParallelHelper createParallelHelper(@NotNull GT_Recipe recipe) { // When the fusion first loads and is still processing, it does the recipe check without consuming. - if (mRunningOnLoad) { - return new GT_ParallelHelper().setRecipe(recipe).setItemInputs(inputItems) - .setFluidInputs(inputFluids).setAvailableEUt(availableVoltage * availableAmperage) - .setMachine(machine, protectItems, protectFluids) - .setRecipeLocked(recipeLockableMachine, isRecipeLocked).setMaxParallel(maxParallel) - .enableBatchMode(batchSize).enableOutputCalculation(); - } - return super.createParallelHelper(recipe); + return super.createParallelHelper(recipe).setConsumption(!mRunningOnLoad); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe, - @NotNull GT_ParallelHelper helper) { - return super.createOverclockCalculator(recipe, helper) - .limitOverclockCount(overclock(recipe.mSpecialValue)); + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + return super.createOverclockCalculator(recipe).limitOverclockCount(overclock(recipe.mSpecialValue)); } @NotNull |