Merge branch '1.19b' into 1.20a

Juuxel · Aug 13, 2023 · dec6723 · dec6723
2 parents f68cf2b + c9c48da
commit dec6723
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings = 1.20.1+build.8
 loader_version = 0.14.21
 
 # Mod Properties
-mod_version = 2.1.0
+mod_version = 2.1.1
 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
@@ -194,6 +194,18 @@ private Biome lushPineForest() {
                 VegetationPlacedFeatures.PATCH_GRASS_FOREST,
                 VegetationPlacedFeatures.FLOWER_WARM
             );
+
+            // https://github.com/Juuxel/WoodsAndMires/issues/22
+            builder.addOrdering(
+                GenerationStep.Feature.VEGETAL_DECORATION,
+                VegetationPlacedFeatures.PATCH_TALL_GRASS,
+                VegetationPlacedFeatures.FLOWER_DEFAULT
+            );
+            builder.addOrdering(
+                GenerationStep.Feature.VEGETAL_DECORATION,
+                VegetationPlacedFeatures.PATCH_TALL_GRASS,
+                VegetationPlacedFeatures.PATCH_LARGE_FERN
+            );
         });
     }
 

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
@@ -74,10 +74,10 @@
     [
       "minecraft:glow_lichen",
       "minecraft:forest_flowers",
+      "minecraft:patch_tall_grass",
       "minecraft:patch_large_fern",
       "minecraft:flower_default",
       "minecraft:patch_grass_forest",
-      "minecraft:patch_tall_grass",
       "minecraft:flower_warm",
       "minecraft:brown_mushroom_normal",
       "minecraft:red_mushroom_normal",