diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 3c27e29b49..9d4f684f7d 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -302,6 +302,8 @@ "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.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", @@ -327,6 +329,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", @@ -430,6 +433,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..139353d5ad --- /dev/null +++ b/src/generated/resources/data/c/tags/item/potions.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:potions/bottle" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/potions/bottle.json b/src/generated/resources/data/c/tags/item/potions/bottle.json new file mode 100644 index 0000000000..592e0eb9db --- /dev/null +++ b/src/generated/resources/data/c/tags/item/potions/bottle.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/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/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..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,7 +1,5 @@ { "values": [ - "minecraft:swamp", - "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:bamboo_jungle", "minecraft:sparse_jungle", @@ -13,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_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..1bd940f7f2 --- /dev/null +++ b/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json @@ -0,0 +1,18 @@ +{ + "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:mangrove_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..f4e7f923a0 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, 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"); @@ -485,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. @@ -516,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"); @@ -552,6 +561,18 @@ 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"); + /** + * 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 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"); 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"); @@ -583,10 +604,14 @@ 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"); 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} @@ -893,20 +918,41 @@ public static class Biomes { public static final TagKey IS_VOID = tag("is_void"); + /** + * 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"); public static final TagKey IS_HOT_NETHER = tag("is_hot/nether"); public static final TagKey IS_HOT_END = tag("is_hot/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 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. + */ 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"); @@ -1029,11 +1075,25 @@ 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"); + /** + * 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"); + /** + * 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"); + /** + * 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. @@ -1092,6 +1152,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)); } 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..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,8 +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) .add(Biomes.SPARSE_JUNGLE) @@ -48,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) @@ -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,26 @@ 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.MANGROVE_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 +120,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 +131,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 +144,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/NeoForgeBlockTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java index ca4fde00ba..5cf1169d62 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); 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 20e88b6501..f8385df02c 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,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.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); @@ -217,10 +219,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 f764016f5c..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 @@ -276,6 +276,8 @@ 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.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"); @@ -301,6 +303,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"); @@ -389,6 +392,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");