ForgePatch/forge/conf/patches/minecraft.patch

diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Mar 30 23:49:03 2012
@@ -847,8 +847,7 @@
         }
         profilerresult = (ProfilerResult)list.remove(0);
         if(!(p_40003_1_ != 0))
-## JADFIX _L1 _L2
-_L1:
+        {
         if(profilerresult.field_40703_c.length() > 0)
         {
             int i = field_40006_ak.lastIndexOf(".");
@@ -857,18 +856,15 @@
                 field_40006_ak = field_40006_ak.substring(0, i);
             }
         }
-          goto _L3
-_L2:
+        } else
         if(!(--p_40003_1_ >= list.size() || ((ProfilerResult)list.get(p_40003_1_)).field_40703_c.equals("unspecified")))
-## JADFIX _L4 _L3
-_L4:
+        {
         if(!(field_40006_ak.length() <= 0))
-## JADFIX _L5 _L6
-_L5:
+        {
         field_40006_ak += ".";
-_L6:
+        }
         field_40006_ak += ((ProfilerResult)list.get(p_40003_1_)).field_40703_c;
-_L3:
+        }
     }
 
     private void func_6238_a(long p_6238_1_)
diff -r -U 3 minecraft\net\minecraft\client\MinecraftApplet.java minecraft_patched\net\minecraft\client\MinecraftApplet.java
--- minecraft\net\minecraft\client\MinecraftApplet.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\client\MinecraftApplet.java	Fri Mar 30 23:49:03 2012
@@ -37,10 +37,9 @@
         field_6234_b = new MinecraftAppletImpl(this, this, field_6235_a, this, getWidth(), getHeight(), flag);
         field_6234_b.field_6319_j = getDocumentBase().getHost();
         if(!(getDocumentBase().getPort() <= 0))
