get rid of LogIdentifier(FML has this now), add in optional recipe du…

…plication detection
SlimeKnights · Dec 7, 2014 · e7ba871 · e7ba871
1 parent cb2a0cf
commit e7ba871
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 67 deletions.
diff --git a/src/mantle/Mantle.java b/src/mantle/Mantle.java
@@ -4,16 +4,16 @@
 import static mantle.lib.CoreRepo.modId;
 import static mantle.lib.CoreRepo.modName;
 import static mantle.lib.CoreRepo.modVersion;
+
+import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import mantle.books.BookData;
 import mantle.books.BookDataStore;
 import mantle.common.IDDumps;
 import mantle.common.MProxyCommon;
-import mantle.debug.LogIdentifier;
 import mantle.items.Manual;
 import mantle.lib.CoreConfig;
 import mantle.lib.CoreRepo;
 import mantle.lib.environment.EnvironmentChecks;
-import mantle.module.ModuleController;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -23,6 +23,7 @@
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import mantle.utils.CraftingHandler;
 
 import java.io.File;
 
@@ -44,7 +45,6 @@ public class Mantle
 
     public static MProxyCommon proxy;
     public static Manual mantleBook;
-    public static LogIdentifier logID;
     /**
      * Constructor
      *
@@ -69,10 +69,6 @@ public void preInit (FMLPreInitializationEvent evt)
         logger.info("Entering preinitialization phase.");
         CoreConfig.loadConfiguration(evt.getModConfigurationDirectory());
 
-        if (CoreConfig.identifyLogs) {
-            logID = new LogIdentifier();
-            logID.preinit();
-        }
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
 
         mantleBook = (Manual) new Manual().setUnlocalizedName("mantle.manual");
@@ -115,5 +111,10 @@ public void postInit (FMLPostInitializationEvent evt)
         CoreConfig.loadBookLocations();
         IDDumps.dump();
     }
+    @EventHandler
+    public void serverStart(FMLServerStartedEvent evt)
+    {
+        CraftingHandler.logConflicts();
+    }
 
 }
diff --git a/src/mantle/debug/LogIdentifier.java b/src/mantle/debug/LogIdentifier.java
diff --git a/src/mantle/lib/CoreConfig.java b/src/mantle/lib/CoreConfig.java
@@ -53,12 +53,12 @@ public static void loadConfiguration (File mainConfigFolder)
         dumpBiomeIDs = config.get("DebugHelpers", "Dump BIOME ID's in log", dumpBiomeIDs).getBoolean(dumpBiomeIDs);
         dumpPotionIDs = config.get("DebugHelpers", "Dump POTION ID's in log", dumpPotionIDs).getBoolean(dumpPotionIDs);
         dumpEnchantIDs = config.get("DebugHelpers", "Dump ENCHANT ID's in log", dumpEnchantIDs).getBoolean(dumpEnchantIDs);
+        dumpRecipeConflicts = config.get("DebugHelpers", "Dump Recipe Conflicts in log when server starts",dumpRecipeConflicts).getBoolean(dumpRecipeConflicts);
 
-        identifyLogs = config.get("DebugHelpers", "Force all unidentified logging entries (STDOUT/STDERR) through log4j2", identifyLogs).getBoolean(identifyLogs);
-
         //check for debugging overrides in system environment
         checkSysOverrides();
-        config.save();
+        if(config.hasChanged())
+            config.save();
         logger.info("Configuration load completed.");
     }
 
@@ -98,7 +98,7 @@ public static void loadBookLocations ()
     public static boolean dumpBiomeIDs = false;
     public static boolean dumpPotionIDs = false;
     public static boolean dumpEnchantIDs = false;
-    public static boolean identifyLogs = false;
+    public static boolean dumpRecipeConflicts = false;
 
 
 }