no plains flowers in meadows

AViewFromTheTop · Dec 2, 2023 · 84906df · 84906df
1 parent b0ff9dc
commit 84906df
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...ain/java/net/frozenblock/wilderwild/world/additions/feature/WilderConfiguredFeatures.java b/...ain/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
@@ -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()
 		);