diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-11-22 01:43:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-21 17:43:11 +0000 |
| commit | edf1500f14363ea1887b3754d85a21570806308e (patch) | |
| tree | 6b7a78c2b55f910986f78003ae0be368ac97ec22 /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | f92e38bb6c0145c6f275973cb4fc7a9952eb9974 (diff) | |
| download | GT5-Unofficial-edf1500f14363ea1887b3754d85a21570806308e.tar.gz GT5-Unofficial-edf1500f14363ea1887b3754d85a21570806308e.tar.bz2 GT5-Unofficial-edf1500f14363ea1887b3754d85a21570806308e.zip | |
Fix some incorrect parallel calculation (#3517)
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java index 382400c3b1..30c0a388bc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java @@ -349,7 +349,7 @@ public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEAssemblyL batchMultiplierMax = Math .min(batchMultiplierMax, (double) currentParallel / maxParallelBeforeBatchMode); } - int finalParallel = (int) (batchMultiplierMax * maxParallelBeforeBatchMode); + int finalParallel = (int) (batchMultiplierMax * currentParallelBeforeBatchMode); lEUt = calculator.getConsumption(); mMaxProgresstime = (int) (calculator.getDuration() * batchMultiplierMax); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java index e369126895..1f131af692 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java @@ -334,7 +334,7 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI batchMultiplierMax = Math.min(batchMultiplierMax, (double) currentParallel / maxParallelBeforeBatchMode); } - int finalParallel = (int) (batchMultiplierMax * maxParallelBeforeBatchMode); + int finalParallel = (int) (batchMultiplierMax * currentParallelBeforeBatchMode); // for scanner setCurrentParallelism(finalParallel); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java index 7227e022e5..5dab48aba0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java @@ -198,7 +198,7 @@ public class MTEMultiFurnace extends MTEAbstractMultiFurnace<MTEMultiFurnace> im batchMultiplierMax = (double) getMaxBatchSize() / calculator.getDuration(); batchMultiplierMax = Math.min(batchMultiplierMax, (double) currentParallel / maxParallelBeforeBatchMode); } - int finalParallel = (int) (batchMultiplierMax * maxParallelBeforeBatchMode); + int finalParallel = (int) (batchMultiplierMax * currentParallelBeforeBatchMode); // Consume inputs and generate outputs ArrayList<ItemStack> smeltedOutputs = new ArrayList<>(); |