More fixups

2013-06-30 09:04:50 -04:00 · 2013-06-30 09:04:50 -04:00 · daa85290e4
parent ae922989ed
commit daa85290e4
7 changed files with 195 additions and 412 deletions
--- a/fml/conf/patches/minecraft_ff.patch
+++ b/fml/conf/patches/minecraft_ff.patch
@ -1,52 +1,19 @@
-diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\src\Minecraft.java	Sat Apr 27 01:53:03 2013
-+++ minecraft_patched\net\minecraft\src\Minecraft.java	Sat Apr 27 01:55:19 2013
-@@ -599,9 +599,8 @@
-          return;
-       }
- 
-      while(true) {
-          try {
-            if(this.field_71425_J) {
-+            while(this.field_71425_J) {
-                if(this.field_71434_R && this.field_71433_S != null) {
-                   this.func_71377_b(this.field_71433_S);
-                   return;
-@@ -619,7 +620,6 @@
-                   this.func_71373_a(new GuiMemoryErrorScreen());
-                   System.gc();
-                }
-               continue;
-             }
-          } catch (MinecraftError var12) {
-             ;
-@@ -637,8 +635,6 @@
-             this.func_71405_e();
-          }
- 
-         return;
-      }
-    }
- 
-    private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jun 29 02:23:48 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jun 29 02:30:36 2013
+--- 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();
-      Field var2 = ClassLoader.class.getDeclaredField("classes");
-      var2.setAccessible(true);
+     ArrayList var3;
+     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+	     Field var2 = ClassLoader.class.getDeclaredField("classes");
-+	     var2.setAccessible(true);
-+	     var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
+      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();
@ -54,31 +21,30 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
 
    // $FF: synthetic method
    public Object call() {
-      return this.func_85085_a();
 +     try {
-+		return this.func_85085_a();
-+	 } catch (Exception e) {
-+		return null;
-+	 }
+       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	Sat Jun 29 02:23:49 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jun 29 02:26:03 2013
+--- 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_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
+   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	Sat Jun 29 02:23:49 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Jun 29 02:26:03 2013
+--- 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);
    }
@ -89,48 +55,43 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
       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	Sat Jun 29 02:23:49 2013
-+++ minecraft_patched\net\minecraft\src\EntityDragon.java	Sat Jun 29 02:35:53 2013
-@@ -551,4 +551,16 @@
+--- 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() {
-+		// TODO Auto-generated method stub
-+		return 0.0f;
-+	}
-+	
-+	@Override
-+	public float func_110183_aJ() {
-+		// TODO Auto-generated method stub
-+		return 0.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	Sat Jun 29 02:23:50 2013
-+++ minecraft_patched\net\minecraft\src\EntityWither.java	Sat Jun 29 02:36:35 2013
-@@ -458,4 +458,16 @@
+--- 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() {
-+		// TODO Auto-generated method stub
-+		return 0.0f;
-+	}
-+	
-+	@Override
-+	public float func_110183_aJ() {
-+		// TODO Auto-generated method stub
-+		return 0.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\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sat Jun 29 02:23:50 2013
-+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sat Jun 29 02:26:03 2013
+--- 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;
 
@ -139,34 +100,32 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch
 +      this(p_i1336_3_, false);
    }
 
-    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
+    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	Sat Jun 29 02:23:50 2013
-+++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Sat Jun 29 02:31:18 2013
+--- 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();
-      super.finalize();
-+      try {
-+		super.finalize();
-+	} catch (Throwable e) {
-+	}
+     try {
+       super.finalize();
+     } catch(Throwable t) {
+     }
    }
 
    public void close() {
       if(this.field_110600_d != null) {
-         this.field_110600_d.close();
-+         try {
-+			this.field_110600_d.close();
-+		} catch (IOException e) {
-+		}
+        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	Sat Jun 29 02:23:50 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Jun 29 02:26:03 2013
+--- 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;
@ -181,13 +140,13 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
             }
             break;
 +         case 32:
-+             var6 = var5;
+            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	Sat Jun 29 02:23:50 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Jun 29 02:26:03 2013
+--- 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;
    }
@ -197,9 +156,60 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
       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	Sat Jun 29 02:23:51 2013
-+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sat Jun 29 02:26:03 2013
+--- 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 @@
    }
 
@ -227,21 +237,20 @@ diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched
          }
 -
 -         return;
-      }
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
+       }
 -
-+     } 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	Sat Jun 29 02:23:51 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sat Jun 29 02:26:03 2013
+--- 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);
@ -273,8 +282,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
          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	Sat Jun 29 02:23:51 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Jun 29 02:26:03 2013
+--- 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_;
@ -285,26 +294,25 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
             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	Sat Jun 29 02:23:52 2013
