Merge remote-tracking branch 'refs/remotes/origin/1.5.2'

Conflicts:
	common/net/minecraftforge/common/ForgeVersion.java

client/net/minecraftforge/client/GuiIngameForge.java

@@ -24,6 +24,7 @@
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.crash.CallableMinecraftVersion;
 import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -69,6 +70,7 @@ public class GuiIngameForge extends GuiIngame
     private ScaledResolution res = null;
     private FontRenderer fontrenderer = null;
     private RenderGameOverlayEvent eventParent;
+    private static final String MC_VERSION = (new CallableMinecraftVersion(null)).minecraftVersion();
 
     public GuiIngameForge(Minecraft mc)
     {
@@ -485,11 +487,11 @@ protected void renderToolHightlight(int width, int height)
         {
             mc.mcProfiler.startSection("toolHighlight");
 
-            if (this.field_92017_k > 0 && this.field_92016_l != null)
+            if (this.remainingHighlightTicks > 0 && this.highlightingItemStack != null)
             {
-                String name = this.field_92016_l.getDisplayName();
+                String name = this.highlightingItemStack.getDisplayName();
 
-                int opacity = (int)((float)this.field_92017_k * 256.0F / 10.0F);
+                int opacity = (int)((float)this.remainingHighlightTicks * 256.0F / 10.0F);
                 if (opacity > 255) opacity = 255;
 
                 if (opacity > 0)
@@ -500,7 +502,7 @@ protected void renderToolHightlight(int width, int height)
                     GL11.glPushMatrix();
                     GL11.glEnable(GL11.GL_BLEND);
                     GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                    FontRenderer font = field_92016_l.getItem().getFontRenderer(field_92016_l);
+                    FontRenderer font = highlightingItemStack.getItem().getFontRenderer(highlightingItemStack);
                     if (font != null)
                     {
                         int x = (width - font.getStringWidth(name)) / 2;
@@ -544,7 +546,7 @@ protected void renderHUDText(int width, int height)
         {
             mc.mcProfiler.startSection("debug");
             GL11.glPushMatrix();
-            left.add("Minecraft 1.5.1 (" + this.mc.debug + ")");
+            left.add("Minecraft " + MC_VERSION + " (" + this.mc.debug + ")");
             left.add(mc.debugInfoRenders());
             left.add(mc.getEntityDebug());
             left.add(mc.debugInfoEntities());
@@ -693,7 +695,7 @@ protected void renderPlayerList(int width, int height)
                 if (i < players.size())
                 {
                     GuiPlayerInfo player = (GuiPlayerInfo)players.get(i);
-                    ScorePlayerTeam team = mc.theWorld.getScoreboard().func_96509_i(player.name);
+                    ScorePlayerTeam team = mc.theWorld.getScoreboard().getPlayersTeam(player.name);
                     String displayName = ScorePlayerTeam.func_96667_a(team, player.name);
                     fontrenderer.drawStringWithShadow(displayName, xPos, yPos, 16777215);
 

common/forge_at.cfg

@@ -1,11 +1,11 @@
 #Main Forge Access Transformer configuration file
 # Tessellator
-public-f bge.a #FD:Tessellator/field_78398_a #instance
-public bge.u #FD:Tessellator/field_78409_u #drawMode
-public bge.v #FD:Tessellator/field_78408_v #xOffset
-public bge.w #FD:Tessellator/field_78407_w #yOffset
-public bge.x #FD:Tessellator/field_78417_x #zOffset
-public bge.z #FD:Tessellator/field_78415_z #isDrawing
+public-f bgd.a #FD:Tessellator/field_78398_a #instance
+public bgd.u #FD:Tessellator/field_78409_u #drawMode
+public bgd.v #FD:Tessellator/field_78408_v #xOffset
+public bgd.w #FD:Tessellator/field_78407_w #yOffset
+public bgd.x #FD:Tessellator/field_78417_x #zOffset
+public bgd.z #FD:Tessellator/field_78415_z #isDrawing
 # ItemPickaxe
 public wu.<init>(ILwl;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
 public+f wu.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
@@ -21,20 +21,20 @@ public vr.d #FD:ItemTool/field_77865_bY #damageVsEntity
 # EntityEnderman
 public rv.d #FD:EntityEnderman/field_70827_d #carriableBlocks
 # RenderEngine
-public bgf.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture
-public bgf.i #FD:RenderEngine/field_94154_l #terrainTextureMap
-public bgf.j #FD:RenderEngine/field_94155_m #itemTextureMap
+public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture
+public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap
+public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap
 # RenderGlobal
-public bfz.h #FD:RenderGlobal/field_72769_h #theWorld
-public bfz.i #FD:RenderGlobal/field_72770_i #renderEngine
-public bfz.q #FD:RenderGlobal/field_72777_q #mc
-public bfz.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
-public bfz.E #FD:RenderGlobal/field_72738_E #damagedBlocks
+public bfy.h #FD:RenderGlobal/field_72769_h #theWorld
+public bfy.i #FD:RenderGlobal/field_72770_i #renderEngine
+public bfy.q #FD:RenderGlobal/field_72777_q #mc
+public bfy.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
+public bfy.E #FD:RenderGlobal/field_72738_E #damagedBlocks
 # SoundManager
-public bkd.a #FD:SoundManager/field_77381_a #sndSystem
-public bkd.b #FD:SoundManager/field_77379_b #soundPoolSounds
-public bkd.c #FD:SoundManager/field_77380_c #soundPoolStreaming
-public bkd.d #FD:SoundManager/field_77377_d #soundPoolMusic
+public bkc.a #FD:SoundManager/field_77381_a #sndSystem
+public bkc.b #FD:SoundManager/field_77379_b #soundPoolSounds
+public bkc.c #FD:SoundManager/field_77380_c #soundPoolStreaming
+public bkc.d #FD:SoundManager/field_77377_d #soundPoolMusic
 # EntityMinecart
 protected ri.* #FD:EntityMinecart/* # All private -> protected
 # -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
@@ -71,7 +71,7 @@ public sq.a(Lrh;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
 public sq.h()V #MD:EntityPlayer/func_71053_j #closeScreen
 public sq.b #FD:EntityPlayer/field_71076_b #sleepTimer
 # EntityPlayerMP
-public bdw.a(Lrh;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
+public bdv.a(Lrh;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
 # World Gen Chests Related
 public lp.* #FD:WeightedRandomChestContent/* #all
 public iz.S #FD:WorldServer/field_73069_S #bonusChestContent
@@ -130,15 +130,15 @@ public aab.n #FD:World/field_73004_o #rainingStrength
 public aab.p #FD:World/field_73017_q #thunderingStrength
 public aab.o #FD:World/field_73018_p #prevThunderingStrength
 #WorldClient
-public bdt.b(Lmp;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
+public bds.b(Lmp;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
 #WorldServer
 public iz.b(Lmp;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
 public iz.N #FD:WorldServer/field_73068_P #allPlayersSleeping
 #TextureMap
-public bis.a #FD:TextureMap/field_94255_a
-public bis.b #FD:TextureMap/field_94253_b
-public bis.c #FD:TextureMap/field_94254_c
-public bis.d #FD:TextureMap/field_94251_d
+public bir.a #FD:TextureMap/field_94255_a
+public bir.b #FD:TextureMap/field_94253_b
+public bir.c #FD:TextureMap/field_94254_c
+public bir.d #FD:TextureMap/field_94251_d
 #Potion
 public mk.b(II)Lmk; #MD:Potion/func_76399_b #setIconIndex
 #PotionHelper

common/net/minecraftforge/common/ForgeVersion.java

@@ -10,9 +10,9 @@ public class ForgeVersion
     //This number is incremented every time we remove deprecated code/major API changes, never reset
     public static final int majorVersion    = 7;
     //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 7;
+    public static final int minorVersion    = 8;
     //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
-    public static final int revisionVersion = 2;
+    public static final int revisionVersion = 0;
     //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
     public static final int buildVersion    = 0;
 

patches/minecraft/net/minecraft/block/Block.java.patch

@@ -165,7 +165,7 @@
      }
 
      /**
-@@ -1439,4 +1460,944 @@
+@@ -1443,4 +1464,944 @@
          canBlockGrass[0] = true;
          StatList.initBreakableStats();
      }

patches/minecraft/net/minecraft/block/BlockChest.java.patch

@@ -9,7 +9,7 @@
  public class BlockChest extends BlockContainer
  {
      private final Random random = new Random();
-@@ -442,7 +444,7 @@
+@@ -444,7 +446,7 @@
          {
              return null;
          }
@@ -18,7 +18,7 @@
          {
              return null;
          }
-@@ -450,19 +452,19 @@
+@@ -452,19 +454,19 @@
          {
              return null;
          }

patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/block/BlockPistonBase.java
 +++ ../src_work/minecraft/net/minecraft/block/BlockPistonBase.java
-@@ -431,7 +431,7 @@
+@@ -437,7 +437,7 @@
                  return false;
              }
 
@@ -9,7 +9,7 @@
          }
      }
 
-@@ -449,7 +449,7 @@
+@@ -455,7 +455,7 @@
          {
              if (l1 < 13)
              {
@@ -18,7 +18,7 @@
                  {
                      return false;
                  }
-@@ -499,7 +499,7 @@
+@@ -505,7 +505,7 @@
 
              if (l1 < 13)
              {
@@ -27,7 +27,7 @@
                  {
                      return false;
                  }
-@@ -527,7 +527,9 @@
+@@ -533,7 +533,9 @@
                          continue;
                      }
 

patches/minecraft/net/minecraft/block/BlockSnow.java.patch

@@ -1,6 +1,6 @@
 --- ../src_base/minecraft/net/minecraft/block/BlockSnow.java
 +++ ../src_work/minecraft/net/minecraft/block/BlockSnow.java
-@@ -93,8 +93,12 @@
+@@ -96,8 +96,12 @@
       */
      public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
      {
@@ -15,15 +15,15 @@
      }
 
      /**
-@@ -113,7 +117,6 @@
+@@ -116,7 +120,6 @@
      {
          if (!this.canPlaceBlockAt(par1World, par2, par3, par4))
          {
 -            this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
              par1World.setBlockToAir(par2, par3, par4);
              return false;
          }
-@@ -129,11 +132,8 @@
+@@ -132,11 +135,8 @@
       */
      public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
      {
@@ -36,7 +36,7 @@
      }
 
      /**
-@@ -149,7 +149,7 @@
+@@ -152,7 +152,7 @@
       */
      public int quantityDropped(Random par1Random)
      {
@@ -45,15 +45,15 @@
      }
 
      /**
-@@ -159,7 +159,6 @@
+@@ -162,7 +162,6 @@
      {
          if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11)
          {
 -            this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
              par1World.setBlockToAir(par2, par3, par4);
          }
      }
-@@ -174,4 +173,10 @@
+@@ -177,4 +176,10 @@
      {
          return par5 == 1 ? true : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
      }

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

@@ -112,7 +112,7 @@
 -                }
 -
 -                flag1 = Item.itemsList[j].getHasSubtypes();
--                int j1 = j < 256 && !Block.blocksList[block.blockID].func_82505_u_() ? j : block.blockID;
+-                int j1 = j < 256 && !Block.blocksList[block.blockID].isFlowerPot() ? j : block.blockID;
 -                i = Block.blocksList[j1].getDamageValue(this.theWorld, k, l, i1);
 -            }
 -            else
@@ -155,11 +155,11 @@
 -                    }
 -                    else if (entityminecart.getMinecartType() == 3)
 -                    {
--                        j = Item.tntMinecart.itemID;
+-                        j = Item.minecartTnt.itemID;
 -                    }
 -                    else if (entityminecart.getMinecartType() == 5)
 -                    {
--                        j = Item.hopperMinecart.itemID;
+-                        j = Item.minecartHopper.itemID;
 -                    }
 -                    else
 -                    {

patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch

@@ -41,7 +41,7 @@
              sndSystem = new SoundSystem();
              this.options.soundVolume = f;
              this.options.musicVolume = f1;
-@@ -177,10 +187,12 @@
+@@ -179,10 +189,12 @@
                  }
 
                  SoundPoolEntry soundpoolentry = this.soundPoolMusic.getRandomSound();
@@ -55,47 +55,47 @@
                      sndSystem.backgroundMusic("BgMusic", soundpoolentry.soundUrl, soundpoolentry.soundName, false);
                      sndSystem.setVolume("BgMusic", this.options.musicVolume);
                      sndSystem.play("BgMusic");
-@@ -247,6 +259,7 @@
+@@ -249,6 +261,7 @@
              if (par1Str != null)
              {
                  SoundPoolEntry soundpoolentry = this.soundPoolStreaming.getRandomSoundFromSoundPool(par1Str);
 +                soundpoolentry = SoundEvent.getResult(new PlayStreamingEvent(this, soundpoolentry, par1Str, par2, par3, par4));
 
                  if (soundpoolentry != null)
                  {
-@@ -258,6 +271,7 @@
+@@ -260,6 +273,7 @@
                      float f3 = 16.0F;
                      sndSystem.newStreamingSource(true, s1, soundpoolentry.soundUrl, soundpoolentry.soundName, false, par2, par3, par4, 2, f3 * 4.0F);
                      sndSystem.setVolume(s1, 0.5F * this.options.soundVolume);
 +                    MinecraftForge.EVENT_BUS.post(new PlayStreamingSourceEvent(this, s1, par2, par3, par4));
                      sndSystem.play(s1);
                  }
              }
-@@ -437,6 +451,7 @@
+@@ -439,6 +453,7 @@
          if (loaded && this.options.soundVolume != 0.0F)
          {
              SoundPoolEntry soundpoolentry = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str);
 +            soundpoolentry = SoundEvent.getResult(new PlaySoundEvent(this, soundpoolentry, par1Str, par2, par3, par4, par5, par6));
 
              if (soundpoolentry != null && par5 > 0.0F)
              {
-@@ -458,6 +473,7 @@
+@@ -460,6 +475,7 @@
                  }
 
                  sndSystem.setVolume(s1, par5 * this.options.soundVolume);
 +                MinecraftForge.EVENT_BUS.post(new PlaySoundSourceEvent(this, s1, par2, par3, par4));
                  sndSystem.play(s1);
              }
          }
-@@ -472,6 +488,7 @@
+@@ -474,6 +490,7 @@
          if (loaded && this.options.soundVolume != 0.0F)
          {
              SoundPoolEntry soundpoolentry = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str);
 +            soundpoolentry = SoundEvent.getResult(new PlaySoundEffectEvent(this, soundpoolentry, par1Str, par2, par3));
 
              if (soundpoolentry != null)
              {
-@@ -487,6 +504,7 @@
+@@ -489,6 +506,7 @@
                  par2 *= 0.25F;
                  sndSystem.setPitch(s1, par3);
                  sndSystem.setVolume(s1, par2 * this.options.soundVolume);