Put Wooden rods first

Blaze rod tag added to help show people that more rods can be added to rods folder
FabricMC · Sep 23, 2023 · 6bfa408 · 6bfa408
1 parent f59ec63
commit 6bfa408
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/...-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/...-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java
@@ -160,6 +160,7 @@ public enum LOG_WARNING_MODES {
 			createMapEntry(RegistryKeys.ITEM, "redstone_dusts", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.REDSTONE_DUSTS),
 			createMapEntry(RegistryKeys.ITEM, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STONES),
 			createMapEntry(RegistryKeys.ITEM, "string", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STRINGS),
+			createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS),
 			createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS)
 
 	);

diff --git a/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
@@ -267,9 +267,11 @@ private void generateOtherTags() {
 				.add(Items.STRING);
 		getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS)
 				.add(Items.STICK);
+		getOrCreateTagBuilder(ConventionalItemTags.BLAZE_RODS)
+				.add(Items.BLAZE_ROD);
 		getOrCreateTagBuilder(ConventionalItemTags.RODS)
-				.add(Items.BLAZE_ROD)
-				.addOptionalTag(ConventionalItemTags.WOODEN_RODS);
+				.addOptionalTag(ConventionalItemTags.WOODEN_RODS)
+				.addOptionalTag(ConventionalItemTags.BLAZE_RODS);
 	}
 
 	private void generateDyedTags() {

diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json
@@ -1,10 +1,13 @@
 {
   "replace": false,
   "values": [
-    "minecraft:blaze_rod",
     {
       "id": "#c:rods/wooden",
       "required": false
+    },
+    {
+      "id": "#c:rods/blaze",
+      "required": false
     }
   ]
 }
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:blaze_rod"
+  ]
+}
diff --git a/...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
@@ -169,6 +169,7 @@ private ConventionalItemTags() {
 	public static final TagKey<Item> STRINGS = register("strings");
 	public static final TagKey<Item> RODS = register("rods");
 	public static final TagKey<Item> WOODEN_RODS = register("rods/wooden");
+	public static final TagKey<Item> BLAZE_RODS = register("rods/blaze");
 
 	private static TagKey<Item> register(String tagID) {
 		return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID);