mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 19:49:50 +00:00
move generation config to generation config file
aswell move recipes to recipes config file
This commit is contained in:
3 files changed
+45
-42
No files matched your search
@@ -99,64 +99,68 @@ public class GeneratorsCommonProxy implements IGuiProvider
|
||||
*/
|
||||
public void loadConfiguration()
|
||||
{
|
||||
generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble();
|
||||
generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble();
|
||||
generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble();
|
||||
generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble();
|
||||
generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble();
|
||||
generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble();
|
||||
generators.advancedSolarGeneration = Mekanism.configurationgenerators.get("generation", "AdvancedSolarGeneration", 300D).getDouble();
|
||||
generators.bioGeneration = Mekanism.configurationgenerators.get("generation", "BioGeneration", 350D).getDouble();
|
||||
generators.heatGeneration = Mekanism.configurationgenerators.get("generation", "HeatGeneration", 150D).getDouble();
|
||||
generators.heatGenerationLava = Mekanism.configurationgenerators.get("generation", "HeatGenerationLava", 5D).getDouble();
|
||||
generators.heatGenerationNether = Mekanism.configurationgenerators.get("generation", "HeatGenerationNether", 100D).getDouble();
|
||||
generators.solarGeneration = Mekanism.configurationgenerators.get("generation", "SolarGeneration", 50D).getDouble();
|
||||
|
||||
loadWindConfiguration();
|
||||
generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt();
|
||||
generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble();
|
||||
generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble();
|
||||
generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserFlowRate", 32000).getInt();
|
||||
generators.enableWindmillWhitelist = Mekanism.configuration.get("generation", "EnableWindmillWhitelist", true).getBoolean();
|
||||
loadwinddimension();
|
||||
generators.turbineBladesPerCoil = Mekanism.configurationgenerators.get("generation", "TurbineBladesPerCoil", 4).getInt();
|
||||
generators.turbineVentGasFlow = Mekanism.configurationgenerators.get("generation", "TurbineVentGasFlow", 16000D).getDouble();
|
||||
generators.turbineDisperserGasFlow = Mekanism.configurationgenerators.get("generation", "TurbineDisperserGasFlow", 640D).getDouble();
|
||||
generators.condenserRate = Mekanism.configurationgenerators.get("generation", "TurbineCondenserFlowRate", 32000).getInt();
|
||||
generators.enableWindmillWhitelist = Mekanism.configurationgenerators.get("generation", "EnableWindmillWhitelist", true).getBoolean();
|
||||
|
||||
generatorsrecipes.enableHeatGenerator = Mekanism.configuration.get("generationrecipes","enableHeatGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableSolarGenerator = Mekanism.configuration.get("generationrecipes","enableSolarGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableGasGenerator = Mekanism.configuration.get("generationrecipes","enableGasGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableBioGenerator = Mekanism.configuration.get("generationrecipes","enableBioGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableAdvSolarGenerator = Mekanism.configuration.get("generationrecipes","enableAdvSolarGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableWindGenerator = Mekanism.configuration.get("generationrecipes","enableWindGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineRotor = Mekanism.configuration.get("generationrecipes","enableTurbineRotor", true).getBoolean();
|
||||
generatorsrecipes.enableRotationalComplex = Mekanism.configuration.get("generationrecipes","enableRotationalComplex", true).getBoolean();
|
||||
generatorsrecipes.enableElectromagneticCoil = Mekanism.configuration.get("generationrecipes","enableElectromagneticCoil", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineCasing = Mekanism.configuration.get("generationrecipes","enableTurbineCasing", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineValve = Mekanism.configuration.get("generationrecipes","enableTurbineValve", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineVent = Mekanism.configuration.get("generationrecipes","enableTurbineVent", true).getBoolean();
|
||||
generatorsrecipes.enableSaturatingCondenser = Mekanism.configuration.get("generationrecipes","enableSaturatingCondenser", true).getBoolean();
|
||||
generatorsrecipes.enableReactorController = Mekanism.configuration.get("generationrecipes","enableReactorController", true).getBoolean();
|
||||
generatorsrecipes.enableReactorFrame = Mekanism.configuration.get("generationrecipes","enableReactorFrame", true).getBoolean();
|
||||
generatorsrecipes.enableReactorPort = Mekanism.configuration.get("generationrecipes","enableReactorPort", true).getBoolean();
|
||||
generatorsrecipes.enableReactorAdapter = Mekanism.configuration.get("generationrecipes","enableReactorAdapter", true).getBoolean();
|
||||
generatorsrecipes.enableReactorGlass = Mekanism.configuration.get("generationrecipes","enableReactorGlass", true).getBoolean();
|
||||
generatorsrecipes.enableReactorMatrix = Mekanism.configuration.get("generationrecipes","enableReactorMatrix", true).getBoolean();
|
||||
generatorsrecipes.enableSolarPanel = Mekanism.configuration.get("generationrecipes","enableSolarPanel", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineBlade = Mekanism.configuration.get("generationrecipes","enableTurbineBlade", true).getBoolean();
|
||||
|
||||
if(Mekanism.configuration.hasChanged())
|
||||
generatorsrecipes.enableHeatGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableHeatGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableSolarGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableSolarGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableGasGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableGasGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableBioGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableBioGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableAdvSolarGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableAdvSolarGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableWindGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableWindGenerator", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineRotor = Mekanism.configurationrecipes.get("generationrecipes","enableTurbineRotor", true).getBoolean();
|
||||
generatorsrecipes.enableRotationalComplex = Mekanism.configurationrecipes.get("generationrecipes","enableRotationalComplex", true).getBoolean();
|
||||
generatorsrecipes.enableElectromagneticCoil = Mekanism.configurationrecipes.get("generationrecipes","enableElectromagneticCoil", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineCasing = Mekanism.configurationrecipes.get("generationrecipes","enableTurbineCasing", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineValve = Mekanism.configurationrecipes.get("generationrecipes","enableTurbineValve", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineVent = Mekanism.configurationrecipes.get("generationrecipes","enableTurbineVent", true).getBoolean();
|
||||
generatorsrecipes.enableSaturatingCondenser = Mekanism.configurationrecipes.get("generationrecipes","enableSaturatingCondenser", true).getBoolean();
|
||||
generatorsrecipes.enableReactorController = Mekanism.configurationrecipes.get("generationrecipes","enableReactorController", true).getBoolean();
|
||||
generatorsrecipes.enableReactorFrame = Mekanism.configurationrecipes.get("generationrecipes","enableReactorFrame", true).getBoolean();
|
||||
generatorsrecipes.enableReactorPort = Mekanism.configurationrecipes.get("generationrecipes","enableReactorPort", true).getBoolean();
|
||||
generatorsrecipes.enableReactorAdapter = Mekanism.configurationrecipes.get("generationrecipes","enableReactorAdapter", true).getBoolean();
|
||||
generatorsrecipes.enableReactorGlass = Mekanism.configurationrecipes.get("generationrecipes","enableReactorGlass", true).getBoolean();
|
||||
generatorsrecipes.enableReactorMatrix = Mekanism.configurationrecipes.get("generationrecipes","enableReactorMatrix", true).getBoolean();
|
||||
generatorsrecipes.enableSolarPanel = Mekanism.configurationrecipes.get("generationrecipes","enableSolarPanel", true).getBoolean();
|
||||
generatorsrecipes.enableTurbineBlade = Mekanism.configurationrecipes.get("generationrecipes","enableTurbineBlade", true).getBoolean();
|
||||
if(Mekanism.configurationgenerators.hasChanged())
|
||||
{
|
||||
Mekanism.configuration.save();
|
||||
Mekanism.configurationgenerators.save();
|
||||
}
|
||||
if(Mekanism.configurationrecipes.hasChanged())
|
||||
{
|
||||
Mekanism.configurationrecipes.save();
|
||||
}
|
||||
}
|
||||
|
||||
public void loadwinddimension()
|
||||
{
|
||||
String[] windid = {"0"};
|
||||
generators.winddimensionids = Arrays.asList(Mekanism.configuration.getStringList("winddimensionids", "generation", windid, "List of dimension id to be whitelisted"));
|
||||
generators.winddimensionids = Arrays.asList(Mekanism.configurationgenerators.getStringList("winddimensionids", "generation", windid, "List of dimension id to be whitelisted"));
|
||||
dimid = generators.winddimensionids.stream().map(Integer::parseInt).collect(Collectors.toList());
|
||||
System.out.println("Windmill whitelist : " + dimid);
|
||||
}
|
||||
|
||||
private void loadWindConfiguration()
|
||||
{
|
||||
generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble();
|
||||
generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble();
|
||||
generators.windGenerationMin = Mekanism.configurationgenerators.get("generation", "WindGenerationMin", 60D).getDouble();
|
||||
generators.windGenerationMax = Mekanism.configurationgenerators.get("generation", "WindGenerationMax", 480D).getDouble();
|
||||
|
||||
//Ensure max > min to avoid division by zero later
|
||||
final int minY = Mekanism.configuration.get("generation", "WindGenerationMinY", 24).getInt();
|
||||
final int maxY = Mekanism.configuration.get("generation", "WindGenerationMaxY", 255).getInt();
|
||||
final int minY = Mekanism.configurationgenerators.get("generation", "WindGenerationMinY", 24).getInt();
|
||||
final int maxY = Mekanism.configurationgenerators.get("generation", "WindGenerationMaxY", 255).getInt();
|
||||
|
||||
generators.windGenerationMinY = minY;
|
||||
generators.windGenerationMaxY = Math.max(minY + 1, maxY);
|
||||
|
||||
Reference in new issue
Block a user