-+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Sat Jun 29 02:34:57 2013
+--- 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() {
-      return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
 +     try {
-+		return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
-+	 } catch (java.io.IOException e) {
-+		return null;
-+	 }
+       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	Sat Jun 29 02:23:52 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Jun 29 02:26:03 2013
+--- 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_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
    }
 
 +   @SuppressWarnings("deprecation")
@ -312,15 +320,13 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
       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	Sat Jun 29 02:23:52 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jun 29 02:26:03 2013
-@@ -20,7 +20,8 @@
+--- 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() {
-      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
+     while(true)
+       this.func_75736_b();
    }
 
-    private void func_75736_b() {
--- a/fml/conf/patches/minecraft_server_ff.patch
+++ b/fml/conf/patches/minecraft_server_ff.patch
@ -1,21 +1,19 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jun 29 02:25:12 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jun 29 02:29:37 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 12:36:32 2013
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 12:48:42 2013
@@ -21,9 +21,14 @@
 
    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
       StringBuilder var1 = new StringBuilder();
-      Field var2 = ClassLoader.class.getDeclaredField("classes");
-      var2.setAccessible(true);
+     ArrayList var3;
+     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+         Field var2 = ClassLoader.class.getDeclaredField("classes");
-+         var2.setAccessible(true);
-+         var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
+      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();
@ -25,29 +23,29 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
    public Object call() {
 -      return this.func_85085_a();
 +     try {
-+		return this.func_85085_a();
-+	 } catch (Exception e) {
-+		return null;
-+	 }
+       return this.func_85085_a();
+     } catch(Exception ex) {
+       return null;
+     }
    }
 }
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jun 29 02:25:13 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jun 29 02:25:48 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 12:36:32 2013
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 12:41:20 2013
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
 
-+   public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
+   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_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Jun 29 02:25:13 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Jun 29 02:25:48 2013
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sun Jun 30 12:36:32 2013
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 12:41:48 2013
@@ -208,7 +208,7 @@
       System.exit(0);
    }
@ -58,8 +56,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
       this.func_71333_ah();
    }
 diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sat Jun 29 02:25:13 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sat Jun 29 02:25:48 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 12:36:33 2013
+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 12:42:08 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
@ -68,43 +66,33 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf
 +      this(p_i1336_3_, false);
    }
 
-    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
 diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sat Jun 29 02:25:14 2013
-+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sat Jun 29 02:25:48 2013
-@@ -2,6 +2,8 @@
- 
- import java.net.InetSocketAddress;
- import java.net.SocketAddress;
-+import java.util.ArrayList;
-+import java.util.Collections;
- import java.util.List;
- import net.minecraft.src.ILogAgent;
- import net.minecraft.src.INetworkManager;
-@@ -11,7 +13,7 @@
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sun Jun 30 12:36:33 2013
+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sun Jun 30 12:46:26 2013
+@@ -11,13 +11,18 @@
 public class MemoryConnection implements INetworkManager {
 
    private static final SocketAddress field_74444_a = new InetSocketAddress("127.0.0.1", 0);
 -   private final List field_74442_b;
-+   private final List field_74442_b = Collections.synchronizedList(new ArrayList());
+   private final List field_74442_b  = java.util.Collections.synchronizedList(new java.util.ArrayList());
    private final ILogAgent field_98214_c;
    private MemoryConnection field_74443_c;
    private NetHandler field_74440_d;
-@@ -19,6 +21,11 @@
+    private boolean field_74441_e;
    private String field_74438_f;
    private Object[] field_74439_g;
- 
-+   public MemoryConnection(ILogAgent p_i11025_1_, NetHandler p_i11025_2_) {
-+      this.field_74440_d = p_i11025_2_;
-+      this.field_98214_c = p_i11025_1_;
+
+   public MemoryConnection(ILogAgent p_i1392_1_, NetHandler p_i1392_2_) {
+      this.field_74440_d = p_i1392_2_;
+      this.field_98214_c = p_i1392_1_;
 +   }
-+   
+ 
    public void func_74425_a(NetHandler p_74425_1_) {
       this.field_74440_d = p_74425_1_;
-    }
 diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sat Jun 29 02:25:14 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sat Jun 29 02:25:48 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sun Jun 30 12:36:33 2013
+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 12:51:57 2013
@@ -32,8 +32,8 @@
    }
 
@ -132,23 +120,22 @@ diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_
          }
 -
 -         return;
-      }
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
+       }
 -
-+     } 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_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Jun 29 02:25:14 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Jun 29 02:25:48 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 12:36:34 2013
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 12:52:29 2013
@@ -11,6 +11,7 @@
-       this.field_74504_a = p_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
    }
 
 +   @SuppressWarnings("deprecation")
