Merge branch '1.19a' into 1.19b

# Conflicts: # gradle.properties # src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
Juuxel · Mar 26, 2023 · 425e1ad · 425e1ad
2 parents 751d0af + 5fabbdc
commit 425e1ad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings = 1.19.4+build.1
 loader_version = 0.14.18
 
 # Mod Properties
-mod_version = 2.0.2
+mod_version = 2.0.3
 maven_group = io.github.juuxel
 archives_base_name = WoodsAndMires
 

diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
@@ -70,12 +70,13 @@ private Biome pineForest(float temperature,
             // Stone boulders
             builder.feature(GenerationStep.Feature.LOCAL_MODIFICATIONS, WamPlacedFeatureKeys.PINE_FOREST_BOULDER);
 
-            generationSettingsConfigurator.accept(builder);
-
             if (temperature >= WARM_BIOME_MINIMUM_TEMPERATURE) {
                 DefaultBiomeFeatures.addDefaultFlowers(builder);
                 builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, WamPlacedFeatureKeys.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
@@ -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
@@ -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
@@ -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",