ForgePatch/fml/conf/patches/minecraft_ff.patch

diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 12:35:15 2013
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 12:57:28 2013
@@ -21,9 +21,14 @@
 
    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
       StringBuilder var1 = new StringBuilder();
+     ArrayList var3;
+     try {
       Field var2 = ClassLoader.class.getDeclaredField("classes");
       var2.setAccessible(true);
-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+     } catch(Exception ex) {
+      return "";
+     }
       boolean var4 = true;
       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
       HashMap var6 = new HashMap();
@@ -98,6 +103,10 @@
 
    // $FF: synthetic method
    public Object call() {
+     try {
       return this.func_85085_a();
+     } catch(Exception ex) {
+      return null;
+     }
    }
 }
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 12:35:16 2013
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 12:58:25 2013
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
 
+   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
+      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
+   }
+
    public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
--- minecraft\net\minecraft\src\DedicatedServer.java	Sun Jun 30 12:35:16 2013
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 12:59:50 2013
@@ -207,7 +207,7 @@
       System.exit(0);
    }
 
-   protected void func_71190_q() {
+   public void func_71190_q() {
       super.func_71190_q();
       this.func_71333_ah();
    }
diff -r -U 3 minecraft\net\minecraft\src\EntityDragon.java minecraft_patched\net\minecraft\src\EntityDragon.java
--- minecraft\net\minecraft\src\EntityDragon.java	Sun Jun 30 12:35:16 2013
+++ minecraft_patched\net\minecraft\src\EntityDragon.java	Sun Jun 30 13:01:34 2013
@@ -551,4 +551,14 @@
    protected float func_70599_aP() {
       return 5.0F;
    }
+
+   @Override
+   public float func_70667_aM() {
+      return 0.0f;
+   }
+
+   @Override
+   public float func_110183_aJ() {
+      return 0.0f;
+   }
 }
diff -r -U 3 minecraft\net\minecraft\src\EntityWither.java minecraft_patched\net\minecraft\src\EntityWither.java
--- minecraft\net\minecraft\src\EntityWither.java	Sun Jun 30 12:35:16 2013
+++ minecraft_patched\net\minecraft\src\EntityWither.java	Sun Jun 30 13:02:20 2013
@@ -458,4 +458,13 @@
       this.field_70154_o = null;
    }
 
+   @Override
+   public float func_70667_aM() {
+      return 0.0f;
+   }
+
+   @Override
+   public float func_110183_aJ() {
+      return 0.0f;
+   }
 }
diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 12:35:16 2013
+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 13:02:35 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
    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 -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
--- minecraft\net\minecraft\src\FileResourcePack.java	Sun Jun 30 12:35:17 2013
+++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Sun Jun 30 13:04:31 2013
@@ -84,12 +84,18 @@
 
    protected void finalize() {
       this.close();
+     try {
       super.finalize();
+     } catch(Throwable t) {
+     }
    }
 
    public void close() {
       if(this.field_110600_d != null) {
+        try {
          this.field_110600_d.close();
+        } catch(Exception ex) {
+        }
          this.field_110600_d = null;
       }
 
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- minecraft\net\minecraft\src\FontRenderer.java	Sun Jun 30 12:35:17 2013
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sun Jun 30 13:05:19 2013
@@ -625,8 +625,6 @@
          case 10:
             --var5;
             break;
-         case 32:
-            var6 = var5;
          case 167:
             if(var5 < var3 - 1) {
                ++var5;
@@ -640,6 +638,8 @@
                }
             }
             break;
+         case 32:
+            var6 = var5;
          default:
             var4 += this.func_78263_a(var8);
             if(var7) {
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
--- minecraft\net\minecraft\src\IntegratedServer.java	Sun Jun 30 12:35:17 2013
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sun Jun 30 13:05:37 2013
@@ -103,7 +103,7 @@
       return true;
    }
 
