From b3a1548cfaac77e9756168a8887270f8181487ad Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Tue, 9 Jun 2015 23:06:06 -0700
Subject: [PATCH] Cleanup mod state dump to be easier to read by displaying the
 states in abreviation and placing them before the mod info.

---
 .../cpw/mods/fml/common/LoadController.java   | 11 ++++++--
 .../java/cpw/mods/fml/common/LoaderState.java | 27 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/fml/src/main/java/cpw/mods/fml/common/LoadController.java b/fml/src/main/java/cpw/mods/fml/common/LoadController.java
index 0edfe92fb..3c4802a7f 100644
--- a/fml/src/main/java/cpw/mods/fml/common/LoadController.java
+++ b/fml/src/main/java/cpw/mods/fml/common/LoadController.java
@@ -266,10 +266,17 @@ public class LoadController
 
     public void printModStates(StringBuilder ret)
     {
+        ret.append("\n\tStates:");
+        for (ModState state : ModState.values())
+            ret.append(" '").append(state.getMarker()).append("' = ").append(state.toString());
+
         for (ModContainer mc : loader.getModList())
         {
-            ret.append("\n\t").append(mc.getModId()).append("{").append(mc.getVersion()).append("} [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
-            Joiner.on("->"). appendTo(ret, modStates.get(mc.getModId()));
+            ret.append("\n\t");
+            for (ModState state : modStates.get(mc.getModId()))
+                ret.append(state.getMarker());
+
+            ret.append("\t").append(mc.getModId()).append("{").append(mc.getVersion()).append("} [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
         }
     }
 
diff --git a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java b/fml/src/main/java/cpw/mods/fml/common/LoaderState.java
index 8fc26635a..cb30ba2ad 100644
--- a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java
+++ b/fml/src/main/java/cpw/mods/fml/common/LoaderState.java
@@ -95,21 +95,23 @@ public enum LoaderState
     }
     public enum ModState
     {
-        UNLOADED("Unloaded"),
-        LOADED("Loaded"),
-        CONSTRUCTED("Constructed"),
-        PREINITIALIZED("Pre-initialized"),
-        INITIALIZED("Initialized"),
-        POSTINITIALIZED("Post-initialized"),
-        AVAILABLE("Available"),
-        DISABLED("Disabled"),
-        ERRORED("Errored");
+        UNLOADED       ("Unloaded",         "U"),
+        LOADED         ("Loaded",           "L"),
+        CONSTRUCTED    ("Constructed",      "C"),
+        PREINITIALIZED ("Pre-initialized",  "H"),
+        INITIALIZED    ("Initialized",      "I"),
+        POSTINITIALIZED("Post-initialized", "J"),
+        AVAILABLE      ("Available",        "A"),
+        DISABLED       ("Disabled",         "D"),
+        ERRORED        ("Errored",          "E");
 
         private String label;
+        private String marker;
 
-        private ModState(String label)
+        private ModState(String label, String marker)
         {
             this.label = label;
+            this.marker = marker;
         }
 
         @Override
@@ -117,5 +119,10 @@ public enum LoaderState
         {
             return this.label;
         }
+
+        public String getMarker()
+        {
+            return this.marker;
+        }
     }
 }