From 0586c2b1aaf07f91771ec56c5b49ae88a7abb2f1 Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Mon, 31 Mar 2014 16:02:54 -0700
Subject: [PATCH] Update patches for Fixed FF in FG 1.2.

---
 .../net/minecraft/client/Minecraft.java.patch        | 12 ++++++------
 .../net/minecraft/client/gui/GuiIngame.java.patch    |  2 +-
 .../minecraft/entity/player/EntityPlayer.java.patch  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index e34d86186..00d133e9b 100644
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -65,7 +65,7 @@
          Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
      }
  
-@@ -915,9 +925,11 @@
+@@ -916,9 +926,11 @@
  
          if (!this.field_71454_w)
          {
@@ -77,7 +77,7 @@
          }
  
          GL11.glFlush();
-@@ -1495,6 +1507,8 @@
+@@ -1496,6 +1508,8 @@
              --this.field_71467_ac;
          }
  
@@ -86,7 +86,7 @@
          this.field_71424_I.func_76320_a("gui");
  
          if (!this.field_71445_n)
-@@ -1645,6 +1659,7 @@
+@@ -1646,6 +1660,7 @@
                          this.field_71462_r.func_146274_d();
                      }
                  }
@@ -94,7 +94,7 @@
              }
  
              if (this.field_71429_W > 0)
-@@ -1786,6 +1801,7 @@
+@@ -1787,6 +1802,7 @@
                              }
                          }
                      }
@@ -102,7 +102,7 @@
                  }
              }
  
-@@ -1977,12 +1993,15 @@
+@@ -1978,12 +1994,15 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -118,7 +118,7 @@
          this.func_71403_a((WorldClient)null);
          System.gc();
          ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2093,6 +2112,7 @@
+@@ -2094,6 +2113,7 @@
              this.field_110448_aq.func_148529_f();
              this.func_71351_a((ServerData)null);
              this.field_71455_al = false;
diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
index b820ec114..451727cd2 100644
--- a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
@@ -9,7 +9,7 @@
  import java.awt.Color;
 @@ -312,6 +313,11 @@
              this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632);
-             s = "Allocated memory: " + k5 * 100L / i5 + "% (" + k5 / 1024L / 1024L + "MB)";
+             s = "Allocated memory: " + j5 * 100L / i5 + "% (" + j5 / 1024L / 1024L + "MB)";
              this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632);
 +            int offset = 22;
 +            for (String brd : FMLCommonHandler.instance().getBrandings(false))
diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
index c1ce0cb26..4dbd28f2c 100644
--- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
@@ -26,8 +26,8 @@
      }
  
      public int func_82145_z()
-@@ -1986,6 +1991,11 @@
-         return uuid;
+@@ -2032,6 +2037,11 @@
+         }
      }
  
 +    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)