-## JADFIX _L1 _L2
-_L1:
+        {
         field_6234_b.field_6319_j += ":" + getDocumentBase().getPort();
-_L2:
+        }
         if(getParameter("username") != null && getParameter("sessionid") != null)
         {
             field_6234_b.field_6320_i = new Session(getParameter("username"), getParameter("sessionid"));
diff -r -U 3 minecraft\net\minecraft\src\Block.java minecraft_patched\net\minecraft\src\Block.java
--- minecraft\net\minecraft\src\Block.java	Fri Mar 30 23:47:16 2012
+++ minecraft_patched\net\minecraft\src\Block.java	Fri Mar 30 23:49:03 2012
@@ -51,11 +51,11 @@
     public static final StepSound field_9248_k;
     public static final StepSound field_9247_l;
     public static final Block field_345_n[];
-    public static final boolean field_343_p[] = new boolean[4096];
-    public static final int field_341_r[] = new int[4096];
+    public static final boolean field_343_p[];
+    public static final int field_341_r[];
     public static final boolean field_340_s[];
-    public static final int field_339_t[] = new int[4096];
-    public static final boolean field_28032_t[] = new boolean[4096];
+    public static final int field_339_t[];
+    public static final boolean field_28032_t[];
     public static boolean field_40201_bL[];
     public static final Block field_338_u;
     public static final BlockGrass field_337_v;
@@ -81,18 +81,18 @@
     public static final Block field_9266_O;
     public static final Block field_9265_P;
     public static final Block field_9264_Q;
-    public static final Block field_9263_R = (new BlockNote(25)).func_222_c(0.8F).func_20012_a("musicBlock").func_28031_n();
-    public static final Block field_9262_S = (new BlockBed(26)).func_222_c(0.2F).func_20012_a("bed").func_27032_l().func_28031_n();
+    public static final Block field_9263_R;
+    public static final Block field_9262_S;
     public static final Block field_9261_T;
     public static final Block field_9260_U;
     public static final Block field_9259_V;
-    public static final Block field_9258_W = (new BlockWeb(30, 11)).func_256_d(1).func_222_c(4F).func_20012_a("web");
+    public static final Block field_9258_W;
     public static final BlockTallGrass field_9257_X;
     public static final BlockDeadBush field_9256_Y;
     public static final Block field_9255_Z;
-    public static final BlockPistonExtension field_9269_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28031_n();
+    public static final BlockPistonExtension field_9269_aa;
     public static final Block field_419_ac;
-    public static final BlockPistonMoving field_9268_ac = new BlockPistonMoving(36);
+    public static final BlockPistonMoving field_9268_ac;
     public static final BlockFlower field_417_ae;
     public static final BlockFlower field_416_af;
     public static final BlockFlower field_415_ag;
@@ -153,7 +153,7 @@
     public static final Block field_22020_bi;
     public static final Block field_25017_bj;
     public static final Block field_28033_bl;
-    public static final Block field_35289_bm = (new BlockSilverfish(97)).func_222_c(0.75F);
+    public static final Block field_35289_bm;
     public static final Block field_35285_bn;
     public static final Block field_35286_bo;
     public static final Block field_35287_bp;
@@ -171,10 +171,10 @@
     public static final Block field_40206_bB;
     public static final Block field_40207_bC;
     public static final Block field_40204_bD;
-    public static final Block field_40205_bE = (new BlockNetherStalk(115)).func_20012_a("netherStalk").func_28031_n();
-    public static final Block field_40210_bF = (new BlockEnchantmentTable(116)).func_222_c(5F).func_219_b(2000F).func_20012_a("enchantmentTable");
-    public static final Block field_40211_bG = (new BlockBrewingStand(117)).func_222_c(0.5F).func_215_a(0.125F).func_20012_a("brewingStand").func_28031_n();
-    public static final Block field_40208_bH = (new BlockCauldron(118)).func_222_c(2.0F).func_20012_a("cauldron").func_28031_n();
+    public static final Block field_40205_bE;
+    public static final Block field_40210_bF;
+    public static final Block field_40211_bG;
+    public static final Block field_40208_bH;
     public static final Block field_40209_bI;
     public static final Block field_40202_bJ;
     public static final Block field_40203_bK;
@@ -854,7 +854,11 @@
         field_9248_k = new StepSound("cloth", 1.0F, 1.0F);
         field_9247_l = new StepSoundSand("sand", 1.0F, 1.0F);
         field_345_n = new Block[4096];
+        field_343_p = new boolean[4096];
+        field_341_r = new int[4096];
         field_340_s = new boolean[4096];
+        field_339_t = new int[4096];
+        field_28032_t = new boolean[4096];
         field_40201_bL = new boolean[4096];
         field_338_u = (new BlockStone(1, 1)).func_222_c(1.5F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("stone");
         field_337_v = (BlockGrass)(new BlockGrass(2)).func_222_c(0.6F).func_4024_a(field_9252_g).func_20012_a("grass");
@@ -880,13 +884,18 @@
         field_9266_O = (new Block(22, 144, Material.field_1334_d)).func_222_c(3F).func_219_b(5F).func_4024_a(field_9251_h).func_20012_a("blockLapis");
         field_9265_P = (new BlockDispenser(23)).func_222_c(3.5F).func_4024_a(field_9251_h).func_20012_a("dispenser").func_28031_n();
         field_9264_Q = (new BlockSandStone(24)).func_4024_a(field_9251_h).func_222_c(0.8F).func_20012_a("sandStone").func_28031_n();
+        field_9263_R = (new BlockNote(25)).func_222_c(0.8F).func_20012_a("musicBlock").func_28031_n();
+        field_9262_S = (new BlockBed(26)).func_222_c(0.2F).func_20012_a("bed").func_27032_l().func_28031_n();
         field_9261_T = (new BlockRail(27, 179, true)).func_222_c(0.7F).func_4024_a(field_9250_i).func_20012_a("goldenRail").func_28031_n();
         field_9260_U = (new BlockDetectorRail(28, 195)).func_222_c(0.7F).func_4024_a(field_9250_i).func_20012_a("detectorRail").func_28031_n();
         field_9259_V = (new BlockPistonBase(29, 106, true)).func_20012_a("pistonStickyBase").func_28031_n();
+        field_9258_W = (new BlockWeb(30, 11)).func_256_d(1).func_222_c(4F).func_20012_a("web");
         field_9257_X = (BlockTallGrass)(new BlockTallGrass(31, 39)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("tallgrass");
         field_9256_Y = (BlockDeadBush)(new BlockDeadBush(32, 55)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("deadbush");
         field_9255_Z = (new BlockPistonBase(33, 107, false)).func_20012_a("pistonBase").func_28031_n();
+        field_9269_aa = (BlockPistonExtension)(new BlockPistonExtension(34, 107)).func_28031_n();
         field_419_ac = (new BlockCloth()).func_222_c(0.8F).func_4024_a(field_9248_k).func_20012_a("cloth").func_28031_n();
+        field_9268_ac = new BlockPistonMoving(36);
         field_417_ae = (BlockFlower)(new BlockFlower(37, 13)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("flower");
         field_416_af = (BlockFlower)(new BlockFlower(38, 12)).func_222_c(0.0F).func_4024_a(field_9252_g).func_20012_a("rose");
         field_415_ag = (BlockFlower)(new BlockMushroom(39, 29)).func_222_c(0.0F).func_4024_a(field_9252_g).func_215_a(0.125F).func_20012_a("mushroom");
@@ -947,6 +956,7 @@
         field_22020_bi = (new BlockRedstoneRepeater(94, true)).func_222_c(0.0F).func_215_a(0.625F).func_4024_a(field_9254_e).func_20012_a("diode").func_27032_l().func_28031_n();
         field_25017_bj = (new BlockLockedChest(95)).func_222_c(0.0F).func_215_a(1.0F).func_4024_a(field_9254_e).func_20012_a("lockedchest").func_253_b(true).func_28031_n();
         field_28033_bl = (new BlockTrapDoor(96, Material.field_1335_c)).func_222_c(3F).func_4024_a(field_9254_e).func_20012_a("trapdoor").func_27032_l().func_28031_n();
+        field_35289_bm = (new BlockSilverfish(97)).func_222_c(0.75F);
         field_35285_bn = (new BlockStoneBrick(98)).func_222_c(1.5F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("stonebricksmooth");
         field_35286_bo = (new BlockMushroomCap(99, Material.field_1335_c, 142, 0)).func_222_c(0.2F).func_4024_a(field_9254_e).func_20012_a("mushroom").func_28031_n();
         field_35287_bp = (new BlockMushroomCap(100, Material.field_1335_c, 142, 1)).func_222_c(0.2F).func_4024_a(field_9254_e).func_20012_a("mushroom").func_28031_n();
@@ -964,6 +974,10 @@
         field_40206_bB = (new Block(112, 224, Material.field_1334_d)).func_222_c(2.0F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("netherBrick");
         field_40207_bC = (new BlockFence(113, 224, Material.field_1334_d)).func_222_c(2.0F).func_219_b(10F).func_4024_a(field_9251_h).func_20012_a("netherFence");
         field_40204_bD = (new BlockStairs(114, field_40206_bB)).func_20012_a("stairsNetherBrick").func_28031_n();
+        field_40205_bE = (new BlockNetherStalk(115)).func_20012_a("netherStalk").func_28031_n();
+        field_40210_bF = (new BlockEnchantmentTable(116)).func_222_c(5F).func_219_b(2000F).func_20012_a("enchantmentTable");
+        field_40211_bG = (new BlockBrewingStand(117)).func_222_c(0.5F).func_215_a(0.125F).func_20012_a("brewingStand").func_28031_n();
+        field_40208_bH = (new BlockCauldron(118)).func_222_c(2.0F).func_20012_a("cauldron").func_28031_n();
         field_40209_bI = (new BlockEndPortal(119, Material.field_4260_x)).func_222_c(-1F).func_219_b(6000000F);
         field_40202_bJ = (new BlockEndPortalFrame(120)).func_4024_a(field_9249_j).func_215_a(0.125F).func_222_c(-1F).func_20012_a("endPortalFrame").func_28031_n().func_219_b(6000000F);
         field_40203_bK = (new Block(121, 175, Material.field_1334_d)).func_222_c(3F).func_219_b(15F).func_4024_a(field_9251_h).func_20012_a("whiteStone");
diff -r -U 3 minecraft\net\minecraft\src\ChatClickData.java minecraft_patched\net\minecraft\src\ChatClickData.java
--- minecraft\net\minecraft\src\ChatClickData.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\ChatClickData.java	Fri Mar 30 23:49:03 2012
@@ -23,7 +23,7 @@
     private final int field_50093_d;
     private final int field_50094_e;
     private final String field_50091_f;
-    private final String field_50092_g = func_50090_c();
+    private final String field_50092_g;
 
     public ChatClickData(FontRenderer p_i1203_1_, ChatLine p_i1203_2_, int p_i1203_3_, int p_i1203_4_)
     {
@@ -32,6 +32,7 @@
         field_50093_d = p_i1203_3_;
         field_50094_e = p_i1203_4_;
         field_50091_f = p_i1203_1_.func_50107_a(p_i1203_2_.field_1297_a, p_i1203_3_);
+        field_50092_g = func_50090_c();
     }
 
     public String func_50088_a()
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Mar 30 23:49:03 2012
@@ -20,6 +20,9 @@
 
     protected InputStream openInputStream()
     {
+    	try {
         return new MusInputStream(this, url, urlConnection.getInputStream());
+        }
+    	catch(Throwable t) { return null; }
     }
 }
diff -r -U 3 minecraft\net\minecraft\src\ComponentNetherBridgePiece.java minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java
--- minecraft\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:47:17 2012
+++ minecraft_patched\net\minecraft\src\ComponentNetherBridgePiece.java	Fri Mar 30 23:49:03 2012
@@ -35,51 +35,41 @@
         return flag ? i : -1;
     }
 
-    private ComponentNetherBridgePiece func_40020_a(ComponentNetherBridgeStartPiece p_40020_1_, List p_40020_2_, List p_40020_3_, Random p_40020_4_, int p_40020_5_, int p_40020_6_, int p_40020_7_, int p_40020_8_, int p_40020_9_)
-    {
-        int i;
-        boolean flag;
-        int j;
-        i = func_40017_a(p_40020_2_);
-        flag = i > 0 && p_40020_9_ <= 30;
-        j = 0;
-_L2:
-        int k;
-        Iterator iterator;
-        if(j >= 5 || !flag)
-        {
-            break MISSING_BLOCK_LABEL_195;
+    private ComponentNetherBridgePiece func_40020_a(ComponentNetherBridgeStartPiece p_40020_1_, List p_40020_2_, List p_40020_3_, Random p_40020_4_, int p_40020_5_, int p_40020_6_, int p_40020_7_, int p_40020_8_, int p_40020_9_) {
+        int var10 = this.func_40017_a(p_40020_2_);
+        boolean var11 = var10 > 0 && p_40020_9_ <= 30;
+        int var12 = 0;
+
+        while(var12 < 5 && var11) {
+           ++var12;
+           int var13 = p_40020_4_.nextInt(var10);
+           Iterator var14 = p_40020_2_.iterator();
+
+           while(var14.hasNext()) {
+              StructureNetherBridgePieceWeight var15 = (StructureNetherBridgePieceWeight)var14.next();
+              var13 -= var15.field_40697_b;
+              if(var13 < 0) {
+                 if(!var15.func_40693_a(p_40020_9_) || var15 == p_40020_1_.field_40037_a && !var15.field_40696_e) {
+                    break;
+                 }
+
+                 ComponentNetherBridgePiece var16 = StructureNetherBridgePieces.func_40688_a(var15, p_40020_3_, p_40020_4_, p_40020_5_, p_40020_6_, p_40020_7_, p_40020_8_, p_40020_9_);
+                 if(var16 != null) {
+                    ++var15.field_40698_c;
+                    p_40020_1_.field_40037_a = var15;
+                    if(!var15.func_40694_a()) {
+                       p_40020_2_.remove(var15);
+                    }
+
+                    return var16;
+                 }
+              }
+           }
         }
-        j++;
-        k = p_40020_4_.nextInt(i);
-        iterator = p_40020_2_.iterator();
-_L4:
-        if(!(!iterator.hasNext()))
-## JADFIX _L1 _L2
-_L1:
-        StructureNetherBridgePieceWeight structurenetherbridgepieceweight;
-        structurenetherbridgepieceweight = (StructureNetherBridgePieceWeight)iterator.next();
-        k -= structurenetherbridgepieceweight.field_40697_b;
-        if(!(k >= 0))
-## JADFIX _L3 _L4
-_L3:
-        if(structurenetherbridgepieceweight.func_40693_a(p_40020_9_) && (structurenetherbridgepieceweight != p_40020_1_.field_40037_a || structurenetherbridgepieceweight.field_40696_e))
-## JADFIX _L5 _L2
-_L5:
-        ComponentNetherBridgePiece componentnetherbridgepiece = StructureNetherBridgePieces.func_40688_a(structurenetherbridgepieceweight, p_40020_3_, p_40020_4_, p_40020_5_, p_40020_6_, p_40020_7_, p_40020_8_, p_40020_9_);
-        if(!(componentnetherbridgepiece == null))
-## JADFIX _L6 _L4
-_L6:
-        structurenetherbridgepieceweight.field_40698_c++;
-        p_40020_1_.field_40037_a = structurenetherbridgepieceweight;
-        if(!structurenetherbridgepieceweight.func_40694_a())
-        {
-            p_40020_2_.remove(structurenetherbridgepieceweight);
-        }
-        return componentnetherbridgepiece;
-        ComponentNetherBridgeEnd componentnetherbridgeend = ComponentNetherBridgeEnd.func_40023_a(p_40020_3_, p_40020_4_, p_40020_5_, p_40020_6_, p_40020_7_, p_40020_8_, p_40020_9_);
-        return componentnetherbridgeend;
-    }
+
+        ComponentNetherBridgeEnd var17 = ComponentNetherBridgeEnd.func_40023_a(p_40020_3_, p_40020_4_, p_40020_5_, p_40020_6_, p_40020_7_, p_40020_8_, p_40020_9_);
+        return var17;
+     }
 
     private StructureComponent func_40018_a(ComponentNetherBridgeStartPiece p_40018_1_, List p_40018_2_, Random p_40018_3_, int p_40018_4_, int p_40018_5_, int p_40018_6_, int p_40018_7_, int p_40018_8_, boolean p_40018_9_)
     {
diff -r -U 3 minecraft\net\minecraft\src\GenLayer.java minecraft_patched\net\minecraft\src\GenLayer.java
--- minecraft\net\minecraft\src\GenLayer.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GenLayer.java	Fri Mar 30 23:49:04 2012
@@ -20,7 +20,7 @@
 
     public static GenLayer[] func_48425_a(long p_48425_0_, WorldType p_48425_2_)
     {
-        Object obj = new GenLayerIsland(1L);
+    	GenLayer obj = new GenLayerIsland(1L);
         obj = new GenLayerFuzzyZoom(2000L, ((GenLayer) (obj)));
         obj = new GenLayerAddIsland(1L, ((GenLayer) (obj)));
         obj = new GenLayerZoom(2001L, ((GenLayer) (obj)));
@@ -32,13 +32,13 @@
         obj = new GenLayerAddIsland(4L, ((GenLayer) (obj)));
         obj = new GenLayerAddMushroomIsland(5L, ((GenLayer) (obj)));
         byte byte0 = 4;
-        Object obj1 = obj;
+        GenLayer obj1 = obj;
         obj1 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj1)), 0);
         obj1 = new GenLayerRiverInit(100L, ((GenLayer) (obj1)));
         obj1 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj1)), byte0 + 2);
         obj1 = new GenLayerRiver(1L, ((GenLayer) (obj1)));
         obj1 = new GenLayerSmooth(1000L, ((GenLayer) (obj1)));
-        Object obj2 = obj;
+        GenLayer obj2 = obj;
         obj2 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj2)), 0);
         obj2 = new GenLayerBiome(200L, ((GenLayer) (obj2)), p_48425_2_);
         obj2 = GenLayerZoom.func_35515_a(1000L, ((GenLayer) (obj2)), 2);
