diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b1429484..44e5a47492 100644 --- 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. @@ -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 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 index 062f7a3ec3..02b0bea8e9 100644 --- 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 index 61c8890daf..bf4bebb586 100644 --- 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/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_clouded_yellow.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_clouded_yellow.json index 780fa23f48..e31a826af7 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_clouded_yellow.json +++ b/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 } ] diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_duskwing.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_duskwing.json index 0717fb1046..365382b365 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_duskwing.json +++ b/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 } ] 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 index 1a8baadbbe..06a7892d75 100644 --- 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/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_red_lacewing.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_red_lacewing.json index 782f2534c6..12b4c8bb58 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/butterfly_red_lacewing.json +++ b/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 } ] 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 index eee53326b1..42a6a353ba 100644 --- 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/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_pasqueflower.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_pasqueflower.json index 61c8890daf..bf4bebb586 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/entity/variant/moobloom_pasqueflower.json +++ b/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 } ] diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_tundra_flowers.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_autumnal_plains_flowers.json similarity index 57% rename from src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_tundra_flowers.json rename to src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_autumnal_plains_flowers.json index 0717fb1046..365382b365 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_tundra_flowers.json +++ b/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 } ] diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_large_fern_and_grass_rare.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_large_fern_and_grass_rare.json index db00300651..f83e349d7c 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_large_fern_and_grass_rare.json +++ b/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 } ] 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 index 84964632a5..66cfb029ed 100644 --- 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/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_seeding_dandelion.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_seeding_dandelion.json index 21c1548262..1d2a5bfca7 100644 --- a/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_rare_seeding_dandelion.json +++ b/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 } ] 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 index d301cf48de..6af02b0066 100644 --- 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 index a8009538fe..d25d9f6a05 100644 --- 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 index 956daf0273..482664251d 100644 --- 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 @@ -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/plains_grass.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/feature/plains_grass.json index a6f2940ec0..50e2e39ae0 100644 --- 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 index fa29fe6871..a3d5504488 100644 --- 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/src/main/generated/data/wilderwild/worldgen/biome/tundra.json b/src/main/generated/data/wilderwild/worldgen/biome/autumnal_plains.json similarity index 100% rename from src/main/generated/data/wilderwild/worldgen/biome/tundra.json rename to src/main/generated/data/wilderwild/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 index bc4fb3e825..7e0a7c26b8 100644 --- 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 index c1d5a057f4..70f9dbf6da 100644 --- 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 index 711552780a..f772ec10b5 100644 --- 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 index 1aaaeba07f..78f813bf30 100644 --- 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); @@ -219,7 +219,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) @@ -418,7 +418,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) @@ -430,13 +430,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) @@ -458,10 +458,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) @@ -605,7 +605,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) @@ -625,7 +625,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) @@ -952,7 +952,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) @@ -1040,7 +1040,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_EYEBLOSSOM) .add(Biomes.PALE_GARDEN); @@ -1150,7 +1150,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); @@ -1509,7 +1509,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); @@ -1521,8 +1521,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) @@ -1549,7 +1549,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) @@ -1704,7 +1704,7 @@ private void generateFeatureTags() { .add(Biomes.FLOWER_FOREST) .add(Biomes.PALE_GARDEN) .addOptional(WWBiomes.MAPLE_FOREST) - .addOptional(WWBiomes.TUNDRA); + .addOptional(WWBiomes.AUTUMNAL_PLAINS); this.getOrCreateTagBuilder(WWBiomeTags.HAS_COARSE_DIRT_PILE_WITH_DISK) .addOptional(WWBiomes.DYING_FOREST) @@ -1998,7 +1998,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) diff --git a/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java b/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java index e91ea218f5..7d657f0e81 100644 --- a/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java +++ b/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java @@ -108,7 +108,6 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule; import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest; import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor; -import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.NotNull; @@ -407,7 +406,7 @@ public void init() { addBiomeRequirement(advancement, WWBiomes.SNOWY_DYING_MIXED_FOREST, registries); addBiomeRequirement(advancement, WWBiomes.MAPLE_FOREST, registries); addBiomeRequirement(advancement, WWBiomes.SPARSE_FOREST, registries); - addBiomeRequirement(advancement, WWBiomes.TUNDRA, registries); + addBiomeRequirement(advancement, WWBiomes.AUTUMNAL_PLAINS, registries); } case "minecraft:husbandry/balanced_diet" -> { AdvancementAPI.addCriteria(advancement, "wilderwild:baobab_nut", CriteriaTriggers.CONSUME_ITEM.createCriterion( diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWBiomes.java b/src/main/java/net/frozenblock/wilderwild/registry/WWBiomes.java index 30c782faed..7633192127 100644 --- a/src/main/java/net/frozenblock/wilderwild/registry/WWBiomes.java +++ b/src/main/java/net/frozenblock/wilderwild/registry/WWBiomes.java @@ -46,7 +46,7 @@ import net.frozenblock.wilderwild.worldgen.biome.SparseBirchJungle; import net.frozenblock.wilderwild.worldgen.biome.SparseForest; import net.frozenblock.wilderwild.worldgen.biome.TemperateRainforest; -import net.frozenblock.wilderwild.worldgen.biome.Tundra; +import net.frozenblock.wilderwild.worldgen.biome.AutumnalPlains; import net.frozenblock.wilderwild.worldgen.biome.WarmBeach; import net.frozenblock.wilderwild.worldgen.biome.WarmRiver; import net.minecraft.data.worldgen.BootstrapContext; @@ -83,7 +83,7 @@ public final class WWBiomes { public static final ResourceKey DARK_TAIGA = DarkTaiga.INSTANCE.getKey(); public static final ResourceKey MIXED_FOREST = MixedForest.INSTANCE.getKey(); public static final ResourceKey SPARSE_FOREST = SparseForest.INSTANCE.getKey(); - public static final ResourceKey TUNDRA = Tundra.INSTANCE.getKey(); + public static final ResourceKey AUTUMNAL_PLAINS = AutumnalPlains.INSTANCE.getKey(); // COLD public static final ResourceKey DYING_FOREST = DyingForest.INSTANCE.getKey(); public static final ResourceKey SNOWY_DYING_FOREST = SnowyDyingForest.INSTANCE.getKey(); @@ -132,7 +132,7 @@ public static void bootstrap(@NotNull BootstrapContext context) { register(context, DARK_TAIGA, DarkTaiga.INSTANCE.create(context)); register(context, MIXED_FOREST, MixedForest.INSTANCE.create(context)); register(context, SPARSE_FOREST, SparseForest.INSTANCE.create(context)); - register(context, TUNDRA, Tundra.INSTANCE.create(context)); + register(context, AUTUMNAL_PLAINS, AutumnalPlains.INSTANCE.create(context)); // COLD register(context, DYING_FOREST, DyingForest.INSTANCE.create(context)); register(context, SNOWY_DYING_FOREST, SnowyDyingForest.INSTANCE.create(context)); diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java b/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java index 61cdc49418..569a538879 100644 --- a/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java +++ b/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java @@ -100,10 +100,7 @@ public static SurfaceRules.RuleSource fallingBlockAndSafeBlockRules(Block fallin public static SurfaceRules.RuleSource warmRiverRules() { return SurfaceRules.ifTrue( SurfaceRules.isBiome(WWBiomes.WARM_RIVER), - SurfaceRules.ifTrue( - SurfaceRules.yBlockCheck(VerticalAnchor.absolute(32), 0), - fallingBlockAndSafeBlockRules(Blocks.SAND, Blocks.SANDSTONE) - ) + desertAndBeachRules() ); } @@ -355,7 +352,7 @@ public static SurfaceRules.RuleSource mapleForestRules() { @NotNull public static SurfaceRules.RuleSource tundraRules() { return SurfaceRules.ifTrue( - SurfaceRules.isBiome(WWBiomes.TUNDRA), + SurfaceRules.isBiome(WWBiomes.AUTUMNAL_PLAINS), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.ifTrue( SurfaceRules.waterBlockCheck(-1, 0), diff --git a/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java b/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java index 947cd9c725..b64c5ba6d5 100644 --- a/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java +++ b/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java @@ -229,7 +229,7 @@ public final class WWBiomeTags { public static final TagKey HAS_GENERIC_FLOWERS = bind("feature/has_generic_flowers"); public static final TagKey HAS_GENERIC_FLOWERS_NO_CARNATIONS = bind("feature/has_generic_flowers_no_carnations"); public static final TagKey HAS_PLAINS_FLOWERS = bind("feature/has_plains_flowers"); - public static final TagKey HAS_TUNDRA_FLOWERS = bind("feature/has_tundra_flowers"); + public static final TagKey HAS_AUTUMNAL_PLAINS_FLOWERS = bind("feature/has_autumnal_plains_flowers"); public static final TagKey HAS_BIRCH_FLOWERS = bind("feature/has_birch_flowers"); public static final TagKey HAS_CYPRESS_FLOWERS = bind("feature/has_cypress_flowers"); public static final TagKey HAS_RARE_MILKWEED = bind("feature/has_rare_milkweed"); diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/AutumnalPlains.java similarity index 98% rename from src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java rename to src/main/java/net/frozenblock/wilderwild/worldgen/biome/AutumnalPlains.java index d175c772d8..f38fa167fe 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/AutumnalPlains.java @@ -56,7 +56,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public final class Tundra extends FrozenBiome { +public final class AutumnalPlains extends FrozenBiome { public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.495F, -0.295F); public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(-1F, -0.2F); public static final Climate.Parameter EROSION_A = Climate.Parameter.span(-2.233F, 0.450F); @@ -107,9 +107,9 @@ public final class Tundra extends FrozenBiome { public static final int GRASS_COLOR_RED = 14909535; public static final int FOLIAGE_COLOR = 14995819; //15648619; - public static final Tundra INSTANCE = new Tundra(); + public static final AutumnalPlains INSTANCE = new AutumnalPlains(); - public Tundra() { + public AutumnalPlains() { super(); FrozenGrassColorModifiers.addGrassColorModifier( this.getKey().location(), @@ -138,7 +138,7 @@ public String modID() { @Override public String biomeID() { - return "tundra"; + return "autumnal_plains"; } @Override @@ -233,7 +233,7 @@ public void addSpawns(MobSpawnSettings.Builder spawns) { @Override public void injectToOverworld(Consumer>> parameters) { - if (WWWorldgenConfig.get().biomeGeneration.generateTundra) { + if (WWWorldgenConfig.get().biomeGeneration.generateAutumnalPlains) { for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.PLAINS)) { this.addSurfaceBiome( parameters, diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/modification/WWVegetationGeneration.java b/src/main/java/net/frozenblock/wilderwild/worldgen/modification/WWVegetationGeneration.java index 62614dbcda..5da327a626 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/modification/WWVegetationGeneration.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/modification/WWVegetationGeneration.java @@ -198,7 +198,7 @@ public static void generateFlower() { generationSettings.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.FLOWER_PLAINS.getKey()); } - if (biomeSelectionContext.hasTag(WWBiomeTags.HAS_TUNDRA_FLOWERS)) { + if (biomeSelectionContext.hasTag(WWBiomeTags.HAS_AUTUMNAL_PLAINS_FLOWERS)) { generationSettings.removeFeature(VegetationPlacements.FOREST_FLOWERS); generationSettings.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.FLOWER_TUNDRA.getKey()); } diff --git a/src/main/resources/assets/wilderwild/lang/en_us.json b/src/main/resources/assets/wilderwild/lang/en_us.json index 5b6c5c88ac..1de13a8e67 100644 --- a/src/main/resources/assets/wilderwild/lang/en_us.json +++ b/src/main/resources/assets/wilderwild/lang/en_us.json @@ -28,7 +28,7 @@ "biome.wilderwild.snowy_dying_forest": "Snowy Dying Forest", "biome.wilderwild.dying_mixed_forest": "Dying Mixed Forest", "biome.wilderwild.snowy_dying_mixed_forest": "Snowy Dying Mixed Forest", - "biome.wilderwild.tundra": "Tundra", + "biome.wilderwild.autumnal_plains": "Autumnal Plains", "item.wilderwild.baobab_nut": "Baobab Nut", "item.wilderwild.baobab_boat": "Baobab Boat", @@ -860,8 +860,8 @@ "tooltip.wilderwild.generate_magmatic_caves": "Whether Magmatic Caves should generate.", "option.wilderwild.generate_maple_forest": "Generate Maple Forests", "tooltip.wilderwild.generate_maple_forest": "Whether Maple Forests should generate.", - "option.wilderwild.generate_tundra": "Generate Tundra", - "tooltip.wilderwild.generate_tundra": "Whether Tundras should generate.", + "option.wilderwild.generate_autumnal_plains": "Generate Autumnal Plains", + "tooltip.wilderwild.generate_autumnal_plains": "Whether Autumnal Plains should generate.", "option.wilderwild.generate_mixed_forest": "Generate Mixed Forests", "tooltip.wilderwild.generate_mixed_forest": "Whether Mixed Forests should generate.", "option.wilderwild.generate_oasis": "Generate Oases", diff --git a/src/main/resources/assets/wilderwild/models/block/template_mesoglea.json b/src/main/resources/assets/wilderwild/models/block/template_mesoglea.json index d28b220c15..50ed1139e5 100644 --- a/src/main/resources/assets/wilderwild/models/block/template_mesoglea.json +++ b/src/main/resources/assets/wilderwild/models/block/template_mesoglea.json @@ -7,7 +7,6 @@ { "from": [0, 0, 0], "to": [16, 16, 16], - "shade": false, "light_emission": 15, "faces": { "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "north"}, @@ -21,7 +20,6 @@ { "from": [16, 16, 16], "to": [0, 0, 0], - "shade": false, "light_emission": 15, "faces": { "north": {"uv": [0, 16, 16, 0], "texture": "#texture", "cullface": "south"},