rename to autumnal plains

FrozenBlock · Feb 19, 2025 · 184b406 · 184b406
1 parent 45c0904
commit 184b406
Show file tree

Hide file tree

Showing 30 changed files with 69 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED
 hi
 -----------------
 - Bumped Wilder Wild's protocol version to 12.
-- Added the Tundra biome.
+- Added the Autumnal Plains biome.
   - This biome generates near the colder regions of the world where Plains would be, before the snow takes over.
 - Revamped flower distribution and generation.
 - Added a new config option to disable Pollen generation.
@@ -100,7 +100,7 @@ hi
 - Rattling sounds are now used as a footstep sound instead of idle sound for Crabs.
 - Added the Phlox flower.
   - Generates in Birch Forest, Old Growth Birch Forest, and Meadow biomes.
-  - Generates occasionally in Dark Forest, Swamp, Dying Forest, Maple Forest, and Tundra biomes.
+  - Generates occasionally in Dark Forest, Swamp, Dying Forest, Maple Forest, and Autumnal Plains biomes.
   - Can be crafted into Purple Dye.
 - Added the Lantanas flower.
   - Generates in Old Growth Birch Forest, Savanna, Dark Forest, and Sunflower Plains biomes.
@@ -123,7 +123,7 @@ hi
   - Caves Temp
     - Plays in Frozen Caves, Magmatic Caves, Mesoglea Caves, and Lush Caves biomes.
   - Maple Temp
-    - Plays in Maple Forest and Tundra biomes.
+    - Plays in Maple Forest and Autumnal Plains biomes.
 - Ludocrypt's `Dove` now also plays in Lush Caves.
 
 # Swamp Overhaul

diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_cold/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_cold/overworld.json
@@ -41,7 +41,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/spawn/butterfly.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/spawn/butterfly.json
@@ -6,7 +6,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...enerated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_clouded_yellow.json b/...enerated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_clouded_yellow.json
@@ -12,7 +12,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_duskwing.json b/...main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_duskwing.json
@@ -1,7 +1,7 @@
 {
   "values": [
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_monarch.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_monarch.json
@@ -11,7 +11,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/.../generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_red_lacewing.json b/.../generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_red_lacewing.json
@@ -10,7 +10,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_allium.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_allium.json
@@ -19,7 +19,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...n/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_pasqueflower.json b/...n/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_pasqueflower.json
@@ -6,7 +6,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...gen/biome/feature/has_tundra_flowers.json → .../feature/has_autumnal_plains_flowers.json b/...gen/biome/feature/has_tundra_flowers.json → .../feature/has_autumnal_plains_flowers.json
@@ -1,7 +1,7 @@
 {
   "values": [
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/.../generated/data/wilderwild/tags/worldgen/biome/feature/has_large_fern_and_grass_rare.json b/.../generated/data/wilderwild/tags/worldgen/biome/feature/has_large_fern_and_grass_rare.json
@@ -18,7 +18,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_marigold_sparse.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_marigold_sparse.json
@@ -9,7 +9,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...ain/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_seeding_dandelion.json b/...ain/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_seeding_dandelion.json
@@ -8,7 +8,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_stone.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_stone.json
@@ -54,7 +54,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_shrub.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_shrub.json
@@ -25,7 +25,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_stone_pile_rare.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_stone_pile_rare.json
@@ -7,7 +7,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/plains_grass.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/plains_grass.json
@@ -3,7 +3,7 @@
     "minecraft:plains",
     "minecraft:meadow",
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/wilder_wild_biomes.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/wilder_wild_biomes.json
@@ -117,7 +117,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

diff --git a/...ata/wilderwild/worldgen/biome/tundra.json → ...rwild/worldgen/biome/autumnal_plains.json b/...ata/wilderwild/worldgen/biome/tundra.json → ...rwild/worldgen/biome/autumnal_plains.json
diff --git a/src/main/java/net/frozenblock/wilderwild/config/WWWorldgenConfig.java b/src/main/java/net/frozenblock/wilderwild/config/WWWorldgenConfig.java
@@ -254,7 +254,7 @@ public static class BiomeGeneration {
 		@EntrySyncData("generateSparseForest")
 		public boolean generateSparseForest = true;
 
-		@EntrySyncData("generateTundra")
-		public boolean generateTundra = true;
+		@EntrySyncData("generateAutumnalPlains")
+		public boolean generateAutumnalPlains = true;
 	}
 }
diff --git a/src/main/java/net/frozenblock/wilderwild/config/gui/WWWorldgenConfigGui.java b/src/main/java/net/frozenblock/wilderwild/config/gui/WWWorldgenConfigGui.java
@@ -392,24 +392,24 @@ public static void setupEntries(@NotNull ConfigCategory category, @NotNull Confi
 			"generateMapleForest",
 			configInstance
 		);
-		var tundra = FrozenClothConfig.syncedEntry(
-			entryBuilder.startBooleanToggle(text("generate_tundra"), modifiedBiomes.generateTundra)
-				.setDefaultValue(defaultConfig.biomeGeneration.generateTundra)
-				.setSaveConsumer(newValue -> biomes.generateTundra = newValue)
-				.setTooltip(tooltip("generate_tundra"))
+		var generateAutumnalPlains = FrozenClothConfig.syncedEntry(
+			entryBuilder.startBooleanToggle(text("generate_autumnal_plains"), modifiedBiomes.generateAutumnalPlains)
+				.setDefaultValue(defaultConfig.biomeGeneration.generateAutumnalPlains)
+				.setSaveConsumer(newValue -> biomes.generateAutumnalPlains = newValue)
+				.setTooltip(tooltip("generate_autumnal_plains"))
 				.requireRestart()
 				.build(),
 			biomes.getClass(),
-			"generateTundra",
+			"generateAutumnalPlains",
 			configInstance
 		);
 
 		var biomeGenerationCategory = FrozenClothConfig.createSubCategory(entryBuilder, category, text("biome_generation"),
 			false,
 			tooltip("biome_generation"),
-			aridForest, aridSavanna, birchJungle, birchTaiga, cypressWetlands, darkBirchForest, darkTaiga, dyingForest, dyingMixedForest, flowerField, frozenCaves,
-			magmaticCaves, mapleForest, mesogleaCaves, mixedForest, oasis, oldGrowthBirchTaiga, oldGrowthDarkForest, oldGrowthSnowyTaiga, parchedForest, rainforest,
-			semiBirchForest, snowyDyingForest, snowyDyingMixedForest, sparseBirchJungle, sparseForest, temperateRainforest, tundra, warmBeach, warmRiver
+			aridForest, aridSavanna, generateAutumnalPlains, birchJungle, birchTaiga, cypressWetlands, darkBirchForest, darkTaiga, dyingForest, dyingMixedForest, flowerField,
+			frozenCaves, magmaticCaves, mapleForest, mesogleaCaves, mixedForest, oasis, oldGrowthBirchTaiga, oldGrowthDarkForest, oldGrowthSnowyTaiga, parchedForest, rainforest,
+			semiBirchForest, snowyDyingForest, snowyDyingMixedForest, sparseBirchJungle, sparseForest, temperateRainforest, warmBeach, warmRiver
 		);
 
 		var cherryGrove = FrozenClothConfig.syncedEntry(

diff --git a/src/main/java/net/frozenblock/wilderwild/datafix/wilderwild/WWDataFixer.java b/src/main/java/net/frozenblock/wilderwild/datafix/wilderwild/WWDataFixer.java
@@ -35,7 +35,7 @@
 import org.quiltmc.qsl.frozenblock.misc.datafixerupper.api.SimpleFixes;
 
 public final class WWDataFixer {
-	public static final int DATA_VERSION = 26;
+	public static final int DATA_VERSION = 27;
 
 	private WWDataFixer() {
 		throw new UnsupportedOperationException("WWDataFixer contains only static declarations.");
@@ -203,6 +203,10 @@ public static void applyDataFixes(final @NotNull ModContainer mod) {
 			schemaV26
 		);
 
+		Schema schemaV27 = builder.addSchema(27, NamespacedSchema::new);
+		SimpleFixes.addBiomeRenameFix(builder, "Rename tundra to autumnal_plains", Map.of(WWConstants.id("tundra"), WWConstants.id("autumnal_plains")), schemaV27);
+
+
 		QuiltDataFixes.buildAndRegisterFixer(mod, builder);
 		WWConstants.log("DataFixes for Wilder Wild have been applied", true);
 	}

diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBiomeTagProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBiomeTagProvider.java
@@ -105,7 +105,7 @@ private void generateBiomeTags() {
 			.addOptional(WWBiomes.SNOWY_DYING_MIXED_FOREST)
 			.addOptional(WWBiomes.MAPLE_FOREST)
 			.addOptional(WWBiomes.SPARSE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(BiomeTags.IS_OVERWORLD)
 			.addOptionalTag(WWBiomeTags.WILDER_WILD_BIOMES);
@@ -216,7 +216,7 @@ private void generateClimateAndVegetationTags() {
 			.addOptional(WWBiomes.SNOWY_DYING_MIXED_FOREST)
 			.addOptional(WWBiomes.FROZEN_CAVES)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD)
 			.addOptional(WWBiomes.CYPRESS_WETLANDS)
@@ -415,7 +415,7 @@ private void generateUtilityTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_BUTTERFLY)
 			.add(Biomes.MEADOW)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_COMMON_BUTTERFLY)
 			.add(Biomes.FLOWER_FOREST)
@@ -427,13 +427,13 @@ private void generateUtilityTags() {
 			.add(Biomes.SUNFLOWER_PLAINS)
 			.addOptional(WWBiomes.FLOWER_FIELD)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.BUTTERFLY_RED_LACEWING)
 			.add(Biomes.FLOWER_FOREST)
 			.addOptional(WWBiomes.FLOWER_FIELD)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.BUTTERFLY_MARBLED)
 			.add(Biomes.MEADOW)
@@ -455,10 +455,10 @@ private void generateUtilityTags() {
 			.add(Biomes.SUNFLOWER_PLAINS)
 			.addOptional(WWBiomes.FLOWER_FIELD)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.BUTTERFLY_DUSKWING)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_JELLYFISH)
 			.add(Biomes.WARM_OCEAN)
@@ -602,7 +602,7 @@ private void generateUtilityTags() {
 			.addOptionalTag(ConventionalBiomeTags.IS_BIRCH_FOREST)
 			.addOptional(WWBiomes.FLOWER_FIELD)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.MOOBLOOM_BLUE_ORCHID)
 			.add(Biomes.FLOWER_FOREST)
@@ -622,7 +622,7 @@ private void generateUtilityTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.MOOBLOOM_PASQUEFLOWER)
 			.add(Biomes.MEADOW)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_CRAB)
 			.addOptional(WWBiomes.WARM_BEACH)
@@ -944,7 +944,7 @@ private void generateFeatureTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.PLAINS_GRASS)
 			.add(Biomes.PLAINS)
 			.add(Biomes.MEADOW)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_HUGE_RED_MUSHROOM)
 			.add(Biomes.FOREST)