@ -156,15 +143,13 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
       try {
          Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Jun 29 02:25:14 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jun 29 02:25:48 2013
-@@ -20,7 +20,8 @@
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 12:36:34 2013
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 12:52:53 2013
+@@ -20,6 +20,7 @@
    }
 
    public void run() {
-      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
+     while(true)
+       this.func_75736_b();
    }
 
-    private void func_75736_b() {
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@ -46,7 +46,7 @@
     }
 
     public void func_110436_a()
-@@ -725,6 +736,7 @@
+@@ -729,6 +740,7 @@
         {
             this.func_71405_e();
         }
@ -54,7 +54,7 @@
     }
 
     private void func_71411_J()
-@@ -793,9 +805,11 @@
+@@ -797,9 +809,11 @@
 
         if (!this.field_71454_w)
         {
@ -66,7 +66,7 @@
         }
 
         GL11.glFlush();
-@@ -1317,10 +1331,14 @@
+@@ -1321,10 +1335,14 @@
 
     public void func_71407_l()
     {
@ -81,7 +81,7 @@
 
         this.field_71424_I.func_76320_a("stats");
         this.field_71413_E.func_77449_e();
-@@ -1771,6 +1789,8 @@
+@@ -1775,6 +1793,8 @@
             this.field_71453_ak.func_74428_b();
         }
 
@ -90,7 +90,7 @@
         this.field_71424_I.func_76319_b();
         this.field_71423_H = func_71386_F();
     }
-@@ -1794,8 +1814,27 @@
+@@ -1798,8 +1818,27 @@
         }
 
         this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
