From 84906dfee5844d0963b80960f3b77a0512edbed8 Mon Sep 17 00:00:00 2001
From: AViewFromTheTop <87103914+AViewFromTheTop@users.noreply.github.com>
Date: Sat, 2 Dec 2023 03:24:12 -0500
Subject: [PATCH] no plains flowers in meadows

---
 CHANGELOG.md                                         |  2 ++
 .../tags/worldgen/biome/has_plains_flowers.json      |  1 -
 .../worldgen/configured_feature/flower_meadow.json   | 10 +++++-----
 .../worldgen/placed_feature/flower_meadow.json       | 12 +++++++-----
 .../wilderwild/datagen/WWBiomeTagProvider.java       |  1 -
 .../additions/feature/WilderConfiguredFeatures.java  |  4 ++--
 .../additions/feature/WilderPlacedFeatures.java      |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd2bad370c..e81674ac60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,8 @@ Bug Fixes & Changes
 
 - Refactored many aspects Wilder Wild's configured features' field names to be more consistent with Vanilla
 - Removed LeavesAroundTopTreeDecorator
+- Removed additional Plains flowers from Meadows
+- Increased the amount of flowers that typically generate in Meadows
 
 - Removed the Fabric Loader version requirement in hopes it will fix issues with Quilt
 - Changed the grammar of Wilder Wild's advancements to align with Vanilla's
diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/has_plains_flowers.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/has_plains_flowers.json
index 79173ff722..279f7ac6f1 100644
--- a/src/main/generated/data/wilderwild/tags/worldgen/biome/has_plains_flowers.json
+++ b/src/main/generated/data/wilderwild/tags/worldgen/biome/has_plains_flowers.json
@@ -2,7 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:plains",
-    "minecraft:meadow",
     "minecraft:forest",
     "minecraft:birch_forest",
     "minecraft:old_growth_birch_forest",
diff --git a/src/main/generated/data/wilderwild/worldgen/configured_feature/flower_meadow.json b/src/main/generated/data/wilderwild/worldgen/configured_feature/flower_meadow.json
index 0070f1821d..af0d9072cf 100644
--- a/src/main/generated/data/wilderwild/worldgen/configured_feature/flower_meadow.json
+++ b/src/main/generated/data/wilderwild/worldgen/configured_feature/flower_meadow.json
@@ -23,9 +23,6 @@
             },
             "slow_scale": 1.0,
             "states": [
-              {
-                "Name": "wilderwild:carnation"
-              },
               {
                 "Name": "minecraft:allium"
               },
@@ -36,14 +33,17 @@
                 "Name": "minecraft:azure_bluet"
               },
               {
-                "Name": "minecraft:dandelion"
+                "Name": "minecraft:cornflower"
               },
               {
-                "Name": "minecraft:cornflower"
+                "Name": "wilderwild:carnation"
               },
               {
                 "Name": "minecraft:oxeye_daisy"
               },
+              {
+                "Name": "minecraft:dandelion"
+              },
               {
                 "Name": "wilderwild:seeding_dandelion"
               }
diff --git a/src/main/generated/data/wilderwild/worldgen/placed_feature/flower_meadow.json b/src/main/generated/data/wilderwild/worldgen/placed_feature/flower_meadow.json
index 4d2bd40eb7..905f383e7a 100644
--- a/src/main/generated/data/wilderwild/worldgen/placed_feature/flower_meadow.json
+++ b/src/main/generated/data/wilderwild/worldgen/placed_feature/flower_meadow.json
@@ -3,11 +3,13 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 1
-    },
-    {
-      "type": "minecraft:rarity_filter",
-      "chance": 1
+      "count": {
+        "type": "minecraft:uniform",
+        "value": {
+          "max_inclusive": 2,
+          "min_inclusive": 1
+        }
+      }
     },
     {
       "type": "minecraft:in_square"
diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/WWBiomeTagProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/WWBiomeTagProvider.java
index f865a0cd34..1b942b4b75 100644
--- a/src/main/java/net/frozenblock/wilderwild/datagen/WWBiomeTagProvider.java
+++ b/src/main/java/net/frozenblock/wilderwild/datagen/WWBiomeTagProvider.java
@@ -981,7 +981,6 @@ private void generateFeatureTags() {
 
 		this.getOrCreateTagBuilder(WilderBiomeTags.HAS_PLAINS_FLOWERS)
 			.add(Biomes.PLAINS)
-			.add(Biomes.MEADOW)
 			.add(Biomes.FOREST)
 			.add(Biomes.BIRCH_FOREST)
 			.add(Biomes.OLD_GROWTH_BIRCH_FOREST)
diff --git a/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderConfiguredFeatures.java b/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderConfiguredFeatures.java
index d48f5f2501..f8d32aaaf3 100644
--- a/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderConfiguredFeatures.java
+++ b/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderConfiguredFeatures.java
@@ -1224,13 +1224,13 @@ public static void registerConfiguredFeatures(@NotNull BootstapContext<Configure
 							new NormalNoise.NoiseParameters(-3, 1.0),
 							1.0f,
 							List.of(
-								RegisterBlocks.CARNATION.defaultBlockState(),
 								Blocks.ALLIUM.defaultBlockState(),
 								Blocks.POPPY.defaultBlockState(),
 								Blocks.AZURE_BLUET.defaultBlockState(),
-								Blocks.DANDELION.defaultBlockState(),
 								Blocks.CORNFLOWER.defaultBlockState(),
+								RegisterBlocks.CARNATION.defaultBlockState(),
 								Blocks.OXEYE_DAISY.defaultBlockState(),
+								Blocks.DANDELION.defaultBlockState(),
 								RegisterBlocks.SEEDING_DANDELION.defaultBlockState()
 							)
 						)
diff --git a/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderPlacedFeatures.java b/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderPlacedFeatures.java
index 2d080c9566..694a9a0997 100644
--- a/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderPlacedFeatures.java
+++ b/src/main/java/net/frozenblock/wilderwild/world/additions/feature/WilderPlacedFeatures.java
@@ -1045,7 +1045,7 @@ public static void registerPlacedFeatures(@NotNull BootstapContext<PlacedFeature
 		);
 
 		FLOWER_MEADOW.makeAndSetHolder(WilderConfiguredFeatures.FLOWER_MEADOW.getHolder(),
-			CountPlacement.of(1), RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(),
+			CountPlacement.of(UniformInt.of(1, 2)), InSquarePlacement.spread(),
 			PlacementUtils.HEIGHTMAP_WORLD_SURFACE, BiomeFilter.biome()
 		);