diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-26 21:02:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 21:02:02 +0200 |
| commit | 65c8ddb94dbdba1d1931d8b03d59c4a735d40224 (patch) | |
| tree | cdd3fdfd5dfd666dfb3e5b6baffef0e16e7cd959 /src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity | |
| parent | 23a80da2e511499f34cad0a5224a371d3bb68989 (diff) | |
| parent | dd7c188b7ce5e3f4ae92181971c9c91e0352ef64 (diff) | |
| download | GT5-Unofficial-65c8ddb94dbdba1d1931d8b03d59c4a735d40224.tar.gz GT5-Unofficial-65c8ddb94dbdba1d1931d8b03d59c4a735d40224.tar.bz2 GT5-Unofficial-65c8ddb94dbdba1d1931d8b03d59c4a735d40224.zip | |
Merge pull request #12 from D-Cysteine/master
Fix GUI and WAILA fluid handling for GT++ single-block boilers and steam condenser.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java index 8ae735af95..99ad81a4a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java @@ -19,6 +19,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.util.math.MathUtils; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank @@ -176,7 +177,13 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTan @Override public FluidStack setDrainableStack(final FluidStack aFluid) { - this.mSteam = aFluid;return this.mSteam; + this.mSteam = aFluid; + return this.mSteam; + } + + @Override + public boolean isDrainableStackSeparate() { + return true; } @Override @@ -272,10 +279,10 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTan } } if ((this.mSteam != null) && - (this.mSteam.amount > 32000)) + (this.mSteam.amount > getSteamCapacity())) { this.sendSound((byte)1); - this.mSteam.amount = 24000; + this.mSteam.amount = getSteamCapacity() * 3 / 4; } if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (this.mInventory[2] != null)) { @@ -322,6 +329,16 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTan } @Override + // Since this type of machine can have different water and steam capacities, we need to override getTankInfo() to + // support returning those different capacities. + public FluidTankInfo[] getTankInfo(ForgeDirection aSide) { + return new FluidTankInfo[]{ + new FluidTankInfo(this.mFluid, getCapacity()), + new FluidTankInfo(this.mSteam, getSteamCapacity()) + }; + } + + @Override public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) { return (aIndex == 1) || (aIndex == 3); @@ -351,6 +368,12 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTan return 16000; } + // This type of machine can have different water and steam capacities. + public int getSteamCapacity() + { + return 32000; + } + @Override public int getTankPressure() { |