From b036b37a35e4e00efbc93a0ab668cd0873ea5cca Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Wed, 4 Feb 2015 12:19:46 -0800
Subject: [PATCH] Fixed BlockBush and BlockCrops not respecting custom soils.
 Closes #1683

---
 .../minecraft/net/minecraft/block/Block.java.patch |  4 ++--
 .../net/minecraft/block/BlockBush.java.patch       | 14 +++++++++++++-
 .../net/minecraft/block/BlockCrops.java.patch      |  9 +++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch
index 7a24cd02e6..f0612ffdc5 100644
--- a/patches/minecraft/net/minecraft/block/Block.java.patch
+++ b/patches/minecraft/net/minecraft/block/Block.java.patch
@@ -812,8 +812,8 @@
 +    public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, net.minecraftforge.common.IPlantable plantable)
 +    {
 +        IBlockState state = world.func_180495_p(pos);
-+        IBlockState plant = plantable.getPlant(world, pos.func_177984_a());
-+        net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177984_a());
++        IBlockState plant = plantable.getPlant(world, pos.func_177972_a(direction));
++        net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177972_a(direction));
 +
 +        if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF && this == net.minecraft.init.Blocks.field_150434_aF)
 +        {
diff --git a/patches/minecraft/net/minecraft/block/BlockBush.java.patch b/patches/minecraft/net/minecraft/block/BlockBush.java.patch
index 5555052a8f..fa04998cf6 100644
--- a/patches/minecraft/net/minecraft/block/BlockBush.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockBush.java.patch
@@ -18,7 +18,19 @@
      }
  
      protected boolean func_149854_a(Block p_149854_1_)
-@@ -85,4 +85,33 @@
+@@ -62,7 +62,10 @@
+ 
+     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
+     {
+-        return this.func_149854_a(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c());
++        BlockPos down = p_180671_2_.func_177977_b();
++        Block soil = p_180671_1_.func_180495_p(down).func_177230_c();
++        if (p_180671_3_.func_177230_c() != this) return this.func_149854_a(soil); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
++        return soil.canSustainPlant(p_180671_1_, down, net.minecraft.util.EnumFacing.UP, this);
+     }
+ 
+     public AxisAlignedBB func_180640_a(World p_180640_1_, BlockPos p_180640_2_, IBlockState p_180640_3_)
+@@ -85,4 +88,33 @@
      {
          return EnumWorldBlockLayer.CUTOUT;
      }
diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
index f214f74fc8..a9d87a8ea3 100644
--- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
@@ -14,6 +14,15 @@
                      {
                          f1 = 3.0F;
                      }
+@@ -127,7 +127,7 @@
+ 
+     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
+     {
+-        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && this.func_149854_a(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c());
++        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c().canSustainPlant(p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
+     }
+ 
+     protected Item func_149866_i()
 @@ -143,24 +143,6 @@
      public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
      {