-   protected void func_71217_p() {
+   public void func_71217_p() {
       boolean var1 = this.field_71348_o;
       this.field_71348_o = this.field_71347_n.func_71752_f();
       if(!var1 && this.field_71348_o) {
diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
--- minecraft\net\minecraft\src\Minecraft.java	Sun Jun 30 12:35:17 2013
+++ minecraft_patched\net\minecraft\src\Minecraft.java	Sun Jun 30 13:28:05 2013
@@ -599,8 +599,8 @@
          return;
       }
 
-      while(true) {
-         try {
+      try {
+         while(this.field_71425_J) {
             if(this.field_71425_J) {
                if(this.field_71434_R && this.field_71433_S != null) {
                   this.func_71377_b(this.field_71433_S);
@@ -621,23 +621,20 @@
                }
                continue;
             }
-         } catch (MinecraftError var12) {
-            ;
-         } catch (ReportedException var13) {
-            this.func_71396_d(var13.func_71575_a());
-            this.func_71398_f();
-            var13.printStackTrace();
-            this.func_71377_b(var13.func_71575_a());
-         } catch (Throwable var14) {
-            var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
-            this.func_71398_f();
-            var14.printStackTrace();
-            this.func_71377_b(var2);
-         } finally {
-            this.func_71405_e();
          }
-
-         return;
+      } catch (MinecraftError var12) {
+      } catch (ReportedException var13) {
+         this.func_71396_d(var13.func_71575_a());
+         this.func_71398_f();
+         var13.printStackTrace();
+         this.func_71377_b(var13.func_71575_a());
+      } catch (Throwable var14) {
+         var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
+         this.func_71398_f();
+         var14.printStackTrace();
+         this.func_71377_b(var2);
+      } finally {
+         this.func_71405_e();
       }
    }
 
diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
--- minecraft\net\minecraft\src\RConThreadClient.java	Sun Jun 30 12:35:18 2013
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 13:07:31 2013
@@ -32,8 +32,8 @@
    }
 
    public void run() {
-      while(true) {
-         try {
+      try {
+         while(true) {
             if(!this.field_72619_a) {
                break;
             }
@@ -84,20 +84,14 @@
                   continue;
                }
             }
-         } catch (SocketTimeoutException var17) {
-            break;
-         } catch (IOException var18) {
-            break;
-         } catch (Exception var19) {
-            System.out.println(var19);
-            break;
-         } finally {
-            this.func_72653_g();
          }
-
-         return;
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
       }
-
    }
 
    private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
--- minecraft\net\minecraft\src\RenderBlocks.java	Sun Jun 30 12:35:18 2013
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Jun 30 13:09:31 2013
@@ -1960,16 +1960,16 @@
       float var25 = (float)(p_78589_2_ + 1);
       float var26 = (float)(p_78589_4_ + 0);
       float var27 = (float)(p_78589_4_ + 1);
-      boolean var28 = false;
+      int var28 = 0;
       if((var20 || var21) && !var22 && !var23) {
-         var28 = true;
+         var28 = 1;
       }
 
       if((var22 || var23) && !var21 && !var20) {
-         var28 = true;
+         var28 = 2;
       }
 
-      if(!var28) {
+      if(var28 == 0) {
          int var29 = 0;
          int var30 = 0;
          int var31 = 16;
@@ -2016,7 +2016,7 @@
          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var31), (double)var9.func_94207_b((double)var30));
          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var30));
          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var32));
-      } else if(var28) {
+      } else if(var28 == 1) {
          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var8.func_94212_f(), (double)var8.func_94210_h());
          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java	Sun Jun 30 12:35:18 2013
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Jun 30 13:09:31 2013
@@ -1435,7 +1435,7 @@
          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
-         Object var21 = null;
+         EntityFX var21 = null;
          if(p_72726_1_.equals("hugeexplosion")) {
             this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
          } else if(p_72726_1_.equals("largeexplode")) {
diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
--- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 12:35:18 2013
+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 13:10:50 2013
@@ -22,7 +22,11 @@
    public void connect() {}
 
    public InputStream getInputStream() {
+     try {
       return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
+     } catch(Exception ex) {
+      return null;
+     }
    }
 
    // $FF: synthetic method
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 12:35:19 2013
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 13:10:50 2013
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i1395_1_;
    }
 
+   @SuppressWarnings("deprecation")
    public void run() {
       try {
          Thread.sleep(5000L);
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 12:35:19 2013
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 13:11:10 2013
@@ -20,6 +20,7 @@
    }
 
    public void run() {
+     while(true)
       this.func_75736_b();
    }