From 6bfa40883756c8a7197d0cc6eaedf29ead73dfca Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:33:43 -0400 Subject: [PATCH] Put Wooden rods first Blaze rod tag added to help show people that more rods can be added to rods folder --- .../fabric/impl/tag/convention/ConventionLogWarnings.java | 1 + .../tag/convention/datagen/generators/ItemTagGenerator.java | 6 ++++-- .../src/generated/resources/data/c/tags/items/rods.json | 5 ++++- .../generated/resources/data/c/tags/items/rods/blaze.json | 6 ++++++ .../fabric/api/tag/convention/v2/ConventionalItemTags.java | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/blaze.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 8da647f283..60d80a7f5e 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-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/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 91d96c3c13..39f6948c40 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/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 index c958e942ad..109344658e 100644 --- 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 } ] } \ No newline at end of file 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 new file mode 100644 index 0000000000..8cbb7bc030 --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 19d7ce5c47..177b78970f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -169,6 +169,7 @@ private ConventionalItemTags() { public static final TagKey STRINGS = register("strings"); public static final TagKey RODS = register("rods"); public static final TagKey WOODEN_RODS = register("rods/wooden"); + public static final TagKey BLAZE_RODS = register("rods/blaze"); private static TagKey register(String tagID) { return TagRegistration.ITEM_TAG_REGISTRATION.registerC(tagID);