feat: Update tags to new tag convention

TwelveIterationMods · May 23, 2024 · c786ac8 · c786ac8
1 parent 132cd11
commit c786ac8
Show file tree

Hide file tree

Showing 156 changed files with 54 additions and 1,039 deletions.
diff --git a/common/src/main/java/net/blay09/mods/balm/api/tag/BalmItemTags.java b/common/src/main/java/net/blay09/mods/balm/api/tag/BalmItemTags.java
@@ -7,37 +7,37 @@
 import net.minecraft.world.item.Item;
 
 public class BalmItemTags {
-    public static final TagKey<Item> BLACK_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "black_dyes"));
-    public static final TagKey<Item> BLUE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "blue_dyes"));
-    public static final TagKey<Item> BROWN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "brown_dyes"));
+    public static final TagKey<Item> BLACK_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/black"));
+    public static final TagKey<Item> BLUE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/blue"));
+    public static final TagKey<Item> BROWN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/brown"));
     public static final TagKey<Item> COOKING_OIL = TagKey.create(Registries.ITEM, new ResourceLocation("c", "cooking_oil"));
-    public static final TagKey<Item> CYAN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "cyan_dyes"));
-    public static final TagKey<Item> DIAMONDS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "diamonds"));
+    public static final TagKey<Item> CYAN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/cyan"));
+    public static final TagKey<Item> DIAMONDS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "gems/diamonds"));
     public static final TagKey<Item> DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes"));
     public static final TagKey<Item> EGGS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "eggs"));
-    public static final TagKey<Item> EMERALDS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "emeralds"));
+    public static final TagKey<Item> EMERALDS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "gems/emerald"));
     public static final TagKey<Item> GEMS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "gems"));
-    public static final TagKey<Item> GOLD_NUGGETS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "gold_nuggets"));
-    public static final TagKey<Item> GRAY_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "gray_dyes"));
-    public static final TagKey<Item> GREEN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "green_dyes"));
+    public static final TagKey<Item> GOLD_NUGGETS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "nuggets/gold"));
+    public static final TagKey<Item> GRAY_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/gray"));
+    public static final TagKey<Item> GREEN_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/green"));
     public static final TagKey<Item> INGOTS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "ingots"));
-    public static final TagKey<Item> IRON_INGOTS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "iron_ingots"));
-    public static final TagKey<Item> IRON_NUGGETS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "iron_nuggets"));
-    public static final TagKey<Item> LIGHT_BLUE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "light_blue_dyes"));
-    public static final TagKey<Item> LIGHT_GRAY_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "light_gray_dyes"));
-    public static final TagKey<Item> LIME_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "lime_dyes"));
-    public static final TagKey<Item> MAGENTA_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "magenta_dyes"));
+    public static final TagKey<Item> IRON_INGOTS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "ingots/iron"));
+    public static final TagKey<Item> IRON_NUGGETS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "nuggets/iron"));
+    public static final TagKey<Item> LIGHT_BLUE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/light_blue"));
+    public static final TagKey<Item> LIGHT_GRAY_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/light_gray"));
+    public static final TagKey<Item> LIME_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/lime"));
+    public static final TagKey<Item> MAGENTA_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/magenta"));
     public static final TagKey<Item> NUGGETS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "nuggets"));
-    public static final TagKey<Item> ORANGE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "orange_dyes"));
+    public static final TagKey<Item> ORANGE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/orange"));
     public static final TagKey<Item> ORES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "ores"));
-    public static final TagKey<Item> PINK_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "pink_dyes"));
-    public static final TagKey<Item> PURPLE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "purple_dyes"));
-    public static final TagKey<Item> RED_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "red_dyes"));
+    public static final TagKey<Item> PINK_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/pink"));
+    public static final TagKey<Item> PURPLE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/purple"));
+    public static final TagKey<Item> RED_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/red"));
     public static final TagKey<Item> STONES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "stones"));
-    public static final TagKey<Item> WHITE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "white_dyes"));
-    public static final TagKey<Item> WOODEN_CHESTS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "wooden_chests"));
-    public static final TagKey<Item> WOODEN_RODS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "wooden_rods"));
-    public static final TagKey<Item> YELLOW_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "yellow_dyes"));
+    public static final TagKey<Item> WHITE_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/white"));
+    public static final TagKey<Item> WOODEN_CHESTS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "chests/wooden"));
+    public static final TagKey<Item> WOODEN_RODS = TagKey.create(Registries.ITEM, new ResourceLocation("c", "rods/wooden"));
+    public static final TagKey<Item> YELLOW_DYES = TagKey.create(Registries.ITEM, new ResourceLocation("c", "dyes/yellow"));
 
     @SuppressWarnings("unchecked")
     public static final TagKey<Item>[] DYE_TAGS = new TagKey[] {

diff --git a/fabric/src/main/resources/data/balm/tags/items/black_dyes.json b/fabric/src/main/resources/data/balm/tags/items/black_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/blue_dyes.json b/fabric/src/main/resources/data/balm/tags/items/blue_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/brown_dyes.json b/fabric/src/main/resources/data/balm/tags/items/brown_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/cyan_dyes.json b/fabric/src/main/resources/data/balm/tags/items/cyan_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/diamonds.json b/fabric/src/main/resources/data/balm/tags/items/diamonds.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/dyes.json b/fabric/src/main/resources/data/balm/tags/items/dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/eggs.json b/fabric/src/main/resources/data/balm/tags/items/eggs.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/emeralds.json b/fabric/src/main/resources/data/balm/tags/items/emeralds.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/gems.json b/fabric/src/main/resources/data/balm/tags/items/gems.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/gold_nuggets.json b/fabric/src/main/resources/data/balm/tags/items/gold_nuggets.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/gray_dyes.json b/fabric/src/main/resources/data/balm/tags/items/gray_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/green_dyes.json b/fabric/src/main/resources/data/balm/tags/items/green_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/ingots.json b/fabric/src/main/resources/data/balm/tags/items/ingots.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/iron_ingots.json b/fabric/src/main/resources/data/balm/tags/items/iron_ingots.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/light_blue_dyes.json b/fabric/src/main/resources/data/balm/tags/items/light_blue_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/light_gray_dyes.json b/fabric/src/main/resources/data/balm/tags/items/light_gray_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/lime_dyes.json b/fabric/src/main/resources/data/balm/tags/items/lime_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/magenta_dyes.json b/fabric/src/main/resources/data/balm/tags/items/magenta_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/nuggets.json b/fabric/src/main/resources/data/balm/tags/items/nuggets.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/orange_dyes.json b/fabric/src/main/resources/data/balm/tags/items/orange_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/ores.json b/fabric/src/main/resources/data/balm/tags/items/ores.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/pink_dyes.json b/fabric/src/main/resources/data/balm/tags/items/pink_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/purple_dyes.json b/fabric/src/main/resources/data/balm/tags/items/purple_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/red_dyes.json b/fabric/src/main/resources/data/balm/tags/items/red_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/stones.json b/fabric/src/main/resources/data/balm/tags/items/stones.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/white_dyes.json b/fabric/src/main/resources/data/balm/tags/items/white_dyes.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/wooden_chests.json b/fabric/src/main/resources/data/balm/tags/items/wooden_chests.json
diff --git a/fabric/src/main/resources/data/balm/tags/items/wooden_rods.json b/fabric/src/main/resources/data/balm/tags/items/wooden_rods.json