From 26302a6ff2d65bda08f457cb7861c6abb7f676c1 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 23 Aug 2012 14:28:49 -0400
Subject: [PATCH] Fix oddity with Screen, print a version out in the sorted
 list!

---
 client/cpw/mods/fml/client/FMLClientHandler.java     | 4 +++-
 client/cpw/mods/fml/client/ModsMissingGuiScreen.java | 3 ++-
 common/cpw/mods/fml/common/FMLModContainer.java      | 2 +-
 common/cpw/mods/fml/common/Loader.java               | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java
index e030635d9d..ec8105ef36 100644
--- a/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -184,7 +184,9 @@ public class FMLClientHandler implements IFMLSidedHandler
     {
         if (modsMissing != null)
         {
-            client.func_71373_a(new ModsMissingGuiScreen(modsMissing));
+            ModsMissingGuiScreen err = new ModsMissingGuiScreen();
+            err.setList(modsMissing);
+            client.func_71373_a(err);
         }
         else
         {
diff --git a/client/cpw/mods/fml/client/ModsMissingGuiScreen.java b/client/cpw/mods/fml/client/ModsMissingGuiScreen.java
index 9075ae8eb5..b0f12d040f 100644
--- a/client/cpw/mods/fml/client/ModsMissingGuiScreen.java
+++ b/client/cpw/mods/fml/client/ModsMissingGuiScreen.java
@@ -9,7 +9,8 @@ public class ModsMissingGuiScreen extends GuiErrorScreen
 
     private MissingModsException modsMissing;
 
-    public ModsMissingGuiScreen(MissingModsException modsMissing)
+
+    public void setList(MissingModsException modsMissing)
     {
         this.modsMissing = modsMissing;
     }
diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/common/cpw/mods/fml/common/FMLModContainer.java
index 7297ecf8f7..d972202c79 100644
--- a/common/cpw/mods/fml/common/FMLModContainer.java
+++ b/common/cpw/mods/fml/common/FMLModContainer.java
@@ -176,7 +176,7 @@ public class FMLModContainer implements ModContainer
     @Override
     public String getSortingRules()
     {
-        return ((overridesMetadata || !modMetadata.useDependencyInformation) ? annotationDependencies : modMetadata.printableSortingRules());
+        return ((overridesMetadata || !modMetadata.useDependencyInformation) ? Strings.nullToEmpty(annotationDependencies) : modMetadata.printableSortingRules());
     }
 
     @Override
diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java
index 408e35d3a2..6489fe15df 100644
--- a/common/cpw/mods/fml/common/Loader.java
+++ b/common/cpw/mods/fml/common/Loader.java
@@ -236,7 +236,7 @@ public class Loader
             {
                 if (!mod.isImmutable())
                 {
-                    FMLLog.fine("\t%s(%s): %s (%s)", mod.getModId(), mod.getName(), mod.getSource().getName(), mod.getSortingRules());
+                    FMLLog.fine("\t%s(%s:%s): %s (%s)", mod.getModId(), mod.getName(), mod.getVersion(), mod.getSource().getName(), mod.getSortingRules());
                 }
             }
             if (mods.size()==0)