@@ -1026,7 +1026,7 @@ private void generateFeatureTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_MARIGOLD_SPARSE)
 			.addOptional(WWBiomes.DYING_FOREST)
 			.addOptional(WWBiomes.DYING_MIXED_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_PINK_TULIP_UNCOMMON)
 			.addOptional(WWBiomes.MAPLE_FOREST);
@@ -1133,7 +1133,7 @@ private void generateFeatureTags() {
 			.add(Biomes.FOREST)
 			.add(Biomes.DARK_FOREST)
 			.addOptional(WWBiomes.SPARSE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_VERY_RARE_SEEDING_DANDELION)
 			.add(Biomes.PLAINS);
@@ -1489,7 +1489,7 @@ private void generateFeatureTags() {
 			.addOptional(WWBiomes.TEMPERATE_RAINFOREST)
 			.addOptional(WWBiomes.DYING_FOREST)
 			.addOptional(WWBiomes.DYING_MIXED_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_GENERIC_FLOWERS)
 			.add(Biomes.FOREST);
@@ -1501,8 +1501,8 @@ private void generateFeatureTags() {
 			.add(Biomes.PLAINS)
 			.addOptional(WWBiomes.SPARSE_FOREST);
 
-		this.getOrCreateTagBuilder(WWBiomeTags.HAS_TUNDRA_FLOWERS)
-			.addOptional(WWBiomes.TUNDRA);
+		this.getOrCreateTagBuilder(WWBiomeTags.HAS_AUTUMNAL_PLAINS_FLOWERS)
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_BIRCH_FLOWERS)
 			.add(Biomes.BIRCH_FOREST)
@@ -1529,7 +1529,7 @@ private void generateFeatureTags() {
 			.addOptional(WWBiomes.OLD_GROWTH_BIRCH_TAIGA)
 			.addOptional(WWBiomes.TEMPERATE_RAINFOREST)
 			.addOptional(WWBiomes.DARK_TAIGA)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_NEW_RARE_GRASS)
 			.add(Biomes.WINDSWEPT_FOREST)
@@ -1677,7 +1677,7 @@ private void generateFeatureTags() {
 			.add(Biomes.SUNFLOWER_PLAINS)
 			.add(Biomes.FLOWER_FOREST)
 			.addOptional(WWBiomes.MAPLE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_COARSE_DIRT_PILE_WITH_DISK)
 			.addOptional(WWBiomes.DYING_FOREST)
@@ -1970,7 +1970,7 @@ private void generateFeatureTags() {
 			.addOptional(WWBiomes.DYING_FOREST)
 			.addOptional(WWBiomes.DYING_MIXED_FOREST)
 			.addOptional(WWBiomes.SPARSE_FOREST)
-			.addOptional(WWBiomes.TUNDRA);
+			.addOptional(WWBiomes.AUTUMNAL_PLAINS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_FROZEN_FOREST_GRASS)
 			.addOptional(WWBiomes.SNOWY_DYING_FOREST)