diff --git a/src/main/generated/data/c/tags/block/flowers.json b/src/main/generated/data/c/tags/block/flowers.json new file mode 100644 index 0000000000..6aba969a51 --- /dev/null +++ b/src/main/generated/data/c/tags/block/flowers.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:flowering_azalea_leaves", + "minecraft:flowering_azalea", + "minecraft:mangrove_propagule", + "minecraft:pink_petals", + "minecraft:chorus_flower", + "minecraft:spore_blossom", + "#c:flowers/small", + "#c:flowers/tall", + { + "id": "#minecraft:flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/flowers/small.json b/src/main/generated/data/c/tags/block/flowers/small.json new file mode 100644 index 0000000000..bdd6b47dd1 --- /dev/null +++ b/src/main/generated/data/c/tags/block/flowers/small.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:dandelion", + "minecraft:poppy", + "minecraft:blue_orchid", + "minecraft:allium", + "minecraft:azure_bluet", + "minecraft:red_tulip", + "minecraft:orange_tulip", + "minecraft:white_tulip", + "minecraft:pink_tulip", + "minecraft:oxeye_daisy", + "minecraft:cornflower", + "minecraft:lily_of_the_valley", + "minecraft:wither_rose", + "minecraft:torchflower", + "minecraft:open_eyeblossom", + "minecraft:closed_eyeblossom", + { + "id": "#minecraft:small_flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/flowers/tall.json b/src/main/generated/data/c/tags/block/flowers/tall.json new file mode 100644 index 0000000000..1944a475be --- /dev/null +++ b/src/main/generated/data/c/tags/block/flowers/tall.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:sunflower", + "minecraft:lilac", + "minecraft:peony", + "minecraft:rose_bush", + "minecraft:pitcher_plant", + { + "id": "minecraft:tall_flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/flowers.json b/src/main/generated/data/c/tags/item/flowers.json new file mode 100644 index 0000000000..6aba969a51 --- /dev/null +++ b/src/main/generated/data/c/tags/item/flowers.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:flowering_azalea_leaves", + "minecraft:flowering_azalea", + "minecraft:mangrove_propagule", + "minecraft:pink_petals", + "minecraft:chorus_flower", + "minecraft:spore_blossom", + "#c:flowers/small", + "#c:flowers/tall", + { + "id": "#minecraft:flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/flowers/small.json b/src/main/generated/data/c/tags/item/flowers/small.json new file mode 100644 index 0000000000..bdd6b47dd1 --- /dev/null +++ b/src/main/generated/data/c/tags/item/flowers/small.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:dandelion", + "minecraft:poppy", + "minecraft:blue_orchid", + "minecraft:allium", + "minecraft:azure_bluet", + "minecraft:red_tulip", + "minecraft:orange_tulip", + "minecraft:white_tulip", + "minecraft:pink_tulip", + "minecraft:oxeye_daisy", + "minecraft:cornflower", + "minecraft:lily_of_the_valley", + "minecraft:wither_rose", + "minecraft:torchflower", + "minecraft:open_eyeblossom", + "minecraft:closed_eyeblossom", + { + "id": "#minecraft:small_flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/flowers/tall.json b/src/main/generated/data/c/tags/item/flowers/tall.json new file mode 100644 index 0000000000..1944a475be --- /dev/null +++ b/src/main/generated/data/c/tags/item/flowers/tall.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:sunflower", + "minecraft:lilac", + "minecraft:peony", + "minecraft:rose_bush", + "minecraft:pitcher_plant", + { + "id": "minecraft:tall_flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index d2f40eaebd..16f0ce75b6 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -164,6 +164,22 @@ public class Tags { public static final TagKey DYED_WHITE = cTag("dyed/white"); public static final TagKey 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 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 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 FLOWERS = cTag("flowers"); + public static final TagKey GLASS_BLOCKS = cTag("glass_blocks"); public static final TagKey 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 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 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 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 FLOWERS = cTag("flowers"); public static final TagKey FOODS = cTag("foods"); /** * Apples and other foods that are considered fruits in the culinary field belong in this tag. diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index f3c22aaf4d..1d191596cf 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -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")); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 858109d2e5..cb16c2310c 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -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);