From 483ac0716a2b83d02ec13837f2e81a3d4dd9b309 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 22 Dec 2022 16:44:48 +0100 Subject: [PATCH] add configurable ic2 tier for mekanism --- src/main/java/mekanism/api/MekanismConfig.java | 2 ++ src/main/java/mekanism/common/CommonProxy.java | 2 ++ .../java/mekanism/common/network/PacketConfigSync.java | 7 +++++-- .../java/mekanism/common/tile/TileEntityElectricBlock.java | 5 +++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index fca3fee6d..7e75c7be9 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -74,6 +74,8 @@ public class MekanismConfig public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; + public static int IC2SinkTier; + public static int IC2SourceTier; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f72018faa..cbf614cec 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -311,6 +311,8 @@ public class CommonProxy implements IGuiProvider general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 2).getInt(); + general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 2).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 67dc22364..74dfe477b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -204,7 +204,8 @@ public class PacketConfigSync implements IMessageHandler