diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/ggfab/mte/MTEAdvAssLine.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/OverclockCalculator.java | 2 |
2 files changed, 6 insertions, 7 deletions
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<MTEAdvAssLine> 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<MTEAdvAssLine> } } + endRecipeProcessing(); + boolean foundWorking = false; int working = 0; for (Slice slice : slices) { @@ -606,10 +605,9 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> } } } else { - if (!super.onRunningTick(aStack)) return false; + return super.onRunningTick(aStack); } - endRecipeProcessing(); return true; } @@ -770,7 +768,8 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> .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(); diff --git a/src/main/java/gregtech/api/util/OverclockCalculator.java b/src/main/java/gregtech/api/util/OverclockCalculator.java index e6e775b397..28175c7b8c 100644 --- a/src/main/java/gregtech/api/util/OverclockCalculator.java +++ b/src/main/java/gregtech/api/util/OverclockCalculator.java @@ -86,7 +86,7 @@ public class OverclockCalculator { /** * How many overclocks have been performed */ - private int overclockCount; + private int overclockCount = 0; /** * Should we actually try to calculate overclocking */ |