diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2020-12-13 16:23:59 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2020-12-13 16:24:08 -0800 |
| commit | f3606c5305584bcdb5aabd39e9876e7e3ea801cd (patch) | |
| tree | 0e17fe14466471c8a48e912c5662aa28f8f31e1f /src/main/java/gregtech/common/tileentities/generators | |
| parent | 2ba5c5b7f26a1fcdcb4e03a57015f52f032448db (diff) | |
| download | GT5-Unofficial-f3606c5305584bcdb5aabd39e9876e7e3ea801cd.tar.gz GT5-Unofficial-f3606c5305584bcdb5aabd39e9876e7e3ea801cd.tar.bz2 GT5-Unofficial-f3606c5305584bcdb5aabd39e9876e7e3ea801cd.zip | |
Cache steam fluid IDs on startup and use those instead of string comparisions everywhere.
NOTE: Also drops MFR steam compat
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/generators')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java | 5 |
1 files changed, 2 insertions, 3 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 b248dc5aae..7a1421c3bb 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 @@ -69,8 +69,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener public int getFuelValue(FluidStack aLiquid) { if (aLiquid == null) return 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; + return GT_ModHandler.isAnySteam(aLiquid) ? 3 : 0; } public int consumedFluidPerOperation(FluidStack aLiquid) { @@ -126,7 +125,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener @Override public boolean isFluidInputAllowed(FluidStack aFluid) { - if (aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")) { + if (GT_ModHandler.isSuperHeatedSteam(aFluid)) { aFluid.amount = 0; aFluid = null; return false; |
