diff options
Diffstat (limited to 'src/main')
7 files changed, 36 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java index 43086c3340..93a51a94fd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java @@ -437,7 +437,8 @@ public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase<MTELarge + EnumChatFormatting.YELLOW + GTUtility.formatNumbers(GTUtility.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET - + " L/t" + + " L/" // based on processing time uses ticks or seconds (for plasma) + + (this.mMaxProgresstime == 1 ? 't' : 's') + /* 4 */ EnumChatFormatting.YELLOW + " (" + (looseFit ? StatCollector.translateToLocal("GT5U.turbine.loose") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java index 1e44eb95c3..92bc764475 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java @@ -193,4 +193,9 @@ public class MTELargeTurbineGas extends MTELargerTurbineBase { protected String getCasingName() { return "Reinforced Gas Turbine Casing"; } + + @Override + protected boolean isDenseSteam() { + return false; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java index fddacc5662..82bc4a59c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java @@ -157,4 +157,9 @@ public class MTELargeTurbineSCSteam extends MTELargerTurbineBase { protected String getCasingName() { return "Reinforced SC Turbine Casing"; } + + @Override + protected boolean isDenseSteam() { + return isUsingDenseSteam; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java index 5fbcb237fd..4ca2b5832e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java @@ -172,4 +172,9 @@ public class MTELargeTurbineSHSteam extends MTELargerTurbineBase { protected String getCasingName() { return "Reinforced HP Steam Turbine Casing"; } + + @Override + protected boolean isDenseSteam() { + return isUsingDenseSteam; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java index 6445e2ad23..38c2b7160a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java @@ -183,4 +183,9 @@ public class MTELargeTurbineSteam extends MTELargerTurbineBase { protected String getCasingName() { return "Reinforced Steam Turbine Casing"; } + + @Override + protected boolean isDenseSteam() { + return isUsingDenseSteam; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index e96493351e..6317244898 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -139,6 +139,8 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT protected abstract String getCasingName(); + protected abstract boolean isDenseSteam(); + protected abstract boolean requiresOutputHatch(); @Override @@ -152,6 +154,8 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT if (getTurbineType().equals("Plasma")) { tt.addInfo("Plasma fuel efficiency is lower for high tier turbines when using low-grade plasmas") .addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)"); + } else if (getTurbineType().contains("Steam")) { + tt.addInfo("Dense types of steam are so energy packed, they only require 1/1000th of the original flow"); } tt.addTecTechHatchInfo(); tt.addPollutionAmount(getPollutionPerSecond(null)) @@ -609,11 +613,12 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", - StatCollector.translateToLocal("GT5U.turbine.flow") + ": " - + EnumChatFormatting.YELLOW - + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW + // Divides optimal flow by 1000 if it's a dense steam + + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow) / (isDenseSteam() ? 1000 : 1)) + EnumChatFormatting.RESET - + " L/s" + + " L/" + + (getTurbineType().equals("Plasma") ? 's' : 't') // based on turbine type changes flow timing + EnumChatFormatting.YELLOW + " (" + (isLooseMode() ? StatCollector.translateToLocal("GT5U.turbine.loose") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java index 4f3626e7cd..59ae72cf0c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java @@ -285,4 +285,9 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { protected String getCasingName() { return "Reinforced Plasma Turbine Casing"; } + + @Override + protected boolean isDenseSteam() { + return false; + } } |