From 3f03cc8c8721c1940f629aa94ccde9fc581ca168 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sun, 21 Oct 2012 10:22:56 -0700
Subject: [PATCH] BlockCrops is now the parent class of multiple types of
 crops, Wheat, Potatoes, and Carrots, updated getBlockDropped patch to
 reflect.

---
 .../net/minecraft/src/BlockCrops.java.patch   | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/patches/common/net/minecraft/src/BlockCrops.java.patch b/patches/common/net/minecraft/src/BlockCrops.java.patch
index 7d45549e14..a161723616 100644
--- a/patches/common/net/minecraft/src/BlockCrops.java.patch
+++ b/patches/common/net/minecraft/src/BlockCrops.java.patch
@@ -12,7 +12,7 @@
  
  public class BlockCrops extends BlockFlower
  {
-@@ -84,11 +88,11 @@
+@@ -88,11 +92,11 @@
                  int var19 = par1World.getBlockId(var17, par3 - 1, var18);
                  float var20 = 0.0F;
  
@@ -26,42 +26,55 @@
                      {
                          var20 = 3.0F;
                      }
-@@ -138,25 +142,27 @@
+@@ -152,22 +156,37 @@
      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);
+-
+-        if (!par1World.isRemote)
+-        {
+-            if (par5 >= 7)
+-            {
+-                int var8 = 3 + par7;
+-
+-                for (int var9 = 0; var9 < var8; ++var9)
+-                {
+-                    if (par1World.rand.nextInt(15) <= par5)
+-                    {
+-                        this.dropBlockAsItem_do(par1World, par2, par3, par4, new ItemStack(this.func_82532_h(), 1, 0));
+-                    }
+-                }
+-            }
+-        }
 +    }
-+        
++
 +    @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)
-+        {
-+            ret.add(new ItemStack(Item.wheat));
++        {      
++            int count = quantityDropped(metadata, fortune, world.rand);
++            for(int i = 0; i < count; i++)
++            {
++                int id = idDropped(metadata, world.rand, 0);
++                if (id > 0)
++                {
++                    ret.add(new ItemStack(id, 1, damageDropped(metadata)));
++                }
++            }
++        }
++
++        if (metadata >= 7)
++        {
++            for (int n = 0; n < 3 + fortune; n++)
++            {
++                if (world.rand.nextInt(15) <= metadata)
++                {
++                    ret.add(new ItemStack(this.func_82532_h(), 1, 0));
++                }
++            }
 +        }
- 
--        if (!par1World.isRemote)
-+        for (int n = 0; n < 3 + fortune; n++)
-         {
--            int var8 = 3 + par7;
- 
--            for (int var9 = 0; var9 < var8; ++var9)
-+            if (world.rand.nextInt(15) <= metadata)
-             {
--                if (par1World.rand.nextInt(15) <= par5)
--                {
--                    float var10 = 0.7F;
--                    float var11 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
--                    float var12 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
--                    float var13 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
--                    EntityItem var14 = new EntityItem(par1World, (double)((float)par2 + var11), (double)((float)par3 + var12), (double)((float)par4 + var13), new ItemStack(Item.seeds));
--                    var14.delayBeforeCanPickup = 10;
--                    par1World.spawnEntityInWorld(var14);
--                }
-+                ret.add(new ItemStack(Item.seeds));
-             }
-         }
 +
 +        return ret;
      }