From 22d2cfbb75bb50718058117b8005cbff329cbeb3 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:21:14 -0400 Subject: [PATCH 01/29] Sync with fabric tags --- .../resources/assets/c/lang/en_us.json | 5 ++++ .../resources/data/c/tags/item/potions.json | 7 +++++ .../data/c/tags/worldgen/biome/is_cold.json | 5 +--- .../worldgen/biome/is_dense_vegetation.json | 10 ++----- .../data/c/tags/worldgen/biome/is_hot.json | 5 +--- .../tags/worldgen/biome/is_hot/overworld.json | 1 - .../worldgen/biome/is_sparse_vegetation.json | 10 ++----- .../c/tags/worldgen/biome/is_temperate.json | 7 +++++ .../tags/worldgen/biome/is_temperate/end.json | 3 ++ .../worldgen/biome/is_temperate/nether.json | 3 ++ .../biome/is_temperate/overworld.json | 17 +++++++++++ .../data/c/tags/worldgen/biome/is_wet.json | 10 ++----- .../net/neoforged/neoforge/common/Tags.java | 9 ++++++ .../internal/NeoForgeBiomeTagsProvider.java | 29 +++++++++++++++---- .../internal/NeoForgeItemTagsProvider.java | 1 + .../internal/NeoForgeLanguageProvider.java | 5 ++++ 16 files changed, 88 insertions(+), 39 deletions(-) create mode 100644 src/generated/resources/data/c/tags/item/potions.json create mode 100644 src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json create mode 100644 src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json create mode 100644 src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json create mode 100644 src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 3c27e29b49..8362d106fd 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -302,6 +302,7 @@ "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.potions": "Potions", "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", @@ -430,6 +431,10 @@ "tag.worldgen.biome.c.is_stony_shores": "Stony Shores", "tag.worldgen.biome.c.is_swamp": "Swamps", "tag.worldgen.biome.c.is_taiga": "Taiga", + "tag.worldgen.biome.c.is_temperate": "Temperate", + "tag.worldgen.biome.c.is_temperate.end": "Temperate End", + "tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether", + "tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld", "tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Trees", "tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Trees", "tag.worldgen.biome.c.is_tree.jungle": "Jungle Trees", diff --git a/src/generated/resources/data/c/tags/item/potions.json b/src/generated/resources/data/c/tags/item/potions.json new file mode 100644 index 0000000000..592e0eb9db --- /dev/null +++ b/src/generated/resources/data/c/tags/item/potions.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:potion", + "minecraft:splash_potion", + "minecraft:lingering_potion" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json b/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json index 5d5826f660..e072099767 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json @@ -1,10 +1,7 @@ { "values": [ "#c:is_cold/overworld", - { - "id": "#c:is_cold/nether", - "required": false - }, + "#c:is_cold/nether", "#c:is_cold/end", { "id": "#forge:is_cold", diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json b/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json index 761d530555..9681edafbf 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -1,14 +1,8 @@ { "values": [ "#c:is_dense_vegetation/overworld", - { - "id": "#c:is_dense_vegetation/nether", - "required": false - }, - { - "id": "#c:is_dense_vegetation/end", - "required": false - }, + "#c:is_dense_vegetation/nether", + "#c:is_dense_vegetation/end", { "id": "#forge:is_dense", "required": false diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json b/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json index aa9e158867..5948ff7b5c 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json @@ -2,10 +2,7 @@ "values": [ "#c:is_hot/overworld", "#c:is_hot/nether", - { - "id": "#c:is_hot/end", - "required": false - }, + "#c:is_hot/end", { "id": "#forge:is_hot", "required": false diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json index 58a85ef951..d99d16577b 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:swamp", "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:bamboo_jungle", diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json b/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json index f2ce1c179f..ef4f3fc90b 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -1,14 +1,8 @@ { "values": [ "#c:is_sparse_vegetation/overworld", - { - "id": "#c:is_sparse_vegetation/nether", - "required": false - }, - { - "id": "#c:is_sparse_vegetation/end", - "required": false - }, + "#c:is_sparse_vegetation/nether", + "#c:is_sparse_vegetation/end", { "id": "#forge:is_sparse_vegetation", "required": false diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json new file mode 100644 index 0000000000..fe845d3378 --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:is_temperate/overworld", + "#c:is_temperate/nether", + "#c:is_temperate/end" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json new file mode 100644 index 0000000000..117ed8222f --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:plains", + "minecraft:sunflower_plains", + "minecraft:forest", + "minecraft:flower_forest", + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest", + "minecraft:dark_forest", + "minecraft:cherry_grove", + "minecraft:meadow", + "minecraft:swamp", + "minecraft:beach", + "minecraft:ocean", + "minecraft:deep_ocean" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json b/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json index 5903fbb204..7ae0700ab4 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json @@ -1,14 +1,8 @@ { "values": [ "#c:is_wet/overworld", - { - "id": "#c:is_wet/nether", - "required": false - }, - { - "id": "#c:is_wet/end", - "required": false - }, + "#c:is_wet/nether", + "#c:is_wet/end", { "id": "#forge:is_wet", "required": false diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 8a57785dc8..404b33b010 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -552,6 +552,10 @@ 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"); + /** + * All kinds of potion items that can hold various effects including splash and lingering potions from vanilla. + */ + public static final TagKey POTIONS = tag("potions"); 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"); @@ -903,6 +907,11 @@ public static class Biomes { public static final TagKey IS_COLD_NETHER = tag("is_cold/nether"); public static final TagKey IS_COLD_END = tag("is_cold/end"); + public static final TagKey IS_TEMPERATE = tag("is_temperate"); + public static final TagKey IS_TEMPERATE_OVERWORLD = tag("is_temperate/overworld"); + public static final TagKey IS_TEMPERATE_NETHER = tag("is_temperate/nether"); + public static final TagKey IS_TEMPERATE_END = tag("is_temperate/end"); + public static final TagKey IS_SPARSE_VEGETATION = tag("is_sparse_vegetation"); public static final TagKey IS_SPARSE_VEGETATION_OVERWORLD = tag("is_sparse_vegetation/overworld"); public static final TagKey IS_SPARSE_VEGETATION_NETHER = tag("is_sparse_vegetation/nether"); 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 e1bf5dc121..e2111809c4 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 @@ -35,7 +35,6 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD); tag(Tags.Biomes.IS_HOT_OVERWORLD) - .add(Biomes.SWAMP) .add(Biomes.MANGROVE_SWAMP) .add(Biomes.JUNGLE) .add(Biomes.BAMBOO_JUNGLE) @@ -56,7 +55,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.SOUL_SAND_VALLEY) .add(Biomes.BASALT_DELTAS); tag(Tags.Biomes.IS_HOT_END); - tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location()); + tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addTag(Tags.Biomes.IS_HOT_END); tag(Tags.Biomes.IS_COLD_OVERWORLD) .add(Biomes.TAIGA) @@ -86,7 +85,25 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.END_MIDLANDS) .add(Biomes.END_HIGHLANDS) .add(Biomes.END_BARRENS); - tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(Tags.Biomes.IS_COLD_END); + tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addTag(Tags.Biomes.IS_COLD_NETHER).addTag(Tags.Biomes.IS_COLD_END); + + tag(Tags.Biomes.IS_TEMPERATE_OVERWORLD) + .add(Biomes.PLAINS) + .add(Biomes.SUNFLOWER_PLAINS) + .add(Biomes.FOREST) + .add(Biomes.FLOWER_FOREST) + .add(Biomes.BIRCH_FOREST) + .add(Biomes.OLD_GROWTH_BIRCH_FOREST) + .add(Biomes.DARK_FOREST) + .add(Biomes.CHERRY_GROVE) + .add(Biomes.MEADOW) + .add(Biomes.SWAMP) + .add(Biomes.BEACH) + .add(Biomes.OCEAN) + .add(Biomes.DEEP_OCEAN); + tag(Tags.Biomes.IS_TEMPERATE_NETHER); + tag(Tags.Biomes.IS_TEMPERATE_END); + tag(Tags.Biomes.IS_TEMPERATE).addTag(Tags.Biomes.IS_TEMPERATE_OVERWORLD).addTag(Tags.Biomes.IS_TEMPERATE_NETHER).addTag(Tags.Biomes.IS_TEMPERATE_END); tag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD) .add(Biomes.WOODED_BADLANDS) @@ -102,7 +119,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.FROZEN_PEAKS); tag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER); tag(Tags.Biomes.IS_SPARSE_VEGETATION_END); - tag(Tags.Biomes.IS_SPARSE_VEGETATION).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_VEGETATION_END.location()); + tag(Tags.Biomes.IS_SPARSE_VEGETATION).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_END); tag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD) .add(Biomes.DARK_FOREST) @@ -113,7 +130,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.MANGROVE_SWAMP); tag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER); tag(Tags.Biomes.IS_DENSE_VEGETATION_END); - tag(Tags.Biomes.IS_DENSE_VEGETATION).addTag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_VEGETATION_END.location()); + tag(Tags.Biomes.IS_DENSE_VEGETATION).addTag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD).addTag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER).addTag(Tags.Biomes.IS_DENSE_VEGETATION_END); tag(Tags.Biomes.IS_WET_OVERWORLD) .add(Biomes.SWAMP) @@ -126,7 +143,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.DRIPSTONE_CAVES); tag(Tags.Biomes.IS_WET_NETHER); tag(Tags.Biomes.IS_WET_END); - tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location()); + tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addTag(Tags.Biomes.IS_WET_NETHER).addTag(Tags.Biomes.IS_WET_END); tag(Tags.Biomes.IS_DRY_OVERWORLD) .add(Biomes.DESERT) 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 36c67fbaba..62f5d56714 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 @@ -196,6 +196,7 @@ 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.POTIONS).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); 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 f764016f5c..b121d14c5d 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 @@ -276,6 +276,7 @@ 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.POTIONS, "Potions"); 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"); @@ -389,6 +390,10 @@ protected void addTranslations() { add(Tags.Biomes.IS_COLD_OVERWORLD, "Cold Overworld"); add(Tags.Biomes.IS_COLD_NETHER, "Cold Nether"); add(Tags.Biomes.IS_COLD_END, "Cold End"); + add(Tags.Biomes.IS_TEMPERATE, "Temperate"); + add(Tags.Biomes.IS_TEMPERATE_OVERWORLD, "Temperate Overworld"); + add(Tags.Biomes.IS_TEMPERATE_NETHER, "Temperate Nether"); + add(Tags.Biomes.IS_TEMPERATE_END, "Temperate End"); add(Tags.Biomes.IS_SPARSE_VEGETATION, "Sparse Vegetation"); add(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD, "Sparse Overworld Vegetation"); add(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER, "Sparse Nether Vegetation"); From 3b2ebd2e7244f1fba8d3446f40441bb8ce6b3f9d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:22:46 -0400 Subject: [PATCH 02/29] Add torchflower seeds tag --- src/generated/resources/assets/c/lang/en_us.json | 1 + src/generated/resources/data/c/tags/item/seeds.json | 1 + .../resources/data/c/tags/item/seeds/torchflower.json | 5 +++++ src/main/java/net/neoforged/neoforge/common/Tags.java | 1 + .../common/data/internal/NeoForgeItemTagsProvider.java | 3 ++- .../common/data/internal/NeoForgeLanguageProvider.java | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/c/tags/item/seeds/torchflower.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 8362d106fd..609a505d85 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -328,6 +328,7 @@ "tag.item.c.seeds.beetroot": "Beetroot Seeds", "tag.item.c.seeds.melon": "Melon Seeds", "tag.item.c.seeds.pumpkin": "Pumpkin Seeds", + "tag.item.c.seeds.torchflower": "Torchflower Seeds", "tag.item.c.seeds.wheat": "Wheat Seeds", "tag.item.c.shulker_boxes": "Shulker Boxes", "tag.item.c.slime_balls": "Slimeballs", diff --git a/src/generated/resources/data/c/tags/item/seeds.json b/src/generated/resources/data/c/tags/item/seeds.json index 350c6d7383..7baf8a568a 100644 --- a/src/generated/resources/data/c/tags/item/seeds.json +++ b/src/generated/resources/data/c/tags/item/seeds.json @@ -3,6 +3,7 @@ "#c:seeds/beetroot", "#c:seeds/melon", "#c:seeds/pumpkin", + "#c:seeds/torchflower", "#c:seeds/wheat", { "id": "#forge:seeds", diff --git a/src/generated/resources/data/c/tags/item/seeds/torchflower.json b/src/generated/resources/data/c/tags/item/seeds/torchflower.json new file mode 100644 index 0000000000..e02282a32c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/seeds/torchflower.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:torchflower_seeds" + ] +} \ 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 404b33b010..3bdf66d568 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -591,6 +591,7 @@ public static class Items { public static final TagKey SEEDS_BEETROOT = tag("seeds/beetroot"); public static final TagKey SEEDS_MELON = tag("seeds/melon"); public static final TagKey SEEDS_PUMPKIN = tag("seeds/pumpkin"); + public static final TagKey SEEDS_TORCHFLOWER = tag("seeds/torchflower"); public static final TagKey SEEDS_WHEAT = tag("seeds/wheat"); /** * Block tag equivalent is {@link BlockTags#SHULKER_BOXES} 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 62f5d56714..86d0b45c6c 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 @@ -218,10 +218,11 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, Tags.Items.SANDSTONE_UNCOLORED_BLOCKS); copy(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, Tags.Items.SANDSTONE_UNCOLORED_SLABS); copy(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, Tags.Items.SANDSTONE_UNCOLORED_STAIRS); - tag(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT); + tag(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_TORCHFLOWER, Tags.Items.SEEDS_WHEAT); tag(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS); tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS); tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS); + tag(Tags.Items.SEEDS_TORCHFLOWER).add(Items.TORCHFLOWER_SEEDS); tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS); tag(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL); // Deprecated tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL).addOptionalTag(Tags.Items.SLIMEBALLS); 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 b121d14c5d..a6301d04aa 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 @@ -302,6 +302,7 @@ protected void addTranslations() { add(Tags.Items.SEEDS_BEETROOT, "Beetroot Seeds"); add(Tags.Items.SEEDS_MELON, "Melon Seeds"); add(Tags.Items.SEEDS_PUMPKIN, "Pumpkin Seeds"); + add(Tags.Items.SEEDS_TORCHFLOWER, "Torchflower Seeds"); add(Tags.Items.SEEDS_WHEAT, "Wheat Seeds"); add(Tags.Items.SHULKER_BOXES, "Shulker Boxes"); add(Tags.Items.SLIME_BALLS, "Slimeballs"); From 671174c8f8fd35fd0b42a367a49f24fc845f91a9 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:13:45 -0400 Subject: [PATCH 03/29] Improved the javadoc for ore rates --- src/main/java/net/neoforged/neoforge/common/Tags.java | 9 ++++++--- .../common/data/internal/NeoForgeBlockTagsProvider.java | 2 +- 2 files changed, 7 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 3bdf66d568..2693b1fc60 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -134,15 +134,18 @@ public static class Blocks { */ public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); /** - * Ores which on average result in more than one resource worth of materials + * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. + * (example, Redstone Ore) */ public static final TagKey ORE_RATES_DENSE = tag("ore_rates/dense"); /** - * Ores which on average result in one resource worth of materials + * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. + * (Example, Coal Ore) */ public static final TagKey ORE_RATES_SINGULAR = tag("ore_rates/singular"); /** - * Ores which on average result in less than one resource worth of materials + * Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers. + * (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop) */ public static final TagKey ORE_RATES_SPARSE = tag("ore_rates/sparse"); public static final TagKey ORES = tag("ores"); 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 a1959d5aa8..0a9b26a1a3 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 @@ -105,9 +105,9 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(Blocks.COAL_ORE, Blocks.COPPER_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE); tag(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE); tag(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES).add(Blocks.FURNACE); - tag(Tags.Blocks.SANDS).addTags(Tags.Blocks.SANDS_COLORLESS, Tags.Blocks.SANDS_RED); tag(Tags.Blocks.RELOCATION_NOT_SUPPORTED); tag(Tags.Blocks.ROPES); + tag(Tags.Blocks.SANDS).addTags(Tags.Blocks.SANDS_COLORLESS, Tags.Blocks.SANDS_RED); tag(Tags.Blocks.SANDS_COLORLESS).add(Blocks.SAND); tag(Tags.Blocks.SANDS_RED).add(Blocks.RED_SAND); From 6288029cc2f2e124b6321a37c7352aa2ba9319fd Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:39:20 -0400 Subject: [PATCH 04/29] add mushrooms javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 2693b1fc60..a2e7be5397 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -488,6 +488,9 @@ public static class Items { public static final TagKey INGOTS_IRON = tag("ingots/iron"); public static final TagKey INGOTS_NETHERITE = tag("ingots/netherite"); public static final TagKey LEATHERS = tag("leathers"); + /** + * Small mushroom items. Not the full block forms. + */ public static final TagKey MUSHROOMS = tag("mushrooms"); /** * For music disc-like materials to be used in recipes. From 828782a6a811fcafcc9915c7c6977bf75890ce25 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:43:01 -0400 Subject: [PATCH 05/29] added seeds javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index a2e7be5397..1ccef90a9e 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -593,6 +593,9 @@ public static class Items { public static final TagKey SANDSTONE_UNCOLORED_SLABS = tag("sandstone/uncolored_slabs"); public static final TagKey SANDSTONE_UNCOLORED_STAIRS = tag("sandstone/uncolored_stairs"); + /** + * For items that are explicitly seeds for use cases such as refilling a bird feeder block or certain seed-based recipes. + */ public static final TagKey SEEDS = tag("seeds"); public static final TagKey SEEDS_BEETROOT = tag("seeds/beetroot"); public static final TagKey SEEDS_MELON = tag("seeds/melon"); From 3593e39a9740b03586f1f804994f89c295555f7b Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:08:52 -0400 Subject: [PATCH 06/29] addsparse and dense vegetation javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 1ccef90a9e..dbb9da7aaa 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -922,10 +922,17 @@ public static class Biomes { public static final TagKey IS_TEMPERATE_NETHER = tag("is_temperate/nether"); public static final TagKey IS_TEMPERATE_END = tag("is_temperate/end"); + /** + * If a biome has trees but spawn infrequently like a Savanna or Sparse Jungle, then the biome is considered having sparse vegetation. It does NOT mean no trees. + */ public static final TagKey IS_SPARSE_VEGETATION = tag("is_sparse_vegetation"); public static final TagKey IS_SPARSE_VEGETATION_OVERWORLD = tag("is_sparse_vegetation/overworld"); public static final TagKey IS_SPARSE_VEGETATION_NETHER = tag("is_sparse_vegetation/nether"); public static final TagKey IS_SPARSE_VEGETATION_END = tag("is_sparse_vegetation/end"); + /** + * If a biome has more vegetation than a regular Forest biome, then it is considered having dense vegetation. + * This is more subjective so simply do your best with classifying your biomes. + */ public static final TagKey IS_DENSE_VEGETATION = tag("is_dense_vegetation"); public static final TagKey IS_DENSE_VEGETATION_OVERWORLD = tag("is_dense_vegetation/overworld"); public static final TagKey IS_DENSE_VEGETATION_NETHER = tag("is_dense_vegetation/nether"); From 7f08d7a6d17c0f85d9998c568be0e7e957b216a2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:19:38 -0400 Subject: [PATCH 07/29] Added lush javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index dbb9da7aaa..19540e0ec2 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1055,6 +1055,9 @@ public static class Biomes { public static final TagKey IS_UNDERGROUND = tag("is_underground"); public static final TagKey IS_CAVE = tag("is_cave"); + /** + * Biomes whose flora primarily consists of vibrant thick vegetation and pools of water. Think of Lush Caves as an example. + */ public static final TagKey IS_LUSH = tag("is_lush"); public static final TagKey IS_MAGICAL = tag("is_magical"); public static final TagKey IS_RARE = tag("is_rare"); From a3d60a1c6445f77286482860a77a9c89317986b6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:22:25 -0400 Subject: [PATCH 08/29] Added magical javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 19540e0ec2..14d92c83bd 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1059,6 +1059,9 @@ public static class Biomes { * Biomes whose flora primarily consists of vibrant thick vegetation and pools of water. Think of Lush Caves as an example. */ public static final TagKey IS_LUSH = tag("is_lush"); + /** + * Biomes whose theme revolves around magic. Like a forest full of fairies or plants of magical abilities. + */ public static final TagKey IS_MAGICAL = tag("is_magical"); public static final TagKey IS_RARE = tag("is_rare"); public static final TagKey IS_PLATEAU = tag("is_plateau"); From 3d0a53a945bd82ffc619fc67bf183ba3a21c184d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:25:05 -0400 Subject: [PATCH 09/29] Added rare javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 14d92c83bd..d52f30cbd6 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1063,6 +1063,9 @@ public static class Biomes { * Biomes whose theme revolves around magic. Like a forest full of fairies or plants of magical abilities. */ public static final TagKey IS_MAGICAL = tag("is_magical"); + /** + * Intended for biomes that spawns infrequently and can be difficult to find. + */ public static final TagKey IS_RARE = tag("is_rare"); public static final TagKey IS_PLATEAU = tag("is_plateau"); public static final TagKey IS_MODIFIED = tag("is_modified"); From 72e677f3380f87d7d6c1fa2731908e7f75dab344 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:27:38 -0400 Subject: [PATCH 10/29] plateau javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index d52f30cbd6..f6b00ffd21 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1067,6 +1067,9 @@ public static class Biomes { * Intended for biomes that spawns infrequently and can be difficult to find. */ public static final TagKey IS_RARE = tag("is_rare"); + /** + * Biomes that spawn as a flat-topped hill often. + */ public static final TagKey IS_PLATEAU = tag("is_plateau"); public static final TagKey IS_MODIFIED = tag("is_modified"); public static final TagKey IS_SPOOKY = tag("is_spooky"); From 1be0da64c029829ce780e210e2e927637c57aecf Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:31:03 -0400 Subject: [PATCH 11/29] Deprecate is modified tag for removal in future --- src/main/java/net/neoforged/neoforge/common/Tags.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index f6b00ffd21..cf5e913e67 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1071,7 +1071,6 @@ public static class Biomes { * Biomes that spawn as a flat-topped hill often. */ public static final TagKey IS_PLATEAU = tag("is_plateau"); - public static final TagKey IS_MODIFIED = tag("is_modified"); public static final TagKey IS_SPOOKY = tag("is_spooky"); /** * Biomes that lack any natural life or vegetation. @@ -1130,6 +1129,13 @@ public static class Biomes { */ public static final TagKey IS_OUTER_END_ISLAND = tag("is_outer_end_island"); + /** + * Old legacy tag that lost it's intended use case and is too unclear with regard to the current worldgen biome system today. + * TODO: remove in 1.22 + */ + @Deprecated(forRemoval = true, since = "21.1") + public static final TagKey IS_MODIFIED = tag("is_modified"); + private static TagKey tag(String name) { return TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("c", name)); } From 8182d6eb09c3860b904406e6b4359f124c30e3f4 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:35:19 -0400 Subject: [PATCH 12/29] Added spooky javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index cf5e913e67..b4a5046780 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1071,6 +1071,9 @@ public static class Biomes { * Biomes that spawn as a flat-topped hill often. */ public static final TagKey IS_PLATEAU = tag("is_plateau"); + /** + * For biomes that are intended to be creepy or scary. For example, see Deep Dark biome or Dark Forest biome. + */ public static final TagKey IS_SPOOKY = tag("is_spooky"); /** * Biomes that lack any natural life or vegetation. From a2e06c7710236d5930bc02f906bfe3164c578a1d Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:19:50 -0400 Subject: [PATCH 13/29] more javadoc and fixed biomes in temperature tag --- .../net/neoforged/neoforge/common/Tags.java | 32 +++++++++++++------ .../internal/NeoForgeBiomeTagsProvider.java | 3 +- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index b4a5046780..f69edc1014 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -135,12 +135,12 @@ public static class Blocks { public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); /** * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. - * (example, Redstone Ore) + * (example, Copper Ore) */ public static final TagKey ORE_RATES_DENSE = tag("ore_rates/dense"); /** * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. - * (Example, Coal Ore) + * (Example, Iron Ore) */ public static final TagKey ORE_RATES_SINGULAR = tag("ore_rates/singular"); /** @@ -522,15 +522,18 @@ public static class Items { */ public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); /** - * Ores which on average result in more than one resource worth of materials + * Ores which on average result in more than one resource worth of materials ignoring fortune and other modifiers. + * (example, Copper Ore) */ public static final TagKey ORE_RATES_DENSE = tag("ore_rates/dense"); /** - * Ores which on average result in one resource worth of materials + * Ores which on average result in one resource worth of materials ignoring fortune and other modifiers. + * (Example, Iron Ore) */ public static final TagKey ORE_RATES_SINGULAR = tag("ore_rates/singular"); /** - * Ores which on average result in less than one resource worth of materials + * Ores which on average result in less than one resource worth of materials ignoring fortune and other modifiers. + * (Example, Nether Gold Ore as it drops 2 to 6 Gold Nuggets which is less than normal Gold Ore's Raw Gold drop) */ public static final TagKey ORE_RATES_SPARSE = tag("ore_rates/sparse"); public static final TagKey ORES = tag("ores"); @@ -907,21 +910,30 @@ public static class Biomes { public static final TagKey IS_VOID = tag("is_void"); + /** + * Biomes that are between above 0.8 temperature. (Excluding 0.8) + */ public static final TagKey IS_HOT = tag("is_hot"); public static final TagKey IS_HOT_OVERWORLD = tag("is_hot/overworld"); public static final TagKey IS_HOT_NETHER = tag("is_hot/nether"); public static final TagKey IS_HOT_END = tag("is_hot/end"); - public static final TagKey IS_COLD = tag("is_cold"); - public static final TagKey IS_COLD_OVERWORLD = tag("is_cold/overworld"); - public static final TagKey IS_COLD_NETHER = tag("is_cold/nether"); - public static final TagKey IS_COLD_END = tag("is_cold/end"); - + /** + * Biomes that are between 0.5 and 0.8 temperature range. (Including 0.5 and 0.8) + */ public static final TagKey IS_TEMPERATE = tag("is_temperate"); public static final TagKey IS_TEMPERATE_OVERWORLD = tag("is_temperate/overworld"); public static final TagKey IS_TEMPERATE_NETHER = tag("is_temperate/nether"); public static final TagKey IS_TEMPERATE_END = tag("is_temperate/end"); + /** + * Biomes that are between below 0.5 temperature. (Excluding 0.5) + */ + public static final TagKey IS_COLD = tag("is_cold"); + public static final TagKey IS_COLD_OVERWORLD = tag("is_cold/overworld"); + public static final TagKey IS_COLD_NETHER = tag("is_cold/nether"); + public static final TagKey IS_COLD_END = tag("is_cold/end"); + /** * If a biome has trees but spawn infrequently like a Savanna or Sparse Jungle, then the biome is considered having sparse vegetation. It does NOT mean no trees. */ 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 e2111809c4..509c2b4a2f 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 @@ -35,7 +35,6 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD); tag(Tags.Biomes.IS_HOT_OVERWORLD) - .add(Biomes.MANGROVE_SWAMP) .add(Biomes.JUNGLE) .add(Biomes.BAMBOO_JUNGLE) .add(Biomes.SPARSE_JUNGLE) @@ -47,6 +46,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.SAVANNA_PLATEAU) .add(Biomes.WINDSWEPT_SAVANNA) .add(Biomes.STONY_PEAKS) + .add(Biomes.MUSHROOM_FIELDS) .add(Biomes.WARM_OCEAN); tag(Tags.Biomes.IS_HOT_NETHER) .add(Biomes.NETHER_WASTES) @@ -98,6 +98,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { .add(Biomes.CHERRY_GROVE) .add(Biomes.MEADOW) .add(Biomes.SWAMP) + .add(Biomes.MANGROVE_SWAMP) .add(Biomes.BEACH) .add(Biomes.OCEAN) .add(Biomes.DEEP_OCEAN); From cbb4cbb49097fe202b20e43d11fbb9fb194fbf66 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:26:20 -0400 Subject: [PATCH 14/29] fixed typo in biome temperature tag javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index f69edc1014..ea719e818e 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -911,7 +911,7 @@ public static class Biomes { public static final TagKey IS_VOID = tag("is_void"); /** - * Biomes that are between above 0.8 temperature. (Excluding 0.8) + * Biomes that are above 0.8 temperature. (Excluding 0.8) */ public static final TagKey IS_HOT = tag("is_hot"); public static final TagKey IS_HOT_OVERWORLD = tag("is_hot/overworld"); @@ -927,7 +927,7 @@ public static class Biomes { public static final TagKey IS_TEMPERATE_END = tag("is_temperate/end"); /** - * Biomes that are between below 0.5 temperature. (Excluding 0.5) + * Biomes that are below 0.5 temperature. (Excluding 0.5) */ public static final TagKey IS_COLD = tag("is_cold"); public static final TagKey IS_COLD_OVERWORLD = tag("is_cold/overworld"); From 1b63348047cd4645dce02adff2a987fc1c23b7a4 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:37:06 -0400 Subject: [PATCH 15/29] attempt 2 at potion tag javadoc --- src/main/java/net/neoforged/neoforge/common/Tags.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index ea719e818e..5306a1f63f 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,7 +562,8 @@ public static class Items { public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces"); /** - * All kinds of potion items that can hold various effects including splash and lingering potions from vanilla. + * Variations of the Potion bottle that can hold various effects. Examples are Splash and Lingering Potions from vanilla. + * If a mod adds a new variant like Seeking Potion that applies effect to the closest entity at impact, that would in this tag. */ public static final TagKey POTIONS = tag("potions"); public static final TagKey RAW_MATERIALS = tag("raw_materials"); From 2b7215c9da36d39f6f26f1024653528ccd79a615 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:52:09 -0400 Subject: [PATCH 16/29] Add bottled potion subtag --- src/generated/resources/assets/c/lang/en_us.json | 1 + src/generated/resources/data/c/tags/item/potions.json | 4 +--- .../resources/data/c/tags/item/potions/bottled.json | 7 +++++++ src/main/java/net/neoforged/neoforge/common/Tags.java | 9 +++++++-- .../common/data/internal/NeoForgeItemTagsProvider.java | 3 ++- .../common/data/internal/NeoForgeLanguageProvider.java | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/generated/resources/data/c/tags/item/potions/bottled.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 609a505d85..d02f32b6c5 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -303,6 +303,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", + "tag.item.c.potions.bottled": "Bottled Potions", "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/potions.json b/src/generated/resources/data/c/tags/item/potions.json index 592e0eb9db..79f7396e7c 100644 --- a/src/generated/resources/data/c/tags/item/potions.json +++ b/src/generated/resources/data/c/tags/item/potions.json @@ -1,7 +1,5 @@ { "values": [ - "minecraft:potion", - "minecraft:splash_potion", - "minecraft:lingering_potion" + "#c:potions/bottled" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/potions/bottled.json b/src/generated/resources/data/c/tags/item/potions/bottled.json new file mode 100644 index 0000000000..592e0eb9db --- /dev/null +++ b/src/generated/resources/data/c/tags/item/potions/bottled.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:potion", + "minecraft:splash_potion", + "minecraft:lingering_potion" + ] +} \ 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 5306a1f63f..caaade72c1 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,10 +562,15 @@ public static class Items { public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces"); /** - * Variations of the Potion bottle that can hold various effects. Examples are Splash and Lingering Potions from vanilla. - * If a mod adds a new variant like Seeking Potion that applies effect to the closest entity at impact, that would in this tag. + * Items that can hold various potion effects similar to how potion bottles do. + * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. */ public static final TagKey POTIONS = tag("potions"); + /** + * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. + * If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag. + */ + public static final TagKey POTION_BOTTLED = tag("potions/bottled"); 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 86d0b45c6c..fd4ec61718 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 @@ -196,7 +196,8 @@ 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.POTIONS).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); + tag(Tags.Items.POTION_BOTTLED).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); + tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLED); 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 a6301d04aa..d018b34f9d 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 @@ -277,6 +277,7 @@ protected void addTranslations() { add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); add(Tags.Items.POTIONS, "Potions"); + add(Tags.Items.POTION_BOTTLED, "Bottled Potions"); 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 bfeefc59b5825d2f41e4e41a0a68ceadc25fc202 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:52:25 -0400 Subject: [PATCH 17/29] Datagen biome temperature fix --- .../resources/data/c/tags/worldgen/biome/is_hot/overworld.json | 2 +- .../data/c/tags/worldgen/biome/is_temperate/overworld.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json index d99d16577b..3fea45117c 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:bamboo_jungle", "minecraft:sparse_jungle", @@ -12,6 +11,7 @@ "minecraft:savanna_plateau", "minecraft:windswept_savanna", "minecraft:stony_peaks", + "minecraft:mushroom_fields", "minecraft:warm_ocean", { "id": "#forge:is_hot/overworld", diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json index 117ed8222f..1bd940f7f2 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -10,6 +10,7 @@ "minecraft:cherry_grove", "minecraft:meadow", "minecraft:swamp", + "minecraft:mangrove_swamp", "minecraft:beach", "minecraft:ocean", "minecraft:deep_ocean" From c2c05076672d2128bfd1840408afd93103ff342f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:21:11 -0400 Subject: [PATCH 18/29] Improved potion javadoc more --- src/main/java/net/neoforged/neoforge/common/Tags.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index caaade72c1..07c6a7e762 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -564,6 +564,7 @@ public static class Items { /** * Items that can hold various potion effects similar to how potion bottles do. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. + * The subtags would be the verb form of the container such as `c:potions/bucketed` or `c:potions/vialed` */ public static final TagKey POTIONS = tag("potions"); /** From 87bccd696a58cd245021ca3b7fab81dc1962d6f0 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:36:50 -0400 Subject: [PATCH 19/29] Changed potion verb to noun --- src/generated/resources/assets/c/lang/en_us.json | 2 +- src/generated/resources/data/c/tags/item/potions.json | 2 +- .../data/c/tags/item/potions/{bottled.json => bottle.json} | 0 src/main/java/net/neoforged/neoforge/common/Tags.java | 4 ++-- .../common/data/internal/NeoForgeItemTagsProvider.java | 4 ++-- .../common/data/internal/NeoForgeLanguageProvider.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/generated/resources/data/c/tags/item/potions/{bottled.json => bottle.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 d02f32b6c5..9d4f684f7d 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -303,7 +303,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", - "tag.item.c.potions.bottled": "Bottled Potions", + "tag.item.c.potions.bottle": "Bottle Potions", "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/potions.json b/src/generated/resources/data/c/tags/item/potions.json index 79f7396e7c..139353d5ad 100644 --- a/src/generated/resources/data/c/tags/item/potions.json +++ b/src/generated/resources/data/c/tags/item/potions.json @@ -1,5 +1,5 @@ { "values": [ - "#c:potions/bottled" + "#c:potions/bottle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/potions/bottled.json b/src/generated/resources/data/c/tags/item/potions/bottle.json similarity index 100% rename from src/generated/resources/data/c/tags/item/potions/bottled.json rename to src/generated/resources/data/c/tags/item/potions/bottle.json diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 07c6a7e762..db8290c820 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -564,14 +564,14 @@ public static class Items { /** * Items that can hold various potion effects similar to how potion bottles do. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. - * The subtags would be the verb form of the container such as `c:potions/bucketed` or `c:potions/vialed` + * The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples. */ public static final TagKey POTIONS = tag("potions"); /** * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. * If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag. */ - public static final TagKey POTION_BOTTLED = tag("potions/bottled"); + public static final TagKey POTION_BOTTLE = tag("potions/bottle"); 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 fd4ec61718..8244ae4ad3 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 @@ -196,8 +196,8 @@ 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.POTION_BOTTLED).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); - tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLED); + tag(Tags.Items.POTION_BOTTLE).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); + tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLE); 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 d018b34f9d..7e68191265 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 @@ -277,7 +277,7 @@ protected void addTranslations() { add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); add(Tags.Items.POTIONS, "Potions"); - add(Tags.Items.POTION_BOTTLED, "Bottled Potions"); + add(Tags.Items.POTION_BOTTLE, "Bottle Potions"); 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 2d3ec4b0e8674b418f07f31e1870881d04c17044 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:09:26 -0400 Subject: [PATCH 20/29] Improve potion javadoc to mention data component --- src/main/java/net/neoforged/neoforge/common/Tags.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index db8290c820..f4e7f923a0 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,13 +562,14 @@ public static class Items { public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces"); /** - * Items that can hold various potion effects similar to how potion bottles do. + * Items that can hold various potion effects by making use of {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. * The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples. */ public static final TagKey POTIONS = tag("potions"); /** - * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. + * Variations of the potion bottle that can hold various effects by using {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}. + * Examples are splash and lingering potions from vanilla. * If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag. */ public static final TagKey POTION_BOTTLE = tag("potions/bottle"); From 089266055775ddb9c4de11742ce7c1efd9b11790 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:19:01 -0500 Subject: [PATCH 21/29] Added 1.21.4 tags from fabric --- .../resources/assets/c/lang/en_us.json | 5 ++ .../data/c/tags/block/storage_blocks.json | 1 + .../c/tags/block/storage_blocks/resin.json | 5 ++ .../resources/data/c/tags/item/bricks.json | 3 +- .../data/c/tags/item/bricks/resin.json | 5 ++ .../resources/data/c/tags/item/clumps.json | 5 ++ .../data/c/tags/item/clumps/resin.json | 5 ++ .../data/c/tags/item/storage_blocks.json | 1 + .../c/tags/item/storage_blocks/resin.json | 5 ++ .../c/tags/worldgen/biome/is_dark_forest.json | 6 +++ .../data/c/tags/worldgen/biome/is_rare.json | 1 + .../data/c/tags/worldgen/biome/is_spooky.json | 1 + .../worldgen/biome/is_tree/deciduous.json | 3 +- .../net/neoforged/neoforge/common/Tags.java | 49 ++++++++++++++++++- .../internal/NeoForgeBiomeTagsProvider.java | 7 +-- .../internal/NeoForgeBlockTagsProvider.java | 3 +- .../internal/NeoForgeItemTagsProvider.java | 6 ++- .../internal/NeoForgeLanguageProvider.java | 5 ++ 18 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 src/generated/resources/data/c/tags/block/storage_blocks/resin.json create mode 100644 src/generated/resources/data/c/tags/item/bricks/resin.json create mode 100644 src/generated/resources/data/c/tags/item/clumps.json create mode 100644 src/generated/resources/data/c/tags/item/clumps/resin.json create mode 100644 src/generated/resources/data/c/tags/item/storage_blocks/resin.json create mode 100644 src/generated/resources/data/c/tags/worldgen/biome/is_dark_forest.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 91a86f5f4d..5cccfc2141 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -108,6 +108,7 @@ "tag.block.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks", "tag.block.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks", "tag.block.c.storage_blocks.redstone": "Redstone Storage Blocks", + "tag.block.c.storage_blocks.resin": "Resin Storage Blocks", "tag.block.c.storage_blocks.slime": "Slime Storage Blocks", "tag.block.c.storage_blocks.wheat": "Wheat Storage Blocks", "tag.block.c.stripped_logs": "Stripped Logs", @@ -150,6 +151,7 @@ "tag.item.c.bricks": "Bricks", "tag.item.c.bricks.nether": "Nether Bricks", "tag.item.c.bricks.normal": "Normal Bricks", + "tag.item.c.bricks.resin": "Resin Bricks", "tag.item.c.buckets": "Buckets", "tag.item.c.buckets.empty": "Empty Buckets", "tag.item.c.buckets.entity_water": "Water Entity Buckets", @@ -164,6 +166,8 @@ "tag.item.c.chests.ender": "Ender Chests", "tag.item.c.chests.trapped": "Trapped Chests", "tag.item.c.chests.wooden": "Wooden Chests", + "tag.item.c.clumps": "Clumps", + "tag.item.c.clumps.resin": "Clumps Resin", "tag.item.c.clusters": "Clusters", "tag.item.c.cobblestones": "Cobblestones", "tag.item.c.cobblestones.deepslate": "Deepslate Cobblestones", @@ -349,6 +353,7 @@ "tag.item.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks", "tag.item.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks", "tag.item.c.storage_blocks.redstone": "Redstone Storage Blocks", + "tag.item.c.storage_blocks.resin": "Resin Storage Blocks", "tag.item.c.storage_blocks.slime": "Slime Storage Blocks", "tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks", "tag.item.c.strings": "Strings", diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index 7bf4a38117..a837ec688c 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -14,6 +14,7 @@ "#c:storage_blocks/raw_gold", "#c:storage_blocks/raw_iron", "#c:storage_blocks/redstone", + "#c:storage_blocks/resin", "#c:storage_blocks/slime", "#c:storage_blocks/wheat", { diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/resin.json b/src/generated/resources/data/c/tags/block/storage_blocks/resin.json new file mode 100644 index 0000000000..7b95c08f1f --- /dev/null +++ b/src/generated/resources/data/c/tags/block/storage_blocks/resin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:resin_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bricks.json b/src/generated/resources/data/c/tags/item/bricks.json index ba6a10fc02..49e3c14ed5 100644 --- a/src/generated/resources/data/c/tags/item/bricks.json +++ b/src/generated/resources/data/c/tags/item/bricks.json @@ -1,6 +1,7 @@ { "values": [ "#c:bricks/normal", - "#c:bricks/nether" + "#c:bricks/nether", + "#c:bricks/resin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/bricks/resin.json b/src/generated/resources/data/c/tags/item/bricks/resin.json new file mode 100644 index 0000000000..56a6448fb1 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/bricks/resin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:resin_brick" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps.json b/src/generated/resources/data/c/tags/item/clumps.json new file mode 100644 index 0000000000..b5b9c68a30 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:clumps/resin" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/clumps/resin.json b/src/generated/resources/data/c/tags/item/clumps/resin.json new file mode 100644 index 0000000000..a3986bda86 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/clumps/resin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:resin_clump" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index 7bf4a38117..a837ec688c 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -14,6 +14,7 @@ "#c:storage_blocks/raw_gold", "#c:storage_blocks/raw_iron", "#c:storage_blocks/redstone", + "#c:storage_blocks/resin", "#c:storage_blocks/slime", "#c:storage_blocks/wheat", { diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/resin.json b/src/generated/resources/data/c/tags/item/storage_blocks/resin.json new file mode 100644 index 0000000000..7b95c08f1f --- /dev/null +++ b/src/generated/resources/data/c/tags/item/storage_blocks/resin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:resin_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_dark_forest.json b/src/generated/resources/data/c/tags/worldgen/biome/is_dark_forest.json new file mode 100644 index 0000000000..33519bb4c2 --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_dark_forest.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:dark_forest", + "minecraft:pale_garden" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json b/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json index 4520d941ac..9f2fa3a332 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json @@ -11,6 +11,7 @@ "minecraft:windswept_savanna", "minecraft:ice_spikes", "minecraft:windswept_gravelly_hills", + "minecraft:pale_garden", "minecraft:mushroom_fields", "minecraft:deep_dark", { diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json b/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json index 61d4740d42..83ca214899 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json @@ -1,6 +1,7 @@ { "values": [ "minecraft:dark_forest", + "minecraft:pale_garden", "minecraft:deep_dark", { "id": "#forge:is_spooky", diff --git a/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json b/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json index 0db7a3e9b6..6a676be84a 100644 --- a/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json @@ -3,8 +3,9 @@ "minecraft:forest", "minecraft:flower_forest", "minecraft:birch_forest", - "minecraft:dark_forest", "minecraft:old_growth_birch_forest", + "minecraft:dark_forest", + "minecraft:pale_garden", "minecraft:windswept_forest" ] } \ 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 f2d2c7c836..e4c3af5095 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -245,6 +245,7 @@ public static class Blocks { public static final TagKey STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); public static final TagKey STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); public static final TagKey STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_RESIN = tag("storage_blocks/resin"); public static final TagKey STORAGE_BLOCKS_SLIME = tag("storage_blocks/slime"); public static final TagKey STORAGE_BLOCKS_WHEAT = tag("storage_blocks/wheat"); public static final TagKey STRIPPED_LOGS = tag("stripped_logs"); @@ -305,6 +306,7 @@ public static class Items { public static final TagKey BRICKS = tag("bricks"); public static final TagKey BRICKS_NORMAL = tag("bricks/normal"); public static final TagKey BRICKS_NETHER = tag("bricks/nether"); + public static final TagKey BRICKS_RESIN = tag("bricks/resin"); public static final TagKey BUCKETS = tag("buckets"); public static final TagKey BUCKETS_EMPTY = tag("buckets/empty"); /** @@ -346,6 +348,8 @@ public static class Items { * For blocks that are similar to amethyst where they have clusters forming from budding blocks */ public static final TagKey CLUSTERS = tag("clusters"); + public static final TagKey CLUMPS = tag("clumps"); + public static final TagKey CLUMPS_RESIN = tag("clumps/resin"); /** * For raw materials harvested from growable plants. Crop items can be edible like carrots or * non-edible like wheat and cocoa beans. @@ -664,6 +668,7 @@ public static class Items { public static final TagKey STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); public static final TagKey STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); public static final TagKey STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_RESIN = tag("storage_blocks/resin"); public static final TagKey STORAGE_BLOCKS_SLIME = tag("storage_blocks/slime"); public static final TagKey STORAGE_BLOCKS_WHEAT = tag("storage_blocks/wheat"); public static final TagKey STRINGS = tag("strings"); @@ -1020,7 +1025,19 @@ public static class Biomes { * side effects from {@link net.minecraft.tags.BiomeTags#IS_FOREST}) */ public static final TagKey IS_FOREST = tag("is_forest"); + /** + * For biomes that are a variant of Birch Forest (has mostly birch trees) + */ public static final TagKey IS_BIRCH_FOREST = tag("is_birch_forest"); + /** + * For biomes that are a variant of Dark Forest. (Has roofed trees that are reminiscent of Dark Forest's style) + * Pale Gardens is included in this tag because according to Mojang's blog post, they state it is a variation of the Dark Forest biome. + * .... + */ + public static final TagKey IS_DARK_FOREST = tag("is_dark_forest"); + /** + * For biomes that are a variant of Flower Forest (Is very dense in variety of flowers) + */ public static final TagKey IS_FLOWER_FOREST = tag("is_flower_forest"); /** * Biomes that spawn as a taiga. @@ -1028,6 +1045,10 @@ public static class Biomes { * side effects from {@link net.minecraft.tags.BiomeTags#IS_TAIGA}) */ public static final TagKey IS_TAIGA = tag("is_taiga"); + /** + * For biomes that are an "old growth" variant of a regular biome. + * Usually this includes taller or different tree styles as if the biome is older. + */ public static final TagKey IS_OLD_GROWTH = tag("is_old_growth"); /** * Biomes that spawn as a hills biome. (Previously was called Extreme Hills biome in past) @@ -1035,6 +1056,10 @@ public static class Biomes { * side effects from {@link net.minecraft.tags.BiomeTags#IS_HILL}) */ public static final TagKey IS_HILL = tag("is_hill"); + /** + * For biomes that are a "windswept" variant of a regular biome. + * Usually these biomes includes fewer trees than normal and more exposed stone on hilly terrain. + */ public static final TagKey IS_WINDSWEPT = tag("is_windswept"); /** * Biomes that spawn as a jungle. @@ -1048,7 +1073,14 @@ public static class Biomes { * side effects from {@link net.minecraft.tags.BiomeTags#IS_SAVANNA}) */ public static final TagKey IS_SAVANNA = tag("is_savanna"); + /** + * For biomes that are considered a swamp such as Swamp or Mangrove Swamp. + */ public static final TagKey IS_SWAMP = tag("is_swamp"); + /** + * For biomes that are considered a regular desert. + * Badlands have their own tag to better separate them from this tag. + */ public static final TagKey IS_DESERT = tag("is_desert"); /** * Biomes that spawn as a badlands. @@ -1057,12 +1089,18 @@ public static class Biomes { */ public static final TagKey IS_BADLANDS = tag("is_badlands"); /** - * Biomes that are dedicated to spawning on the shoreline of a body of water. + * Non-stony biomes that are dedicated to spawning on the shoreline of a body of water. * (This is for people who want to tag their biomes without getting * side effects from {@link net.minecraft.tags.BiomeTags#IS_BEACH}) */ public static final TagKey IS_BEACH = tag("is_beach"); + /** + * Stony biomes that are dedicated to spawning on the shoreline of a body of water. + */ public static final TagKey IS_STONY_SHORES = tag("is_stony_shores"); + /** + * For biomes that spawn primarily mushrooms. + */ public static final TagKey IS_MUSHROOM = tag("is_mushroom"); /** @@ -1083,9 +1121,18 @@ public static class Biomes { * side effects from {@link net.minecraft.tags.BiomeTags#IS_DEEP_OCEAN}) */ public static final TagKey IS_DEEP_OCEAN = tag("is_deep_ocean"); + /** + * Biomes that spawn as part of the world's oceans that have shallow depth. + */ public static final TagKey IS_SHALLOW_OCEAN = tag("is_shallow_ocean"); + /** + * Biomes that spawn primarily underground. (Not necessarily always a cave) + */ public static final TagKey IS_UNDERGROUND = tag("is_underground"); + /** + * Biomes dedicated to decorating caves such as Lush Caves or Dripstone Caves. + */ public static final TagKey IS_CAVE = tag("is_cave"); /** 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 509c2b4a2f..dc3c91284d 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 @@ -171,7 +171,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_CONIFEROUS_TREE).addTags(Tags.Biomes.IS_TAIGA).add(Biomes.GROVE); tag(Tags.Biomes.IS_SAVANNA_TREE).addTags(Tags.Biomes.IS_SAVANNA); tag(Tags.Biomes.IS_JUNGLE_TREE).addTags(Tags.Biomes.IS_JUNGLE); - tag(Tags.Biomes.IS_DECIDUOUS_TREE).add(Biomes.FOREST).add(Biomes.FLOWER_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.DARK_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.WINDSWEPT_FOREST); + tag(Tags.Biomes.IS_DECIDUOUS_TREE).add(Biomes.FOREST).add(Biomes.FLOWER_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.DARK_FOREST).add(Biomes.PALE_GARDEN).add(Biomes.WINDSWEPT_FOREST); tag(Tags.Biomes.IS_MOUNTAIN_SLOPE).add(Biomes.SNOWY_SLOPES).add(Biomes.MEADOW).add(Biomes.GROVE).add(Biomes.CHERRY_GROVE); tag(Tags.Biomes.IS_MOUNTAIN_PEAK).add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS).add(Biomes.STONY_PEAKS); @@ -180,6 +180,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_FOREST).addTags(BiomeTags.IS_FOREST); tag(Tags.Biomes.IS_BIRCH_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST); tag(Tags.Biomes.IS_FLOWER_FOREST).add(Biomes.FLOWER_FOREST); + tag(Tags.Biomes.IS_DARK_FOREST).add(Biomes.DARK_FOREST).add(Biomes.PALE_GARDEN); tag(Tags.Biomes.IS_FLORAL).addTags(Tags.Biomes.IS_FLOWER_FOREST).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW); tag(Tags.Biomes.IS_BEACH).addTags(BiomeTags.IS_BEACH); tag(Tags.Biomes.IS_STONY_SHORES).add(Biomes.STONY_SHORE); @@ -200,9 +201,9 @@ protected void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Biomes.IS_SANDY).add(Biomes.DESERT).add(Biomes.BADLANDS).add(Biomes.WOODED_BADLANDS).add(Biomes.ERODED_BADLANDS).add(Biomes.BEACH); tag(Tags.Biomes.IS_MUSHROOM).add(Biomes.MUSHROOM_FIELDS); tag(Tags.Biomes.IS_PLATEAU).add(Biomes.WOODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW); - tag(Tags.Biomes.IS_SPOOKY).add(Biomes.DARK_FOREST).add(Biomes.DEEP_DARK); + tag(Tags.Biomes.IS_SPOOKY).add(Biomes.DARK_FOREST).add(Biomes.PALE_GARDEN).add(Biomes.DEEP_DARK); tag(Tags.Biomes.IS_WASTELAND); - tag(Tags.Biomes.IS_RARE).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.FLOWER_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA).add(Biomes.BAMBOO_JUNGLE).add(Biomes.SPARSE_JUNGLE).add(Biomes.ERODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.WINDSWEPT_SAVANNA).add(Biomes.ICE_SPIKES).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK); + tag(Tags.Biomes.IS_RARE).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.FLOWER_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA).add(Biomes.BAMBOO_JUNGLE).add(Biomes.SPARSE_JUNGLE).add(Biomes.ERODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.WINDSWEPT_SAVANNA).add(Biomes.ICE_SPIKES).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.PALE_GARDEN).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK); tag(Tags.Biomes.IS_RIVER).addTags(BiomeTags.IS_RIVER); tag(Tags.Biomes.IS_SHALLOW_OCEAN).add(Biomes.OCEAN).add(Biomes.LUKEWARM_OCEAN).add(Biomes.WARM_OCEAN).add(Biomes.COLD_OCEAN).add(Biomes.FROZEN_OCEAN); 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 57ff88c627..c22b52bc61 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 @@ -127,7 +127,7 @@ public void addTags(HolderLookup.Provider p_256380_) { Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER, Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Blocks.STORAGE_BLOCKS_REDSTONE, - Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Blocks.STORAGE_BLOCKS_WHEAT); + Tags.Blocks.STORAGE_BLOCKS_RESIN, Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Blocks.STORAGE_BLOCKS_WHEAT); tag(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL).add(Blocks.BONE_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_COPPER).add(Blocks.COPPER_BLOCK); @@ -142,6 +142,7 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD).add(Blocks.RAW_GOLD_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON).add(Blocks.RAW_IRON_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK); + tag(Tags.Blocks.STORAGE_BLOCKS_RESIN).add(Blocks.RESIN_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK); tag(Tags.Blocks.STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK); tag(Tags.Blocks.STRIPPED_LOGS).add( 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 4f8c6e0d7b..3db0de1520 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 @@ -35,9 +35,10 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN); tag(Tags.Items.BONES).add(Items.BONE); copy(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES); - tag(Tags.Items.BRICKS).addTags(Tags.Items.BRICKS_NORMAL, Tags.Items.BRICKS_NETHER); + tag(Tags.Items.BRICKS).addTags(Tags.Items.BRICKS_NORMAL, Tags.Items.BRICKS_NETHER, Tags.Items.BRICKS_RESIN); tag(Tags.Items.BRICKS_NORMAL).add(Items.BRICK); tag(Tags.Items.BRICKS_NETHER).add(Items.NETHER_BRICK); + tag(Tags.Items.BRICKS_RESIN).add(Items.RESIN_BRICK); tag(Tags.Items.BUCKETS_EMPTY).add(Items.BUCKET); tag(Tags.Items.BUCKETS_WATER).add(Items.WATER_BUCKET); tag(Tags.Items.BUCKETS_LAVA).add(Items.LAVA_BUCKET); @@ -53,6 +54,8 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED); copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN); copy(Tags.Blocks.CLUSTERS, Tags.Items.CLUSTERS); + tag(Tags.Items.CLUMPS).addTags(Tags.Items.CLUMPS_RESIN); + tag(Tags.Items.CLUMPS_RESIN).add(Items.RESIN_CLUMP); copy(Tags.Blocks.COBBLESTONES, Tags.Items.COBBLESTONES); copy(Tags.Blocks.COBBLESTONES_NORMAL, Tags.Items.COBBLESTONES_NORMAL); copy(Tags.Blocks.COBBLESTONES_INFESTED, Tags.Items.COBBLESTONES_INFESTED); @@ -249,6 +252,7 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, Tags.Items.STORAGE_BLOCKS_RAW_GOLD); copy(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Items.STORAGE_BLOCKS_RAW_IRON); copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE); + copy(Tags.Blocks.STORAGE_BLOCKS_RESIN, Tags.Items.STORAGE_BLOCKS_RESIN); copy(Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Items.STORAGE_BLOCKS_SLIME); copy(Tags.Blocks.STORAGE_BLOCKS_WHEAT, Tags.Items.STORAGE_BLOCKS_WHEAT); tag(Tags.Items.STRINGS).add(Items.STRING); 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 a8c87093be..1629dc8652 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 @@ -123,6 +123,7 @@ protected void addTranslations() { add(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, "Raw Gold Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, "Raw Iron Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks"); + add(Tags.Blocks.STORAGE_BLOCKS_RESIN, "Resin Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks"); add(Tags.Blocks.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks"); add(Tags.Blocks.STRIPPED_LOGS, "Stripped Logs"); @@ -138,6 +139,7 @@ protected void addTranslations() { add(Tags.Items.BRICKS, "Bricks"); add(Tags.Items.BRICKS_NORMAL, "Normal Bricks"); add(Tags.Items.BRICKS_NETHER, "Nether Bricks"); + add(Tags.Items.BRICKS_RESIN, "Resin Bricks"); add(Tags.Items.BUCKETS, "Buckets"); add(Tags.Items.BUCKETS_EMPTY, "Empty Buckets"); add(Tags.Items.BUCKETS_WATER, "Water Buckets"); @@ -153,6 +155,8 @@ protected void addTranslations() { add(Tags.Items.CHESTS_TRAPPED, "Trapped Chests"); add(Tags.Items.CHESTS_WOODEN, "Wooden Chests"); add(Tags.Items.CLUSTERS, "Clusters"); + add(Tags.Items.CLUMPS, "Clumps"); + add(Tags.Items.CLUMPS_RESIN, "Clumps Resin"); add(Tags.Items.COBBLESTONES, "Cobblestones"); add(Tags.Items.COBBLESTONES_NORMAL, "Normal Cobblestones"); add(Tags.Items.COBBLESTONES_INFESTED, "Infested Cobblestones"); @@ -323,6 +327,7 @@ protected void addTranslations() { add(Tags.Items.STORAGE_BLOCKS_RAW_GOLD, "Raw Gold Storage Blocks"); add(Tags.Items.STORAGE_BLOCKS_RAW_IRON, "Raw Iron Storage Blocks"); add(Tags.Items.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks"); + add(Tags.Items.STORAGE_BLOCKS_RESIN, "Resin Storage Blocks"); add(Tags.Items.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks"); add(Tags.Items.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks"); add(Tags.Items.STRINGS, "Strings"); From e108804c11268e4c97c182c4c5fdb29cd81b8585 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:48:27 -0500 Subject: [PATCH 22/29] Added missing pale wood stuff in tags --- src/generated/resources/data/c/tags/block/stripped_logs.json | 1 + .../resources/data/c/tags/block/stripped_woods.json | 1 + src/generated/resources/data/c/tags/entity_type/boats.json | 1 + src/generated/resources/data/c/tags/item/stripped_logs.json | 1 + src/generated/resources/data/c/tags/item/stripped_woods.json | 1 + .../common/data/internal/NeoForgeBlockTagsProvider.java | 5 +++-- .../common/data/internal/NeoForgeEntityTypeTagsProvider.java | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/data/c/tags/block/stripped_logs.json b/src/generated/resources/data/c/tags/block/stripped_logs.json index ae69c996ad..baaed5b50e 100644 --- a/src/generated/resources/data/c/tags/block/stripped_logs.json +++ b/src/generated/resources/data/c/tags/block/stripped_logs.json @@ -8,6 +8,7 @@ "minecraft:stripped_jungle_log", "minecraft:stripped_mangrove_log", "minecraft:stripped_oak_log", + "minecraft:stripped_pale_oak_log", "minecraft:stripped_spruce_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/stripped_woods.json b/src/generated/resources/data/c/tags/block/stripped_woods.json index 197542891d..5870f97bc4 100644 --- a/src/generated/resources/data/c/tags/block/stripped_woods.json +++ b/src/generated/resources/data/c/tags/block/stripped_woods.json @@ -7,6 +7,7 @@ "minecraft:stripped_jungle_wood", "minecraft:stripped_mangrove_wood", "minecraft:stripped_oak_wood", + "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/entity_type/boats.json b/src/generated/resources/data/c/tags/entity_type/boats.json index 134759720c..785162519c 100644 --- a/src/generated/resources/data/c/tags/entity_type/boats.json +++ b/src/generated/resources/data/c/tags/entity_type/boats.json @@ -7,6 +7,7 @@ "minecraft:jungle_chest_boat", "minecraft:acacia_chest_boat", "minecraft:cherry_chest_boat", + "minecraft:pale_oak_chest_boat", "minecraft:dark_oak_chest_boat", "minecraft:mangrove_chest_boat", "minecraft:bamboo_chest_raft", diff --git a/src/generated/resources/data/c/tags/item/stripped_logs.json b/src/generated/resources/data/c/tags/item/stripped_logs.json index ae69c996ad..baaed5b50e 100644 --- a/src/generated/resources/data/c/tags/item/stripped_logs.json +++ b/src/generated/resources/data/c/tags/item/stripped_logs.json @@ -8,6 +8,7 @@ "minecraft:stripped_jungle_log", "minecraft:stripped_mangrove_log", "minecraft:stripped_oak_log", + "minecraft:stripped_pale_oak_log", "minecraft:stripped_spruce_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/stripped_woods.json b/src/generated/resources/data/c/tags/item/stripped_woods.json index 197542891d..5870f97bc4 100644 --- a/src/generated/resources/data/c/tags/item/stripped_woods.json +++ b/src/generated/resources/data/c/tags/item/stripped_woods.json @@ -7,6 +7,7 @@ "minecraft:stripped_jungle_wood", "minecraft:stripped_mangrove_wood", "minecraft:stripped_oak_wood", + "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood" ] } \ No newline at end of file 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 c22b52bc61..33c4f43fba 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 @@ -148,11 +148,12 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.STRIPPED_LOGS).add( Blocks.STRIPPED_ACACIA_LOG, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.STRIPPED_BIRCH_LOG, Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_JUNGLE_LOG, - Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_SPRUCE_LOG); + Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_PALE_OAK_LOG, + Blocks.STRIPPED_SPRUCE_LOG); tag(Tags.Blocks.STRIPPED_WOODS).add( Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_CHERRY_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD, - Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD); + Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_PALE_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD); tag(Tags.Blocks.VILLAGER_JOB_SITES).add( Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE, Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeEntityTypeTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeEntityTypeTagsProvider.java index e12f911f8f..23c7aeda23 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeEntityTypeTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeEntityTypeTagsProvider.java @@ -32,6 +32,7 @@ public void addTags(HolderLookup.Provider lookupProvider) { EntityType.JUNGLE_CHEST_BOAT, EntityType.ACACIA_CHEST_BOAT, EntityType.CHERRY_CHEST_BOAT, + EntityType.PALE_OAK_CHEST_BOAT, EntityType.DARK_OAK_CHEST_BOAT, EntityType.MANGROVE_CHEST_BOAT, EntityType.BAMBOO_CHEST_RAFT); From df6f7fd5d159c701f99cc7791d97bfdb26d7e41f Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:59:39 -0500 Subject: [PATCH 23/29] adjust resin tag name --- src/generated/resources/assets/c/lang/en_us.json | 2 +- .../resources/data/c/tags/block/stripped_woods.json | 4 ++-- .../resources/data/c/tags/item/stripped_woods.json | 4 ++-- .../common/data/internal/NeoForgeBlockTagsProvider.java | 8 ++++---- .../common/data/internal/NeoForgeLanguageProvider.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 5cccfc2141..63fe3e2d81 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -167,7 +167,7 @@ "tag.item.c.chests.trapped": "Trapped Chests", "tag.item.c.chests.wooden": "Wooden Chests", "tag.item.c.clumps": "Clumps", - "tag.item.c.clumps.resin": "Clumps Resin", + "tag.item.c.clumps.resin": "Resin Clumps", "tag.item.c.clusters": "Clusters", "tag.item.c.cobblestones": "Cobblestones", "tag.item.c.cobblestones.deepslate": "Deepslate Cobblestones", diff --git a/src/generated/resources/data/c/tags/block/stripped_woods.json b/src/generated/resources/data/c/tags/block/stripped_woods.json index 735b27c6af..89a862a569 100644 --- a/src/generated/resources/data/c/tags/block/stripped_woods.json +++ b/src/generated/resources/data/c/tags/block/stripped_woods.json @@ -9,7 +9,7 @@ "minecraft:stripped_oak_wood", "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood", - "minecraft:stripped_warped_hyphae", - "minecraft:stripped_crimson_hyphae" + "minecraft:stripped_crimson_hyphae", + "minecraft:stripped_warped_hyphae" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/stripped_woods.json b/src/generated/resources/data/c/tags/item/stripped_woods.json index 735b27c6af..89a862a569 100644 --- a/src/generated/resources/data/c/tags/item/stripped_woods.json +++ b/src/generated/resources/data/c/tags/item/stripped_woods.json @@ -9,7 +9,7 @@ "minecraft:stripped_oak_wood", "minecraft:stripped_pale_oak_wood", "minecraft:stripped_spruce_wood", - "minecraft:stripped_warped_hyphae", - "minecraft:stripped_crimson_hyphae" + "minecraft:stripped_crimson_hyphae", + "minecraft:stripped_warped_hyphae" ] } \ No newline at end of file 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 54352fefec..c8455ac2b7 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 @@ -148,13 +148,13 @@ public void addTags(HolderLookup.Provider p_256380_) { tag(Tags.Blocks.STRIPPED_LOGS).add( Blocks.STRIPPED_ACACIA_LOG, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.STRIPPED_BIRCH_LOG, Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_JUNGLE_LOG, - Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_PALE_OAK_LOG, Blocks.STRIPPED_SPRUCE_LOG, - Blocks.STRIPPED_CRIMSON_STEM, Blocks.STRIPPED_WARPED_STEM); + Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_PALE_OAK_LOG, + Blocks.STRIPPED_SPRUCE_LOG, Blocks.STRIPPED_CRIMSON_STEM, Blocks.STRIPPED_WARPED_STEM); tag(Tags.Blocks.STRIPPED_WOODS).add( Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_CHERRY_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD, - Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_PALE_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD, Blocks.STRIPPED_WARPED_HYPHAE, - Blocks.STRIPPED_CRIMSON_HYPHAE); + Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_PALE_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD, + Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE); tag(Tags.Blocks.VILLAGER_JOB_SITES).add( Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE, Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, 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 1629dc8652..a74e2873d0 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 @@ -156,7 +156,7 @@ protected void addTranslations() { add(Tags.Items.CHESTS_WOODEN, "Wooden Chests"); add(Tags.Items.CLUSTERS, "Clusters"); add(Tags.Items.CLUMPS, "Clumps"); - add(Tags.Items.CLUMPS_RESIN, "Clumps Resin"); + add(Tags.Items.CLUMPS_RESIN, "Resin Clumps"); add(Tags.Items.COBBLESTONES, "Cobblestones"); add(Tags.Items.COBBLESTONES_NORMAL, "Normal Cobblestones"); add(Tags.Items.COBBLESTONES_INFESTED, "Infested Cobblestones"); From 603e405a351b8d800fda102dcc298219ab70093a Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:09:45 -0500 Subject: [PATCH 24/29] Bottled Potions --- .../neoforge/common/data/internal/NeoForgeLanguageProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a74e2873d0..5847f21937 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 @@ -281,7 +281,7 @@ protected void addTranslations() { add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); add(Tags.Items.POTIONS, "Potions"); - add(Tags.Items.POTION_BOTTLE, "Bottle Potions"); + add(Tags.Items.POTION_BOTTLE, "Bottled Potions"); 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 03094bb6830537f1d5c377b165da7844f7681740 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:10:23 -0500 Subject: [PATCH 25/29] Bottled Potions datagen --- src/generated/resources/assets/c/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 63fe3e2d81..1a073f19ed 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -307,7 +307,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", - "tag.item.c.potions.bottle": "Bottle Potions", + "tag.item.c.potions.bottle": "Bottled Potions", "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", From 1bc3f63970d0f7a444ef9e6679bf61aa5acdf9e2 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 14 Dec 2024 21:21:21 -0500 Subject: [PATCH 26/29] Update src/main/java/net/neoforged/neoforge/common/Tags.java Co-authored-by: dhyces <10985914+dhyces@users.noreply.github.com> --- src/main/java/net/neoforged/neoforge/common/Tags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index e4c3af5095..b0e6774ecd 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -596,7 +596,7 @@ public static class Items { * Examples are splash and lingering potions from vanilla. * If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag. */ - public static final TagKey POTION_BOTTLE = tag("potions/bottle"); + public static final TagKey POTIONS_BOTTLE = tag("potions/bottle"); 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"); From 31cae73a53fb62d700685873e7bd1b685cf8fe9c Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 14 Dec 2024 21:24:04 -0500 Subject: [PATCH 27/29] fix build and address nether brick fence lang --- src/generated/resources/assets/c/lang/en_us.json | 2 +- .../common/data/internal/NeoForgeItemTagsProvider.java | 4 ++-- .../common/data/internal/NeoForgeLanguageProvider.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 1a073f19ed..476a79d4a3 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -40,7 +40,7 @@ "tag.block.c.fence_gates": "Fence Gates", "tag.block.c.fence_gates.wooden": "Wooden Fence Gates", "tag.block.c.fences": "Fences", - "tag.block.c.fences.nether_brick": "Fences Nether Brick", + "tag.block.c.fences.nether_brick": "Nether Brick Fences", "tag.block.c.fences.wooden": "Wooden Fences", "tag.block.c.glass_blocks": "Glass Blocks", "tag.block.c.glass_blocks.cheap": "Silica Glass Blocks", 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 3db0de1520..99ed40f00e 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 @@ -199,8 +199,8 @@ 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.POTION_BOTTLE).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); - tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLE); + tag(Tags.Items.POTIONS_BOTTLE).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); + tag(Tags.Items.POTIONS).addTags(Tags.Items.POTIONS_BOTTLE); 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 5847f21937..147f270498 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 @@ -52,7 +52,7 @@ protected void addTranslations() { add(Tags.Blocks.FENCE_GATES, "Fence Gates"); add(Tags.Blocks.FENCE_GATES_WOODEN, "Wooden Fence Gates"); add(Tags.Blocks.FENCES, "Fences"); - add(Tags.Blocks.FENCES_NETHER_BRICK, "Fences Nether Brick"); + add(Tags.Blocks.FENCES_NETHER_BRICK, "Nether Brick Fences"); add(Tags.Blocks.FENCES_WOODEN, "Wooden Fences"); add(Tags.Blocks.GLASS_BLOCKS, "Glass Blocks"); add(Tags.Blocks.GLASS_BLOCKS_COLORLESS, "Colorless Glass Blocks"); @@ -281,7 +281,7 @@ protected void addTranslations() { add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); add(Tags.Items.POTIONS, "Potions"); - add(Tags.Items.POTION_BOTTLE, "Bottled Potions"); + add(Tags.Items.POTIONS_BOTTLE, "Bottled Potions"); 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 f582e8bd2e6c5dda17ca79959eed9ec2ea44f233 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 14 Dec 2024 22:16:59 -0500 Subject: [PATCH 28/29] singular plateau translation --- src/generated/resources/assets/c/lang/en_us.json | 2 +- .../neoforge/common/data/internal/NeoForgeLanguageProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 476a79d4a3..8df05d1c76 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -421,7 +421,7 @@ "tag.worldgen.biome.c.is_outer_end_island": "Outer End Island", "tag.worldgen.biome.c.is_overworld": "Is Overworld", "tag.worldgen.biome.c.is_plains": "Plains", - "tag.worldgen.biome.c.is_plateau": "Plateaus", + "tag.worldgen.biome.c.is_plateau": "Plateau", "tag.worldgen.biome.c.is_rare": "Rare", "tag.worldgen.biome.c.is_river": "River", "tag.worldgen.biome.c.is_sandy": "Sandy", 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 147f270498..952fbd73c1 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 @@ -452,7 +452,7 @@ protected void addTranslations() { add(Tags.Biomes.IS_MUSHROOM, "Mushrooms"); add(Tags.Biomes.IS_MAGICAL, "Magical"); add(Tags.Biomes.IS_RARE, "Rare"); - add(Tags.Biomes.IS_PLATEAU, "Plateaus"); + add(Tags.Biomes.IS_PLATEAU, "Plateau"); add(Tags.Biomes.IS_MODIFIED, "Modified"); add(Tags.Biomes.IS_OLD_GROWTH, "Old Growth"); From 3fea4f1f63ed68f5b122218692ef3fec20f94df6 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sun, 15 Dec 2024 08:27:50 -0500 Subject: [PATCH 29/29] improve javadoc to be clear on tag name for ore bearing and or in tags --- .../net/neoforged/neoforge/common/Tags.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index b0e6774ecd..373b81b7ad 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -142,15 +142,18 @@ public static class Blocks { public static final TagKey OBSIDIANS_NORMAL = tag("obsidians/normal"); public static final TagKey OBSIDIANS_CRYING = tag("obsidians/crying"); /** - * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = tag("ore_bearing_ground/deepslate"); /** - * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_NETHERRACK = tag("ore_bearing_ground/netherrack"); /** - * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); /** @@ -180,15 +183,18 @@ public static class Blocks { public static final TagKey ORES_QUARTZ = tag("ores/quartz"); public static final TagKey ORES_REDSTONE = tag("ores/redstone"); /** - * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output + * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output. + * (The block's registry name is used as the tag name) */ public static final TagKey ORES_IN_GROUND_DEEPSLATE = tag("ores_in_ground/deepslate"); /** - * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output + * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output. + * (The block's registry name is used as the tag name) */ public static final TagKey ORES_IN_GROUND_NETHERRACK = tag("ores_in_ground/netherrack"); /** - * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output + * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output. + * (The block's registry name is used as the tag name) */ 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"); @@ -534,15 +540,18 @@ public static class Items { public static final TagKey OBSIDIANS_NORMAL = tag("obsidians/normal"); public static final TagKey OBSIDIANS_CRYING = tag("obsidians/crying"); /** - * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = tag("ore_bearing_ground/deepslate"); /** - * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_NETHERRACK = tag("ore_bearing_ground/netherrack"); /** - * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation. + * (The block's registry name is used as the tag name) */ public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); /** @@ -572,15 +581,18 @@ public static class Items { public static final TagKey ORES_QUARTZ = tag("ores/quartz"); public static final TagKey ORES_REDSTONE = tag("ores/redstone"); /** - * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output + * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output. + * (The block's registry name is used as the tag name) */ public static final TagKey ORES_IN_GROUND_DEEPSLATE = tag("ores_in_ground/deepslate"); /** - * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output + * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output. + * (The block's registry name is used as the tag name) */ public static final TagKey ORES_IN_GROUND_NETHERRACK = tag("ores_in_ground/netherrack"); /** - * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output + * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output. + * (The block's registry name is used as the tag name) */ 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");