From 4305019e1e22fa0a7fd172fb42ed6bce55a1635e Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 27 May 2024 14:01:08 -0400 Subject: [PATCH 01/22] Tag cleanup and additions for 1.21 Closes https://github.com/neoforged/NeoForge/issues/993 Closes https://github.com/neoforged/NeoForge/issues/919 --- .../resources/assets/c/lang/en_us.json | 5 +---- .../data/c/tags/items/music_discs.json | 20 +++++++++++++++++++ .../data/c/tags/items/raw_blocks.json | 7 ------- .../data/c/tags/items/raw_blocks/copper.json | 5 ----- .../data/c/tags/items/raw_blocks/gold.json | 5 ----- .../data/c/tags/items/raw_blocks/iron.json | 5 ----- .../common/TagConventionLogWarning.java | 4 ++++ .../net/neoforged/neoforge/common/Tags.java | 9 +++++---- .../internal/NeoForgeItemTagsProvider.java | 9 +++++---- .../internal/NeoForgeLanguageProvider.java | 5 +---- 10 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 src/generated/resources/data/c/tags/items/music_discs.json delete mode 100644 src/generated/resources/data/c/tags/items/raw_blocks.json delete mode 100644 src/generated/resources/data/c/tags/items/raw_blocks/copper.json delete mode 100644 src/generated/resources/data/c/tags/items/raw_blocks/gold.json delete mode 100644 src/generated/resources/data/c/tags/items/raw_blocks/iron.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index e48d3a95b1..1d6ea0905a 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -248,6 +248,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 +277,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", diff --git a/src/generated/resources/data/c/tags/items/music_discs.json b/src/generated/resources/data/c/tags/items/music_discs.json new file mode 100644 index 0000000000..abd9fd5360 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/music_discs.json @@ -0,0 +1,20 @@ +{ + "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" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/raw_blocks.json b/src/generated/resources/data/c/tags/items/raw_blocks.json deleted file mode 100644 index fef9f55fc6..0000000000 --- a/src/generated/resources/data/c/tags/items/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/items/raw_blocks/copper.json b/src/generated/resources/data/c/tags/items/raw_blocks/copper.json deleted file mode 100644 index 1a21e230ef..0000000000 --- a/src/generated/resources/data/c/tags/items/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/items/raw_blocks/gold.json b/src/generated/resources/data/c/tags/items/raw_blocks/gold.json deleted file mode 100644 index 80781ce667..0000000000 --- a/src/generated/resources/data/c/tags/items/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/items/raw_blocks/iron.json b/src/generated/resources/data/c/tags/items/raw_blocks/iron.json deleted file mode 100644 index 13ed9fc651..0000000000 --- a/src/generated/resources/data/c/tags/items/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/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java index ad793a905a..d055eb88f4 100644 --- a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java +++ b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java @@ -308,6 +308,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), diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 2f1969aa1e..c4ec8429ac 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -438,6 +438,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 +498,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"); 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 5bcf2f9d59..824033b46a 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 @@ -134,6 +134,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); + // TODO: Add the 1.21 music discs to here when merged in 1.21 branch and add log warning to help migration efforts + 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); 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 +167,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); 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 10c3d9c07d..b9da575f1e 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 @@ -219,6 +219,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 +249,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"); From 4e03d711419c109cabfc84037e108badde2059f5 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Thu, 30 May 2024 18:27:29 -0400 Subject: [PATCH 02/22] remove eroded badlands from sparse vegetation --- .../c/tags/worldgen/biome/is_sparse_vegetation/overworld.json | 1 - .../neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java | 1 - 2 files changed, 2 deletions(-) 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/data/internal/NeoForgeBiomeTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java index 66ed49ca3c..f4067f5de2 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) From 7303088b7e43b91d0e2f1f8ce30df13d1031ca58 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:48:07 -0400 Subject: [PATCH 03/22] Switched to singular name for inner files for tools --- .../resources/assets/c/lang/en_us.json | 14 ++++---- .../resources/data/c/tags/items/tools.json | 14 ++++---- .../data/c/tags/items/tools/bow.json | 13 +++++++ .../items/tools/{bows.json => brush.json} | 4 +-- .../data/c/tags/items/tools/brushes.json | 5 --- .../data/c/tags/items/tools/crossbow.json | 13 +++++++ .../data/c/tags/items/tools/crossbows.json | 9 ----- .../data/c/tags/items/tools/fishing_rod.json | 13 +++++++ .../data/c/tags/items/tools/fishing_rods.json | 9 ----- .../items/tools/{shears.json => shear.json} | 4 +++ .../data/c/tags/items/tools/shield.json | 13 +++++++ .../data/c/tags/items/tools/shields.json | 9 ----- .../items/tools/{spears.json => spear.json} | 4 +++ .../common/TagConventionLogWarning.java | 21 +++++++---- .../net/neoforged/neoforge/common/Tags.java | 14 ++++---- .../internal/NeoForgeItemTagsProvider.java | 35 +++++++++++-------- .../internal/NeoForgeLanguageProvider.java | 14 ++++---- 17 files changed, 125 insertions(+), 83 deletions(-) create mode 100644 src/generated/resources/data/c/tags/items/tools/bow.json rename src/generated/resources/data/c/tags/items/tools/{bows.json => brush.json} (50%) delete mode 100644 src/generated/resources/data/c/tags/items/tools/brushes.json create mode 100644 src/generated/resources/data/c/tags/items/tools/crossbow.json delete mode 100644 src/generated/resources/data/c/tags/items/tools/crossbows.json create mode 100644 src/generated/resources/data/c/tags/items/tools/fishing_rod.json delete mode 100644 src/generated/resources/data/c/tags/items/tools/fishing_rods.json rename src/generated/resources/data/c/tags/items/tools/{shears.json => shear.json} (61%) create mode 100644 src/generated/resources/data/c/tags/items/tools/shield.json delete mode 100644 src/generated/resources/data/c/tags/items/tools/shields.json rename src/generated/resources/data/c/tags/items/tools/{spears.json => spear.json} (62%) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 1d6ea0905a..e0e61765f3 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -324,13 +324,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/items/tools.json b/src/generated/resources/data/c/tags/items/tools.json index 8b2c2aae5e..109eabfd56 100644 --- a/src/generated/resources/data/c/tags/items/tools.json +++ b/src/generated/resources/data/c/tags/items/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/items/tools/bow.json b/src/generated/resources/data/c/tags/items/tools/bow.json new file mode 100644 index 0000000000..d98e88796b --- /dev/null +++ b/src/generated/resources/data/c/tags/items/tools/bow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:bow", + { + "id": "#forge:tools/bow", + "required": false + }, + { + "id": "#c:tools/bows", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/bows.json b/src/generated/resources/data/c/tags/items/tools/brush.json similarity index 50% rename from src/generated/resources/data/c/tags/items/tools/bows.json rename to src/generated/resources/data/c/tags/items/tools/brush.json index e46556b3d2..6ba7120fda 100644 --- a/src/generated/resources/data/c/tags/items/tools/bows.json +++ b/src/generated/resources/data/c/tags/items/tools/brush.json @@ -1,8 +1,8 @@ { "values": [ - "minecraft:bow", + "minecraft:brush", { - "id": "#forge:tools/bows", + "id": "#c:tools/brushes", "required": false } ] diff --git a/src/generated/resources/data/c/tags/items/tools/brushes.json b/src/generated/resources/data/c/tags/items/tools/brushes.json deleted file mode 100644 index 8b2fb219ea..0000000000 --- a/src/generated/resources/data/c/tags/items/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/items/tools/crossbow.json b/src/generated/resources/data/c/tags/items/tools/crossbow.json new file mode 100644 index 0000000000..e9cd8f216e --- /dev/null +++ b/src/generated/resources/data/c/tags/items/tools/crossbow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:crossbow", + { + "id": "#forge:tools/crossbow", + "required": false + }, + { + "id": "#c:tools/crossbows", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/crossbows.json b/src/generated/resources/data/c/tags/items/tools/crossbows.json deleted file mode 100644 index d1e63bc584..0000000000 --- a/src/generated/resources/data/c/tags/items/tools/crossbows.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:crossbow", - { - "id": "#forge:tools/crossbows", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/fishing_rod.json b/src/generated/resources/data/c/tags/items/tools/fishing_rod.json new file mode 100644 index 0000000000..5d627c305c --- /dev/null +++ b/src/generated/resources/data/c/tags/items/tools/fishing_rod.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:fishing_rod", + { + "id": "#forge:tools/fishing_rod", + "required": false + }, + { + "id": "#c:tools/fishing_rods", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/fishing_rods.json b/src/generated/resources/data/c/tags/items/tools/fishing_rods.json deleted file mode 100644 index efafba4845..0000000000 --- a/src/generated/resources/data/c/tags/items/tools/fishing_rods.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:fishing_rod", - { - "id": "#forge:tools/fishing_rods", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/shears.json b/src/generated/resources/data/c/tags/items/tools/shear.json similarity index 61% rename from src/generated/resources/data/c/tags/items/tools/shears.json rename to src/generated/resources/data/c/tags/items/tools/shear.json index 1c2ad36f72..5a71933350 100644 --- a/src/generated/resources/data/c/tags/items/tools/shears.json +++ b/src/generated/resources/data/c/tags/items/tools/shear.json @@ -4,6 +4,10 @@ { "id": "#forge:shears", "required": false + }, + { + "id": "#c:tools/shears", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/shield.json b/src/generated/resources/data/c/tags/items/tools/shield.json new file mode 100644 index 0000000000..9a7dfab7a4 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/tools/shield.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:shield", + { + "id": "#forge:tools/shield", + "required": false + }, + { + "id": "#c:tools/shields", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/shields.json b/src/generated/resources/data/c/tags/items/tools/shields.json deleted file mode 100644 index f0b441428b..0000000000 --- a/src/generated/resources/data/c/tags/items/tools/shields.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:shield", - { - "id": "#forge:tools/shields", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/items/tools/spears.json b/src/generated/resources/data/c/tags/items/tools/spear.json similarity index 62% rename from src/generated/resources/data/c/tags/items/tools/spears.json rename to src/generated/resources/data/c/tags/items/tools/spear.json index c5b8b99af6..6682be01f8 100644 --- a/src/generated/resources/data/c/tags/items/tools/spears.json +++ b/src/generated/resources/data/c/tags/items/tools/spear.json @@ -4,6 +4,10 @@ { "id": "#forge:tools/tridents", "required": false + }, + { + "id": "#c:tools/tridents", + "required": false } ] } \ No newline at end of file diff --git a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java index d055eb88f4..c04bd04eb9 100644 --- a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java +++ b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java @@ -329,7 +329,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, "stained_glass", Tags.Items.GLASS_BLOCKS), createForgeMapEntry(Registries.ITEM, "stained_glass_panes", Tags.Items.GLASS_PANES), @@ -351,12 +351,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 c4ec8429ac..ab55215786 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -582,7 +582,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. @@ -590,7 +590,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. @@ -598,7 +598,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. @@ -606,7 +606,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. @@ -616,7 +616,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. @@ -624,7 +624,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. @@ -632,7 +632,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/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 824033b46a..03d3bb10c2 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 @@ -219,16 +219,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); @@ -333,14 +333,21 @@ 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(new ResourceLocation("forge", "shears")); - tag(Tags.Items.TOOLS_SPEARS).addOptionalTag(new ResourceLocation("forge", "tools/tridents")); + tagWithOptionalLegacy(Tags.Items.TOOLS_SHIELD); + tagWithOptionalLegacy(Tags.Items.TOOLS_BOW); + tagWithOptionalLegacy(Tags.Items.TOOLS_CROSSBOW); + tagWithOptionalLegacy(Tags.Items.TOOLS_FISHING_ROD); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("forge", "shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("forge", "tools/tridents")); tagWithOptionalLegacy(Tags.Items.TOOLS); tagWithOptionalLegacy(Tags.Items.ARMORS); + tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(new ResourceLocation("c", "tools/shields")); + tag(Tags.Items.TOOLS_BOW).addOptionalTag(new ResourceLocation("c", "tools/bows")); + tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(new ResourceLocation("c", "tools/brushes")); + tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(new ResourceLocation("c", "tools/crossbows")); + tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(new ResourceLocation("c", "tools/fishing_rods")); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("c", "tools/shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("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 b9da575f1e..f7027c5815 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 @@ -296,13 +296,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"); From d60bb60015941e34cb427963df7f5ddd9ff81a2b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 07:32:09 -0400 Subject: [PATCH 04/22] Added shulker boxes tag and removed duplicate green stained glass entry --- .../resources/assets/c/lang/en_us.json | 2 ++ .../c/tags/blocks/glass_blocks/cheap.json | 1 - .../data/c/tags/blocks/shulker_boxes.json | 21 +++++++++++++++++++ .../data/c/tags/items/glass_blocks/cheap.json | 1 - .../data/c/tags/items/shulker_boxes.json | 21 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 2 ++ .../internal/NeoForgeBlockTagsProvider.java | 3 ++- .../internal/NeoForgeItemTagsProvider.java | 1 + .../internal/NeoForgeLanguageProvider.java | 2 ++ 9 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/c/tags/blocks/shulker_boxes.json create mode 100644 src/generated/resources/data/c/tags/items/shulker_boxes.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index e0e61765f3..07dc800831 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -84,6 +84,7 @@ "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.c.shulker_boxes": "Shulker Boxes", "tag.block.c.skulls": "Skulls", "tag.block.c.stones": "Stones", "tag.block.c.storage_blocks": "Storage Blocks", @@ -303,6 +304,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", diff --git a/src/generated/resources/data/c/tags/blocks/glass_blocks/cheap.json b/src/generated/resources/data/c/tags/blocks/glass_blocks/cheap.json index 016e4315ef..ccd28136a6 100644 --- a/src/generated/resources/data/c/tags/blocks/glass_blocks/cheap.json +++ b/src/generated/resources/data/c/tags/blocks/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/blocks/shulker_boxes.json b/src/generated/resources/data/c/tags/blocks/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/generated/resources/data/c/tags/blocks/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/items/glass_blocks/cheap.json b/src/generated/resources/data/c/tags/items/glass_blocks/cheap.json index 016e4315ef..ccd28136a6 100644 --- a/src/generated/resources/data/c/tags/items/glass_blocks/cheap.json +++ b/src/generated/resources/data/c/tags/items/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/items/shulker_boxes.json b/src/generated/resources/data/c/tags/items/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index ab55215786..d205716624 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -184,6 +184,7 @@ public static class Blocks { public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = tag("sandstone/uncolored_blocks"); public static final TagKey SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs"); public static final TagKey SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs"); + public static final TagKey SHULKER_BOXES = tag("shulker_boxes"); /** * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) */ @@ -534,6 +535,7 @@ 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"); + 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. 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 aa6350ba9f..dbb27ad4ea 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 @@ -70,11 +70,12 @@ 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.GRAVELS).add(Blocks.GRAVEL); + tag(Tags.Blocks.SHULKER_BOXES).add(Blocks.SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.BLACK_SHULKER_BOX); 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); tag(Tags.Blocks.NETHERRACKS).add(Blocks.NETHERRACK); 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 03d3bb10c2..bbf9073796 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 @@ -194,6 +194,7 @@ 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); + copy(Tags.Blocks.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); 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); 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 f7027c5815..80e4c2af48 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 @@ -97,6 +97,7 @@ protected void addTranslations() { add(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); add(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); add(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + add(Tags.Blocks.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Blocks.STONES, "Stones"); add(Tags.Blocks.STORAGE_BLOCKS, "Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, "Bone Meal Storage Blocks"); @@ -275,6 +276,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"); From 33e838146d25ad578c20b2896d61e862ccafecea Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 07:36:45 -0400 Subject: [PATCH 05/22] Removed Block shulker box tag --- src/main/java/net/neoforged/neoforge/common/Tags.java | 1 - .../common/data/internal/NeoForgeBlockTagsProvider.java | 1 - .../common/data/internal/NeoForgeItemTagsProvider.java | 3 ++- .../common/data/internal/NeoForgeLanguageProvider.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index d205716624..5ba6c49a84 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -184,7 +184,6 @@ public static class Blocks { public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = tag("sandstone/uncolored_blocks"); public static final TagKey SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs"); public static final TagKey SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs"); - public static final TagKey SHULKER_BOXES = tag("shulker_boxes"); /** * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) */ 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 dbb27ad4ea..f3ebfefc82 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 @@ -75,7 +75,6 @@ public void addTags(HolderLookup.Provider p_256380_) { 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.GRAVELS).add(Blocks.GRAVEL); - tag(Tags.Blocks.SHULKER_BOXES).add(Blocks.SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.BLACK_SHULKER_BOX); 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); tag(Tags.Blocks.NETHERRACKS).add(Blocks.NETHERRACK); 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 bbf9073796..721a24d213 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 @@ -14,6 +14,7 @@ import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; @@ -194,7 +195,7 @@ 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); - copy(Tags.Blocks.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); + copy(BlockTags.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); 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); 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 80e4c2af48..916a1591de 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 @@ -97,7 +97,6 @@ protected void addTranslations() { add(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); add(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); add(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); - add(Tags.Blocks.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Blocks.STONES, "Stones"); add(Tags.Blocks.STORAGE_BLOCKS, "Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, "Bone Meal Storage Blocks"); From 03397e6d1086aa114dee3dc2471ce327c792c0fd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:00:25 -0400 Subject: [PATCH 06/22] Fixed shulker box tag --- .../resources/assets/c/lang/en_us.json | 1 - .../data/c/tags/blocks/shulker_boxes.json | 21 ------------------- .../internal/NeoForgeItemTagsProvider.java | 8 ++++++- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/blocks/shulker_boxes.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 07dc800831..aadfe601d6 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -84,7 +84,6 @@ "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.c.shulker_boxes": "Shulker Boxes", "tag.block.c.skulls": "Skulls", "tag.block.c.stones": "Stones", "tag.block.c.storage_blocks": "Storage Blocks", diff --git a/src/generated/resources/data/c/tags/blocks/shulker_boxes.json b/src/generated/resources/data/c/tags/blocks/shulker_boxes.json deleted file mode 100644 index 8ffa83c158..0000000000 --- a/src/generated/resources/data/c/tags/blocks/shulker_boxes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 721a24d213..e94235c6cf 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 @@ -195,7 +195,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); - copy(BlockTags.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); + 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); From 09b847b5c751852b776423408c9c8661ca5f5e3c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:04:13 -0400 Subject: [PATCH 07/22] Added glazed terracotta tags --- .../resources/assets/c/lang/en_us.json | 2 ++ .../data/c/tags/blocks/glazed_terracotta.json | 20 +++++++++++++++++++ .../data/c/tags/items/glazed_terracotta.json | 20 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 2 ++ .../internal/NeoForgeBlockTagsProvider.java | 1 + .../internal/NeoForgeItemTagsProvider.java | 1 + .../internal/NeoForgeLanguageProvider.java | 2 ++ 7 files changed, 48 insertions(+) create mode 100644 src/generated/resources/data/c/tags/blocks/glazed_terracotta.json create mode 100644 src/generated/resources/data/c/tags/items/glazed_terracotta.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index aadfe601d6..0acee5593c 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -44,6 +44,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_terracotta": "Glazed Terracotta", "tag.block.c.gravels": "Gravels", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.block.c.netherracks": "Netherracks", @@ -238,6 +239,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_terracotta": "Glazed Terracotta", "tag.item.c.gravels": "Gravels", "tag.item.c.gunpowders": "Gunpowders", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", diff --git a/src/generated/resources/data/c/tags/blocks/glazed_terracotta.json b/src/generated/resources/data/c/tags/blocks/glazed_terracotta.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/blocks/glazed_terracotta.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/items/glazed_terracotta.json b/src/generated/resources/data/c/tags/items/glazed_terracotta.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/glazed_terracotta.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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 5ba6c49a84..24d18aa1d7 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -104,6 +104,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_TERRACOTTA = tag("glazed_terracotta"); public static final TagKey GRAVELS = tag("gravels"); /** @@ -424,6 +425,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_TERRACOTTA = tag("glazed_terracotta"); public static final TagKey GRAVELS = tag("gravels"); public static final TagKey GUNPOWDERS = tag("gunpowders"); 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 f3ebfefc82..d2937dca28 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 @@ -74,6 +74,7 @@ public void addTags(HolderLookup.Provider p_256380_) { 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_TERRACOTTA).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 e94235c6cf..6880a035c9 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 @@ -125,6 +125,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_TERRACOTTA, Tags.Items.GLAZED_TERRACOTTA); copy(Tags.Blocks.GRAVELS, Tags.Items.GRAVELS); tag(Tags.Items.GUNPOWDERS).add(Items.GUNPOWDER); tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS); 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 916a1591de..77f5fdf47c 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 @@ -53,6 +53,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_TERRACOTTA, "Glazed Terracotta"); add(Tags.Blocks.GRAVELS, "Gravels"); add(Tags.Blocks.SKULLS, "Skulls"); add(Tags.Blocks.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); @@ -210,6 +211,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_TERRACOTTA, "Glazed Terracotta"); add(Tags.Items.GRAVELS, "Gravels"); add(Tags.Items.GUNPOWDERS, "Gunpowders"); add(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); From 3deb7b03f251ae6d37a53aa764d4776fdba73111 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:14:46 -0400 Subject: [PATCH 08/22] Added concrete and concrete powder tags --- .../resources/assets/c/lang/en_us.json | 3 +++ .../data/c/tags/blocks/concrete.json | 20 +++++++++++++++++++ .../resources/data/c/tags/items/concrete.json | 20 +++++++++++++++++++ .../data/c/tags/items/concrete_powder.json | 20 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 9 +++++++++ .../internal/NeoForgeBlockTagsProvider.java | 1 + .../internal/NeoForgeItemTagsProvider.java | 8 ++++++++ .../internal/NeoForgeLanguageProvider.java | 3 +++ 8 files changed, 84 insertions(+) create mode 100644 src/generated/resources/data/c/tags/blocks/concrete.json create mode 100644 src/generated/resources/data/c/tags/items/concrete.json create mode 100644 src/generated/resources/data/c/tags/items/concrete_powder.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 0acee5593c..246204b0c0 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.concrete": "Concrete", "tag.block.c.dyed": "Dyed Blocks", "tag.block.c.dyed.black": "Black Dyed Blocks", "tag.block.c.dyed.blue": "Blue Dyed Blocks", @@ -159,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": "Concrete", + "tag.item.c.concrete_powder": "Concrete Powder", "tag.item.c.crops": "Crops", "tag.item.c.crops.beetroot": "Beetroot Crops", "tag.item.c.crops.carrot": "Carrot Crops", diff --git a/src/generated/resources/data/c/tags/blocks/concrete.json b/src/generated/resources/data/c/tags/blocks/concrete.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/blocks/concrete.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/items/concrete.json b/src/generated/resources/data/c/tags/items/concrete.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/items/concrete.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/items/concrete_powder.json b/src/generated/resources/data/c/tags/items/concrete_powder.json new file mode 100644 index 0000000000..57a09c9b25 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/concrete_powder.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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 24d18aa1d7..bfadc99c40 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 CONCRETE = tag("concrete"); /** * Tag that holds all blocks that can be dyed a specific color. @@ -300,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 CONCRETE = tag("concrete"); + /** + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER} + */ + public static final TagKey CONCRETE_POWDER = tag("concrete_powder"); /** * For blocks that are similar to amethyst where they have clusters forming from budding blocks */ @@ -536,6 +542,9 @@ 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"); /** 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 d2937dca28..42a1330423 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.CONCRETE).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"); 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 6880a035c9..52b4e45ef5 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 @@ -59,6 +59,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.CONCRETE, Tags.Items.CONCRETE); + tag(Tags.Items.CONCRETE_POWDER) + .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); 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 77f5fdf47c..8c69c9b0ec 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.CONCRETE, "Concrete"); add(Tags.Blocks.DYED, "Dyed Blocks"); addColored(Tags.Blocks.DYED, "{color} Dyed Blocks"); add(Tags.Blocks.END_STONES, "End Stones"); @@ -146,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.CONCRETE, "Concrete"); + add(Tags.Items.CONCRETE_POWDER, "Concrete Powder"); add(Tags.Items.CROPS, "Crops"); add(Tags.Items.CROPS_BEETROOT, "Beetroot Crops"); add(Tags.Items.CROPS_CARROT, "Carrot Crops"); From 1804ab660e417200df373df7f14d92a0e0440488 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:21:47 -0400 Subject: [PATCH 09/22] SPOTLESS --- .../neoforge/common/data/internal/NeoForgeItemTagsProvider.java | 1 - 1 file changed, 1 deletion(-) 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 52b4e45ef5..bb97b47e7e 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 @@ -14,7 +14,6 @@ import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; From 79dccb61bf3096c1e755113be8ec065225b738df Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 27 May 2024 14:01:08 -0400 Subject: [PATCH 10/22] Tag cleanup and additions for 1.21 Closes https://github.com/neoforged/NeoForge/issues/993 Closes https://github.com/neoforged/NeoForge/issues/919 --- .../resources/assets/c/lang/en_us.json | 5 +---- .../data/c/tags/item/music_discs.json | 20 +++++++++++++++++++ .../data/c/tags/item/raw_blocks.json | 7 ------- .../data/c/tags/item/raw_blocks/copper.json | 5 ----- .../data/c/tags/item/raw_blocks/gold.json | 5 ----- .../data/c/tags/item/raw_blocks/iron.json | 5 ----- .../common/TagConventionLogWarning.java | 4 ++++ .../net/neoforged/neoforge/common/Tags.java | 9 +++++---- .../internal/NeoForgeItemTagsProvider.java | 9 +++++---- .../internal/NeoForgeLanguageProvider.java | 5 +---- 10 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 src/generated/resources/data/c/tags/item/music_discs.json delete mode 100644 src/generated/resources/data/c/tags/item/raw_blocks.json delete mode 100644 src/generated/resources/data/c/tags/item/raw_blocks/copper.json delete mode 100644 src/generated/resources/data/c/tags/item/raw_blocks/gold.json delete mode 100644 src/generated/resources/data/c/tags/item/raw_blocks/iron.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index e48d3a95b1..1d6ea0905a 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -248,6 +248,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 +277,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", 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..abd9fd5360 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/music_discs.json @@ -0,0 +1,20 @@ +{ + "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" + ] +} \ 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/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java index 4a1c76e0f8..a3a38dbbd4 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), diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index fef140997a..9dfbaafcd7 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -438,6 +438,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 +498,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"); 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..33eb83d6b6 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 @@ -134,6 +134,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); + // TODO: Add the 1.21 music discs to here when merged in 1.21 branch and add log warning to help migration efforts + 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); 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 +167,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); 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..70fc21c24c 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 @@ -219,6 +219,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 +249,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"); From a27e3d55008c97ab93132a4807ec5f022dd28595 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Thu, 30 May 2024 18:27:29 -0400 Subject: [PATCH 11/22] remove eroded badlands from sparse vegetation --- .../c/tags/worldgen/biome/is_sparse_vegetation/overworld.json | 1 - .../neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java | 1 - 2 files changed, 2 deletions(-) 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/data/internal/NeoForgeBiomeTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java index 702069b969..a932c25054 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) From be32eb32ef35c69e4091fbdb7da1495e30411ad2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:48:07 -0400 Subject: [PATCH 12/22] Switched to singular name for inner files for tools --- .../resources/assets/c/lang/en_us.json | 14 ++++---- .../resources/data/c/tags/item/tools.json | 14 ++++---- .../resources/data/c/tags/item/tools/bow.json | 13 +++++++ .../data/c/tags/item/tools/bows.json | 4 +-- .../data/c/tags/item/tools/brush.json | 9 +++++ .../data/c/tags/item/tools/brushes.json | 5 --- .../data/c/tags/item/tools/crossbow.json | 13 +++++++ .../data/c/tags/item/tools/crossbows.json | 9 ----- .../data/c/tags/item/tools/fishing_rod.json | 13 +++++++ .../data/c/tags/item/tools/fishing_rods.json | 9 ----- .../data/c/tags/item/tools/shear.json | 13 +++++++ .../data/c/tags/item/tools/shears.json | 4 +++ .../data/c/tags/item/tools/shield.json | 13 +++++++ .../data/c/tags/item/tools/shields.json | 9 ----- .../data/c/tags/item/tools/spear.json | 13 +++++++ .../data/c/tags/item/tools/spears.json | 4 +++ .../common/TagConventionLogWarning.java | 21 +++++++---- .../net/neoforged/neoforge/common/Tags.java | 14 ++++---- .../internal/NeoForgeItemTagsProvider.java | 35 +++++++++++-------- .../internal/NeoForgeLanguageProvider.java | 14 ++++---- 20 files changed, 160 insertions(+), 83 deletions(-) create mode 100644 src/generated/resources/data/c/tags/item/tools/bow.json create mode 100644 src/generated/resources/data/c/tags/item/tools/brush.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/brushes.json create mode 100644 src/generated/resources/data/c/tags/item/tools/crossbow.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/crossbows.json create mode 100644 src/generated/resources/data/c/tags/item/tools/fishing_rod.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/fishing_rods.json create mode 100644 src/generated/resources/data/c/tags/item/tools/shear.json create mode 100644 src/generated/resources/data/c/tags/item/tools/shield.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/shields.json create mode 100644 src/generated/resources/data/c/tags/item/tools/spear.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 1d6ea0905a..e0e61765f3 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -324,13 +324,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/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..d98e88796b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/bow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:bow", + { + "id": "#forge:tools/bow", + "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 index e46556b3d2..6ba7120fda 100644 --- a/src/generated/resources/data/c/tags/item/tools/bows.json +++ b/src/generated/resources/data/c/tags/item/tools/bows.json @@ -1,8 +1,8 @@ { "values": [ - "minecraft:bow", + "minecraft:brush", { - "id": "#forge:tools/bows", + "id": "#c:tools/brushes", "required": false } ] 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..6ba7120fda --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/brush.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brush", + { + "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/crossbow.json b/src/generated/resources/data/c/tags/item/tools/crossbow.json new file mode 100644 index 0000000000..e9cd8f216e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/crossbow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:crossbow", + { + "id": "#forge:tools/crossbow", + "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/crossbows.json b/src/generated/resources/data/c/tags/item/tools/crossbows.json deleted file mode 100644 index d1e63bc584..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/crossbows.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:crossbow", - { - "id": "#forge:tools/crossbows", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/tools/fishing_rod.json b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json new file mode 100644 index 0000000000..5d627c305c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:fishing_rod", + { + "id": "#forge:tools/fishing_rod", + "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/fishing_rods.json b/src/generated/resources/data/c/tags/item/tools/fishing_rods.json deleted file mode 100644 index efafba4845..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/fishing_rods.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:fishing_rod", - { - "id": "#forge: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..5a71933350 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/shear.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:shears", + { + "id": "#forge: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 index 1c2ad36f72..5a71933350 100644 --- a/src/generated/resources/data/c/tags/item/tools/shears.json +++ b/src/generated/resources/data/c/tags/item/tools/shears.json @@ -4,6 +4,10 @@ { "id": "#forge: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/shield.json b/src/generated/resources/data/c/tags/item/tools/shield.json new file mode 100644 index 0000000000..9a7dfab7a4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/shield.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:shield", + { + "id": "#forge:tools/shield", + "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/shields.json b/src/generated/resources/data/c/tags/item/tools/shields.json deleted file mode 100644 index f0b441428b..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/shields.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:shield", - { - "id": "#forge: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..6682be01f8 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/tools/spear.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:trident", + { + "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 index c5b8b99af6..6682be01f8 100644 --- a/src/generated/resources/data/c/tags/item/tools/spears.json +++ b/src/generated/resources/data/c/tags/item/tools/spears.json @@ -4,6 +4,10 @@ { "id": "#forge:tools/tridents", "required": false + }, + { + "id": "#c:tools/tridents", + "required": false } ] } \ No newline at end of file diff --git a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java index a3a38dbbd4..55288d4f2a 100644 --- a/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java +++ b/src/main/java/net/neoforged/neoforge/common/TagConventionLogWarning.java @@ -332,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), @@ -352,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 9dfbaafcd7..fa7d5efac4 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -582,7 +582,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. @@ -590,7 +590,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. @@ -598,7 +598,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. @@ -606,7 +606,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. @@ -616,7 +616,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. @@ -624,7 +624,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. @@ -632,7 +632,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/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 33eb83d6b6..9846ee0f23 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 @@ -219,16 +219,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); @@ -333,14 +333,21 @@ 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")); + tagWithOptionalLegacy(Tags.Items.TOOLS_SHIELD); + tagWithOptionalLegacy(Tags.Items.TOOLS_BOW); + tagWithOptionalLegacy(Tags.Items.TOOLS_CROSSBOW); + tagWithOptionalLegacy(Tags.Items.TOOLS_FISHING_ROD); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("forge", "shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("forge", "tools/tridents")); tagWithOptionalLegacy(Tags.Items.TOOLS); tagWithOptionalLegacy(Tags.Items.ARMORS); + tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(new ResourceLocation("c", "tools/shields")); + tag(Tags.Items.TOOLS_BOW).addOptionalTag(new ResourceLocation("c", "tools/bows")); + tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(new ResourceLocation("c", "tools/brushes")); + tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(new ResourceLocation("c", "tools/crossbows")); + tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(new ResourceLocation("c", "tools/fishing_rods")); + tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("c", "tools/shears")); + tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("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 70fc21c24c..0d1f5093ab 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 @@ -296,13 +296,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"); From 66476c94a7ec7c0c6ef6531fa80f01e08c66c3ae Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 07:32:09 -0400 Subject: [PATCH 13/22] Added shulker boxes tag and removed duplicate green stained glass entry --- .../resources/assets/c/lang/en_us.json | 2 ++ .../data/c/tags/block/glass_blocks/cheap.json | 1 - .../data/c/tags/blocks/shulker_boxes.json | 21 +++++++++++++++++++ .../data/c/tags/item/glass_blocks/cheap.json | 1 - .../data/c/tags/items/shulker_boxes.json | 21 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 2 ++ .../internal/NeoForgeBlockTagsProvider.java | 3 ++- .../internal/NeoForgeItemTagsProvider.java | 1 + .../internal/NeoForgeLanguageProvider.java | 2 ++ 9 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/c/tags/blocks/shulker_boxes.json create mode 100644 src/generated/resources/data/c/tags/items/shulker_boxes.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index e0e61765f3..07dc800831 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -84,6 +84,7 @@ "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", + "tag.block.c.shulker_boxes": "Shulker Boxes", "tag.block.c.skulls": "Skulls", "tag.block.c.stones": "Stones", "tag.block.c.storage_blocks": "Storage Blocks", @@ -303,6 +304,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", 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/blocks/shulker_boxes.json b/src/generated/resources/data/c/tags/blocks/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/generated/resources/data/c/tags/blocks/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/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/items/shulker_boxes.json b/src/generated/resources/data/c/tags/items/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index fa7d5efac4..2eeee2c68d 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -184,6 +184,7 @@ public static class Blocks { public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = tag("sandstone/uncolored_blocks"); public static final TagKey SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs"); public static final TagKey SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs"); + public static final TagKey SHULKER_BOXES = tag("shulker_boxes"); /** * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) */ @@ -534,6 +535,7 @@ 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"); + 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. 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..30fafda67d 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 @@ -70,11 +70,12 @@ 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.GRAVELS).add(Blocks.GRAVEL); + tag(Tags.Blocks.SHULKER_BOXES).add(Blocks.SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.BLACK_SHULKER_BOX); 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); tag(Tags.Blocks.NETHERRACKS).add(Blocks.NETHERRACK); 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 9846ee0f23..329bf11d1f 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 @@ -194,6 +194,7 @@ 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); + copy(Tags.Blocks.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); 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); 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 0d1f5093ab..8bbff67ec4 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 @@ -97,6 +97,7 @@ protected void addTranslations() { add(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); add(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); add(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); + add(Tags.Blocks.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Blocks.STONES, "Stones"); add(Tags.Blocks.STORAGE_BLOCKS, "Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, "Bone Meal Storage Blocks"); @@ -275,6 +276,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"); From 9185e826488f9000b22d32ce5e7d460abc4ebc56 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 07:36:45 -0400 Subject: [PATCH 14/22] Removed Block shulker box tag --- src/main/java/net/neoforged/neoforge/common/Tags.java | 1 - .../common/data/internal/NeoForgeBlockTagsProvider.java | 1 - .../common/data/internal/NeoForgeItemTagsProvider.java | 3 ++- .../common/data/internal/NeoForgeLanguageProvider.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 2eeee2c68d..45ba6c0d6b 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -184,7 +184,6 @@ public static class Blocks { public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = tag("sandstone/uncolored_blocks"); public static final TagKey SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs"); public static final TagKey SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs"); - public static final TagKey SHULKER_BOXES = tag("shulker_boxes"); /** * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) */ 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 30fafda67d..7388f0b177 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 @@ -75,7 +75,6 @@ public void addTags(HolderLookup.Provider p_256380_) { 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.GRAVELS).add(Blocks.GRAVEL); - tag(Tags.Blocks.SHULKER_BOXES).add(Blocks.SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.BLACK_SHULKER_BOX); 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); tag(Tags.Blocks.NETHERRACKS).add(Blocks.NETHERRACK); 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 329bf11d1f..04e292162a 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 @@ -14,6 +14,7 @@ import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; @@ -194,7 +195,7 @@ 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); - copy(Tags.Blocks.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); + copy(BlockTags.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); 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); 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 8bbff67ec4..07c4f65040 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 @@ -97,7 +97,6 @@ protected void addTranslations() { add(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, "Uncolored Sandstone Blocks"); add(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, "Uncolored Sandstone Slabs"); add(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, "Uncolored Sandstone Stairs"); - add(Tags.Blocks.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Blocks.STONES, "Stones"); add(Tags.Blocks.STORAGE_BLOCKS, "Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, "Bone Meal Storage Blocks"); From 55a48a10ef9aede5dd437bc3209e259c371e3c2c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:00:25 -0400 Subject: [PATCH 15/22] Fixed shulker box tag --- .../resources/assets/c/lang/en_us.json | 1 - .../data/c/tags/blocks/shulker_boxes.json | 21 ------------------- .../internal/NeoForgeItemTagsProvider.java | 8 ++++++- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/blocks/shulker_boxes.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 07dc800831..aadfe601d6 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -84,7 +84,6 @@ "tag.block.c.sandstone.uncolored_blocks": "Uncolored Sandstone Blocks", "tag.block.c.sandstone.uncolored_slabs": "Uncolored Sandstone Slabs", "tag.block.c.sandstone.uncolored_stairs": "Uncolored Sandstone Stairs", - "tag.block.c.shulker_boxes": "Shulker Boxes", "tag.block.c.skulls": "Skulls", "tag.block.c.stones": "Stones", "tag.block.c.storage_blocks": "Storage Blocks", diff --git a/src/generated/resources/data/c/tags/blocks/shulker_boxes.json b/src/generated/resources/data/c/tags/blocks/shulker_boxes.json deleted file mode 100644 index 8ffa83c158..0000000000 --- a/src/generated/resources/data/c/tags/blocks/shulker_boxes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 04e292162a..818b0f679b 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 @@ -195,7 +195,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); - copy(BlockTags.SHULKER_BOXES, Tags.Items.SHULKER_BOXES); + 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); From 0bc0db9e694a5352df726681f5f96964a06f6a28 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:04:13 -0400 Subject: [PATCH 16/22] Added glazed terracotta tags --- .../resources/assets/c/lang/en_us.json | 2 ++ .../data/c/tags/block/glazed_terracotta.json | 20 +++++++++++++++++++ .../data/c/tags/items/glazed_terracotta.json | 20 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 2 ++ .../internal/NeoForgeBlockTagsProvider.java | 1 + .../internal/NeoForgeItemTagsProvider.java | 1 + .../internal/NeoForgeLanguageProvider.java | 2 ++ 7 files changed, 48 insertions(+) create mode 100644 src/generated/resources/data/c/tags/block/glazed_terracotta.json create mode 100644 src/generated/resources/data/c/tags/items/glazed_terracotta.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index aadfe601d6..0acee5593c 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -44,6 +44,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_terracotta": "Glazed Terracotta", "tag.block.c.gravels": "Gravels", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.block.c.netherracks": "Netherracks", @@ -238,6 +239,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_terracotta": "Glazed Terracotta", "tag.item.c.gravels": "Gravels", "tag.item.c.gunpowders": "Gunpowders", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", diff --git a/src/generated/resources/data/c/tags/block/glazed_terracotta.json b/src/generated/resources/data/c/tags/block/glazed_terracotta.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/block/glazed_terracotta.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/items/glazed_terracotta.json b/src/generated/resources/data/c/tags/items/glazed_terracotta.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/glazed_terracotta.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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 45ba6c0d6b..6ad46ed144 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -104,6 +104,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_TERRACOTTA = tag("glazed_terracotta"); public static final TagKey GRAVELS = tag("gravels"); /** @@ -424,6 +425,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_TERRACOTTA = tag("glazed_terracotta"); public static final TagKey GRAVELS = tag("gravels"); public static final TagKey GUNPOWDERS = tag("gunpowders"); 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 7388f0b177..da4e50eb5a 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 @@ -74,6 +74,7 @@ public void addTags(HolderLookup.Provider p_256380_) { 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_TERRACOTTA).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 818b0f679b..02c700806c 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 @@ -125,6 +125,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_TERRACOTTA, Tags.Items.GLAZED_TERRACOTTA); copy(Tags.Blocks.GRAVELS, Tags.Items.GRAVELS); tag(Tags.Items.GUNPOWDERS).add(Items.GUNPOWDER); tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS); 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 07c4f65040..d703206292 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 @@ -53,6 +53,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_TERRACOTTA, "Glazed Terracotta"); add(Tags.Blocks.GRAVELS, "Gravels"); add(Tags.Blocks.SKULLS, "Skulls"); add(Tags.Blocks.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); @@ -210,6 +211,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_TERRACOTTA, "Glazed Terracotta"); add(Tags.Items.GRAVELS, "Gravels"); add(Tags.Items.GUNPOWDERS, "Gunpowders"); add(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers"); From f66095ecf582050a0e822c46493b4054776eff1f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:14:46 -0400 Subject: [PATCH 17/22] Added concrete and concrete powder tags --- .../resources/assets/c/lang/en_us.json | 3 +++ .../resources/data/c/tags/block/concrete.json | 20 +++++++++++++++++++ .../resources/data/c/tags/items/concrete.json | 20 +++++++++++++++++++ .../data/c/tags/items/concrete_powder.json | 20 +++++++++++++++++++ .../net/neoforged/neoforge/common/Tags.java | 9 +++++++++ .../internal/NeoForgeBlockTagsProvider.java | 1 + .../internal/NeoForgeItemTagsProvider.java | 8 ++++++++ .../internal/NeoForgeLanguageProvider.java | 3 +++ 8 files changed, 84 insertions(+) create mode 100644 src/generated/resources/data/c/tags/block/concrete.json create mode 100644 src/generated/resources/data/c/tags/items/concrete.json create mode 100644 src/generated/resources/data/c/tags/items/concrete_powder.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 0acee5593c..246204b0c0 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.concrete": "Concrete", "tag.block.c.dyed": "Dyed Blocks", "tag.block.c.dyed.black": "Black Dyed Blocks", "tag.block.c.dyed.blue": "Blue Dyed Blocks", @@ -159,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": "Concrete", + "tag.item.c.concrete_powder": "Concrete Powder", "tag.item.c.crops": "Crops", "tag.item.c.crops.beetroot": "Beetroot Crops", "tag.item.c.crops.carrot": "Carrot Crops", diff --git a/src/generated/resources/data/c/tags/block/concrete.json b/src/generated/resources/data/c/tags/block/concrete.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/block/concrete.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/items/concrete.json b/src/generated/resources/data/c/tags/items/concrete.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/generated/resources/data/c/tags/items/concrete.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/items/concrete_powder.json b/src/generated/resources/data/c/tags/items/concrete_powder.json new file mode 100644 index 0000000000..57a09c9b25 --- /dev/null +++ b/src/generated/resources/data/c/tags/items/concrete_powder.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/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 6ad46ed144..b9e3d7dc0f 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 CONCRETE = tag("concrete"); /** * Tag that holds all blocks that can be dyed a specific color. @@ -300,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 CONCRETE = tag("concrete"); + /** + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER} + */ + public static final TagKey CONCRETE_POWDER = tag("concrete_powder"); /** * For blocks that are similar to amethyst where they have clusters forming from budding blocks */ @@ -536,6 +542,9 @@ 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"); /** 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 da4e50eb5a..07172c17a4 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.CONCRETE).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"); 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 02c700806c..ab8c348560 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 @@ -59,6 +59,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.CONCRETE, Tags.Items.CONCRETE); + tag(Tags.Items.CONCRETE_POWDER) + .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); 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 d703206292..77fae8dc49 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.CONCRETE, "Concrete"); add(Tags.Blocks.DYED, "Dyed Blocks"); addColored(Tags.Blocks.DYED, "{color} Dyed Blocks"); add(Tags.Blocks.END_STONES, "End Stones"); @@ -146,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.CONCRETE, "Concrete"); + add(Tags.Items.CONCRETE_POWDER, "Concrete Powder"); add(Tags.Items.CROPS, "Crops"); add(Tags.Items.CROPS_BEETROOT, "Beetroot Crops"); add(Tags.Items.CROPS_CARROT, "Carrot Crops"); From 3ba4b510d064e5daec2339096e8334cff0b79f22 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:21:47 -0400 Subject: [PATCH 18/22] SPOTLESS --- .../neoforge/common/data/internal/NeoForgeItemTagsProvider.java | 1 - 1 file changed, 1 deletion(-) 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 ab8c348560..eb72a48260 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 @@ -14,7 +14,6 @@ import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; From 35bbd0fa2704b0d66488a572dbf8a09c93c87417 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:26:44 -0400 Subject: [PATCH 19/22] regen data and fixed resourcelocations --- .../data/c/tags/{items => item}/concrete.json | 0 .../tags/{items => item}/concrete_powder.json | 0 .../{items => item}/glazed_terracotta.json | 0 .../c/tags/{items => item}/shulker_boxes.json | 0 .../resources/data/c/tags/item/tools/bow.json | 2 +- .../data/c/tags/item/tools/bows.json | 9 ------ .../data/c/tags/item/tools/brush.json | 4 +++ .../data/c/tags/item/tools/crossbow.json | 2 +- .../data/c/tags/item/tools/fishing_rod.json | 2 +- .../data/c/tags/item/tools/shear.json | 4 +++ .../data/c/tags/item/tools/shears.json | 13 --------- .../data/c/tags/item/tools/shield.json | 2 +- .../data/c/tags/item/tools/spear.json | 4 +++ .../data/c/tags/item/tools/spears.json | 13 --------- .../internal/NeoForgeItemTagsProvider.java | 29 ++++++++++--------- 15 files changed, 32 insertions(+), 52 deletions(-) rename src/generated/resources/data/c/tags/{items => item}/concrete.json (100%) rename src/generated/resources/data/c/tags/{items => item}/concrete_powder.json (100%) rename src/generated/resources/data/c/tags/{items => item}/glazed_terracotta.json (100%) rename src/generated/resources/data/c/tags/{items => item}/shulker_boxes.json (100%) delete mode 100644 src/generated/resources/data/c/tags/item/tools/bows.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/shears.json delete mode 100644 src/generated/resources/data/c/tags/item/tools/spears.json diff --git a/src/generated/resources/data/c/tags/items/concrete.json b/src/generated/resources/data/c/tags/item/concrete.json similarity index 100% rename from src/generated/resources/data/c/tags/items/concrete.json rename to src/generated/resources/data/c/tags/item/concrete.json diff --git a/src/generated/resources/data/c/tags/items/concrete_powder.json b/src/generated/resources/data/c/tags/item/concrete_powder.json similarity index 100% rename from src/generated/resources/data/c/tags/items/concrete_powder.json rename to src/generated/resources/data/c/tags/item/concrete_powder.json diff --git a/src/generated/resources/data/c/tags/items/glazed_terracotta.json b/src/generated/resources/data/c/tags/item/glazed_terracotta.json similarity index 100% rename from src/generated/resources/data/c/tags/items/glazed_terracotta.json rename to src/generated/resources/data/c/tags/item/glazed_terracotta.json diff --git a/src/generated/resources/data/c/tags/items/shulker_boxes.json b/src/generated/resources/data/c/tags/item/shulker_boxes.json similarity index 100% rename from src/generated/resources/data/c/tags/items/shulker_boxes.json rename to src/generated/resources/data/c/tags/item/shulker_boxes.json diff --git a/src/generated/resources/data/c/tags/item/tools/bow.json b/src/generated/resources/data/c/tags/item/tools/bow.json index d98e88796b..0e7a3eb3a2 100644 --- a/src/generated/resources/data/c/tags/item/tools/bow.json +++ b/src/generated/resources/data/c/tags/item/tools/bow.json @@ -2,7 +2,7 @@ "values": [ "minecraft:bow", { - "id": "#forge:tools/bow", + "id": "#forge:tools/bows", "required": false }, { 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 6ba7120fda..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/bows.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "minecraft:brush", - { - "id": "#c:tools/brushes", - "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 index 6ba7120fda..bacde92122 100644 --- a/src/generated/resources/data/c/tags/item/tools/brush.json +++ b/src/generated/resources/data/c/tags/item/tools/brush.json @@ -1,6 +1,10 @@ { "values": [ "minecraft:brush", + { + "id": "#forge:tools/brushes", + "required": false + }, { "id": "#c:tools/brushes", "required": false diff --git a/src/generated/resources/data/c/tags/item/tools/crossbow.json b/src/generated/resources/data/c/tags/item/tools/crossbow.json index e9cd8f216e..7f9c54c37f 100644 --- a/src/generated/resources/data/c/tags/item/tools/crossbow.json +++ b/src/generated/resources/data/c/tags/item/tools/crossbow.json @@ -2,7 +2,7 @@ "values": [ "minecraft:crossbow", { - "id": "#forge:tools/crossbow", + "id": "#forge:tools/crossbows", "required": false }, { diff --git a/src/generated/resources/data/c/tags/item/tools/fishing_rod.json b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json index 5d627c305c..7b10f8bef7 100644 --- a/src/generated/resources/data/c/tags/item/tools/fishing_rod.json +++ b/src/generated/resources/data/c/tags/item/tools/fishing_rod.json @@ -2,7 +2,7 @@ "values": [ "minecraft:fishing_rod", { - "id": "#forge:tools/fishing_rod", + "id": "#forge:tools/fishing_rods", "required": false }, { diff --git a/src/generated/resources/data/c/tags/item/tools/shear.json b/src/generated/resources/data/c/tags/item/tools/shear.json index 5a71933350..4bfc43fa6b 100644 --- a/src/generated/resources/data/c/tags/item/tools/shear.json +++ b/src/generated/resources/data/c/tags/item/tools/shear.json @@ -5,6 +5,10 @@ "id": "#forge:shears", "required": false }, + { + "id": "#forge:tools/shears", + "required": false + }, { "id": "#c:tools/shears", "required": false 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 5a71933350..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/shears.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "values": [ - "minecraft:shears", - { - "id": "#forge: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/shield.json b/src/generated/resources/data/c/tags/item/tools/shield.json index 9a7dfab7a4..e7f561f3a0 100644 --- a/src/generated/resources/data/c/tags/item/tools/shield.json +++ b/src/generated/resources/data/c/tags/item/tools/shield.json @@ -2,7 +2,7 @@ "values": [ "minecraft:shield", { - "id": "#forge:tools/shield", + "id": "#forge:tools/shields", "required": false }, { diff --git a/src/generated/resources/data/c/tags/item/tools/spear.json b/src/generated/resources/data/c/tags/item/tools/spear.json index 6682be01f8..ec20a2fa83 100644 --- a/src/generated/resources/data/c/tags/item/tools/spear.json +++ b/src/generated/resources/data/c/tags/item/tools/spear.json @@ -5,6 +5,10 @@ "id": "#forge:tools/tridents", "required": false }, + { + "id": "#forge:tools/tridents", + "required": false + }, { "id": "#c:tools/tridents", "required": false 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 6682be01f8..0000000000 --- a/src/generated/resources/data/c/tags/item/tools/spears.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "values": [ - "minecraft:trident", - { - "id": "#forge:tools/tridents", - "required": false - }, - { - "id": "#c:tools/tridents", - "required": false - } - ] -} \ No newline at end of file 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 eb72a48260..8da5c16c5c 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 @@ -349,21 +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_SHIELD); - tagWithOptionalLegacy(Tags.Items.TOOLS_BOW); - tagWithOptionalLegacy(Tags.Items.TOOLS_CROSSBOW); - tagWithOptionalLegacy(Tags.Items.TOOLS_FISHING_ROD); - tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("forge", "shears")); - tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("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(new ResourceLocation("c", "tools/shields")); - tag(Tags.Items.TOOLS_BOW).addOptionalTag(new ResourceLocation("c", "tools/bows")); - tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(new ResourceLocation("c", "tools/brushes")); - tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(new ResourceLocation("c", "tools/crossbows")); - tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(new ResourceLocation("c", "tools/fishing_rods")); - tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(new ResourceLocation("c", "tools/shears")); - tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(new ResourceLocation("c", "tools/tridents")); + 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) { From 77271b6427028c0067dda21d7f351fdd64f8823b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:28:00 -0400 Subject: [PATCH 20/22] regen data --- .../data/c/tags/blocks/concrete.json | 20 ------------------- .../data/c/tags/blocks/glazed_terracotta.json | 20 ------------------- .../resources/data/c/tags/items/concrete.json | 20 ------------------- .../data/c/tags/items/glazed_terracotta.json | 20 ------------------- 4 files changed, 80 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/blocks/concrete.json delete mode 100644 src/generated/resources/data/c/tags/blocks/glazed_terracotta.json delete mode 100644 src/generated/resources/data/c/tags/items/concrete.json delete mode 100644 src/generated/resources/data/c/tags/items/glazed_terracotta.json diff --git a/src/generated/resources/data/c/tags/blocks/concrete.json b/src/generated/resources/data/c/tags/blocks/concrete.json deleted file mode 100644 index 99c8ab401a..0000000000 --- a/src/generated/resources/data/c/tags/blocks/concrete.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/blocks/glazed_terracotta.json b/src/generated/resources/data/c/tags/blocks/glazed_terracotta.json deleted file mode 100644 index 26cb2df258..0000000000 --- a/src/generated/resources/data/c/tags/blocks/glazed_terracotta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/items/concrete.json b/src/generated/resources/data/c/tags/items/concrete.json deleted file mode 100644 index 99c8ab401a..0000000000 --- a/src/generated/resources/data/c/tags/items/concrete.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/items/glazed_terracotta.json b/src/generated/resources/data/c/tags/items/glazed_terracotta.json deleted file mode 100644 index 26cb2df258..0000000000 --- a/src/generated/resources/data/c/tags/items/glazed_terracotta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 From 23c562ab19ea9b5f173429aab7c7ffdbe60b3a0a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:40:59 -0400 Subject: [PATCH 21/22] Fixed pluraliness --- src/generated/resources/assets/c/lang/en_us.json | 10 +++++----- .../c/tags/block/{concrete.json => concretes.json} | 0 ...{glazed_terracotta.json => glazed_terracottas.json} | 0 .../{concrete_powder.json => concrete_powders.json} | 0 .../data/c/tags/item/{concrete.json => concretes.json} | 0 ...{glazed_terracotta.json => glazed_terracottas.json} | 0 src/main/java/net/neoforged/neoforge/common/Tags.java | 10 +++++----- .../data/internal/NeoForgeBlockTagsProvider.java | 4 ++-- .../common/data/internal/NeoForgeItemTagsProvider.java | 6 +++--- .../common/data/internal/NeoForgeLanguageProvider.java | 10 +++++----- 10 files changed, 20 insertions(+), 20 deletions(-) rename src/generated/resources/data/c/tags/block/{concrete.json => concretes.json} (100%) rename src/generated/resources/data/c/tags/block/{glazed_terracotta.json => glazed_terracottas.json} (100%) rename src/generated/resources/data/c/tags/item/{concrete_powder.json => concrete_powders.json} (100%) rename src/generated/resources/data/c/tags/item/{concrete.json => concretes.json} (100%) rename src/generated/resources/data/c/tags/item/{glazed_terracotta.json => glazed_terracottas.json} (100%) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 246204b0c0..f577ba3f25 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -15,7 +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.concrete": "Concrete", + "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", @@ -45,7 +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_terracotta": "Glazed Terracotta", + "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", @@ -160,8 +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": "Concrete", - "tag.item.c.concrete_powder": "Concrete Powder", + "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", @@ -242,7 +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_terracotta": "Glazed Terracotta", + "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", diff --git a/src/generated/resources/data/c/tags/block/concrete.json b/src/generated/resources/data/c/tags/block/concretes.json similarity index 100% rename from src/generated/resources/data/c/tags/block/concrete.json rename to src/generated/resources/data/c/tags/block/concretes.json diff --git a/src/generated/resources/data/c/tags/block/glazed_terracotta.json b/src/generated/resources/data/c/tags/block/glazed_terracottas.json similarity index 100% rename from src/generated/resources/data/c/tags/block/glazed_terracotta.json rename to src/generated/resources/data/c/tags/block/glazed_terracottas.json diff --git a/src/generated/resources/data/c/tags/item/concrete_powder.json b/src/generated/resources/data/c/tags/item/concrete_powders.json similarity index 100% rename from src/generated/resources/data/c/tags/item/concrete_powder.json rename to src/generated/resources/data/c/tags/item/concrete_powders.json diff --git a/src/generated/resources/data/c/tags/item/concrete.json b/src/generated/resources/data/c/tags/item/concretes.json similarity index 100% rename from src/generated/resources/data/c/tags/item/concrete.json rename to src/generated/resources/data/c/tags/item/concretes.json diff --git a/src/generated/resources/data/c/tags/item/glazed_terracotta.json b/src/generated/resources/data/c/tags/item/glazed_terracottas.json similarity index 100% rename from src/generated/resources/data/c/tags/item/glazed_terracotta.json rename to src/generated/resources/data/c/tags/item/glazed_terracottas.json diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index b9e3d7dc0f..d54fa1e1a4 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -65,7 +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 CONCRETE = tag("concrete"); + public static final TagKey CONCRETES = tag("concretes"); /** * Tag that holds all blocks that can be dyed a specific color. @@ -105,7 +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_TERRACOTTA = tag("glazed_terracotta"); + public static final TagKey GLAZED_TERRACOTTAS = tag("glazed_terracottas"); public static final TagKey GRAVELS = tag("gravels"); /** @@ -301,11 +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 CONCRETE = tag("concrete"); + public static final TagKey CONCRETES = tag("concretes"); /** * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER} */ - public static final TagKey CONCRETE_POWDER = tag("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 */ @@ -431,7 +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_TERRACOTTA = tag("glazed_terracotta"); + public static final TagKey GLAZED_TERRACOTTAS = tag("glazed_terracottas"); public static final TagKey GRAVELS = tag("gravels"); public static final TagKey GUNPOWDERS = tag("gunpowders"); 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 07172c17a4..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,7 +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.CONCRETE).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); + 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"); @@ -75,7 +75,7 @@ public void addTags(HolderLookup.Provider p_256380_) { 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_TERRACOTTA).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.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 8da5c16c5c..01365a5feb 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,8 +58,8 @@ 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.CONCRETE, Tags.Items.CONCRETE); - tag(Tags.Items.CONCRETE_POWDER) + 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) @@ -132,7 +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_TERRACOTTA, Tags.Items.GLAZED_TERRACOTTA); + 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); 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 77fae8dc49..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,7 +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.CONCRETE, "Concrete"); + 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"); @@ -54,7 +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_TERRACOTTA, "Glazed Terracotta"); + 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"); @@ -147,8 +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.CONCRETE, "Concrete"); - add(Tags.Items.CONCRETE_POWDER, "Concrete Powder"); + 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"); @@ -214,7 +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_TERRACOTTA, "Glazed Terracotta"); + 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"); From d48aade4709003e65f09225981a732ecd42e6015 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:11:33 -0400 Subject: [PATCH 22/22] Add the 3 new music discs --- src/generated/resources/data/c/tags/item/music_discs.json | 5 ++++- .../common/data/internal/NeoForgeItemTagsProvider.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/data/c/tags/item/music_discs.json b/src/generated/resources/data/c/tags/item/music_discs.json index abd9fd5360..4cfc035e4f 100644 --- a/src/generated/resources/data/c/tags/item/music_discs.json +++ b/src/generated/resources/data/c/tags/item/music_discs.json @@ -15,6 +15,9 @@ "minecraft:music_disc_otherside", "minecraft:music_disc_5", "minecraft:music_disc_pigstep", - "minecraft:music_disc_relic" + "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/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 01365a5feb..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 @@ -143,11 +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); - // TODO: Add the 1.21 music discs to here when merged in 1.21 branch and add log warning to help migration efforts 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_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);