60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
|
|
@@ -20,7 +20,7 @@
|
|
import net.minecraftforge.fml.relauncher.Side;
|
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
|
|
|
-public class BlockCactus extends Block
|
|
+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
|
|
{
|
|
public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
|
|
protected static final AxisAlignedBB field_185593_b = new AxisAlignedBB(0.0625D, 0.0D, 0.0625D, 0.9375D, 0.9375D, 0.9375D);
|
|
@@ -51,6 +51,8 @@
|
|
{
|
|
int j = ((Integer)p_180650_3_.func_177229_b(field_176587_a)).intValue();
|
|
|
|
+ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, true))
|
|
+ {
|
|
if (j == 15)
|
|
{
|
|
p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
|
|
@@ -62,6 +64,8 @@
|
|
{
|
|
p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176587_a, Integer.valueOf(j + 1)), 4);
|
|
}
|
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
@@ -112,8 +116,8 @@
|
|
}
|
|
}
|
|
|
|
- Block block = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b()).func_177230_c();
|
|
- return block == Blocks.field_150434_aF || block == Blocks.field_150354_m && !p_176586_1_.func_180495_p(p_176586_2_.func_177984_a()).func_185904_a().func_76224_d();
|
|
+ IBlockState state = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b());
|
|
+ return state.func_177230_c().canSustainPlant(state, p_176586_1_, p_176586_2_.func_177977_b(), EnumFacing.UP, this) && !p_176586_1_.func_180495_p(p_176586_2_.func_177984_a()).func_185904_a().func_76224_d();
|
|
}
|
|
|
|
public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
|
|
@@ -137,6 +141,18 @@
|
|
return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
|
|
}
|
|
|
|
+ @Override
|
|
+ public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
|
|
+ {
|
|
+ return net.minecraftforge.common.EnumPlantType.Desert;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
|
|
+ {
|
|
+ return func_176223_P();
|
|
+ }
|
|
+
|
|
protected BlockStateContainer func_180661_e()
|
|
{
|
|
return new BlockStateContainer(this, new IProperty[] {field_176587_a});
|