Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tag cleanup and additions for 1.21 #3807

Merged
merged 9 commits into from
Jun 8, 2024
Merged

Tag cleanup and additions for 1.21 #3807

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
55dab80
Tag cleanup and additions for 1.21
TelepathicGrunt May 27, 2024
20763a5
Fixed music disc javadoc
TelepathicGrunt May 27, 2024
561cccf
Re-add redundant tags but deprecate them
TelepathicGrunt May 28, 2024
dbc40db
remove eroded badlands from sparse vegetation
TelepathicGrunt May 30, 2024
a18eeaa
Switched to singular name for inner files for tools
TelepathicGrunt Jun 1, 2024
7c99bd2
deprecate redundant shulker box tag
TelepathicGrunt Jun 2, 2024
9ac51bb
Added glazed terracotta tag
TelepathicGrunt Jun 2, 2024
4a245ce
Added concrete and concrete powder tags
TelepathicGrunt Jun 2, 2024
fc00de5
checkstyle issue
TelepathicGrunt Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ private enum LogWarningMode {
createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS),
createMapEntry(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS),

createMapEntry(ConventionalItemTags.COAL, ItemTags.COALS),
createMapEntry(ConventionalItemTags.QUARTZ_ORES, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_ORES),
createMapEntry(ConventionalItemTags.WOODEN_BARRELS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_BARRELS),
createMapEntry(ConventionalItemTags.SANDSTONE_BLOCKS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SANDSTONE_BLOCKS),
Expand Down Expand Up @@ -209,8 +210,12 @@ private enum LogWarningMode {
createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS),
createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS)

createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS),
createMapEntry(RegistryKeys.ITEM, "raw_blocks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS),
createMapEntry(RegistryKeys.ITEM, "raw_blocks/copper", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_COPPER),
createMapEntry(RegistryKeys.ITEM, "raw_blocks/gold", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_GOLD),
createMapEntry(RegistryKeys.ITEM, "raw_blocks/iron", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_IRON),
createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "music_discs")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MUSIC_DISCS)
);

@Override
Expand Down
6 changes: 1 addition & 5 deletions ...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,9 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets");
translationBuilder.add(ConventionalItemTags.ORES, "Ores");
translationBuilder.add(ConventionalItemTags.RAW_MATERIALS, "Raw Materials");
translationBuilder.add(ConventionalItemTags.RAW_BLOCKS, "Raw Blocks");
translationBuilder.add(ConventionalItemTags.IRON_RAW_MATERIALS, "Raw Iron Materials");
translationBuilder.add(ConventionalItemTags.GOLD_RAW_MATERIALS, "Raw Gold Materials");
translationBuilder.add(ConventionalItemTags.COPPER_RAW_MATERIALS, "Raw Copper Materials");
translationBuilder.add(ConventionalItemTags.IRON_RAW_BLOCKS, "Raw Iron Blocks");
translationBuilder.add(ConventionalItemTags.GOLD_RAW_BLOCKS, "Raw Gold Blocks");
translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Copper Blocks");
translationBuilder.add(ConventionalItemTags.NORMAL_BRICKS, "Bricks");
translationBuilder.add(ConventionalItemTags.NETHER_BRICKS, "Nether Bricks");
translationBuilder.add(ConventionalItemTags.IRON_INGOTS, "Iron Ingots");
Expand All @@ -152,7 +148,6 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalItemTags.PRISMARINE_GEMS, "Prismarine Gems");
translationBuilder.add(ConventionalItemTags.REDSTONE_DUSTS, "Redstone Dusts");
translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts");
translationBuilder.add(ConventionalItemTags.COAL, "Coal");
translationBuilder.add(ConventionalItemTags.POTIONS, "Potions");
translationBuilder.add(ConventionalItemTags.FOODS, "Foods");
translationBuilder.add(ConventionalItemTags.FRUITS_FOODS, "Fruits");
Expand Down Expand Up @@ -250,6 +245,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables");
translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_FURNACES, "Furnaces");
translationBuilder.add(ConventionalItemTags.STRINGS, "Strings");
translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs");
translationBuilder.add(ConventionalItemTags.RODS, "Rods");
translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods");
translationBuilder.add(ConventionalItemTags.BLAZE_RODS, "Blaze Rods");
Expand Down
22 changes: 9 additions & 13 deletions ...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,6 @@ private void generateOreAndRelatedTags() {
.addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS)
.addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS)
.addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS);
getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS)
.addOptionalTag(ConventionalItemTags.COPPER_RAW_BLOCKS)
.addOptionalTag(ConventionalItemTags.GOLD_RAW_BLOCKS)
.addOptionalTag(ConventionalItemTags.IRON_RAW_BLOCKS);

