From 1c7341b98220d3427fbbab26e3cb3743b25e2779 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 14 May 2014 12:21:24 -0700 Subject: [PATCH] Added Farmland to PLAINS type plants as that has changed in 1.7. Also made BlockTallGrass call it's super.canBlockStay to better support custom soils. Closes #1077 --- patches/minecraft/net/minecraft/block/Block.java.patch | 2 +- .../net/minecraft/block/BlockTallGrass.java.patch | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index f89f1bb0bc..66c7ed8c85 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -924,7 +924,7 @@ + case Nether: return this == Blocks.field_150425_aM; + case Crop: return this == Blocks.field_150458_ak; + case Cave: return isSideSolid(world, x, y, z, UP); -+ case Plains: return this == Blocks.field_150349_c || this == Blocks.field_150346_d; ++ case Plains: return this == Blocks.field_150349_c || this == Blocks.field_150346_d || this == Blocks.field_150458_ak; + case Water: return world.func_147439_a(x, y, z).func_149688_o() == Material.field_151586_h && world.func_72805_g(x, y, z) == 0; + case Beach: + boolean isBeach = this == Blocks.field_150349_c || this == Blocks.field_150346_d || this == Blocks.field_150354_m; diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch index 29668a9828..4874336d4f 100644 --- a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch @@ -19,6 +19,15 @@ +public class BlockTallGrass extends BlockBush implements IGrowable, IShearable { private static final String[] field_149871_a = new String[] {"deadbush", "tallgrass", "fern"}; + @SideOnly(Side.CLIENT) +@@ -53,7 +56,7 @@ + + public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) + { +- return this.func_149854_a(p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_)); ++ return super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_); + } + @SideOnly(Side.CLIENT) @@ -71,7 +74,7 @@