diff -r -U 3 minecraft\net\minecraft\src\GuiCreateWorld.java minecraft_patched\net\minecraft\src\GuiCreateWorld.java
--- minecraft\net\minecraft\src\GuiCreateWorld.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GuiCreateWorld.java	Fri Mar 30 23:49:04 2012
@@ -102,13 +102,11 @@
         field_35369_v = stringtranslate.func_20163_a((new StringBuilder()).append("selectWorld.gameMode.").append(field_35364_f).append(".line2").toString());
         field_35372_s.field_939_e = (new StringBuilder()).append(stringtranslate.func_20163_a("selectWorld.mapFeatures")).append(" ").toString();
         if(!(!field_35365_g))
-## JADFIX _L1 _L2
-_L1:
+        {
         field_35372_s.field_939_e += stringtranslate.func_20163_a("options.on");
-          goto _L3
-_L2:
+        } else {
         field_35372_s.field_939_e += stringtranslate.func_20163_a("options.off");
-_L3:
+        }
         field_35371_t.field_939_e = (new StringBuilder()).append(stringtranslate.func_20163_a("selectWorld.mapType")).append(" ").append(stringtranslate.func_20163_a(WorldType.field_48637_a[field_46030_z].func_46136_a())).toString();
         return;
     }
diff -r -U 3 minecraft\net\minecraft\src\GuiEditSign.java minecraft_patched\net\minecraft\src\GuiEditSign.java
--- minecraft\net\minecraft\src\GuiEditSign.java	Fri Mar 30 23:47:20 2012
+++ minecraft_patched\net\minecraft\src\GuiEditSign.java	Fri Mar 30 23:49:04 2012
@@ -81,10 +81,9 @@
             field_1002_h.field_826_a[field_1000_j] = field_1002_h.field_826_a[field_1000_j].substring(0, field_1002_h.field_826_a[field_1000_j].length() - 1);
         }
         if(!(field_20083_l.indexOf(p_580_1_) < 0 || field_1002_h.field_826_a[field_1000_j].length() >= 15))
-## JADFIX _L1 _L2
-_L1:
+        {
         field_1002_h.field_826_a[field_1000_j] += p_580_1_;
-_L2:
+        }
     }
 
     public void func_571_a(int p_571_1_, int p_571_2_, float p_571_3_)
