diff options
| author | Steelux <70096037+Steelux8@users.noreply.github.com> | 2023-01-23 16:47:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-23 17:47:54 +0100 |
| commit | 37b7eddb651667d8d90cc66cc8e5a143b01ce34e (patch) | |
| tree | d98bd09a35e898d29a6835c33184991d82788818 /src/main/java/gregtech/common/tileentities/machines | |
| parent | d13798dccf106865d0193e9d4109fb71162f6650 (diff) | |
| download | GT5-Unofficial-37b7eddb651667d8d90cc66cc8e5a143b01ce34e.tar.gz GT5-Unofficial-37b7eddb651667d8d90cc66cc8e5a143b01ce34e.tar.bz2 GT5-Unofficial-37b7eddb651667d8d90cc66cc8e5a143b01ce34e.zip | |
Fixed some EU/t values in Steam Turbines (#1678)
* Fixed some EU/t values in Steam Turbines
* spotlessApply (#1679)
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/gregtech/common/tileentities/machines')
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index 0b56f6f0d7..8b10b2e74b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -125,8 +125,8 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La // - 250% if it is 2 // - 300% if it is 3 // Variable required outside of loop for multi-hatch scenarios. - int remainingFlow = GT_Utility.safeInt((long) (aOptFlow * (0.5f * overflowMultiplier + 1.5))); this.realOptFlow = aOptFlow * flowMultipliers[0]; + int remainingFlow = GT_Utility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1.5))); storedFluid = 0; for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { @@ -156,10 +156,11 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La if (totalFlow <= 0) return 0; tEU = totalFlow; addOutput(GT_ModHandler.getSteam(totalFlow)); - if (totalFlow == aOptFlow) { + if (totalFlow == (GT_Utility.safeInt((long) realOptFlow))) { tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { - float efficiency = getOverflowEfficiency(totalFlow, aOptFlow, overflowMultiplier); + float efficiency = + getOverflowEfficiency(totalFlow, (GT_Utility.safeInt((long) realOptFlow)), overflowMultiplier); tEU *= efficiency; tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L)); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 5876a3bf17..79f833fa31 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -133,8 +133,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg // - 200% if it is 2 // - 250% if it is 3 // Variable required outside of loop for multi-hatch scenarios. - int remainingFlow = GT_Utility.safeInt((long) (aOptFlow * (0.5f * overflowMultiplier + 1))); this.realOptFlow = aOptFlow * flowMultipliers[0]; + int remainingFlow = GT_Utility.safeInt((long) (realOptFlow * (0.5f * overflowMultiplier + 1))); storedFluid = 0; for (int i = 0; @@ -164,10 +164,11 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg tEU = totalFlow; int waterToOutput = condenseSteam(totalFlow); addOutput(GT_ModHandler.getDistilledWater(waterToOutput)); - if (totalFlow == aOptFlow) { + if (totalFlow == (GT_Utility.safeInt((long) realOptFlow))) { tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 20000L); } else { - float efficiency = getOverflowEfficiency(totalFlow, aOptFlow, overflowMultiplier); + float efficiency = + getOverflowEfficiency(totalFlow, (GT_Utility.safeInt((long) realOptFlow)), overflowMultiplier); tEU *= efficiency; tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 20000L)); } |