From ead4e5255edbcfd189581e87bfcf8a36d7149a0b Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 5 Jul 2012 15:35:38 -0400
Subject: [PATCH] UnexpectedThrowable is now the much more awesome CrashReport!

---
 client/cpw/mods/fml/client/FMLClientHandler.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java
index 5dcbac16cc..ba83b25981 100644
--- a/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -48,6 +48,7 @@ import net.minecraft.src.BaseMod;
 import net.minecraft.src.BiomeGenBase;
 import net.minecraft.src.Block;
 import net.minecraft.src.ClientRegistry;
+import net.minecraft.src.CrashReport;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GameSettings;
@@ -85,6 +86,7 @@ import cpw.mods.fml.common.FMLModLoaderContainer;
 import cpw.mods.fml.common.IFMLSidedHandler;
 import cpw.mods.fml.common.IKeyHandler;
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderException;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.ProxyInjector;
@@ -206,7 +208,7 @@ public class FMLClientHandler implements IFMLSidedHandler
     @Override
     public void haltGame(String message, Throwable t)
     {
-        client.func_28003_b(new UnexpectedThrowable(message, t));
+        client.func_55071_b(new CrashReport(message, t));
     }
     /**
      * Called a bit later on during initialization to finish loading mods
@@ -947,15 +949,6 @@ public class FMLClientHandler implements IFMLSidedHandler
         Profiler.func_40662_b();
     }
 
-    /**
-     *
-     */
-    public void preGameLoad(String user, String sessionToken)
-    {
-        // Currently this does nothing, but it's possible I could relaunch Minecraft in a new classloader if I wished
-        Minecraft.fmlReentry(user, sessionToken);
-    }
-
     public void onTexturePackChange(RenderEngine engine, TexturePackBase texturepack, List<TextureFX> effects)
     {
         FMLClientHandler.instance().pruneOldTextureFX(texturepack, effects);