From f836fb84c70b9dae54e3c4be7a8d6a12fd6e4b76 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 4 Feb 2019 20:53:33 +0000 Subject: [PATCH] Move IC2_PROFILE to a config, the event is fired too early to be used. --- src/main/java/techreborn/config/ConfigTechReborn.java | 3 +++ src/main/java/techreborn/init/IC2Duplicates.java | 2 +- src/main/java/techreborn/lib/ModInfo.java | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index dae03730e..90d74d0eb 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -36,6 +36,9 @@ public class ConfigTechReborn { @ConfigRegistry(config = "recipes", category = "ic2", key = "deduplicate", comment = "Changes a lot of recipes and hides blocks to integrate TechReborn into IC2") public static boolean REMOVE_DUPLICATES = false; + @ConfigRegistry(config = "recipes", category = "ic2", key = "ic2_profile", comment = "Enter the ic2 profile name here (Experimental or Classic)") + public static String IC2_PROFILE = "Experimental"; + @ConfigRegistry(config = "misc", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools") public static boolean enableGemArmorAndTools = true; diff --git a/src/main/java/techreborn/init/IC2Duplicates.java b/src/main/java/techreborn/init/IC2Duplicates.java index 41262c932..d1c079e95 100644 --- a/src/main/java/techreborn/init/IC2Duplicates.java +++ b/src/main/java/techreborn/init/IC2Duplicates.java @@ -157,7 +157,7 @@ public enum IC2Duplicates { } public static boolean isClassicMode(){ - return ModInfo.IC2_PROFILE.equals("Classic"); + return ConfigTechReborn.IC2_PROFILE.equals("Classic"); } public static boolean isClassicalDedupe(){ diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index f152d88ab..cb726c84b 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -35,9 +35,6 @@ public class ModInfo implements IModInfo { public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory"; - //This is in here as the ic2 event get called soo early it fucks the class loading order up :) weee - public static String IC2_PROFILE = "UNKNOWN"; - @Override public String MOD_NAME() { return MOD_NAME;