ForgePatch/fml/conf/patches/minecraft_ff.patch

diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java	Sat Mar 02 03:07:02 2013
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Mar 02 03:08:47 2013
@@ -531,9 +531,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;
@@ -551,7 +550,6 @@
                   this.func_71373_a(new GuiMemoryErrorScreen());
                   System.gc();
                }
-               continue;
             }
          } catch (MinecraftError var12) {
             ;
@@ -569,8 +567,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 Mar 02 03:07:03 2013
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Mar 02 03:08:47 2013
@@ -21,9 +21,14 @@
 
    public String func_85085_a() {
       StringBuilder var1 = new StringBuilder();
-      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 "";
+      }
       boolean var4 = true;
       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
       HashMap var6 = new HashMap();
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java	Sat Mar 02 03:07:03 2013
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Mar 02 03:08:47 2013
@@ -1,5 +1,6 @@
 package net.minecraft.src;
 
+import java.io.IOException;
 import java.io.InputStream;
 import net.minecraft.src.MusInputStream;
 import paulscode.sound.codecs.CodecJOrbis;
@@ -7,6 +8,10 @@
 public class CodecMus extends CodecJOrbis {
 
    protected InputStream openInputStream() {
-      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+      try {
+         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+      } catch (IOException e) {
+         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 Mar 02 03:07:03 2013
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Mar 02 03:08:47 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 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 Mar 02 03:07:03 2013
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Mar 02 03:08:47 2013
@@ -206,7 +206,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\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sat Mar 02 03:07:04 2013
+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sat Mar 02 03:08:47 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
    private EnumChatFormatting(char p_i10000_3_) {
-      this(p_i10000_1_, p_i10000_2_, p_i10000_3_, false);
+      this(p_i10000_3_, false);
    }
 
    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- minecraft\net\minecraft\src\FontRenderer.java	Sat Mar 02 03:07:04 2013
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Mar 02 03:08:47 2013
@@ -599,8 +599,6 @@
          case 10:
             --var5;
             break;
-         case 32:
-            var6 = var5;
          case 167:
             if(var5 < var3 - 1) {
                ++var5;
@@ -614,6 +612,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	Sat Mar 02 03:07:05 2013
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Mar 02 03:08:47 2013
@@ -101,7 +101,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\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
--- minecraft\net\minecraft\src\RenderBlocks.java	Sat Mar 02 03:07:06 2013
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sat Mar 02 03:08:49 2013
@@ -1967,16 +1967,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;
@@ -2022,7 +2022,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	Sat Mar 02 03:07:06 2013
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Mar 02 03:08:49 2013
@@ -1449,7 +1449,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\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Mar 02 03:07:06 2013
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Mar 02 03:08:49 2013
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
 
+   @SuppressWarnings("deprecation")
    public void run() {
       try {
          Thread.sleep(5000L);
diff -r -U 3 minecraft\net\minecraft\src\TexturePackCustom.java minecraft_patched\net\minecraft\src\TexturePackCustom.java
--- minecraft\net\minecraft\src\TexturePackCustom.java	Sat Mar 02 03:07:07 2013
+++ minecraft_patched\net\minecraft\src\TexturePackCustom.java	Sat Mar 02 03:11:52 2013
@@ -77,4 +77,9 @@
       boolean var4 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png");
       return !var4;
    }
+
+	@Override
+	public boolean func_94179_g() {
+		return true;
+	}
 }
diff -r -U 3 minecraft\net\minecraft\src\TexturePackDefault.java minecraft_patched\net\minecraft\src\TexturePackDefault.java
--- minecraft\net\minecraft\src\TexturePackDefault.java	Sat Mar 02 03:07:07 2013
+++ minecraft_patched\net\minecraft\src\TexturePackDefault.java	Sat Mar 02 03:11:52 2013
@@ -33,4 +33,9 @@
          return var2;
       }
    }
+
+	@Override
+	public boolean func_94179_g() {
+		return true;
+	}
 }
diff -r -U 3 minecraft\net\minecraft\src\TexturePackFolder.java minecraft_patched\net\minecraft\src\TexturePackFolder.java
--- minecraft\net\minecraft\src\TexturePackFolder.java	Sat Mar 02 03:07:07 2013
+++ minecraft_patched\net\minecraft\src\TexturePackFolder.java	Sat Mar 02 03:11:52 2013
@@ -35,4 +35,9 @@
       boolean var3 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png");
       return var2 || !var3;
    }
+
+	@Override
+	public boolean func_94179_g() {
+		return true;
+	}
 }
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Mar 02 03:07:07 2013
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Mar 02 03:08:49 2013
@@ -20,7 +20,8 @@
    }
 
    public void run() {
-      this.func_75736_b();
+      while(true)
+         this.func_75736_b();
    }
 
    private void func_75736_b() {