From 9a7c5daa4353684c6549dfeea5902a48f93c261d Mon Sep 17 00:00:00 2001
From: Michael <53499406+TheDeathlyCow@users.noreply.github.com>
Date: Wed, 15 Mar 2023 22:35:58 +1300
Subject: [PATCH] Add 'Windswept Hills' biome convention tag (#2878)
* add windswept biome tag
* change windswept tag to windswept hills
* list out biomes and revert name change
(cherry picked from commit 1b664772cf24b8f3cdf19121d4b9b773ed5c2fbd)
---
.../convention/datagen/generators/BiomeTagGenerator.java | 5 +++++
.../resources/data/c/tags/worldgen/biome/windswept.json | 9 +++++++++
.../api/tag/convention/v1/ConventionalBiomeTags.java | 1 +
3 files changed, 15 insertions(+)
create mode 100644 fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json
diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
index 33b132ab7..a5bf06b83 100644
--- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
+++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
@@ -91,6 +91,11 @@ public class BiomeTagGenerator extends FabricTagProvider<Biome> {
getOrCreateTagBuilder(ConventionalBiomeTags.EXTREME_HILLS)
.add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS)
.add(BiomeKeys.WINDSWEPT_HILLS);
+ getOrCreateTagBuilder(ConventionalBiomeTags.WINDSWEPT)
+ .add(BiomeKeys.WINDSWEPT_HILLS)
+ .add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS)
+ .add(BiomeKeys.WINDSWEPT_FOREST)
+ .add(BiomeKeys.WINDSWEPT_SAVANNA);
getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE)
.addOptionalTag(BiomeTags.IS_JUNGLE);
getOrCreateTagBuilder(ConventionalBiomeTags.MESA)
diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json
new file mode 100644
index 000000000..8df5621ae
--- /dev/null
+++ b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json
@@ -0,0 +1,9 @@
+{
+ "replace": false,
+ "values": [
+ "minecraft:windswept_hills",
+ "minecraft:windswept_gravelly_hills",
+ "minecraft:windswept_forest",
+ "minecraft:windswept_savanna"
+ ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java
index a40953aa1..ec5ce54fb 100644
--- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java
+++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java
@@ -46,6 +46,7 @@ public final class ConventionalBiomeTags {
public static final TagKey<Biome> IN_NETHER = register("in_nether");
public static final TagKey<Biome> TAIGA = register("taiga");
public static final TagKey<Biome> EXTREME_HILLS = register("extreme_hills");
+ public static final TagKey<Biome> WINDSWEPT = register("windswept");
public static final TagKey<Biome> JUNGLE = register("jungle");
public static final TagKey<Biome> MESA = register("mesa");
/**