- 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
Potion-Studios · Aug 22, 2024 · de3d77d · de3d77d
1 parent 3927e53
commit de3d77d
Show file tree

Hide file tree

Showing 26 changed files with 237 additions and 56 deletions.
diff --git 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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#biomeswevegone:flowers/alliums/flower_bushes",
+    "#biomeswevegone:flowers/alliums/short",
+    "#biomeswevegone:flowers/alliums/tall"
+  ]
+}
diff --git a/...in/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/flower_bushes.json b/...in/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"
+  ]
+}
diff --git a/...n/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/short.json b/...n/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"
+  ]
+}
diff --git a/...on/src/main/generated/resources/data/biomeswevegone/tags/blocks/flowers/alliums/tall.json b/...on/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"
+  ]
+}
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
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "biomeswevegone:amaranth",
+    "biomeswevegone:cyan_amaranth",
+    "biomeswevegone:magenta_amaranth",
+    "biomeswevegone:orange_amaranth",
+    "biomeswevegone:purple_amaranth"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "biomeswevegone:daffodil",
+    "biomeswevegone:pink_daffodil",
+    "biomeswevegone:yellow_daffodil"
+  ]
+}
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
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "biomeswevegone:black_rose",
+    "biomeswevegone:cyan_rose",
+    "biomeswevegone:osiria_rose",
+    "biomeswevegone:rose",
+    "biomeswevegone:winter_rose"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "biomeswevegone:blue_sage",
+    "biomeswevegone:purple_sage",
+    "biomeswevegone:white_sage"
+  ]
+}
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
@@ -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"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#biomeswevegone:flowers/alliums/flower_bushes",
+    "#biomeswevegone:flowers/alliums/short",
+    "#biomeswevegone:flowers/alliums/tall"
+  ]
+}
diff --git a/...ain/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/flower_bushes.json b/...ain/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"
+  ]
+}
diff --git a/...on/src/main/generated/resources/data/biomeswevegone/tags/items/flowers/alliums/short.json b/...on/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"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "biomeswevegone:tall_allium",
+    "biomeswevegone:tall_pink_allium",
+    "biomeswevegone:tall_white_allium"
+  ]
+}
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
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "biomeswevegone:amaranth",
+    "biomeswevegone:cyan_amaranth",
+    "biomeswevegone:magenta_amaranth",
+    "biomeswevegone:orange_amaranth",
+    "biomeswevegone:purple_amaranth"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "biomeswevegone:daffodil",
+    "biomeswevegone:pink_daffodil",
+    "biomeswevegone:yellow_daffodil"
+  ]
+}
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
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "biomeswevegone:black_rose",
+    "biomeswevegone:cyan_rose",
+    "biomeswevegone:osiria_rose",
+    "biomeswevegone:rose",
+    "biomeswevegone:winter_rose"
+  ]
+}
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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "biomeswevegone:blue_sage",
+    "biomeswevegone:purple_sage",
+    "biomeswevegone:white_sage"
+  ]
+}
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
@@ -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"
+  ]
+}
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
@@ -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
@@ -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"
   ]
 }
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
@@ -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
@@ -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"
   ]
 }
diff --git 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<Block> SNOWY_PLANT_PLACEABLE = create("snowy_plant_placeable");
     public static final TagKey<Block> BWG_MUSHROOM_PLACEABLE = create("bwg_mushroom_placeable");
     public static final TagKey<Block> HYDRANGEA_BUSH_PLACEABLE = create("hydrangea_bush_placeable");
+    public static final TagKey<Block> TALL_ALLIUMS = create("flowers/alliums/tall");
+    public static final TagKey<Block> SHORT_ALLIUMS = create("flowers/alliums/short");
+    public static final TagKey<Block> ALLIUM_FLOWER_BUSHES = create("flowers/alliums/flower_bushes");
+    public static final TagKey<Block> ALLIUMS = create("flowers/alliums");
+    public static final TagKey<Block> ROSES = create("flowers/roses");
+    public static final TagKey<Block> TULIPS = create("flowers/tulips");
+    public static final TagKey<Block> AMARANTH = create("flowers/amaranth");
+    public static final TagKey<Block> SAGES = create("flowers/sages");
+    public static final TagKey<Block> DAFFODILS = create("flowers/daffodils");
 
     private static TagKey<Block> 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
@@ -17,6 +17,16 @@ public class BWGItemTags {
     public static final TagKey<Item> BOREALIS_ICE = create("borealis_ice");
     public static final TagKey<Item> PALO_VERDE_LOGS = create("palo_verde_logs");
 
+    public static final TagKey<Item> TALL_ALLIUMS = create("flowers/alliums/tall");
+    public static final TagKey<Item> SHORT_ALLIUMS = create("flowers/alliums/short");
+    public static final TagKey<Item> ALLIUM_FLOWER_BUSHES = create("flowers/alliums/flower_bushes");
+    public static final TagKey<Item> ALLIUMS = create("flowers/alliums");
+    public static final TagKey<Item> ROSES = create("flowers/roses");
+    public static final TagKey<Item> TULIPS = create("flowers/tulips");
+    public static final TagKey<Item> AMARANTH = create("flowers/amaranth");
+    public static final TagKey<Item> SAGES = create("flowers/sages");
+    public static final TagKey<Item> DAFFODILS = create("flowers/daffodils");
+
     public static final TagKey<Item> MAKES_BLACK_DYE = create("dye/makes_black_dye");
     public static final TagKey<Item> MAKES_BLUE_DYE = create("dye/makes_blue_dye");
     public static final TagKey<Item> MAKES_BROWN_DYE = create("dye/makes_brown_dye");