chore: singularize occultism knife tag

klikli-dev · Aug 29, 2024 · e69d568 · e69d568
1 parent 2aedd11
commit e69d568
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json
@@ -1897,5 +1897,5 @@
   "tag.item.occultism.miners.ores": "General Miners",
   "tag.item.occultism.otherworld_goggles": "Otherworld Goggles",
   "tag.item.occultism.saplings.otherworld": "Otherworld Saplings",
-  "tag.item.occultism.tools.knives": "Knives"
+  "tag.item.occultism.tools.knife": "Knives"
 }
diff --git a/...rces/data/minecraft/tags/item/swords.json → ...sources/data/c/tags/item/tools/knife.json b/...rces/data/minecraft/tags/item/swords.json → ...sources/data/c/tags/item/tools/knife.json
diff --git a/...ata/occultism/tags/item/tools/knives.json → ...data/occultism/tags/item/tools/knife.json b/...ata/occultism/tags/item/tools/knives.json → ...data/occultism/tags/item/tools/knife.json
diff --git a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java
@@ -3239,7 +3239,7 @@ private void addTags() {
         this.addItemTag(OccultismTags.Items.Miners.DEEPS,"Deepslate Miners");
         this.addItemTag(OccultismTags.Items.Miners.MASTER,"Rare Resource Miners");
         this.addItemTag(OccultismTags.Items.Miners.ORES,"General Miners");
-        this.addItemTag(OccultismTags.Items.TOOL_KNIVES,"Knives");
+        this.addItemTag(OccultismTags.Items.TOOLS_KNIFE,"Knives");
         this.addItemTag(OccultismTags.Items.ELYTRA,"Elytras");
         this.addItemTag(OccultismTags.Items.OTHERWORLD_GOGGLES,"Otherworld Goggles");
         this.addItemTag(OccultismTags.Items.DATURA_SEEDS,"Demon's Dream Seeds");

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
@@ -110,7 +110,7 @@ private void addOccultismTags(HolderLookup.Provider provider) {
                 .addTag(OccultismTags.Items.Miners.ORES).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.TOOLS_KNIFE).add(OccultismItems.BUTCHER_KNIFE.get()).replace(false);
         this.tag(OccultismTags.Items.ELYTRA).add(Items.ELYTRA).addOptional(ResourceLocation.fromNamespaceAndPath("mana-and-artifice", "spectral_elytra")).replace(false);
         this.tag(OccultismTags.Items.OTHERWORLD_GOGGLES).add(OccultismItems.OTHERWORLD_GOGGLES.get()).replace(false);
     }
@@ -147,7 +147,7 @@ private void addMinecraftTags(HolderLookup.Provider provider) {
         this.copy(BlockTags.PIGLIN_REPELLENTS, ItemTags.PIGLIN_REPELLENTS);
         this.copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS);
         this.tag(ItemTags.PICKAXES).add(OccultismItems.INFUSED_PICKAXE.get(), OccultismItems.IESNIUM_PICKAXE.get()).replace(false);
-        this.tag(ItemTags.SWORDS).add(OccultismItems.BUTCHER_KNIFE.get()).replace(false);
+        this.tag(this.cTag("tools/knife")).add(OccultismItems.BUTCHER_KNIFE.get()).replace(false);
 
         this.tag(ItemTags.BOOKSHELF_BOOKS)
                 .replace(false)

diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java
@@ -92,7 +92,8 @@ public static class Items {
         public static final TagKey<Item> DATURA_SEEDS = makeItemTag(ResourceLocation.fromNamespaceAndPath("c", "seeds/datura"));
 
         //Item Tags
-        public static final TagKey<Item> TOOL_KNIVES = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "tools/knives"));
+        public static final TagKey<Item> TOOLS_KNIFE = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "tools/knife"));
+
         public static final TagKey<Item> OTHERWORLD_GOGGLES = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "otherworld_goggles"));
         public static final TagKey<Item> ELYTRA = makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "elytra"));
         public static final TagKey<Item> BOOKS = makeItemTag(ResourceLocation.fromNamespaceAndPath("c", "books"));