Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Foid invalid steam in turbines

Browse source
This commit is contained in:
Blood-Asp 2016-12-16 18:34:26 +01:00 committed by Technus
parent 3a8b8bc380
commit d6fd3fd7fa
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
View file

@ -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);
}
}

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
View file

@ -101,6 +101,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
}
achievement = true;
}
}else if(fluidName.equals("ic2.fluidSuperheatedSteam")){
depleteInput(new FluidStack(aFluids.get(i), aFluids.get(i).amount));
}
}