less flowers & lantanas in sunflower plains

CHANGELOG.md

@@ -98,7 +98,7 @@ hi
   - Generates occasionally in Dark Forest, Swamp, Dying Forest, Maple Forest, and Tundra biomes.
   - Can be crafted into Purple Dye.
 - Added the Lantanas flower.
-  - Generates in Old Growth Birch Forest, Savanna, and Dark Forest biomes.
+  - Generates in Old Growth Birch Forest, Savanna, Dark Forest, and Sunflower Plains biomes.
   - Can be crafted into Orange Dye.
 - Fixed Geysers not being able to erupt when placed facing directly into a block in the `wilderwild:block/geyser_can_pass_through` tag, thanks to Kluski42/Ashlyn!
 - Magmatic Caves are now larger on average.

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_wildflowers.json

@@ -1,5 +1,3 @@
 {
-  "values": [
-    "minecraft:sunflower_plains"
-  ]
+  "values": []
 }

src/main/generated/data/wilderwild/tags/worldgen/biome/feature/has_wildflowers_and_lantanas.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:sunflower_plains"
+  ]
+}

src/main/generated/data/wilderwild/worldgen/configured_feature/wildflowers_and_lantanas.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:random_selector",
+  "config": {
+    "default": {
+      "feature": "wilderwild:wildflowers",
+      "placement": []
+    },
+    "features": [
+      {
+        "chance": 0.3,
+        "feature": {
+          "feature": "wilderwild:lantanas",
+          "placement": []
+        }
+      }
+    ]
+  }
+}

src/main/generated/data/wilderwild/worldgen/placed_feature/lantanas_and_phlox_sparse.json

@@ -2,12 +2,8 @@
   "feature": "wilderwild:lantanas_and_phlox",
   "placement": [
     {
-      "type": "minecraft:count",
-      "count": {
-        "type": "minecraft:uniform",
-        "max_inclusive": 2,
-        "min_inclusive": 0
-      }
+      "type": "minecraft:rarity_filter",
+      "chance": 3
     },
     {
       "type": "minecraft:in_square"

src/main/generated/data/wilderwild/worldgen/placed_feature/phlox_sparse.json

@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 4
+      "chance": 7
     },
     {
       "type": "minecraft:in_square"

src/main/generated/data/wilderwild/worldgen/placed_feature/wildflowers_and_lantanas.json

@@ -0,0 +1,23 @@
+{
+  "feature": "wilderwild:wildflowers_and_lantanas",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": {
+        "type": "minecraft:uniform",
+        "max_inclusive": 2,
+        "min_inclusive": 1
+      }
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBiomeTagProvider.java

@@ -1143,8 +1143,7 @@ private void generateFeatureTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_VERY_RARE_SEEDING_DANDELION)
 			.add(Biomes.PLAINS);
 
-		this.getOrCreateTagBuilder(WWBiomeTags.HAS_WILDFLOWERS)
-			.add(Biomes.SUNFLOWER_PLAINS);
+		this.getOrCreateTagBuilder(WWBiomeTags.HAS_WILDFLOWERS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_PHLOX);
 
@@ -1172,6 +1171,9 @@ private void generateFeatureTags() {
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_WILDFLOWERS_AND_PHLOX_SPARSE)
 			.addOptionalTag(WWBiomeTags.MEADOW);
 
+		this.getOrCreateTagBuilder(WWBiomeTags.HAS_WILDFLOWERS_AND_LANTANAS)
+			.add(Biomes.SUNFLOWER_PLAINS);
+
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_LANTANAS_AND_PHLOX)
 			.add(Biomes.OLD_GROWTH_BIRCH_FOREST)
 			.addOptional(WWBiomes.DARK_BIRCH_FOREST);

src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java

