aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/generators
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-12-16 18:34:26 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2016-12-16 18:34:26 +0100
commitf0ff2a6cfce37437e3807f5f649be13704f674b9 (patch)
tree3e5c613d3a1dc22af24eac17b76bea369c9eb002 /src/main/java/gregtech/common/tileentities/generators
parentcca28f29fae75505d28c2f7ca380954cfda69356 (diff)
downloadGT5-Unofficial-f0ff2a6cfce37437e3807f5f649be13704f674b9.tar.gz
GT5-Unofficial-f0ff2a6cfce37437e3807f5f649be13704f674b9.tar.bz2
GT5-Unofficial-f0ff2a6cfce37437e3807f5f649be13704f674b9.zip
Void wrong type of steam inserted into steam turbines.
Prevents getting stuck on superheated/normal steam change.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/generators')
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
index 8d27bd3fd9..99bbe17508 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
@@ -56,7 +56,8 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
}
public int getFuelValue(FluidStack aLiquid) {
- return GT_ModHandler.isSteam(aLiquid) ? 3 : 0;
+ String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);
+ return GT_ModHandler.isSteam(aLiquid) || fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name") ? 3 : 0;
}
public int consumedFluidPerOperation(FluidStack aLiquid) {
@@ -109,4 +110,14 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
public int getPollution() {
return 0;
}
+
+ @Override
+ public boolean isFluidInputAllowed(FluidStack aFluid) {
+ if(aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")){
+ aFluid.amount=0;
+ aFluid = null;
+ return false;
+ }
+ return super.isFluidInputAllowed(aFluid);
+ }
}