Use the spigot config for mangrove propagule / torchflower growth (#8597)

patches/server/Fix-Spigot-growth-modifiers.patch

@@ -4,11 +4,13 @@ Date: Fri, 3 Dec 2021 17:09:24 -0800
 Subject: [PATCH] Fix Spigot growth modifiers
 
 Fixes kelp modifier changing growth for other crops
-Also add growth modifiers for glow berries
+Also add growth modifiers for glow berries, mangrove propagules
+and torchflower crops
 Also fix above-mentioned modifiers from having the reverse effect
 
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
+Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -33,6 +35,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {
          return new ItemStack(Items.GLOW_BERRIES);
+diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
+@@ -0,0 +0,0 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
+                     modifier = world.spigotConfig.carrotModifier;
+                 } else if (this == Blocks.POTATOES) {
+                     modifier = world.spigotConfig.potatoModifier;
++                // Paper start
++                } else if (this == Blocks.TORCHFLOWER_CROP) {
++                    modifier = world.spigotConfig.torchFlowerModifier;
++                // Paper end
+                 } else {
+                     modifier = world.spigotConfig.wheatModifier;
+                 }
 diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
@@ -57,10 +74,31 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
          return (BlockState) state.cycle(GrowingPlantHeadBlock.AGE);
      }
+diff --git a/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java b/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java
+@@ -0,0 +0,0 @@ public class MangrovePropaguleBlock extends SaplingBlock implements SimpleWaterl
+     @Override
+     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
+         if (!isHanging(state)) {
+-            if (random.nextInt(7) == 0) {
++            if (random.nextFloat() < (world.spigotConfig.saplingModifier / (100.0F * 7))) { // Paper
+                 this.advanceTree(world, pos, state, random);
+             }
+ 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
+@@ -0,0 +0,0 @@ public class SpigotWorldConfig
+     public int beetrootModifier;
+     public int carrotModifier;
+     public int potatoModifier;
++    public int torchFlowerModifier; // Paper
+     public int wheatModifier;
+     public int wartModifier;
+     public int vineModifier;
 @@ -0,0 +0,0 @@ public class SpigotWorldConfig
      public int twistingVinesModifier;
      public int weepingVinesModifier;
@@ -69,6 +107,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private int getAndValidateGrowth(String crop)
      {
          int modifier = this.getInt( "growth." + crop.toLowerCase(java.util.Locale.ENGLISH) + "-modifier", 100 );
+@@ -0,0 +0,0 @@ public class SpigotWorldConfig
+         this.beetrootModifier = this.getAndValidateGrowth( "Beetroot" );
+         this.carrotModifier = this.getAndValidateGrowth( "Carrot" );
+         this.potatoModifier = this.getAndValidateGrowth( "Potato" );
++        this.torchFlowerModifier = this.getAndValidateGrowth("TorchFlower"); // Paper
+         this.wheatModifier = this.getAndValidateGrowth( "Wheat" );
+         this.wartModifier = this.getAndValidateGrowth( "NetherWart" );
+         this.vineModifier = this.getAndValidateGrowth( "Vine" );
 @@ -0,0 +0,0 @@ public class SpigotWorldConfig
          this.twistingVinesModifier = this.getAndValidateGrowth( "TwistingVines" );
          this.weepingVinesModifier = this.getAndValidateGrowth( "WeepingVines" );