Expose the state of the loader

MinecraftForge · May 7, 2015 · 0b84b6a · 0b84b6a
1 parent 450b82c
commit 0b84b6a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/cpw/mods/fml/common/LoadController.java b/src/main/java/cpw/mods/fml/common/LoadController.java
@@ -150,8 +150,8 @@ else if (toThrow == null)
             else
             {
                 FMLLog.severe("The ForgeModLoader state engine has become corrupted. Probably, a state was missed by and invalid modification to a base class" +
-                		"ForgeModLoader depends on. This is a critical error and not recoverable. Investigate any modifications to base classes outside of" +
-                		"ForgeModLoader, especially Optifine, to see if there are fixes available.");
+                        "ForgeModLoader depends on. This is a critical error and not recoverable. Investigate any modifications to base classes outside of" +
+                        "ForgeModLoader, especially Optifine, to see if there are fixes available.");
                 throw new RuntimeException("The ForgeModLoader state engine is invalid");
             }
             if (toThrow != null && toThrow instanceof RuntimeException)
@@ -311,9 +311,9 @@ public boolean isInState(LoaderState state)
         return this.state == state;
     }
 
-	boolean hasReachedState(LoaderState state) {
-		return this.state.ordinal()>=state.ordinal() && this.state!=LoaderState.ERRORED;
-	}
+    boolean hasReachedState(LoaderState state) {
+        return this.state.ordinal()>=state.ordinal() && this.state!=LoaderState.ERRORED;
+    }
 
     void forceState(LoaderState newState)
     {
@@ -352,4 +352,9 @@ Class<?>[] getCallingStack()
     {
         return accessibleManager.getStackClasses();
     }
+
+    LoaderState getState()
+    {
+        return state;
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/Loader.java b/src/main/java/cpw/mods/fml/common/Loader.java
@@ -681,7 +681,7 @@ public void computeDependencies(String dependencyString, Set<ArtifactVersion> re
             // before elements are things we are loaded before (so they are our dependants)
             if ("required-before".equals(instruction) || "before".equals(instruction))
             {
-            	dependants.add(VersionParser.parseVersionReference(target));
+                dependants.add(VersionParser.parseVersionReference(target));
             }
             // after elements are things that load before we do (so they are out dependencies)
             else if ("required-after".equals(instruction) || "after".equals(instruction))
@@ -1060,4 +1060,9 @@ List<ArtifactVersion> getInjectedAfter(String modId)
     {
         return injectedAfter.get(modId);
     }
+
+    public final LoaderState getLoaderState()
+    {
+        return modController != null ? modController.getState() : LoaderState.NOINIT;
+    }
 }