From 8a0644b48e058f323e339aec92d32b8947eebd16 Mon Sep 17 00:00:00 2001
From: Forstride <forstride@gmail.com>
Date: Fri, 20 Dec 2024 04:57:14 -0500
Subject: [PATCH] Model stuff

---
 .../77038cb024c5999ce280bcb6800e72cf1c655fe7  | 182 ++++++++++-------
 .../biomesoplenty/blockstates/dead_grass.json |   7 -
 .../blockstates/glowshroom_block.json         | 120 +++++++++++
 .../biomesoplenty/blockstates/pus_bubble.json |   7 -
 .../blockstates/toadstool_block.json          | 120 +++++++++++
 .../assets/biomesoplenty/items/barnacles.json |   2 +-
 .../biomesoplenty/items/blackstone_bulb.json  |   2 +-
 .../items/blackstone_spines.json              |   2 +-
 .../assets/biomesoplenty/items/bramble.json   |   2 +-
 .../biomesoplenty/items/bramble_leaves.json   |   8 +-
 .../biomesoplenty/items/brimstone_bud.json    |   2 +-
 .../biomesoplenty/items/burning_blossom.json  |   2 +-
 .../assets/biomesoplenty/items/bush.json      |   8 +-
 .../assets/biomesoplenty/items/clover.json    |   9 +-
 .../biomesoplenty/items/dead_branch.json      |   2 +-
 .../biomesoplenty/items/desert_grass.json     |   2 +-
 .../biomesoplenty/items/dune_grass.json       |   2 +-
 .../assets/biomesoplenty/items/endbloom.json  |   2 +-
 .../biomesoplenty/items/enderphyte.json       |   2 +-
 .../biomesoplenty/items/flesh_tendons.json    |   2 +-
 .../biomesoplenty/items/glowflower.json       |   2 +-
 .../biomesoplenty/items/glowshroom.json       |   2 +-
 .../biomesoplenty/items/glowshroom_block.json |   2 +-
 .../biomesoplenty/items/glowworm_silk.json    |   2 +-
 .../assets/biomesoplenty/items/hair.json      |   2 +-
 .../biomesoplenty/items/hanging_cobweb.json   |   2 +-
 .../biomesoplenty/items/high_grass.json       |   9 +-
 .../items/huge_clover_petal.json              |   9 +-
 .../biomesoplenty/items/huge_lily_pad.json    |   8 +-
 .../items/large_rose_quartz_bud.json          |   2 +-
 .../assets/biomesoplenty/items/lavender.json  |   2 +-
 .../assets/biomesoplenty/items/lumaloop.json  |   2 +-
 .../items/medium_rose_quartz_bud.json         |   2 +-
 .../biomesoplenty/items/null_plant.json       |   2 +-
 .../biomesoplenty/items/orange_cosmos.json    |   2 +-
 .../items/orange_maple_leaf_pile.json         |   2 +-
 .../biomesoplenty/items/pink_daffodil.json    |   2 +-
 .../biomesoplenty/items/pink_hibiscus.json    |   2 +-
 .../items/red_maple_leaf_pile.json            |   2 +-
 .../assets/biomesoplenty/items/rose.json      |   2 +-
 .../items/rose_quartz_cluster.json            |   2 +-
 .../items/small_rose_quartz_bud.json          |   2 +-
 .../biomesoplenty/items/spanish_moss.json     |   2 +-
 .../biomesoplenty/items/spider_egg.json       |   2 +-
 .../assets/biomesoplenty/items/sprout.json    |   9 +-
 .../biomesoplenty/items/stringy_cobweb.json   |   2 +-
 .../biomesoplenty/items/tiny_cactus.json      |   2 +-
 .../assets/biomesoplenty/items/toadstool.json |   2 +-
 .../biomesoplenty/items/toadstool_block.json  |   2 +-
 .../biomesoplenty/items/tundra_shrub.json     |   2 +-
 .../assets/biomesoplenty/items/violet.json    |   2 +-
 .../assets/biomesoplenty/items/waterlily.json |   2 +-
 .../assets/biomesoplenty/items/webbing.json   |   2 +-
 .../biomesoplenty/items/white_lavender.json   |   2 +-
 .../biomesoplenty/items/wilted_lily.json      |   2 +-
 .../items/yellow_maple_leaf_pile.json         |   2 +-
 .../models/block/dead_grass.json              |   6 -
 .../models/block/glowshroom_block.json        |   6 +
 .../block/glowshroom_block_inventory.json     |   6 +
 .../models/block/pus_bubble.json              |   6 -
 .../models/block/toadstool_block.json         |   6 +
 .../block/toadstool_block_inventory.json      |   6 +
 .../biomesoplenty/models/item/barley.json     |   2 +-
 .../biomesoplenty/models/item/barnacles.json} |   2 +-
 .../models/item/blackstone_bulb.json          |   6 +
 .../models/item/blackstone_spines.json        |   6 +
 .../biomesoplenty/models/item/bramble.json}   |   2 +-
 .../models/item/bramble_leaves.json           |   6 +
 .../models/item/brimstone_bud.json            |   6 +
 .../models/item/brimstone_cluster.json        |   2 +-
 .../models/item/burning_blossom.json          |   6 +
 .../biomesoplenty/models/item/bush.json       |   6 +
 .../biomesoplenty/models/item/cattail.json    |   2 +-
 .../biomesoplenty/models/item/clover.json     |   2 +-
 .../models/item/dead_branch.json              |   6 +
 .../models/item/desert_grass.json             |   6 +
 .../biomesoplenty/models/item/dune_grass.json |   6 +
 .../biomesoplenty/models/item/endbloom.json   |   6 +
 .../biomesoplenty/models/item/enderphyte.json |   6 +
 .../biomesoplenty/models/item/eyebulb.json    |   2 +-
 .../models/item/flesh_tendons.json            |   0
 .../biomesoplenty/models/item/glowflower.json |   6 +
 .../biomesoplenty/models/item/glowshroom.json |   6 +
 .../models/item/glowworm_silk.json            |   6 +
 .../biomesoplenty/models/item/hair.json       |   6 +
 .../models/item/hanging_cobweb.json           |   0
 .../biomesoplenty/models/item/high_grass.json |   6 +
 .../models/item/huge_clover_petal.json        |   2 +-
 .../models/item/large_rose_quartz_bud.json    |   6 +
 .../biomesoplenty/models/item/lavender.json   |   6 +
 .../biomesoplenty/models/item/lumaloop.json   |   6 +
 .../models/item/medium_rose_quartz_bud.json   |   6 +
 .../biomesoplenty/models/item/null_plant.json |   6 +
 .../models/item/orange_cosmos.json            |   6 +
 .../models/item/orange_maple_leaf_pile.json   |   6 +
 .../models/item/pink_daffodil.json            |   6 +
 .../models/item/pink_hibiscus.json            |   6 +
 .../biomesoplenty/models/item/pus_bubble.json |   2 +-
 .../models/item/red_maple_leaf_pile.json      |   6 +
 .../biomesoplenty/models/item/reed.json       |   2 +-
 .../biomesoplenty/models/item/rose.json       |   6 +
 .../models/item/rose_quartz_cluster.json      |   7 +-
 .../biomesoplenty/models/item/sea_oats.json   |   2 +-
 .../models/item/small_rose_quartz_bud.json    |   6 +
 .../models/item/spanish_moss.json             |   0
 .../biomesoplenty/models/item/spider_egg.json |   6 +
 .../biomesoplenty/models/item/sprout.json     |   6 +
 .../models/item/stringy_cobweb.json           |   6 +
 .../models/item/tiny_cactus.json              |   6 +
 .../biomesoplenty/models/item/toadstool.json  |   6 +
 .../models/item/tundra_shrub.json             |   6 +
 .../biomesoplenty/models/item/violet.json     |   6 +
 .../biomesoplenty/models/item/waterlily.json  |   6 +
 .../biomesoplenty/models/item/webbing.json    |   0
 .../models/item/white_lavender.json           |   6 +
 .../models/item/white_petals.json             |   2 +-
 .../biomesoplenty/models/item/wildflower.json |   2 +-
 .../models/item/wilted_lily.json              |   6 +
 .../models/item/yellow_maple_leaf_pile.json   |   6 +
 .../biomesoplenty/blockstates/dead_grass.json |   5 +
 .../blockstates/glowshroom_block.json         |  40 ----
 .../biomesoplenty/blockstates/pus_bubble.json |   5 +
 .../blockstates/toadstool_block.json          |  40 ----
 .../models/block/dead_grass.json              |   6 +
 .../models/block/glowshroom_block.json        |  14 --
 .../models/block/glowshroom_block_inside.json |  11 +-
 .../block/glowshroom_block_inventory.json     |   6 -
 .../models/block/pus_bubble.json              |   6 +
 .../models/block/toadstool_block.json         |  14 --
 .../block/toadstool_block_inventory.json      |   6 -
 .../biomesoplenty/models/item/barnacles.json  |   6 -
 .../models/item/blackstone_bulb.json          |   6 -
 .../models/item/blackstone_spines.json        |  16 --
 .../biomesoplenty/models/item/bramble.json    |   6 -
 .../models/item/bramble_leaves.json           |   6 -
 .../models/item/brimstone_bud.json            |  16 --
 .../models/item/burning_blossom.json          |   6 -
 .../biomesoplenty/models/item/bush.json       |   6 -
 .../models/item/desert_grass.json             |  16 --
 .../biomesoplenty/models/item/dune_grass.json |   6 -
 .../biomesoplenty/models/item/endbloom.json   |  16 --
 .../biomesoplenty/models/item/enderphyte.json |   6 -
 .../biomesoplenty/models/item/glowflower.json |   6 -
 .../biomesoplenty/models/item/glowshroom.json |   6 -
 .../models/item/glowshroom_block.json         |   3 -
 .../models/item/glowworm_silk.json            |   6 -
 .../models/item/glowworm_silk_strand.json     |   6 -
 .../biomesoplenty/models/item/hair.json       |   6 -
 .../models/item/high_grass_plant.json         |   6 -
 .../models/item/large_rose_quartz_bud.json    |  11 -
 .../biomesoplenty/models/item/lavender.json   |   6 -
 .../biomesoplenty/models/item/lumaloop.json   |   6 -
 .../models/item/lumaloop_plant.json           |   6 -
 .../models/item/medium_rose_quartz_bud.json   |  11 -
 .../biomesoplenty/models/item/null_plant.json |  16 --
 .../models/item/orange_cosmos.json            |   6 -
 .../models/item/orange_maple_leaf_pile.json   |   6 -
 .../models/item/pink_daffodil.json            |   6 -
 .../models/item/pink_hibiscus.json            |   6 -
 .../models/item/potted_burning_blossom.json   |   6 -
 .../models/item/potted_endbloom.json          |   6 -
 .../models/item/potted_fir_sapling.json       |   6 -
 .../models/item/potted_glowflower.json        |   6 -
 .../models/item/potted_glowshroom.json        |   6 -
 .../models/item/potted_lavender.json          |   6 -
 .../models/item/potted_orange_cosmos.json     |   6 -
 .../models/item/potted_pink_daffodil.json     |   6 -
 .../models/item/potted_pink_hibiscus.json     |   6 -
 .../item/potted_rainbow_birch_sapling.json    |   6 -
 .../models/item/potted_rose.json              |   6 -
 .../item/potted_snowblossom_sapling.json      |   6 -
 .../models/item/potted_sprout.json            |   6 -
 .../models/item/potted_tiny_cactus.json       |   6 -
 .../models/item/potted_toadstool.json         |   6 -
 .../models/item/potted_umbran_sapling.json    |   6 -
 .../models/item/potted_violet.json            |   6 -
 .../models/item/potted_white_lavender.json    |   6 -
 .../models/item/potted_wildflower.json        |   6 -
 .../models/item/potted_wilted_lily.json       |   6 -
 .../models/item/red_maple_leaf_pile.json      |   6 -
 .../biomesoplenty/models/item/rose.json       |   6 -
 .../models/item/rose_quartz_bud.json          |  20 --
 .../models/item/small_rose_quartz_bud.json    |  16 --
 .../biomesoplenty/models/item/spider_egg.json |   6 -
 .../biomesoplenty/models/item/sprout.json     |   6 -
 .../models/item/stringy_cobweb.json           |   6 -
 .../models/item/tiny_cactus.json              |   6 -
 .../biomesoplenty/models/item/toadstool.json  |   6 -
 .../models/item/toadstool_block.json          |   3 -
 .../models/item/tundra_shrub.json             |   6 -
 .../biomesoplenty/models/item/violet.json     |  16 --
 .../biomesoplenty/models/item/waterlily.json  |   6 -
 .../models/item/white_lavender.json           |   6 -
 .../models/item/wilted_lily.json              |   6 -
 .../models/item/yellow_maple_leaf_pile.json   |   6 -
 gradle.properties                             |   2 +-
 .../model/BOPBlockModelGenerators.java        | 188 ++++++++++++++++--
 .../datagen/model/BOPItemModelGenerators.java |   4 -
 198 files changed, 923 insertions(+), 789 deletions(-)
 delete mode 100644 common/src/generated/resources/assets/biomesoplenty/blockstates/dead_grass.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
 delete mode 100644 common/src/generated/resources/assets/biomesoplenty/blockstates/pus_bubble.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/blockstates/toadstool_block.json
 delete mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/dead_grass.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
 delete mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/pus_bubble.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
 rename common/src/{main/resources/assets/biomesoplenty/models/item/flesh_tendons_strand.json => generated/resources/assets/biomesoplenty/models/item/barnacles.json} (55%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_spines.json
 rename common/src/{main/resources/assets/biomesoplenty/models/item/hanging_cobweb_strand.json => generated/resources/assets/biomesoplenty/models/item/bramble.json} (55%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/bramble_leaves.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_bud.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/burning_blossom.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/bush.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/dead_branch.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/desert_grass.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/dune_grass.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/endbloom.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/enderphyte.json
 rename common/src/{main => generated}/resources/assets/biomesoplenty/models/item/flesh_tendons.json (100%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/glowflower.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/glowshroom.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/glowworm_silk.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/hair.json
 rename common/src/{main => generated}/resources/assets/biomesoplenty/models/item/hanging_cobweb.json (100%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/high_grass.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/lavender.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/lumaloop.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/null_plant.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/orange_cosmos.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/pink_daffodil.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/rose.json
 rename common/src/{main => generated}/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json (60%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
 rename common/src/{main => generated}/resources/assets/biomesoplenty/models/item/spanish_moss.json (100%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/spider_egg.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/sprout.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/tiny_cactus.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/toadstool.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/tundra_shrub.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/violet.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/waterlily.json
 rename common/src/{main => generated}/resources/assets/biomesoplenty/models/item/webbing.json (100%)
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/white_lavender.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/wilted_lily.json
 create mode 100644 common/src/generated/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
 create mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/dead_grass.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
 create mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/pus_bubble.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/toadstool_block.json
 create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
 create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/pus_bubble.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/barnacles.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/blackstone_spines.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/bramble.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/bramble_leaves.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/brimstone_bud.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/bush.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/endbloom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/enderphyte.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/glowshroom_block.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk_strand.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/hair.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/high_grass_plant.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/lavender.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/lumaloop.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/lumaloop_plant.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/null_plant.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_burning_blossom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_endbloom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_fir_sapling.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_glowflower.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_glowshroom.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_lavender.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_orange_cosmos.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_daffodil.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_hibiscus.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_rainbow_birch_sapling.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_rose.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_snowblossom_sapling.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_sprout.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_tiny_cactus.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_toadstool.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_umbran_sapling.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_violet.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_wildflower.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_wilted_lily.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/rose.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_bud.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/spider_egg.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/sprout.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/toadstool_block.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/tundra_shrub.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/violet.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/waterlily.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
 delete mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json

diff --git a/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7 b/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7
index 1792c7c073..e636da2426 100644
--- a/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7
+++ b/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7
@@ -1,4 +1,4 @@
-// 1.21.4	2024-12-19T19:05:52.1408943	Model Definitions
+// 1.21.4	2024-12-20T04:50:56.1195782	Model Definitions
 3670b788e3f8e8154db2b0cb2a4eec8d1d92ce02 assets/biomesoplenty/blockstates/black_sandstone.json
 b7e71e9e2c45918de279dba69073d21fc4da8c34 assets/biomesoplenty/blockstates/black_sandstone_slab.json
 99a0b068818dd6a10909ea477064d05f752ddcfb assets/biomesoplenty/blockstates/black_sandstone_stairs.json
@@ -23,7 +23,6 @@ bd1d37bf992f6016098fe418fa36fbeb9c3b8d38 assets/biomesoplenty/blockstates/cut_wh
 846f158d71f88d6fd71d41f21db20b017abfc102 assets/biomesoplenty/blockstates/dead_door.json
 1778df170370e42bfc802e275336ed2eb1e9ab57 assets/biomesoplenty/blockstates/dead_fence.json
 e3006fc143eb862a320f79378b87ae6878c0347f assets/biomesoplenty/blockstates/dead_fence_gate.json
-601014c23d63920f84e3cd994f45482dc6f157bc assets/biomesoplenty/blockstates/dead_grass.json
 cc55264a7b48eb8665ddf06ee7d610917e644837 assets/biomesoplenty/blockstates/dead_hanging_sign.json
 2053a6842c185875a1b81e62bd0169e5f70b2982 assets/biomesoplenty/blockstates/dead_leaves.json
 c30b4e3c1a2cd88bea91220c5e629f68b893daf1 assets/biomesoplenty/blockstates/dead_log.json
@@ -72,6 +71,7 @@ d1586a89b3a26729e7d2ba2e0bd2b3c046ebba66 assets/biomesoplenty/blockstates/fir_sl
 53f3d6f7ce4c4bced3be85684d555b52db071a7f assets/biomesoplenty/blockstates/fir_wall_sign.json
 3d56ee6c5c469557925befa353c4babab765cf60 assets/biomesoplenty/blockstates/fir_wood.json
 097ac8280db734a2be5459e0ea94b799c6f4009d assets/biomesoplenty/blockstates/flowering_oak_sapling.json
+49548ae1e7d24e7b11bbab05f9f2ea1b0f9564f8 assets/biomesoplenty/blockstates/glowshroom_block.json
 b82f79199f3213ff338d21fb3547cc33d8a56ba4 assets/biomesoplenty/blockstates/hellbark_button.json
 93f1785c0afb0287147df588d7870eb008c4a919 assets/biomesoplenty/blockstates/hellbark_door.json
 22ed100150ab367671523e8a728b2a417116f441 assets/biomesoplenty/blockstates/hellbark_fence.json
@@ -216,7 +216,6 @@ aed1623995b20912dd866b48d439a06242c11d1d assets/biomesoplenty/blockstates/potted
 8c748a11dc454ee80b2c9a8d5cbb68e2c71f278d assets/biomesoplenty/blockstates/potted_umbran_sapling.json
 50d0648731019c91114ea38333d48ab0ede68496 assets/biomesoplenty/blockstates/potted_willow_sapling.json
 ab5ea388d2b3a94afef8a7f0228cdcdbb3046457 assets/biomesoplenty/blockstates/potted_yellow_maple_sapling.json
-6f30ebec636445894a9c4019cc5656ba5289fe3f assets/biomesoplenty/blockstates/pus_bubble.json
 a1dfdb8f451a108ed781f4f05ad1f77e1d479e13 assets/biomesoplenty/blockstates/rainbow_birch_sapling.json
 6bb60fac71177d6e32dc0208bc65a3866a067a98 assets/biomesoplenty/blockstates/redwood_button.json
 d15eb4e828a07c519920cd6d28e96f66242a3559 assets/biomesoplenty/blockstates/redwood_door.json
@@ -273,6 +272,7 @@ c7ca7729f04d131cd8b6622659c4678557a6c3ee assets/biomesoplenty/blockstates/stripp
 306ffa31395eb4f33b7b740cc62b8e5c31fd321c assets/biomesoplenty/blockstates/stripped_umbran_wood.json
 db6231b43cd5aa3a4adf97afef6a7a848662f10c assets/biomesoplenty/blockstates/stripped_willow_log.json
 cc2e69c1a12e9178618a820340c6fa17cff0a5f0 assets/biomesoplenty/blockstates/stripped_willow_wood.json
+45983ecfe09a268affeab0bcd9c35527b3e74b3a assets/biomesoplenty/blockstates/toadstool_block.json
 ebcbe6c139a9823bf5d04f77411c5997d84d4222 assets/biomesoplenty/blockstates/umbran_button.json
 3c1eaf55e1717dfda5ccbccbb03b5ef36961cb54 assets/biomesoplenty/blockstates/umbran_door.json
 986c68b58194461eb774c57db56a79557fb5feb2 assets/biomesoplenty/blockstates/umbran_fence.json
@@ -317,9 +317,9 @@ e65d59cb6b08d2f8698af8da787c5cc3b6a8c59b assets/biomesoplenty/blockstates/yellow
 ebf7f2b4326b8a951227d26e35b0497d2138b922 assets/biomesoplenty/items/algal_end_stone.json
 6095cace807b2fd02e97f4c0229c39eb5f667365 assets/biomesoplenty/items/anomaly.json
 77145d2054914dc9a0a4013496cc4291717fe2cd assets/biomesoplenty/items/barley.json
-542a50a9512b7b697d499549fd7f1fbd25b2dc04 assets/biomesoplenty/items/barnacles.json
-fa5da8f183260c96833aa2f08e464c8033a784ea assets/biomesoplenty/items/blackstone_bulb.json
-e9f577008956e4cbc97e48d08bf794300b6e5c5d assets/biomesoplenty/items/blackstone_spines.json
+788a1f8aa35c31e85883ee400ab20d0141b16780 assets/biomesoplenty/items/barnacles.json
+e9b97c4e1bd3f05576cbe3956d5441c4f3b27eed assets/biomesoplenty/items/blackstone_bulb.json
+54b5b01749d213f6cd3f55bbf3555f0ecd68147c assets/biomesoplenty/items/blackstone_spines.json
 668ac558d6bff6f7b4a3a76421df1fd518c1da1b assets/biomesoplenty/items/black_sand.json
 e7db7de718c1d49f2cf9815a592a77b2098ee8ef assets/biomesoplenty/items/black_sandstone.json
 c764cc3a5ae7e8eb4c04c74ebe29b5674295af1a assets/biomesoplenty/items/black_sandstone_slab.json
@@ -329,24 +329,24 @@ a3c0bbec1e5e2b019e198c823e3fa3aa7a8cb09c assets/biomesoplenty/items/black_sandst
 9daabe2b465ca9c691b9e6e8d8b89d1c7ca33482 assets/biomesoplenty/items/blood_bucket.json
 5f22218448c5bd741a25dcc7f6d9e86852e148a4 assets/biomesoplenty/items/blue_hydrangea.json
 250c730ae6e80acfd6193708daae34871d736957 assets/biomesoplenty/items/bop_icon.json
-f2f581a1e76bd60ba20f40dea85ae57ab0d0becc assets/biomesoplenty/items/bramble.json
-a6fc0325aa60e13bd1d6d141c10fbcffddcef3dc assets/biomesoplenty/items/bramble_leaves.json
+b1b14aa3ce57deda5e40cd865b2e015fa0f2d8f7 assets/biomesoplenty/items/bramble.json
+b6bf7fa7da2a4d4c24b5806f0da6a149a6cb8270 assets/biomesoplenty/items/bramble_leaves.json
 bf64cd94542c417eb8535f73405cc8c39b2b3800 assets/biomesoplenty/items/brimstone.json
 700239f3fca47f4ecb4fa95b464fea54a32bd4c8 assets/biomesoplenty/items/brimstone_bricks.json
 e44249639ac2b7ded256203669a1455194db0849 assets/biomesoplenty/items/brimstone_brick_slab.json
 cf2461ab1b0d14f880ea25e9c0fc0b817cdd2f04 assets/biomesoplenty/items/brimstone_brick_stairs.json
 45e328407f769d3b38db803836ba9f2f221a74c8 assets/biomesoplenty/items/brimstone_brick_wall.json
-fb16908ddc4e9a3818c224a97d149c2a19bb4a30 assets/biomesoplenty/items/brimstone_bud.json
+f81ff364c2448f5ec5137df47979cd0d6cf1011d assets/biomesoplenty/items/brimstone_bud.json
 3064c59c626da15f61c37fcceb3d5b8526a5f2f9 assets/biomesoplenty/items/brimstone_cluster.json
 cfe7d78028de56c156d22261d09926f1b611e08a assets/biomesoplenty/items/brimstone_fumarole.json
-271719b308333618c5abcff7ac42c110039dbfcd assets/biomesoplenty/items/burning_blossom.json
-b2af2654086a566f5a39c68a733a8ec3b626458f assets/biomesoplenty/items/bush.json
+2c6874f4f450d1a00861aac9d27b01b7edfd42ad assets/biomesoplenty/items/burning_blossom.json
+0fa7a9d718121458e337d315b102884f12571442 assets/biomesoplenty/items/bush.json
 a30f85898621eb2dd0c21c60cce91a2832b70620 assets/biomesoplenty/items/cattail.json
 12f01dfe937167e1af9d8c2a5d526855430e9554 assets/biomesoplenty/items/chiseled_black_sandstone.json
 bf5f99b12ba44cc8c577fb85c7c57c756579e135 assets/biomesoplenty/items/chiseled_brimstone_bricks.json
 b267355786a8d3a76c04a344083988a1a5d06664 assets/biomesoplenty/items/chiseled_orange_sandstone.json
 c6c3bbd8240bca514eb2714108060b7ce49b8084 assets/biomesoplenty/items/chiseled_white_sandstone.json
-ae23622e2b73a7597be2cd481f4aff0e1443f525 assets/biomesoplenty/items/clover.json
+8c63eb37758edbeca4d3515a71dd3e9a71032d69 assets/biomesoplenty/items/clover.json
 3644aa2b01e9eb02a403f7ae498f518d5cf8cb24 assets/biomesoplenty/items/cut_black_sandstone.json
 f5d1f700a4bc349ed694fe5feb46b447524eda49 assets/biomesoplenty/items/cut_black_sandstone_slab.json
 0cf2a2be99a70f7f22d7d92d64633ebc241bcc58 assets/biomesoplenty/items/cut_orange_sandstone.json
@@ -356,7 +356,7 @@ f39f5d4de9766e79401e80892fb359b435d3f9e8 assets/biomesoplenty/items/cut_orange_s
 dcaa16b8e76517aa06d51bcde043a31ba44fa300 assets/biomesoplenty/items/cypress_leaves.json
 ebb349585e188ac45e556243fba022c0e45f3609 assets/biomesoplenty/items/cypress_sapling.json
 93c25495e3c193337fbe867a7884f4ef745063bb assets/biomesoplenty/items/dead_boat.json
-fec52c404fa081c3bd0ebb82252e1165bcc68958 assets/biomesoplenty/items/dead_branch.json
+bbb5b33ec7401705d80980e24d4ece0c873b44e2 assets/biomesoplenty/items/dead_branch.json
 d624237e91d526071aa89abbb4c35083778af4a0 assets/biomesoplenty/items/dead_button.json
 4cf83f43828e291657b262383961007b0e3e3f42 assets/biomesoplenty/items/dead_chest_boat.json
 f046cda2890844da877e112f384505b0d9ef1011 assets/biomesoplenty/items/dead_door.json
@@ -374,9 +374,9 @@ ea158dee0ac9927faab7038d4d7558719b41d249 assets/biomesoplenty/items/dead_sign.js
 cd6321f72a4f80ef6a2d088af52172550e373798 assets/biomesoplenty/items/dead_stairs.json
 3af98b4dc3454ec1d22812e9690407165b857ea4 assets/biomesoplenty/items/dead_trapdoor.json
 114fe51e037f7973dc75a34d6e09b9a71440debc assets/biomesoplenty/items/dead_wood.json
-df73e1739b6b02e6b8a6f6e10cfc754ee272dd1a assets/biomesoplenty/items/desert_grass.json
+769d706fdf1629151ccf28250ed902c7e924f6b5 assets/biomesoplenty/items/desert_grass.json
 5f2e9652dbe396ff093c3364d46122609decdbf7 assets/biomesoplenty/items/dried_salt.json
-ef722808e2108d27a08a7c0993259c8179e052e3 assets/biomesoplenty/items/dune_grass.json
+da7fccacbd8a13d03ee8468dd82493a84465b967 assets/biomesoplenty/items/dune_grass.json
 fd3dc3d3427fd251f7ab3b05b62c95d35894a1b6 assets/biomesoplenty/items/empyreal_boat.json
 f2989ce88ad2c59725c92919483afa7e8b1e545e assets/biomesoplenty/items/empyreal_button.json
 42dadbeab52dace3b79540180b6c74ec3bcc2b15 assets/biomesoplenty/items/empyreal_chest_boat.json
@@ -394,8 +394,8 @@ c8c11dd3b9105a56c8ff30104898dceeb434c0d4 assets/biomesoplenty/items/empyreal_sig
 83ac9f1f610733555db4c9be7c57857ff3c5ca42 assets/biomesoplenty/items/empyreal_stairs.json
 10d56cf22044959675da81f4dfa4a187a833d74c assets/biomesoplenty/items/empyreal_trapdoor.json
 36ba76209a893ca869b956d7cc53c2abaae58d19 assets/biomesoplenty/items/empyreal_wood.json
-f7518a2ed3fa989603c41b6731a1afb662093002 assets/biomesoplenty/items/endbloom.json
-3a510a4665b89b7af1ef588ceb7e71b474a9e5a9 assets/biomesoplenty/items/enderphyte.json
+400453dfc76bd50b3b369ad0d54456c1b1356e47 assets/biomesoplenty/items/endbloom.json
+384ccd3fd455f7eb0ae1f8f335cf0f22cbff1100 assets/biomesoplenty/items/enderphyte.json
 551ea7a2db56f851b4bc3b9fadb95f258a2c375f assets/biomesoplenty/items/eyebulb.json
 97a31aa15ef695a80323a67a70ca5931eca3a98c assets/biomesoplenty/items/fir_boat.json
 a05478bbf6a54da1f44eec65144deafd164efe41 assets/biomesoplenty/items/fir_button.json
@@ -415,20 +415,20 @@ d518108c5b5e0db15c3400fc3493d051d8ea0854 assets/biomesoplenty/items/fir_stairs.j
 451244b55af388160211c2a7c7d8c6e20293eaf9 assets/biomesoplenty/items/fir_trapdoor.json
 fb904e4b09ae49f96bee80121c00046b20a1e464 assets/biomesoplenty/items/fir_wood.json
 2413be81525bf78b4af3d4cc54c314cc26ed9654 assets/biomesoplenty/items/flesh.json
-d57af3009093757db6c5489cc75d0e58bd60c014 assets/biomesoplenty/items/flesh_tendons.json
+8a92c0b1681fa7e997d7046f3d6a84eae4ca542a assets/biomesoplenty/items/flesh_tendons.json
 c960a55a6ea1349cc3429e8e1a5c2901d16939ec assets/biomesoplenty/items/flesh_tendons_strand.json
 9aed5af8f5c0238381d3f6debd0a297d71096755 assets/biomesoplenty/items/flowering_oak_leaves.json
 385bf22577bc1f860aa5cd5212ef55aef7e01724 assets/biomesoplenty/items/flowering_oak_sapling.json
-96eea4900e9dab477f0c3a38c26b38464d5d2dc5 assets/biomesoplenty/items/glowflower.json
+c3cd3cd6047a31fdb00240bc3ac82e2ad77dd42d assets/biomesoplenty/items/glowflower.json
 859c25077c8b8de4f333350b31dc8dd35a411720 assets/biomesoplenty/items/glowing_moss_block.json
 8d7167434a7647d7d646817a379e73b5f7f498ce assets/biomesoplenty/items/glowing_moss_carpet.json
-fc2f73a84bc89fc65c70d19db6024cf1265763ce assets/biomesoplenty/items/glowshroom.json
-e098d0ba7b71486100cc4297d939c98c4c2918e5 assets/biomesoplenty/items/glowshroom_block.json
-b9008344bf86eca0c4516c9200b60f6061cbdbac assets/biomesoplenty/items/glowworm_silk.json
+7dba5a00f9dd897d3868444a13e96a6f2f0615c7 assets/biomesoplenty/items/glowshroom.json
+344862977e5e99c605b549add2aaa0471571e3f3 assets/biomesoplenty/items/glowshroom_block.json
+5ab7fe08d0d3f121882d41dd8897f92fe67068d0 assets/biomesoplenty/items/glowworm_silk.json
 11206c85141b965c95219d60cf2a79c6178889cb assets/biomesoplenty/items/glowworm_silk_strand.json
 7ed37c85a2de0899696c59c4ebcd8bf9b843290f assets/biomesoplenty/items/goldenrod.json
-b73e565770cce25f357a35dbd01f49efddbc1424 assets/biomesoplenty/items/hair.json
-20ab1e8e4eccdd61be96945c9d9070cd635eca93 assets/biomesoplenty/items/hanging_cobweb.json
+b77923542180e81ec5f60ef032ba654859a8404a assets/biomesoplenty/items/hair.json
+2d6b145003c6634ec21b26a6999fb28df8557cd5 assets/biomesoplenty/items/hanging_cobweb.json
 3f135e843bd04687bedb5c3443c40d60d42b48ed assets/biomesoplenty/items/hanging_cobweb_strand.json
 7fb09c1c229a7c0f0485cddff1b6e37210eb289e assets/biomesoplenty/items/hellbark_boat.json
 2b732cc19fc8955fc9a5162ab9299d85e17197d8 assets/biomesoplenty/items/hellbark_button.json
@@ -447,10 +447,10 @@ a58245e52f9fb7ac96126f2556413880e9816c7f assets/biomesoplenty/items/hellbark_pre
 c4d05795a5a3499d7b8c6892a2c48f8d2512505e assets/biomesoplenty/items/hellbark_stairs.json
 813bee8293144219a1ddcc2736e81fc5f903f472 assets/biomesoplenty/items/hellbark_trapdoor.json
 ca99ba875bf81112a2e82d61909e72803a7f85b6 assets/biomesoplenty/items/hellbark_wood.json
-4f84a9282fe4f695c47b27e62aeeb45a534c7926 assets/biomesoplenty/items/high_grass.json
+c64bd082596107e3e9c007e5787136924138f350 assets/biomesoplenty/items/high_grass.json
 982d2adf81b863af676078fd2056c1b86ff24f24 assets/biomesoplenty/items/high_grass_plant.json
-56790698823b3c007aad096d7db6232f7ffaa2f7 assets/biomesoplenty/items/huge_clover_petal.json
-b8bc90eed068d97137a706cbdb8263a7ce5dedb1 assets/biomesoplenty/items/huge_lily_pad.json
+b9ec06bfe4b8a35fc71c3000e44e81c6c77f701c assets/biomesoplenty/items/huge_clover_petal.json
+d11053f4dc9837e0ab75975f5be6284879f0e497 assets/biomesoplenty/items/huge_lily_pad.json
 af86ffd3a8ec7f46c56ffb9d8a9c6266921797dd assets/biomesoplenty/items/icy_iris.json
 13beb851c27640cf942b17d23bcaff704a8e2b25 assets/biomesoplenty/items/jacaranda_boat.json
 1e90c0901d10ce83248d44dc56793f69e2b3a26c assets/biomesoplenty/items/jacaranda_button.json
@@ -469,11 +469,11 @@ d129662f4aa131a2c380c3abf8774801e30a0a36 assets/biomesoplenty/items/jacaranda_sl
 1005da1bbb1031439f2316246f4a9d8af90b3fd4 assets/biomesoplenty/items/jacaranda_stairs.json
 20bfe7766657a76ad8eb1b13a1edd7627294a607 assets/biomesoplenty/items/jacaranda_trapdoor.json
 77649b28adefbce5c56657cd55449a5df2a875a3 assets/biomesoplenty/items/jacaranda_wood.json
-cbfecbe422b13a423d5e710b69111ee46cb6a033 assets/biomesoplenty/items/large_rose_quartz_bud.json
-9e28f42e216163b57402a4f3ff36c1744a247f92 assets/biomesoplenty/items/lavender.json
+da550e38cfa48840f6c3f5d3d7c0efb1437eb7f0 assets/biomesoplenty/items/large_rose_quartz_bud.json
+10be260593c50268f1e5ab93edce2f96511f2157 assets/biomesoplenty/items/lavender.json
 63518f4850e0eca191e3d2d88db79f4b317fe171 assets/biomesoplenty/items/liquid_null.json
 0e1ddc1f33939d3f0c2c51a43a80b23edbad8577 assets/biomesoplenty/items/liquid_null_bucket.json
-09d7cbc442d650ed9147c6ded0b97f4a2b53d0eb assets/biomesoplenty/items/lumaloop.json
+e7736277a57799b6f9c834d0cb8bdf8187d5abbf assets/biomesoplenty/items/lumaloop.json
 64763f66979f957da54d76ed3661de0352c3b6ed assets/biomesoplenty/items/lumaloop_plant.json
 145a0710e37afe2782187e5fbbb3fc521c03955e assets/biomesoplenty/items/magic_boat.json
 3292e743672f7729569ab30a9991695292570977 assets/biomesoplenty/items/magic_button.json
@@ -524,15 +524,15 @@ a07aeca11308e37a79eb72fbb927147a10f1df5d assets/biomesoplenty/items/maple_pressu
 2ff0ac40d681034d1cd82b59a2889cfb94d204e7 assets/biomesoplenty/items/maple_stairs.json
 53a8e50e5604d1a25ae08faa68eeee86f3723c1d assets/biomesoplenty/items/maple_trapdoor.json
 d9ce8e24e86f7530a26b6810790a6c3bb7a757ea assets/biomesoplenty/items/maple_wood.json
-f40438a8f15e5e25c54cea8e89fd8691f4933bb1 assets/biomesoplenty/items/medium_rose_quartz_bud.json
+85e2b345f53733cb5b75252dd218c4544545f0ba assets/biomesoplenty/items/medium_rose_quartz_bud.json
 831af6ee4993b3b223584d5ee9bfa7718d6b8993 assets/biomesoplenty/items/mossy_black_sand.json
 5a1a160361d5c995ff48355501a22191451cf1ea assets/biomesoplenty/items/music_disc_wanderer.json
 b3e6574a5ab4f7180de3d180d0c588a9e8934ffe assets/biomesoplenty/items/null_block.json
 5b3ccf0be95a8c724a04c6586a59998b3bd36eaa assets/biomesoplenty/items/null_end_stone.json
 f78ad90d7db73fe159fa76fe1407f9692bd4bdae assets/biomesoplenty/items/null_leaves.json
-78912417adbc984b67747298b2b993949c2b8bfc assets/biomesoplenty/items/null_plant.json
-72ad073a2ba9de1c496c65eea7ceb3a56ca4ccf1 assets/biomesoplenty/items/orange_cosmos.json
-5093f789caca6619fe88c0b51f7128f05db264f1 assets/biomesoplenty/items/orange_maple_leaf_pile.json
+63612645c30890d04f8593f549b43d45d0db1da3 assets/biomesoplenty/items/null_plant.json
+0dde9142e9c620d2fb86b23a0e627875b2c77b2b assets/biomesoplenty/items/orange_cosmos.json
+a8ad58ae292d068912fc10d390089c97c2c5baf2 assets/biomesoplenty/items/orange_maple_leaf_pile.json
 969495f55b577607bee80332c76d6edcd50944de assets/biomesoplenty/items/orange_maple_leaves.json
 073a0363f58fafd18fd2b51906007eaaff7b8bb2 assets/biomesoplenty/items/orange_maple_sapling.json
 f22b14b91de83cd7b25631a1382401efee7bdd9e assets/biomesoplenty/items/orange_sand.json
@@ -577,8 +577,8 @@ eb1fbdeee5fec5cddaef14d79281b6e416de0771 assets/biomesoplenty/items/pine_sapling
 194252be0d73dedad2865b65e55dba5eaf93001b assets/biomesoplenty/items/pine_stairs.json
 8a294cee91d96569297c9d6fe8932cd0f8838f90 assets/biomesoplenty/items/pine_trapdoor.json
 d1b01595bb9795c018997176d32f0149a0640692 assets/biomesoplenty/items/pine_wood.json
-82ed416b00f914c883dd9ace87dc7ed1c2d540d7 assets/biomesoplenty/items/pink_daffodil.json
-398913d2b26196efedea82ef5aa6a0120e36c320 assets/biomesoplenty/items/pink_hibiscus.json
+18284f749309963791a767ddace96ad12f90a45d assets/biomesoplenty/items/pink_daffodil.json
+0015da6a60b0123be3c58c526b81cb1802acbe88 assets/biomesoplenty/items/pink_hibiscus.json
 36e61690c7f4f629492e7d1db8551cd1f4213bba assets/biomesoplenty/items/porous_flesh.json
 1f47dd102801dd718012178a9843d2dc740548d4 assets/biomesoplenty/items/potted_burning_blossom.json
 5e6cd3ae671d7f17b20d7291aadec88b9ceb7256 assets/biomesoplenty/items/potted_cypress_sapling.json
@@ -635,16 +635,16 @@ c23c96df92d9a231a84af93fa9e35cd96c9d7cf0 assets/biomesoplenty/items/redwood_sapl
 929158c2a91ce34fa91d64a1ae4a814720429a7c assets/biomesoplenty/items/redwood_stairs.json
 e860fd04b0f757acee43189f5184a7db4da7a77c assets/biomesoplenty/items/redwood_trapdoor.json
 24946f09feb2c5d7d772c8e706e4e69a3d2e855b assets/biomesoplenty/items/redwood_wood.json
-d26fecadea1009c8f4afe2097555f0314f53380d assets/biomesoplenty/items/red_maple_leaf_pile.json
+5c4aab9f7ff80f9054571894ed359c66e9c4deec assets/biomesoplenty/items/red_maple_leaf_pile.json
 1a5c043eb9059ec762cad3dbc649a9f139a67ec2 assets/biomesoplenty/items/red_maple_leaves.json
 537b93fea6a469425684e0ee624f2ed1bfe99811 assets/biomesoplenty/items/red_maple_sapling.json
 85b5cf5794b457cb602b0b5c0af622270868e59b assets/biomesoplenty/items/reed.json
-9c63d2c3cf8fa88be0ecef50f74333504e79a284 assets/biomesoplenty/items/rose.json
+6c0bb6621a8bcca765735ea4af08d2f37bb5752b assets/biomesoplenty/items/rose.json
 f0bfe3b4fd6e7c46e446f6f0576301fb92bb6a60 assets/biomesoplenty/items/rose_quartz_block.json
 8c9bef289910fcaffc9c720ec59fe22521a3743e assets/biomesoplenty/items/rose_quartz_chunk.json
-e53a2093d0dbe22f6c46bde2a6876b7cf6dd1509 assets/biomesoplenty/items/rose_quartz_cluster.json
+b3483b81551ae6f51182ccd9bb6686f2daf3e1a0 assets/biomesoplenty/items/rose_quartz_cluster.json
 5f7dc14dc4b3faaff611d8678b4d95e4491cd204 assets/biomesoplenty/items/sea_oats.json
-dc7983a4c4031d829f17e31e507ef68a0eec962f assets/biomesoplenty/items/small_rose_quartz_bud.json
+6bb9c4eb89435fe98487121263a4c20735843c17 assets/biomesoplenty/items/small_rose_quartz_bud.json
 5f61e032e5c5d9aa29a9e59c66de35bb46fe4ee2 assets/biomesoplenty/items/smooth_black_sandstone.json
 ba595ca86192b6fbb8affc15a3658a38f97fb6ee assets/biomesoplenty/items/smooth_black_sandstone_slab.json
 17a8ffd6cca6fa2638c23dc3f14a0d20f636a3f2 assets/biomesoplenty/items/smooth_black_sandstone_stairs.json
@@ -656,11 +656,11 @@ ba595ca86192b6fbb8affc15a3658a38f97fb6ee assets/biomesoplenty/items/smooth_black
 1724594bfa24d709f00f361ce27b245487319eab assets/biomesoplenty/items/smooth_white_sandstone_stairs.json
 f6567eecc5b830725ce39059c0e3555a41881067 assets/biomesoplenty/items/snowblossom_leaves.json
 552c019015abcc557847c05e4b18798059d348e8 assets/biomesoplenty/items/snowblossom_sapling.json
-7b771d606ab242c739ced3e58617371d5fb9362c assets/biomesoplenty/items/spanish_moss.json
+e49bd2cbda4e4b0b4328affc5dbbfce38007eab6 assets/biomesoplenty/items/spanish_moss.json
 284c82c74d0eb5ba261acc49f103bd1c48988a5c assets/biomesoplenty/items/spanish_moss_plant.json
-df961cfa2579dd7011e5c315a86ef3ce14ccccdf assets/biomesoplenty/items/spider_egg.json
-90f5d377e6ccf3b355c235e6b3a9a199654a40a2 assets/biomesoplenty/items/sprout.json
-7e929d3780a579242de21a512df23639aca337bf assets/biomesoplenty/items/stringy_cobweb.json
+47453d7629134a8f7215bfb0aeddf4b9b3fa8231 assets/biomesoplenty/items/spider_egg.json
+c709f201103b096c181c36b78c81e312b87c1845 assets/biomesoplenty/items/sprout.json
+52d66326c84f9f5402c98cab0c26c2d975ab34ec assets/biomesoplenty/items/stringy_cobweb.json
 a67a124bbb5d963a84fdbd07ac7676046508e34c assets/biomesoplenty/items/stripped_dead_log.json
 247226da3f86faff42a3c1df742a8c9e5c38b336 assets/biomesoplenty/items/stripped_dead_wood.json
 592b9369727da626239a065c50f3882c1d532d4b assets/biomesoplenty/items/stripped_empyreal_log.json
@@ -691,10 +691,10 @@ b6299e378c32d8c1d466bb61085de982177b4cd0 assets/biomesoplenty/items/stripped_wil
 51ff5f4e98ccc0de870ab8c57cdfc95683586fa7 assets/biomesoplenty/items/tall_white_lavender.json
 0e10dacf8a4226eb570c7c6ccbc2128fc34a0ffa assets/biomesoplenty/items/thermal_calcite.json
 aa0dbe446dab237b693b27ff0d61664769c3538e assets/biomesoplenty/items/thermal_calcite_vent.json
-67983722724b207de99a3a49f8a6ecc499751498 assets/biomesoplenty/items/tiny_cactus.json
-2930ceb4755be6cb0815df3f48214d40225d7ee7 assets/biomesoplenty/items/toadstool.json
-a7c69d4c13cc4f101cac4533ccdf0ce2d5327e57 assets/biomesoplenty/items/toadstool_block.json
-20769b8834f1f6af58e008bb57975bd575a1198e assets/biomesoplenty/items/tundra_shrub.json
+8ba85d880b73ac95631253281fcba1089c6808cc assets/biomesoplenty/items/tiny_cactus.json
+14d62ba336bf2986bc256af1fb25009990ae3493 assets/biomesoplenty/items/toadstool.json
+470e4cd3e038206edc9db7d69e5379dfbc9642a3 assets/biomesoplenty/items/toadstool_block.json
+b205bdff7af097d062408ae95a6f8ba98913a604 assets/biomesoplenty/items/tundra_shrub.json
 3b7a11dc5a06276d748b7be1e9b71b7673aa2c93 assets/biomesoplenty/items/umbran_boat.json
 e638d83d3c1fb35d426cfd1e482f77d681d4339f assets/biomesoplenty/items/umbran_button.json
 f32486e4510a080638c2d668d83455556af3ca09 assets/biomesoplenty/items/umbran_chest_boat.json
@@ -713,11 +713,11 @@ e1836cbe99c5c795a2e2b88bab66abaa341613ac assets/biomesoplenty/items/umbran_press
 876f52e11cab55d055dd165b652fcaabf45e4ce4 assets/biomesoplenty/items/umbran_trapdoor.json
 4e1055fcb04a0e3f915e9022bbf15681a9f76be6 assets/biomesoplenty/items/umbran_wood.json
 12736b8fc7ecac30de31542864514c0ca97d0d8a assets/biomesoplenty/items/unmapped_end_stone.json
-112068032d815f9cfceb76bfa66aa6a59d71db1d assets/biomesoplenty/items/violet.json
+b5260097bd91e97715b60725f08133ea225464d5 assets/biomesoplenty/items/violet.json
 eb2b7baa374f60c6ae95faf58f55994b9fbc2a26 assets/biomesoplenty/items/watergrass.json
-835bc2ae06c618006991ee189d7038e827dde92d assets/biomesoplenty/items/waterlily.json
-9c3cfd2009b413d4662188642e4c670d7639a577 assets/biomesoplenty/items/webbing.json
-9baec0b542281046d75537f14777768e8190fc0c assets/biomesoplenty/items/white_lavender.json
+fafa51534ca9718095ea42ed41245e65b9a20bb8 assets/biomesoplenty/items/waterlily.json
+de43e05041f556bdcb1e51ac4efc8aa49ed30bab assets/biomesoplenty/items/webbing.json
+189b336a2b4843af1ed617a0067934ed2f767986 assets/biomesoplenty/items/white_lavender.json
 e9af0ee1228116576a4a9e488f56b1fe23c69554 assets/biomesoplenty/items/white_petals.json
 c1f7676ee3d3035a1cc5d3d93b15bc744ffaf9de assets/biomesoplenty/items/white_sand.json
 137ff249027ca318e0ea00ba12492e0dc591883f assets/biomesoplenty/items/white_sandstone.json
@@ -743,9 +743,9 @@ f5493304e93b6a273c45fee34c2c8dadec8de6b0 assets/biomesoplenty/items/willow_stair
 20adaabd384202eb3cb323ff68895db1cb3caa11 assets/biomesoplenty/items/willow_trapdoor.json
 9f9f48862014097c5d23e6b40079534fff3b1886 assets/biomesoplenty/items/willow_vine.json
 366ce140f61243cfc017d3b69baf5c7eb7516568 assets/biomesoplenty/items/willow_wood.json
-98bcad7eaefcae57e718f9edaca5ed3abab3bee4 assets/biomesoplenty/items/wilted_lily.json
+ab50fd6ed96641f40df2c898d03e2aa183e115c0 assets/biomesoplenty/items/wilted_lily.json
 5a6855116784a43b16e8f1c6b929a1870b797fac assets/biomesoplenty/items/wispjelly.json
-c45e9aa689ed08c45f4a06e8a2712a7f69a7920e assets/biomesoplenty/items/yellow_maple_leaf_pile.json
+7c9608b004cab1a4c5a0d800f8c9aa13c11748b3 assets/biomesoplenty/items/yellow_maple_leaf_pile.json
 f02e43e2268a070407a4be3dfd8a7aeda273f8b0 assets/biomesoplenty/items/yellow_maple_leaves.json
 be2b738d3b759499969c28bdb91b4ecb66ea7bf9 assets/biomesoplenty/items/yellow_maple_sapling.json
 14401aa293090beb559a388a0e6351eb178da7b2 assets/biomesoplenty/models/block/black_sandstone.json
@@ -801,7 +801,6 @@ efa6bbc638a41214df953cd6438a11a11152bb0a assets/biomesoplenty/models/block/dead_
 07d42515643549e822feff74fa937b694a768607 assets/biomesoplenty/models/block/dead_fence_inventory.json
 bc1d2b9225254353bb3bc602a5ff4df6e9056e3f assets/biomesoplenty/models/block/dead_fence_post.json
 78477d85c14385d6984fd091a8064d3f890cca52 assets/biomesoplenty/models/block/dead_fence_side.json
-1650de6e173e37c0f4631d379009fff33c4355fc assets/biomesoplenty/models/block/dead_grass.json
 af461cfc501e663ac84385638889c618034fd728 assets/biomesoplenty/models/block/dead_hanging_sign.json
 131811c1fb7c887493e8dfa467a6bb97561f8559 assets/biomesoplenty/models/block/dead_leaves.json
 0ff81c8fdd668ce23f01f37dc06e54eb2c62d604 assets/biomesoplenty/models/block/dead_log.json
@@ -893,6 +892,8 @@ da2a5e7ad73626e40ede156bcb1b642aad791748 assets/biomesoplenty/models/block/fir_t
 549077112dd906a448700944d39d175c93c01d68 assets/biomesoplenty/models/block/fir_trapdoor_top.json
 2fe51aac3e6442c8ad1b52acb206fb7bd8b9ce54 assets/biomesoplenty/models/block/fir_wood.json
 dba135910215d4b1ad8a817809e3c2aabcfe45eb assets/biomesoplenty/models/block/flowering_oak_sapling.json
+71fc73d25b64d804d364f8b93b5c45dcaf9b6122 assets/biomesoplenty/models/block/glowshroom_block.json
+aacba1f9cac6eb67b97cf22f1cd4f5412854ef20 assets/biomesoplenty/models/block/glowshroom_block_inventory.json
 9ede0eaf5fae971b0088e02a47a9c44959131e4d assets/biomesoplenty/models/block/hellbark_button.json
 3002f9687623e5af599de9dbac68d9d7b49b705a assets/biomesoplenty/models/block/hellbark_button_inventory.json
 22a0659160e3b8e7a9f9c1dc5cb0a113f785b1f3 assets/biomesoplenty/models/block/hellbark_button_pressed.json
@@ -1176,7 +1177,6 @@ a3ae4aae8631d6d5aedc65ef6122cd73d2201b15 assets/biomesoplenty/models/block/potte
 ab78c876493a44621599494bdcc2f98847aaf22e assets/biomesoplenty/models/block/potted_umbran_sapling.json
 9060e6413dbce2d41c541ddcaf39c7df7ce62902 assets/biomesoplenty/models/block/potted_willow_sapling.json
 4538249cf1e5cad794c10a29042910ef88570c01 assets/biomesoplenty/models/block/potted_yellow_maple_sapling.json
-5350ceb5d4ba514eb9b8ff253873bbba32d9d1a3 assets/biomesoplenty/models/block/pus_bubble.json
 d7d0d75bcf144d262d6f3277a9b36a9df8f1fd64 assets/biomesoplenty/models/block/rainbow_birch_sapling.json
 805b0d954f57b1726217f8016716bcee04c35838 assets/biomesoplenty/models/block/redwood_button.json
 8a74dc9e099d73c742c84d39453c5c879379d9ae assets/biomesoplenty/models/block/redwood_button_inventory.json
@@ -1274,6 +1274,8 @@ ad2564ff1f391b8fe1c9781a7229183342138fa3 assets/biomesoplenty/models/block/strip
 eaa1831159d363f784aa1f4b37dac979fe6b1170 assets/biomesoplenty/models/block/stripped_willow_log.json
 9113ee50095fdb55857200cb5db55931ceb12a9c assets/biomesoplenty/models/block/stripped_willow_log_horizontal.json
 25141e24df5c66366569367bd619d63ac8b6f444 assets/biomesoplenty/models/block/stripped_willow_wood.json
+d4f528b64189a598bec3ae705b2ddf76780d000e assets/biomesoplenty/models/block/toadstool_block.json
+cfd844342e12c9294d0d12c7ea4fc724849d0201 assets/biomesoplenty/models/block/toadstool_block_inventory.json
 6edff4631d1ced49789e72450c41ee8e9958ac37 assets/biomesoplenty/models/block/umbran_button.json
 5e8b38cf8849d4b5548c6f82c6276a441fecb083 assets/biomesoplenty/models/block/umbran_button_inventory.json
 e4ed526ebf0a62809a8670c7774c27c8d45a420d assets/biomesoplenty/models/block/umbran_button_pressed.json
@@ -1358,43 +1360,63 @@ f87a588ff67d24ca5643c8d93a4784074cb11b89 assets/biomesoplenty/models/block/willo
 e2357ea42426d80cc8c3b20f6c878757fbb45a90 assets/biomesoplenty/models/block/willow_wood.json
 92fc60ea6b4636bf912d4c7931e19516f9b47e94 assets/biomesoplenty/models/block/yellow_maple_leaves.json
 6b426d51265a5c963c2330235be72f4c9ce15bc6 assets/biomesoplenty/models/block/yellow_maple_sapling.json
-d1f04c2805f5d9a35508c25c93f631c5d16bb9a6 assets/biomesoplenty/models/item/barley.json
+345be4d3e22c1e2607e67dba6ad24a3d088451d5 assets/biomesoplenty/models/item/barley.json
+e31557297c01a95c458e90e53aa233ceedf1d551 assets/biomesoplenty/models/item/barnacles.json
+01b167f1385c8a5611e796794b834aa60c967d01 assets/biomesoplenty/models/item/blackstone_bulb.json
+d2f3d80c173997c9ef1183a5753ea0925001c5f3 assets/biomesoplenty/models/item/blackstone_spines.json
 acf2a95afe16264b6cdc1a0e6af36435ae435716 assets/biomesoplenty/models/item/blood_bucket.json
 130fee90c56e5ac402c5b3e4a4b122141fe673de assets/biomesoplenty/models/item/blue_hydrangea.json
 e88eb9fc88d3c608de67b8ba1637ef5b7ff127ef assets/biomesoplenty/models/item/bop_icon.json
-9454de72fd5a743ce8a45077363d6fb323b0865d assets/biomesoplenty/models/item/brimstone_cluster.json
-84c661617c6448fbc6fcfb199a4d48e2f9eadaa0 assets/biomesoplenty/models/item/cattail.json
-3b9027aa640b2c7d48edcaccd063b310eabca987 assets/biomesoplenty/models/item/clover.json
+ce5604fcf62b8b77a2d130da57c484ab5eb8df00 assets/biomesoplenty/models/item/bramble.json
+12de0cbb399fa639f999dc50bd49c66e99fc3b56 assets/biomesoplenty/models/item/bramble_leaves.json
+13d68f2905437b45dc77609bdcbc28ed900b5070 assets/biomesoplenty/models/item/brimstone_bud.json
+0d613bfd6163d68be1f3db341c86c55c7d27112e assets/biomesoplenty/models/item/brimstone_cluster.json
+cfecc268a47e8e123243bfd4147abbc9ce1c3962 assets/biomesoplenty/models/item/burning_blossom.json
+390a6d570bbf0931ca575728d2326ed5a22bff97 assets/biomesoplenty/models/item/bush.json
+1970064ed80051e29da3a44f3493f5c4a0a33758 assets/biomesoplenty/models/item/cattail.json
+ac1fb1f28847b00798576275c6eb7e58fd30dee9 assets/biomesoplenty/models/item/clover.json
 3928931fef4a6bc678c396561652925844f2dcb9 assets/biomesoplenty/models/item/cypress_sapling.json
 470a2d97ef5b752c913790b355ed41b2ba54edd5 assets/biomesoplenty/models/item/dead_boat.json
+0c07419442697751d318f46c91590c3f900af672 assets/biomesoplenty/models/item/dead_branch.json
 a1970b5c40aedb8f7e6e6a9a14ee4d17e23ee0a0 assets/biomesoplenty/models/item/dead_chest_boat.json
 628f4d604800cc6e00c12066bc733b17f3483256 assets/biomesoplenty/models/item/dead_door.json
 8c5304797e578deecb2fa3921725dd9ffdb34aaf assets/biomesoplenty/models/item/dead_grass.json
 8076db37a7694713db967c28eb17755c513f427c assets/biomesoplenty/models/item/dead_hanging_sign.json
 55d46fbee32601acfb335ff799bb66a56e3410d3 assets/biomesoplenty/models/item/dead_sapling.json
 d67679219902293197b7798fbc55c6c2f1ab5c76 assets/biomesoplenty/models/item/dead_sign.json
+0f46446788eb7979a6d56b7bb04ddf9f0fb0f0e7 assets/biomesoplenty/models/item/desert_grass.json
+f1988c38c41a66cef5e817cfd15d4d20846d33f8 assets/biomesoplenty/models/item/dune_grass.json
 138fe508138e9b3ece9ab4343449a4d0935fa5a2 assets/biomesoplenty/models/item/empyreal_boat.json
 ca98ba34bb27ab0831dfc154a0abbb3b75ddb2b2 assets/biomesoplenty/models/item/empyreal_chest_boat.json
 01d4319ef54f097b49eff0f777495011c49c2cde assets/biomesoplenty/models/item/empyreal_door.json
 2a7c2d4fabb8e6fc33678e2a1964fabe5c7bebfd assets/biomesoplenty/models/item/empyreal_hanging_sign.json
 81b472f2eb8d4d91065d880a8010ade493e7cf5c assets/biomesoplenty/models/item/empyreal_sapling.json
 c5c86ea2359893f53625e1251b07b0e850d629d0 assets/biomesoplenty/models/item/empyreal_sign.json
-0bb66855f1e3066bcb9e4414e2cc476e148f170c assets/biomesoplenty/models/item/eyebulb.json
+dade71f53c1009c8427e0d6646d8f547fb2b1ff8 assets/biomesoplenty/models/item/endbloom.json
+325c8986f1ef79ffdbd9385518437dc50f3c4c57 assets/biomesoplenty/models/item/enderphyte.json
+2f4c6ba0b941c45bd179704c920e08b0a4598b87 assets/biomesoplenty/models/item/eyebulb.json
 570b6b2804017baec0137edb42948c95b78a48bb assets/biomesoplenty/models/item/fir_boat.json
 0e23770d166f179145ee2879dc306686eee96351 assets/biomesoplenty/models/item/fir_chest_boat.json
 8ccb7a65a7adc8001df531063d728b64576a2df1 assets/biomesoplenty/models/item/fir_door.json
 d3a5932c1d653fd0e3211ab71e63b14ea6ef65fa assets/biomesoplenty/models/item/fir_hanging_sign.json
 73813369fce86715193807945bc535cc17dc24c3 assets/biomesoplenty/models/item/fir_sapling.json
 bfdd7e2f5a214592a99922521dc78cfbf1cc84f2 assets/biomesoplenty/models/item/fir_sign.json
+0ca5a2602ea84969e1190e6593d4235814ed2404 assets/biomesoplenty/models/item/flesh_tendons.json
 c01f1ea09fc5205c87a140e288e17f466bf6263a assets/biomesoplenty/models/item/flowering_oak_sapling.json
+6e0dde34cf59e72d6ca282aec46f47bd703fe6e9 assets/biomesoplenty/models/item/glowflower.json
+6c1ee40fe81bb4d3e57ec4fe8702d885c5d67907 assets/biomesoplenty/models/item/glowshroom.json
+e65bbbcbe4ed623a968f70e05adeca64288e4f23 assets/biomesoplenty/models/item/glowworm_silk.json
 2d8f7b1aee4a72adffed416d401abd42c51cb9d1 assets/biomesoplenty/models/item/goldenrod.json
+5f3b3f66950c22d43b568e0ee8576ca52b4a8d09 assets/biomesoplenty/models/item/hair.json
+14b100716e4d5d0a51b611aced4cffcb7f0c6367 assets/biomesoplenty/models/item/hanging_cobweb.json
 d1a98ed861556d1ca750457b59fb75da42d298c5 assets/biomesoplenty/models/item/hellbark_boat.json
 f05b85605fd969f22d478a581ef982b805228dcf assets/biomesoplenty/models/item/hellbark_chest_boat.json
 7ebf2e99fcbf479c76267338902d9ae60f78701a assets/biomesoplenty/models/item/hellbark_door.json
 aad3c607622600ffb6bf4cd40c7582b84f7d14cf assets/biomesoplenty/models/item/hellbark_hanging_sign.json
 0a870d6b4c26d3df29a22d488458f57b5e7956a3 assets/biomesoplenty/models/item/hellbark_sapling.json
 a6e3c54f3988a69fa2c53e0231a2e864e6438771 assets/biomesoplenty/models/item/hellbark_sign.json
-d3165c0964f31f558a0270e7920425e17cba9c28 assets/biomesoplenty/models/item/huge_clover_petal.json
+4f300e841ad25d4c63fa7d89241e09d95722e42a assets/biomesoplenty/models/item/high_grass.json
+49a7c54fb2c49e94204f806c679b54425a5a0673 assets/biomesoplenty/models/item/huge_clover_petal.json
 3538fb08d3198f1c2ffa0edff2b12c02c1c6eb73 assets/biomesoplenty/models/item/huge_lily_pad.json
 10fd387e795932a57bc7f7768436ce8bfea6d9b0 assets/biomesoplenty/models/item/icy_iris.json
 4cba453f9e6afdbc6f2d8e3a3947f09ff96b01af assets/biomesoplenty/models/item/jacaranda_boat.json
@@ -1403,7 +1425,10 @@ d3165c0964f31f558a0270e7920425e17cba9c28 assets/biomesoplenty/models/item/huge_c
 ffcb215485aa2b26b4baeb1e48906b138cb70adb assets/biomesoplenty/models/item/jacaranda_hanging_sign.json
 100ef33debff3361ed0ebdf5f4329b9ad8e6b7f7 assets/biomesoplenty/models/item/jacaranda_sapling.json
 5f4c537dd195b7a777f2655b1e6842659980777f assets/biomesoplenty/models/item/jacaranda_sign.json
+86ab0455e2217065672292d317a64104c0891a74 assets/biomesoplenty/models/item/large_rose_quartz_bud.json
+a534d94664a67264bbe8d96f8540c9e6e4f5b92f assets/biomesoplenty/models/item/lavender.json
 a8f2b6cf0d17dd02f36eef058620acd3d085d12b assets/biomesoplenty/models/item/liquid_null_bucket.json
+bb630cd4f500a09a9f3df04b29cadefe65e73655 assets/biomesoplenty/models/item/lumaloop.json
 f652204233605dfddfe1b3414d9e69821b3f39c4 assets/biomesoplenty/models/item/magic_boat.json
 5c02efb26fc555d32fd0915081047def8ea945de assets/biomesoplenty/models/item/magic_chest_boat.json
 3545e2766008d4871f81b8b2971dd536570f373e assets/biomesoplenty/models/item/magic_door.json
@@ -1421,7 +1446,11 @@ b90822a2ecbd6029e508170ad126362eaed0d0e0 assets/biomesoplenty/models/item/mahoga
 ccca3e9ad7c73689a46b00af5b172aa72fd03d37 assets/biomesoplenty/models/item/maple_door.json
 95878d4e038ed4bcb6fbfd06d33ec0a02e08072b assets/biomesoplenty/models/item/maple_hanging_sign.json
 55bf2b15d6e1182d97b827253ef5a482cfdbdd1b assets/biomesoplenty/models/item/maple_sign.json
+a6718dc7a80ebd4565e115b452f438b14f264957 assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
 cc1770ff598883bafe2a2ace26d3ded44c359ea7 assets/biomesoplenty/models/item/music_disc_wanderer.json
+b773f5c27b1bda9e12f3b06d2d8980a439e4adfa assets/biomesoplenty/models/item/null_plant.json
+f0a66e961c5315593813f0abdda0b3ae68d03995 assets/biomesoplenty/models/item/orange_cosmos.json
+c0e060e625c05d1d32634ffc22b7345366034795 assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
 763b5fd012f55b240d89753c21605f4d46533b30 assets/biomesoplenty/models/item/orange_maple_sapling.json
 c95a43ab4f6e672b4a4c67bdb1dc0b44b83eba3e assets/biomesoplenty/models/item/origin_sapling.json
 f1ea1d2089e32da322486ad0b99237c9b0489e3c assets/biomesoplenty/models/item/palm_boat.json
@@ -1436,7 +1465,9 @@ fe4059d006f132cb852d9431d6aad452cc267dfb assets/biomesoplenty/models/item/palm_s
 85b5796ec81af98386eb4413d64f6b298a029375 assets/biomesoplenty/models/item/pine_hanging_sign.json
 265cbcbdb321cab87bce476cbae7a2b15dea3a77 assets/biomesoplenty/models/item/pine_sapling.json
 05d37faec5fff575c526ea97e7260a75f233a010 assets/biomesoplenty/models/item/pine_sign.json
-cee8fc75e3086535591e26296fcbbfc42e840b38 assets/biomesoplenty/models/item/pus_bubble.json
+95e76abe3d1c71be940078da500bcc48153f2e1f assets/biomesoplenty/models/item/pink_daffodil.json
+7947301cb375cf75167e8d3a1b41edab1e52a834 assets/biomesoplenty/models/item/pink_hibiscus.json
+39dec6855cf1f2f8181c5293a87ae82957a8a289 assets/biomesoplenty/models/item/pus_bubble.json
 764b3805ff70cf4ddec384810d1d879a7b22757f assets/biomesoplenty/models/item/rainbow_birch_sapling.json
 cf0622c3cce98a35ca0867295dc4e0b0d2e6837e assets/biomesoplenty/models/item/redwood_boat.json
 7702d1a2afd3783f50511335dd03d4ef090b80ce assets/biomesoplenty/models/item/redwood_chest_boat.json
@@ -1444,22 +1475,37 @@ cf0622c3cce98a35ca0867295dc4e0b0d2e6837e assets/biomesoplenty/models/item/redwoo
 44cc66767b08ab05c8a92f2a88f1ce0f4ac3c318 assets/biomesoplenty/models/item/redwood_hanging_sign.json
 ee1cd0342cfd8ce33d5752b5d6921b7f75bacfc9 assets/biomesoplenty/models/item/redwood_sapling.json
 77e73742ea1f6cfbd69cb0df12110fa9b55f0f77 assets/biomesoplenty/models/item/redwood_sign.json
+f7e4cbd33d3b0f2ab85711d2597ce22366fc899a assets/biomesoplenty/models/item/red_maple_leaf_pile.json
 ac4c16aec6c5cb9cd6f4d0c207ebdfcb682d3c4e assets/biomesoplenty/models/item/red_maple_sapling.json
-6342a50e1a29bff43a463af5751bdbc0a6cafa0e assets/biomesoplenty/models/item/reed.json
+2c493742a5950e8e392f1ff976ec03a6ad0cca98 assets/biomesoplenty/models/item/reed.json
+9d94b6f102e381ebc03d686e4841a047ec0f5b8e assets/biomesoplenty/models/item/rose.json
 8fd5081eea20496dd71b9d09655e7a284c074168 assets/biomesoplenty/models/item/rose_quartz_chunk.json
-af233fe04d860f7dca8e5f36431ab32dd7240444 assets/biomesoplenty/models/item/sea_oats.json
+2bce93ea97d1b73ce1d9c24e4a8b2d74782acfa8 assets/biomesoplenty/models/item/rose_quartz_cluster.json
+6a73ea05bd0d4fc64780841e1bd82c87ffa019ae assets/biomesoplenty/models/item/sea_oats.json
+352300f106fb58a80d8ffc70e650aa3b65251f4d assets/biomesoplenty/models/item/small_rose_quartz_bud.json
 91ffe21ea9927758f79d7a086eef87b09c962bd0 assets/biomesoplenty/models/item/snowblossom_sapling.json
+0a2571ca24c54e3c98e853bf8365cf111f93b0ee assets/biomesoplenty/models/item/spanish_moss.json
+f78558ae05a6f205623a334f6f0c2b21eefb115c assets/biomesoplenty/models/item/spider_egg.json
+5f95e93926e10d07d4ecd0a6d42dbb69a7911710 assets/biomesoplenty/models/item/sprout.json
+bc078ccfc455295a4bad804b92e33e894bc20894 assets/biomesoplenty/models/item/stringy_cobweb.json
 b23ab1211104d7539182331aea8d31329021b7f7 assets/biomesoplenty/models/item/tall_lavender.json
 a9296cec6837d67d1e63435ad4648a6b94022fb5 assets/biomesoplenty/models/item/tall_white_lavender.json
+0e4b4f1ec813d3a8a7d0fe37307d5c5463576967 assets/biomesoplenty/models/item/tiny_cactus.json
+d2a9b2c774f941ec122756c3b79b8fdd3410388a assets/biomesoplenty/models/item/toadstool.json
+bb5e94d393c90cc1f95ba4d65122f439d5bb2659 assets/biomesoplenty/models/item/tundra_shrub.json
 e73c74ebe308ab849e63a1f03d1b3a2526632b4c assets/biomesoplenty/models/item/umbran_boat.json
 fd1d35affe45a43326d55ac04a263f4abcbe660c assets/biomesoplenty/models/item/umbran_chest_boat.json
 69073d9ad0d14ab67141a9e58cc8f60f51cb13d4 assets/biomesoplenty/models/item/umbran_door.json
 568cbdc0fa77519e7f242e4a96ef5600d84ac0c2 assets/biomesoplenty/models/item/umbran_hanging_sign.json
 6332dd5455f45517689a07825ea54dacfc05b017 assets/biomesoplenty/models/item/umbran_sapling.json
 77babd7a0cd25c2bc9e83ab8d2e93dfeaf5608e5 assets/biomesoplenty/models/item/umbran_sign.json
+19df54defd2d013ed32547ddb8348a0cd39ff500 assets/biomesoplenty/models/item/violet.json
 b75f12cd130bd3a1d05933871613f35a95db14ae assets/biomesoplenty/models/item/watergrass.json
-0339b04b566538d7bd02c58ea937f2656d35964e assets/biomesoplenty/models/item/white_petals.json
-81988846a6841e28c82d9a44b9a09da9ac569a94 assets/biomesoplenty/models/item/wildflower.json
+77cf4dddcf8d5a2f78acc4ac5ae4d72b7582c194 assets/biomesoplenty/models/item/waterlily.json
+9ccf9d7cfd878cbf79788bfb54850088e196b669 assets/biomesoplenty/models/item/webbing.json
+1832b54a99d9bfca97a89fa872a82a3e6f504591 assets/biomesoplenty/models/item/white_lavender.json
+27db2eeb0077550d4e13e154dd1d7edca1b8caa8 assets/biomesoplenty/models/item/white_petals.json
+ec79bbf1a93c01ddd413f9af4a5fbe17b2abe2f2 assets/biomesoplenty/models/item/wildflower.json
 e840c21e9707f7bd3244ca75d1d74b93ea4add72 assets/biomesoplenty/models/item/willow_boat.json
 4bfb7ae2dbc499e85e0ed2568c28eab83424f45c assets/biomesoplenty/models/item/willow_chest_boat.json
 b0d0706a606558c0fec1feb6b8b51a4a47479420 assets/biomesoplenty/models/item/willow_door.json
@@ -1467,4 +1513,6 @@ b0d0706a606558c0fec1feb6b8b51a4a47479420 assets/biomesoplenty/models/item/willow
 2622c90dd2f619115536b5efe24b7cc548d50aeb assets/biomesoplenty/models/item/willow_sapling.json
 9dd032ad6162dd96cb09bdd61370bfed03f1ee79 assets/biomesoplenty/models/item/willow_sign.json
 a18c17519c9627554845ff4eb3ccdb4685a1724d assets/biomesoplenty/models/item/willow_vine.json
+8165be1782ff33402c3f5a0f59c479dea2721e5a assets/biomesoplenty/models/item/wilted_lily.json
+0c9b090d9dd2622b61496251810f9493dbb5b7f4 assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
 dc6ad680b6da89740741541d4967fe005b7ba18d assets/biomesoplenty/models/item/yellow_maple_sapling.json
diff --git a/common/src/generated/resources/assets/biomesoplenty/blockstates/dead_grass.json b/common/src/generated/resources/assets/biomesoplenty/blockstates/dead_grass.json
deleted file mode 100644
index a421c5d686..0000000000
--- a/common/src/generated/resources/assets/biomesoplenty/blockstates/dead_grass.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "biomesoplenty:block/dead_grass"
-    }
-  }
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/blockstates/glowshroom_block.json b/common/src/generated/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
new file mode 100644
index 0000000000..e123c5722a
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
@@ -0,0 +1,120 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block"
+      },
+      "when": {
+        "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block",
+        "uvlock": true,
+        "x": 270
+      },
+      "when": {
+        "up": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block",
+        "uvlock": true,
+        "x": 90
+      },
+      "when": {
+        "down": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside"
+      },
+      "when": {
+        "north": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside",
+        "uvlock": false,
+        "y": 90
+      },
+      "when": {
+        "east": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside",
+        "uvlock": false,
+        "y": 180
+      },
+      "when": {
+        "south": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside",
+        "uvlock": false,
+        "y": 270
+      },
+      "when": {
+        "west": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside",
+        "uvlock": false,
+        "x": 270
+      },
+      "when": {
+        "up": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowshroom_block_inside",
+        "uvlock": false,
+        "x": 90
+      },
+      "when": {
+        "down": "false"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/blockstates/pus_bubble.json b/common/src/generated/resources/assets/biomesoplenty/blockstates/pus_bubble.json
deleted file mode 100644
index f0d8a00636..0000000000
--- a/common/src/generated/resources/assets/biomesoplenty/blockstates/pus_bubble.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "biomesoplenty:block/pus_bubble"
-    }
-  }
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/blockstates/toadstool_block.json b/common/src/generated/resources/assets/biomesoplenty/blockstates/toadstool_block.json
new file mode 100644
index 0000000000..7da87fb33e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/blockstates/toadstool_block.json
@@ -0,0 +1,120 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block"
+      },
+      "when": {
+        "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block",
+        "uvlock": true,
+        "x": 270
+      },
+      "when": {
+        "up": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "biomesoplenty:block/toadstool_block",
+        "uvlock": true,
+        "x": 90
+      },
+      "when": {
+        "down": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside"
+      },
+      "when": {
+        "north": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "uvlock": false,
+        "y": 90
+      },
+      "when": {
+        "east": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "uvlock": false,
+        "y": 180
+      },
+      "when": {
+        "south": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "uvlock": false,
+        "y": 270
+      },
+      "when": {
+        "west": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "uvlock": false,
+        "x": 270
+      },
+      "when": {
+        "up": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "minecraft:block/mushroom_block_inside",
+        "uvlock": false,
+        "x": 90
+      },
+      "when": {
+        "down": "false"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/barnacles.json b/common/src/generated/resources/assets/biomesoplenty/items/barnacles.json
index 86a4588d89..9101e770d1 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/barnacles.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/barnacles.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/barnacles"
+    "model": "biomesoplenty:item/barnacles"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/blackstone_bulb.json b/common/src/generated/resources/assets/biomesoplenty/items/blackstone_bulb.json
index 405494a398..e230a02522 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/blackstone_bulb.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/blackstone_bulb.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/blackstone_bulb"
+    "model": "biomesoplenty:item/blackstone_bulb"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/blackstone_spines.json b/common/src/generated/resources/assets/biomesoplenty/items/blackstone_spines.json
index 1a56465ed2..88c0fd6626 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/blackstone_spines.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/blackstone_spines.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/blackstone_spines"
+    "model": "biomesoplenty:item/blackstone_spines"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/bramble.json b/common/src/generated/resources/assets/biomesoplenty/items/bramble.json
index a50abd388f..5d9b8f4b31 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/bramble.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/bramble.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/bramble"
+    "model": "biomesoplenty:item/bramble"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/bramble_leaves.json b/common/src/generated/resources/assets/biomesoplenty/items/bramble_leaves.json
index c6039d20e5..83a0cad6a4 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/bramble_leaves.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/bramble_leaves.json
@@ -1,6 +1,12 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/bramble_leaves"
+    "model": "biomesoplenty:item/bramble_leaves",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -12012264
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/brimstone_bud.json b/common/src/generated/resources/assets/biomesoplenty/items/brimstone_bud.json
index 4d554e748c..095f9fa73a 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/brimstone_bud.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/brimstone_bud.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/brimstone_bud"
+    "model": "biomesoplenty:item/brimstone_bud"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/burning_blossom.json b/common/src/generated/resources/assets/biomesoplenty/items/burning_blossom.json
index 5dae69811b..5c8d61dfdb 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/burning_blossom.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/burning_blossom.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/burning_blossom"
+    "model": "biomesoplenty:item/burning_blossom"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/bush.json b/common/src/generated/resources/assets/biomesoplenty/items/bush.json
index a35ae15553..cdecb96863 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/bush.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/bush.json
@@ -1,6 +1,12 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/bush"
+    "model": "biomesoplenty:item/bush",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -12012264
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/clover.json b/common/src/generated/resources/assets/biomesoplenty/items/clover.json
index e5d5659350..4ed47da32c 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/clover.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/clover.json
@@ -1,6 +1,13 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:item/clover"
+    "model": "biomesoplenty:item/clover",
+    "tints": [
+      {
+        "type": "minecraft:grass",
+        "downfall": 1.0,
+        "temperature": 0.5
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/dead_branch.json b/common/src/generated/resources/assets/biomesoplenty/items/dead_branch.json
index 892613d7b9..a151125399 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/dead_branch.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/dead_branch.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/dead_branch"
+    "model": "biomesoplenty:item/dead_branch"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/desert_grass.json b/common/src/generated/resources/assets/biomesoplenty/items/desert_grass.json
index b5e074ceea..07105db566 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/desert_grass.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/desert_grass.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/desert_grass"
+    "model": "biomesoplenty:item/desert_grass"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/dune_grass.json b/common/src/generated/resources/assets/biomesoplenty/items/dune_grass.json
index cdd285afb7..50ea3664d6 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/dune_grass.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/dune_grass.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/dune_grass"
+    "model": "biomesoplenty:item/dune_grass"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/endbloom.json b/common/src/generated/resources/assets/biomesoplenty/items/endbloom.json
index 77529782a3..f41b0e8b2c 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/endbloom.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/endbloom.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/endbloom"
+    "model": "biomesoplenty:item/endbloom"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/enderphyte.json b/common/src/generated/resources/assets/biomesoplenty/items/enderphyte.json
index a0f0afa041..cce5e54acc 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/enderphyte.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/enderphyte.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/enderphyte"
+    "model": "biomesoplenty:item/enderphyte"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/flesh_tendons.json b/common/src/generated/resources/assets/biomesoplenty/items/flesh_tendons.json
index 202477a15b..00ee14a00e 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/flesh_tendons.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/flesh_tendons.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/flesh_tendons"
+    "model": "biomesoplenty:item/flesh_tendons"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/glowflower.json b/common/src/generated/resources/assets/biomesoplenty/items/glowflower.json
index 18053914f7..76b70213d2 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/glowflower.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/glowflower.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/glowflower"
+    "model": "biomesoplenty:item/glowflower"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/glowshroom.json b/common/src/generated/resources/assets/biomesoplenty/items/glowshroom.json
index f1766f9fc9..f6906d185b 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/glowshroom.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/glowshroom.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/glowshroom"
+    "model": "biomesoplenty:item/glowshroom"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/glowshroom_block.json b/common/src/generated/resources/assets/biomesoplenty/items/glowshroom_block.json
index d5152a2c24..0e0ddcea8f 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/glowshroom_block.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/glowshroom_block.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/glowshroom_block"
+    "model": "biomesoplenty:block/glowshroom_block_inventory"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/glowworm_silk.json b/common/src/generated/resources/assets/biomesoplenty/items/glowworm_silk.json
index bc971b306b..3f0237fbe3 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/glowworm_silk.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/glowworm_silk.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/glowworm_silk"
+    "model": "biomesoplenty:item/glowworm_silk"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/hair.json b/common/src/generated/resources/assets/biomesoplenty/items/hair.json
index a78c00f1e7..3ae8d5eab1 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/hair.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/hair.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/hair"
+    "model": "biomesoplenty:item/hair"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/hanging_cobweb.json b/common/src/generated/resources/assets/biomesoplenty/items/hanging_cobweb.json
index cc08744fac..fa0559cd7b 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/hanging_cobweb.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/hanging_cobweb.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/hanging_cobweb"
+    "model": "biomesoplenty:item/hanging_cobweb"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/high_grass.json b/common/src/generated/resources/assets/biomesoplenty/items/high_grass.json
index 67821d39b7..330042fb54 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/high_grass.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/high_grass.json
@@ -1,6 +1,13 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/high_grass"
+    "model": "biomesoplenty:item/high_grass",
+    "tints": [
+      {
+        "type": "minecraft:grass",
+        "downfall": 1.0,
+        "temperature": 0.5
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/huge_clover_petal.json b/common/src/generated/resources/assets/biomesoplenty/items/huge_clover_petal.json
index e43656ecb0..44bd1ef63e 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/huge_clover_petal.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/huge_clover_petal.json
@@ -1,6 +1,13 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:item/huge_clover_petal"
+    "model": "biomesoplenty:item/huge_clover_petal",
+    "tints": [
+      {
+        "type": "minecraft:grass",
+        "downfall": 1.0,
+        "temperature": 0.5
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/huge_lily_pad.json b/common/src/generated/resources/assets/biomesoplenty/items/huge_lily_pad.json
index c46e886c6b..5148e7e9ac 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/huge_lily_pad.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/huge_lily_pad.json
@@ -1,6 +1,12 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:item/huge_lily_pad"
+    "model": "biomesoplenty:item/huge_lily_pad",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -9321636
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/large_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/items/large_rose_quartz_bud.json
index 67e3fa9d65..4681041752 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/large_rose_quartz_bud.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/large_rose_quartz_bud.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/large_rose_quartz_bud"
+    "model": "biomesoplenty:item/large_rose_quartz_bud"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/lavender.json b/common/src/generated/resources/assets/biomesoplenty/items/lavender.json
index 2c839ec3f8..8472d64598 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/lavender.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/lavender.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/lavender"
+    "model": "biomesoplenty:item/lavender"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/lumaloop.json b/common/src/generated/resources/assets/biomesoplenty/items/lumaloop.json
index 1025a96a51..ccde403d3c 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/lumaloop.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/lumaloop.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/lumaloop"
+    "model": "biomesoplenty:item/lumaloop"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/medium_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/items/medium_rose_quartz_bud.json
index 8799e45248..ac64461429 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/medium_rose_quartz_bud.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/medium_rose_quartz_bud.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/medium_rose_quartz_bud"
+    "model": "biomesoplenty:item/medium_rose_quartz_bud"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/null_plant.json b/common/src/generated/resources/assets/biomesoplenty/items/null_plant.json
index a99e1aad9b..0f5f619839 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/null_plant.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/null_plant.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/null_plant"
+    "model": "biomesoplenty:item/null_plant"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/orange_cosmos.json b/common/src/generated/resources/assets/biomesoplenty/items/orange_cosmos.json
index 61cae49bed..41d4ee4777 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/orange_cosmos.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/orange_cosmos.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/orange_cosmos"
+    "model": "biomesoplenty:item/orange_cosmos"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/orange_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/items/orange_maple_leaf_pile.json
index fa477e4e68..0e3d2ef25e 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/orange_maple_leaf_pile.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/orange_maple_leaf_pile.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/orange_maple_leaf_pile"
+    "model": "biomesoplenty:item/orange_maple_leaf_pile"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/pink_daffodil.json b/common/src/generated/resources/assets/biomesoplenty/items/pink_daffodil.json
index 34a6f271f0..540ab66fb0 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/pink_daffodil.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/pink_daffodil.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/pink_daffodil"
+    "model": "biomesoplenty:item/pink_daffodil"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/pink_hibiscus.json b/common/src/generated/resources/assets/biomesoplenty/items/pink_hibiscus.json
index 23d8be6b20..5bdc237a6e 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/pink_hibiscus.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/pink_hibiscus.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/pink_hibiscus"
+    "model": "biomesoplenty:item/pink_hibiscus"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/red_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/items/red_maple_leaf_pile.json
index 48d2e5dd1e..600b95839d 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/red_maple_leaf_pile.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/red_maple_leaf_pile.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/red_maple_leaf_pile"
+    "model": "biomesoplenty:item/red_maple_leaf_pile"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/rose.json b/common/src/generated/resources/assets/biomesoplenty/items/rose.json
index 8a2c88220c..532b27f1b0 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/rose.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/rose.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/rose"
+    "model": "biomesoplenty:item/rose"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/rose_quartz_cluster.json b/common/src/generated/resources/assets/biomesoplenty/items/rose_quartz_cluster.json
index 4a9a7cd170..d17e941f08 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/rose_quartz_cluster.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/rose_quartz_cluster.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/rose_quartz_cluster"
+    "model": "biomesoplenty:item/rose_quartz_cluster"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/small_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/items/small_rose_quartz_bud.json
index e1ba5df837..d3671f6794 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/small_rose_quartz_bud.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/small_rose_quartz_bud.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/small_rose_quartz_bud"
+    "model": "biomesoplenty:item/small_rose_quartz_bud"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/spanish_moss.json b/common/src/generated/resources/assets/biomesoplenty/items/spanish_moss.json
index 4fa84377e7..d61837eaa4 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/spanish_moss.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/spanish_moss.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/spanish_moss"
+    "model": "biomesoplenty:item/spanish_moss"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/spider_egg.json b/common/src/generated/resources/assets/biomesoplenty/items/spider_egg.json
index 24ff905407..d74087317e 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/spider_egg.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/spider_egg.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/spider_egg"
+    "model": "biomesoplenty:item/spider_egg"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/sprout.json b/common/src/generated/resources/assets/biomesoplenty/items/sprout.json
index 6061e8f116..822adfe755 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/sprout.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/sprout.json
@@ -1,6 +1,13 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/sprout"
+    "model": "biomesoplenty:item/sprout",
+    "tints": [
+      {
+        "type": "minecraft:grass",
+        "downfall": 1.0,
+        "temperature": 0.5
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/stringy_cobweb.json b/common/src/generated/resources/assets/biomesoplenty/items/stringy_cobweb.json
index f418c9f94f..3543d7ffff 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/stringy_cobweb.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/stringy_cobweb.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/stringy_cobweb"
+    "model": "biomesoplenty:item/stringy_cobweb"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/tiny_cactus.json b/common/src/generated/resources/assets/biomesoplenty/items/tiny_cactus.json
index 0a78a1c3c5..f38e7e1e16 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/tiny_cactus.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/tiny_cactus.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/tiny_cactus"
+    "model": "biomesoplenty:item/tiny_cactus"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/toadstool.json b/common/src/generated/resources/assets/biomesoplenty/items/toadstool.json
index c9d3ee191d..de6f55b98f 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/toadstool.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/toadstool.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/toadstool"
+    "model": "biomesoplenty:item/toadstool"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/toadstool_block.json b/common/src/generated/resources/assets/biomesoplenty/items/toadstool_block.json
index 2d89c4aadb..99c27a233c 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/toadstool_block.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/toadstool_block.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/toadstool_block"
+    "model": "biomesoplenty:block/toadstool_block_inventory"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/tundra_shrub.json b/common/src/generated/resources/assets/biomesoplenty/items/tundra_shrub.json
index 1e91ab977c..7cf871c96a 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/tundra_shrub.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/tundra_shrub.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/tundra_shrub"
+    "model": "biomesoplenty:item/tundra_shrub"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/violet.json b/common/src/generated/resources/assets/biomesoplenty/items/violet.json
index a09e535896..57675a9be4 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/violet.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/violet.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/violet"
+    "model": "biomesoplenty:item/violet"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/waterlily.json b/common/src/generated/resources/assets/biomesoplenty/items/waterlily.json
index 315e4fb93c..071c5cde67 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/waterlily.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/waterlily.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/waterlily"
+    "model": "biomesoplenty:item/waterlily"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/webbing.json b/common/src/generated/resources/assets/biomesoplenty/items/webbing.json
index 87008e8b59..0ec37200a6 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/webbing.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/webbing.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/webbing"
+    "model": "biomesoplenty:item/webbing"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/white_lavender.json b/common/src/generated/resources/assets/biomesoplenty/items/white_lavender.json
index 3862ef5b20..7dd7ce439d 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/white_lavender.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/white_lavender.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/white_lavender"
+    "model": "biomesoplenty:item/white_lavender"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/wilted_lily.json b/common/src/generated/resources/assets/biomesoplenty/items/wilted_lily.json
index 15062979fa..bfdb2e5fe1 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/wilted_lily.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/wilted_lily.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/wilted_lily"
+    "model": "biomesoplenty:item/wilted_lily"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/items/yellow_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/items/yellow_maple_leaf_pile.json
index e734e25f95..25a09c74df 100644
--- a/common/src/generated/resources/assets/biomesoplenty/items/yellow_maple_leaf_pile.json
+++ b/common/src/generated/resources/assets/biomesoplenty/items/yellow_maple_leaf_pile.json
@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "biomesoplenty:block/yellow_maple_leaf_pile"
+    "model": "biomesoplenty:item/yellow_maple_leaf_pile"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/dead_grass.json b/common/src/generated/resources/assets/biomesoplenty/models/block/dead_grass.json
deleted file mode 100644
index 5754ca14c5..0000000000
--- a/common/src/generated/resources/assets/biomesoplenty/models/block/dead_grass.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/cross",
-  "textures": {
-    "cross": "biomesoplenty:block/dead_grass"
-  }
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block.json b/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block.json
new file mode 100644
index 0000000000..63dd7b2044
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_single_face",
+  "textures": {
+    "texture": "biomesoplenty:block/glowshroom_block"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json b/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
new file mode 100644
index 0000000000..be67056538
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "biomesoplenty:block/glowshroom_block"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/pus_bubble.json b/common/src/generated/resources/assets/biomesoplenty/models/block/pus_bubble.json
deleted file mode 100644
index 4d849b41e6..0000000000
--- a/common/src/generated/resources/assets/biomesoplenty/models/block/pus_bubble.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/cross",
-  "textures": {
-    "cross": "biomesoplenty:block/pus_bubble"
-  }
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block.json b/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block.json
new file mode 100644
index 0000000000..1cdfcc08c7
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_single_face",
+  "textures": {
+    "texture": "biomesoplenty:block/toadstool_block"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json b/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
new file mode 100644
index 0000000000..d4e53db66d
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "biomesoplenty:block/toadstool_block"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/barley.json b/common/src/generated/resources/assets/biomesoplenty/models/item/barley.json
index 19fa2e667d..16cd48c4f2 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/barley.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/barley.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/barley_top"
+    "layer0": "biomesoplenty:item/barley"
   }
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/flesh_tendons_strand.json b/common/src/generated/resources/assets/biomesoplenty/models/item/barnacles.json
similarity index 55%
rename from common/src/main/resources/assets/biomesoplenty/models/item/flesh_tendons_strand.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/barnacles.json
index e7a5b3ec8d..4325be0e53 100644
--- a/common/src/main/resources/assets/biomesoplenty/models/item/flesh_tendons_strand.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/barnacles.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/flesh_tendons"
+    "layer0": "biomesoplenty:item/barnacles"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_bulb.json b/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
new file mode 100644
index 0000000000..bb1d61aea4
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/blackstone_bulb"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_spines.json b/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_spines.json
new file mode 100644
index 0000000000..5df95ec9fa
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/blackstone_spines.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/blackstone_spines"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/hanging_cobweb_strand.json b/common/src/generated/resources/assets/biomesoplenty/models/item/bramble.json
similarity index 55%
rename from common/src/main/resources/assets/biomesoplenty/models/item/hanging_cobweb_strand.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/bramble.json
index be80944dba..0c32573618 100644
--- a/common/src/main/resources/assets/biomesoplenty/models/item/hanging_cobweb_strand.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/bramble.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/hanging_cobweb"
+    "layer0": "biomesoplenty:item/bramble"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/bramble_leaves.json b/common/src/generated/resources/assets/biomesoplenty/models/item/bramble_leaves.json
new file mode 100644
index 0000000000..5ae8e8b54e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/bramble_leaves.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/bramble_leaves"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_bud.json b/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_bud.json
new file mode 100644
index 0000000000..9d9ecd5765
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_bud.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/brimstone_bud"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_cluster.json b/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_cluster.json
index d7f6b1af22..57f9bff013 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_cluster.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/brimstone_cluster.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/brimstone_cluster_top"
+    "layer0": "biomesoplenty:block/brimstone_cluster_bottom"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/burning_blossom.json b/common/src/generated/resources/assets/biomesoplenty/models/item/burning_blossom.json
new file mode 100644
index 0000000000..6e681cc812
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/burning_blossom.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/burning_blossom"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/bush.json b/common/src/generated/resources/assets/biomesoplenty/models/item/bush.json
new file mode 100644
index 0000000000..aeae92b582
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/bush.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/bush"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/cattail.json b/common/src/generated/resources/assets/biomesoplenty/models/item/cattail.json
index 736159555b..ad67173401 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/cattail.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/cattail.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/cattail_top"
+    "layer0": "biomesoplenty:item/cattail"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/clover.json b/common/src/generated/resources/assets/biomesoplenty/models/item/clover.json
index 667fab2b68..d058f5f1cf 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/clover.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/clover.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/clover"
+    "layer0": "biomesoplenty:item/clover"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/dead_branch.json b/common/src/generated/resources/assets/biomesoplenty/models/item/dead_branch.json
new file mode 100644
index 0000000000..4a2085240e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/dead_branch.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/dead_branch"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/desert_grass.json b/common/src/generated/resources/assets/biomesoplenty/models/item/desert_grass.json
new file mode 100644
index 0000000000..1d9d13b88d
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/desert_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/desert_grass"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/dune_grass.json b/common/src/generated/resources/assets/biomesoplenty/models/item/dune_grass.json
new file mode 100644
index 0000000000..e26907ae3e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/dune_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/dune_grass"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/endbloom.json b/common/src/generated/resources/assets/biomesoplenty/models/item/endbloom.json
new file mode 100644
index 0000000000..c38f79e6bd
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/endbloom.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/endbloom"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/enderphyte.json b/common/src/generated/resources/assets/biomesoplenty/models/item/enderphyte.json
new file mode 100644
index 0000000000..c1a7b01767
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/enderphyte.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/enderphyte"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/eyebulb.json b/common/src/generated/resources/assets/biomesoplenty/models/item/eyebulb.json
index de08a184fc..eb1ca9aa27 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/eyebulb.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/eyebulb.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/eyebulb_top"
+    "layer0": "biomesoplenty:item/eyebulb"
   }
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/flesh_tendons.json b/common/src/generated/resources/assets/biomesoplenty/models/item/flesh_tendons.json
similarity index 100%
rename from common/src/main/resources/assets/biomesoplenty/models/item/flesh_tendons.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/flesh_tendons.json
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/glowflower.json b/common/src/generated/resources/assets/biomesoplenty/models/item/glowflower.json
new file mode 100644
index 0000000000..6583f0b9a3
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/glowflower.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/glowflower"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/glowshroom.json b/common/src/generated/resources/assets/biomesoplenty/models/item/glowshroom.json
new file mode 100644
index 0000000000..7401e2b306
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/glowshroom.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/glowshroom"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/glowworm_silk.json b/common/src/generated/resources/assets/biomesoplenty/models/item/glowworm_silk.json
new file mode 100644
index 0000000000..74027e01fd
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/glowworm_silk.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/glowworm_silk"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/hair.json b/common/src/generated/resources/assets/biomesoplenty/models/item/hair.json
new file mode 100644
index 0000000000..0454083390
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/hair.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/hair"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/hanging_cobweb.json b/common/src/generated/resources/assets/biomesoplenty/models/item/hanging_cobweb.json
similarity index 100%
rename from common/src/main/resources/assets/biomesoplenty/models/item/hanging_cobweb.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/hanging_cobweb.json
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/high_grass.json b/common/src/generated/resources/assets/biomesoplenty/models/item/high_grass.json
new file mode 100644
index 0000000000..861e69877b
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/high_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/high_grass"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/huge_clover_petal.json b/common/src/generated/resources/assets/biomesoplenty/models/item/huge_clover_petal.json
index e236f3ef2d..9d0b9b0da0 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/huge_clover_petal.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/huge_clover_petal.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/huge_clover_petal"
+    "layer0": "biomesoplenty:item/huge_clover_petal"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
new file mode 100644
index 0000000000..6084b6ae82
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/large_rose_quartz_bud"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/lavender.json b/common/src/generated/resources/assets/biomesoplenty/models/item/lavender.json
new file mode 100644
index 0000000000..9dce268887
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/lavender.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/lavender"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/lumaloop.json b/common/src/generated/resources/assets/biomesoplenty/models/item/lumaloop.json
new file mode 100644
index 0000000000..3a79675054
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/lumaloop.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/lumaloop_plant_lit"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
new file mode 100644
index 0000000000..a4c64d5de2
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/medium_rose_quartz_bud"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/null_plant.json b/common/src/generated/resources/assets/biomesoplenty/models/item/null_plant.json
new file mode 100644
index 0000000000..f81e81aba8
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/null_plant.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/null_plant"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/orange_cosmos.json b/common/src/generated/resources/assets/biomesoplenty/models/item/orange_cosmos.json
new file mode 100644
index 0000000000..8bac5e0e4a
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/orange_cosmos.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/orange_cosmos"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
new file mode 100644
index 0000000000..e7b40efc93
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/orange_maple_leaf_pile"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/pink_daffodil.json b/common/src/generated/resources/assets/biomesoplenty/models/item/pink_daffodil.json
new file mode 100644
index 0000000000..1819d700c5
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/pink_daffodil.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/pink_daffodil"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/pink_hibiscus.json b/common/src/generated/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
new file mode 100644
index 0000000000..6473aeafa5
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/pink_hibiscus"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/pus_bubble.json b/common/src/generated/resources/assets/biomesoplenty/models/item/pus_bubble.json
index 778acc17ad..881cb318bc 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/pus_bubble.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/pus_bubble.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/pus_bubble"
+    "layer0": "biomesoplenty:item/pus_bubble"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
new file mode 100644
index 0000000000..6d8d3dae4e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/red_maple_leaf_pile"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/reed.json b/common/src/generated/resources/assets/biomesoplenty/models/item/reed.json
index 754b7d4595..08ae1026d3 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/reed.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/reed.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/reed_top"
+    "layer0": "biomesoplenty:item/reed"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/rose.json b/common/src/generated/resources/assets/biomesoplenty/models/item/rose.json
new file mode 100644
index 0000000000..78cbc98eeb
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/rose.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/rose"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json b/common/src/generated/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json
similarity index 60%
rename from common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json
index eb59178911..fc0b5cbb5b 100644
--- a/common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/rose_quartz_cluster.json
@@ -2,10 +2,5 @@
   "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "biomesoplenty:block/rose_quartz_cluster"
-  },
-  "display": {
-    "head": {
-      "translation": [ 0, 14, -5 ]
-    }
   }
-}
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/sea_oats.json b/common/src/generated/resources/assets/biomesoplenty/models/item/sea_oats.json
index 70721029bb..3e2e6d0501 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/sea_oats.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/sea_oats.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/sea_oats_top"
+    "layer0": "biomesoplenty:item/sea_oats"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json b/common/src/generated/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
new file mode 100644
index 0000000000..30814200eb
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/small_rose_quartz_bud"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/spanish_moss.json b/common/src/generated/resources/assets/biomesoplenty/models/item/spanish_moss.json
similarity index 100%
rename from common/src/main/resources/assets/biomesoplenty/models/item/spanish_moss.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/spanish_moss.json
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/spider_egg.json b/common/src/generated/resources/assets/biomesoplenty/models/item/spider_egg.json
new file mode 100644
index 0000000000..a934125af6
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/spider_egg.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/spider_egg"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/sprout.json b/common/src/generated/resources/assets/biomesoplenty/models/item/sprout.json
new file mode 100644
index 0000000000..5668f0ee31
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/sprout.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/sprout"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/stringy_cobweb.json b/common/src/generated/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
new file mode 100644
index 0000000000..32e8a18791
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/stringy_cobweb"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/tiny_cactus.json b/common/src/generated/resources/assets/biomesoplenty/models/item/tiny_cactus.json
new file mode 100644
index 0000000000..1bccba9b3e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/tiny_cactus.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/tiny_cactus"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/toadstool.json b/common/src/generated/resources/assets/biomesoplenty/models/item/toadstool.json
new file mode 100644
index 0000000000..2b9416ec30
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/toadstool.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/toadstool"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/tundra_shrub.json b/common/src/generated/resources/assets/biomesoplenty/models/item/tundra_shrub.json
new file mode 100644
index 0000000000..f22e6fd80e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/tundra_shrub.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/tundra_shrub"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/violet.json b/common/src/generated/resources/assets/biomesoplenty/models/item/violet.json
new file mode 100644
index 0000000000..c45c55b2b0
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/violet.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/violet"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/waterlily.json b/common/src/generated/resources/assets/biomesoplenty/models/item/waterlily.json
new file mode 100644
index 0000000000..e33defb626
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/waterlily.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/waterlily"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/webbing.json b/common/src/generated/resources/assets/biomesoplenty/models/item/webbing.json
similarity index 100%
rename from common/src/main/resources/assets/biomesoplenty/models/item/webbing.json
rename to common/src/generated/resources/assets/biomesoplenty/models/item/webbing.json
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/white_lavender.json b/common/src/generated/resources/assets/biomesoplenty/models/item/white_lavender.json
new file mode 100644
index 0000000000..4f5d2a5bd8
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/white_lavender.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/white_lavender"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/white_petals.json b/common/src/generated/resources/assets/biomesoplenty/models/item/white_petals.json
index eb464c4205..37d23aac7a 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/white_petals.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/white_petals.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/white_petals"
+    "layer0": "biomesoplenty:item/white_petals"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/wildflower.json b/common/src/generated/resources/assets/biomesoplenty/models/item/wildflower.json
index 34550d0b1f..484cc1dfaa 100644
--- a/common/src/generated/resources/assets/biomesoplenty/models/item/wildflower.json
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/wildflower.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "biomesoplenty:block/wildflower"
+    "layer0": "biomesoplenty:item/wildflower"
   }
 }
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/wilted_lily.json b/common/src/generated/resources/assets/biomesoplenty/models/item/wilted_lily.json
new file mode 100644
index 0000000000..7ae5fab3b0
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/wilted_lily.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:block/wilted_lily"
+  }
+}
\ No newline at end of file
diff --git a/common/src/generated/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json b/common/src/generated/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
new file mode 100644
index 0000000000..6cb886592e
--- /dev/null
+++ b/common/src/generated/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "biomesoplenty:item/yellow_maple_leaf_pile"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/dead_grass.json b/common/src/main/resources/assets/biomesoplenty/blockstates/dead_grass.json
new file mode 100644
index 0000000000..ea3de02874
--- /dev/null
+++ b/common/src/main/resources/assets/biomesoplenty/blockstates/dead_grass.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "biomesoplenty:block/dead_grass" }
+    }
+}
diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/glowshroom_block.json b/common/src/main/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
deleted file mode 100644
index 4e8f8d7703..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/blockstates/glowshroom_block.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "multipart": [
-        {   "when": { "north": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block", "y": 90, "uvlock": true }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block", "y": 180, "uvlock": true }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block", "y": 270, "uvlock": true }
-        },
-        {   "when": { "up": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block", "x": 270, "uvlock": true }
-        },
-        {   "when": { "down": true },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block", "x": 90, "uvlock": true }
-        },
-        {   "when": { "north": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside" }
-        },
-        {   "when": { "east": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside", "y": 90, "uvlock": false }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside", "y": 180, "uvlock": false }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside", "y": 270, "uvlock": false }
-        },
-        {   "when": { "up": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside", "x": 270, "uvlock": false }
-        },
-        {   "when": { "down": false },
-            "apply": { "model": "biomesoplenty:block/glowshroom_block_inside", "x": 90, "uvlock": false }
-        }
-    ]
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/pus_bubble.json b/common/src/main/resources/assets/biomesoplenty/blockstates/pus_bubble.json
new file mode 100644
index 0000000000..84281e1880
--- /dev/null
+++ b/common/src/main/resources/assets/biomesoplenty/blockstates/pus_bubble.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "biomesoplenty:block/pus_bubble" }
+    }
+}
diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/toadstool_block.json b/common/src/main/resources/assets/biomesoplenty/blockstates/toadstool_block.json
deleted file mode 100644
index 42b80f0a7e..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/blockstates/toadstool_block.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "multipart": [
-        {   "when": { "north": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block", "y": 90, "uvlock": true }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block", "y": 180, "uvlock": true }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block", "y": 270, "uvlock": true }
-        },
-        {   "when": { "up": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block", "x": 270, "uvlock": true }
-        },
-        {   "when": { "down": true },
-            "apply": { "model": "biomesoplenty:block/toadstool_block", "x": 90, "uvlock": true }
-        },
-        {   "when": { "north": false },
-            "apply": { "model": "block/mushroom_block_inside" }
-        },
-        {   "when": { "east": false },
-            "apply": { "model": "block/mushroom_block_inside", "y": 90, "uvlock": false }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "block/mushroom_block_inside", "y": 180, "uvlock": false }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "block/mushroom_block_inside", "y": 270, "uvlock": false }
-        },
-        {   "when": { "up": false },
-            "apply": { "model": "block/mushroom_block_inside", "x": 270, "uvlock": false }
-        },
-        {   "when": { "down": false },
-            "apply": { "model": "block/mushroom_block_inside", "x": 90, "uvlock": false }
-        }
-    ]
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json b/common/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
new file mode 100644
index 0000000000..d8afa3f631
--- /dev/null
+++ b/common/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "biomesoplenty:block/dead_grass"
+    }
+}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block.json b/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block.json
deleted file mode 100644
index 875d571d1e..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "textures": {
-        "texture": "biomesoplenty:block/glowshroom_block",
-        "particle": "biomesoplenty:block/glowshroom_block"
-    },
-    "elements": [
-        {   "from": [ 0, 0, 0 ],
-            "to": [ 16, 16, 0 ],
-            "faces": {
-                "north": { "texture": "#texture", "cullface":"north" }
-            }
-        }
-    ]
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inside.json b/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inside.json
index 0388348d3f..4a1bb55bac 100644
--- a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inside.json
+++ b/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inside.json
@@ -1,7 +1,6 @@
 {
-    "parent": "block/template_single_face",
-    "ambientocclusion": false,
-    "textures": {
-        "texture": "biomesoplenty:block/glowshroom_block_inside"
-    }
-}
+  "parent": "minecraft:block/template_single_face",
+  "textures": {
+    "texture": "biomesoplenty:block/glowshroom_block_inside"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json b/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
deleted file mode 100644
index 3586f40b09..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/block/glowshroom_block_inventory.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "biomesoplenty:block/glowshroom_block"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/pus_bubble.json b/common/src/main/resources/assets/biomesoplenty/models/block/pus_bubble.json
new file mode 100644
index 0000000000..890a38d7d8
--- /dev/null
+++ b/common/src/main/resources/assets/biomesoplenty/models/block/pus_bubble.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "biomesoplenty:block/pus_bubble"
+    }
+}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block.json b/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block.json
deleted file mode 100644
index ab2121dbf3..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "textures": {
-        "texture": "biomesoplenty:block/toadstool_block",
-        "particle": "biomesoplenty:block/toadstool_block"
-    },
-    "elements": [
-        {   "from": [ 0, 0, 0 ],
-            "to": [ 16, 16, 0 ],
-            "faces": {
-                "north": { "texture": "#texture", "cullface":"north" }
-            }
-        }
-    ]
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json b/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
deleted file mode 100644
index a6ad2c2f7b..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/block/toadstool_block_inventory.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "biomesoplenty:block/toadstool_block"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/barnacles.json b/common/src/main/resources/assets/biomesoplenty/models/item/barnacles.json
deleted file mode 100644
index cbdc8db265..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/barnacles.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/barnacles"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_bulb.json b/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
deleted file mode 100644
index 424b6909d0..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_bulb.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/blackstone_bulb"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_spines.json b/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_spines.json
deleted file mode 100644
index 9ba666e70b..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/blackstone_spines.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/blackstone_spines"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/bramble.json b/common/src/main/resources/assets/biomesoplenty/models/item/bramble.json
deleted file mode 100644
index 3ef0870290..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/bramble.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/bramble"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/bramble_leaves.json b/common/src/main/resources/assets/biomesoplenty/models/item/bramble_leaves.json
deleted file mode 100644
index f5568e9dc9..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/bramble_leaves.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/bramble_leaves"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/brimstone_bud.json b/common/src/main/resources/assets/biomesoplenty/models/item/brimstone_bud.json
deleted file mode 100644
index 79c82c9d12..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/brimstone_bud.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/brimstone_bud"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json b/common/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
deleted file mode 100644
index 7a18b0596d..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/burning_blossom"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/bush.json b/common/src/main/resources/assets/biomesoplenty/models/item/bush.json
deleted file mode 100644
index 5a09ecbfa8..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/bush.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/bush"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json b/common/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
deleted file mode 100644
index 42ddc203f1..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/desert_grass"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json b/common/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
deleted file mode 100644
index b93b6a1f85..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/dune_grass"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/endbloom.json b/common/src/main/resources/assets/biomesoplenty/models/item/endbloom.json
deleted file mode 100644
index a29d24ebd0..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/endbloom.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/endbloom"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/enderphyte.json b/common/src/main/resources/assets/biomesoplenty/models/item/enderphyte.json
deleted file mode 100644
index 8503ff5441..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/enderphyte.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/enderphyte"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/glowflower.json b/common/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
deleted file mode 100644
index 1c43f5a0aa..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/glowflower"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json b/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
deleted file mode 100644
index c0b73f3790..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/glowshroom"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom_block.json b/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom_block.json
deleted file mode 100644
index eb2f5c211a..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/glowshroom_block.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "biomesoplenty:block/glowshroom_block_inventory"
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk.json b/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk.json
deleted file mode 100644
index 45fcb795c5..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/glowworm_silk"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk_strand.json b/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk_strand.json
deleted file mode 100644
index 45fcb795c5..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/glowworm_silk_strand.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/glowworm_silk"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/hair.json b/common/src/main/resources/assets/biomesoplenty/models/item/hair.json
deleted file mode 100644
index 1308143571..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/hair.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/hair"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/high_grass_plant.json b/common/src/main/resources/assets/biomesoplenty/models/item/high_grass_plant.json
deleted file mode 100644
index 995d98b682..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/high_grass_plant.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/high_grass"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json b/common/src/main/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
deleted file mode 100644
index 1a2613b596..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/large_rose_quartz_bud.json
+++ /dev/null
@@ -1,11 +0,0 @@
-  {
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/large_rose_quartz_bud"
-  },
-  "display": {
-    "fixed": {
-      "translation": [ 0, 4, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/lavender.json
deleted file mode 100644
index c1c4419a07..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/lavender.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/lavender"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop.json b/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop.json
deleted file mode 100644
index 4a281d2f85..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/lumaloop_plant"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop_plant.json b/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop_plant.json
deleted file mode 100644
index 4a281d2f85..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/lumaloop_plant.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/lumaloop_plant"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json b/common/src/main/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
deleted file mode 100644
index 685aa896ca..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/medium_rose_quartz_bud.json
+++ /dev/null
@@ -1,11 +0,0 @@
-  {
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/medium_rose_quartz_bud"
-  },
-  "display": {
-    "fixed": {
-      "translation": [ 0, 6, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/null_plant.json b/common/src/main/resources/assets/biomesoplenty/models/item/null_plant.json
deleted file mode 100644
index c9845ae62d..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/null_plant.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/null_plant"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json b/common/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
deleted file mode 100644
index 69ea223c78..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/orange_cosmos"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json b/common/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
deleted file mode 100644
index 11db806f03..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/orange_maple_leaf_pile"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json b/common/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
deleted file mode 100644
index 8de775c68c..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/pink_daffodil"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json b/common/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
deleted file mode 100644
index 37b779b9cc..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/pink_hibiscus"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_burning_blossom.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_burning_blossom.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_burning_blossom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_endbloom.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_endbloom.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_endbloom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_fir_sapling.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_fir_sapling.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_fir_sapling.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowflower.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowflower.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowflower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowshroom.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowshroom.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_glowshroom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_lavender.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_lavender.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_orange_cosmos.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_orange_cosmos.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_orange_cosmos.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_daffodil.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_daffodil.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_daffodil.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_hibiscus.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_hibiscus.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_pink_hibiscus.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_rainbow_birch_sapling.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_rainbow_birch_sapling.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_rainbow_birch_sapling.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_rose.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_rose.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_rose.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_snowblossom_sapling.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_snowblossom_sapling.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_snowblossom_sapling.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_sprout.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_sprout.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_sprout.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_tiny_cactus.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_tiny_cactus.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_tiny_cactus.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_toadstool.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_toadstool.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_toadstool.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_umbran_sapling.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_umbran_sapling.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_umbran_sapling.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_violet.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_violet.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_violet.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_wildflower.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_wildflower.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_wildflower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_wilted_lily.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_wilted_lily.json
deleted file mode 100644
index 037d3d6602..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/potted_wilted_lily.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json b/common/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
deleted file mode 100644
index 6d2ba4c990..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/red_maple_leaf_pile"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/rose.json b/common/src/main/resources/assets/biomesoplenty/models/item/rose.json
deleted file mode 100644
index e33354f213..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/rose.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/rose"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_bud.json b/common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_bud.json
deleted file mode 100644
index d3bd628231..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/rose_quartz_bud.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 5, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "thirdperson_righthand": {
-      "translation": [ 0, 4, 1 ],
-      "scale": [ 0.55, 0.55, 0.55 ]
-    },
-    "head": {
-      "translation": [ 0, 14, -5 ]
-    },
-    "gui": {
-      "translation": [ 0, 2, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json b/common/src/main/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
deleted file mode 100644
index 0c6b9950ca..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/small_rose_quartz_bud.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/small_rose_quartz_bud"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/spider_egg.json b/common/src/main/resources/assets/biomesoplenty/models/item/spider_egg.json
deleted file mode 100644
index 05c3226977..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/spider_egg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/spider_egg"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/sprout.json b/common/src/main/resources/assets/biomesoplenty/models/item/sprout.json
deleted file mode 100644
index 9126845c9d..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/sprout.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/sprout"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/stringy_cobweb.json b/common/src/main/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
deleted file mode 100644
index cc84a45658..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/stringy_cobweb.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/stringy_cobweb"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json b/common/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json
deleted file mode 100644
index 6077dc9081..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/tiny_cactus"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/toadstool.json b/common/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
deleted file mode 100644
index 9e8a12764f..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/toadstool"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/toadstool_block.json b/common/src/main/resources/assets/biomesoplenty/models/item/toadstool_block.json
deleted file mode 100644
index 9ce509015e..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/toadstool_block.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "biomesoplenty:block/toadstool_block_inventory"
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/tundra_shrub.json b/common/src/main/resources/assets/biomesoplenty/models/item/tundra_shrub.json
deleted file mode 100644
index 5e6cf55d16..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/tundra_shrub.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/tundra_shrub"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/violet.json b/common/src/main/resources/assets/biomesoplenty/models/item/violet.json
deleted file mode 100644
index e0caba286c..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/violet.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "parent": "biomesoplenty:item/rose_quartz_bud",
-  "textures": {
-    "layer0": "biomesoplenty:block/violet"
-  },
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [ 0, -90, 25 ],
-      "translation": [ 0, 6, 0 ],
-      "scale": [ 0.68, 0.68, 0.68 ]
-    },
-    "fixed": {
-      "translation": [ 0, 7, 0 ]
-    }
-  }
-}
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/waterlily.json b/common/src/main/resources/assets/biomesoplenty/models/item/waterlily.json
deleted file mode 100644
index 17d7f6225c..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/waterlily.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/waterlily"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json
deleted file mode 100644
index 3662f43bf4..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/white_lavender"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json b/common/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
deleted file mode 100644
index f039b9523b..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:block/wilted_lily"
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json b/common/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
deleted file mode 100644
index 83e2aba244..0000000000
--- a/common/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:item/yellow_maple_leaf_pile"
-    }
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 32fe512fcf..cd16bb1e8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,5 +40,5 @@ org.gradle.daemon=false
 
 # Dependencies
 nightconfig_version=3.6.7
-glitchcore_version=2.3.0.1
+glitchcore_version=2.3.0.3
 terrablender_version=4.3.0.0
\ No newline at end of file
diff --git a/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPBlockModelGenerators.java b/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPBlockModelGenerators.java
index bdb948d326..61a42f2388 100644
--- a/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPBlockModelGenerators.java
+++ b/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPBlockModelGenerators.java
@@ -8,16 +8,20 @@
 import biomesoplenty.api.item.BOPItems;
 import biomesoplenty.neoforge.datagen.BOPBlockFamilies;
 import com.google.common.collect.ImmutableMap;
+import net.minecraft.client.color.item.GrassColorSource;
+import net.minecraft.client.color.item.ItemTintSource;
 import net.minecraft.client.data.models.BlockModelGenerators;
 import net.minecraft.client.data.models.ItemModelOutput;
-import net.minecraft.client.data.models.blockstates.BlockStateGenerator;
+import net.minecraft.client.data.models.blockstates.*;
 import net.minecraft.client.data.models.model.*;
 import net.minecraft.data.BlockFamily;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.FoliageColor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -165,35 +169,85 @@ public void run()
         this.createPlantWithDefaultItem(BOPBlocks.SNOWBLOSSOM_SAPLING, BOPBlocks.POTTED_SNOWBLOSSOM_SAPLING, BlockModelGenerators.PlantType.NOT_TINTED);
         this.createPlantWithDefaultItem(BOPBlocks.RAINBOW_BIRCH_SAPLING, BOPBlocks.POTTED_RAINBOW_BIRCH_SAPLING, BlockModelGenerators.PlantType.NOT_TINTED);
 
-        this.createCrossBlockWithDefaultItem(BOPBlocks.PUS_BUBBLE, PlantType.NOT_TINTED);
+        this.createMushroomBlock(BOPBlocks.TOADSTOOL_BLOCK);
+        this.createGlowshroomBlock(BOPBlocks.GLOWSHROOM_BLOCK);
 
         this.createTrivialCube(BOPBlocks.BRIMSTONE);
         this.createWillowVine();
 
-        // Foliage
-        this.createCrossBlockWithDefaultItem(BOPBlocks.DEAD_GRASS, PlantType.NOT_TINTED);
-
         //
         // Items. Ideally the block models should be generated too, but we'll just do the items for now for simplicity's sake
         //
 
         // Double plants
-        this.registerSimpleFlatItemModel(BOPBlocks.EYEBULB, "_top");
         this.registerSimpleFlatItemModel(BOPBlocks.TALL_LAVENDER, "_top");
         this.registerSimpleFlatItemModel(BOPBlocks.TALL_WHITE_LAVENDER, "_top");
         this.registerSimpleFlatItemModel(BOPBlocks.GOLDENROD, "_top");
         this.registerSimpleFlatItemModel(BOPBlocks.BLUE_HYDRANGEA, "_top");
         this.registerSimpleFlatItemModel(BOPBlocks.ICY_IRIS, "_top");
-        this.registerSimpleFlatItemModel(BOPBlocks.BARLEY, "_top");
-        this.registerSimpleFlatItemModel(BOPBlocks.SEA_OATS, "_top");
-        this.registerSimpleFlatItemModel(BOPBlocks.CATTAIL, "_top");
-        this.registerSimpleFlatItemModel(BOPBlocks.REED, "_top");
-        this.registerSimpleFlatItemModel(BOPBlocks.BRIMSTONE_CLUSTER, "_top");
-
-        this.registerSimpleFlatItemModel(BOPBlocks.WILDFLOWER);
-        this.registerSimpleFlatItemModel(BOPBlocks.WHITE_PETALS);
-        this.registerSimpleFlatItemModel(BOPBlocks.CLOVER);
-        this.registerSimpleFlatItemModel(BOPBlocks.HUGE_CLOVER_PETAL);
+        this.registerSimpleFlatItemModel(BOPBlocks.BRIMSTONE_CLUSTER, "_bottom");
+        this.registerSimpleFlatItemModel(BOPBlocks.LUMALOOP, "_plant_lit");
+        this.registerSimpleFlatItemModel(BOPBlocks.SPANISH_MOSS);
+        this.registerSimpleFlatItemModel(BOPBlocks.FLESH_TENDONS);
+        this.registerSimpleFlatItemModel(BOPBlocks.HANGING_COBWEB);
+        this.registerSimpleFlatItemModel(BOPBlocks.WEBBING);
+        this.registerSimpleFlatItemModel(BOPBlocks.DEAD_GRASS);
+        this.registerSimpleFlatItemModel(BOPBlocks.DESERT_GRASS);
+        this.registerSimpleFlatItemModel(BOPBlocks.DUNE_GRASS);
+        this.registerSimpleFlatItemModel(BOPBlocks.TUNDRA_SHRUB);
+        this.registerSimpleFlatItemModel(BOPBlocks.ENDERPHYTE);
+        this.registerSimpleFlatItemModel(BOPBlocks.TINY_CACTUS);
+        this.registerSimpleFlatItemModel(BOPBlocks.TOADSTOOL);
+        this.registerSimpleFlatItemModel(BOPBlocks.GLOWSHROOM);
+        this.registerSimpleFlatItemModel(BOPBlocks.NULL_PLANT);
+        this.registerSimpleFlatItemModel(BOPBlocks.BRIMSTONE_BUD);
+        this.registerSimpleFlatItemModel(BOPBlocks.BLACKSTONE_SPINES);
+        this.registerSimpleFlatItemModel(BOPBlocks.BLACKSTONE_BULB);
+        this.registerSimpleFlatItemModel(BOPBlocks.ROSE_QUARTZ_CLUSTER);
+        this.registerSimpleFlatItemModel(BOPBlocks.LARGE_ROSE_QUARTZ_BUD);
+        this.registerSimpleFlatItemModel(BOPBlocks.MEDIUM_ROSE_QUARTZ_BUD);
+        this.registerSimpleFlatItemModel(BOPBlocks.SMALL_ROSE_QUARTZ_BUD);
+        this.registerSimpleFlatItemModel(BOPBlocks.ROSE);
+        this.registerSimpleFlatItemModel(BOPBlocks.VIOLET);
+        this.registerSimpleFlatItemModel(BOPBlocks.LAVENDER);
+        this.registerSimpleFlatItemModel(BOPBlocks.WHITE_LAVENDER);
+        this.registerSimpleFlatItemModel(BOPBlocks.ORANGE_COSMOS);
+        this.registerSimpleFlatItemModel(BOPBlocks.PINK_HIBISCUS);
+        this.registerSimpleFlatItemModel(BOPBlocks.GLOWFLOWER);
+        this.registerSimpleFlatItemModel(BOPBlocks.WILTED_LILY);
+        this.registerSimpleFlatItemModel(BOPBlocks.BURNING_BLOSSOM);
+        this.registerSimpleFlatItemModel(BOPBlocks.ENDBLOOM);
+
+        this.createTintedItemModel(BOPBlocks.SPROUT, new GrassColorSource());
+        this.createTintedItemModel(BOPBlocks.BUSH, ItemModelUtils.constantTint(-12012264));
+        this.createTintedItemModel(BOPBlocks.BRAMBLE_LEAVES, ItemModelUtils.constantTint(-12012264));
+
+        // Items that use a separate item texture from their block
+        this.createBlockItemModel(BOPBlocks.RED_MAPLE_LEAF_PILE);
+        this.createBlockItemModel(BOPBlocks.ORANGE_MAPLE_LEAF_PILE);
+        this.createBlockItemModel(BOPBlocks.YELLOW_MAPLE_LEAF_PILE);
+        this.createBlockItemModel(BOPBlocks.BRAMBLE);
+        this.createBlockItemModel(BOPBlocks.WILDFLOWER);
+        this.createBlockItemModel(BOPBlocks.WHITE_PETALS);
+        this.createBlockItemModel(BOPBlocks.WATERGRASS);
+        this.createBlockItemModel(BOPBlocks.CATTAIL);
+        this.createBlockItemModel(BOPBlocks.BARLEY);
+        this.createBlockItemModel(BOPBlocks.SEA_OATS);
+        this.createBlockItemModel(BOPBlocks.REED);
+        this.createBlockItemModel(BOPBlocks.SPIDER_EGG);
+        this.createBlockItemModel(BOPBlocks.STRINGY_COBWEB);
+        this.createBlockItemModel(BOPBlocks.PUS_BUBBLE);
+        this.createBlockItemModel(BOPBlocks.EYEBULB);
+        this.createBlockItemModel(BOPBlocks.HAIR);
+        this.createBlockItemModel(BOPBlocks.GLOWWORM_SILK);
+        this.createBlockItemModel(BOPBlocks.BARNACLES);
+        this.createBlockItemModel(BOPBlocks.DEAD_BRANCH);
+        this.createBlockItemModel(BOPBlocks.WATERLILY);
+        this.createBlockItemModel(BOPBlocks.PINK_DAFFODIL);
+        this.createTintedBlockItemModel(BOPBlocks.CLOVER, new GrassColorSource());
+        this.createTintedBlockItemModel(BOPBlocks.HUGE_CLOVER_PETAL, new GrassColorSource());
+        this.createTintedBlockItemModel(BOPBlocks.HIGH_GRASS, new GrassColorSource());
+        this.createTintedBlockItemModel(BOPBlocks.HUGE_LILY_PAD, ItemModelUtils.constantTint(-9321636));
     }
 
     @Override
@@ -210,9 +264,109 @@ public void createWillowVine()
         this.registerSimpleTintedItemModel(BOPBlocks.WILLOW_VINE, resourcelocation, ItemModelUtils.constantTint(FoliageColor.FOLIAGE_DEFAULT));
     }
 
-    public class BOPBlockFamilyProvider extends BlockFamilyProvider
+    public void createBlockItemModel(Block block)
+    {
+        ResourceLocation resourcelocation = this.createFlatItemModel(block.asItem());
+        this.registerSimpleItemModel(block, resourcelocation);
+    }
+
+    public void createTintedBlockItemModel(Block block, ItemTintSource tint)
+    {
+        ResourceLocation resourcelocation = this.createFlatItemModel(block.asItem());
+        this.registerSimpleTintedItemModel(block, resourcelocation, tint);
+    }
+
+    public void createTintedItemModel(Block block, ItemTintSource tint)
+    {
+        ResourceLocation resourcelocation = this.createFlatItemModelWithBlockTexture(block.asItem(), block);
+        this.registerSimpleTintedItemModel(block, resourcelocation, tint);
+    }
+
+    public void createGlowshroomBlock(Block p_388752_)
     {
+        ResourceLocation resourcelocation = ModelTemplates.SINGLE_FACE.create(p_388752_, TextureMapping.defaultTexture(p_388752_), this.modelOutput);
+        ResourceLocation resourcelocation1 = ModelLocationUtils.getModelLocation(p_388752_, "_inside");
+        this.blockStateOutput
+            .accept(
+                MultiPartGenerator.multiPart(p_388752_)
+                    .with(Condition.condition().term(BlockStateProperties.NORTH, true), Variant.variant().with(VariantProperties.MODEL, resourcelocation))
+                    .with(
+                        Condition.condition().term(BlockStateProperties.EAST, true),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)
+                            .with(VariantProperties.UV_LOCK, true)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.SOUTH, true),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)
+                            .with(VariantProperties.UV_LOCK, true)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.WEST, true),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)
+                            .with(VariantProperties.UV_LOCK, true)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.UP, true),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation)
+                            .with(VariantProperties.X_ROT, VariantProperties.Rotation.R270)
+                            .with(VariantProperties.UV_LOCK, true)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.DOWN, true),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation)
+                            .with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)
+                            .with(VariantProperties.UV_LOCK, true)
+                    )
+                    .with(Condition.condition().term(BlockStateProperties.NORTH, false), Variant.variant().with(VariantProperties.MODEL, resourcelocation1))
+                    .with(
+                        Condition.condition().term(BlockStateProperties.EAST, false),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation1)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R90)
+                            .with(VariantProperties.UV_LOCK, false)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.SOUTH, false),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation1)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R180)
+                            .with(VariantProperties.UV_LOCK, false)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.WEST, false),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation1)
+                            .with(VariantProperties.Y_ROT, VariantProperties.Rotation.R270)
+                            .with(VariantProperties.UV_LOCK, false)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.UP, false),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation1)
+                            .with(VariantProperties.X_ROT, VariantProperties.Rotation.R270)
+                            .with(VariantProperties.UV_LOCK, false)
+                    )
+                    .with(
+                        Condition.condition().term(BlockStateProperties.DOWN, false),
+                        Variant.variant()
+                            .with(VariantProperties.MODEL, resourcelocation1)
+                            .with(VariantProperties.X_ROT, VariantProperties.Rotation.R90)
+                            .with(VariantProperties.UV_LOCK, false)
+                    )
+            );
+        this.registerSimpleItemModel(p_388752_, TexturedModel.CUBE.createWithSuffix(p_388752_, "_inventory", this.modelOutput));
+    }
 
