From b3e35e381fcb4056c71704a1e6c9d7f3737bdfda Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Wed, 11 Dec 2013 23:03:30 -0500
Subject: [PATCH] Clean up patches for latest exc.

---
 ...inecraft.network.EnumConnectionState.java.patch | 14 --------------
 ...et.minecraft.util.EnumChatFormatting.java.patch | 12 ------------
 .../net/minecraft/client/Minecraft.java.patch      |  6 +++---
 .../entity/player/EntityPlayer.java.patch          |  2 +-
 4 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 fml/conf/patches/minecraft_ff/net.minecraft.network.EnumConnectionState.java.patch
 delete mode 100644 fml/conf/patches/minecraft_ff/net.minecraft.util.EnumChatFormatting.java.patch

diff --git a/fml/conf/patches/minecraft_ff/net.minecraft.network.EnumConnectionState.java.patch b/fml/conf/patches/minecraft_ff/net.minecraft.network.EnumConnectionState.java.patch
deleted file mode 100644
index c557f59d8..000000000
--- a/fml/conf/patches/minecraft_ff/net.minecraft.network.EnumConnectionState.java.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\network\EnumConnectionState.java minecraft_patched\net\minecraft\network\EnumConnectionState.java
---- minecraft\net\minecraft\network\EnumConnectionState.java
-+++ minecraft_patched\net\minecraft\network\EnumConnectionState.java
-@@ -307,8 +307,8 @@
-    }
- 
-    // $FF: synthetic method
--   EnumConnectionState(int var3, Object var4) {
--      this(var1, var2, var3);
-+   EnumConnectionState(String ignore1, int ignore2, int var3, Object var4) {
-+      this(var3);
-    }
- 
-    static {
diff --git a/fml/conf/patches/minecraft_ff/net.minecraft.util.EnumChatFormatting.java.patch b/fml/conf/patches/minecraft_ff/net.minecraft.util.EnumChatFormatting.java.patch
deleted file mode 100644
index 726d8507b..000000000
--- a/fml/conf/patches/minecraft_ff/net.minecraft.util.EnumChatFormatting.java.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\util\EnumChatFormatting.java minecraft_patched\net\minecraft\util\EnumChatFormatting.java
---- minecraft\net\minecraft\util\EnumChatFormatting.java
-+++ minecraft_patched\net\minecraft\util\EnumChatFormatting.java
-@@ -39,7 +39,7 @@
-    private static final String __OBFID = "CL_00000342";
- 
-    private EnumChatFormatting(char p_i1336_3_) {
--      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
-+      this(p_i1336_3_, false);
-    }
- 
-    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 2d13c36f1..dd4c8406d 100644
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/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/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
index ba5d33a20..c1ce0cb26 100644
--- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
@@ -37,4 +37,4 @@
 +
      public static enum EnumStatus
      {
-         OK("OK", 0),
+         OK,