// Vanilla instances
getOrCreateTagBuilder(ConventionalItemTags.NORMAL_BRICKS)
Expand All @@ -321,13 +317,6 @@ private void generateOreAndRelatedTags() {
getOrCreateTagBuilder(ConventionalItemTags.NETHERITE_INGOTS)
.add(Items.NETHERITE_INGOT);

getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_BLOCKS)
.add(Items.RAW_IRON_BLOCK);
getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_BLOCKS)
.add(Items.RAW_COPPER_BLOCK);
getOrCreateTagBuilder(ConventionalItemTags.GOLD_RAW_BLOCKS)
.add(Items.RAW_GOLD_BLOCK);

getOrCreateTagBuilder(ConventionalItemTags.IRON_RAW_MATERIALS)
.add(Items.RAW_IRON);
getOrCreateTagBuilder(ConventionalItemTags.COPPER_RAW_MATERIALS)
Expand All @@ -339,8 +328,6 @@ private void generateOreAndRelatedTags() {
.add(Items.REDSTONE);
getOrCreateTagBuilder(ConventionalItemTags.GLOWSTONE_DUSTS)
.add(Items.GLOWSTONE_DUST);
getOrCreateTagBuilder(ConventionalItemTags.COAL)
.addOptionalTag(ItemTags.COALS);

getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES)
.add(Items.NETHER_QUARTZ_ORE);
Expand Down Expand Up @@ -460,6 +447,15 @@ private void generateOtherTags() {
getOrCreateTagBuilder(ConventionalItemTags.STRINGS)
.add(Items.STRING);

getOrCreateTagBuilder(ConventionalItemTags.LEATHERS)
.add(Items.LEATHER);

getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS)
.add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR,
Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD,
Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT, Items.MUSIC_DISC_OTHERSIDE, Items.MUSIC_DISC_5, Items.MUSIC_DISC_PIGSTEP,
Items.MUSIC_DISC_RELIC, Items.MUSIC_DISC_CREATOR, Items.MUSIC_DISC_CREATOR_MUSIC_BOX, Items.MUSIC_DISC_PRECIPICE);

getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS)
.add(Items.STICK);

