From c82a610c34a90c8d827d0f9a89e71356f831f73e 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/20] 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 626b385a89..3115e2f55a 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -299,6 +299,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", @@ -425,6 +426,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 c4dfe263b7..97180f8569 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -550,6 +550,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"); @@ -887,6 +891,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 f683fa8a72..afed9c76de 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 f8cb9f9f26..bfc676dfb2 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 @@ -274,6 +274,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"); @@ -384,6 +385,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 fd5e0e545cbc5eca75257841e8a9f06df8ee66fc 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/20] 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 3115e2f55a..59f674734e 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -325,6 +325,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 97180f8569..95208ca4f3 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -589,6 +589,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 afed9c76de..3488ccc8b5 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 bfc676dfb2..0b4891479a 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 @@ -300,6 +300,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 923b4ad20b2b55f3a14e099188a3242271eff71e 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/20] 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 95208ca4f3..2242a36b04 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 8a689441d4..ff6ce19bfe 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 8ec15e653eadeb20a043f69cfcd64c237fbf602c 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/20] 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 2242a36b04..5fab13732f 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -486,6 +486,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 5a4b50dc356f3d925163ba8ecb239b3e8471ffc4 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/20] 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 5fab13732f..6bc850fb2e 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -591,6 +591,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 a9b6d5fc0f44d67f5bdad61d8795daf64051e23d 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/20] 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 6bc850fb2e..6470e2201e 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -906,10 +906,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 961d7843d1b12031d9c9d822b7105fda06896ae6 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/20] 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 6470e2201e..4c64dc901d 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1039,6 +1039,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 dff2525ecf5ae02e5effa8dfba6ccff7709a98d8 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/20] 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 4c64dc901d..a73d61526b 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1043,6 +1043,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 2780a61ac1e7b069e90b81ea66587a583960092a 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/20] 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 a73d61526b..3a7b17b802 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1047,6 +1047,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 d53dea1bb204a2aed050bd558f2500d6ffd87694 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/20] 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 3a7b17b802..34944b0033 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1051,6 +1051,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 99b4fc4cf2b794eb1cd2a0dd0202495f9529aa85 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/20] 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 34944b0033..c8526a9da9 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -1055,7 +1055,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. @@ -1114,6 +1113,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 1b6d340e5ac875dd2cb992c64fa1221f2a074fd8 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/20] 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 c8526a9da9..6510022516 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 { * 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 91578f652f10669fddc5afa4cef1393860cbab63 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/20] 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 6510022516..f066f32579 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"); /** @@ -520,15 +520,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"); @@ -891,21 +894,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 6c35625c5276d45a2962b02e7aac7819dad53e14 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/20] 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 f066f32579..f5656d2263 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -895,7 +895,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"); @@ -911,7 +911,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 8220af14b32edb7ec9660592dbd0260d838d53e1 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/20] 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 f5656d2263..c2e50824a0 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -560,7 +560,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 c8a6391d69392cbfa5d51e8d5b26e17fe20f597a 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/20] 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 59f674734e..43dee5f6de 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -300,6 +300,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 c2e50824a0..0ccf34c130 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -560,10 +560,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 3488ccc8b5..c329018f3d 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 0b4891479a..eceee11233 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 @@ -275,6 +275,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 c7bd38756433cd5c27241ecdb9de537e285179cd 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/20] 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 014e04626b3210529fc4ec8f09242958d9dab570 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/20] 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 0ccf34c130..fded293483 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,6 +562,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 2a2e44f3fab05aad65b35cba77429239615fe046 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/20] 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 43dee5f6de..85eb587f88 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -300,7 +300,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 fded293483..f19f41486f 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,14 +562,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 c329018f3d..bc82fc8775 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 eceee11233..b9c6fd5538 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 @@ -275,7 +275,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 652539603bd60f299ddbea6cae8ed6627b4a062a 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/20] 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 f19f41486f..effd3c89a8 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -560,13 +560,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");