Update to 1.21.5 (#1107)

* Add 1.21.5 packtest workflow

* Update wolf_variant files

* Update biome extensions

* Remove 1.21-1.21.4 support ans squash overlays

* Update version numbers to 1.21.5

* Update pack format

* generate new item model definitions

* item-model merge policy

* Generate 1.21.3 RP models into an overlay

* Add CMD range padding into new item_def files

* Replace manual predicate-entry into model data config (for end fishing elytra)

* Manually provide end fishing elytra item model in overlay

* Remove RP backports

* Fix some more RP script issues

* Re-add standard crafting guidebook recipes

* Re-add biome extensions beet.yaml

* Remove upgrade paths and optional tag entries

* Split potion entity type into splash_ and lingering_

* Item component changes

* Update type_specific predicates

* Delete beehive inspector module

* Add pale oak door sounds

* Update hoverEvent and clickEvent

* Update some guidebook text components

* Update ArmorItems and HandItems to equipment + drop_chances

* Update text components in custom_name and CustomName

* Use mecha dev dependency

* Update TranslationLinter to check SNBT

* Update more text components

* Update body_armor_item to equipment.body

* Fix splash_potion entity type in mob curing tests

* Fix potion swords tests with inventory predicates

* Test timing fix: Metallurgy and Infinitas failing smoosh test activating piston too early

* increase delay to confirm sneaking

* Test timing fix: Animi and Fulcio also failing smoosh test activating piston too early

* Update to stable beet and mecha versions

* Update packtest version to v2.1

* Revert test timing commits

This reverts commit 63cb12f.
This reverts commit d209a7e.
This reverts commit bdb8c86.

* Rename FallDistance to fall_distance

* Fix advancement background texture

* Fix phantom field Size -> size

* Fix turtle field HasEgg -> has_egg

* Fix vex field LifeTicks -> life_ticks

* Fix pig Saddle -> equipment.saddle

* Fix chairs lightning reviving

* Fix text components in gm4 reload logs

* More text component unstringifying

* Replace reliance on AstNbt.evaluate

* Add 1.21.5 Plants to Blossoming Pots

* Fix balloon animals lead lore to entity name

* Pig tractors fix

* Fix phantom scarecrows rocket having a particle

* Discontinue auto crafting module

* Discontinue record crafting module

* Make lumos and shapeless portals tests optional

* Fix tunnel bores creation particle + orb of ankou AEC name

* Fix undead players drowned conversion copying player name

* Update Blossoming Pots Guidebook

* Add new blocks to base tag lists
- also fix alphabetical sorting in no_collision

* Add farm animal variants to Balloon Animals

* Fix guidebook code for text component changes

* Fix guidebook lecturn TOC

* Recommended Changes from misode

* Fixes because I didn't pay enough attention to what I was doing

* Discontinue tinkering compressors module

* Fix Block Compressors test, add additional BoO test checking against keeping the boots data

* BAS aec's do not despawn, expected Duration:0 by default.  1.21.5 broke this

* Run's misc 1.21.5 commits part 3 (#1115)

* Fix pig tractors unresponsive (#1109)

* Fix NBI area affect cloud showing particles

* Fix DripleafLaunchers broken from "stepping_on" change

* Fix Gemini Shamir extra farm animal baby not having same variant as other baby / parents

* Fix Gemini Shamir extra wolf baby not having same variant as other baby / parents

* Add pale oak log & wood to Arborenda Shamir

* Fix modules using `Inventory` for armor or offhand

* Fix wrong set_bees reference and bucket_entity_data component

* Fix tinker shamir for offhand and armor slots

* Change inventory.* to container.* in tinker predicates

* Discontinue combat expanded module

* Fix infinite AECs

* 1.21.5 aec default fixes (#1118)

* set default radius

* set default particle

* update predicate count to 64 (#1120)

* Fix Tipped Arrows and Beehives (#1121)

* Fix Lingering LiaB

* fix soul glass removing beacon data (#1123)

* Revert machines library armor stand change

* Update shamir model/texture generation code for 1.21.4

* Add backwards compatibility for 1.21.3 metallurgy textures

* Fix references to item references that only exist as block references

* Add support for special-case vanilla tempates

Covers player heads, which is used by metallurgy mould heads. NOTE: current implementation puts heads on an armor stand, bypassing the usual model rendering. If a custom block model is added to the moulds, migration to an item-display is required.

* Add rename for guidebook broken elytra texture

* [Incomplete] fixing missing advancement icon model forwarding

* [Incomplete] Move item-def handling to Templates

* VanillaTemplate pulls in default model settings

* [Incomplete] progress from desktop

* Advancement models inherit from VanillaTemplate

* 1.21.5 heart canisters update (#1122)

* update heart canisters

* improve heart canisters counting

* update heart canister tests

* meaningless change to make tests run

* allow tadpoles to be everstoned (#1125)

* Metallurgy 1.21: Lore Line Shrink (#1078)

* Reduces Metallurgy shamir items lore count from 3 to 2

* Remove failing test line

* Use macro and spawn new instead of copying over data

* Move item kill to inside macro for safety

* Use Text Displays for Holographic Tags
- Colors now represent wool colores
- Glow Item Frames now cause the hologram to appear lit

* Fix Holographic Tags Test

* Fix Hologram Removal Not Respecting Item Frame Rotation

* I have suffered enough

* New Mysterious Midnights Sound (#1126)

The previous sound (wolf howl) was removed by Mojang.

* 1.21.5 Heart Canisters (& Crossbow Cartridges) (#1127)

* make heart canisters use poisonous potato's

* fix heart canister from recipe

* remove duplicate from recipe (oops)

* Fix Double Doors: Copper Doors and Trapdoors are Unaffected #1038

* 1.21.5 Blossoming Pots finalize features & up version number (#1129)

* Use 100% Entity-Free Raycast Technique in Book Binders (Vegan)
Disclaimer: I was not able to test these changes yet.

* Move Legacy Smithed Upgrade Path in Shroomites to Reduce @e Count

* Actually Remove an @e

* Remove smithed_compat upgrades (after almost 3 years)

* Update Minor Version Numbers (#1130)

Minor version should be bumped on every supported Minecraft version change to avoid possible overlaps on backports.

* Modernize Desire Lines (#1090)

* Fix Desire Lines Converting Blocks Below Non-Full Blocks

* Modernize Desire Lines

* Slow Falling Prevents Desire Lines

* Fix: Vibro Shockwave Should Ignore Slow Falling, Add Comment on $probability Usage

* Actually Don't Affect Blocks Below Carpet

Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

* Hard-Overwrite Desire Lines if Slow Falling is Active

Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

* Update gm4_desire_lines/data/gm4_desire_lines/function/player.mcfunction

Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

* Include Slow Falling in is_affected.json

* Remove Unused Predicate

* Remove Reference to Removed Predicate

* Decrease Jumping Penalty

* Add Myself to the Updater List so People Can Blame Me

* Ensure Player Does NOT Have slow_falling

---------

Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>

* Remove Leftover Lines

* Update lib_brewing Raycast

* Update lib_trees Raycast

* Update lib_custom_crafters Raycast

* Prioritize Saplings on Looking Vector in lib_trees Raycast

* Prioritize Brewing Stand on Looking Vector in lib_brewing Raycast

* Standard Crafting 1.21.5  (#1132)

* Fix Slab uncrafting overlapping with some Vanilla Recipes (#1113)

- Fixes #1105 by changing slab uncrafting to 2x2 slabs -> 2 blocks
- Updates custom crafter recipes to match
- Adding custom crafter support for 1.21 - 1.21.4 blocks
- Changes to generated function definitions and loot tables for the custom crafter

* Change stair uncrafting recipe output count to 3 blocks

* Fix Excessive Particles in Better Armor Stands

* Add Resin Brick Support to Forming Press

* Add heart canisters upgrade path and fix RP (#1133)

* Orb of Ankou 1.21.5 (#1128)

* fix attribute-based pneumas

* fix blasting

* fix dashing by using player motion library

* fix feigning jump

* use attribute for agile

NOTE: breaks old agile items, need an upgrade path

* fix typo in comment

* fix pricking

NOTE: breaks old pricking soul essence

* fix soaring

* make shard and orb equippable into offhand

* fix beet.yaml formatting

* add loot tables for shards

* add smithed item ignore functionality

* refactor some entity functions

- inline functions that aren't called from multiple places
- use random
- shard and essence entities grab loot table item instead of copying exact item (to act as an upgrade path)
- TODO: orb upgrade path using data from shard loot tables

* fix spawn positions of entities

* restore orb based on shard loot tables

* set max stack size of shards and orb to 1

* fix formatting

* fix function rename

* fix weapon.mainhand slot call for loot command

* keep pneuma order intact when restoring an orb

* fix congealed shard data

* implement lib_player_motion

- adds the player motion library as a namespaced and versioned GM4 library with proper call function tags

* implement custom version of player motion

- basically a fork that is renamespaced, version-checked, and uses the GM4 forceloaded chunk
- licensing might not be correct in the release download

* fix ooa to use proper player motion version

* prevent wither rose particle from generating on obsidian

* update random position to use random command and macro

* Move original player motion license to main license

* properly remove rose particle markers

* properly kill striding markers

* make items fire resistant

* fix withering pneuma

* fix expeditious

* fix soaring

* actually fix soaring

- no longer need to look up for the first no-gravity
- picking up or dropping items no longer resets the no-gravity
- first sneak when equipping will activate the no-gravity

* Fix shield models being invisible

* Sunken treasure chests and metallurgy elytra

* Fix "missing particle texture" warning in block models

* Fix metallurgy RP

* Fix guidebook RP by removing spawn_egg texture reference in font

* Update heart canisters guidebook

* 1.21.5 hc and ooa guidebook text (#1135)

* update heart cansisters guidebook

* update ooa guidebook

* Update beet to v0.110.1

---------

Co-authored-by: SpecialBuilder <specialbuilder32@gmail.com>
Co-authored-by: EpyonProjects <66185010+EpyonProjects@users.noreply.github.com>
Co-authored-by: runcows <alexparbarnes@gmail.com>
Co-authored-by: runcows <124551271+runcows@users.noreply.github.com>
Co-authored-by: BPR <dev@bpr02.com>
Co-authored-by: Thanathor <73304324+TheThanathor@users.noreply.github.com>
Co-authored-by: Bloo <git@bloo.boo>

Author: 7 people

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '1.21'
+  VERSION: '1.21.5'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
 
 jobs:
@@ -89,18 +89,10 @@ jobs:
           # https://fabricmc.net/use/server/
           # https://modrinth.com/mod/fabric-api/versions
           # https://modrinth.com/mod/packtest/versions
-          - version: '1.21.1'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.1/0.16.5/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WTaAx4ah/fabric-api-0.105.0%2B1.21.1.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/x9txtivi/packtest-1.8-mc1.21.1.jar
-          - version: '1.21.3'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.3/0.16.7/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dhD4I4lJ/fabric-api-0.106.1%2B1.21.3.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/wjOUK14F/packtest-1.9-mc1.21.2.jar
-          - version: '1.21.4'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.4-rc1/0.16.9/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/X7o8njVT/fabric-api-0.110.2%2B1.21.4.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/owHaqexZ/packtest-1.10-beta1-mc1.21.4.jar
+          - version: '1.21.5'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

base/beet.yaml

@@ -1,4 +1,4 @@
-version: 1.7.0
+version: 1.8.0
 id: gm4
 
 data_pack:

base/data/gm4/function/conflict_logs/traverse.mcfunction

@@ -1,5 +1,5 @@
 execute store success score #not_match gm4_data run data modify storage gm4:log traverse_versions[0].id set from storage gm4:log log.require_id
-execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value '[{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","color":"red"},{"text":")","color":"red"}]'
+execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value [{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","color":"red"},{"text":")","color":"red"}]
 
 execute if score #not_match gm4_data matches 0 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log"},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log"},{"text":" v"},{"nbt":"traverse_versions[0].version","storage":"gm4:log","color":"red"},{"text":" is installed instead","color":"red"},{"nbt":"temp","storage":"gm4:log","interpret":true}]
 

base/data/gm4/function/load.mcfunction

@@ -1,5 +1,5 @@
 data merge storage gm4:log {queue:[],versions:[]}
-data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Checking for updates...","color":"#4AA0C7"}'}
+data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Checking for updates...","color":"#4AA0C7"}}
 
 scoreboard objectives add gm4_modules dummy
 scoreboard objectives add gm4_data dummy
@@ -15,6 +15,6 @@ execute unless score $cooldown gm4_creative matches 0.. run scoreboard players s
 # Setting this to 0 will always show logs to all players
 execute unless score $global_cooldown gm4_creative matches 0.. run scoreboard players set $global_cooldown gm4_creative 10
 
-execute unless score gm4 gm4_modules matches 1.. run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Welcome to Gamemode 4. Initialising...","color":"green"}'}
+execute unless score gm4 gm4_modules matches 1.. run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Welcome to Gamemode 4. Initialising...","color":"green"}}
 execute unless score gm4 gm4_modules matches 1.. run schedule function gm4:intro_song/init 2s
 execute unless score gm4 gm4_modules matches 1.. run scoreboard players set gm4 gm4_modules 1

base/data/gm4/function/outdated_logs/outdated_start.mcfunction

@@ -1,4 +1,4 @@
-tellraw @a[tag=gm4_show_log] [{"text":"The following modules are outdated! Click here to download the latest versions.","color":"gold","clickEvent":{"action":"open_url","value":"https://www.gm4.co/modules"},"hoverEvent":{"action":"show_text","value":{"text":"Click to visit gm4.co/modules","color":"#4AA0C7"}}}]
+tellraw @a[tag=gm4_show_log] [{"text":"The following modules are outdated! Click here to download the latest versions.","color":"gold","click_event":{"action":"open_url","url":"https://www.gm4.co/modules"},"hover_event":{"action":"show_text","value":{"text":"Click to visit gm4.co/modules","color":"#4AA0C7"}}}]
 
 data modify storage gm4:log outdated_list set from storage gm4:log queue
 data remove storage gm4:log outdated_list[{type:"text"}]

base/data/gm4/function/post_load.mcfunction

@@ -1,4 +1,4 @@
-execute unless data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: No updates found.","color":"#4AA0C7"}'}
-execute if data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Updates completed.","color":"#4AA0C7"}'}
+execute unless data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: No updates found.","color":"#4AA0C7"}}
+execute if data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Updates completed.","color":"#4AA0C7"}}
 
 function gm4:log_wait

base/data/gm4/tags/block/foliage.json

@@ -11,33 +11,40 @@
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:brown_mushroom",
+    "minecraft:bush",
+    "minecraft:cactus_flower",
     "minecraft:cave_vines",
     "minecraft:cave_vines_plant",
     "minecraft:crimson_fungus",
     "minecraft:crimson_roots",
     "minecraft:dead_bush",
     "minecraft:fern",
+    "minecraft:firefly_bush",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
     "minecraft:hanging_roots",
     "minecraft:large_fern",
+    "minecraft:leaf_litter",
     "minecraft:mangrove_propagule",
     "minecraft:moss_carpet",
     "minecraft:nether_sprouts",
-    { "id": "minecraft:pale_hanging_moss", "required": false },
-    { "id": "minecraft:pale_moss_carpet", "required": false },
+    "minecraft:pale_hanging_moss",
+    "minecraft:pale_moss_carpet",
     "minecraft:pink_petals",
     "minecraft:red_mushroom",
     "minecraft:small_dripleaf",
     "minecraft:spore_blossom",
     "minecraft:sweet_berry_bush",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:twisting_vines",
     "minecraft:twisting_vines_plant",
     "minecraft:vine",
     "minecraft:warped_fungus",
     "minecraft:warped_roots",
     "minecraft:weeping_vines",
-    "minecraft:weeping_vines_plant"
+    "minecraft:weeping_vines_plant",
+    "minecraft:wildflowers"
   ]
 }

base/data/gm4/tags/block/full_collision.json

@@ -54,7 +54,7 @@
         "minecraft:chiseled_polished_blackstone",
         "minecraft:chiseled_quartz_block",
         "minecraft:chiseled_red_sandstone",
-        { "id": "minecraft:chiseled_resin_bricks", "required": false },
+        "minecraft:chiseled_resin_bricks",
         "minecraft:chiseled_sandstone",
         "minecraft:chiseled_stone_bricks",
         "minecraft:chiseled_tuff",
@@ -75,7 +75,7 @@
         "minecraft:cracked_stone_bricks",
         "minecraft:crafter",
         "minecraft:crafting_table",
-        { "id": "minecraft:creaking_heart", "required": false },
+        "minecraft:creaking_heart",
         "minecraft:crimson_nylium",
         "minecraft:crying_obsidian",
         "minecraft:cut_copper",
@@ -257,8 +257,8 @@
         "minecraft:redstone_ore",
         "minecraft:reinforced_deepslate",
         "minecraft:repeating_command_block",
-        { "id": "minecraft:resin_block", "required": false },
-        { "id": "minecraft:resin_bricks", "required": false },
+        "minecraft:resin_block",
+        "minecraft:resin_bricks",
         "minecraft:respawn_anchor",
         "minecraft:sand",
         "minecraft:sandstone",
@@ -285,6 +285,8 @@
         "minecraft:suspicious_sand",
         "minecraft:target",
         "minecraft:terracotta",
+        "minecraft:test_block",
+        "minecraft:test_instance_block",
         "minecraft:tinted_glass",
         "minecraft:tnt",
         "minecraft:trial_spawner",

base/data/gm4/tags/block/no_collision.json

@@ -1,7 +1,7 @@
 {
   "values": [
-    "#minecraft:air",
     "#gm4:water",
+    "#minecraft:air",
     "#minecraft:banners",
     "#minecraft:buttons",
     "#minecraft:ceiling_hanging_signs",
@@ -13,11 +13,6 @@
     "#minecraft:rails",
     "#minecraft:signs",
     "#minecraft:small_flowers",
-    "minecraft:sunflower",
-    "minecraft:lilac",
-    "minecraft:peony",
-    "minecraft:rose_bush",
-    "minecraft:pitcher_plant",
     "#minecraft:wall_corals",
     "minecraft:acacia_sapling",
     "minecraft:attached_melon_stem",
@@ -26,6 +21,8 @@
     "minecraft:big_dripleaf_stem",
     "minecraft:birch_sapling",
     "minecraft:brown_mushroom",
+    "minecraft:bush",
+    "minecraft:cactus_flower",
     "minecraft:cave_vines",
     "minecraft:cave_vines_plant",
     "minecraft:cherry_sapling",
@@ -50,28 +47,36 @@
     "minecraft:dead_tube_coral_wall_fan",
     "minecraft:dead_tube_coral",
     "minecraft:fern",
+    "minecraft:firefly_bush",
     "minecraft:frogspawn",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
+    "minecraft:sunflower",
     "minecraft:hanging_roots",
     "minecraft:jungle_sapling",
     "minecraft:ladder",
     "minecraft:large_fern",
     "minecraft:lava",
+    "minecraft:leaf_litter",
     "minecraft:lever",
     "minecraft:light",
+    "minecraft:lilac",
     "minecraft:mangrove_propagule",
     "minecraft:nether_sprouts",
     "minecraft:nether_wart",
     "minecraft:oak_sapling",
-    { "id": "minecraft:pale_hanging_moss", "required": false },
-    { "id": "minecraft:pale_oak_sapling", "required": false },
+    "minecraft:pale_hanging_moss",
+    "minecraft:pale_oak_sapling",
+    "minecraft:peony",
     "minecraft:pink_petals",
+    "minecraft:pitcher_plant",
     "minecraft:powder_snow",
     "minecraft:red_mushroom",
     "minecraft:redstone_torch",
     "minecraft:redstone_wall_torch",
     "minecraft:redstone_wire",
+    "minecraft:rose_bush",
     "minecraft:scaffolding",
     "minecraft:sculk_vein",
     "minecraft:small_dripleaf",
@@ -82,6 +87,7 @@
     "minecraft:structure_void",
     "minecraft:sugar_cane",
     "minecraft:sweet_berry_bush",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:torch",
     "minecraft:tripwire_hook",
@@ -93,6 +99,7 @@
     "minecraft:warped_fungus",
     "minecraft:warped_roots",
     "minecraft:weeping_vines",
-    "minecraft:weeping_vines_plant"
+    "minecraft:weeping_vines_plant",
+    "minecraft:wildflowers"
   ]
 }

base/data/gm4/tags/block/replaceable.json

@@ -3,21 +3,25 @@
     "#minecraft:air",
     "#minecraft:fire",
     "minecraft:bubble_column",
+    "minecraft:bush",
     "minecraft:crimson_roots",
     "minecraft:dead_bush",
     "minecraft:fern",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
     "minecraft:hanging_roots",
     "minecraft:large_fern",
     "minecraft:lava",
+    "minecraft:leaf_litter",
     "minecraft:light",
     "minecraft:nether_sprouts",
-    { "id": "minecraft:resin_clump", "required": false },
+    "minecraft:resin_clump",
     "minecraft:sculk_vein",
     "minecraft:seagrass",
     "minecraft:snow",
     "minecraft:structure_void",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:tall_seagrass",
     "minecraft:vine",