From 02f26dc7a106b2470524bf42afe8aa8b5565e91c Mon Sep 17 00:00:00 2001 From: Minecraftschurli Date: Sat, 3 Sep 2022 21:24:00 +0200 Subject: [PATCH] [1.19.x] add methods with more context to tree growers (#8956) --- .../grower/AbstractMegaTreeGrower.java.patch | 23 +++++++++++++++++++ .../grower/AbstractTreeGrower.java.patch | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch create mode 100644 patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch diff --git a/patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch new file mode 100644 index 0000000000..4045e7894f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java ++++ b/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java +@@ -25,11 +_,19 @@ + return super.m_213817_(p_222891_, p_222892_, p_222893_, p_222894_, p_222895_); + } + ++ // Forge: context-sensitive version to be able to use data pack provided features ++ @Nullable ++ protected Holder> getConfiguredMegaFeature(ServerLevel level, ChunkGenerator chunkGenerator, BlockPos pos, BlockState state, RandomSource random) { ++ return m_213566_(random); ++ } ++ ++ /** @deprecated Forge: Use {@link #getConfiguredMegaFeature(ServerLevel, ChunkGenerator, BlockPos, BlockState, RandomSource)} instead */ ++ @Deprecated + @Nullable + protected abstract Holder> m_213566_(RandomSource p_222904_); + + public boolean m_222896_(ServerLevel p_222897_, ChunkGenerator p_222898_, BlockPos p_222899_, BlockState p_222900_, RandomSource p_222901_, int p_222902_, int p_222903_) { +- Holder> holder = this.m_213566_(p_222901_); ++ Holder> holder = this.getConfiguredMegaFeature(p_222897_, p_222898_, p_222899_, p_222900_, p_222901_); + if (holder == null) { + return false; + } else { diff --git a/patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch new file mode 100644 index 0000000000..953f321557 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/world/level/block/grower/AbstractTreeGrower.java ++++ b/net/minecraft/world/level/block/grower/AbstractTreeGrower.java +@@ -12,11 +_,19 @@ + import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; + + public abstract class AbstractTreeGrower { ++ // Forge: context-sensitive version to be able to use data pack provided features ++ @Nullable ++ protected Holder> getConfiguredFeature(ServerLevel level, ChunkGenerator chunkGenerator, BlockPos pos, BlockState state, RandomSource random, boolean hasFlowers) { ++ return m_213888_(random, hasFlowers); ++ } ++ ++ /** @deprecated Forge: Use {@link #getConfiguredFeature(ServerLevel, ChunkGenerator, BlockPos, BlockState, RandomSource, boolean)} instead */ ++ @Deprecated + @Nullable + protected abstract Holder> m_213888_(RandomSource p_222910_, boolean p_222911_); + + public boolean m_213817_(ServerLevel p_222905_, ChunkGenerator p_222906_, BlockPos p_222907_, BlockState p_222908_, RandomSource p_222909_) { +- Holder> holder = this.m_213888_(p_222909_, this.m_60011_(p_222905_, p_222907_)); ++ Holder> holder = this.getConfiguredFeature(p_222905_, p_222906_, p_222907_, p_222908_, p_222909_, this.m_60011_(p_222905_, p_222907_)); + if (holder == null) { + return false; + } else {