Add c:flowers, c:flowers/tall, and c:flowers/small block and item tags (#10335)

Co-authored-by: TelepathicGrunt <[email protected]>
This commit is contained in:
Paint_NinjaandTelepathicGrunt authored and GitHub committed 2025-01-25 20:55:58 +00:00
1 parent 3c5a534b7a
commit 762f6a7d78
9 files changed
+150

No files matched your search

@@ -164,6 +164,22 @@ public class Tags {
public static final TagKey<Block> DYED_WHITE = cTag("dyed/white");
public static final TagKey<Block> DYED_YELLOW = cTag("dyed/yellow");
/**
* Contains living ground-based flowers that are 1 block tall such as Dandelions or Poppy.
* Equivalent to the {@code minecraft:small_flowers} block tag.
*/
public static final TagKey<Block> FLOWERS_SMALL = cTag("flowers/small");
/**
* Contains living ground-based flowers that are 2 block tall such as Rose Bush or Peony.
* Equivalent to the {@code minecraft:tall_flowers} block tag in past Minecraft versions.
*/
public static final TagKey<Block> FLOWERS_TALL = cTag("flowers/tall");
/**
* Contains any living plant block that contains flowers or is a flower itself.
* Equivalent to the {@code minecraft:flowers} block tag.
*/
public static final TagKey<Block> FLOWERS = cTag("flowers");
public static final TagKey<Block> GLASS_BLOCKS = cTag("glass_blocks");
public static final TagKey<Block> GLASS_BLOCKS_COLORLESS = cTag("glass_blocks/colorless");
/**
@@ -615,6 +631,21 @@ public class Tags {
* For bonemeal-like items that can grow plants.
*/
public static final TagKey<Item> FERTILIZERS = cTag("fertilizers");
/**
* Contains living ground-based flowers that are 1 block tall such as Dandelions or Poppy.
* Equivalent to the {@code minecraft:small_flowers} item tag.
*/
public static final TagKey<Item> FLOWERS_SMALL = cTag("flowers/small");
/**
* Contains living ground-based flowers that are 2 block tall such as Rose Bush or Peony.
* Equivalent to the {@code minecraft:tall_flowers} item tag in past Minecraft versions.
*/
public static final TagKey<Item> FLOWERS_TALL = cTag("flowers/tall");
/**
* Contains any living plant block that contains flowers or is a flower itself.
* Equivalent to the {@code minecraft:flowers} item tag in past Minecraft versions.
*/
public static final TagKey<Item> FLOWERS = cTag("flowers");
public static final TagKey<Item> FOODS = cTag("foods");
/**
* Apples and other foods that are considered fruits in the culinary field belong in this tag.
@@ -85,6 +85,16 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider {
tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN); // forge:fences
tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); // forge:fences/nether_brick
tag(FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES); // forge:fences/wooden
tag(Tags.Blocks.FLOWERS_SMALL)
.add(Blocks.DANDELION, Blocks.POPPY, Blocks.BLUE_ORCHID, Blocks.ALLIUM, Blocks.AZURE_BLUET, Blocks.RED_TULIP, Blocks.ORANGE_TULIP, Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.OXEYE_DAISY, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, Blocks.WITHER_ROSE, Blocks.TORCHFLOWER, Blocks.OPEN_EYEBLOSSOM, Blocks.CLOSED_EYEBLOSSOM)
.addOptionalTag(BlockTags.SMALL_FLOWERS);
tag(Tags.Blocks.FLOWERS_TALL)
.add(Blocks.SUNFLOWER, Blocks.LILAC, Blocks.PEONY, Blocks.ROSE_BUSH, Blocks.PITCHER_PLANT)
.addOptional(ResourceLocation.withDefaultNamespace("tall_flowers"));
tag(Tags.Blocks.FLOWERS)
.add(Blocks.FLOWERING_AZALEA_LEAVES, Blocks.FLOWERING_AZALEA, Blocks.MANGROVE_PROPAGULE, Blocks.PINK_PETALS, Blocks.CHORUS_FLOWER, Blocks.SPORE_BLOSSOM)
.addTags(Tags.Blocks.FLOWERS_SMALL, Tags.Blocks.FLOWERS_TALL)
.addOptionalTag(BlockTags.FLOWERS);
tag(GLASS_BLOCKS)
.addTags(GLASS_BLOCKS_COLORLESS, GLASS_BLOCKS_CHEAP, GLASS_BLOCKS_TINTED)
.addOptionalTag(forgeTagKey("glass"));
@@ -132,6 +132,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider {
copy(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK);
copy(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN);
tag(Tags.Items.FERTILIZERS).add(Items.BONE_MEAL);
copy(Tags.Blocks.FLOWERS_SMALL, Tags.Items.FLOWERS_SMALL);
copy(Tags.Blocks.FLOWERS_TALL, Tags.Items.FLOWERS_TALL);
copy(Tags.Blocks.FLOWERS, Tags.Items.FLOWERS);
tag(Tags.Items.FOODS_FRUIT).add(Items.APPLE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.CHORUS_FRUIT, Items.MELON_SLICE);
tag(Tags.Items.FOODS_VEGETABLE).add(Items.CARROT, Items.GOLDEN_CARROT, Items.POTATO, Items.BEETROOT);
tag(Tags.Items.FOODS_BERRY).add(Items.SWEET_BERRIES, Items.GLOW_BERRIES);