From 1c31f42dae16f051a9d538f551e6afb801f15711 Mon Sep 17 00:00:00 2001 From: Jais Djurhuus-Kempel Date: Thu, 8 Sep 2022 18:11:59 +0300 Subject: [PATCH] [1.19.x] Added event for growing fungus (#8981) --- .../world/level/block/FungusBlock.java.patch | 11 ++++++ .../level/block/MushroomBlock.java.patch | 11 +++++- .../world/level/block/SaplingBlock.java.patch | 8 ---- .../grower/AbstractMegaTreeGrower.java.patch | 11 +++++- .../grower/AbstractTreeGrower.java.patch | 11 +++++- .../event/ForgeEventFactory.java | 12 +++++- .../event/level/SaplingGrowTreeEvent.java | 37 +++++++++++++++---- .../debug/world/BlockGrowFeatureTest.java | 25 +++++++++++++ src/test/resources/META-INF/mods.toml | 2 + 9 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/level/block/FungusBlock.java.patch create mode 100644 src/test/java/net/minecraftforge/debug/world/BlockGrowFeatureTest.java diff --git a/patches/minecraft/net/minecraft/world/level/block/FungusBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/FungusBlock.java.patch new file mode 100644 index 0000000000..e213c51de4 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/FungusBlock.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/FungusBlock.java ++++ b/net/minecraft/world/level/block/FungusBlock.java +@@ -44,6 +_,8 @@ + } + + public void m_214148_(ServerLevel p_221243_, RandomSource p_221244_, BlockPos p_221245_, BlockState p_221246_) { ++ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221243_, p_221244_, p_221245_, this.f_53597_.get()); ++ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return; + this.f_53597_.get().m_203334_().m_224953_(p_221243_, p_221243_.m_7726_().m_8481_(), p_221244_, p_221245_); + } + } diff --git a/patches/minecraft/net/minecraft/world/level/block/MushroomBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/MushroomBlock.java.patch index c3362162c9..caeb54fac4 100644 --- a/patches/minecraft/net/minecraft/world/level/block/MushroomBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/MushroomBlock.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/MushroomBlock.java +++ b/net/minecraft/world/level/block/MushroomBlock.java -@@ -70,7 +_,7 @@ +@@ -70,13 +_,15 @@ if (blockstate.m_204336_(BlockTags.f_13057_)) { return true; } else { @@ -9,3 +9,12 @@ } } + public boolean m_221773_(ServerLevel p_221774_, BlockPos p_221775_, BlockState p_221776_, RandomSource p_221777_) { ++ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221774_, p_221777_, p_221775_, this.f_153981_.get()); ++ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return false; + p_221774_.m_7471_(p_221775_, false); +- if (this.f_153981_.get().m_203334_().m_224953_(p_221774_, p_221774_.m_7726_().m_8481_(), p_221777_, p_221775_)) { ++ if (event.getFeature().m_203334_().m_224953_(p_221774_, p_221774_.m_7726_().m_8481_(), p_221777_, p_221775_)) { + return true; + } else { + p_221774_.m_7731_(p_221775_, p_221776_, 3); diff --git a/patches/minecraft/net/minecraft/world/level/block/SaplingBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/SaplingBlock.java.patch index ec587a49c4..578cc2aee7 100644 --- a/patches/minecraft/net/minecraft/world/level/block/SaplingBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/SaplingBlock.java.patch @@ -8,11 +8,3 @@ if (p_222012_.m_46803_(p_222013_.m_7494_()) >= 9 && p_222014_.m_188503_(7) == 0) { this.m_222000_(p_222012_, p_222013_, p_222011_, p_222014_); } -@@ -41,6 +_,7 @@ - if (p_222003_.m_61143_(f_55973_) == 0) { - p_222001_.m_7731_(p_222002_, p_222003_.m_61122_(f_55973_), 4); - } else { -+ if (!net.minecraftforge.event.ForgeEventFactory.saplingGrowTree(p_222001_, p_222004_, p_222002_)) return; - this.f_55975_.m_213817_(p_222001_, p_222001_.m_7726_().m_8481_(), p_222002_, p_222003_, p_222004_); - } - 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 index 4045e7894f..e0dbe46de4 100644 --- a/patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java +++ b/net/minecraft/world/level/block/grower/AbstractMegaTreeGrower.java -@@ -25,11 +_,19 @@ +@@ -25,15 +_,24 @@ return super.m_213817_(p_222891_, p_222892_, p_222893_, p_222894_, p_222895_); } @@ -17,7 +17,14 @@ 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_); +- if (holder == null) { + Holder> holder = this.getConfiguredMegaFeature(p_222897_, p_222898_, p_222899_, p_222900_, p_222901_); - if (holder == null) { ++ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_222897_, p_222901_, p_222899_, holder); ++ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY) || event.getFeature() == null) { return false; } else { +- ConfiguredFeature configuredfeature = holder.m_203334_(); ++ ConfiguredFeature configuredfeature = event.getFeature().m_203334_(); + BlockState blockstate = Blocks.f_50016_.m_49966_(); + p_222897_.m_7731_(p_222899_.m_7918_(p_222902_, 0, p_222903_), blockstate, 4); + p_222897_.m_7731_(p_222899_.m_7918_(p_222902_ + 1, 0, p_222903_), blockstate, 4); 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 index 953f321557..4fe8f88170 100644 --- a/patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/grower/AbstractTreeGrower.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/grower/AbstractTreeGrower.java +++ b/net/minecraft/world/level/block/grower/AbstractTreeGrower.java -@@ -12,11 +_,19 @@ +@@ -12,15 +_,24 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; public abstract class AbstractTreeGrower { @@ -17,7 +17,14 @@ 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_)); +- if (holder == null) { + Holder> holder = this.getConfiguredFeature(p_222905_, p_222906_, p_222907_, p_222908_, p_222909_, this.m_60011_(p_222905_, p_222907_)); - if (holder == null) { ++ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_222905_, p_222909_, p_222907_, holder); ++ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY) || event.getFeature() == null) { return false; } else { +- ConfiguredFeature configuredfeature = holder.m_203334_(); ++ ConfiguredFeature configuredfeature = event.getFeature().m_203334_(); + BlockState blockstate = p_222905_.m_6425_(p_222907_).m_76188_(); + p_222905_.m_7731_(p_222907_, blockstate, 4); + if (configuredfeature.m_224953_(p_222905_, p_222906_, p_222909_, p_222907_)) { diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 1e6d9bb710..0cbd990036 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -17,6 +17,7 @@ import com.mojang.brigadier.CommandDispatcher; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.commands.CommandBuildContext; +import net.minecraft.core.Holder; import net.minecraft.server.MinecraftServer; import net.minecraft.server.ReloadableServerResources; import net.minecraft.server.level.ChunkHolder; @@ -29,6 +30,7 @@ import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.level.biome.MobSpawnSettings; import net.minecraft.world.level.chunk.LevelChunk; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.portal.PortalShape; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.item.TooltipFlag; @@ -613,11 +615,17 @@ public class ForgeEventFactory return result == Result.DEFAULT ? level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) : result == Result.ALLOW; } + @Deprecated(forRemoval = true, since = "1.19.2") public static boolean saplingGrowTree(LevelAccessor level, RandomSource randomSource, BlockPos pos) { - SaplingGrowTreeEvent event = new SaplingGrowTreeEvent(level, randomSource, pos); + return !blockGrowFeature(level, randomSource, pos, null).getResult().equals(Result.DENY); + } + + public static SaplingGrowTreeEvent blockGrowFeature(LevelAccessor level, RandomSource randomSource, BlockPos pos, Holder> holder) + { + SaplingGrowTreeEvent event = new SaplingGrowTreeEvent(level, randomSource, pos, holder); MinecraftForge.EVENT_BUS.post(event); - return event.getResult() != Result.DENY; + return event; } public static void fireChunkTicketLevelUpdated(ServerLevel level, long chunkPos, int oldTicketLevel, int newTicketLevel, @Nullable ChunkHolder chunkHolder) diff --git a/src/main/java/net/minecraftforge/event/level/SaplingGrowTreeEvent.java b/src/main/java/net/minecraftforge/event/level/SaplingGrowTreeEvent.java index e5732be475..d5dc484b2a 100644 --- a/src/main/java/net/minecraftforge/event/level/SaplingGrowTreeEvent.java +++ b/src/main/java/net/minecraftforge/event/level/SaplingGrowTreeEvent.java @@ -6,38 +6,58 @@ package net.minecraftforge.event.level; import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.SaplingBlock; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event.HasResult; /** - * This event is fired whenever a sapling grows into a tree. + * This event is fired whenever a sapling, fungus, mushroom or azalea grows into a tree. * This event is fired during sapling growth in * {@link SaplingBlock#advanceTree(ServerLevel, BlockPos, BlockState, RandomSource)}. *

* This event is not {@linkplain Cancelable cancellable} but does {@linkplain HasResult have a result}. - * {@linkplain Result#ALLOW ALLOW} and {@linkplain Result#DEFAULT DEFAULT} will allow the sapling to grow. + * {@linkplain Result#ALLOW ALLOW} and {@linkplain Result#DEFAULT DEFAULT} will allow the sapling to grow + * using the features set on the event. * {@linkplain Result#DENY DENY} will prevent the sapling from growing. *

* This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus} * only on the {@linkplain net.minecraftforge.fml.LogicalSide#SERVER logical server}. + * TODO 1.20 rename event */ @HasResult public class SaplingGrowTreeEvent extends LevelEvent { - private final BlockPos pos; private final RandomSource randomSource; + private final BlockPos pos; + private Holder> feature; + @Deprecated(forRemoval = true, since = "1.19.2") public SaplingGrowTreeEvent(LevelAccessor level, RandomSource randomSource, BlockPos pos) + { + this(level, randomSource, pos, null); + } + + public SaplingGrowTreeEvent(LevelAccessor level, RandomSource randomSource, BlockPos pos, Holder> feature) { super(level); this.randomSource = randomSource; this.pos = pos; + this.feature = feature; + } + + /** + * {@return the random source which initiated the sapling growth} + */ + public RandomSource getRandomSource() + { + return this.randomSource; } /** @@ -49,10 +69,13 @@ public class SaplingGrowTreeEvent extends LevelEvent } /** - * {@return the random source which initiated the sapling growth} + * {@return the holder of the feature which will be placed} */ - public RandomSource getRandomSource() - { - return this.randomSource; + public Holder> getFeature() { + return feature; + } + + public void setFeature(Holder> feature) { + this.feature = feature; } } diff --git a/src/test/java/net/minecraftforge/debug/world/BlockGrowFeatureTest.java b/src/test/java/net/minecraftforge/debug/world/BlockGrowFeatureTest.java new file mode 100644 index 0000000000..4650030a3c --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/world/BlockGrowFeatureTest.java @@ -0,0 +1,25 @@ +package net.minecraftforge.debug.world; + +import net.minecraft.data.worldgen.features.TreeFeatures; +import net.minecraftforge.event.level.SaplingGrowTreeEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import org.apache.logging.log4j.LogManager; + +@Mod("block_grow_feature_test") +@Mod.EventBusSubscriber +public class BlockGrowFeatureTest +{ + public static final boolean ENABLE = true; + + @SubscribeEvent + public static void onGrowReplaceFeature(SaplingGrowTreeEvent event) + { + if (ENABLE) { + event.setFeature(TreeFeatures.BIRCH_BEES_005); + if (event.getFeature().equals(TreeFeatures.BIRCH_BEES_005)) { + LogManager.getLogger().info("BlockGrowFeatureTest replaced feature"); + } + } + } +} diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index f2845286c9..bdc66472f7 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -14,6 +14,8 @@ license="LGPL v2.1" modId="fluid_type_test" [[mods]] modId="potentialspawnsevent_test" +[[mods]] + modId="block_grow_feature_test" [[mods]] modId="advancement_event_test"