maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move IC2_PROFILE to a config, the event is fired too early to be used.

Browse source
This commit is contained in:
modmuss50 2019-02-04 20:53:33 +00:00
parent 6916de2ad7
commit f836fb84c7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/techreborn/config/ConfigTechReborn.java
View file

@ -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") @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; 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") @ConfigRegistry(config = "misc", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools")
public static boolean enableGemArmorAndTools = true; public static boolean enableGemArmorAndTools = true;

2
src/main/java/techreborn/init/IC2Duplicates.java
View file

@ -157,7 +157,7 @@ public enum IC2Duplicates {
} }
public static boolean isClassicMode(){ public static boolean isClassicMode(){
return ModInfo.IC2_PROFILE.equals("Classic"); return ConfigTechReborn.IC2_PROFILE.equals("Classic");
} }
public static boolean isClassicalDedupe(){ public static boolean isClassicalDedupe(){

3
src/main/java/techreborn/lib/ModInfo.java
View file

@ -35,9 +35,6 @@ public class ModInfo implements IModInfo {
public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy";
public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory"; 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 @Override
public String MOD_NAME() { public String MOD_NAME() {
return MOD_NAME; return MOD_NAME;