+    public class BOPBlockFamilyProvider extends BlockFamilyProvider
+    {
         public BOPBlockFamilyProvider(TextureMapping p_388151_)
         {
             super(p_388151_);
diff --git a/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPItemModelGenerators.java b/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPItemModelGenerators.java
index d2dbaeaa7f..02836a5e19 100644
--- a/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPItemModelGenerators.java
+++ b/neoforge/src/main/java/biomesoplenty/neoforge/datagen/model/BOPItemModelGenerators.java
@@ -35,10 +35,6 @@ public void run()
         this.generateFlatItem(BOPItems.LIQUID_NULL_BUCKET, ModelTemplates.FLAT_ITEM);
         this.generateFlatItem(BOPItems.MUSIC_DISC_WANDERER, ModelTemplates.FLAT_ITEM);
 
-        // These should probably be under blocks
-        this.generateFlatItem(BOPItems.HUGE_LILY_PAD, ModelTemplates.FLAT_ITEM);
-        this.generateFlatItem(BOPItems.WATERGRASS, ModelTemplates.FLAT_ITEM);
-
         this.generateFlatItem(BOPItems.FIR_BOAT, ModelTemplates.FLAT_ITEM);
         this.generateFlatItem(BOPItems.PINE_BOAT, ModelTemplates.FLAT_ITEM);
         this.generateFlatItem(BOPItems.MAPLE_BOAT, ModelTemplates.FLAT_ITEM);