From 3b2994a3def35a2d3058960b71dc59dc48b802f9 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 12 Dec 2013 21:19:31 -0500
Subject: [PATCH] Some patching touchups

---
 .../net/minecraft/client/Minecraft.java.patch       |  6 +++---
 .../entity/player/EntityPlayerMP.java.patch         | 12 ------------
 .../net/minecraft/tileentity/TileEntity.java.patch  |  8 ++++++++
 .../net/minecraft/util/StringTranslate.java.patch   | 13 +++++++++++--
 4 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch

diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 2d13c36f19..dd4c8406dd 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -44,7 +44,7 @@
          Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
      }
  
-@@ -915,9 +924,11 @@
+@@ -916,9 +925,11 @@
  
          if (!this.field_71454_w)
          {
@@ -56,7 +56,7 @@
          }
  
          GL11.glFlush();
-@@ -1490,11 +1501,15 @@
+@@ -1491,11 +1502,15 @@
  
      public void func_71407_l()
      {
@@ -72,7 +72,7 @@
          this.field_71424_I.func_76320_a("gui");
  
          if (!this.field_71445_n)
-@@ -1977,6 +1992,8 @@
+@@ -1978,6 +1993,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
deleted file mode 100644
index 4098001acb..0000000000
--- a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
-+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
-@@ -11,6 +11,9 @@
- import java.util.Iterator;
- import java.util.LinkedList;
- import java.util.List;
-+import java.util.Queue;
-+import java.util.concurrent.ConcurrentLinkedQueue;
-+
- import net.minecraft.crash.CrashReport;
- import net.minecraft.crash.CrashReportCategory;
- import net.minecraft.entity.Entity;
diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
index fb9a4315ca..b19e43185f 100644
--- a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
+++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
@@ -44,3 +44,11 @@
          }
          else
          {
+@@ -137,7 +151,6 @@
+         }
+     }
+ 
+-    @SideOnly(Side.CLIENT)
+     public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_)
+     {
+         double d3 = (double)this.field_145851_c + 0.5D - p_145835_1_;
diff --git a/patches/minecraft/net/minecraft/util/StringTranslate.java.patch b/patches/minecraft/net/minecraft/util/StringTranslate.java.patch
index f67d6f7c66..acf32e636e 100644
--- a/patches/minecraft/net/minecraft/util/StringTranslate.java.patch
+++ b/patches/minecraft/net/minecraft/util/StringTranslate.java.patch
@@ -16,12 +16,12 @@
 +        InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
 +        localInject(inputstream);
 +    }
-+    
++
 +    public static void inject(InputStream inputstream)
 +    {
 +        field_74817_a.localInject(inputstream);
 +    }
-+    
++
 +    private void localInject(InputStream inputstream)
 +    {
          try
@@ -30,3 +30,12 @@
              Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator();
  
              while (iterator.hasNext())
+@@ -49,7 +61,7 @@
+ 
+             this.field_150511_e = System.currentTimeMillis();
+         }
+-        catch (IOException ioexception)
++        catch (Exception ioexception)
+         {
+             ;
+         }