From 494d7c53abc2f26fc0d9bc9b6e3ff4f16c4edefb Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 16 Mar 2023 18:09:22 +0100 Subject: [PATCH] move last bit of mekce config to mekce file --- src/main/java/mekanism/api/MekanismConfig.java | 5 +++-- src/main/java/mekanism/common/CommonProxy.java | 4 ++-- .../java/mekanism/common/network/PacketConfigSync.java | 8 ++++---- .../java/mekanism/common/tile/TileEntityElectricPump.java | 5 +++-- .../common/tile/TileEntityElectrolyticSeparator.java | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index a88c10aa5..bac13d56b 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -67,8 +67,7 @@ public class MekanismConfig public static double heatPerFuelTick = 4; public static boolean allowTransmitterAlloyUpgrade; public static boolean allowProtection = true; - public static boolean accurateHeavyWaterCapture = true; - public static int heavyWaterChance = 4; + } @@ -84,6 +83,8 @@ public class MekanismConfig public static int IC2SourceTier; public static int digitalMinerMaxRadius; public static boolean enableSingleUseCardboxes; + public static boolean accurateHeavyWaterCapture = true; + public static int heavyWaterChance = 4; } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 9c86378dd..e354de292 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -302,8 +302,8 @@ public class CommonProxy implements IGuiProvider general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble(); general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean(); general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean(); - general.accurateHeavyWaterCapture = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWater", false).getBoolean(); - general.heavyWaterChance = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWaterGen", 5).getInt(); + mekce.accurateHeavyWaterCapture = Mekanism.configuration.get("mekce", "AccurateHeavyWater", false).getBoolean(); + mekce.heavyWaterChance = Mekanism.configuration.get("mekce", "AccurateHeavyWaterGen", 5).getInt(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 9999c7671..615648bb3 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -75,8 +75,8 @@ public class PacketConfigSync implements IMessageHandler