From 303be1be885ee05ca5a0cfa5087e788b6877a2b1 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Wed, 18 Sep 2024 08:04:47 +0200 Subject: [PATCH] fix: item tags for ritual materials --- .../data/minecraft/tags/item/candles.json | 5 +++++ .../tags/block/pentacle_materials.json | 5 +---- .../data/occultism/tags/item/candles.json | 21 +++++++++++++++++++ .../tags/item/pentacle_materials.json | 5 +---- .../tags/OccultismBlockTagProvider.java | 2 +- .../tags/OccultismItemTagProvider.java | 3 +++ .../occultism/registry/OccultismTags.java | 1 + 7 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/item/candles.json create mode 100644 src/generated/resources/data/occultism/tags/item/candles.json diff --git a/src/generated/resources/data/minecraft/tags/item/candles.json b/src/generated/resources/data/minecraft/tags/item/candles.json new file mode 100644 index 000000000..24738e0bc --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/candles.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#occultism:candles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/tags/block/pentacle_materials.json b/src/generated/resources/data/occultism/tags/block/pentacle_materials.json index 064238070..0ccf4cfbf 100644 --- 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 new file mode 100644 index 000000000..bcc37e3a2 --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/tags/item/pentacle_materials.json b/src/generated/resources/data/occultism/tags/item/pentacle_materials.json index 2bbeab87b..b3bd39f74 100644 --- 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 index 998b4e0f2..8669dbe1d 100644 --- 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 index 76c85ef53..418ba89fe 100644 --- 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 index b43ef6454..f480e709a 100644 --- 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 PENTACLE_MATERIALS = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "pentacle_materials")); public static final TagKey SKULLS = makeItemTag(ResourceLocation.fromNamespaceAndPath("c", "skulls")); + public static final TagKey OCCULTISM_CANDLES = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "candles")); public static final TagKey DEMONIC_PARTNER_FOOD = makeItemTag(ResourceLocation.fromNamespaceAndPath("occultism", "demonic_partner_food"));