aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common
diff options
context:
space:
mode:
authorDerekCHAN <DeckerCHAN@gmail.com>2015-08-22 23:37:57 +0800
committerDerekCHAN <DeckerCHAN@gmail.com>2015-08-22 23:37:57 +0800
commit08b28cbb655e68f3f524dd9b9f28356b1423f420 (patch)
tree1815bf6539a331fe81fb5b913caa3c9b0efdc7bd /main/java/gregtech/common
parent4263f3b43f1009df01574ce84c4dcc8e8aeed82c (diff)
downloadGT5-Unofficial-08b28cbb655e68f3f524dd9b9f28356b1423f420.tar.gz
GT5-Unofficial-08b28cbb655e68f3f524dd9b9f28356b1423f420.tar.bz2
GT5-Unofficial-08b28cbb655e68f3f524dd9b9f28356b1423f420.zip
Fixed large steam turbine do not consume steam.
Large steam turbine do not consume steam as MFR installed. Simply caused by MFR changed regular steam "fluid.steam" to "fluid.mfr.steam.still.name".
Diffstat (limited to 'main/java/gregtech/common')
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 535069b333..e6c252c43e 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -72,8 +72,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios.
for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals.
- if (aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("fluid.steam")
- || aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("ic2.fluidSteam")) {
+ String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i));
+ if (fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name")) {
flow = aFluids.get(i).amount; // Get all (steam) in hatch
flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount