From 9e224a825b23c9c1ac1580270c69ac543c6705f7 Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:19:32 -0500 Subject: [PATCH] added more docs and tagging of pale garden --- .../datagen/generators/BiomeTagGenerator.java | 8 +- .../data/c/tags/worldgen/biome/is_rare.json | 1 + .../data/c/tags/worldgen/biome/is_spooky.json | 1 + .../worldgen/biome/is_tree/deciduous.json | 4 +- .../convention/v2/ConventionalBiomeTags.java | 74 ++++++++++++++++++- 5 files changed, 81 insertions(+), 7 deletions(-) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 562b11f5f5..6d2725ea87 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -310,12 +310,12 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.GROVE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE) .add(BiomeKeys.FOREST) - .add(BiomeKeys.WINDSWEPT_FOREST) .add(BiomeKeys.FLOWER_FOREST) .add(BiomeKeys.BIRCH_FOREST) + .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST) .add(BiomeKeys.DARK_FOREST) .add(BiomeKeys.PALE_GARDEN) - .add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST); + .add(BiomeKeys.WINDSWEPT_FOREST); getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE) .addOptionalTag(ConventionalBiomeTags.IS_JUNGLE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE) @@ -346,8 +346,8 @@ private void generateClimateAndVegetationTags() { .add(BiomeKeys.MEADOW); getOrCreateTagBuilder(ConventionalBiomeTags.IS_SPOOKY) .add(BiomeKeys.DARK_FOREST) - .add(BiomeKeys.DEEP_DARK) - .add(BiomeKeys.PALE_GARDEN); + .add(BiomeKeys.PALE_GARDEN) + .add(BiomeKeys.DEEP_DARK); getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL) .add(BiomeKeys.SUNFLOWER_PLAINS) .add(BiomeKeys.MEADOW) diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json index 1c8ff47705..77b3680e49 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json +++ b/fabric-convention-tags-v2/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/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json index 9255238fa6..db1aa63f72 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json +++ b/fabric-convention-tags-v2/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" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json index cb2f9a0807..e741f366df 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json @@ -1,12 +1,12 @@ { "values": [ "minecraft:forest", - "minecraft:windswept_forest", "minecraft:flower_forest", "minecraft:birch_forest", + "minecraft:old_growth_birch_forest", "minecraft:dark_forest", "minecraft:pale_garden", - "minecraft:old_growth_birch_forest", + "minecraft:windswept_forest", { "id": "#c:tree_deciduous", "required": false diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java index 73ac8dd866..cbd1e6a8ce 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java @@ -127,36 +127,108 @@ private ConventionalBiomeTags() { public static final TagKey IS_SNOWY_PLAINS = register("is_snowy_plains"); /** * Biomes densely populated with deciduous trees. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_FOREST}) */ public static final TagKey IS_FOREST = register("is_forest"); + /** + * For biomes that are a variant of Birch Forest (has mostly birch trees) + */ public static final TagKey IS_BIRCH_FOREST = register("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 = register("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 = register("is_flower_forest"); + /** + * Biomes that spawn as a taiga. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_TAIGA}) + */ public static final TagKey IS_TAIGA = register("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 = register("is_old_growth"); /** * Biomes that spawn as a hills biome. (Previously was called Extreme Hills biome in past) + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_HILL}) */ public static final TagKey IS_HILL = register("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 = register("is_windswept"); + /** + * Biomes that spawn as a jungle. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_JUNGLE}) + */ public static final TagKey IS_JUNGLE = register("is_jungle"); + /** + * Biomes that spawn as a savanna. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_SAVANNA}) + */ public static final TagKey IS_SAVANNA = register("is_savanna"); + /** + * For biomes that are considered a swamp such as Swamp or Mangrove Swamp. + */ public static final TagKey IS_SWAMP = register("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 = register("is_desert"); + /** + * Biomes that spawn as a badlands. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_BADLANDS}) + */ public static final TagKey IS_BADLANDS = register("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 ConventionalBiomeTags#IS_BEACH}) */ public static final TagKey IS_BEACH = register("is_beach"); + /** + * Stony biomes that are dedicated to spawning on the shoreline of a body of water. + */ public static final TagKey IS_STONY_SHORES = register("is_stony_shores"); + /** + * For biomes that spawn primarily mushrooms. + */ public static final TagKey IS_MUSHROOM = register("is_mushroom"); + /** + * Biomes that spawn as a river. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_RIVER}) + */ public static final TagKey IS_RIVER = register("is_river"); + /** + * Biomes that spawn as part of the world's oceans. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_OCEAN}) + */ public static final TagKey IS_OCEAN = register("is_ocean"); + /** + * Biomes that spawn as part of the world's oceans that have low depth. + * (This is for people who want to tag their biomes without getting side effects from {@link ConventionalBiomeTags#IS_DEEP_OCEAN}) + */ public static final TagKey IS_DEEP_OCEAN = register("is_deep_ocean"); + /** + * Biomes that spawn as part of the world's oceans that have shallow depth. + */ public static final TagKey IS_SHALLOW_OCEAN = register("is_shallow_ocean"); + /** + * Biomes that spawn primarily underground. (Not necessarily always a cave) + */ public static final TagKey IS_UNDERGROUND = register("is_underground"); + /** + * Biomes dedicated to decorating caves such as Lush Caves or Dripstone Caves. + */ public static final TagKey IS_CAVE = register("is_cave"); /**