From e12972da2603ba8ce5b60d2e0dedea6a89569eb1 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 20 Oct 2022 19:57:13 +0200 Subject: [PATCH] move config for recipes for generators to correct place --- .../java/mekanism/api/MekanismConfig.java | 6 +- .../java/mekanism/common/CommonProxy.java | 22 +---- .../common/network/PacketConfigSync.java | 44 +--------- .../common/GeneratorsCommonProxy.java | 23 +++++ .../generators/common/MekanismGenerators.java | 88 ++++++++++++++----- 5 files changed, 96 insertions(+), 87 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index c2474e68d..875c1b0f9 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -1,6 +1,5 @@ package mekanism.api; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -270,6 +269,10 @@ public class MekanismConfig public static boolean enableFlamethrower = true; public static boolean enableGaugeDropper = true; public static boolean enableTierInstaller = true; + + + } + public static class generatorsrecipes { public static boolean enableHeatGenerator = true; public static boolean enableSolarGenerator = true; public static boolean enableGasGenerator = true; @@ -291,6 +294,5 @@ public class MekanismConfig public static boolean enableReactorMatrix = true; public static boolean enableSolarPanel = true; public static boolean enableTurbineBlade = true; - } } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 1e671a3f1..016dc2bcf 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -496,27 +496,7 @@ public class CommonProxy implements IGuiProvider recipes.enableFlamethrower = Mekanism.configuration.get("Recipes","enableFlamethrower", true).getBoolean(); recipes.enableGaugeDropper = Mekanism.configuration.get("Recipes","enableGaugeDropper", true).getBoolean(); recipes.enableTierInstaller = Mekanism.configuration.get("Recipes","enableTierInstaller", true).getBoolean(); - recipes.enableHeatGenerator = Mekanism.configuration.get("Recipes","enableHeatGenerator", true).getBoolean(); - recipes.enableSolarGenerator = Mekanism.configuration.get("Recipes","enableSolarGenerator", true).getBoolean(); - recipes.enableGasGenerator = Mekanism.configuration.get("Recipes","enableGasGenerator", true).getBoolean(); - recipes.enableBioGenerator = Mekanism.configuration.get("Recipes","enableBioGenerator", true).getBoolean(); - recipes.enableAdvSolarGenerator = Mekanism.configuration.get("Recipes","enableAdvSolarGenerator", true).getBoolean(); - recipes.enableWindGenerator = Mekanism.configuration.get("Recipes","enableWindGenerator", true).getBoolean(); - recipes.enableTurbineRotor = Mekanism.configuration.get("Recipes","enableTurbineRotor", true).getBoolean(); - recipes.enableRotationalComplex = Mekanism.configuration.get("Recipes","enableRotationalComplex", true).getBoolean(); - recipes.enableElectromagneticCoil = Mekanism.configuration.get("Recipes","enableElectromagneticCoil", true).getBoolean(); - recipes.enableTurbineCasing = Mekanism.configuration.get("Recipes","enableTurbineCasing", true).getBoolean(); - recipes.enableTurbineValve = Mekanism.configuration.get("Recipes","enableTurbineValve", true).getBoolean(); - recipes.enableTurbineVent = Mekanism.configuration.get("Recipes","enableTurbineVent", true).getBoolean(); - recipes.enableSaturatingCondenser = Mekanism.configuration.get("Recipes","enableSaturatingCondenser", true).getBoolean(); - recipes.enableReactorController = Mekanism.configuration.get("Recipes","enableReactorController", true).getBoolean(); - recipes.enableReactorFrame = Mekanism.configuration.get("Recipes","enableReactorFrame", true).getBoolean(); - recipes.enableReactorPort = Mekanism.configuration.get("Recipes","enableReactorPort", true).getBoolean(); - recipes.enableReactorAdapter = Mekanism.configuration.get("Recipes","enableReactorAdapter", true).getBoolean(); - recipes.enableReactorGlass = Mekanism.configuration.get("Recipes","enableReactorGlass", true).getBoolean(); - recipes.enableReactorMatrix = Mekanism.configuration.get("Recipes","enableReactorMatrix", true).getBoolean(); - recipes.enableSolarPanel = Mekanism.configuration.get("Recipes","enableSolarPanel", true).getBoolean(); - recipes.enableTurbineBlade = Mekanism.configuration.get("Recipes","enableTurbineBlade", true).getBoolean(); + if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 3c2a2872a..cd83572ce 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -207,27 +207,7 @@ public class PacketConfigSync implements IMessageHandler