diff options
| author | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-07-24 06:43:42 -0600 |
|---|---|---|
| committer | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-07-24 06:43:42 -0600 |
| commit | c090eda9e4fc51a5932e44e471de1870fe293526 (patch) | |
| tree | cf5e2fa413638d05a35557bdf8d48ffc715b1103 /src/Java/gtPlusPlus/xmod/gregtech/common | |
| parent | 97f37fd812269cea21b928c9e3de949147b575e0 (diff) | |
| download | GT5-Unofficial-c090eda9e4fc51a5932e44e471de1870fe293526.tar.gz GT5-Unofficial-c090eda9e4fc51a5932e44e471de1870fe293526.tar.bz2 GT5-Unofficial-c090eda9e4fc51a5932e44e471de1870fe293526.zip | |
Update SolarGenerator and SteamCondenser with similar changes
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 502a010b57..c10906d433 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -175,7 +175,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { return (16000 + (16000 * mBoilerTier)); } - // GT++ boilers can hold more steam than water. + // This type of machine can have different water and steam capacities. public int getSteamCapacity() { return 2 * getCapacity(); } @@ -206,7 +206,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } @Override - // Since GT++ advanced boilers have different water and steam capacities, we need to override getTankInfo() to + // 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[]{ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index de33069904..1d1c4fbfab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -36,12 +36,12 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener @Override public Object getServerGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) { - return new CONTAINER_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, 16000); + return new CONTAINER_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity); } @Override public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) { - return new GUI_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000); + return new GUI_SolarGenerator(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png"); } @Override 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_))))) |