@@ -161,6 +161,7 @@ public final class WWBiomeTags {
 	public static final TagKey<Biome> HAS_WILDFLOWERS_SPARSE = bind("feature/has_wildflowers_sparse");
 	public static final TagKey<Biome> HAS_WILDFLOWERS_AND_PHLOX = bind("feature/has_wildflowers_and_phlox");
 	public static final TagKey<Biome> HAS_WILDFLOWERS_AND_PHLOX_SPARSE = bind("feature/has_wildflowers_and_phlox_sparse");
+	public static final TagKey<Biome> HAS_WILDFLOWERS_AND_LANTANAS = bind("feature/has_wildflowers_and_lantanas");
 	public static final TagKey<Biome> HAS_LANTANAS_AND_PHLOX = bind("feature/has_lantanas_and_phlox");
 	public static final TagKey<Biome> HAS_LANTANAS_AND_PHLOX_SPARSE = bind("feature/has_lantanas_and_phlox_sparse");
 	public static final TagKey<Biome> HAS_CLOVERS = bind("feature/has_clovers");

src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWConfiguredFeatures.java

@@ -190,6 +190,7 @@ public final class WWConfiguredFeatures {
 	public static final FrozenLibConfiguredFeature<RandomPatchConfiguration, ConfiguredFeature<RandomPatchConfiguration, ?>> LANTANAS = WWFeatureUtils.register("lantanas");
 	public static final FrozenLibConfiguredFeature<RandomPatchConfiguration, ConfiguredFeature<RandomPatchConfiguration, ?>> WILDFLOWERS = WWFeatureUtils.register("wildflowers");
 	public static final FrozenLibConfiguredFeature<RandomFeatureConfiguration, ConfiguredFeature<RandomFeatureConfiguration, ?>> WILDFLOWERS_AND_PHLOX = WWFeatureUtils.register("wildflowers_and_phlox");
+	public static final FrozenLibConfiguredFeature<RandomFeatureConfiguration, ConfiguredFeature<RandomFeatureConfiguration, ?>> WILDFLOWERS_AND_LANTANAS = WWFeatureUtils.register("wildflowers_and_lantanas");
 	public static final FrozenLibConfiguredFeature<RandomFeatureConfiguration, ConfiguredFeature<RandomFeatureConfiguration, ?>> LANTANAS_AND_PHLOX = WWFeatureUtils.register("lantanas_and_phlox");
 	public static final FrozenLibConfiguredFeature<RandomPatchConfiguration, ConfiguredFeature<RandomPatchConfiguration, ?>> SEEDING_DANDELION = WWFeatureUtils.register("seeding_dandelion");
 	public static final FrozenLibConfiguredFeature<RandomPatchConfiguration, ConfiguredFeature<RandomPatchConfiguration, ?>> CARNATION = WWFeatureUtils.register("carnation");
@@ -1638,6 +1639,15 @@ public static void registerConfiguredFeatures(@NotNull BootstrapContext<Configur
 			)
 		);
 
+		WILDFLOWERS_AND_LANTANAS.makeAndSetHolder(Feature.RANDOM_SELECTOR,
+			new RandomFeatureConfiguration(
+				List.of(
+					new WeightedPlacedFeature(PlacementUtils.inlinePlaced(LANTANAS.getHolder()), 0.3F)
+				),
+				PlacementUtils.inlinePlaced(WILDFLOWERS.getHolder())
+			)
+		);
+
 		LANTANAS_AND_PHLOX.makeAndSetHolder(Feature.RANDOM_SELECTOR,
 			new RandomFeatureConfiguration(
 				List.of(

src/main/java/net/frozenblock/wilderwild/worldgen/feature/placed/WWPlacedFeatures.java

@@ -243,6 +243,7 @@ public final class WWPlacedFeatures {
 	public static final FrozenLibPlacedFeature WILDFLOWERS_SPARSE = register("wildflowers_sparse");
 	public static final FrozenLibPlacedFeature WILDFLOWERS_AND_PHLOX = register("wildflowers_and_phlox");
 	public static final FrozenLibPlacedFeature WILDFLOWERS_AND_PHLOX_SPARSE = register("wildflowers_and_phlox_sparse");
+	public static final FrozenLibPlacedFeature WILDFLOWERS_AND_LANTANAS = register("wildflowers_and_lantanas");
 	public static final FrozenLibPlacedFeature LANTANAS_AND_PHLOX = register("lantanas_and_phlox");
 	public static final FrozenLibPlacedFeature LANTANAS_AND_PHLOX_SPARSE = register("lantanas_and_phlox_sparse");
 	public static final FrozenLibPlacedFeature SEEDING_DANDELION = register("seeding_dandelion");
@@ -1392,7 +1393,7 @@ public static void registerPlacedFeatures(@NotNull BootstrapContext<PlacedFeatur
 		);
 
 		PHLOX_SPARSE.makeAndSetHolder(WWConfiguredFeatures.PHLOX.getHolder(),
-			RarityFilter.onAverageOnceEvery(4),
+			RarityFilter.onAverageOnceEvery(7),
 			InSquarePlacement.spread(),
 			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
 			BiomeFilter.biome()
@@ -1440,6 +1441,13 @@ public static void registerPlacedFeatures(@NotNull BootstrapContext<PlacedFeatur
 			BiomeFilter.biome()
 		);
 
+		WILDFLOWERS_AND_LANTANAS.makeAndSetHolder(WWConfiguredFeatures.WILDFLOWERS_AND_LANTANAS.getHolder(),
+			CountPlacement.of(UniformInt.of(1, 2)),
+			InSquarePlacement.spread(),
+			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
+			BiomeFilter.biome()
+		);
+
 		LANTANAS_AND_PHLOX.makeAndSetHolder(WWConfiguredFeatures.LANTANAS_AND_PHLOX.getHolder(),
 			CountPlacement.of(UniformInt.of(1, 2)),
 			InSquarePlacement.spread(),
@@ -1448,7 +1456,7 @@ public static void registerPlacedFeatures(@NotNull BootstrapContext<PlacedFeatur
 		);
 
 		LANTANAS_AND_PHLOX_SPARSE.makeAndSetHolder(WWConfiguredFeatures.LANTANAS_AND_PHLOX.getHolder(),
-			CountPlacement.of(UniformInt.of(0, 2)),
+			RarityFilter.onAverageOnceEvery(3),
 			InSquarePlacement.spread(),
 			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
 			BiomeFilter.biome()

src/main/java/net/frozenblock/wilderwild/worldgen/modification/WWVegetationGeneration.java

@@ -173,6 +173,10 @@ public static void generateFlower() {
 							generationSettings.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.WILDFLOWERS_AND_PHLOX_SPARSE.getKey());
 						}
 
+						if (biomeSelectionContext.hasTag(WWBiomeTags.HAS_WILDFLOWERS_AND_LANTANAS)) {
+							generationSettings.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.WILDFLOWERS_AND_LANTANAS.getKey());
+						}
+
 						if (biomeSelectionContext.hasTag(WWBiomeTags.HAS_LANTANAS_AND_PHLOX)) {
 							generationSettings.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.LANTANAS_AND_PHLOX.getKey());
 						}