From 69e895e687b41932a83890ac51dde20722c1227f Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Mon, 23 Jul 2012 22:51:16 -0230
Subject: [PATCH] Some patches to go along with the other changes

---
 .../src/CallableMinecraftVersion.java.patch   | 20 ++++++++++++
 .../net/minecraft/src/CrashReport.java.patch  | 23 +++++++++++++
 .../net/minecraft/src/GuiMainMenu.java.patch  | 32 +++++++++++++------
 .../minecraft/src/PanelCrashReport.java.patch | 21 ++++++------
 4 files changed, 78 insertions(+), 18 deletions(-)
 create mode 100644 fml/patches/minecraft/net/minecraft/src/CallableMinecraftVersion.java.patch
 create mode 100644 fml/patches/minecraft/net/minecraft/src/CrashReport.java.patch

diff --git a/fml/patches/minecraft/net/minecraft/src/CallableMinecraftVersion.java.patch b/fml/patches/minecraft/net/minecraft/src/CallableMinecraftVersion.java.patch
new file mode 100644
index 000000000..f18b2d47b
--- /dev/null
+++ b/fml/patches/minecraft/net/minecraft/src/CallableMinecraftVersion.java.patch
@@ -0,0 +1,20 @@
+--- ../src-base/minecraft/net/minecraft/src/CallableMinecraftVersion.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src-work/minecraft/net/minecraft/src/CallableMinecraftVersion.java	0000-00-00 00:00:00.000000000 -0000
+@@ -2,7 +2,7 @@
+ 
+ import java.util.concurrent.Callable;
+ 
+-class CallableMinecraftVersion implements Callable
++public class CallableMinecraftVersion implements Callable
+ {
+     final CrashReport field_55338_a;
+ 
+@@ -11,7 +11,7 @@
+         this.field_55338_a = p_i1418_1_;
+     }
+ 
+-    public String func_55337_a()
++    public static String func_55337_a()
+     {
+         return "12w26a";
+     }
diff --git a/fml/patches/minecraft/net/minecraft/src/CrashReport.java.patch b/fml/patches/minecraft/net/minecraft/src/CrashReport.java.patch
new file mode 100644
index 000000000..2570577ba
--- /dev/null
+++ b/fml/patches/minecraft/net/minecraft/src/CrashReport.java.patch
@@ -0,0 +1,23 @@
+--- ../src-base/minecraft/net/minecraft/src/CrashReport.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src-work/minecraft/net/minecraft/src/CrashReport.java	0000-00-00 00:00:00.000000000 -0000
+@@ -12,9 +12,12 @@
+ import java.util.Map;
+ import java.util.Map.Entry;
+ import java.util.concurrent.Callable;
++import java.util.concurrent.Executors;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
++import cpw.mods.fml.common.Loader;
++
+ public class CrashReport
+ {
+     private final String field_55376_a;
+@@ -36,6 +39,7 @@
+         this.func_55366_a("Java Version", new CallableJavaInfo(this));
+         this.func_55366_a("Java VM Version", new CallableJavaInfo2(this));
+         this.func_55366_a("Memory", new CallableMemoryInfo(this));
++        this.func_55366_a("FML", Loader.instance().getCallableCrashInformation());
+     }
+ 
+     public void func_55366_a(String p_55366_1_, Callable p_55366_2_)
diff --git a/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch b/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
index f962ba9b4..c34e7fe07 100644
--- a/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
+++ b/fml/patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
@@ -1,16 +1,25 @@
 --- ../src-base/minecraft/net/minecraft/src/GuiMainMenu.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src-work/minecraft/net/minecraft/src/GuiMainMenu.java	0000-00-00 00:00:00.000000000 -0000
-@@ -12,6 +12,9 @@
+@@ -8,10 +8,18 @@
+ import java.util.ArrayList;
+ import java.util.Calendar;
+ import java.util.Date;
++import java.util.List;
+ import java.util.Random;
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.util.glu.GLU;
  
++import com.google.common.base.Strings;
++import com.google.common.collect.Lists;
++
 +import cpw.mods.fml.client.GuiModList;
 +import cpw.mods.fml.common.FMLCommonHandler;
