diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index bd82c1d09..2ef3cb71d 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -186,6 +186,8 @@ public class MekanismConfig public static double ethanolMultiplier; public static boolean enableWindmillWhitelist; public static List winddimensionids; + public static double fusionThermocoupleEfficiency; + public static double fusionSteamTransferEfficiency; } public static class tools diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 9ac0ce704..a264b9b14 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -11,6 +11,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.mekce_generators; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -60,8 +61,8 @@ public class FusionReactor implements IFusionReactor public static double plasmaHeatCapacity = 100; public static double caseHeatCapacity = 1; public static double enthalpyOfVaporization = 10; - public static double thermocoupleEfficiency = 0.00125; - public static double steamTransferEfficiency = 0.0025; + public static double thermocoupleEfficiency = mekce_generators.fusionThermocoupleEfficiency; + public static double steamTransferEfficiency = mekce_generators.fusionSteamTransferEfficiency; //Heat transfer metrics public static double plasmaCaseConductivity = 0.2; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index c5aca5579..d53496e80 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -118,6 +118,8 @@ public class GeneratorsCommonProxy implements IGuiProvider generators.turbineDisperserGasFlow = Mekanism.configurationgenerators.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); generators.condenserRate = Mekanism.configurationgenerators.get("generation", "TurbineCondenserFlowRate", 32000).getInt(); mekce_generators.enableWindmillWhitelist = Mekanism.configurationce.get("mekce_generation", "EnableWindmillWhitelist", true).getBoolean(); + mekce_generators.fusionThermocoupleEfficiency = Mekanism.configurationce.get("mekce_generation", "FusionReactorEnergyEfficiency", 0.00125, "Fusion Reactor Energy Generation efficiency multiplier, Community Edition default is 0.00125, Legacy Mekanism default is 0.05").getDouble(); + mekce_generators.fusionSteamTransferEfficiency = Mekanism.configurationce.get("mekce_generation", "FusionReactorSteamTransferEfficiency", 0.0025, "Fusion Reactor Steam Transfer efficiency multiplier, Community Edition default is 0.0025, Legacy Mekanism default is 0.1").getDouble(); generatorsrecipes.enableHeatGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableHeatGenerator", true).getBoolean(); generatorsrecipes.enableSolarGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableSolarGenerator", true).getBoolean(); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index c082bbcce..857012ae6 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -284,6 +284,8 @@ public class MekanismGenerators implements IModule dataStream.writeDouble(generators.turbineDisperserGasFlow); dataStream.writeInt(generators.condenserRate); dataStream.writeBoolean(mekce_generators.enableWindmillWhitelist); + dataStream.writeDouble(mekce_generators.fusionThermocoupleEfficiency); + dataStream.writeDouble(mekce_generators.fusionSteamTransferEfficiency); dataStream.writeBoolean(generatorsrecipes.enableHeatGenerator); dataStream.writeBoolean(generatorsrecipes.enableSolarGenerator); @@ -334,6 +336,8 @@ public class MekanismGenerators implements IModule generators.turbineDisperserGasFlow = dataStream.readDouble(); generators.condenserRate = dataStream.readInt(); mekce_generators.enableWindmillWhitelist = dataStream.readBoolean(); + mekce_generators.fusionThermocoupleEfficiency = dataStream.readDouble(); + mekce_generators.fusionSteamTransferEfficiency = dataStream.readDouble(); generatorsrecipes.enableHeatGenerator = dataStream.readBoolean(); generatorsrecipes.enableSolarGenerator = dataStream.readBoolean();