From 986c6722b6ea9d419bbb51f5fd570f5e2fda6e41 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sun, 10 Jun 2012 01:28:34 -0700
Subject: [PATCH] Added bouncer functions for functions we removed. Makes
 MagicLauncher shut up about missing functions {not actually missing}, and
 therefor makes users stop thinking its a life or death error.

---
 .../net/minecraft/src/BlockCrops.java.patch   | 19 ++++++-------
 .../minecraft/src/BlockNetherStalk.java.patch | 27 +++++++++----------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
index d4871159c..745d739e3 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch
@@ -8,20 +8,17 @@
  
  public class BlockCrops extends BlockFlower
  {
-@@ -129,31 +130,24 @@
-         return 6;
-     }
- 
--    /**
--     * Drops the block items with a specified chance of dropping the specified items
--     */
--    public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7)
-+    @Override
-+    public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
+@@ -135,25 +136,26 @@
+     public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7)
      {
--        super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, 0);
+         super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, 0);
 -
 -        if (!par1World.isRemote)
++    }
++    
++    @Override
++    public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
++    {
 +        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
 +        if (metadata == 7)
          {
diff --git a/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
index 544d51656..86daf4fb0 100644
--- a/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/BlockNetherStalk.java.patch
@@ -7,27 +7,26 @@
  import java.util.Random;
  
  public class BlockNetherStalk extends BlockFlower
-@@ -66,30 +67,22 @@
-         return 6;
-     }
- 
--    /**
--     * Drops the block items with a specified chance of dropping the specified items
--     */
--    public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7)
-+    @Override
-+    public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
+@@ -71,25 +72,25 @@
+      */
+     public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7)
      {
 -        if (!par1World.isRemote)
 -        {
 -            int var8 = 1;
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        int var8 = 1;
- 
+-
 -            if (par5 >= 3)
 -            {
 -                var8 = 2 + par1World.rand.nextInt(3);
--
++        super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7);
++    }
++    
++    @Override
++    public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
++    {
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++        int var8 = 1;
+ 
 -                if (par7 > 0)
 -                {
 -                    var8 += par1World.rand.nextInt(par7 + 1);