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 #195 from SpoilersMC/1.7.10

Browse Source 
Add Fusion output config option
This commit is contained in:
maggi373 authored and GitHub committed 2024-11-25 17:59:56 +01:00
2 parents aa5102a342 db80b77522
commit 1317cc5bb4
4 files changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/api/MekanismConfig.java
+2
View File
@@ -186,6 +186,8 @@ public class MekanismConfig
public static double ethanolMultiplier;
public static boolean enableWindmillWhitelist;
public static List<String> winddimensionids;
public static double fusionThermocoupleEfficiency;
public static double fusionSteamTransferEfficiency;
}
public static class tools
src/main/java/mekanism/generators/common/FusionReactor.java
+3 -2
View File
@@ -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;
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
+2
View File
@@ -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();
src/main/java/mekanism/generators/common/MekanismGenerators.java
+4
View File
@@ -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();