diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-07 21:37:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-07 21:37:43 +0200 |
commit | fe53125e3c45a73c86c5e835a779e7f8206aa2f2 (patch) | |
tree | d090a51c26bcdce2e7ea5731d6e132fe600c9db4 /src | |
parent | 543dd4a60fe6517940b6eaaaecfe85cafb7d826d (diff) | |
download | GT5-Unofficial-fe53125e3c45a73c86c5e835a779e7f8206aa2f2.tar.gz GT5-Unofficial-fe53125e3c45a73c86c5e835a779e7f8206aa2f2.tar.bz2 GT5-Unofficial-fe53125e3c45a73c86c5e835a779e7f8206aa2f2.zip |
Fix waterline bugs (#3107)
Diffstat (limited to 'src')
2 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java index 263590f184..ffb929074a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java @@ -318,7 +318,7 @@ public abstract class MTEPurificationUnitBase<T extends MTEExtendedPowerMultiBlo public FluidStack getWaterBoostAmount(GTRecipe recipe) { // Recipes should always be constructed so that output water is always the first fluid output FluidStack outputWater = recipe.mFluidOutputs[0]; - int amount = Math.round(outputWater.amount * WATER_BOOST_NEEDED_FLUID); + int amount = Math.round(outputWater.amount * WATER_BOOST_NEEDED_FLUID * this.effectiveParallel); return new FluidStack(outputWater.getFluid(), amount); } @@ -337,11 +337,15 @@ public abstract class MTEPurificationUnitBase<T extends MTEExtendedPowerMultiBlo /** * Consumes all <b>fluid</b> inputs of the current recipe. + * Should only scale the first fluid input with water */ public void depleteRecipeInputs() { - for (FluidStack input : this.currentRecipe.mFluidInputs) { + for (int i = 0; i < this.currentRecipe.mFluidInputs.length; ++i) { + FluidStack input = this.currentRecipe.mFluidInputs[i]; FluidStack copyWithParallel = input.copy(); - copyWithParallel.amount = input.amount * effectiveParallel; + if (i == 0) { + copyWithParallel.amount = input.amount * effectiveParallel; + } this.depleteInput(copyWithParallel); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java index f1d3b56fe8..bf221d6973 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java @@ -261,8 +261,7 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur for (FluidStack fluid : this.storedFluids) { if (fluid.isFluidEqual(Materials.Ozone.getGas(1L))) { if (fluid.amount > MAX_OZONE_GAS_FOR_EXPLOSION) { - // TODO: Fix crash in hatch - // this.explodeMultiblock(); + this.explodeMultiblock(); } } } |