Expand Down
6 changes: 1 addition & 5 deletions ...nvention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
"tag.item.c.chests": "Chests",
"tag.item.c.chests.wooden": "Wooden Chests",
"tag.item.c.clusters": "Clusters",
"tag.item.c.coal": "Coal",
"tag.item.c.cobblestones": "Cobblestones",
"tag.item.c.dusts": "Dusts",
"tag.item.c.dusts.glowstone": "Glowstone Dusts",
Expand Down Expand Up @@ -171,17 +170,14 @@
"tag.item.c.ingots.gold": "Gold Ingots",
"tag.item.c.ingots.iron": "Iron Ingots",
"tag.item.c.ingots.netherite": "Netherite Ingots",
"tag.item.c.music_discs": "Music Discs",
"tag.item.c.nuggets": "Nuggets",
"tag.item.c.ores": "Ores",
"tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores",
"tag.item.c.ores.quartz": "Quartz Ores",
"tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
"tag.item.c.player_workstations.furnaces": "Furnaces",
"tag.item.c.potions": "Potions",
"tag.item.c.raw_blocks": "Raw Blocks",
"tag.item.c.raw_blocks.copper": "Raw Copper Blocks",
"tag.item.c.raw_blocks.gold": "Raw Gold Blocks",
"tag.item.c.raw_blocks.iron": "Raw Iron Blocks",
"tag.item.c.raw_materials": "Raw Materials",
"tag.item.c.raw_materials.copper": "Raw Copper Materials",
"tag.item.c.raw_materials.gold": "Raw Gold Materials",
Expand Down
8 changes: 0 additions & 8 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/coal.json
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/leathers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:leather"
]
}
23 changes: 23 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"values": [
"minecraft:music_disc_13",
"minecraft:music_disc_cat",
"minecraft:music_disc_blocks",
"minecraft:music_disc_chirp",
"minecraft:music_disc_far",
"minecraft:music_disc_mall",
"minecraft:music_disc_mellohi",
"minecraft:music_disc_stal",
"minecraft:music_disc_strad",
"minecraft:music_disc_ward",
"minecraft:music_disc_11",
"minecraft:music_disc_wait",
"minecraft:music_disc_otherside",
"minecraft:music_disc_5",
"minecraft:music_disc_pigstep",
"minecraft:music_disc_relic",
"minecraft:music_disc_creator",
"minecraft:music_disc_creator_music_box",
"minecraft:music_disc_precipice"
]
}
16 changes: 0 additions & 16 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_blocks.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_blocks/copper.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_blocks/gold.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_blocks/iron.json
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions ...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,11 @@ private ConventionalItemTags() {
public static final TagKey<Item> NUGGETS = register("nuggets");
public static final TagKey<Item> ORES = register("ores");
public static final TagKey<Item> RAW_MATERIALS = register("raw_materials");
public static final TagKey<Item> RAW_BLOCKS = register("raw_blocks");
TelepathicGrunt marked this conversation as resolved.
Show resolved Hide resolved

// Raw material and blocks - vanilla instances
public static final TagKey<Item> IRON_RAW_MATERIALS = register("raw_materials/iron");
public static final TagKey<Item> GOLD_RAW_MATERIALS = register("raw_materials/gold");
public static final TagKey<Item> COPPER_RAW_MATERIALS = register("raw_materials/copper");
public static final TagKey<Item> IRON_RAW_BLOCKS = register("raw_blocks/iron");
public static final TagKey<Item> GOLD_RAW_BLOCKS = register("raw_blocks/gold");
public static final TagKey<Item> COPPER_RAW_BLOCKS = register("raw_blocks/copper");

// Bricks - vanilla instances
public static final TagKey<Item> NORMAL_BRICKS = register("bricks/normal");
Expand All @@ -109,7 +105,6 @@ private ConventionalItemTags() {
// Dusts and Misc - vanilla instances
public static final TagKey<Item> REDSTONE_DUSTS = register("dusts/redstone");
public static final TagKey<Item> GLOWSTONE_DUSTS = register("dusts/glowstone");
public static final TagKey<Item> COAL = register("coal");

// Consumables
public static final TagKey<Item> POTIONS = register("potions");
Expand Down Expand Up @@ -271,6 +266,12 @@ private ConventionalItemTags() {
public static final TagKey<Item> PLAYER_WORKSTATIONS_CRAFTING_TABLES = register("player_workstations/crafting_tables");
public static final TagKey<Item> PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces");
public static final TagKey<Item> STRINGS = register("strings");
public static final TagKey<Item> LEATHERS = register("leathers");
/**
* For music disc-like materials to be used in recipes.
* A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag.
*/
public static final TagKey<Item> MUSIC_DISCS = register("music_discs");
/**
* For rod-like materials to be used in recipes.
*/
Expand Down
Loading