From 120154cbf2f21a6f451bd8a3e30f360512a2c0eb Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:16:13 +0300
Subject: [PATCH 1/2] Fix FOC with Terrestria

Fixes #22.
---
 .../juuxel/woodsandmires/data/builtin/WamBiomes.java | 12 ++++++++++++
 .../worldgen/biome/lush_pine_forest.json             |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
index 05abfd2..5ec7ca0 100644
--- a/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
+++ b/src/data/java/juuxel/woodsandmires/data/builtin/WamBiomes.java
@@ -170,6 +170,18 @@ private static 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
index 6061c3f..a44380d 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
@@ -73,10 +73,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",

From 23f25248f8fe0a5b560f61a53a19ea10ec9a81f3 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:16:40 +0300
Subject: [PATCH 2/2] Bump version to 2.1.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index bb72721..c52d81b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings = 1.18.2+build.3
 loader_version = 0.14.16
 
 # Mod Properties
-mod_version = 2.1.0
+mod_version = 2.1.1
 maven_group = io.github.juuxel
 archives_base_name = WoodsAndMires