From e0261e4492c6e07b4897892f082f2999dca2abca Mon Sep 17 00:00:00 2001
From: Mechalopa <92443696+Mechalopa@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:29:07 +0900
Subject: [PATCH] Marigolds generate again on savannah plateau

---
 ...n => tall_flower_features_in_savanna_plateau.json} | 11 +++++++++--
 ..._savanna.json => tall_flower_savanna_plateau.json} |  0
 ..._savanna.json => tall_flower_savanna_plateau.json} |  4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename src/main/resources/data/jafohana/neoforge/biome_modifier/{tall_flower_features_in_windswept_savanna.json => tall_flower_features_in_savanna_plateau.json} (54%)
 rename src/main/resources/data/jafohana/worldgen/configured_feature/{tall_flower_windswept_savanna.json => tall_flower_savanna_plateau.json} (100%)
 rename src/main/resources/data/jafohana/worldgen/placed_feature/{tall_flower_windswept_savanna.json => tall_flower_savanna_plateau.json} (73%)

diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_savanna_plateau.json
similarity index 54%
rename from src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json
rename to src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_savanna_plateau.json
index ac131685..08d3b35a 100644
--- a/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_windswept_savanna.json
+++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_savanna_plateau.json
@@ -4,14 +4,21 @@
     "type": "neoforge:and",
     "values": [
       "#jafohana:is_overworld",
-      "#jafohana:is_windswept",
       "#jafohana:is_savanna",
+      {
+        "type": "neoforge:or",
+        "values": [
+          "#jafohana:is_windswept",
+          "#c:is_plateau",
+          "#c:is_floral"
+        ]
+      },
       {
         "type": "neoforge:not",
         "value": "#jafohana:is_forest"
       }
     ]
   },
-  "features": "jafohana:tall_flower_windswept_savanna",
+  "features": "jafohana:tall_flower_savanna_plateau",
   "step": "vegetal_decoration"
 }
\ No newline at end of file
diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_windswept_savanna.json b/src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_savanna_plateau.json
similarity index 100%
rename from src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_windswept_savanna.json
rename to src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_savanna_plateau.json
diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_savanna_plateau.json
similarity index 73%
rename from src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json
rename to src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_savanna_plateau.json
index 31ae4b85..8c5a6506 100644
--- a/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_windswept_savanna.json
+++ b/src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_savanna_plateau.json
@@ -1,9 +1,9 @@
 {
-  "feature": "jafohana:tall_flower_windswept_savanna",
+  "feature": "jafohana:tall_flower_savanna_plateau",
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 48
+      "chance": 56
     },
     {
       "type": "minecraft:in_square"