diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index e48d3a95b1..f577ba3f25 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -15,6 +15,7 @@ "tag.block.c.cobblestones.infested": "Infested Cobblestones", "tag.block.c.cobblestones.mossy": "Mossy Cobblestones", "tag.block.c.cobblestones.normal": "Normal Cobblestones", + "tag.block.c.concretes": "Concretes", "tag.block.c.dyed": "Dyed Blocks", "tag.block.c.dyed.black": "Black Dyed Blocks", "tag.block.c.dyed.blue": "Blue Dyed Blocks", @@ -44,6 +45,7 @@ "tag.block.c.glass_blocks.tinted": "Tinted Glass Blocks", "tag.block.c.glass_panes": "Glass Panes", "tag.block.c.glass_panes.colorless": "Colorless Glass Panes", + "tag.block.c.glazed_terracottas": "Glazed Terracottas", "tag.block.c.gravels": "Gravels", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.block.c.netherracks": "Netherracks", @@ -158,6 +160,8 @@ "tag.item.c.cobblestones.infested": "Infested Cobblestones", "tag.item.c.cobblestones.mossy": "Mossy Cobblestones", "tag.item.c.cobblestones.normal": "Normal Cobblestones", + "tag.item.c.concrete_powders": "Concrete Powders", + "tag.item.c.concretes": "Concretes", "tag.item.c.crops": "Crops", "tag.item.c.crops.beetroot": "Beetroot Crops", "tag.item.c.crops.carrot": "Carrot Crops", @@ -238,6 +242,7 @@ "tag.item.c.glass_blocks.tinted": "Tinted Glass Blocks", "tag.item.c.glass_panes": "Glass Panes", "tag.item.c.glass_panes.colorless": "Colorless Glass Panes", + "tag.item.c.glazed_terracottas": "Glazed Terracottas", "tag.item.c.gravels": "Gravels", "tag.item.c.gunpowders": "Gunpowders", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", @@ -248,6 +253,7 @@ "tag.item.c.ingots.netherite": "Netherite Ingots", "tag.item.c.leathers": "Leathers", "tag.item.c.mushrooms": "Mushrooms", + "tag.item.c.music_discs": "Music Discs", "tag.item.c.nether_stars": "Nether Stars", "tag.item.c.netherracks": "Netherracks", "tag.item.c.nuggets": "Nuggets", @@ -276,10 +282,6 @@ "tag.item.c.ores_in_ground.stone": "Stone Ores In Ground", "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", - "tag.item.c.raw_blocks": "Raw Blocks", - "tag.item.c.raw_blocks.copper": "Copper Raw Blocks", - "tag.item.c.raw_blocks.gold": "Gold Raw Blocks", - "tag.item.c.raw_blocks.iron": "Iron Raw Blocks", "tag.item.c.raw_materials": "Raw Materials", "tag.item.c.raw_materials.copper": "Copper Raw Materials", "tag.item.c.raw_materials.gold": "Gold Raw Materials", @@ -306,6 +308,7 @@ "tag.item.c.seeds.melon": "Melon Seeds", "tag.item.c.seeds.pumpkin": "Pumpkin Seeds", "tag.item.c.seeds.wheat": "Wheat Seeds", + "tag.item.c.shulker_boxes": "Shulker Boxes", "tag.item.c.slimeballs": "Slimeballs", "tag.item.c.stones": "Stones", "tag.item.c.storage_blocks": "Storage Blocks", @@ -327,13 +330,13 @@ "tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks", "tag.item.c.strings": "Strings", "tag.item.c.tools": "Tools", - "tag.item.c.tools.bows": "Bows", - "tag.item.c.tools.brushes": "Brushes", - "tag.item.c.tools.crossbows": "Crossbows", - "tag.item.c.tools.fishing_rods": "Fishing Rods", - "tag.item.c.tools.shears": "Shears", - "tag.item.c.tools.shields": "Shields", - "tag.item.c.tools.spears": "Spears", + "tag.item.c.tools.bow": "Bows", + "tag.item.c.tools.brush": "Brushes", + "tag.item.c.tools.crossbow": "Crossbows", + "tag.item.c.tools.fishing_rod": "Fishing Rods", + "tag.item.c.tools.shear": "Shears", + "tag.item.c.tools.shield": "Shields", + "tag.item.c.tools.spear": "Spears", "tag.item.c.villager_job_sites": "Villager Job Sites", "tag.item.neoforge.enchanting_fuels": "Enchanting Fuels", "tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator's Selection", diff --git a/src/generated/resources/data/c/tags/block/concretes.json b/src/generated/resources/data/c/tags/block/concretes.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/concretes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json b/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json index 016e4315ef..ccd28136a6 100644 --- a/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json +++ b/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json @@ -15,7 +15,6 @@ "minecraft:blue_stained_glass", "minecraft:brown_stained_glass", "minecraft:green_stained_glass", - "minecraft:green_stained_glass", "minecraft:red_stained_glass", "minecraft:black_stained_glass", { diff --git a/src/generated/resources/data/c/tags/block/glazed_terracottas.json b/src/generated/resources/data/c/tags/block/glazed_terracottas.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/glazed_terracottas.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:black_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/concrete_powders.json b/src/generated/resources/data/c/tags/item/concrete_powders.json new file mode 100644 index 0000000000..57a09c9b25 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/concrete_powders.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete_powder", + "minecraft:orange_concrete_powder", + "minecraft:magenta_concrete_powder", + "minecraft:light_blue_concrete_powder", + "minecraft:yellow_concrete_powder", + "minecraft:lime_concrete_powder", + "minecraft:pink_concrete_powder", + "minecraft:gray_concrete_powder", + "minecraft:light_gray_concrete_powder", + "minecraft:cyan_concrete_powder", + "minecraft:purple_concrete_powder", + "minecraft:blue_concrete_powder", + "minecraft:brown_concrete_powder", + "minecraft:green_concrete_powder", + "minecraft:red_concrete_powder", + "minecraft:black_concrete_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/concretes.json b/src/generated/resources/data/c/tags/item/concretes.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/item/concretes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json b/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json index 016e4315ef..ccd28136a6 100644 --- a/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json +++ b/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json @@ -15,7 +15,6 @@ "minecraft:blue_stained_glass", "minecraft:brown_stained_glass", "minecraft:green_stained_glass", - "minecraft:green_stained_glass", "minecraft:red_stained_glass", "minecraft:black_stained_glass", { diff --git a/src/generated/resources/data/c/tags/item/glazed_terracottas.json b/src/generated/resources/data/c/tags/item/glazed_terracottas.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/glazed_terracottas.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:black_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/music_discs.json b/src/generated/resources/data/c/tags/item/music_discs.json new file mode 100644 index 0000000000..4cfc035e4f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/music_discs.json @@ -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" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_blocks.json b/src/generated/resources/data/c/tags/item/raw_blocks.json deleted file mode 100644 index fef9f55fc6..0000000000 --- a/src/generated/resources/data/c/tags/item/raw_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "#c:raw_blocks/copper", - "#c:raw_blocks/gold", - "#c:raw_blocks/iron" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_blocks/copper.json b/src/generated/resources/data/c/tags/item/raw_blocks/copper.json deleted file mode 100644 index 1a21e230ef..0000000000 --- a/src/generated/resources/data/c/tags/item/raw_blocks/copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:raw_copper_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_blocks/gold.json b/src/generated/resources/data/c/tags/item/raw_blocks/gold.json deleted file mode 100644 index 80781ce667..0000000000 --- a/src/generated/resources/data/c/tags/item/raw_blocks/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:raw_gold_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_blocks/iron.json b/src/generated/resources/data/c/tags/item/raw_blocks/iron.json deleted file mode 100644 index 13ed9fc651..0000000000 --- a/src/generated/resources/data/c/tags/item/raw_blocks/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:raw_iron_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/shulker_boxes.json b/src/generated/resources/data/c/tags/item/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/shulker_boxes.json @@ -0,0 +1,21 @@ +{ + "values": [ + "minecraft:shulker_box", + "minecraft:white_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:yellow_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:purple_shulker_box", + "minecraft:blue_shulker_box", + "minecraft:brown_shulker_box", + "minecraft:green_shulker_box", + "minecraft:red_shulker_box", + "minecraft:black_shulker_box" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools.json b/src/generated/resources/data/c/tags/item/tools.json index 8b2c2aae5e..109eabfd56 100644 --- a/src/generated/resources/data/c/tags/item/tools.json +++ b/src/generated/resources/data/c/tags/item/tools.json @@ -5,13 +5,13 @@ "#minecraft:pickaxes", "#minecraft:shovels", "#minecraft:swords", - "#c:tools/bows", - "#c:tools/brushes", - "#c:tools/crossbows", - "#c:tools/fishing_rods", - "#c:tools/shears", - "#c:tools/shields", - "#c:tools/spears", + "#c:tools/bow", + "#c:tools/brush", + "#c:tools/crossbow", + "#c:tools/fishing_rod", + "#c:tools/shear", + "#c:tools/shield", + "#c:tools/spear", { "id": "#forge:tools", "required": false diff --git a/src/generated/resources/data/c/tags/item/tools/bow.json b/src/generated/resources/data/c/tags/item/tools/bow.json new file mode 100644 index 0000000000..d0dad42854 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/bow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:brush", + { + "id": "#c:tools/brushes", + "required": false + }, + { + "id": "#c:tools/bows", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/bows.json b/src/generated/resources/data/c/tags/item/tools/bows.json deleted file mode 100644 index e46556b3d2..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/bows.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:bow", - { - "id": "#forge:tools/bows", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/brush.json b/src/generated/resources/data/c/tags/item/tools/brush.json new file mode 100644 index 0000000000..bacde92122 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/brush.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:brush", + { + "id": "#forge:tools/brushes", + "required": false + }, + { + "id": "#c:tools/brushes", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/brushes.json b/src/generated/resources/data/c/tags/item/tools/brushes.json deleted file mode 100644 index 8b2fb219ea..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/brushes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:brush" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/crossbows.json b/src/generated/resources/data/c/tags/item/tools/crossbow.json similarity index 63% rename from src/generated/resources/data/c/tags/item/tools/crossbows.json rename to src/generated/resources/data/c/tags/item/tools/crossbow.json index d1e63bc584..7f9c54c37f 100644 --- a/src/generated/resources/data/c/tags/item/tools/crossbows.json +++ b/src/generated/resources/data/c/tags/item/tools/crossbow.json @@ -4,6 +4,10 @@ { "id": "#forge:tools/crossbows", "required": false + }, + { + "id": "#c:tools/crossbows", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/fishing_rods.json b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json similarity index 63% rename from src/generated/resources/data/c/tags/item/tools/fishing_rods.json rename to src/generated/resources/data/c/tags/item/tools/fishing_rod.json index efafba4845..7b10f8bef7 100644 --- a/src/generated/resources/data/c/tags/item/tools/fishing_rods.json +++ b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json @@ -4,6 +4,10 @@ { "id": "#forge:tools/fishing_rods", "required": false + }, + { + "id": "#c:tools/fishing_rods", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/shear.json b/src/generated/resources/data/c/tags/item/tools/shear.json new file mode 100644 index 0000000000..4bfc43fa6b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/shear.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:shears", + { + "id": "#forge:shears", + "required": false + }, + { + "id": "#forge:tools/shears", + "required": false + }, + { + "id": "#c:tools/shears", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/shears.json b/src/generated/resources/data/c/tags/item/tools/shears.json deleted file mode 100644 index 1c2ad36f72..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/shears.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:shears", - { - "id": "#forge:shears", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/shields.json b/src/generated/resources/data/c/tags/item/tools/shield.json similarity index 62% rename from src/generated/resources/data/c/tags/item/tools/shields.json rename to src/generated/resources/data/c/tags/item/tools/shield.json index f0b441428b..e7f561f3a0 100644 --- a/src/generated/resources/data/c/tags/item/tools/shields.json +++ b/src/generated/resources/data/c/tags/item/tools/shield.json @@ -4,6 +4,10 @@ { "id": "#forge:tools/shields", "required": false + }, + { + "id": "#c:tools/shields", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/spear.json b/src/generated/resources/data/c/tags/item/tools/spear.json new file mode 100644 index 0000000000..ec20a2fa83 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/spear.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:trident", + { + "id": "#forge:tools/tridents", + "required": false + }, + { + "id": "#forge:tools/tridents", + "required": false + }, + { + "id": "#c:tools/tridents", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/spears.json b/src/generated/resources/data/c/tags/item/tools/spears.json deleted file mode 100644 index c5b8b99af6..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/spears.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:trident", - { - "id": "#forge:tools/tridents", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 2505597fde..6d5cdb8ddf 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:wooded_badlands", - "minecraft:eroded_badlands", "minecraft:savanna", "minecraft:savanna_plateau", "minecraft:windswept_savanna", diff --git a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java index 4a1c76e0f8..55288d4f2a 100644 --- a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java +++ b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java @@ -311,6 +311,10 @@ public enum LogWarningMode { createForgeMapEntry(Registries.ITEM, "ores_in_ground/deepslate", Tags.Items.ORES_IN_GROUND_DEEPSLATE), createForgeMapEntry(Registries.ITEM, "ores_in_ground/netherrack", Tags.Items.ORES_IN_GROUND_NETHERRACK), createForgeMapEntry(Registries.ITEM, "ores_in_ground/stone", Tags.Items.ORES_IN_GROUND_STONE), + createMapEntry(Registries.ITEM, "c", "raw_blocks", Tags.Items.STORAGE_BLOCKS), + createMapEntry(Registries.ITEM, "c", "raw_blocks/copper", Tags.Items.STORAGE_BLOCKS_COPPER), + createMapEntry(Registries.ITEM, "c", "raw_blocks/gold", Tags.Items.STORAGE_BLOCKS_GOLD), + createMapEntry(Registries.ITEM, "c", "raw_blocks/iron", Tags.Items.STORAGE_BLOCKS_IRON), createForgeMapEntry(Registries.ITEM, "raw_materials", Tags.Items.RAW_MATERIALS), createForgeMapEntry(Registries.ITEM, "raw_materials/copper", Tags.Items.RAW_MATERIALS_COPPER), createForgeMapEntry(Registries.ITEM, "raw_materials/gold", Tags.Items.RAW_MATERIALS_GOLD), @@ -328,7 +332,7 @@ public enum LogWarningMode { createForgeMapEntry(Registries.ITEM, "seeds/melon", Tags.Items.SEEDS_MELON), createForgeMapEntry(Registries.ITEM, "seeds/pumpkin", Tags.Items.SEEDS_PUMPKIN), createForgeMapEntry(Registries.ITEM, "seeds/wheat", Tags.Items.SEEDS_WHEAT), - createForgeMapEntry(Registries.ITEM, "shears", Tags.Items.TOOLS_SHEARS), + createForgeMapEntry(Registries.ITEM, "shears", Tags.Items.TOOLS_SHEAR), createForgeMapEntry(Registries.ITEM, "slimeballs", Tags.Items.SLIMEBALLS), createForgeMapEntry(Registries.ITEM, "stone", Tags.Items.STONES), createForgeMapEntry(Registries.ITEM, "storage_blocks", Tags.Items.STORAGE_BLOCKS), @@ -348,12 +352,19 @@ public enum LogWarningMode { createForgeMapEntry(Registries.ITEM, "storage_blocks/redstone", Tags.Items.STORAGE_BLOCKS_REDSTONE), createForgeMapEntry(Registries.ITEM, "string", Tags.Items.STRINGS), createForgeMapEntry(Registries.ITEM, "tools", Tags.Items.TOOLS), - createForgeMapEntry(Registries.ITEM, "tools/shields", Tags.Items.TOOLS_SHIELDS), - createForgeMapEntry(Registries.ITEM, "tools/bows", Tags.Items.TOOLS_BOWS), - createForgeMapEntry(Registries.ITEM, "tools/crossbows", Tags.Items.TOOLS_CROSSBOWS), - createForgeMapEntry(Registries.ITEM, "tools/fishing_rods", Tags.Items.TOOLS_FISHING_RODS), - createForgeMapEntry(Registries.ITEM, "tools/tridents", Tags.Items.TOOLS_SPEARS), - createForgeMapEntry(Registries.ITEM, "tools/brushes", Tags.Items.TOOLS_BRUSHES), + createForgeMapEntry(Registries.ITEM, "tools/shields", Tags.Items.TOOLS_SHIELD), + createForgeMapEntry(Registries.ITEM, "tools/bows", Tags.Items.TOOLS_BOW), + createForgeMapEntry(Registries.ITEM, "tools/crossbows", Tags.Items.TOOLS_CROSSBOW), + createForgeMapEntry(Registries.ITEM, "tools/fishing_rods", Tags.Items.TOOLS_FISHING_ROD), + createForgeMapEntry(Registries.ITEM, "tools/tridents", Tags.Items.TOOLS_SPEAR), + createForgeMapEntry(Registries.ITEM, "tools/brushes", Tags.Items.TOOLS_BRUSH), + createMapEntry(Registries.ITEM, "c", "tools/shields", Tags.Items.TOOLS_SHIELD), + createMapEntry(Registries.ITEM, "c", "tools/bows", Tags.Items.TOOLS_BOW), + createMapEntry(Registries.ITEM, "c", "tools/brushes", Tags.Items.TOOLS_BRUSH), + createMapEntry(Registries.ITEM, "c", "tools/crossbows", Tags.Items.TOOLS_CROSSBOW), + createMapEntry(Registries.ITEM, "c", "tools/fishing_rods", Tags.Items.TOOLS_FISHING_ROD), + createMapEntry(Registries.ITEM, "c", "tools/shears", Tags.Items.TOOLS_SHEAR), + createMapEntry(Registries.ITEM, "c", "tools/tridents", Tags.Items.TOOLS_SPEAR), createForgeMapEntry(Registries.ITEM, "armors", Tags.Items.ARMORS), createForgeMapEntry(Registries.ITEM, "armors/helmets", ItemTags.HEAD_ARMOR), createForgeMapEntry(Registries.ITEM, "armors/chestplates", ItemTags.CHEST_ARMOR), diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index fef140997a..d54fa1e1a4 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -65,6 +65,7 @@ public static class Blocks { public static final TagKey COBBLESTONES_INFESTED = tag("cobblestones/infested"); public static final TagKey COBBLESTONES_MOSSY = tag("cobblestones/mossy"); public static final TagKey COBBLESTONES_DEEPSLATE = tag("cobblestones/deepslate"); + public static final TagKey CONCRETES = tag("concretes"); /** * Tag that holds all blocks that can be dyed a specific color. @@ -104,6 +105,7 @@ public static class Blocks { public static final TagKey GLASS_PANES = tag("glass_panes"); public static final TagKey GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); + public static final TagKey GLAZED_TERRACOTTAS = tag("glazed_terracottas"); public static final TagKey GRAVELS = tag("gravels"); /** @@ -299,6 +301,11 @@ public static class Items { public static final TagKey COBBLESTONES_INFESTED = tag("cobblestones/infested"); public static final TagKey COBBLESTONES_MOSSY = tag("cobblestones/mossy"); public static final TagKey COBBLESTONES_DEEPSLATE = tag("cobblestones/deepslate"); + public static final TagKey CONCRETES = tag("concretes"); + /** + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER} + */ + public static final TagKey CONCRETE_POWDERS = tag("concrete_powders"); /** * For blocks that are similar to amethyst where they have clusters forming from budding blocks */ @@ -424,6 +431,7 @@ public static class Items { public static final TagKey GLASS_PANES = tag("glass_panes"); public static final TagKey GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); + public static final TagKey GLAZED_TERRACOTTAS = tag("glazed_terracottas"); public static final TagKey GRAVELS = tag("gravels"); public static final TagKey GUNPOWDERS = tag("gunpowders"); @@ -438,6 +446,11 @@ public static class Items { public static final TagKey INGOTS_NETHERITE = tag("ingots/netherite"); public static final TagKey LEATHERS = tag("leathers"); public static final TagKey MUSHROOMS = tag("mushrooms"); + /** + * 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 MUSIC_DISCS = tag("music_discs"); public static final TagKey NETHER_STARS = tag("nether_stars"); public static final TagKey NETHERRACKS = tag("netherracks"); public static final TagKey NUGGETS = tag("nuggets"); @@ -493,10 +506,6 @@ public static class Items { public static final TagKey ORES_IN_GROUND_STONE = tag("ores_in_ground/stone"); public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces"); - public static final TagKey RAW_BLOCKS = tag("raw_blocks"); - public static final TagKey RAW_BLOCKS_COPPER = tag("raw_blocks/copper"); - public static final TagKey RAW_BLOCKS_GOLD = tag("raw_blocks/gold"); - public static final TagKey RAW_BLOCKS_IRON = tag("raw_blocks/iron"); public static final TagKey RAW_MATERIALS = tag("raw_materials"); public static final TagKey RAW_MATERIALS_COPPER = tag("raw_materials/copper"); public static final TagKey RAW_MATERIALS_GOLD = tag("raw_materials/gold"); @@ -533,6 +542,10 @@ public static class Items { public static final TagKey SEEDS_MELON = tag("seeds/melon"); public static final TagKey SEEDS_PUMPKIN = tag("seeds/pumpkin"); public static final TagKey SEEDS_WHEAT = tag("seeds/wheat"); + /** + * Block tag equivalent is {@link BlockTags#SHULKER_BOXES} + */ + public static final TagKey SHULKER_BOXES = tag("shulker_boxes"); public static final TagKey SLIMEBALLS = tag("slimeballs"); /** * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. @@ -581,7 +594,7 @@ public static class Items { * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_SHIELDS = tag("tools/shields"); + public static final TagKey TOOLS_SHIELD = tag("tools/shield"); /** * A tag containing all existing bows. Do not use this tag for determining a tool's behavior. * Please use {@link net.neoforged.neoforge.common.ToolActions} instead for what action a tool can do. @@ -589,7 +602,7 @@ public static class Items { * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_BOWS = tag("tools/bows"); + public static final TagKey TOOLS_BOW = tag("tools/bow"); /** * A tag containing all existing crossbows. Do not use this tag for determining a tool's behavior. * Please use {@link net.neoforged.neoforge.common.ToolActions} instead for what action a tool can do. @@ -597,7 +610,7 @@ public static class Items { * @see net.neoforged.neoforge.common.ToolAction * @see net.neoforged.neoforge.common.ToolActions */ - public static final TagKey TOOLS_CROSSBOWS = tag("tools/crossbows"); + public static final TagKey TOOLS_CROSSBOW = tag("tools/crossbow"); /** * A tag containing all existing fishing rods. Do not use this tag for determining a tool's behavior. * Please use {@link net.neoforged.neoforge.common.ToolActions} instead for what action a tool can do. @@ -605,7 +618,7 @@ public static class Items { * @see net.neoforged.neoforge.common.ToolAction * @see net.neoforged.neoforge.common.ToolActions */ - public static final TagKey TOOLS_FISHING_RODS = tag("tools/fishing_rods"); + public static final TagKey TOOLS_FISHING_ROD = tag("tools/fishing_rod"); /** * A tag containing all existing spears. Other tools such as throwing knives or boomerangs * should not be put into this tag and should be put into their own tool tags. @@ -615,7 +628,7 @@ public static class Items { * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_SPEARS = tag("tools/spears"); + public static final TagKey TOOLS_SPEAR = tag("tools/spear"); /** * A tag containing all existing shears. Do not use this tag for determining a tool's behavior. * Please use {@link net.neoforged.neoforge.common.ToolActions} instead for what action a tool can do. @@ -623,7 +636,7 @@ public static class Items { * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_SHEARS = tag("tools/shears"); + public static final TagKey TOOLS_SHEAR = tag("tools/shear"); /** * A tag containing all existing brushes. Do not use this tag for determining a tool's behavior. * Please use {@link net.neoforged.neoforge.common.ToolActions} instead for what action a tool can do. @@ -631,7 +644,7 @@ public static class Items { * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_BRUSHES = tag("tools/brushes"); + public static final TagKey TOOLS_BRUSH = tag("tools/brush"); /** * Collects the 4 vanilla armor tags into one parent collection for ease. */ diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java index fb677ec9c4..a82fbf58e8 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java @@ -83,7 +83,6 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD) .add(Biomes.WOODED_BADLANDS) - .add(Biomes.ERODED_BADLANDS) .add(Biomes.SAVANNA) .add(Biomes.SAVANNA_PLATEAU) .add(Biomes.WINDSWEPT_SAVANNA) diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java index e703c16491..87123ffb13 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java @@ -47,6 +47,7 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.COBBLESTONES_INFESTED).add(Blocks.INFESTED_COBBLESTONE); tag(Tags.Blocks.COBBLESTONES_MOSSY).add(Blocks.MOSSY_COBBLESTONE); tag(Tags.Blocks.COBBLESTONES_DEEPSLATE).add(Blocks.COBBLED_DEEPSLATE); + tag(Tags.Blocks.CONCRETES).add(Blocks.WHITE_CONCRETE, Blocks.ORANGE_CONCRETE, Blocks.MAGENTA_CONCRETE, Blocks.LIGHT_BLUE_CONCRETE, Blocks.YELLOW_CONCRETE, Blocks.LIME_CONCRETE, Blocks.PINK_CONCRETE, Blocks.GRAY_CONCRETE, Blocks.LIGHT_GRAY_CONCRETE, Blocks.CYAN_CONCRETE, Blocks.PURPLE_CONCRETE, Blocks.BLUE_CONCRETE, Blocks.BROWN_CONCRETE, Blocks.GREEN_CONCRETE, Blocks.RED_CONCRETE, Blocks.BLACK_CONCRETE); addColored(Tags.Blocks.DYED, "{color}_banner"); addColored(Tags.Blocks.DYED, "{color}_bed"); addColored(Tags.Blocks.DYED, "{color}_candle"); @@ -70,10 +71,11 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES); tag(Tags.Blocks.GLASS_BLOCKS).addTags(Tags.Blocks.GLASS_BLOCKS_COLORLESS, Tags.Blocks.GLASS_BLOCKS_CHEAP, Tags.Blocks.GLASS_BLOCKS_TINTED).add(Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS); tag(Tags.Blocks.GLASS_BLOCKS_COLORLESS).add(Blocks.GLASS); - tag(Tags.Blocks.GLASS_BLOCKS_CHEAP).add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS); + tag(Tags.Blocks.GLASS_BLOCKS_CHEAP).add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS); tag(Tags.Blocks.GLASS_BLOCKS_TINTED).add(Blocks.TINTED_GLASS); tag(Tags.Blocks.GLASS_PANES).addTags(Tags.Blocks.GLASS_PANES_COLORLESS).add(Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Blocks.CYAN_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS_PANE); tag(Tags.Blocks.GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE); + tag(Tags.Blocks.GLAZED_TERRACOTTAS).add(Blocks.WHITE_GLAZED_TERRACOTTA, Blocks.ORANGE_GLAZED_TERRACOTTA, Blocks.MAGENTA_GLAZED_TERRACOTTA, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA, Blocks.YELLOW_GLAZED_TERRACOTTA, Blocks.LIME_GLAZED_TERRACOTTA, Blocks.PINK_GLAZED_TERRACOTTA, Blocks.GRAY_GLAZED_TERRACOTTA, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA, Blocks.CYAN_GLAZED_TERRACOTTA, Blocks.PURPLE_GLAZED_TERRACOTTA, Blocks.BLUE_GLAZED_TERRACOTTA, Blocks.BROWN_GLAZED_TERRACOTTA, Blocks.GREEN_GLAZED_TERRACOTTA, Blocks.RED_GLAZED_TERRACOTTA, Blocks.BLACK_GLAZED_TERRACOTTA); tag(Tags.Blocks.GRAVELS).add(Blocks.GRAVEL); tag(Tags.Blocks.SKULLS).add(Blocks.SKELETON_SKULL, Blocks.SKELETON_WALL_SKULL, Blocks.WITHER_SKELETON_SKULL, Blocks.WITHER_SKELETON_WALL_SKULL, Blocks.PLAYER_HEAD, Blocks.PLAYER_WALL_HEAD, Blocks.ZOMBIE_HEAD, Blocks.ZOMBIE_WALL_HEAD, Blocks.CREEPER_HEAD, Blocks.CREEPER_WALL_HEAD, Blocks.PIGLIN_HEAD, Blocks.PIGLIN_WALL_HEAD, Blocks.DRAGON_HEAD, Blocks.DRAGON_WALL_HEAD); tag(Tags.Blocks.HIDDEN_FROM_RECIPE_VIEWERS); diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 13dcac65ad..fc47148485 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java @@ -58,6 +58,14 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.COBBLESTONES_INFESTED, Tags.Items.COBBLESTONES_INFESTED); copy(Tags.Blocks.COBBLESTONES_MOSSY, Tags.Items.COBBLESTONES_MOSSY); copy(Tags.Blocks.COBBLESTONES_DEEPSLATE, Tags.Items.COBBLESTONES_DEEPSLATE); + copy(Tags.Blocks.CONCRETES, Tags.Items.CONCRETES); + tag(Tags.Items.CONCRETE_POWDERS) + .add(Items.WHITE_CONCRETE_POWDER).add(Items.ORANGE_CONCRETE_POWDER).add(Items.MAGENTA_CONCRETE_POWDER) + .add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.YELLOW_CONCRETE_POWDER).add(Items.LIME_CONCRETE_POWDER) + .add(Items.PINK_CONCRETE_POWDER).add(Items.GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_CONCRETE_POWDER) + .add(Items.CYAN_CONCRETE_POWDER).add(Items.PURPLE_CONCRETE_POWDER).add(Items.BLUE_CONCRETE_POWDER) + .add(Items.BROWN_CONCRETE_POWDER).add(Items.GREEN_CONCRETE_POWDER).add(Items.RED_CONCRETE_POWDER) + .add(Items.BLACK_CONCRETE_POWDER); tag(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT); tag(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT); tag(Tags.Items.CROPS_CARROT).add(Items.CARROT); @@ -124,6 +132,7 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.GLASS_BLOCKS_CHEAP, Tags.Items.GLASS_BLOCKS_CHEAP); copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); copy(Tags.Blocks.GLASS_PANES_COLORLESS, Tags.Items.GLASS_PANES_COLORLESS); + copy(Tags.Blocks.GLAZED_TERRACOTTAS, Tags.Items.GLAZED_TERRACOTTAS); copy(Tags.Blocks.GRAVELS, Tags.Items.GRAVELS); tag(Tags.Items.GUNPOWDERS).add(Items.GUNPOWDER); tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS); @@ -134,6 +143,11 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT); tag(Tags.Items.LEATHERS).add(Items.LEATHER); tag(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM); + tag(Tags.Items.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); tag(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR); copy(Tags.Blocks.NETHERRACKS, Tags.Items.NETHERRACKS); tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON); @@ -162,10 +176,6 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES); copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES); - tag(Tags.Items.RAW_BLOCKS).addTags(Tags.Items.RAW_BLOCKS_COPPER, Tags.Items.RAW_BLOCKS_GOLD, Tags.Items.RAW_BLOCKS_IRON); - tag(Tags.Items.RAW_BLOCKS_COPPER).add(Items.RAW_COPPER_BLOCK); - tag(Tags.Items.RAW_BLOCKS_GOLD).add(Items.RAW_GOLD_BLOCK); - tag(Tags.Items.RAW_BLOCKS_IRON).add(Items.RAW_IRON_BLOCK); tag(Tags.Items.RAW_MATERIALS).addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON); tag(Tags.Items.RAW_MATERIALS_COPPER).add(Items.RAW_COPPER); tag(Tags.Items.RAW_MATERIALS_GOLD).add(Items.RAW_GOLD); @@ -193,6 +203,13 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS); tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS); tag(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL); + tag(Tags.Items.SHULKER_BOXES) + .add(Items.SHULKER_BOX).add(Items.WHITE_SHULKER_BOX).add(Items.ORANGE_SHULKER_BOX) + .add(Items.MAGENTA_SHULKER_BOX).add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.YELLOW_SHULKER_BOX) + .add(Items.LIME_SHULKER_BOX).add(Items.PINK_SHULKER_BOX).add(Items.GRAY_SHULKER_BOX) + .add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.CYAN_SHULKER_BOX).add(Items.PURPLE_SHULKER_BOX) + .add(Items.BLUE_SHULKER_BOX).add(Items.BROWN_SHULKER_BOX).add(Items.GREEN_SHULKER_BOX) + .add(Items.RED_SHULKER_BOX).add(Items.BLACK_SHULKER_BOX); copy(Tags.Blocks.STONES, Tags.Items.STONES); copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS); copy(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, Tags.Items.STORAGE_BLOCKS_BONE_MEAL); @@ -218,16 +235,16 @@ public void addTags(HolderLookup.Provider lookupProvider) { Items.LECTERN, Items.LOOM, Items.SMITHING_TABLE, Items.SMOKER, Items.STONECUTTER); // Tools and Armors - tag(Tags.Items.TOOLS_SHIELDS).add(Items.SHIELD); - tag(Tags.Items.TOOLS_BOWS).add(Items.BOW); - tag(Tags.Items.TOOLS_BRUSHES).add(Items.BRUSH); - tag(Tags.Items.TOOLS_CROSSBOWS).add(Items.CROSSBOW); - tag(Tags.Items.TOOLS_FISHING_RODS).add(Items.FISHING_ROD); - tag(Tags.Items.TOOLS_SHEARS).add(Items.SHEARS); - tag(Tags.Items.TOOLS_SPEARS).add(Items.TRIDENT); + tag(Tags.Items.TOOLS_SHIELD).add(Items.SHIELD); + tag(Tags.Items.TOOLS_BOW).add(Items.BOW); + tag(Tags.Items.TOOLS_BRUSH).add(Items.BRUSH); + tag(Tags.Items.TOOLS_CROSSBOW).add(Items.CROSSBOW); + tag(Tags.Items.TOOLS_FISHING_ROD).add(Items.FISHING_ROD); + tag(Tags.Items.TOOLS_SHEAR).add(Items.SHEARS); + tag(Tags.Items.TOOLS_SPEAR).add(Items.TRIDENT); tag(Tags.Items.TOOLS) .addTags(ItemTags.AXES, ItemTags.HOES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.SWORDS) - .addTags(Tags.Items.TOOLS_BOWS, Tags.Items.TOOLS_BRUSHES, Tags.Items.TOOLS_CROSSBOWS, Tags.Items.TOOLS_FISHING_RODS, Tags.Items.TOOLS_SHEARS, Tags.Items.TOOLS_SHIELDS, Tags.Items.TOOLS_SPEARS); + .addTags(Tags.Items.TOOLS_BOW, Tags.Items.TOOLS_BRUSH, Tags.Items.TOOLS_CROSSBOW, Tags.Items.TOOLS_FISHING_ROD, Tags.Items.TOOLS_SHEAR, Tags.Items.TOOLS_SHIELD, Tags.Items.TOOLS_SPEAR); tag(Tags.Items.ARMORS).addTags(ItemTags.HEAD_ARMOR, ItemTags.CHEST_ARMOR, ItemTags.LEG_ARMOR, ItemTags.FOOT_ARMOR); tag(Tags.Items.ENCHANTABLES).addTags(ItemTags.ARMOR_ENCHANTABLE, ItemTags.EQUIPPABLE_ENCHANTABLE, ItemTags.WEAPON_ENCHANTABLE, ItemTags.SWORD_ENCHANTABLE, ItemTags.MINING_ENCHANTABLE, ItemTags.MINING_LOOT_ENCHANTABLE, ItemTags.FISHING_ENCHANTABLE, ItemTags.TRIDENT_ENCHANTABLE, ItemTags.BOW_ENCHANTABLE, ItemTags.CROSSBOW_ENCHANTABLE, ItemTags.FIRE_ASPECT_ENCHANTABLE, ItemTags.DURABILITY_ENCHANTABLE).addOptionalTag(ItemTags.MACE_ENCHANTABLE); @@ -332,14 +349,24 @@ public void addTags(HolderLookup.Provider lookupProvider) { tagWithOptionalLegacy(Tags.Items.SEEDS_WHEAT); tagWithOptionalLegacy(Tags.Items.SLIMEBALLS); tagWithOptionalLegacy(Tags.Items.STRINGS); - tagWithOptionalLegacy(Tags.Items.TOOLS_SHIELDS); - tagWithOptionalLegacy(Tags.Items.TOOLS_BOWS); - tagWithOptionalLegacy(Tags.Items.TOOLS_CROSSBOWS); - tagWithOptionalLegacy(Tags.Items.TOOLS_FISHING_RODS); - tag(Tags.Items.TOOLS_SHEARS).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "shears")); - tag(Tags.Items.TOOLS_SPEARS).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/tridents")); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/tridents")); tagWithOptionalLegacy(Tags.Items.TOOLS); tagWithOptionalLegacy(Tags.Items.ARMORS); + tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/shields")); + tag(Tags.Items.TOOLS_BOW).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/bows")); + tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/brushes")); + tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/crossbows")); + tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/fishing_rods")); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", "tools/tridents")); + tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/shields")); + tag(Tags.Items.TOOLS_BOW).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/bows")); + tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/brushes")); + tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/crossbows")); + tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/fishing_rods")); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(ResourceLocation.fromNamespaceAndPath("c", "tools/tridents")); } private IntrinsicHolderTagsProvider.IntrinsicTagAppender tagWithOptionalLegacy(TagKey tag) { diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java index 46cd8c4222..39eeebdad1 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java @@ -38,6 +38,7 @@ protected void addTranslations() { add(Tags.Blocks.COBBLESTONES_INFESTED, "Infested Cobblestones"); add(Tags.Blocks.COBBLESTONES_MOSSY, "Mossy Cobblestones"); add(Tags.Blocks.COBBLESTONES_DEEPSLATE, "Deepslate Cobblestones"); + add(Tags.Blocks.CONCRETES, "Concretes"); add(Tags.Blocks.DYED, "Dyed Blocks"); addColored(Tags.Blocks.DYED, "{color} Dyed Blocks"); add(Tags.Blocks.END_STONES, "End Stones"); @@ -53,6 +54,7 @@ protected void addTranslations() { add(Tags.Blocks.GLASS_BLOCKS_TINTED, "Tinted Glass Blocks"); add(Tags.Blocks.GLASS_PANES, "Glass Panes"); add(Tags.Blocks.GLASS_PANES_COLORLESS, "Colorless Glass Panes"); + add(Tags.Blocks.GLAZED_TERRACOTTAS, "Glazed Terracottas"); add(Tags.Blocks.GRAVELS, "Gravels"); add(Tags.Blocks.SKULLS, "Skulls"); add(Tags.Blocks.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); @@ -145,6 +147,8 @@ protected void addTranslations() { add(Tags.Items.COBBLESTONES_INFESTED, "Infested Cobblestones"); add(Tags.Items.COBBLESTONES_MOSSY, "Mossy Cobblestones"); add(Tags.Items.COBBLESTONES_DEEPSLATE, "Deepslate Cobblestones"); + add(Tags.Items.CONCRETES, "Concretes"); + add(Tags.Items.CONCRETE_POWDERS, "Concrete Powders"); add(Tags.Items.CROPS, "Crops"); add(Tags.Items.CROPS_BEETROOT, "Beetroot Crops"); add(Tags.Items.CROPS_CARROT, "Carrot Crops"); @@ -210,6 +214,7 @@ protected void addTranslations() { add(Tags.Items.GLASS_BLOCKS_COLORLESS, "Colorless Glass Blocks"); add(Tags.Items.GLASS_PANES, "Glass Panes"); add(Tags.Items.GLASS_PANES_COLORLESS, "Colorless Glass Panes"); + add(Tags.Items.GLAZED_TERRACOTTAS, "Glazed Terracottas"); add(Tags.Items.GRAVELS, "Gravels"); add(Tags.Items.GUNPOWDERS, "Gunpowders"); add(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); @@ -219,6 +224,7 @@ protected void addTranslations() { add(Tags.Items.INGOTS_IRON, "Iron Ingots"); add(Tags.Items.INGOTS_NETHERITE, "Netherite Ingots"); add(Tags.Items.LEATHERS, "Leathers"); + add(Tags.Items.MUSIC_DISCS, "Music Discs"); add(Tags.Items.MUSHROOMS, "Mushrooms"); add(Tags.Items.NETHER_STARS, "Nether Stars"); add(Tags.Items.NETHERRACKS, "Netherracks"); @@ -248,10 +254,6 @@ protected void addTranslations() { add(Tags.Items.ORES_IN_GROUND_STONE, "Stone Ores In Ground"); add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); - add(Tags.Items.RAW_BLOCKS, "Raw Blocks"); - add(Tags.Items.RAW_BLOCKS_COPPER, "Copper Raw Blocks"); - add(Tags.Items.RAW_BLOCKS_GOLD, "Gold Raw Blocks"); - add(Tags.Items.RAW_BLOCKS_IRON, "Iron Raw Blocks"); add(Tags.Items.RAW_MATERIALS, "Raw Materials"); add(Tags.Items.RAW_MATERIALS_COPPER, "Copper Raw Materials"); add(Tags.Items.RAW_MATERIALS_GOLD, "Gold Raw Materials"); @@ -278,6 +280,7 @@ protected void addTranslations() { add(Tags.Items.SEEDS_MELON, "Melon Seeds"); add(Tags.Items.SEEDS_PUMPKIN, "Pumpkin Seeds"); add(Tags.Items.SEEDS_WHEAT, "Wheat Seeds"); + add(Tags.Items.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Items.SLIMEBALLS, "Slimeballs"); add(Tags.Items.STONES, "Stones"); add(Tags.Items.STORAGE_BLOCKS, "Storage Blocks"); @@ -299,13 +302,13 @@ protected void addTranslations() { add(Tags.Items.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks"); add(Tags.Items.STRINGS, "Strings"); add(Tags.Items.VILLAGER_JOB_SITES, "Villager Job Sites"); - add(Tags.Items.TOOLS_SHEARS, "Shears"); - add(Tags.Items.TOOLS_SHIELDS, "Shields"); - add(Tags.Items.TOOLS_BOWS, "Bows"); - add(Tags.Items.TOOLS_CROSSBOWS, "Crossbows"); - add(Tags.Items.TOOLS_FISHING_RODS, "Fishing Rods"); - add(Tags.Items.TOOLS_BRUSHES, "Brushes"); - add(Tags.Items.TOOLS_SPEARS, "Spears"); + add(Tags.Items.TOOLS_SHEAR, "Shears"); + add(Tags.Items.TOOLS_SHIELD, "Shields"); + add(Tags.Items.TOOLS_BOW, "Bows"); + add(Tags.Items.TOOLS_CROSSBOW, "Crossbows"); + add(Tags.Items.TOOLS_FISHING_ROD, "Fishing Rods"); + add(Tags.Items.TOOLS_BRUSH, "Brushes"); + add(Tags.Items.TOOLS_SPEAR, "Spears"); add(Tags.Items.TOOLS, "Tools"); add(Tags.Items.ARMORS, "Armors"); add(Tags.Items.ENCHANTABLES, "Enchantables");