Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Steam generation

Browse source 
Closes #104
This commit is contained in:
TheDarkDnKTv 2021-04-13 10:14:23 +03:00
parent 10ef9a777b
commit 08170fcc21
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtechmod/api/util/GT_ModHandler.java
View file

@ -88,7 +88,7 @@ public class GT_ModHandler {
*/ */
public static boolean isSteam(FluidStack aLiquid) { public static boolean isSteam(FluidStack aLiquid) {
if (aLiquid == null) return false; if (aLiquid == null) return false;
return aLiquid.isFluidEqual(getSteam(1)); return aLiquid.isFluidEqual(getSteam(1)) || aLiquid.isFluidEqual(getIC2Steam(1));
} }
/** /**

1
src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_Multi_ThermalBoiler.java
View file

@ -274,6 +274,7 @@ public class GT_MetaTileEntity_Multi_ThermalBoiler extends MTEWorkableMultiblock
protected void addSteam(List<FluidStack> fluids, int amount) { protected void addSteam(List<FluidStack> fluids, int amount) {
FluidStack steam = GT_ModHandler.getSteam(amount); FluidStack steam = GT_ModHandler.getSteam(amount);
if (steam == null) steam = GT_ModHandler.getIC2Steam(amount);
for (int i = 0; i < fluids.size(); i++) { for (int i = 0; i < fluids.size(); i++) {
FluidStack slot = fluids.get(i); FluidStack slot = fluids.get(i);
if (slot == null) { if (slot == null) {

8
src/main/java/gregtechmod/common/tileentities/machines/steam/GT_MetaTileEntity_Boiler_Bronze.java
View file

@ -127,12 +127,16 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_BasicTank
} }
mFluid[0].amount--; mFluid[0].amount--;
if (mSteam == null) { if (mSteam == null) {
mSteam = GT_ModHandler.getSteam(150); FluidStack steam = GT_ModHandler.getSteam(150);
if (steam == null) steam = GT_ModHandler.getIC2Steam(150);
mSteam = steam;
} else { } else {
if (GT_ModHandler.isSteam(mSteam)) { if (GT_ModHandler.isSteam(mSteam)) {
mSteam.amount+=150; mSteam.amount+=150;
} else { } else {
mSteam = GT_ModHandler.getSteam(150); FluidStack steam = GT_ModHandler.getSteam(150);
if (steam == null) steam = GT_ModHandler.getIC2Steam(150);
mSteam = steam;
} }
} }
} }

8
src/main/java/gregtechmod/common/tileentities/machines/steam/GT_MetaTileEntity_Boiler_Steel.java
View file

@ -127,12 +127,16 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_BasicTank
} }
mFluid[0].amount--; mFluid[0].amount--;
if (mSteam == null) { if (mSteam == null) {
mSteam = GT_ModHandler.getSteam(150); FluidStack steam = GT_ModHandler.getSteam(150);
if (steam == null) steam = GT_ModHandler.getIC2Steam(150);
mSteam = steam;
} else { } else {
if (GT_ModHandler.isSteam(mSteam)) { if (GT_ModHandler.isSteam(mSteam)) {
mSteam.amount+=150; mSteam.amount+=150;
} else { } else {
mSteam = GT_ModHandler.getSteam(150); FluidStack steam = GT_ModHandler.getSteam(150);
if (steam == null) steam = GT_ModHandler.getIC2Steam(150);
mSteam = steam;
} }
} }
} }