upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-08 19:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #217 from Thorfusion/laserHeatCfg

Browse Source 
New Config: Laser Heat Coefficient
This commit is contained in:
maggi373 authored and GitHub committed 2025-05-28 23:39:50 +02:00
2 parents c3447cb6ac 0f5f0e349a
commit 35a9e07eaa
4 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/api/MekanismConfig.java
+1
View File
@@ -189,6 +189,7 @@ public class MekanismConfig
public static double ethanolMultiplier;
public static boolean enableWindmillWhitelist;
public static List<String> winddimensionids;
public static double laserHeatCoefficient;
public static double fusionThermocoupleEfficiency;
public static double fusionSteamTransferEfficiency;
}
src/main/java/mekanism/generators/common/FusionReactor.java
+2 -1
View File
@@ -63,6 +63,7 @@ public class FusionReactor implements IFusionReactor
public static double enthalpyOfVaporization = 10;
public static double thermocoupleEfficiency = mekce_generators.fusionThermocoupleEfficiency;
public static double steamTransferEfficiency = mekce_generators.fusionSteamTransferEfficiency;
public static double laserHeatCoefficient = mekce_generators.laserHeatCoefficient;
//Heat transfer metrics
public static double plasmaCaseConductivity = 0.2;
@@ -84,7 +85,7 @@ public class FusionReactor implements IFusionReactor
@Override
public void addTemperatureFromEnergyInput(double energyAdded)
{
plasmaTemperature += energyAdded / plasmaHeatCapacity * (isBurning() ? 1 : 10);
plasmaTemperature += laserHeatCoefficient * energyAdded / plasmaHeatCapacity * (isBurning() ? 1 : 10);
}
public boolean hasHohlraum()
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
+2 -1
View File
@@ -118,7 +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.laserHeatCoefficient = Mekanism.configurationce.get("mekce_generation", "laserHeatCoefficient", 1.0, "Laser Thermal Transfer Efficiency Multiplier. Default is 1.0").getDouble();
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();
src/main/java/mekanism/generators/common/MekanismGenerators.java
+4 -2
View File
@@ -284,7 +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.laserHeatCoefficient);
dataStream.writeDouble(mekce_generators.fusionThermocoupleEfficiency);
dataStream.writeDouble(mekce_generators.fusionSteamTransferEfficiency);
dataStream.writeBoolean(generatorsrecipes.enableHeatGenerator);
@@ -336,7 +337,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.laserHeatCoefficient = dataStream.readDouble();
mekce_generators.fusionThermocoupleEfficiency = dataStream.readDouble();
mekce_generators.fusionSteamTransferEfficiency = dataStream.readDouble();
generatorsrecipes.enableHeatGenerator = dataStream.readBoolean();