Add Storage Block Tags (Allium and Rose Petal Blocks). Closes #183

Signed-off-by: Joseph T. McQuigg <[email protected]>

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Correct BWG Pitcher Plant Item Models
 - Slight Change to FruitBlockProcessor#finalizeProcessing to be more Efficient
 - Add Config to Enable/Disable Spawning of Oddion and Man O War
+- Add Storage Block Tags (Allium and Rose Petal Blocks)
 
 # 2.2.5
 - Make Pale Pumpkin Set Compostable

Common/src/main/generated/resources/data/biomeswevegone/tags/block/storage_blocks/allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/block/storage_blocks/pink_allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:pink_allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/block/storage_blocks/rose.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:rose_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/block/storage_blocks/white_allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:white_allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/item/storage_blocks/allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/item/storage_blocks/pink_allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:pink_allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/item/storage_blocks/rose.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:rose_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/biomeswevegone/tags/item/storage_blocks/white_allium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "biomeswevegone:white_allium_petal_block"
+  ]
+}

Common/src/main/generated/resources/data/c/tags/block/storage_blocks.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "#biomeswevegone:storage_blocks/allium",
+    "#biomeswevegone:storage_blocks/pink_allium",
+    "#biomeswevegone:storage_blocks/rose",
+    "#biomeswevegone:storage_blocks/white_allium"
+  ]
+}

Common/src/main/generated/resources/data/c/tags/item/storage_blocks.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "#biomeswevegone:storage_blocks/allium",
+    "#biomeswevegone:storage_blocks/pink_allium",
+    "#biomeswevegone:storage_blocks/rose",
+    "#biomeswevegone:storage_blocks/white_allium"
+  ]
+}

Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGBlockTags.java

@@ -27,6 +27,12 @@ public class BWGBlockTags {
     public static final TagKey<Block> SAGES = create("flowers/sages");
     public static final TagKey<Block> DAFFODILS = create("flowers/daffodils");
 
+    /** Storage Blocks **/
+    public static final TagKey<Block> STORAGE_BLOCKS_ALLIUM = create("storage_blocks/allium");
+    public static final TagKey<Block> STORAGE_BLOCKS_PINK_ALLIUM = create("storage_blocks/pink_allium");
+    public static final TagKey<Block> STORAGE_BLOCKS_WHITE_ALLIUM = create("storage_blocks/white_allium");
+    public static final TagKey<Block> STORAGE_BLOCKS_ROSE = create("storage_blocks/rose");
+
     private static TagKey<Block> create(String name) {
         return TagKey.create(Registries.BLOCK, BiomesWeveGone.id(name));
     }

Common/src/main/java/net/potionstudios/biomeswevegone/tags/BWGItemTags.java

@@ -28,6 +28,11 @@ public class BWGItemTags {
     public static final TagKey<Item> DAFFODILS = create("flowers/daffodils");
     public static final TagKey<Item> GLOWCANE_POWDER = create("glowcane_powder");
     public static final TagKey<Item> GLOWCANE_SHOOT = create("glowcane_shoot");
+
+    public static final TagKey<Item> STORAGE_BLOCKS_ALLIUM = create("storage_blocks/allium");
+    public static final TagKey<Item> STORAGE_BLOCKS_PINK_ALLIUM = create("storage_blocks/pink_allium");
+    public static final TagKey<Item> STORAGE_BLOCKS_WHITE_ALLIUM = create("storage_blocks/white_allium");
+    public static final TagKey<Item> STORAGE_BLOCKS_ROSE = create("storage_blocks/rose");
 
     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");

NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/datagen/generators/TagsGenerator.java

@@ -172,6 +172,11 @@ else if (blocks.get() instanceof LeavesBlock) {
             tag(BlockTags.ENDERMAN_HOLDABLE).add(BWGBlocks.PALE_PUMPKIN.get(), BWGBlocks.CARVED_PALE_PUMPKIN.get());
             tag(BlockTags.SWORD_EFFICIENT).add(BWGBlocks.PALE_PUMPKIN.get(), BWGBlocks.CARVED_PALE_PUMPKIN.get(), BWGBlocks.ATTACHED_PALE_PUMPKIN_STEM.get(), BWGBlocks.PALE_JACK_O_LANTERN.get());
 
+            tag(BWGBlockTags.STORAGE_BLOCKS_ALLIUM).add(BWGBlocks.ALLIUM_PETAL_BLOCK.get());
+            tag(BWGBlockTags.STORAGE_BLOCKS_PINK_ALLIUM).add(BWGBlocks.PINK_ALLIUM_PETAL_BLOCK.get());
+            tag(BWGBlockTags.STORAGE_BLOCKS_WHITE_ALLIUM).add(BWGBlocks.WHITE_ALLIUM_PETAL_BLOCK.get());
+            tag(BWGBlockTags.STORAGE_BLOCKS_ROSE).add(BWGBlocks.ROSE_PETAL_BLOCK.get());
+            tag(Tags.Blocks.STORAGE_BLOCKS).addTag(BWGBlockTags.STORAGE_BLOCKS_ALLIUM).addTag(BWGBlockTags.STORAGE_BLOCKS_PINK_ALLIUM).addTag(BWGBlockTags.STORAGE_BLOCKS_WHITE_ALLIUM).addTag(BWGBlockTags.STORAGE_BLOCKS_ROSE);
             // Entity Integration Tags
             tag(BlockTags.ANIMALS_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.LUSH_DIRT.get(), BWGBlocks.PODZOL_DACITE.get(), BWGBlocks.OVERGROWN_STONE.get(), BWGBlocks.OVERGROWN_DACITE.get(), BWGBlocks.PEAT.get());
             tag(BlockTags.FROGS_SPAWNABLE_ON).add(BWGBlocks.LUSH_GRASS_BLOCK.get(), BWGBlocks.PALE_MUD.get(), BWGWood.SPIRIT_ROOTS.get());
@@ -257,6 +262,11 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
             copy(BWGBlockTags.AMARANTH, BWGItemTags.AMARANTH);
             copy(BWGBlockTags.SAGES, BWGItemTags.SAGES);
             copy(BWGBlockTags.DAFFODILS, BWGItemTags.DAFFODILS);
+            copy(BWGBlockTags.STORAGE_BLOCKS_ALLIUM, BWGItemTags.STORAGE_BLOCKS_ALLIUM);
+            copy(BWGBlockTags.STORAGE_BLOCKS_PINK_ALLIUM, BWGItemTags.STORAGE_BLOCKS_PINK_ALLIUM);
+            copy(BWGBlockTags.STORAGE_BLOCKS_WHITE_ALLIUM, BWGItemTags.STORAGE_BLOCKS_WHITE_ALLIUM);
+            copy(BWGBlockTags.STORAGE_BLOCKS_ROSE, BWGItemTags.STORAGE_BLOCKS_ROSE);
+            copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS);
             copy(BlockTags.FLOWERS, ItemTags.FLOWERS);
             copy(BlockTags.SMALL_FLOWERS, ItemTags.SMALL_FLOWERS);
             copy(BlockTags.TALL_FLOWERS, ItemTags.TALL_FLOWERS);