fix: item tags for ritual materials

klikli-dev · Sep 18, 2024 · 303be1b · 303be1b
1 parent 776fcf1
commit 303be1b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 9 deletions.
diff --git a/src/generated/resources/data/minecraft/tags/item/candles.json b/src/generated/resources/data/minecraft/tags/item/candles.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#occultism:candles"
+  ]
+}
diff --git a/src/generated/resources/data/occultism/tags/block/pentacle_materials.json b/src/generated/resources/data/occultism/tags/block/pentacle_materials.json
@@ -3,10 +3,7 @@
     "#c:skulls",
     "occultism:golden_sacrificial_bowl",
     "occultism:spirit_attuned_crystal",
-    {
-      "id": "#occultism:candles",
-      "required": false
-    },
+    "#minecraft:candles",
     {
       "id": "#occultism:chalk_glyphs",
       "required": false

diff --git a/src/generated/resources/data/occultism/tags/item/candles.json b/src/generated/resources/data/occultism/tags/item/candles.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "occultism:large_candle",
+    "occultism:large_candle_white",
+    "occultism:large_candle_light_gray",
+    "occultism:large_candle_gray",
+    "occultism:large_candle_black",
+    "occultism:large_candle_brown",
+    "occultism:large_candle_red",
+    "occultism:large_candle_orange",
+    "occultism:large_candle_yellow",
+    "occultism:large_candle_lime",
+    "occultism:large_candle_green",
+    "occultism:large_candle_cyan",
+    "occultism:large_candle_blue",
+    "occultism:large_candle_light_blue",
+    "occultism:large_candle_pink",
+    "occultism:large_candle_magenta",
+    "occultism:large_candle_purple"
+  ]
+}
diff --git a/src/generated/resources/data/occultism/tags/item/pentacle_materials.json b/src/generated/resources/data/occultism/tags/item/pentacle_materials.json
@@ -7,10 +7,7 @@
     "#c:skulls",
     "occultism:golden_sacrificial_bowl",
     "occultism:spirit_attuned_crystal",
-    {
-      "id": "#occultism:candles",
-      "required": false
-    },
+    "#minecraft:candles",
     {
       "id": "#occultism:chalk_glyphs",
       "required": false

diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java
@@ -122,7 +122,7 @@ private void addOccultismTags(HolderLookup.Provider provider) {
                 .addTag(Tags.Blocks.SKULLS)
                 .add(OccultismBlocks.GOLDEN_SACRIFICIAL_BOWL.get())
                 .add(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get())
-                .addOptionalTag(OccultismTags.Blocks.OCCULTISM_CANDLES)
+                .addTag(BlockTags.CANDLES)
                 .addOptionalTag(OccultismTags.Blocks.CHALK_GLYPHS)
                 .replace(false);
 

diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java
@@ -80,6 +80,9 @@ private void addCuriosTags(HolderLookup.Provider provider) {
     }
 
     private void addOccultismTags(HolderLookup.Provider provider) {
+        this.copy(OccultismTags.Blocks.OCCULTISM_CANDLES, OccultismTags.Items.OCCULTISM_CANDLES);
+        this.copy(BlockTags.CANDLES, ItemTags.CANDLES);
+
         this.tag(OccultismTags.Items.SKULLS)
                 .add(Items.SKELETON_SKULL)
                 .add(Items.WITHER_SKELETON_SKULL)

diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java
@@ -62,6 +62,7 @@ public static class Items {
 
         public static final TagKey<Item> PENTACLE_MATERIALS = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "pentacle_materials"));
         public static final TagKey<Item> SKULLS = makeItemTag(ResourceLocation.fromNamespaceAndPath("c", "skulls"));
+        public static final TagKey<Item> OCCULTISM_CANDLES = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "candles"));
 
         public static final TagKey<Item> DEMONIC_PARTNER_FOOD = makeItemTag(ResourceLocation.fromNamespaceAndPath("occultism", "demonic_partner_food"));