Fix patches after last fml merge.

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -8,8 +8,17 @@
          this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
          this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
          this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
-@@ -484,7 +483,7 @@
+@@ -449,7 +448,7 @@
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
+             }
+         });
+         this.field_71417_B = new MouseHelper();
+-        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 9);
++        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 5);
+         bar.step("GL Setup");
+         this.func_71361_d("Pre startup");
+         GlStateManager.func_179098_w();
+@@ -491,7 +490,7 @@
+         net.minecraftforge.fml.common.ProgressManager.pop(bar);
          net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
          this.func_71361_d("Post startup");
 -        this.field_71456_v = new GuiIngame(this);
@@ -17,7 +26,7 @@
  
          if (this.field_71475_ae != null)
          {
-@@ -891,11 +890,6 @@
+@@ -898,11 +897,6 @@
  
      public void func_147108_a(GuiScreen p_147108_1_)
      {
@@ -29,7 +38,7 @@
          if (p_147108_1_ == null && this.field_71441_e == null)
          {
              p_147108_1_ = new GuiMainMenu();
-@@ -905,6 +899,17 @@
+@@ -912,6 +906,17 @@
              p_147108_1_ = new GuiGameOver();
          }
  
@@ -47,7 +56,7 @@
          if (p_147108_1_ instanceof GuiMainMenu)
          {
              this.field_71474_y.field_74330_P = false;
-@@ -1388,7 +1393,7 @@
+@@ -1395,7 +1400,7 @@
  
                  if (this.field_71441_e.func_180495_p(blockpos).func_177230_c().func_149688_o() != Material.field_151579_a && this.field_71442_b.func_180512_c(blockpos, this.field_71476_x.field_178784_b))
                  {
@@ -56,7 +65,7 @@
                      this.field_71439_g.func_71038_i();
                  }
              }
-@@ -1468,15 +1473,19 @@
+@@ -1475,15 +1480,19 @@
                  case 2:
                      BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -77,7 +86,7 @@
  
                          if (itemstack == null)
                          {
-@@ -1697,6 +1706,8 @@
+@@ -1704,6 +1713,8 @@
  
              while (Mouse.next())
              {
@@ -86,7 +95,7 @@
                  i = Mouse.getEventButton();
                  KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
  
-@@ -2206,7 +2217,13 @@
+@@ -2213,7 +2224,13 @@
          NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
          networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
          networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
@@ -101,7 +110,7 @@
          this.field_71453_ak = networkmanager;
      }
  
-@@ -2217,6 +2234,8 @@
+@@ -2224,6 +2241,8 @@
  
      public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -110,7 +119,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2230,6 +2249,18 @@
+@@ -2237,6 +2256,18 @@
              {
                  this.field_71437_Z.func_71263_m();
                  this.field_71437_Z.func_175592_a();
@@ -129,7 +138,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2361,134 +2392,11 @@
+@@ -2368,134 +2399,11 @@
          if (this.field_71476_x != null)
          {
              boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
@@ -266,7 +275,7 @@
              if (flag)
              {
                  int j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + inventoryplayer.field_70461_c;
-@@ -2744,8 +2652,11 @@
+@@ -2751,8 +2659,11 @@
          p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N()));
      }
  
@@ -278,7 +287,7 @@
          for (int i = 16384; i > 0; i >>= 1)
          {
              GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
-@@ -2753,6 +2664,7 @@
+@@ -2760,6 +2671,7 @@
  
              if (j != 0)
              {

patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch

@@ -5,12 +5,12 @@
          int j = Integer.MAX_VALUE;
          int k = 1 << this.field_147636_j;
 +        net.minecraftforge.client.ForgeHooksClient.onTextureStitchedPre(this);
+         net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", this.field_110574_e.size());
          Iterator iterator = this.field_110574_e.entrySet().iterator();
  
-         while (iterator.hasNext())
+@@ -102,6 +103,16 @@
-@@ -100,6 +101,16 @@
-             ResourceLocation resourcelocation = new ResourceLocation(textureatlassprite.func_94215_i());
              ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
+             bar.step(resourcelocation1.func_110623_a());
  
 +            if (textureatlassprite.hasCustomLoader(p_110571_1_, resourcelocation))
 +            {
@@ -25,7 +25,7 @@
              try
              {
                  IResource iresource = p_110571_1_.func_110536_a(resourcelocation1);
-@@ -275,6 +286,9 @@
+@@ -287,6 +298,9 @@
              textureatlassprite2.func_94217_a(this.field_94249_f);
          }
  
@@ -33,9 +33,9 @@
 +
 +        if (!net.minecraftforge.common.ForgeModContainer.disableStitchedFileSaving)
          TextureUtil.func_177055_a(this.field_94254_c.replaceAll("/", "_"), this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b());
+         net.minecraftforge.fml.common.ProgressManager.pop(bar);
      }
- 
+@@ -354,4 +368,37 @@
-@@ -341,4 +355,37 @@
      {
          return this.field_94249_f;
      }

patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch

@@ -23,7 +23,7 @@
 +                                        WeightedRandomChestContent.func_177630_a(p_180709_2_, ChestGenHooks.getItems(DUNGEON_CHEST, p_180709_2_), (TileEntityChest)tileentity1, ChestGenHooks.getCount(DUNGEON_CHEST, p_180709_2_));
                                      }
  
-                                     break label100;
+                                     break label197;
 @@ -184,6 +186,12 @@
  
      private String func_76543_b(Random p_76543_1_)