From 849191ade3fbf12f6c1d06bcf94dd97a115d0864 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 26 Mar 2023 12:50:24 +0300 Subject: [PATCH 1/2] Fix feature order cycle with BYG Fixes #13. --- .../java/juuxel/woodsandmires/data/builtin/WamBiomes.java | 5 +++-- .../woods_and_mires/worldgen/biome/lush_pine_forest.json | 4 ++-- .../worldgen/biome/old_growth_pine_forest.json | 2 +- .../data/woods_and_mires/worldgen/biome/pine_forest.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java index 8ce09cc..403699a 100644 --- a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java +++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java @@ -58,12 +58,13 @@ private static Biome pineForest(Biome.Precipitation precipitation, float tempera // Stone boulders builder.feature(GenerationStep.Feature.LOCAL_MODIFICATIONS, WamPlacedFeatures.PINE_FOREST_BOULDER); - generationSettingsConfigurator.accept(builder); - if (precipitation != Biome.Precipitation.SNOW) { DefaultBiomeFeatures.addDefaultFlowers(builder); builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, WamPlacedFeatures.PINE_FOREST_HEATHER_PATCH); } + + generationSettingsConfigurator.accept(builder); + DefaultBiomeFeatures.addForestGrass(builder); DefaultBiomeFeatures.addDefaultMushrooms(builder); DefaultBiomeFeatures.addDefaultVegetation(builder); diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json index 54235df..f39385c 100644 --- a/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json +++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/lush_pine_forest.json @@ -77,11 +77,11 @@ "minecraft:forest_flowers", "minecraft:patch_large_fern", "woods_and_mires:fallen_pine", + "minecraft:flower_default", + "woods_and_mires:pine_forest_heather_patch", "woods_and_mires:lush_pine_forest_trees", "woods_and_mires:lush_pine_forest_flowers", "minecraft:flower_warm", - "minecraft:flower_default", - "woods_and_mires:pine_forest_heather_patch", "minecraft:patch_grass_forest", "minecraft:brown_mushroom_normal", "minecraft:red_mushroom_normal", diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json index a3897c5..13da085 100644 --- a/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json +++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/old_growth_pine_forest.json @@ -76,9 +76,9 @@ "minecraft:forest_flowers", "minecraft:patch_large_fern", "woods_and_mires:fallen_pine", - "woods_and_mires:old_growth_pine_forest_trees", "minecraft:flower_default", "woods_and_mires:pine_forest_heather_patch", + "woods_and_mires:old_growth_pine_forest_trees", "minecraft:patch_grass_forest", "minecraft:brown_mushroom_normal", "minecraft:red_mushroom_normal", diff --git a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json index d921d2d..ee2fcb7 100644 --- a/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json +++ b/src/generated/resources/data/woods_and_mires/worldgen/biome/pine_forest.json @@ -76,9 +76,9 @@ "minecraft:forest_flowers", "minecraft:patch_large_fern", "woods_and_mires:fallen_pine", - "woods_and_mires:forest_pine", "minecraft:flower_default", "woods_and_mires:pine_forest_heather_patch", + "woods_and_mires:forest_pine", "minecraft:patch_grass_forest", "minecraft:brown_mushroom_normal", "minecraft:red_mushroom_normal", From 5fabbdc70f6a0537716988e79605c3203de3e879 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sun, 26 Mar 2023 12:50:31 +0300 Subject: [PATCH 2/2] Bump version to 2.0.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 435430c..a520821 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings = 1.19.2+build.28 loader_version = 0.14.16 # Mod Properties -mod_version = 2.0.1 +mod_version = 2.0.3 maven_group = io.github.juuxel archives_base_name = WoodsAndMires