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/common/tileentities/machines/basic | |
| 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/common/tileentities/machines/basic')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index 9c246ba913..78b7e40f01 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java @@ -60,13 +60,13 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{ @Override public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) { - return new CONTAINER_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity, 32000); + return new CONTAINER_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity); } @Override public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) { - return new GUI_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000); + return new GUI_SteamCondenser(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png"); } @Override @@ -137,10 +137,10 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{ } } 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()) && (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_))))) |