--- a/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
@ -1,111 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/RenderEngine.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderEngine.java
-@@ -1,8 +1,11 @@
- package net.minecraft.client.renderer;
- 
-+import cpw.mods.fml.client.TextureFXManager;
-+import cpw.mods.fml.common.FMLLog;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.awt.Color;
-+import java.awt.Dimension;
- import java.awt.Graphics;
- import java.awt.image.BufferedImage;
- import java.io.IOException;
-@@ -11,6 +14,9 @@
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
- import javax.imageio.ImageIO;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.texture.TextureMap;
-@@ -37,6 +43,8 @@
-     private final TextureMap field_94155_m;
-     private int field_94153_n;
- 
-+    public static Logger log = FMLLog.getLogger();
-+
-     public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
-     {
-         this.field_78366_k = p_i3192_1_;
-@@ -87,14 +95,17 @@
-                 }
-                 else
-                 {
-                    aint1 = this.func_78348_b(this.func_78345_a(inputstream));
-+                    BufferedImage bufferedimage = this.func_78345_a(inputstream);
-+                    TextureFXManager.instance().fixTransparency(bufferedimage, p_78346_1_);
-+                    aint1 = this.func_78348_b(bufferedimage);
-                 }
- 
-                 this.field_78359_d.put(p_78346_1_, aint1);
-                 return aint1;
-             }
-            catch (IOException ioexception)
-            {
-+            catch (Exception ioexception)
-+            {
-+                log.log(Level.INFO, String.format("An error occured reading texture file %s (getTexture)", p_78346_1_), ioexception);
-                 ioexception.printStackTrace();
-                 int[] aint2 = this.func_78348_b(this.field_78364_l);
-                 this.field_78359_d.put(p_78346_1_, aint2);
-@@ -162,6 +173,7 @@
-                 try
-                 {
-                     int i = GLAllocation.func_74528_a();
-+                    TextureFXManager.instance().bindTextureToName(p_78341_1_, i);
-                     boolean flag = p_78341_1_.startsWith("%blur%");
- 
-                     if (flag)
-@@ -184,7 +196,9 @@
-                     }
-                     else
-                     {
-                        this.func_98184_a(this.func_78345_a(inputstream), i, flag, flag1);
-+                        BufferedImage bufferedimage = this.func_78345_a(inputstream);
-+                        TextureFXManager.instance().fixTransparency(bufferedimage, p_78341_1_);
-+                        this.func_98184_a(bufferedimage, i, flag, flag1);
-                     }
- 
-                     this.field_78362_c.put(s1, Integer.valueOf(i));
-@@ -240,6 +254,7 @@
- 
-         int j = p_98184_1_.getWidth();
-         int k = p_98184_1_.getHeight();
-+        TextureFXManager.instance().setTextureDimensions(p_98184_2_, j, k);
-         int[] aint = new int[j * k];
-         p_98184_1_.getRGB(0, 0, j, k, aint, 0, j);
- 
-@@ -412,10 +427,12 @@
-                 }
- 
-                 BufferedImage bufferedimage1 = this.func_78345_a(itexturepack.func_77532_a(s));
-+                TextureFXManager.instance().fixTransparency(bufferedimage1, s);
-                 this.func_98184_a(bufferedimage1, j, flag, flag1);
-             }
-            catch (IOException ioexception)
-            {
-+            catch (Exception ioexception)
-+            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file %s (refreshTexture)", s), ioexception);
-                 ioexception.printStackTrace();
-             }
-         }
-@@ -429,10 +446,12 @@
-             try
-             {
-                 bufferedimage = this.func_78345_a(itexturepack.func_77532_a(s));
-+                TextureFXManager.instance().fixTransparency(bufferedimage, s);
-                 this.func_78340_a(bufferedimage, (int[])this.field_78359_d.get(s));
-             }
-            catch (IOException ioexception1)
-            {
-+            catch (Exception ioexception1)
-+            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file data %s (refreshTexture)", s), ioexception1);
-                 ioexception1.printStackTrace();
-             }
-         }
--- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/Texture.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/renderer/texture/Texture.java.patch
@ -1,63 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Texture.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Texture.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.renderer.texture;
- 
-+import cpw.mods.fml.client.TextureFXManager;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.awt.image.BufferedImage;
-@@ -9,6 +10,8 @@
- import javax.imageio.ImageIO;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.OpenGlHelper;
-+import net.minecraft.src.FMLRenderAccessLibrary;
-+
- import org.lwjgl.opengl.GL11;
- import org.lwjgl.opengl.GL12;
- 
-@@ -206,6 +209,12 @@
-     {
-         if (this.field_94300_h != 32879)
-         {
-+            if (field_94303_q && !p_94281_4_)
-+            {
-+                FMLRenderAccessLibrary.doTextureCopy(this, p_94281_3_, p_94281_1_, p_94281_2_);
-+                return;
-+            }
-+
-             ByteBuffer bytebuffer = p_94281_3_.func_94273_h();
-             this.field_94302_r.position(0);
-             bytebuffer.position(0);
-@@ -218,7 +227,7 @@
- 
-                 if (p_94281_4_)
-                 {
-                    l = p_94281_2_ + (p_94281_3_.func_94276_e() - k);
-+                    l = p_94281_1_ + (p_94281_3_.func_94276_e() - k - 1); //BUGFIX: targetY -> targetX and -1
-                 }
- 
-                 for (int k1 = 0; k1 < p_94281_3_.func_94275_d(); ++k1)
-@@ -228,7 +237,7 @@
- 
-                     if (p_94281_4_)
-                     {
-                        l1 = p_94281_1_ + k1 * this.field_94289_d * 4 + l * 4;
-+                        l1 = (p_94281_2_ + k1) * this.field_94289_d * 4 + l * 4; //BUGFIX: targetX -> targetY and parens
-                     }
- 
-                     this.field_94302_r.put(l1 + 0, bytebuffer.get(i2 + 0));
-@@ -378,4 +387,13 @@
-     {
-         return this.field_94302_r;
-     }
-+
-+    public void createAndUploadTexture()
-+    {
-+        this.field_94293_a = GL11.glGenTextures();
-+        GL11.glBindTexture(this.field_94300_h, this.field_94293_a);
-+        System.out.printf("Buffer %s %x %d is %s\n",field_94297_m, field_94300_h, field_94293_a, field_94302_r);
-+        field_94302_r.position(field_94302_r.limit());
-+        func_94285_g();
-+    }
- }
--- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch
@ -1,34 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.renderer.texture;
- 
-+import cpw.mods.fml.client.TextureFXManager;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -56,6 +57,11 @@
-         this.field_94230_o = (float)(p_94218_4_ + p_94218_6_) / (float)p_94218_1_.func_94276_e() - f1;
-         this.field_94238_p = (float)p_94218_5_ / 16.0F;
-         this.field_94237_q = (float)p_94218_6_ / 16.0F;
-+        TextureFXManager.instance().getHelper().doTextureUpload(this);
-+        if (this.field_94227_c)
-+        {
-+            TextureFXManager.instance().getHelper().rotateTexture(this.field_94228_a, this.field_94228_a.func_94273_h());
-+        }
-     }
- 
-     public void func_94217_a(TextureStitched p_94217_1_)
-@@ -198,4 +204,12 @@
-             this.field_94236_i = arraylist;
-         }
-     }
-+
-+    public void createAndUploadTextures()
-+    {
-+        for (Texture t : ((List<Texture>)field_94226_b))
-+        {
-+            t.createAndUploadTexture();
-+        }
-+    }
- }
--- a/fml/patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch
+++ b/fml/patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch
@ -8,7 +8,7 @@
 -        {
 -            return this.func_85085_a();
 -        }
-        catch (Exception e)
+-        catch (Exception ex)
 -        {
 -            return null;
 -        }