From e57222ee9a0d6942f0707ba68c1fe67e5cfbecd2 Mon Sep 17 00:00:00 2001 From: TheRealWormbo Date: Tue, 21 Jan 2025 20:29:16 +0100 Subject: [PATCH] Add Botania grass variants to sniffer-diggable blocks (implements #4782) --- .../.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 | 1 + .../minecraft/tags/blocks/sniffer_diggable_block.json | 11 +++++++++++ .../java/vazkii/botania/data/BlockTagProvider.java | 4 +++- web/changelog.md | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Xplat/src/generated/resources/data/minecraft/tags/blocks/sniffer_diggable_block.json diff --git a/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 b/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 index e5171b6a97..7ee81d7219 100644 --- a/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 +++ b/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 @@ -59,6 +59,7 @@ d5f2792b94968c712824b9ab93ba589c15bd1886 data/minecraft/tags/blocks/rails.json 8a23702b05296c8af5014d6aa6e9265ded85c7d9 data/minecraft/tags/blocks/sand.json a01e6f58bac0c802977ef45bff0374c7030b2dac data/minecraft/tags/blocks/slabs.json e2a006bbecc6067ef36187214c8fe5f5c7ea1c2e data/minecraft/tags/blocks/small_flowers.json +f6a5c0245b80f1c4bb390046a4e1a8265be42bd1 data/minecraft/tags/blocks/sniffer_diggable_block.json 201298e855b770d34316738abb0e37a31ebd77b0 data/minecraft/tags/blocks/stairs.json 589fa9d68f43847133a9115af36e85e50cf29be7 data/minecraft/tags/blocks/tall_flowers.json 99110c18af7a6aa513ae990e843ba38bfc13bf3f data/minecraft/tags/blocks/walls.json diff --git a/Xplat/src/generated/resources/data/minecraft/tags/blocks/sniffer_diggable_block.json b/Xplat/src/generated/resources/data/minecraft/tags/blocks/sniffer_diggable_block.json new file mode 100644 index 0000000000..0417611693 --- /dev/null +++ b/Xplat/src/generated/resources/data/minecraft/tags/blocks/sniffer_diggable_block.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "botania:dry_grass", + "botania:golden_grass", + "botania:infused_grass", + "botania:mutated_grass", + "botania:scorched_grass", + "botania:vivid_grass" + ] +} \ No newline at end of file diff --git a/Xplat/src/main/java/vazkii/botania/data/BlockTagProvider.java b/Xplat/src/main/java/vazkii/botania/data/BlockTagProvider.java index 1acb9160c4..ad229b8ba8 100644 --- a/Xplat/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/Xplat/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -146,7 +146,9 @@ protected void addTags(HolderLookup.Provider provider) { tag(BlockTags.BEACON_BASE_BLOCKS).add(BotaniaBlocks.manasteelBlock, BotaniaBlocks.terrasteelBlock, BotaniaBlocks.elementiumBlock, BotaniaBlocks.manaDiamondBlock, BotaniaBlocks.dragonstoneBlock); - tag(BlockTags.DIRT).add(getModBlocks(b -> b instanceof BotaniaGrassBlock)); + @NotNull Block[] grassBlockVariants = getModBlocks(b -> b instanceof BotaniaGrassBlock); + tag(BlockTags.DIRT).add(grassBlockVariants); + tag(BlockTags.SNIFFER_DIGGABLE_BLOCK).add(grassBlockVariants); tag(BotaniaTags.Blocks.BLOCKS_ELEMENTIUM).add(BotaniaBlocks.elementiumBlock); tag(BotaniaTags.Blocks.BLOCKS_MANASTEEL).add(BotaniaBlocks.manasteelBlock); tag(BotaniaTags.Blocks.BLOCKS_TERRASTEEL).add(BotaniaBlocks.terrasteelBlock); diff --git a/web/changelog.md b/web/changelog.md index 445321ecc6..50e084b301 100644 --- a/web/changelog.md +++ b/web/changelog.md @@ -21,6 +21,7 @@ and start a new "Upcoming" section. structure it's placed in, also further customizable with datapacks. Huuuuge thanks to Wormbo for a lot of work on this feature! * Add: Dispenser planting supports torchflower seeds and pitcher pods +* Add: Sniffers can dig up their usual seeds on Botania grass variants * Change: More readable color in Loonium tooltip * Change: Pasture seed spread is no longer restricted to a single Y-level, and replacing existing dirt-like blocks is handled by block tag `botania:pasture_seed_replaceable` * Change: Hopperhocks now also apply delay from being planted on podzol or mycelium to picking up recipe outputs, such as from mana infusion