From 648c000fb2330ca1f9b7833a275e70f06c1fce83 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:23:38 +0200 Subject: [PATCH] Add pitcher plant api (#9286) --- .../0741-Fix-Spigot-growth-modifiers.patch | 27 ++++++++++++++----- ...d-missing-structure-set-seed-configs.patch | 6 ++--- ...-BlockGrowEvent-for-the-pitcher-crop.patch | 19 +++++++++++++ 3 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch diff --git a/patches/server/0741-Fix-Spigot-growth-modifiers.patch b/patches/server/0741-Fix-Spigot-growth-modifiers.patch index a383565371..7530d5438f 100644 --- a/patches/server/0741-Fix-Spigot-growth-modifiers.patch +++ b/patches/server/0741-Fix-Spigot-growth-modifiers.patch @@ -4,8 +4,8 @@ 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, mangrove propagules -and torchflower crops +Also add growth modifiers for glow berries, mangrove propagules, +torchflower crops and pitcher plant crops Also fix above-mentioned modifiers from having the reverse effect Co-authored-by: Jake Potrebic @@ -87,8 +87,21 @@ index 5d78348fc18b22ccb7ad109890f867e20efec047..44c78f0d56c3459c063c104e401a521e this.advanceTree(world, pos, state, random); } +diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +index 593eae04ecf6dee86c9c3664ddcdc3f86d042e66..849c0ae6ca30691134f51e5d4d5da372e0e728bd 100644 +--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +@@ -116,7 +116,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl + @Override + public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) { + float f = CropBlock.getGrowthSpeed(this, world, pos); +- boolean bl = random.nextInt((int)(25.0F / f) + 1) == 0; ++ boolean bl = random.nextFloat() < (world.spigotConfig.pitcherPlantModifier / (100.0F * (Math.floor(25.0F / f) + 1))); // Paper + if (bl) { + this.grow(world, state, pos, 1); + } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..8c45f28450bc1079ee5d184591f1ac03babced4e 100644 +index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..38da4cc3fe3be86e43432de942a1290fa8215474 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -96,6 +96,7 @@ public class SpigotWorldConfig @@ -99,15 +112,16 @@ index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..8c45f28450bc1079ee5d184591f1ac03 public int wheatModifier; public int wartModifier; public int vineModifier; -@@ -106,6 +107,7 @@ public class SpigotWorldConfig +@@ -106,6 +107,8 @@ public class SpigotWorldConfig public int twistingVinesModifier; public int weepingVinesModifier; public int caveVinesModifier; + public int glowBerryModifier; // Paper ++ public int pitcherPlantModifier; // Paper private int getAndValidateGrowth(String crop) { int modifier = this.getInt( "growth." + crop.toLowerCase(java.util.Locale.ENGLISH) + "-modifier", 100 ); -@@ -129,6 +131,7 @@ public class SpigotWorldConfig +@@ -129,6 +132,7 @@ public class SpigotWorldConfig this.beetrootModifier = this.getAndValidateGrowth( "Beetroot" ); this.carrotModifier = this.getAndValidateGrowth( "Carrot" ); this.potatoModifier = this.getAndValidateGrowth( "Potato" ); @@ -115,11 +129,12 @@ index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..8c45f28450bc1079ee5d184591f1ac03 this.wheatModifier = this.getAndValidateGrowth( "Wheat" ); this.wartModifier = this.getAndValidateGrowth( "NetherWart" ); this.vineModifier = this.getAndValidateGrowth( "Vine" ); -@@ -139,6 +142,7 @@ public class SpigotWorldConfig +@@ -139,6 +143,8 @@ public class SpigotWorldConfig this.twistingVinesModifier = this.getAndValidateGrowth( "TwistingVines" ); this.weepingVinesModifier = this.getAndValidateGrowth( "WeepingVines" ); this.caveVinesModifier = this.getAndValidateGrowth( "CaveVines" ); + this.glowBerryModifier = this.getAndValidateGrowth("GlowBerry"); // Paper ++ this.pitcherPlantModifier = this.getAndValidateGrowth("PitcherPlant"); // Paper } public double itemMerge; diff --git a/patches/server/0782-Add-missing-structure-set-seed-configs.patch b/patches/server/0782-Add-missing-structure-set-seed-configs.patch index 55251f679a..40285a58a1 100644 --- a/patches/server/0782-Add-missing-structure-set-seed-configs.patch +++ b/patches/server/0782-Add-missing-structure-set-seed-configs.patch @@ -229,10 +229,10 @@ index 65dcb14241baadb2c9f8f16919d7b562198ad9c3..594a2dd3b1d4c29c969d1992b8e93795 @Override diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8c45f28450bc1079ee5d184591f1ac03babced4e..bbfafb1400721251dfd2cac4dd8a31be2d682d4b 100644 +index 38da4cc3fe3be86e43432de942a1290fa8215474..5638290c72e0daeddfa79fd55e87334fa7d86f72 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -366,6 +366,16 @@ public class SpigotWorldConfig +@@ -368,6 +368,16 @@ public class SpigotWorldConfig public int mansionSeed; public int fossilSeed; public int portalSeed; @@ -249,7 +249,7 @@ index 8c45f28450bc1079ee5d184591f1ac03babced4e..bbfafb1400721251dfd2cac4dd8a31be private void initWorldGenSeeds() { this.villageSeed = this.getInt( "seed-village", 10387312 ); -@@ -383,6 +393,12 @@ public class SpigotWorldConfig +@@ -385,6 +395,12 @@ public class SpigotWorldConfig this.mansionSeed = this.getInt( "seed-mansion", 10387319 ); this.fossilSeed = this.getInt( "seed-fossil", 14357921 ); this.portalSeed = this.getInt( "seed-portal", 34222645 ); diff --git a/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch new file mode 100644 index 0000000000..98e7c69d60 --- /dev/null +++ b/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> +Date: Fri, 9 Jun 2023 13:04:42 +0200 +Subject: [PATCH] Call BlockGrowEvent for the pitcher crop + + +diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +index 849c0ae6ca30691134f51e5d4d5da372e0e728bd..d2e8aafb8db17f2426dd83353c0cfdeaf0d372aa 100644 +--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +@@ -126,7 +126,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl + private void grow(ServerLevel world, BlockState state, BlockPos pos, int amount) { + int i = Math.min(state.getValue(AGE) + amount, 4); + if (this.canGrow(world, pos, state, i)) { +- world.setBlock(pos, state.setValue(AGE, Integer.valueOf(i)), 2); ++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, state.setValue(AGE, Integer.valueOf(i)), 2)) return; // Paper + if (i >= 3) { + BlockPos blockPos = pos.above(); + world.setBlock(blockPos, copyWaterloggedFrom(world, pos, this.defaultBlockState().setValue(AGE, Integer.valueOf(i)).setValue(HALF, DoubleBlockHalf.UPPER)), 3);