diff --git a/gradle.properties b/gradle.properties index 95c4712f7..179c64c2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ minecraft_version=1.12.2 mappings_version=stable_39 forge_version=14.23.5.2847 -mod_version=9.12.1 +mod_version=9.12.2 mcmp_version=2.5.3 jei_version=4.15.0.289 diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index c4ec8c248..e93fa48e3 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -12,7 +12,7 @@ import net.minecraft.block.Block; public final class BoxBlacklistParser { private static File mekanismDir = new File(Mekanism.proxy.getMinecraftDir(), "config/mekanism"); - private static File boxBlacklistFile = new File(mekanismDir, "BoxBlacklist.txt"); + private static File boxBlacklistFile = new File(mekanismDir, "MekanismCardboardBoxBlacklist"); private BoxBlacklistParser() { } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c47f0fa02..0076190f9 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -218,9 +218,12 @@ public class Mekanism { */ public static MekanismHooks hooks = new MekanismHooks(); /** - * Mekanism configuration instance + * Mekanism configuration instances */ public static Configuration configuration; + public static Configuration configurationgenerators; + public static Configuration configurationtools; + public static Configuration configurationrecipes; /** * Mekanism version number */ @@ -781,10 +784,10 @@ public class Mekanism { } } - File config = event.getSuggestedConfigurationFile(); - //Set the mod's configuration - configuration = new Configuration(config); + configuration = new Configuration(new File("config/mekanism/Mekanism.cfg")); + configurationgenerators = new Configuration(new File("config/mekanism/MekanismGenerators.cfg")); + configurationtools = new Configuration(new File("config/mekanism/MekanismTools.cfg")); //Load configuration proxy.loadConfiguration(); diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index ff41b8163..30738a6f8 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -101,10 +101,10 @@ public class GeneratorsCommonProxy implements IGuiProvider { * Set and load the mod's common configuration properties. */ public void loadConfiguration() { - MekanismConfig.local().generators.load(Mekanism.configuration); + MekanismConfig.local().generators.load(Mekanism.configurationgenerators); setGasGeneratorMaxEnergy(); - if (Mekanism.configuration.hasChanged()) { - Mekanism.configuration.save(); + if (Mekanism.configurationgenerators.hasChanged()) { + Mekanism.configurationgenerators.save(); } } diff --git a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java index cd357467a..c63d04a4c 100644 --- a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java +++ b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java @@ -9,9 +9,9 @@ public class ToolsCommonProxy { * Set and load the mod's common configuration properties. */ public void loadConfiguration() { - MekanismConfig.current().tools.load(Mekanism.configuration); - if (Mekanism.configuration.hasChanged()) { - Mekanism.configuration.save(); + MekanismConfig.current().tools.load(Mekanism.configurationtools); + if (Mekanism.configurationtools.hasChanged()) { + Mekanism.configurationtools.save(); } }