From dc23a7a10700aff9cb9675e1b989928886217121 Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:10:35 +0800 Subject: Fix AAL (#3380) Co-authored-by: Martin Robertz --- src/main/java/ggfab/mte/MTEAdvAssLine.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/java/ggfab/mte/MTEAdvAssLine.java') diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index c3cf42146f..18ab96b680 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -200,9 +200,6 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase private int currentInputLength; private String lastStopReason = ""; private int currentRecipeParallel = 1; - // Batch mode will increase parallel per slice to try to get as close as possible to this amount of ticks - // per slice, but will never go over this amount. - private static final int BATCH_MODE_DESIRED_TICKS_PER_SLICE = 128; public MTEAdvAssLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -583,6 +580,8 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase } } + endRecipeProcessing(); + boolean foundWorking = false; int working = 0; for (Slice slice : slices) { @@ -606,10 +605,9 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase } } } else { - if (!super.onRunningTick(aStack)) return false; + return super.onRunningTick(aStack); } - endRecipeProcessing(); return true; } @@ -770,7 +768,8 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase .setEUt(inputVoltage); if (!mExoticEnergyHatches.isEmpty()) { - normalOCCalculator.setCurrentParallel((int) (1 / normalOCCalculator.calculateDurationUnderOneTick())) + normalOCCalculator + .setCurrentParallel((int) Math.max(1 / normalOCCalculator.calculateDurationUnderOneTick(), 1)) .calculate(); int normalOverclockCount = normalOCCalculator.getPerformedOverclocks(); -- cgit