From dde32847cfb44ed0f1e3d2dd6b2ed07f50dd7b4b Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Wed, 10 Apr 2024 17:55:53 +0200 Subject: [PATCH] fix: re-add djini miner to ores tag, fixes #1107 (#1108) --- .../resources/data/occultism/tags/items/miners/ores.json | 3 ++- .../occultism/datagen/tags/OccultismItemTagProvider.java | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/generated/resources/data/occultism/tags/items/miners/ores.json b/src/generated/resources/data/occultism/tags/items/miners/ores.json index 846266201..4f85093e7 100644 --- a/src/generated/resources/data/occultism/tags/items/miners/ores.json +++ b/src/generated/resources/data/occultism/tags/items/miners/ores.json @@ -3,6 +3,7 @@ "occultism:miner_foliot_unspecialized", "occultism:miner_debug_unspecialized", "occultism:miner_afrit_deeps", - "occultism:miner_marid_master" + "occultism:miner_marid_master", + "occultism:miner_djinni_ores" ] } \ No newline at end of file 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 a4efa7282..399456999 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 @@ -52,13 +52,11 @@ private void addOccultismTags(HolderLookup.Provider provider) { this.tag(OccultismTags.Items.Miners.DEEPS).add(OccultismItems.MINER_AFRIT_DEEPS.get(), OccultismItems.MINER_MARID_MASTER.get()).replace(false); this.tag(OccultismTags.Items.Miners.MASTER).add(OccultismItems.MINER_MARID_MASTER.get()).replace(false); this.tag(OccultismTags.Items.Miners.ORES).add(OccultismItems.MINER_FOLIOT_UNSPECIALIZED.get(), - OccultismItems.MINER_DEBUG_UNSPECIALIZED.get(), OccultismItems.MINER_AFRIT_DEEPS.get(), OccultismItems.MINER_MARID_MASTER.get()).replace(false); + OccultismItems.MINER_DEBUG_UNSPECIALIZED.get(), OccultismItems.MINER_AFRIT_DEEPS.get(), OccultismItems.MINER_MARID_MASTER.get(), OccultismItems.MINER_DJINNI_ORES.get()).replace(false); this.copy(OccultismTags.Blocks.OTHERWORLD_SAPLINGS, OccultismTags.Items.OTHERWORLD_SAPLINGS); this.tag(OccultismTags.Items.TOOL_KNIVES).add(OccultismItems.BUTCHER_KNIFE.get()).replace(false); this.tag(OccultismTags.Items.ELYTRA).add(Items.ELYTRA).addOptional(new ResourceLocation("mana-and-artifice", "spectral_elytra")).replace(false); this.tag(OccultismTags.Items.OTHERWORLD_GOGGLES).add(OccultismItems.OTHERWORLD_GOGGLES.get()).replace(false); - - } private void addMinecraftTags(HolderLookup.Provider provider) { @@ -115,7 +113,7 @@ private void addForgeTags(HolderLookup.Provider provider) { this.tag(OccultismTags.Items.METAL_AXES).add(Items.IRON_AXE, Items.GOLDEN_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE).replace(false); // Books - this.tag(OccultismTags.Items.BOOKS).add(OccultismItems.DICTIONARY_OF_SPIRITS.get(),Items.BOOK).replace(false); + this.tag(OccultismTags.Items.BOOKS).add(OccultismItems.DICTIONARY_OF_SPIRITS.get(), Items.BOOK).replace(false); // Fruits this.tag(OccultismTags.Items.FRUITS).add(Items.APPLE).replace(false);