diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
index 0c8c505832..a159a8c678 100644
--- a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
@@ -9,7 +9,25 @@
{
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);
-@@ -110,8 +110,8 @@
+@@ -49,6 +49,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());
+@@ -60,6 +62,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_));
++ }
+ }
+ }
+ }
+@@ -110,8 +114,8 @@
}
}
@@ -20,7 +38,7 @@
}
public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -135,6 +135,18 @@
+@@ -135,6 +139,18 @@
return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
}
diff --git a/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch b/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch
new file mode 100644
index 0000000000..02ff137dbd
--- /dev/null
+++ b/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch
@@ -0,0 +1,19 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockChorusFlower.java
++++ ../src-work/minecraft/net/minecraft/block/BlockChorusFlower.java
+@@ -52,7 +52,7 @@
+ {
+ int i = ((Integer)p_180650_3_.func_177229_b(field_185607_a)).intValue();
+
+- if (i < 5 && p_180650_4_.nextInt(1) == 0)
++ if (i < 5 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, p_180650_4_.nextInt(1) == 0))
+ {
+ boolean flag = false;
+ boolean flag1 = false;
+@@ -141,6 +141,7 @@
+ {
+ this.func_185605_c(p_180650_1_, p_180650_2_);
+ }
++ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+ }
+ }
+ }
diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
index bbdb460ba9..2a88acfb27 100644
--- a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
@@ -1,6 +1,23 @@
--- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -131,7 +131,14 @@
+@@ -43,13 +43,14 @@
+ {
+ this.func_176500_f(p_180650_1_, p_180650_2_, p_180650_3_);
+ }
+- else if (p_180650_1_.field_73012_v.nextInt(5) == 0)
++ else
+ {
+ int i = ((Integer)p_180650_3_.func_177229_b(field_176501_a)).intValue();
+
+- if (i < 2)
++ if (i < 2 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(5) == 0))
+ {
+ p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176501_a, Integer.valueOf(i + 1)), 2);
++ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+ }
+ }
+ }
+@@ -131,7 +132,14 @@
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_)
{
@@ -16,7 +33,7 @@
int j = 1;
if (i >= 2)
-@@ -141,8 +148,9 @@
+@@ -141,8 +149,9 @@
for (int k = 0; k < j; ++k)
{
diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
index 9ecf1fe8e4..696ab09f27 100644
--- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
@@ -1,6 +1,18 @@
--- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -117,11 +117,11 @@
+@@ -79,9 +79,10 @@
+ {
+ float f = func_180672_a(this, p_180650_1_, p_180650_2_);
+
+- if (p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0)
++ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0))
+ {
+ p_180650_1_.func_180501_a(p_180650_2_, this.func_185528_e(i + 1), 2);
++ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+ }
+ }
+ }
+@@ -117,11 +118,11 @@
float f1 = 0.0F;
IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
@@ -14,7 +26,7 @@
{
f1 = 3.0F;
}
-@@ -162,7 +162,8 @@
+@@ -162,7 +163,8 @@
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
{
@@ -24,7 +36,7 @@
}
protected Item func_149866_i()
-@@ -175,11 +176,33 @@
+@@ -175,11 +177,33 @@
return Items.field_151015_O;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
index a9f312ffa0..e07ed50285 100644
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
@@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -43,7 +43,7 @@
+@@ -43,25 +43,28 @@
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
{
@@ -9,7 +9,17 @@
}
public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-@@ -59,9 +59,11 @@
+ {
+ int i = ((Integer)p_180650_3_.func_177229_b(field_176486_a)).intValue();
+
+- if (i < 3 && p_180650_4_.nextInt(10) == 0)
++ if (i < 3 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(10) == 0))
+ {
+ p_180650_3_ = p_180650_3_.func_177226_a(field_176486_a, Integer.valueOf(i + 1));
+ p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_, 2);
++ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+ }
+
super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
}
@@ -22,7 +32,7 @@
{
int i = 1;
-@@ -108,6 +110,26 @@
+@@ -108,6 +111,26 @@
return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
}
diff --git a/patches/minecraft/net/minecraft/block/BlockReed.java.patch b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
index de5c601f7e..4f09dc8499 100644
--- a/patches/minecraft/net/minecraft/block/BlockReed.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
@@ -9,7 +9,25 @@
{
public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
protected static final AxisAlignedBB field_185701_b = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 1.0D, 0.875D);
-@@ -70,7 +70,9 @@
+@@ -54,6 +54,8 @@
+ {
+ int j = ((Integer)p_180650_3_.func_177229_b(field_176355_a)).intValue();
+
++ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, true))
++ {
+ if (j == 15)
+ {
+ p_180650_1_.func_175656_a(p_180650_2_.func_177984_a(), this.func_176223_P());
+@@ -63,6 +65,8 @@
+ {
+ p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176355_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_));
++ }
+ }
+ }
+ }
+@@ -70,7 +74,9 @@
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{
@@ -20,7 +38,7 @@
if (block == this)
{
-@@ -165,6 +167,17 @@
+@@ -165,6 +171,17 @@
return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
}
diff --git a/patches/minecraft/net/minecraft/block/BlockStem.java.patch b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
index 04185835d8..93ce337f03 100644
--- a/patches/minecraft/net/minecraft/block/BlockStem.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
@@ -1,6 +1,15 @@
--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
-@@ -90,9 +90,10 @@
+@@ -70,7 +70,7 @@
+ {
+ float f = BlockCrops.func_180672_a(this, p_180650_1_, p_180650_2_);
+
+- if (p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0)
++ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0))
+ {
+ int i = ((Integer)p_180650_3_.func_177229_b(field_176484_a)).intValue();
+
+@@ -90,13 +90,15 @@
}
p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
@@ -13,7 +22,12 @@
{
p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
}
-@@ -110,24 +111,29 @@
+ }
++ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+ }
+ }
+ }
+@@ -110,24 +112,29 @@
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_)
{
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index 6350107167..edd1b6f5d5 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -1163,4 +1163,16 @@ public class ForgeHooks
{
return MinecraftForge.EVENT_BUS.post(new ThrowableImpactEvent(throwable, ray));
}
+
+ public static boolean onCropsGrowPre(World worldIn, BlockPos pos, IBlockState state, boolean def)
+ {
+ BlockEvent ev = new BlockEvent.CropGrowEvent.Pre(worldIn,pos,state);
+ MinecraftForge.EVENT_BUS.post(ev);
+ return (ev.getResult() == Event.Result.ALLOW || (ev.getResult() == Event.Result.DEFAULT && def));
+ }
+
+ public static void onCropsGrowPost(World worldIn, BlockPos pos, IBlockState state, IBlockState blockState)
+ {
+ MinecraftForge.EVENT_BUS.post(new BlockEvent.CropGrowEvent.Post(worldIn, pos, state, worldIn.getBlockState(pos)));
+ }
}
diff --git a/src/main/java/net/minecraftforge/event/world/BlockEvent.java b/src/main/java/net/minecraftforge/event/world/BlockEvent.java
index 6f4c769d40..258c6287c8 100644
--- a/src/main/java/net/minecraftforge/event/world/BlockEvent.java
+++ b/src/main/java/net/minecraftforge/event/world/BlockEvent.java
@@ -35,6 +35,8 @@ import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.util.BlockSnapshot;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
+import net.minecraftforge.fml.common.eventhandler.Event.HasResult;
+import net.minecraftforge.fml.common.eventhandler.Event.Result;
import com.google.common.collect.ImmutableList;
@@ -285,5 +287,60 @@ public class BlockEvent extends Event
super(world, pos, state);
}
}
+
+ /**
+ * Fired when a crop block grows. See subevents.
+ *
+ */
+ public static class CropGrowEvent extends BlockEvent
+ {
+ public CropGrowEvent(World world, BlockPos pos, IBlockState state)
+ {
+ super(world, pos, state);
+ }
+ /**
+ * Fired when any "growing age" blocks (for example cacti, chorus plants, or crops
+ * in vanilla) attempt to advance to the next growth age state during a random tick.
+ *
+ * {@link Result#DEFAULT} will pass on to the vanilla growth mechanics.
+ * {@link Result#ALLOW} will force the plant to advance a growth stage.
+ * {@link Result#DENY} will prevent the plant from advancing a growth stage.
+ *
+ * This event is not {@link Cancelable}.
+ *
+ */
+ @HasResult
+ public static class Pre extends CropGrowEvent
+ {
+ public Pre(World world, BlockPos pos, IBlockState state)
+ {
+ super(world, pos, state);
+ }
+ }
+
+ /**
+ * Fired when "growing age" blocks (for example cacti, chorus plants, or crops
+ * in vanilla) have successfully grown. The block's original state is available,
+ * in addition to its new state.
+ *
+ * This event is not {@link Cancelable}.
+ *
+ * This event does not have a result. {@link HasResult}
+ */
+ public static class Post extends CropGrowEvent
+ {
+ private final IBlockState originalState;
+ public Post(World world, BlockPos pos, IBlockState original, IBlockState state)
+ {
+ super(world, pos, state);
+ originalState = original;
+ }
+
+ public IBlockState getOriginalState()
+ {
+ return originalState;
+ }
+ }
+ }
}