Merge branch '1.21.4' into 1.21.5

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.
@@ -115,6 +115,7 @@ hi
 - Carnations now yield magenta dye instead of purple dye.
 - Added Frozen Short Grass, Frozen Tall Grass, Frozen Fern, and Frozen Large Fern blocks.
   - Shoutout to just_jose2006 for the textures!
+- Changed the Warm River's surface rules to likely reduce lag caused by Sand blocks falling.
 
 # Music
 - Added three new tracks by Willow/pictochats_.
@@ -123,7 +124,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

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
     }
   ]

src/main/generated/data/minecraft/tags/worldgen/biome/spawns_cold_variant_farm_animals.json

@@ -13,7 +13,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     },
     {

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
     }
   ]

src/main/generated/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
     }
   ]

src/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
     }
   ]

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
     }
   ]

src/main/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
     }
   ]

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
     }
   ]

src/main/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
     }
   ]

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_tundra_flowers.json → src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_autumnal_plains_flowers.json

@@ -1,7 +1,7 @@
 {
   "values": [
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_big_bush.json

@@ -25,7 +25,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_firefly_bush.json

@@ -117,7 +117,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     },
     {

src/main/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
     }
   ]

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
     }
   ]

src/main/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
     }
   ]

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
     }
   ]

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_stone_pile_rare.json

@@ -8,7 +8,7 @@
       "required": false
     },
     {
-      "id": "wilderwild:tundra",
+      "id": "wilderwild:autumnal_plains",
       "required": false
     }
   ]

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
     }
   ]

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
     }
   ]

src/main/java/net/frozenblock/wilderwild/block/MesogleaBlock.java

@@ -318,6 +318,11 @@ public VoxelShape getCollisionShape(@NotNull BlockState blockState, @NotNull Blo
 		return shape;
 	}
 
+	@Override
+	protected @NotNull VoxelShape getBlockSupportShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) {
+		return Shapes.block();
+	}
+
 	@Override
 	public void animateTick(@NotNull BlockState blockState, @NotNull Level level, @NotNull BlockPos blockPos, @NotNull RandomSource randomSource) {
 		super.animateTick(blockState, level, blockPos, randomSource);

src/main/java/net/frozenblock/wilderwild/config/WWWorldgenConfig.java

@@ -260,7 +260,7 @@ public static class BiomeGeneration {
 		@EntrySyncData("generateSparseForest")
 		public boolean generateSparseForest = true;
 
-		@EntrySyncData("generateTundra")
-		public boolean generateTundra = true;
+		@EntrySyncData("generateAutumnalPlains")
+		public boolean generateAutumnalPlains = true;
 	}
 }

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(

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);
 	}