diff --git a/src/main/java/mekanism/common/config/MekanismConfig.java b/src/main/java/mekanism/common/config/MekanismConfig.java index 6c466872e..2fc3088df 100644 --- a/src/main/java/mekanism/common/config/MekanismConfig.java +++ b/src/main/java/mekanism/common/config/MekanismConfig.java @@ -140,6 +140,8 @@ public class MekanismConfig public static double turbineVentGasFlow; public static double turbineDisperserGasFlow; public static int condenserRate; + + public static double energyPerFusionFuel; } 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 433fbcd10..4cd72baa9 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -15,6 +15,7 @@ import mekanism.api.gas.GasTank; import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import mekanism.generators.common.item.ItemHohlraum; @@ -52,7 +53,6 @@ public class FusionReactor //Reaction characteristics public static double burnTemperature = TemperatureUnit.AMBIENT.convertFromK(1E8, true); public static double burnRatio = 1; - public static double energyPerFuel = 5E6; public int injectionRate = 0; //Thermal characteristics @@ -182,7 +182,7 @@ public class FusionReactor int fuelBurned = (int)min(getFuelTank().getStored(), max(0, lastPlasmaTemperature - burnTemperature)*burnRatio); getFuelTank().draw(fuelBurned, true); - plasmaTemperature += energyPerFuel * fuelBurned / plasmaHeatCapacity; + plasmaTemperature += generators.energyPerFusionFuel * fuelBurned / plasmaHeatCapacity; return fuelBurned; } @@ -483,26 +483,26 @@ public class FusionReactor public int getMinInjectionRate(boolean active) { double k = active ? caseWaterConductivity : 0; - double aMin = burnTemperature * burnRatio * plasmaCaseConductivity * (k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); + double aMin = burnTemperature * burnRatio * plasmaCaseConductivity * (k+caseAirConductivity) / (generators.energyPerFusionFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); return (int)(2 * Math.ceil(aMin/2D)); } public double getMaxPlasmaTemperature(boolean active) { double k = active ? caseWaterConductivity : 0; - return injectionRate * energyPerFuel/plasmaCaseConductivity * (plasmaCaseConductivity+k+caseAirConductivity) / (k+caseAirConductivity); + return injectionRate * generators.energyPerFusionFuel/plasmaCaseConductivity * (plasmaCaseConductivity+k+caseAirConductivity) / (k+caseAirConductivity); } public double getMaxCasingTemperature(boolean active) { double k = active ? caseWaterConductivity : 0; - return injectionRate * energyPerFuel / (k+caseAirConductivity); + return injectionRate * generators.energyPerFusionFuel / (k+caseAirConductivity); } public double getIgnitionTemperature(boolean active) { double k = active ? caseWaterConductivity : 0; - return burnTemperature * energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); + return burnTemperature * generators.energyPerFusionFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (generators.energyPerFusionFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); } public double getPassiveGeneration(boolean active, boolean current) diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 9b3efae73..cd5c64a3d 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -110,6 +110,8 @@ public class GeneratorsCommonProxy implements IGuiProvider generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserFlowRate", 32000).getInt(); + generators.energyPerFusionFuel = Mekanism.configuration.get("generation", "EnergyPerFusionFuel", 5E6D).getDouble(); + for(GeneratorType type : GeneratorType.getGeneratorsForConfig()) { generators.generatorsManager.setEntry(type.blockName, Mekanism.configuration.get("generators", type.blockName + "Enabled", true).getBoolean()); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 9f7e0d56f..bbd4119c1 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -223,6 +223,8 @@ public class MekanismGenerators implements IModule dataStream.writeDouble(generators.turbineDisperserGasFlow); dataStream.writeInt(generators.condenserRate); + dataStream.writeDouble(generators.energyPerFusionFuel); + for(GeneratorType type : GeneratorType.getGeneratorsForConfig()) { dataStream.writeBoolean(generators.generatorsManager.isEnabled(type.blockName)); @@ -250,6 +252,8 @@ public class MekanismGenerators implements IModule generators.turbineDisperserGasFlow = dataStream.readDouble(); generators.condenserRate = dataStream.readInt(); + generators.energyPerFusionFuel = dataStream.readDouble(); + for(GeneratorType type : GeneratorType.getGeneratorsForConfig()) { generators.generatorsManager.setEntry(type.blockName, dataStream.readBoolean());