From de3d77dbc74a4036b7dc2de0d493b4f23924dbd5 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Wed, 21 Aug 2024 20:08:18 -0400 Subject: [PATCH] - Add Block and Item Tags for Alliums, Roses, Tulips, Amaranth, Sages and Daffodils - Remove Winter Succulent and HorseWeed from small flowers tag - Add Flowering Leaves and Flowering Bushes to Minecraft FlowerTag Closes #88 --- CHANGELOG.md | 3 ++ .../tags/blocks/flowers/alliums.json | 7 ++++ .../blocks/flowers/alliums/flower_bushes.json | 7 ++++ .../tags/blocks/flowers/alliums/short.json | 7 ++++ .../tags/blocks/flowers/alliums/tall.json | 7 ++++ .../tags/blocks/flowers/amaranth.json | 9 +++++ .../tags/blocks/flowers/daffodils.json | 7 ++++ .../tags/blocks/flowers/roses.json | 9 +++++ .../tags/blocks/flowers/sages.json | 7 ++++ .../tags/blocks/flowers/tulips.json | 13 +++++++ .../tags/items/flowers/alliums.json | 7 ++++ .../items/flowers/alliums/flower_bushes.json | 7 ++++ .../tags/items/flowers/alliums/short.json | 7 ++++ .../tags/items/flowers/alliums/tall.json | 7 ++++ .../tags/items/flowers/amaranth.json | 9 +++++ .../tags/items/flowers/daffodils.json | 7 ++++ .../tags/items/flowers/roses.json | 9 +++++ .../tags/items/flowers/sages.json | 7 ++++ .../tags/items/flowers/tulips.json | 13 +++++++ .../data/minecraft/tags/blocks/flowers.json | 10 +++++ .../minecraft/tags/blocks/small_flowers.json | 37 +++++-------------- .../data/minecraft/tags/items/flowers.json | 10 +++++ .../minecraft/tags/items/small_flowers.json | 37 +++++-------------- .../biomeswevegone/tags/BWGBlockTags.java | 9 +++++ .../biomeswevegone/tags/BWGItemTags.java | 10 +++++ .../datagen/generators/TagsGenerator.java | 31 +++++++++++++++- 26 files changed, 237 insertions(+), 56 deletions(-) create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/flower_bushes.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/short.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/tall.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/amaranth.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/daffodils.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/roses.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/sages.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/tulips.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/flower_bushes.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/short.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/tall.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/amaranth.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/daffodils.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/roses.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/sages.json create mode 100644 Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/tulips.json diff --git a/CHANGELOG.md b/CHANGELOG.md index d6ec7de7..69578008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - Use Processor on Skyris Mason, Skyris Fletcher House - Remove Duplicate Skyris Butcher Shop Entry from Template Pool - Update Chinese Language File (ZH_CN) +- Add Block and Item Tags for Alliums, Roses, Tulips, Amaranth, Sages and Daffodils +- Remove Winter Succulent and HorseWeed from small flowers tag +- Add Flowering Leaves and Flowering Bushes to Minecraft FlowerTag # 1.1.1-Beta - Remove a bunch of unneeded stuff diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums.json new file mode 100644 index 00000000..21ab112e --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#biomeswevegone:flowers/alliums/flower_bushes", + "#biomeswevegone:flowers/alliums/short", + "#biomeswevegone:flowers/alliums/tall" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/flower_bushes.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/flower_bushes.json new file mode 100644 index 00000000..b5ce94b0 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/flower_bushes.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:allium_flower_bush", + "biomeswevegone:pink_allium_flower_bush", + "biomeswevegone:white_allium_flower_bush" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/short.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/short.json new file mode 100644 index 00000000..8a4e6e77 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/short.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:pink_allium", + "biomeswevegone:white_allium", + "minecraft:allium" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/tall.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/tall.json new file mode 100644 index 00000000..bca603e5 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/tall.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:tall_allium", + "biomeswevegone:tall_pink_allium", + "biomeswevegone:tall_white_allium" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/amaranth.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/amaranth.json new file mode 100644 index 00000000..a5370c5e --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/amaranth.json @@ -0,0 +1,9 @@ +{ + "values": [ + "biomeswevegone:amaranth", + "biomeswevegone:cyan_amaranth", + "biomeswevegone:magenta_amaranth", + "biomeswevegone:orange_amaranth", + "biomeswevegone:purple_amaranth" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/daffodils.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/daffodils.json new file mode 100644 index 00000000..a4615b9b --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/daffodils.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:daffodil", + "biomeswevegone:pink_daffodil", + "biomeswevegone:yellow_daffodil" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/roses.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/roses.json new file mode 100644 index 00000000..0a0ba384 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/roses.json @@ -0,0 +1,9 @@ +{ + "values": [ + "biomeswevegone:black_rose", + "biomeswevegone:cyan_rose", + "biomeswevegone:osiria_rose", + "biomeswevegone:rose", + "biomeswevegone:winter_rose" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/sages.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/sages.json new file mode 100644 index 00000000..be312fd9 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/sages.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:blue_sage", + "biomeswevegone:purple_sage", + "biomeswevegone:white_sage" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/tulips.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/tulips.json new file mode 100644 index 00000000..684482b5 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/tulips.json @@ -0,0 +1,13 @@ +{ + "values": [ + "biomeswevegone:cyan_tulip", + "biomeswevegone:green_tulip", + "biomeswevegone:magenta_tulip", + "biomeswevegone:purple_tulip", + "biomeswevegone:yellow_tulip", + "minecraft:orange_tulip", + "minecraft:pink_tulip", + "minecraft:red_tulip", + "minecraft:white_tulip" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums.json new file mode 100644 index 00000000..21ab112e --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#biomeswevegone:flowers/alliums/flower_bushes", + "#biomeswevegone:flowers/alliums/short", + "#biomeswevegone:flowers/alliums/tall" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/flower_bushes.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/flower_bushes.json new file mode 100644 index 00000000..b5ce94b0 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/flower_bushes.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:allium_flower_bush", + "biomeswevegone:pink_allium_flower_bush", + "biomeswevegone:white_allium_flower_bush" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/short.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/short.json new file mode 100644 index 00000000..8a4e6e77 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/short.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:pink_allium", + "biomeswevegone:white_allium", + "minecraft:allium" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/tall.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/tall.json new file mode 100644 index 00000000..bca603e5 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/tall.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:tall_allium", + "biomeswevegone:tall_pink_allium", + "biomeswevegone:tall_white_allium" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/amaranth.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/amaranth.json new file mode 100644 index 00000000..a5370c5e --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/amaranth.json @@ -0,0 +1,9 @@ +{ + "values": [ + "biomeswevegone:amaranth", + "biomeswevegone:cyan_amaranth", + "biomeswevegone:magenta_amaranth", + "biomeswevegone:orange_amaranth", + "biomeswevegone:purple_amaranth" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/daffodils.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/daffodils.json new file mode 100644 index 00000000..a4615b9b --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/daffodils.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:daffodil", + "biomeswevegone:pink_daffodil", + "biomeswevegone:yellow_daffodil" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/roses.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/roses.json new file mode 100644 index 00000000..0a0ba384 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/roses.json @@ -0,0 +1,9 @@ +{ + "values": [ + "biomeswevegone:black_rose", + "biomeswevegone:cyan_rose", + "biomeswevegone:osiria_rose", + "biomeswevegone:rose", + "biomeswevegone:winter_rose" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/sages.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/sages.json new file mode 100644 index 00000000..be312fd9 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/sages.json @@ -0,0 +1,7 @@ +{ + "values": [ + "biomeswevegone:blue_sage", + "biomeswevegone:purple_sage", + "biomeswevegone:white_sage" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/tulips.json b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/tulips.json new file mode 100644 index 00000000..684482b5 --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/tulips.json @@ -0,0 +1,13 @@ +{ + "values": [ + "biomeswevegone:cyan_tulip", + "biomeswevegone:green_tulip", + "biomeswevegone:magenta_tulip", + "biomeswevegone:purple_tulip", + "biomeswevegone:yellow_tulip", + "minecraft:orange_tulip", + "minecraft:pink_tulip", + "minecraft:red_tulip", + "minecraft:white_tulip" + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/minecraft/tags/blocks/flowers.json b/Common/src/main/generated/resources/data/minecraft/tags/blocks/flowers.json index 4ea50822..3b147cf4 100644 --- a/Common/src/main/generated/resources/data/minecraft/tags/blocks/flowers.json +++ b/Common/src/main/generated/resources/data/minecraft/tags/blocks/flowers.json @@ -1,8 +1,18 @@ { "values": [ "biomeswevegone:flower_patch", + "biomeswevegone:flowering_baobab_leaves", "biomeswevegone:flowering_barrel_cactus", + "biomeswevegone:flowering_indigo_jacaranda_bush", + "biomeswevegone:flowering_indigo_jacaranda_leaves", + "biomeswevegone:flowering_ironwood_leaves", + "biomeswevegone:flowering_jacaranda_bush", + "biomeswevegone:flowering_jacaranda_leaves", + "biomeswevegone:flowering_orchard_leaves", + "biomeswevegone:flowering_palo_verde_leaves", + "biomeswevegone:flowering_skyris_leaves", "biomeswevegone:flowering_tiny_lily_pads", + "biomeswevegone:flowering_yucca_leaves", "biomeswevegone:white_sakura_petals", "biomeswevegone:yellow_sakura_petals" ] diff --git a/Common/src/main/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/Common/src/main/generated/resources/data/minecraft/tags/blocks/small_flowers.json index b35042a9..e2432889 100644 --- a/Common/src/main/generated/resources/data/minecraft/tags/blocks/small_flowers.json +++ b/Common/src/main/generated/resources/data/minecraft/tags/blocks/small_flowers.json @@ -1,52 +1,35 @@ { "values": [ - "biomeswevegone:allium_flower_bush", + "#biomeswevegone:flowers/alliums/short", + "#biomeswevegone:flowers/amaranth", + "#biomeswevegone:flowers/daffodils", + "#biomeswevegone:flowers/roses", + "#biomeswevegone:flowers/sages", + "#biomeswevegone:flowers/tulips", "biomeswevegone:alpine_bellflower", - "biomeswevegone:amaranth", "biomeswevegone:angelica", "biomeswevegone:begonia", "biomeswevegone:bistort", - "biomeswevegone:black_rose", - "biomeswevegone:blue_sage", "biomeswevegone:california_poppy", "biomeswevegone:crocus", - "biomeswevegone:cyan_amaranth", - "biomeswevegone:cyan_rose", - "biomeswevegone:cyan_tulip", - "biomeswevegone:daffodil", "biomeswevegone:fairy_slipper", - "biomeswevegone:green_tulip", "biomeswevegone:guzmania", - "biomeswevegone:horseweed", "biomeswevegone:incan_lily", "biomeswevegone:iris", "biomeswevegone:kovan_flower", "biomeswevegone:lazarus_bellflower", "biomeswevegone:lollipop_flower", - "biomeswevegone:magenta_amaranth", - "biomeswevegone:magenta_tulip", - "biomeswevegone:orange_amaranth", "biomeswevegone:orange_daisy", - "biomeswevegone:osiria_rose", "biomeswevegone:peach_leather_flower", - "biomeswevegone:pink_allium", - "biomeswevegone:pink_allium_flower_bush", "biomeswevegone:pink_anemone", - "biomeswevegone:pink_daffodil", "biomeswevegone:protea_flower", - "biomeswevegone:purple_amaranth", - "biomeswevegone:purple_sage", - "biomeswevegone:purple_tulip", + "biomeswevegone:protea_flower", "biomeswevegone:richea", - "biomeswevegone:rose", "biomeswevegone:silver_vase_flower", + "biomeswevegone:snowdrops", "biomeswevegone:violet_leather_flower", - "biomeswevegone:white_allium", - "biomeswevegone:white_allium_flower_bush", "biomeswevegone:white_anemone", - "biomeswevegone:white_sage", - "biomeswevegone:winter_succulent", - "biomeswevegone:yellow_daffodil", - "biomeswevegone:yellow_tulip" + "biomeswevegone:winter_cyclamen", + "biomeswevegone:winter_scilla" ] } \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/minecraft/tags/items/flowers.json b/Common/src/main/generated/resources/data/minecraft/tags/items/flowers.json index 4ea50822..3b147cf4 100644 --- a/Common/src/main/generated/resources/data/minecraft/tags/items/flowers.json +++ b/Common/src/main/generated/resources/data/minecraft/tags/items/flowers.json @@ -1,8 +1,18 @@ { "values": [ "biomeswevegone:flower_patch", + "biomeswevegone:flowering_baobab_leaves", "biomeswevegone:flowering_barrel_cactus", + "biomeswevegone:flowering_indigo_jacaranda_bush", + "biomeswevegone:flowering_indigo_jacaranda_leaves", + "biomeswevegone:flowering_ironwood_leaves", + "biomeswevegone:flowering_jacaranda_bush", + "biomeswevegone:flowering_jacaranda_leaves", + "biomeswevegone:flowering_orchard_leaves", + "biomeswevegone:flowering_palo_verde_leaves", + "biomeswevegone:flowering_skyris_leaves", "biomeswevegone:flowering_tiny_lily_pads", + "biomeswevegone:flowering_yucca_leaves", "biomeswevegone:white_sakura_petals", "biomeswevegone:yellow_sakura_petals" ] diff --git a/Common/src/main/generated/resources/data/minecraft/tags/items/small_flowers.json b/Common/src/main/generated/resources/data/minecraft/tags/items/small_flowers.json index b35042a9..e2432889 100644 --- a/Common/src/main/generated/resources/data/minecraft/tags/items/small_flowers.json +++ b/Common/src/main/generated/resources/data/minecraft/tags/items/small_flowers.json @@ -1,52 +1,35 @@ { "values": [ - "biomeswevegone:allium_flower_bush", + "#biomeswevegone:flowers/alliums/short", + "#biomeswevegone:flowers/amaranth", + "#biomeswevegone:flowers/daffodils", + "#biomeswevegone:flowers/roses", + "#biomeswevegone:flowers/sages", + "#biomeswevegone:flowers/tulips", "biomeswevegone:alpine_bellflower", - "biomeswevegone:amaranth", "biomeswevegone:angelica", "biomeswevegone:begonia", "biomeswevegone:bistort", - "biomeswevegone:black_rose", - "biomeswevegone:blue_sage", "biomeswevegone:california_poppy", "biomeswevegone:crocus", - "biomeswevegone:cyan_amaranth", - "biomeswevegone:cyan_rose", - "biomeswevegone:cyan_tulip", - "biomeswevegone:daffodil", "biomeswevegone:fairy_slipper", - "biomeswevegone:green_tulip", "biomeswevegone:guzmania", - "biomeswevegone:horseweed", "biomeswevegone:incan_lily", "biomeswevegone:iris", "biomeswevegone:kovan_flower", "biomeswevegone:lazarus_bellflower", "biomeswevegone:lollipop_flower", - "biomeswevegone:magenta_amaranth", - "biomeswevegone:magenta_tulip", - "biomeswevegone:orange_amaranth", "biomeswevegone:orange_daisy", - "biomeswevegone:osiria_rose", "biomeswevegone:peach_leather_flower", - "biomeswevegone:pink_allium", - "biomeswevegone:pink_allium_flower_bush", "biomeswevegone:pink_anemone", - "biomeswevegone:pink_daffodil", "biomeswevegone:protea_flower", - "biomeswevegone:purple_amaranth", - "biomeswevegone:purple_sage", - "biomeswevegone:purple_tulip", + "biomeswevegone:protea_flower", "biomeswevegone:richea", - "biomeswevegone:rose", "biomeswevegone:silver_vase_flower", + "biomeswevegone:snowdrops", "biomeswevegone:violet_leather_flower", - "biomeswevegone:white_allium", - "biomeswevegone:white_allium_flower_bush", "biomeswevegone:white_anemone", - "biomeswevegone:white_sage", - "biomeswevegone:winter_succulent", - "biomeswevegone:yellow_daffodil", - "biomeswevegone:yellow_tulip" + "biomeswevegone:winter_cyclamen", + "biomeswevegone:winter_scilla" ] } \ No newline at end of file diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGBlockTags.java b/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGBlockTags.java index dd6b9fca..af66fb7c 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGBlockTags.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGBlockTags.java @@ -17,6 +17,15 @@ public class BWGBlockTags { public static final TagKey SNOWY_PLANT_PLACEABLE = create("snowy_plant_placeable"); public static final TagKey BWG_MUSHROOM_PLACEABLE = create("bwg_mushroom_placeable"); public static final TagKey HYDRANGEA_BUSH_PLACEABLE = create("hydrangea_bush_placeable"); + public static final TagKey TALL_ALLIUMS = create("flowers/alliums/tall"); + public static final TagKey SHORT_ALLIUMS = create("flowers/alliums/short"); + public static final TagKey ALLIUM_FLOWER_BUSHES = create("flowers/alliums/flower_bushes"); + public static final TagKey ALLIUMS = create("flowers/alliums"); + public static final TagKey ROSES = create("flowers/roses"); + public static final TagKey TULIPS = create("flowers/tulips"); + public static final TagKey AMARANTH = create("flowers/amaranth"); + public static final TagKey SAGES = create("flowers/sages"); + public static final TagKey DAFFODILS = create("flowers/daffodils"); private static TagKey create(String name) { return TagKey.create(Registries.BLOCK, BiomesWeveGone.id(name)); diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGItemTags.java b/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGItemTags.java index f4242237..c23a5cf1 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGItemTags.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGItemTags.java @@ -17,6 +17,16 @@ public class BWGItemTags { public static final TagKey BOREALIS_ICE = create("borealis_ice"); public static final TagKey PALO_VERDE_LOGS = create("palo_verde_logs"); + public static final TagKey TALL_ALLIUMS = create("flowers/alliums/tall"); + public static final TagKey SHORT_ALLIUMS = create("flowers/alliums/short"); + public static final TagKey ALLIUM_FLOWER_BUSHES = create("flowers/alliums/flower_bushes"); + public static final TagKey ALLIUMS = create("flowers/alliums"); + public static final TagKey ROSES = create("flowers/roses"); + public static final TagKey TULIPS = create("flowers/tulips"); + public static final TagKey AMARANTH = create("flowers/amaranth"); + public static final TagKey SAGES = create("flowers/sages"); + public static final TagKey DAFFODILS = create("flowers/daffodils"); + public static final TagKey MAKES_BLACK_DYE = create("dye/makes_black_dye"); public static final TagKey MAKES_BLUE_DYE = create("dye/makes_blue_dye"); public static final TagKey MAKES_BROWN_DYE = create("dye/makes_brown_dye"); diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java index b34382f8..83822922 100644 --- a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java +++ b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java @@ -116,7 +116,25 @@ else if (blocks.get() instanceof LeavesBlock) { tag(Tags.Blocks.SAND).addTag(set.getSandBlockTag()); }); - tag(BlockTags.FLOWERS).add(BWGBlocks.FLOWER_PATCH.get(), BWGBlocks.WHITE_SAKURA_PETALS.get(), BWGBlocks.YELLOW_SAKURA_PETALS.get(), BWGBlocks.FLOWERING_BARREL_CACTUS.get(), BWGBlocks.FLOWERING_TINY_LILY_PADS.get()); + tag(BWGBlockTags.TALL_ALLIUMS).add(BWGBlocks.TALL_ALLIUM.get(), BWGBlocks.TALL_PINK_ALLIUM.get(), BWGBlocks.TALL_WHITE_ALLIUM.get()); + tag(BWGBlockTags.SHORT_ALLIUMS).add(Blocks.ALLIUM, BWGBlocks.PINK_ALLIUM.getBlock(), BWGBlocks.WHITE_ALLIUM.getBlock()); + tag(BWGBlockTags.ALLIUM_FLOWER_BUSHES).add(BWGBlocks.ALLIUM_FLOWER_BUSH.getBlock(), BWGBlocks.PINK_ALLIUM_FLOWER_BUSH.getBlock(), BWGBlocks.WHITE_ALLIUM_FLOWER_BUSH.getBlock()); + tag(BWGBlockTags.ALLIUMS).addTag(BWGBlockTags.TALL_ALLIUMS).addTag(BWGBlockTags.SHORT_ALLIUMS).addTag(BWGBlockTags.ALLIUM_FLOWER_BUSHES); + tag(BWGBlockTags.ROSES).add(BWGBlocks.ROSE.getBlock(), BWGBlocks.OSIRIA_ROSE.getBlock(), BWGBlocks.BLACK_ROSE.getBlock(), BWGBlocks.CYAN_ROSE.getBlock(), BWGBlocks.WINTER_ROSE.getBlock()); + tag(BWGBlockTags.TULIPS).add(Blocks.ORANGE_TULIP, Blocks.PINK_TULIP, Blocks.RED_TULIP, Blocks.WHITE_TULIP, BWGBlocks.CYAN_TULIP.getBlock(), BWGBlocks.GREEN_TULIP.getBlock(), BWGBlocks.MAGENTA_TULIP.getBlock(), BWGBlocks.PURPLE_TULIP.getBlock(), BWGBlocks.YELLOW_TULIP.getBlock()); + tag(BWGBlockTags.AMARANTH).add(BWGBlocks.AMARANTH.getBlock(), BWGBlocks.CYAN_AMARANTH.getBlock(), BWGBlocks.MAGENTA_AMARANTH.getBlock(), BWGBlocks.ORANGE_AMARANTH.getBlock(), BWGBlocks.PURPLE_AMARANTH.getBlock()); + tag(BWGBlockTags.SAGES).add(BWGBlocks.BLUE_SAGE.getBlock(), BWGBlocks.PURPLE_SAGE.getBlock(), BWGBlocks.WHITE_SAGE.getBlock()); + tag(BWGBlockTags.DAFFODILS).add(BWGBlocks.DAFFODIL.getBlock(), BWGBlocks.PINK_DAFFODIL.getBlock(), BWGBlocks.YELLOW_DAFFODIL.getBlock()); + tag(BlockTags.SMALL_FLOWERS).addTag(BWGBlockTags.SHORT_ALLIUMS).addTag(BWGBlockTags.ROSES).addTag(BWGBlockTags.TULIPS).addTag(BWGBlockTags.AMARANTH).addTag(BWGBlockTags.SAGES).addTag(BWGBlockTags.DAFFODILS) + .add(BWGBlocks.PINK_ANEMONE.getBlock(), BWGBlocks.WHITE_ANEMONE.getBlock(), BWGBlocks.ALPINE_BELLFLOWER.getBlock(), BWGBlocks.LAZARUS_BELLFLOWER.getBlock(), BWGBlocks.PEACH_LEATHER_FLOWER.getBlock(), + BWGBlocks.VIOLET_LEATHER_FLOWER.getBlock(), BWGBlocks.ANGELICA.getBlock(), BWGBlocks.BEGONIA.getBlock(), BWGBlocks.BISTORT.getBlock(), BWGBlocks.CALIFORNIA_POPPY.getBlock(), BWGBlocks.CROCUS.getBlock(), + BWGBlocks.FAIRY_SLIPPER.getBlock(), BWGBlocks.GUZMANIA.getBlock(), BWGBlocks.INCAN_LILY.getBlock(), BWGBlocks.IRIS.getBlock(), BWGBlocks.KOVAN_FLOWER.getBlock(), BWGBlocks.LOLLIPOP_FLOWER.getBlock(), + BWGBlocks.ORANGE_DAISY.getBlock(), BWGBlocks.PROTEA_FLOWER.getBlock(), BWGBlocks.PROTEA_FLOWER.getBlock(), BWGBlocks.SILVER_VASE_FLOWER.getBlock(), BWGBlocks.RICHEA.getBlock(), BWGBlocks.SNOWDROPS.getBlock(), + BWGBlocks.WINTER_CYCLAMEN.getBlock(), BWGBlocks.WINTER_SCILLA.getBlock()); + tag(BlockTags.FLOWERS).add(BWGBlocks.FLOWER_PATCH.get(), BWGBlocks.WHITE_SAKURA_PETALS.get(), BWGBlocks.YELLOW_SAKURA_PETALS.get(), BWGBlocks.FLOWERING_BARREL_CACTUS.get(), BWGBlocks.FLOWERING_TINY_LILY_PADS.get(), + BWGBlocks.FLOWERING_JACARANDA_BUSH.get(), BWGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH.get(), BWGWood.FLOWERING_PALO_VERDE_LEAVES.get(), BWGWood.FLOWERING_SKYRIS_LEAVES.get(), BWGWood.FLOWERING_IRONWOOD_LEAVES.get(), + BWGWood.FLOWERING_INDIGO_JACARANDA_LEAVES.get(), BWGWood.FLOWERING_JACARANDA_LEAVES.get(), BWGWood.FLOWERING_YUCCA_LEAVES.get(), BWGWood.FLOWERING_ORCHARD_LEAVES.get(), BWGWood.FLOWERING_BAOBAB_LEAVES.get()); + tag(BWGBlockTags.BLACK_ICE).add(BWGBlocks.BLACK_ICE.get(), BWGBlocks.PACKED_BLACK_ICE.get()); tag(BWGBlockTags.BOREALIS_ICE).add(BWGBlocks.BOREALIS_ICE.get(), BWGBlocks.PACKED_BOREALIS_ICE.get()); tag(BlockTags.SNOW_LAYER_CANNOT_SURVIVE_ON).addTag(BWGBlockTags.BLACK_ICE).addTag(BWGBlockTags.BOREALIS_ICE); @@ -148,7 +166,7 @@ private void easyBlockTags(Block object) { else if (object instanceof StairBlock) tag(BlockTags.STAIRS).add(object); else if (object instanceof WallBlock) tag(BlockTags.WALLS).add(object); else if (object instanceof SandBlock) tag(BlockTags.SAND).add(object); - else if (object instanceof FlowerBlock) tag(BlockTags.SMALL_FLOWERS).add(object); + //else if (object instanceof FlowerBlock) tag(BlockTags.SMALL_FLOWERS).add(object); else if (object instanceof TallFlowerBlock) tag(BlockTags.TALL_FLOWERS).add(object); else if (object instanceof LeavesBlock) tag(BlockTags.LEAVES).add(object); else if (object instanceof CampfireBlock) tag(BlockTags.CAMPFIRES).add(object); @@ -201,6 +219,15 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { copy(BlockTags.LOGS, ItemTags.LOGS); copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); copy(BlockTags.SAND, ItemTags.SAND); + copy(BWGBlockTags.ALLIUM_FLOWER_BUSHES, BWGItemTags.ALLIUM_FLOWER_BUSHES); + copy(BWGBlockTags.SHORT_ALLIUMS, BWGItemTags.SHORT_ALLIUMS); + copy(BWGBlockTags.TALL_ALLIUMS, BWGItemTags.TALL_ALLIUMS); + copy(BWGBlockTags.ALLIUMS, BWGItemTags.ALLIUMS); + copy(BWGBlockTags.ROSES, BWGItemTags.ROSES); + copy(BWGBlockTags.TULIPS, BWGItemTags.TULIPS); + copy(BWGBlockTags.AMARANTH, BWGItemTags.AMARANTH); + copy(BWGBlockTags.SAGES, BWGItemTags.SAGES); + copy(BWGBlockTags.DAFFODILS, BWGItemTags.DAFFODILS); copy(BlockTags.FLOWERS, ItemTags.FLOWERS); copy(BlockTags.SMALL_FLOWERS, ItemTags.SMALL_FLOWERS); copy(BlockTags.TALL_FLOWERS, ItemTags.TALL_FLOWERS);