aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorSteelux <70096037+Steelux8@users.noreply.github.com>2022-10-07 20:37:11 +0100
committerGitHub <noreply@github.com>2022-10-07 21:37:11 +0200
commiteca34fb26980e69771c594ca305cf6edc693c31c (patch)
tree96155a0c5c46e9d0f48972e09a1f0fc7f4b7ed6f /src/main/java
parent008e3c6c38ac29c4ed1f9c57714b3da584e474f3 (diff)
downloadGT5-Unofficial-eca34fb26980e69771c594ca305cf6edc693c31c.tar.gz
GT5-Unofficial-eca34fb26980e69771c594ca305cf6edc693c31c.tar.bz2
GT5-Unofficial-eca34fb26980e69771c594ca305cf6edc693c31c.zip
Add Processing Option for GT++ Solar Salt in the LHE (#1444)
* Add Processing Option for Solar Salt in the LHE - Add an option to process GT++ Solar Salt in the Large Heat Exchanger, to avoid people having to build the Thermal Boiler specifically for this purpose. * spotlessApply (#1445) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
index 4496e2362e..440da9a333 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
@@ -194,6 +194,8 @@ public class GT_MetaTileEntity_HeatExchanger
float steam_output_multiplier = 20f; // default: multiply output by 4 * 10 (boosted x5)
float penalty = 0.0f; // penalty to apply to output based on circuitry level (1-25).
boolean do_lava = false;
+ boolean do_coolant = false;
+ boolean do_solarSalt = false;
// Do we have an integrated circuit with a valid configuration?
if (mInventory[1] != null && mInventory[1].getUnlocalizedName().startsWith("gt.integrated_circuit")) {
@@ -214,6 +216,11 @@ public class GT_MetaTileEntity_HeatExchanger
} else if (mInputHotFluidHatch.getFluid().isFluidEqual(FluidRegistry.getFluidStack("ic2hotcoolant", 1))) {
steam_output_multiplier /= 2f; // was boosted x2 on top of x5 -> total x10 -> nerf with this code back to 5x
superheated_threshold /= 5f; // 10x smaller since the Hot Things production in reactor is the same.
+ do_coolant = true;
+ } else if (mInputHotFluidHatch.getFluid().isFluidEqual(FluidRegistry.getFluidStack("molten.solarsalthot", 1))) {
+ steam_output_multiplier *= 2.5f; // Solar Salt:Steam value is 5x higher than Hot Coolant's value
+ superheated_threshold /= 25f; // Given that, multiplier is 5x higher and threshold is 5x lower
+ do_solarSalt = true;
} else {
// If we're working with neither, fail out
superheated_threshold = 0;
@@ -230,8 +237,12 @@ public class GT_MetaTileEntity_HeatExchanger
this.mEUt = (int) (fluidAmountToConsume * steam_output_multiplier * efficiency);
if (do_lava) {
mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("ic2pahoehoelava", fluidAmountToConsume), true);
- } else {
+ } else if (do_coolant) {
mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("ic2coolant", fluidAmountToConsume), true);
+ } else if (do_solarSalt) {
+ mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("molten.solarsaltcold", fluidAmountToConsume), true);
+ } else {
+ return false;
}
this.mEfficiencyIncrease = 80;
return true;