aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGDCloud <93287602+GDCloudstrike@users.noreply.github.com>2023-01-12 17:37:48 +0100
committerGitHub <noreply@github.com>2023-01-12 17:37:48 +0100
commit3a123c3eb03e799a41b0c5c6afc74b9b3715c825 (patch)
tree01499b742cd300a15a61b431624d934e54f7c60a /src
parentbca969349fc7db4ff20eeb78ae956e2142683b43 (diff)
downloadGT5-Unofficial-3a123c3eb03e799a41b0c5c6afc74b9b3715c825.tar.gz
GT5-Unofficial-3a123c3eb03e799a41b0c5c6afc74b9b3715c825.tar.bz2
GT5-Unofficial-3a123c3eb03e799a41b0c5c6afc74b9b3715c825.zip
Fix volcanus batch mode (#493)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index 4e1844f539..9f0edb810d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -329,6 +329,19 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
return false;
}
+ if (mUseMultiparallelMode) {
+ int extraParallelRecipes = 0;
+ for (;
+ extraParallelRecipes + parallelRecipes < aMaxParallelRecipes * MAX_BATCH_SIZE;
+ extraParallelRecipes++) {
+ if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
+ break;
+ }
+ }
+ batchMultiplier = 1.0f + (float) extraParallelRecipes / aMaxParallelRecipes;
+ parallelRecipes += extraParallelRecipes;
+ }
+
// -- Try not to fail after this point - inputs have already been consumed! --
// Convert speed bonus to duration multiplier
@@ -367,6 +380,10 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+ if (mUseMultiparallelMode) {
+ mMaxProgresstime = (int) Math.ceil(mMaxProgresstime * batchMultiplier);
+ }
+
// Collect fluid outputs
FluidStack[] tOutputFluids = new FluidStack[tRecipe.mFluidOutputs.length];
for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) {