diff -r -U 3 minecraft\net\minecraft\src\GuiVideoSettings.java minecraft_patched\net\minecraft\src\GuiVideoSettings.java
--- minecraft\net\minecraft\src\GuiVideoSettings.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\GuiVideoSettings.java	Fri Mar 30 23:49:04 2012
@@ -38,7 +38,7 @@
         int j = aobj.length;
         for(int k = 0; k < j; k++)
         {
-            EnumOptions enumoptions = aobj[k];
+            EnumOptions enumoptions = (EnumOptions) aobj[k];
             if(!enumoptions.func_20136_a())
             {
                 field_949_e.add(new GuiSmallButton(enumoptions.func_20135_c(), (field_951_c / 2 - 155) + (i % 2) * 160, field_950_d / 6 + 24 * (i >> 1), enumoptions, field_22109_i.func_1043_a(enumoptions)));
diff -r -U 3 minecraft\net\minecraft\src\MapGenCaves.java minecraft_patched\net\minecraft\src\MapGenCaves.java
--- minecraft\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenCaves.java	Fri Mar 30 23:49:04 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
             boolean flag2 = false;
-            for(int j1 = d4; !flag2 && j1 < k; j1++)
+            for(int j1 = (int) d4; !flag2 && j1 < k; j1++)
             {
-                for(int l1 = d6; !flag2 && l1 < i1; l1++)
+                for(int l1 = (int) d6; !flag2 && l1 < i1; l1++)
                 {
                     for(int i2 = l + 1; !flag2 && i2 >= d5 - 1; i2--)
                     {
@@ -134,7 +134,7 @@
                         }
                         if(i2 != d5 - 1 && j1 != d4 && j1 != k - 1 && l1 != d6 && l1 != i1 - 1)
                         {
-                            i2 = d5;
+                            i2 = (int) d5;
                         }
                     }
 
@@ -146,11 +146,11 @@
             {
                 continue;
             }
-            for(int k1 = d4; k1 < k; k1++)
+            for(int k1 = (int) d4; k1 < k; k1++)
             {
                 double d8 = (((double)(k1 + p_869_3_ * 16) + 0.5D) - p_869_6_) / d2;
 label0:
-                for(int k2 = d6; k2 < i1; k2++)
+                for(int k2 = (int) d6; k2 < i1; k2++)
                 {
                     double d9 = (((double)(k2 + p_869_4_ * 16) + 0.5D) - p_869_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
diff -r -U 3 minecraft\net\minecraft\src\MapGenCavesHell.java minecraft_patched\net\minecraft\src\MapGenCavesHell.java
--- minecraft\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenCavesHell.java	Fri Mar 30 23:49:04 2012
@@ -117,9 +117,9 @@
                 i1 = 16;
             }
             boolean flag2 = false;
-            for(int j1 = d4; !flag2 && j1 < k; j1++)
+            for(int j1 = (int) d4; !flag2 && j1 < k; j1++)
             {
-                for(int l1 = d6; !flag2 && l1 < i1; l1++)
+                for(int l1 = (int) d6; !flag2 && l1 < i1; l1++)
                 {
                     for(int i2 = l + 1; !flag2 && i2 >= d5 - 1; i2--)
                     {
@@ -134,7 +134,7 @@
                         }
                         if(i2 != d5 - 1 && j1 != d4 && j1 != k - 1 && l1 != d6 && l1 != i1 - 1)
                         {
-                            i2 = d5;
+                            i2 = (int) d5;
                         }
                     }
 
@@ -146,10 +146,10 @@
             {
                 continue;
             }
-            for(int k1 = d4; k1 < k; k1++)
+            for(int k1 = (int) d4; k1 < k; k1++)
             {
                 double d8 = (((double)(k1 + p_4128_1_ * 16) + 0.5D) - p_4128_4_) / d2;
-                for(int k2 = d6; k2 < i1; k2++)
+                for(int k2 = (int) d6; k2 < i1; k2++)
                 {
                     double d9 = (((double)(k2 + p_4128_2_ * 16) + 0.5D) - p_4128_8_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
diff -r -U 3 minecraft\net\minecraft\src\MapGenRavine.java minecraft_patched\net\minecraft\src\MapGenRavine.java
--- minecraft\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:47:21 2012
+++ minecraft_patched\net\minecraft\src\MapGenRavine.java	Fri Mar 30 23:49:04 2012
@@ -113,9 +113,9 @@
                 i1 = 16;
             }
             boolean flag1 = false;
-            for(int j1 = d4; !flag1 && j1 < k; j1++)
+            for(int j1 = (int) d4; !flag1 && j1 < k; j1++)
             {
-                for(int l1 = d6; !flag1 && l1 < i1; l1++)
+                for(int l1 = (int) d6; !flag1 && l1 < i1; l1++)
                 {
                     for(int i2 = l + 1; !flag1 && i2 >= d5 - 1; i2--)
                     {
@@ -130,7 +130,7 @@
                         }
                         if(i2 != d5 - 1 && j1 != d4 && j1 != k - 1 && l1 != d6 && l1 != i1 - 1)
                         {
-                            i2 = d5;
+                            i2 = (int) d5;
                         }
                     }
 
@@ -142,11 +142,11 @@
             {
                 continue;
             }
-            for(int k1 = d4; k1 < k; k1++)
+            for(int k1 = (int) d4; k1 < k; k1++)
             {
                 double d8 = (((double)(k1 + p_35626_3_ * 16) + 0.5D) - p_35626_6_) / d2;
 label0:
-                for(int k2 = d6; k2 < i1; k2++)
+                for(int k2 = (int) d6; k2 < i1; k2++)
                 {
                     double d9 = (((double)(k2 + p_35626_4_ * 16) + 0.5D) - p_35626_10_) / d2;
                     int l2 = (k1 * 16 + k2) * 128 + l;
diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
--- minecraft\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java	Fri Mar 30 23:49:04 2012
@@ -42,7 +42,10 @@
 
     public int read(byte p_read_1_[], int p_read_2_, int p_read_3_)
     {
+    	try {
         p_read_3_ = field_1515_d.read(p_read_1_, p_read_2_, p_read_3_);
+        }
+    	catch(Throwable t) { return 0; }
         for(int i = 0; i < p_read_3_; i++)
         {
             byte byte0 = p_read_1_[p_read_2_ + i] ^= field_1516_c >> 8;
diff -r -U 3 minecraft\net\minecraft\src\NetClientHandler.java minecraft_patched\net\minecraft\src\NetClientHandler.java
--- minecraft\net\minecraft\src\NetClientHandler.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetClientHandler.java	Fri Mar 30 23:49:04 2012
@@ -114,7 +114,7 @@
         double d = (double)p_835_1_.field_499_b / 32D;
         double d1 = (double)p_835_1_.field_503_c / 32D;
         double d2 = (double)p_835_1_.field_502_d / 32D;
-        Object obj = null;
+        Entity obj = null;
         if(p_835_1_.field_501_e == 10)
         {
             obj = new EntityMinecart(field_1211_f, d, d1, d2, 0);
diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patched\net\minecraft\src\NetworkMasterThread.java
--- minecraft\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java	Fri Mar 30 23:49:04 2012
@@ -17,6 +17,7 @@
         field_1086_a = p_i570_1_;
     }
 
+    @SuppressWarnings("deprecation")
     public void run()
     {
         try
diff -r -U 3 minecraft\net\minecraft\src\NetworkReaderThread.java minecraft_patched\net\minecraft\src\NetworkReaderThread.java
--- minecraft\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkReaderThread.java	Fri Mar 30 23:49:04 2012
@@ -24,6 +24,7 @@
         {
             NetworkManager.field_1477_b++;
         }
+        try {
         while(NetworkManager.func_971_a(field_1085_a) && !NetworkManager.func_968_b(field_1085_a))
         {
             while(NetworkManager.func_966_c(field_1085_a)) ;
@@ -33,17 +34,11 @@
             }
             catch(InterruptedException interruptedexception) { }
         }
+        } finally {
         synchronized(NetworkManager.field_1478_a)
         {
             NetworkManager.field_1477_b--;
         }
-        break MISSING_BLOCK_LABEL_131;
-        Exception exception2;
-        exception2;
-        synchronized(NetworkManager.field_1478_a)
-        {
-            NetworkManager.field_1477_b--;
         }
-        throw exception2;
     }
 }
diff -r -U 3 minecraft\net\minecraft\src\NetworkWriterThread.java minecraft_patched\net\minecraft\src\NetworkWriterThread.java
--- minecraft\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:47:22 2012
+++ minecraft_patched\net\minecraft\src\NetworkWriterThread.java	Fri Mar 30 23:49:04 2012
@@ -27,6 +27,7 @@
         {
             NetworkManager.field_1476_c++;
         }
+        try {
         while(NetworkManager.func_971_a(field_1063_a))
         {
             while(NetworkManager.func_965_d(field_1063_a)) ;
@@ -51,17 +52,11 @@
             }
             catch(InterruptedException interruptedexception) { }
         }
+        } finally {
         synchronized(NetworkManager.field_1478_a)
         {
             NetworkManager.field_1476_c--;
         }
-        break MISSING_BLOCK_LABEL_167;
-        Exception exception2;
-        exception2;
-        synchronized(NetworkManager.field_1478_a)
-        {
-            NetworkManager.field_1476_c--;
         }
-        throw exception2;
     }
 }
diff -r -U 3 minecraft\net\minecraft\src\PathNavigate.java minecraft_patched\net\minecraft\src\PathNavigate.java
--- minecraft\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\PathNavigate.java	Fri Mar 30 23:49:04 2012
@@ -184,21 +184,21 @@
     {
         Vec3D vec3d = func_48661_h();
         int i = field_46075_c.func_48644_d();
-        float f = field_46075_c.func_48643_e();
+        int i2 = field_46075_c.func_48643_e();
         do
         {
-            if(f >= field_46075_c.func_48644_d())
+            if(i2 >= field_46075_c.func_48644_d())
             {
                 break;
             }
-            if(field_46075_c.func_48648_a(f).field_1717_b != (int)vec3d.field_1775_b)
+            if(field_46075_c.func_48648_a(i2).field_1717_b != (int)vec3d.field_1775_b)
             {
-                i = f;
+                i = i2;
                 break;
             }
-            f++;
+            i2++;
         } while(true);
-        f = field_46076_a.field_644_aC * field_46076_a.field_644_aC;
+        float f = field_46076_a.field_644_aC * field_46076_a.field_644_aC;
         for(int j = field_46075_c.func_48643_e(); j < i; j++)
         {
             if(vec3d.func_1261_d(field_46075_c.func_48646_a(field_46076_a, j)) < (double)f)
diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
--- minecraft\net\minecraft\src\RenderBlocks.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Fri Mar 30 23:49:04 2012
@@ -1678,7 +1678,7 @@
         tessellator.func_35835_b(p_35929_1_.func_35275_c(field_1772_a, p_35929_2_, p_35929_3_, p_35929_4_));
         int j = p_35929_1_.func_207_d(field_1772_a, p_35929_2_, p_35929_3_, p_35929_4_);
         float f1 = (float)(j >> 16 & 0xff) / 255F;
-        double d = (float)(j >> 8 & 0xff) / 255F;
+        float d = (float)(j >> 8 & 0xff) / 255F;
         float f2 = (float)(j & 0xff) / 255F;
         tessellator.func_987_a(f * f1, f * d, f * f2);
         j = (i & 0xf) << 4;
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:47:23 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Mar 30 23:49:04 2012
@@ -507,7 +507,7 @@
             do
             {
                 Profiler.func_40661_c("occ");
-                byte byte0 = l;
+                int byte0 = l;
                 l *= 2;
                 if(l > field_1445_n.length)
                 {
@@ -831,7 +831,7 @@
         float f7 = 0.0F;
         float f9 = 0.0F;
         float f12 = 0.0F;
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, d);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, (float) d);
         GL11.glTranslatef(f7, f9, f12);
         GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
         GL11.glRotatef(field_1448_k.func_619_c(p_4142_1_) * 360F, 1.0F, 0.0F, 0.0F);
@@ -845,9 +845,9 @@
         tessellator1.func_982_a();
         f15 = 20F;
         GL11.glBindTexture(3553, field_1447_l.func_1070_a("/terrain/moon_phases.png"));
-        float f18 = field_1448_k.func_40475_d(p_4142_1_);
-        int l = f18 % 4;
-        int i1 = (f18 / 4) % 2;
+        int i18 = field_1448_k.func_40475_d(p_4142_1_);
+        int l = i18 % 4;
+        int i1 = (i18 / 4) % 2;
         float f24 = (float)(l + 0) / 4F;
         float f25 = (float)(i1 + 0) / 2.0F;
         float f26 = (float)(l + 1) / 4F;
@@ -859,7 +859,7 @@
         tessellator1.func_983_a(-f15, -100D, -f15, f26, f25);
         tessellator1.func_982_a();
         GL11.glDisable(3553);
-        f18 = field_1448_k.func_679_f(p_4142_1_) * d;
+        float f18 = (float) (field_1448_k.func_679_f(p_4142_1_) * d);
         if(f18 > 0.0F)
         {
             GL11.glColor4f(f18, f18, f18, f18);
diff -r -U 3 minecraft\net\minecraft\src\RenderXPOrb.java minecraft_patched\net\minecraft\src\RenderXPOrb.java
--- minecraft\net\minecraft\src\RenderXPOrb.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\RenderXPOrb.java	Fri Mar 30 23:49:04 2012
@@ -38,12 +38,12 @@
         float f4 = 1.0F;
         float f5 = 0.5F;
         float f6 = 0.25F;
-        float f7 = p_35438_1_.func_35115_a(p_35438_9_);
-        float f8 = f7 % 0x10000;
-        int j = f7 / 0x10000;
+        int i7 = p_35438_1_.func_35115_a(p_35438_9_);
+        float f8 = i7 % 0x10000;
+        int j = i7 / 0x10000;
         OpenGlHelper.func_40454_a(OpenGlHelper.field_40455_b, (float)f8 / 1.0F, (float)j / 1.0F);
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        f7 = 255F;
+        float f7 = 255F;
         f8 = ((float)p_35438_1_.field_35127_a + p_35438_9_) / 2.0F;
         j = (int)((MathHelper.func_1106_a(f8 + 0.0F) + 1.0F) * 0.5F * f7);
         int k = (int)f7;
diff -r -U 3 minecraft\net\minecraft\src\SpawnerAnimals.java minecraft_patched\net\minecraft\src\SpawnerAnimals.java
--- minecraft\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\SpawnerAnimals.java	Fri Mar 30 23:49:04 2012
@@ -33,172 +33,127 @@
         return new ChunkPosition(i, j, k);
     }
 
-    public static final int func_4154_a(World p_4154_0_, boolean p_4154_1_, boolean p_4154_2_)
-    {
-        int j;
-        ChunkCoordinates chunkcoordinates;
-        EnumCreatureType aenumcreaturetype[];
-        int i1;
-        int j1;
-        if(!p_4154_1_ && !p_4154_2_)
-        {
-            return 0;
-        }
-        field_6544_a.clear();
-        for(int i = 0; i < p_4154_0_.field_1040_k.size(); i++)
-        {
-            EntityPlayer entityplayer = (EntityPlayer)p_4154_0_.field_1040_k.get(i);
-            int k = MathHelper.func_1108_b(entityplayer.field_611_ak / 16D);
-            int l = MathHelper.func_1108_b(entityplayer.field_609_am / 16D);
-            byte byte0 = 8;
-            for(int k1 = -byte0; k1 <= byte0; k1++)
-            {
-                for(int l1 = -byte0; l1 <= byte0; l1++)
-                {
-                    boolean flag = k1 == -byte0 || k1 == byte0 || l1 == -byte0 || l1 == byte0;
-                    ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(k1 + k, l1 + l);
-                    if(!flag)
-                    {
-                        field_6544_a.put(chunkcoordintpair1, Boolean.valueOf(false));
-                        continue;
-                    }
-                    if(!field_6544_a.containsKey(chunkcoordintpair1))
-                    {
-                        field_6544_a.put(chunkcoordintpair1, Boolean.valueOf(true));
+    public static final int func_4154_a(World p_4154_0_, boolean p_4154_1_, boolean p_4154_2_) {
+        if(!p_4154_1_ && !p_4154_2_) {
+           return 0;
+        } else {
+           field_6544_a.clear();
+
+           int var3;
+           int var6;
+           for(var3 = 0; var3 < p_4154_0_.field_1040_k.size(); ++var3) {
+              EntityPlayer var4 = (EntityPlayer)p_4154_0_.field_1040_k.get(var3);
+              int var5 = MathHelper.func_1108_b(var4.field_611_ak / 16.0D);
+              var6 = MathHelper.func_1108_b(var4.field_609_am / 16.0D);
+              byte var7 = 8;
+
+              for(int var8 = -var7; var8 <= var7; ++var8) {
+                 for(int var9 = -var7; var9 <= var7; ++var9) {
+                    boolean var10 = var8 == -var7 || var8 == var7 || var9 == -var7 || var9 == var7;
+                    ChunkCoordIntPair var11 = new ChunkCoordIntPair(var8 + var5, var9 + var6);
+                    if(!var10) {
+                       field_6544_a.put(var11, Boolean.valueOf(false));
+                    } else if(!field_6544_a.containsKey(var11)) {
+                       field_6544_a.put(var11, Boolean.valueOf(true));
                     }
-                }
+                 }
+              }
+           }
 
-            }
+           var3 = 0;
+           ChunkCoordinates var31 = p_4154_0_.func_22137_s();
+           EnumCreatureType[] var32 = EnumCreatureType.values();
+           var6 = var32.length;
 
-        }
+           for(int var33 = 0; var33 < var6; ++var33) {
+              EnumCreatureType var34 = var32[var33];
+              if((!var34.func_21168_d() || p_4154_2_) && (var34.func_21168_d() || p_4154_1_) && p_4154_0_.func_621_b(var34.func_21170_a()) <= var34.func_21169_b() * field_6544_a.size() / 256) {
+                 Iterator var35 = field_6544_a.keySet().iterator();
 
-        j = 0;
-        chunkcoordinates = p_4154_0_.func_22137_s();
-        aenumcreaturetype = EnumCreatureType.values();
-        i1 = aenumcreaturetype.length;
-        j1 = 0;
-_L10:
-        if(!(j1 >= i1))
-## JADFIX _L1 _L2
-_L1:
-        EnumCreatureType enumcreaturetype;
-        Iterator iterator;
-        enumcreaturetype = aenumcreaturetype[j1];
-        if(enumcreaturetype.func_21168_d() && !p_4154_2_ || !enumcreaturetype.func_21168_d() && !p_4154_1_ || p_4154_0_.func_621_b(enumcreaturetype.func_21170_a()) > (enumcreaturetype.func_21169_b() * field_6544_a.size()) / 256)
-        {
-            continue; /* Loop/switch isn't completed */
-        }
-        iterator = field_6544_a.keySet().iterator();
-_L4:
-        int i2;
-        int j2;
-        int k2;
-        int l2;
-        int i3;
-        do
-        {
-            ChunkCoordIntPair chunkcoordintpair;
-            do
-            {
-                if(!iterator.hasNext())
-                {
-                    continue; /* Loop/switch isn't completed */
-                }
-                chunkcoordintpair = (ChunkCoordIntPair)iterator.next();
-            } while(((Boolean)field_6544_a.get(chunkcoordintpair)).booleanValue());
-            ChunkPosition chunkposition = func_4153_a(p_4154_0_, chunkcoordintpair.field_189_a, chunkcoordintpair.field_188_b);
-            i2 = chunkposition.field_1111_a;
-            j2 = chunkposition.field_1110_b;
-            k2 = chunkposition.field_1112_c;
-        } while(p_4154_0_.func_28100_h(i2, j2, k2) || p_4154_0_.func_599_f(i2, j2, k2) != enumcreaturetype.func_21171_c());
-        l2 = 0;
-        i3 = 0;
-_L9:
-        if(!(i3 >= 3))
-## JADFIX _L3 _L4
-_L3:
-        int j3;
-        int k3;
-        int l3;
-        byte byte1;
-        SpawnListEntry spawnlistentry;
-        int i4;
-        j3 = i2;
-        k3 = j2;
-        l3 = k2;
-        byte1 = 6;
-        spawnlistentry = null;
-        i4 = 0;
-_L8:
-        if(!(i4 >= 4))
-## JADFIX _L5 _L6
-_L5:
-        EntityLiving entityliving;
-        j3 += p_4154_0_.field_1037_n.nextInt(byte1) - p_4154_0_.field_1037_n.nextInt(byte1);
-        k3 += p_4154_0_.field_1037_n.nextInt(1) - p_4154_0_.field_1037_n.nextInt(1);
-        l3 += p_4154_0_.field_1037_n.nextInt(byte1) - p_4154_0_.field_1037_n.nextInt(byte1);
-        if(!func_21203_a(enumcreaturetype, p_4154_0_, j3, k3, l3))
-        {
-            continue; /* Loop/switch isn't completed */
-        }
-        float f = (float)j3 + 0.5F;
-        float f1 = k3;
-        float f2 = (float)l3 + 0.5F;
-        if(p_4154_0_.func_683_a(f, f1, f2, 24D) != null)
-        {
-            continue; /* Loop/switch isn't completed */
-        }
-        float f3 = f - (float)chunkcoordinates.field_22395_a;
-        float f4 = f1 - (float)chunkcoordinates.field_22394_b;
-        float f5 = f2 - (float)chunkcoordinates.field_22396_c;
-        float f6 = f3 * f3 + f4 * f4 + f5 * f5;
-        if(f6 < 576F)
-        {
-            continue; /* Loop/switch isn't completed */
-        }
-        if(spawnlistentry == null)
-        {
-            spawnlistentry = p_4154_0_.func_40474_a(enumcreaturetype, j3, k3, l3);
-            if(spawnlistentry == null)
-            {
-                break; /* Loop/switch isn't completed */
-            }
-        }
-        try
-        {
-            entityliving = (EntityLiving)spawnlistentry.field_25212_a.getConstructor(new Class[] {
-                net.minecraft.src.World.class
-            }).newInstance(new Object[] {
-                p_4154_0_
-            });
-        }
-        catch(Exception exception)
-        {
-            exception.printStackTrace();
-            return j;
-        }
-        entityliving.func_365_c(f, f1, f2, p_4154_0_.field_1037_n.nextFloat() * 360F, 0.0F);
-        if(!entityliving.func_433_a())
-        {
-            break; /* Loop/switch isn't completed */
+                 label108:
+                 while(var35.hasNext()) {
+                    ChunkCoordIntPair var37 = (ChunkCoordIntPair)var35.next();
+                    if(!((Boolean)field_6544_a.get(var37)).booleanValue()) {
+                       ChunkPosition var36 = func_4153_a(p_4154_0_, var37.field_189_a, var37.field_188_b);
+                       int var12 = var36.field_1111_a;
+                       int var13 = var36.field_1110_b;
+                       int var14 = var36.field_1112_c;
+                       if(!p_4154_0_.func_28100_h(var12, var13, var14) && p_4154_0_.func_599_f(var12, var13, var14) == var34.func_21171_c()) {
+                          int var15 = 0;
+                          int var16 = 0;
+
+                          while(var16 < 3) {
+                             int var17 = var12;
+                             int var18 = var13;
+                             int var19 = var14;
+                             byte var20 = 6;
+                             SpawnListEntry var21 = null;
+                             int var22 = 0;
+
+                             while(true) {
+                                if(var22 < 4) {
+                                   label101: {
+                                      var17 += p_4154_0_.field_1037_n.nextInt(var20) - p_4154_0_.field_1037_n.nextInt(var20);
+                                      var18 += p_4154_0_.field_1037_n.nextInt(1) - p_4154_0_.field_1037_n.nextInt(1);
+                                      var19 += p_4154_0_.field_1037_n.nextInt(var20) - p_4154_0_.field_1037_n.nextInt(var20);
+                                      if(func_21203_a(var34, p_4154_0_, var17, var18, var19)) {
+                                         float var23 = (float)var17 + 0.5F;
+                                         float var24 = (float)var18;
+                                         float var25 = (float)var19 + 0.5F;
+                                         if(p_4154_0_.func_683_a((double)var23, (double)var24, (double)var25, 24.0D) == null) {
+                                            float var26 = var23 - (float)var31.field_22395_a;
+                                            float var27 = var24 - (float)var31.field_22394_b;
+                                            float var28 = var25 - (float)var31.field_22396_c;
+                                            float var29 = var26 * var26 + var27 * var27 + var28 * var28;
+                                            if(var29 >= 576.0F) {
+                                               if(var21 == null) {
+                                                  var21 = p_4154_0_.func_40474_a(var34, var17, var18, var19);
+                                                  if(var21 == null) {
+                                                     break label101;
+                                                  }
+                                               }
+
+                                               EntityLiving var38;
+                                               try {
+                                                  var38 = (EntityLiving)var21.field_25212_a.getConstructor(new Class[]{World.class}).newInstance(new Object[]{p_4154_0_});
+                                               } catch (Exception var30) {
+                                                  var30.printStackTrace();
+                                                  return var3;
+                                               }
+
+                                               var38.func_365_c((double)var23, (double)var24, (double)var25, p_4154_0_.field_1037_n.nextFloat() * 360.0F, 0.0F);
+                                               if(var38.func_433_a()) {
+                                                  ++var15;
+                                                  p_4154_0_.func_674_a(var38);
+                                                  func_21204_a(var38, p_4154_0_, var23, var24, var25);
+                                                  if(var15 >= var38.func_6391_i()) {
+                                                     continue label108;
+                                                  }
+                                               }
+
+                                               var3 += var15;
+                                            }
+                                         }
+                                      }
+
+                                      ++var22;
+                                      continue;
+                                   }
+                                }
+
+                                ++var16;
+                                break;
+                             }
+                          }
+                       }
+                    }
+                 }
+              }
+           }
+
+           return var3;
         }
-        l2++;
-        p_4154_0_.func_674_a(entityliving);
-        func_21204_a(entityliving, p_4154_0_, f, f1, f2);
-        if(l2 < entityliving.func_6391_i())
-## JADFIX _L7 _L4
-_L7:
-        j += l2;
-        i4++;
-          goto _L8
-_L6:
-        i3++;
-          goto _L9
-        j1++;
-          goto _L10
-_L2:
-        return j;
-    }
+     }
 
     public static boolean func_21203_a(EnumCreatureType p_21203_0_, World p_21203_1_, int p_21203_2_, int p_21203_3_, int p_21203_4_)
     {
diff -r -U 3 minecraft\net\minecraft\src\StringTranslate.java minecraft_patched\net\minecraft\src\StringTranslate.java
--- minecraft\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StringTranslate.java	Fri Mar 30 23:49:04 2012
@@ -76,63 +76,46 @@
 
     }
 
-    public void func_44023_a(String p_44023_1_)
-    {
-        Properties properties;
-        if(p_44023_1_.equals(field_44026_d))
-        {
-            return;
+    public void func_44023_a(String p_44023_1_) {
+        if(!p_44023_1_.equals(this.field_44026_d)) {
+           Properties var2 = new Properties();
+
+           try {
+              this.func_44025_a(var2, "en_US");
+           } catch (IOException var8) {
+              ;
+           }
+
+           this.field_46111_e = false;
+           if(!"en_US".equals(p_44023_1_)) {
+              try {
+                 this.func_44025_a(var2, p_44023_1_);
+                 Enumeration var3 = var2.propertyNames();
+
+                 while(var3.hasMoreElements() && !this.field_46111_e) {
+                    Object var4 = var3.nextElement();
+                    Object var5 = var2.get(var4);
+                    if(var5 != null) {
+                       String var6 = var5.toString();
+
+                       for(int var7 = 0; var7 < var6.length(); ++var7) {
+                          if(var6.charAt(var7) >= 256) {
+                             this.field_46111_e = true;
+                             break;
+                          }
+                       }
+                    }
+                 }
+              } catch (IOException var9) {
+                 var9.printStackTrace();
+                 return;
+              }
+           }
+
+           this.field_44026_d = p_44023_1_;
+           this.field_20164_b = var2;
         }
-        properties = new Properties();
-        try
-        {
-            func_44025_a(properties, "en_US");
-        }
-        catch(IOException ioexception) { }
-        field_46111_e = false;
-        if("en_US".equals(p_44023_1_))
-        {
-            break MISSING_BLOCK_LABEL_152;
-        }
-        Enumeration enumeration;
-        func_44025_a(properties, p_44023_1_);
-        enumeration = properties.propertyNames();
-_L2:
-        String s;
-        int i;
-        Object obj1;
-        do
-        {
-            if(!enumeration.hasMoreElements() || field_46111_e)
-            {
-                break MISSING_BLOCK_LABEL_152;
-            }
-            Object obj = enumeration.nextElement();
-            obj1 = properties.get(obj);
-        } while(obj1 == null);
-        s = obj1.toString();
-        i = 0;
-_L5:
-        if(!(i >= s.length()))
-## JADFIX _L1 _L2
-_L1:
-        if(!(s.charAt(i) < '\u0100'))
-## JADFIX _L3 _L4
-_L3:
-        field_46111_e = true;
-          goto _L2
-_L4:
-        i++;
-          goto _L5
-        IOException ioexception1;
-        ioexception1;
-        ioexception1.printStackTrace();
-        return;
-        field_44026_d = p_44023_1_;
-        field_20164_b = properties;
-        return;
-          goto _L2
-    }
+     }
 
     public String func_44024_c()
     {
diff -r -U 3 minecraft\net\minecraft\src\StructureStrongholdPieces.java minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java
--- minecraft\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StructureStrongholdPieces.java	Fri Mar 30 23:49:04 2012
@@ -108,66 +108,55 @@
         return ((ComponentStronghold) (obj));
     }
 
-    private static ComponentStronghold func_35847_b(ComponentStrongholdStairs2 p_35847_0_, List p_35847_1_, Random p_35847_2_, int p_35847_3_, int p_35847_4_, int p_35847_5_, int p_35847_6_, int p_35847_7_)
-    {
-        int i;
-        if(!func_35853_c())
-        {
-            return null;
+    private static ComponentStronghold func_35847_b(ComponentStrongholdStairs2 p_35847_0_, List p_35847_1_, Random p_35847_2_, int p_35847_3_, int p_35847_4_, int p_35847_5_, int p_35847_6_, int p_35847_7_) {
+        if(!func_35853_c()) {
+           return null;
+        } else {
+           if(field_40752_d != null) {
+              ComponentStronghold var8 = func_35851_a(field_40752_d, p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_, p_35847_7_);
+              field_40752_d = null;
+              if(var8 != null) {
+                 return var8;
+              }
+           }
+
+           int var13 = 0;
+
+           while(var13 < 5) {
+              ++var13;
+              int var9 = p_35847_2_.nextInt(field_35857_a);
+              Iterator var10 = field_35856_c.iterator();
+
+              while(var10.hasNext()) {
+                 StructureStrongholdPieceWeight var11 = (StructureStrongholdPieceWeight)var10.next();
+                 var9 -= var11.field_35616_b;
+                 if(var9 < 0) {
+                    if(!var11.func_35613_a(p_35847_7_) || var11 == p_35847_0_.field_35038_a) {
+                       break;
+                    }
+
+                    ComponentStronghold var12 = func_35851_a(var11.field_35618_a, p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_, p_35847_7_);
+                    if(var12 != null) {
+                       ++var11.field_35617_c;
+                       p_35847_0_.field_35038_a = var11;
+                       if(!var11.func_35614_a()) {
+                          field_35856_c.remove(var11);
+                       }
+
+                       return var12;
+                    }
+                 }
+              }
+           }
+
+           StructureBoundingBox var14 = ComponentStrongholdCorridor.func_35051_a(p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_);
+           if(var14 != null && var14.field_35751_b > 1) {
+              return new ComponentStrongholdCorridor(p_35847_7_, p_35847_2_, var14, p_35847_6_);
+           } else {
+              return null;
+           }
         }
-        if(field_40752_d != null)
-        {
-            ComponentStronghold componentstronghold = func_35851_a(field_40752_d, p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_, p_35847_7_);
-            field_40752_d = null;
-            if(componentstronghold != null)
-            {
-                return componentstronghold;
-            }
-        }
-        i = 0;
-_L2:
-        int j;
-        Iterator iterator;
-        if(i >= 5)
-        {
-            break MISSING_BLOCK_LABEL_206;
-        }
-        i++;
-        j = p_35847_2_.nextInt(field_35857_a);
-        iterator = field_35856_c.iterator();
-_L4:
-        if(!(!iterator.hasNext()))
-## JADFIX _L1 _L2
-_L1:
-        StructureStrongholdPieceWeight structurestrongholdpieceweight;
-        structurestrongholdpieceweight = (StructureStrongholdPieceWeight)iterator.next();
-        j -= structurestrongholdpieceweight.field_35616_b;
-        if(!(j >= 0))
-## JADFIX _L3 _L4
-_L3:
-        if(structurestrongholdpieceweight.func_35613_a(p_35847_7_) && structurestrongholdpieceweight != p_35847_0_.field_35038_a)
-## JADFIX _L5 _L2
-_L5:
-        ComponentStronghold componentstronghold1 = func_35851_a(structurestrongholdpieceweight.field_35618_a, p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_, p_35847_7_);
-        if(!(componentstronghold1 == null))
-## JADFIX _L6 _L4
-_L6:
-        structurestrongholdpieceweight.field_35617_c++;
-        p_35847_0_.field_35038_a = structurestrongholdpieceweight;
-        if(!structurestrongholdpieceweight.func_35614_a())
-        {
-            field_35856_c.remove(structurestrongholdpieceweight);
-        }
-        return componentstronghold1;
-        StructureBoundingBox structureboundingbox = ComponentStrongholdCorridor.func_35051_a(p_35847_1_, p_35847_2_, p_35847_3_, p_35847_4_, p_35847_5_, p_35847_6_);
-        if(structureboundingbox != null && structureboundingbox.field_35751_b > 1)
-        {
-            return new ComponentStrongholdCorridor(p_35847_7_, p_35847_2_, structureboundingbox, p_35847_6_);
-        } else
-        {
-            return null;
-        }
-    }
+     }
 
     private static StructureComponent func_35848_c(ComponentStrongholdStairs2 p_35848_0_, List p_35848_1_, Random p_35848_2_, int p_35848_3_, int p_35848_4_, int p_35848_5_, int p_35848_6_, int p_35848_7_)
     {
diff -r -U 3 minecraft\net\minecraft\src\StructureVillagePieces.java minecraft_patched\net\minecraft\src\StructureVillagePieces.java
--- minecraft\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\StructureVillagePieces.java	Fri Mar 30 23:49:04 2012
@@ -107,59 +107,48 @@
         return ((ComponentVillage) (obj));
     }
 
-    private static ComponentVillage func_35700_c(ComponentVillageStartPiece p_35700_0_, List p_35700_1_, Random p_35700_2_, int p_35700_3_, int p_35700_4_, int p_35700_5_, int p_35700_6_, int p_35700_7_)
-    {
-        int i;
-        int j;
-        i = func_35703_a(p_35700_0_.field_35107_d);
-        if(i <= 0)
-        {
-            return null;
+    private static ComponentVillage func_35700_c(ComponentVillageStartPiece p_35700_0_, List p_35700_1_, Random p_35700_2_, int p_35700_3_, int p_35700_4_, int p_35700_5_, int p_35700_6_, int p_35700_7_) {
+        int var8 = func_35703_a(p_35700_0_.field_35107_d);
+        if(var8 <= 0) {
+           return null;
+        } else {
+           int var9 = 0;
+
+           while(var9 < 5) {
+              ++var9;
+              int var10 = p_35700_2_.nextInt(var8);
+              Iterator var11 = p_35700_0_.field_35107_d.iterator();
+
+              while(var11.hasNext()) {
+                 StructureVillagePieceWeight var12 = (StructureVillagePieceWeight)var11.next();
+                 var10 -= var12.field_35605_b;
+                 if(var10 < 0) {
+                    if(!var12.func_35602_a(p_35700_7_) || var12 == p_35700_0_.field_35110_c && p_35700_0_.field_35107_d.size() > 1) {
+                       break;
+                    }
+
+                    ComponentVillage var13 = func_35699_a(var12, p_35700_1_, p_35700_2_, p_35700_3_, p_35700_4_, p_35700_5_, p_35700_6_, p_35700_7_);
+                    if(var13 != null) {
+                       ++var12.field_35606_c;
+                       p_35700_0_.field_35110_c = var12;
+                       if(!var12.func_35603_a()) {
+                          p_35700_0_.field_35107_d.remove(var12);
+                       }
+
+                       return var13;
+                    }
+                 }
+              }
+           }
+
+           StructureBoundingBox var14 = ComponentVillageTorch.func_35099_a(p_35700_1_, p_35700_2_, p_35700_3_, p_35700_4_, p_35700_5_, p_35700_6_);
+           if(var14 != null) {
+              return new ComponentVillageTorch(p_35700_7_, p_35700_2_, var14, p_35700_6_);
+           } else {
+              return null;
+           }
         }
-        j = 0;
-_L2:
-        int k;
-        Iterator iterator;
-        if(j >= 5)
-        {
-            break MISSING_BLOCK_LABEL_182;
-        }
-        j++;
-        k = p_35700_2_.nextInt(i);
-        iterator = p_35700_0_.field_35107_d.iterator();
-_L4:
-        if(!(!iterator.hasNext()))
-## JADFIX _L1 _L2
-_L1:
-        StructureVillagePieceWeight structurevillagepieceweight;
-        structurevillagepieceweight = (StructureVillagePieceWeight)iterator.next();
-        k -= structurevillagepieceweight.field_35605_b;
-        if(!(k >= 0))
-## JADFIX _L3 _L4
-_L3:
-        if(structurevillagepieceweight.func_35602_a(p_35700_7_) && (structurevillagepieceweight != p_35700_0_.field_35110_c || p_35700_0_.field_35107_d.size() <= 1))
-## JADFIX _L5 _L2
-_L5:
-        ComponentVillage componentvillage = func_35699_a(structurevillagepieceweight, p_35700_1_, p_35700_2_, p_35700_3_, p_35700_4_, p_35700_5_, p_35700_6_, p_35700_7_);
-        if(!(componentvillage == null))
-## JADFIX _L6 _L4
-_L6:
-        structurevillagepieceweight.field_35606_c++;
-        p_35700_0_.field_35110_c = structurevillagepieceweight;
-        if(!structurevillagepieceweight.func_35603_a())
-        {
-            p_35700_0_.field_35107_d.remove(structurevillagepieceweight);
-        }
-        return componentvillage;
-        StructureBoundingBox structureboundingbox = ComponentVillageTorch.func_35099_a(p_35700_1_, p_35700_2_, p_35700_3_, p_35700_4_, p_35700_5_, p_35700_6_);
-        if(structureboundingbox != null)
-        {
-            return new ComponentVillageTorch(p_35700_7_, p_35700_2_, structureboundingbox, p_35700_6_);
-        } else
-        {
-            return null;
-        }
-    }
+     }
 
     private static StructureComponent func_35702_d(ComponentVillageStartPiece p_35702_0_, List p_35702_1_, Random p_35702_2_, int p_35702_3_, int p_35702_4_, int p_35702_5_, int p_35702_6_, int p_35702_7_)
     {
diff -r -U 3 minecraft\net\minecraft\src\ThreadPollServers.java minecraft_patched\net\minecraft\src\ThreadPollServers.java
--- minecraft\net\minecraft\src\ThreadPollServers.java	Fri Mar 30 23:47:24 2012
+++ minecraft_patched\net\minecraft\src\ThreadPollServers.java	Fri Mar 30 23:49:04 2012
@@ -36,63 +36,32 @@
         {
             field_35601_a.field_35792_e = -1L;
             field_35601_a.field_35791_d = "\2474Can't resolve hostname";
-            synchronized(GuiMultiplayer.func_35321_g())
-            {
-                GuiMultiplayer.func_35335_o();
-            }
-            break MISSING_BLOCK_LABEL_345;
         }
         catch(SocketTimeoutException sockettimeoutexception)
         {
             field_35601_a.field_35792_e = -1L;
             field_35601_a.field_35791_d = "\2474Can't reach server";
-            synchronized(GuiMultiplayer.func_35321_g())
-            {
-                GuiMultiplayer.func_35335_o();
-            }
-            break MISSING_BLOCK_LABEL_345;
         }
         catch(ConnectException connectexception)
         {
             field_35601_a.field_35792_e = -1L;
             field_35601_a.field_35791_d = "\2474Can't reach server";
-            synchronized(GuiMultiplayer.func_35321_g())
-            {
-                GuiMultiplayer.func_35335_o();
-            }
-            break MISSING_BLOCK_LABEL_345;
         }
         catch(IOException ioexception)
         {
             field_35601_a.field_35792_e = -1L;
             field_35601_a.field_35791_d = "\2474Communication error";
-            synchronized(GuiMultiplayer.func_35321_g())
-            {
-                GuiMultiplayer.func_35335_o();
-            }
-            break MISSING_BLOCK_LABEL_345;
         }
         catch(Exception exception)
         {
             field_35601_a.field_35792_e = -1L;
             field_35601_a.field_35791_d = (new StringBuilder()).append("ERROR: ").append(exception.getClass()).toString();
-            synchronized(GuiMultiplayer.func_35321_g())
-            {
-                GuiMultiplayer.func_35335_o();
-            }
-            break MISSING_BLOCK_LABEL_345;
         }
+        finally {
         synchronized(GuiMultiplayer.func_35321_g())
         {
             GuiMultiplayer.func_35335_o();
         }
-        break MISSING_BLOCK_LABEL_345;
-        Exception exception7;
-        exception7;
-        synchronized(GuiMultiplayer.func_35321_g())
-        {
-            GuiMultiplayer.func_35335_o();
         }
-        throw exception7;
     }
 }