++import cpw.mods.fml.common.Loader;
 +
  public class GuiMainMenu extends GuiScreen
  {
      private static final Random field_6463_h = new Random();
-@@ -117,7 +120,9 @@
+@@ -117,7 +125,9 @@
              this.func_55154_a(var4, 24, var2);
          }
  
@@ -21,7 +30,7 @@
  
          if (this.field_945_b.field_6317_l)
          {
-@@ -149,6 +154,7 @@
+@@ -149,6 +159,7 @@
          {
              this.field_55155_d.field_937_g = false;
          }
@@ -29,7 +38,7 @@
      }
  
      protected void func_572_a(GuiButton p_572_1_)
-@@ -183,6 +189,10 @@
+@@ -183,6 +194,10 @@
              this.field_945_b.func_6244_d();
          }
  
@@ -40,14 +49,19 @@
          if (p_572_1_.field_938_f == 11)
          {
              this.field_945_b.func_58039_a("Demo_World", "Demo_World", DemoWorldServer.field_56874_a);
-@@ -399,7 +409,11 @@
+@@ -398,8 +413,15 @@
+         {
              var9 = var9 + " Demo";
          }
- 
+-
 -        this.func_547_b(this.field_6451_g, var9, 2, this.field_950_d - 10, 16777215);
-+        String[] brandings=FMLCommonHandler.instance().getBrandingStrings(var9);
-+        for (int i=0; i<brandings.length; i++) {
-+            this.func_547_b(this.field_6451_g, brandings[i], 2, this.field_950_d - ( 10 + i * (this.field_6451_g.field_41063_b +1)), 16777215);
++        List<String> brandings=Lists.reverse(FMLCommonHandler.instance().getBrandings());
++        for (int i=0; i<brandings.size(); i++) {
++            String brd = brandings.get(i);
++            if (!Strings.isNullOrEmpty(brd))
++            {
++                this.func_547_b(this.field_6451_g, brd, 2, this.field_950_d - ( 10 + i * (this.field_6451_g.field_41063_b +1)), 16777215);
++            }
 +        }
 +//        this.func_547_b(this.field_6451_g, var9, 2, this.field_950_d - 10, 16777215);
          String var10 = "Copyright Mojang AB. Do not distribute!";
diff --git a/fml/patches/minecraft/net/minecraft/src/PanelCrashReport.java.patch b/fml/patches/minecraft/net/minecraft/src/PanelCrashReport.java.patch
index 660f27387..8cc8817e9 100644
--- a/fml/patches/minecraft/net/minecraft/src/PanelCrashReport.java.patch
+++ b/fml/patches/minecraft/net/minecraft/src/PanelCrashReport.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/src/PanelCrashReport.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src-work/minecraft/net/minecraft/src/PanelCrashReport.java	0000-00-00 00:00:00.000000000 -0000
-@@ -10,13 +10,20 @@
+@@ -10,13 +10,22 @@
  import java.io.StringWriter;
  import java.text.SimpleDateFormat;
  import java.util.Date;
@@ -9,6 +9,8 @@
  import net.minecraft.client.Minecraft;
  import org.lwjgl.opengl.GL11;
  
++import com.google.common.base.Joiner;
++
 +import cpw.mods.fml.common.FMLCommonHandler;
 +import cpw.mods.fml.common.Loader;
 +
@@ -21,12 +23,13 @@
          this.setBackground(new Color(3028036));
          this.setLayout(new BorderLayout());
          StringWriter var2 = new StringWriter();
-@@ -39,7 +46,7 @@
- 
-         var5 = var5 + "\n\n";
-         var5 = var5 + var3;
--        String var6 = "";
-+        String var6 = Loader.instance().getCrashInformation();
-         var6 = var6 + "\n";
-         var6 = var6 + "\n";
+@@ -69,6 +78,9 @@
+             var6 = var6 + "      Minecraft has crashed!      \n";
+             var6 = var6 + "      ----------------------      \n";
+             var6 = var6 + "\n";
++            var6 = var6 + "      ****** Mod related errors will have more detail in the file ForgeModLoader-0.log\n";
++            var6 = var6 + "      ----------------------      \n";
++            var6 = var6 + "\n";
+             var6 = var6 + "Minecraft has stopped running because it encountered a problem; " + p_i1401_1_.func_55365_a() + "\n";
+             File var7 = p_i1401_1_.func_57261_f();