Deprecation sweep and update version to 8.9 to reflect 1.6.1 update.

client/net/minecraftforge/client/MinecraftForgeClient.java

@@ -20,15 +20,6 @@ import net.minecraftforge.common.MinecraftForge;
 
 public class MinecraftForgeClient
 {
-    /**
-     * NO-OP now. Not needed with new texturing system in MC 1.5
-     */
-    @Deprecated // without replacement
-    public static void preloadTexture(String texture)
-    {
-//        ForgeHooksClient.engine().getTexture(texture);
-    }
-
     private static IItemRenderer[] customItemRenderers = new IItemRenderer[Item.itemsList.length];
 
     /**

common/net/minecraftforge/common/ForgeVersion.java

@@ -8,11 +8,11 @@ package net.minecraftforge.common;
 public class ForgeVersion
 {
     //This number is incremented every time we remove deprecated code/major API changes, never reset
-    public static final int majorVersion    = 7;
+    public static final int majorVersion    = 8;
     //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 8;
+    public static final int minorVersion    = 9;
     //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 = 1;
+    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;
 

common/net/minecraftforge/common/IThrowableEntity.java

@@ -1,23 +0,0 @@
-package net.minecraftforge.common;
-
-import net.minecraft.entity.Entity;
-
-/**
- * This interface should be implemented by an Entity that can be 'thrown', like snowballs.
- * This was created to mimic ModLoaderMP's 'owner' functionality.
- */
-@Deprecated //Moved to FML cpw.mods.fml.common.registry.IThrowableEntity
-public interface IThrowableEntity
-{
-    /**
-     * Gets the entity that threw/created this entity.
-     * @return The owner instance, Null if none.
-     */
-    public Entity getThrower();
-
-    /**
-     * Sets the entity that threw/created this entity.
-     * @param entity The new thrower/creator.
-     */
-    public void setThrower(Entity entity);
-}

common/net/minecraftforge/liquids/LiquidStack.java

@@ -66,17 +66,6 @@ public class LiquidStack
         return nbt;
     }
 
-
-    /**
-     * NO-OP now. Use {@link #loadLiquidStackFromNBT(NBTTagCompound)} to get a new instance
-     *
-     * @param nbt
-     */
-    @Deprecated
-    public void readFromNBT(NBTTagCompound nbt)
-    {
-    }
-
     /**
      * @return A copy of this LiquidStack
      */

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

@@ -165,7 +165,7 @@
      }
  
      /**
-@@ -1453,4 +1474,945 @@
+@@ -1453,4 +1474,939 @@
          canBlockGrass[0] = true;
          StatList.initBreakableStats();
      }
@@ -1079,12 +1079,6 @@
 +     */
 +    public float getEnchantPowerBonus(World world, int x, int y, int z)
 +    {
-+        return getEnchantPower(world, x, y, z);
-+    }
-+
-+    @Deprecated //Changed return to float, see above.
-+    public int getEnchantPower(World world, int x, int y, int z)
-+    {
 +        return blockID == bookShelf.blockID ? 1 : 0;
 +    }
 +    /**

patches/minecraft/net/minecraft/item/Item.java.patch

@@ -58,7 +58,7 @@
          Vec3 vec31 = vec3.addVector((double)f7 * d3, (double)f6 * d3, (double)f8 * d3);
          return par1World.rayTraceBlocks_do_do(vec3, vec31, par3, !par3);
      }
-@@ -736,4 +750,509 @@
+@@ -736,4 +750,504 @@
      {
          StatList.initStats();
      }
@@ -360,11 +360,6 @@
 +     */
 +    public boolean isValidArmor(ItemStack stack, int armorType, Entity entity)
 +    {
-+        return isValidArmor(stack, armorType);
-+    }
-+    @Deprecated //Deprecated in 1.5.2, remove in 1.6, see EntityPlayer sensitive version above.
-+    public boolean isValidArmor(ItemStack stack, int armorType)
-+    {
 +        if (this instanceof ItemArmor)
 +        {
 +            return ((ItemArmor)this).armorType == armorType;