diff --git a/README.md b/README.md
index b7d18cdce..9274017d1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-
+
-
+
+
+
**Biomes O' Plenty** is an expansive biome mod for Minecraft that adds a slew of **new, unique biomes to the Overworld, Nether, and End!** To go along with the new biomes, it adds **new plants, flowers, trees, building blocks, and much more!**
diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
index eacadbcc3..7e7c6d2ce 100644
--- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
+++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.4 2024-02-15T23:51:12.4888173 Registries
+// 1.20.4 2024-02-16T23:49:49.4194403 Registries
bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
@@ -17,10 +17,10 @@ d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_
b3eae91d1d02cfda03e70a555aaaa1bc7028bd61 data/biomesoplenty/worldgen/biome/end_reef.json
3a72fd6fdefdedcc67c90d5a8b06fc647086fc83 data/biomesoplenty/worldgen/biome/end_wilds.json
a89d541384f1a879bb82d9c984d98c512474d27c data/biomesoplenty/worldgen/biome/erupting_inferno.json
-d60223aecf7e092fd753a8de34e0d0058a331a53 data/biomesoplenty/worldgen/biome/field.json
+00215227edcd7dcdcf9731656860dad1e3d68d79 data/biomesoplenty/worldgen/biome/field.json
0ca60f25f9961787ec5f174f8be6f29463c4decc data/biomesoplenty/worldgen/biome/fir_clearing.json
83a5d2dfdd6a0e7fd5a8c3d111c863bc254f6604 data/biomesoplenty/worldgen/biome/floodplain.json
-88a7d57d8776b0196ac2b71039b71299d0a1b930 data/biomesoplenty/worldgen/biome/forested_field.json
+b120a6d00298d7e63f2458feaeb763d0f45a969e data/biomesoplenty/worldgen/biome/forested_field.json
b50746f2c174b41608eaf7b9a4ea927ed2ac0a03 data/biomesoplenty/worldgen/biome/fungal_jungle.json
d9000040ce4407e603b2089bb386181a6f4c4427 data/biomesoplenty/worldgen/biome/glowing_grotto.json
7a1c57597ceed578a6a9ad29bb5475d766eeb4ed data/biomesoplenty/worldgen/biome/grassland.json
@@ -152,8 +152,7 @@ ed721b819f2b9ee9315389913d189902a8925629 data/biomesoplenty/worldgen/configured_
33bc88ffffb0bf9918842fd518f5b434ce324987 data/biomesoplenty/worldgen/configured_feature/flower_coniferous_forest.json
c7d25ac7875db71cf74e75eecfa951e05724fa54 data/biomesoplenty/worldgen/configured_feature/flower_default_extended.json
4fdfa66df3f981cfcccf7142725380e1592945cc data/biomesoplenty/worldgen/configured_feature/flower_end_wilds.json
-acadf67b3ddae8bb4f6feee2036394e612ae1ddb data/biomesoplenty/worldgen/configured_feature/flower_field_1.json
-442a5bcc3ca24db935e07b46d112c1a8c5842edb data/biomesoplenty/worldgen/configured_feature/flower_field_2.json
+f08cbf232f5f4f13a337d5db15cefffd94e3629b data/biomesoplenty/worldgen/configured_feature/flower_field.json
c9ea79a9695944845e10e169dc2ca7b091d957c3 data/biomesoplenty/worldgen/configured_feature/flower_grassland.json
85287e70a850677979308acfe02d7991a35069b1 data/biomesoplenty/worldgen/configured_feature/flower_jacaranda_glade.json
5cd38ca5da0f52c69aa1f1e67e28c06728684b9c data/biomesoplenty/worldgen/configured_feature/flower_lavender.json
@@ -247,7 +246,7 @@ ba2ea6e4b7a2c7e8be1a744c91300e6c26a5f9c9 data/biomesoplenty/worldgen/configured_
e044cfc0126d8f2a16bf8190eb8eaa72fdb07722 data/biomesoplenty/worldgen/configured_feature/patch_sea_oats.json
490897b03b2cb822737519650a9abe093070f922 data/biomesoplenty/worldgen/configured_feature/patch_sprouts.json
0d39dbb81db06fd02dfdc7e545eafdc9fe92fe58 data/biomesoplenty/worldgen/configured_feature/patch_tall_lavender.json
-3b9c9e0c22bc19b09302bbd656de739e85ac2efb data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json
+318b03cef4f9cc5fd99ac9591b984e1b16fc5c49 data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json
b4914601d389d8d28f9e785dcb5781f0742087a2 data/biomesoplenty/worldgen/configured_feature/patch_tiny_cactus.json
eb73d3141aa51f279ed8394438edf5fb43556c05 data/biomesoplenty/worldgen/configured_feature/patch_tundra_shrubs.json
8609b9965bb226b2d8b43ca84ce725e4683eb451 data/biomesoplenty/worldgen/configured_feature/patch_watergrass.json
@@ -431,8 +430,7 @@ b8974c150e3f6ec95a353ce0f476fb28f90d5fdc data/biomesoplenty/worldgen/placed_feat
808e3f9afc04fcf6b772f5c41785277b0fd1dbc0 data/biomesoplenty/worldgen/placed_feature/flower_default_extended_15.json
808e3f9afc04fcf6b772f5c41785277b0fd1dbc0 data/biomesoplenty/worldgen/placed_feature/flower_default_extended_6.json
4f2c049dcb3656a651c0a56d6d6586084c5e04f4 data/biomesoplenty/worldgen/placed_feature/flower_end_wilds.json
-240ac02e7b7d783f0116eec633603efdcf9ae445 data/biomesoplenty/worldgen/placed_feature/flower_field_1.json
-c970201d2b5c1226ec8dd81c448c4622a72d804c data/biomesoplenty/worldgen/placed_feature/flower_field_2.json
+135c9953e1b883564a631e63ba06bd2afd9c519a data/biomesoplenty/worldgen/placed_feature/flower_field.json
38a9eb5981ba35d7969497dd649a159b62727500 data/biomesoplenty/worldgen/placed_feature/flower_grassland.json
0b4c12cbc89f5196192d9a3527ee0aabd82e3f12 data/biomesoplenty/worldgen/placed_feature/flower_jacaranda_glade.json
5841cb63baca82268d21b60ad615e979991693bc data/biomesoplenty/worldgen/placed_feature/flower_lavender.json
@@ -561,7 +559,7 @@ f82df4d3ed193a30a50e0ac76ccba37646b7b097 data/biomesoplenty/worldgen/placed_feat
ccdf6e0b92bfd77a96bbeb97dfb010019b2e7f27 data/biomesoplenty/worldgen/placed_feature/patch_tall_grass_64.json
17f77d10841284365212850c4605addf7005a003 data/biomesoplenty/worldgen/placed_feature/patch_tall_lavender.json
0b157d4a63f1567fc9d387f61ef9f83892c2ef38 data/biomesoplenty/worldgen/placed_feature/patch_tall_lavender_forest.json
-05e8551fc91790211a14349db6d84aa819244461 data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json
+269db231644902921d0f57e2c8503e8df6311714 data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json
a7d5138e8625a5013d99a953ee8bd04adf221dfd data/biomesoplenty/worldgen/placed_feature/patch_tiny_cactus.json
d19125aab165d60c5099b3911538fa2f43456aa8 data/biomesoplenty/worldgen/placed_feature/patch_tundra_shrubs.json
613348827906c850e2cf2e4e9c5fb89091b13b59 data/biomesoplenty/worldgen/placed_feature/patch_watergrass_10.json
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json
index c8e0e14a1..f6e2e1b94 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json
@@ -86,8 +86,8 @@
"minecraft:patch_berry_rare",
"biomesoplenty:rose_bush_normal",
"biomesoplenty:sunflower",
+ "biomesoplenty:flower_field",
"biomesoplenty:trees_field",
- "biomesoplenty:flower_field_1",
"biomesoplenty:patch_tall_white_lavender",
"biomesoplenty:patch_sprouts_10",
"biomesoplenty:flower_wildflower",
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/forested_field.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/forested_field.json
index 115cabc47..5a54c2438 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/forested_field.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/forested_field.json
@@ -86,8 +86,8 @@
"minecraft:patch_berry_rare",
"biomesoplenty:rose_bush_normal",
"biomesoplenty:sunflower",
+ "biomesoplenty:flower_field",
"biomesoplenty:trees_field_forest",
- "biomesoplenty:flower_field_2",
"biomesoplenty:patch_sprouts_15",
"biomesoplenty:flower_wildflower",
"biomesoplenty:patch_grass_6"
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_2.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field.json
similarity index 86%
rename from common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_2.json
rename to common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field.json
index 7385cca2d..4129b38e8 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_2.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field.json
@@ -8,12 +8,6 @@
"to_place": {
"type": "minecraft:weighted_state_provider",
"entries": [
- {
- "data": {
- "Name": "minecraft:lily_of_the_valley"
- },
- "weight": 1
- },
{
"data": {
"Name": "biomesoplenty:white_lavender"
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_1.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_1.json
deleted file mode 100644
index d09ed6875..000000000
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "type": "minecraft:flower",
- "config": {
- "feature": {
- "feature": {
- "type": "minecraft:simple_block",
- "config": {
- "to_place": {
- "type": "minecraft:weighted_state_provider",
- "entries": [
- {
- "data": {
- "Name": "biomesoplenty:white_lavender"
- },
- "weight": 1
- }
- ]
- }
- }
- },
- "placement": [
- {
- "type": "minecraft:block_predicate_filter",
- "predicate": {
- "type": "minecraft:matching_blocks",
- "blocks": "minecraft:air"
- }
- }
- ]
- },
- "tries": 64,
- "xz_spread": 7,
- "y_spread": 3
- }
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json
index 3afd2709f..3d1284ebf 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json
@@ -6,13 +6,24 @@
"type": "minecraft:simple_block",
"config": {
"to_place": {
- "type": "minecraft:simple_state_provider",
- "state": {
- "Name": "biomesoplenty:tall_white_lavender",
- "Properties": {
- "half": "lower"
+ "type": "minecraft:weighted_state_provider",
+ "entries": [
+ {
+ "data": {
+ "Name": "biomesoplenty:tall_white_lavender",
+ "Properties": {
+ "half": "lower"
+ }
+ },
+ "weight": 3
+ },
+ {
+ "data": {
+ "Name": "biomesoplenty:white_lavender"
+ },
+ "weight": 1
}
- }
+ ]
}
}
},
@@ -26,7 +37,7 @@
}
]
},
- "tries": 96,
+ "tries": 512,
"xz_spread": 7,
"y_spread": 3
}
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_1.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field.json
similarity index 80%
rename from common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_1.json
rename to common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field.json
index 3cff7e01d..b5d9b096b 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_1.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field.json
@@ -1,9 +1,9 @@
{
- "feature": "biomesoplenty:flower_field_1",
+ "feature": "biomesoplenty:flower_field",
"placement": [
{
"type": "minecraft:rarity_filter",
- "chance": 3
+ "chance": 5
},
{
"type": "minecraft:in_square"
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_2.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_2.json
deleted file mode 100644
index b20f44f73..000000000
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_field_2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "feature": "biomesoplenty:flower_field_2",
- "placement": [
- {
- "type": "minecraft:rarity_filter",
- "chance": 4
- },
- {
- "type": "minecraft:in_square"
- },
- {
- "type": "minecraft:heightmap",
- "heightmap": "MOTION_BLOCKING"
- },
- {
- "type": "minecraft:biome"
- }
- ]
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json
index d9d2004fd..5ca5e3bff 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json
@@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
- "chance": 3
+ "chance": 7
},
{
"type": "minecraft:in_square"
diff --git a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java
index a7757a52a..a3a151247 100644
--- a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java
+++ b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java
@@ -392,18 +392,17 @@ public static Biome field(HolderGetter placedFeatureGetter, Holde
BiomeDefaultFeatures.addRareBerryBushes(biomeBuilder);
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.ROSE_BUSH_NORMAL);
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.SUNFLOWER);
+ addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_FIELD);
// Vegetation
if (forest)
{
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_FIELD_FOREST);
- addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_FIELD_2);
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_SPROUTS_15);
}
else
{
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_FIELD);
- addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_FIELD_1);
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_TALL_WHITE_LAVENDER);
addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_SPROUTS_10);
}
diff --git a/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java b/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java
index eacae7157..f334c00e3 100644
--- a/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java
+++ b/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java
@@ -38,6 +38,8 @@
import net.minecraft.world.level.levelgen.feature.trunkplacers.CherryTrunkPlacer;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
+import java.util.List;
+
public class BOPVegetationFeatures
{
public static final ResourceKey> HIGH_GRASS = BOPFeatureUtils.createKey("high_grass");
@@ -102,8 +104,7 @@ public class BOPVegetationFeatures
public static final ResourceKey> FLOWER_CLOVER_PATCH = BOPFeatureUtils.createKey("flower_clover_patch");
public static final ResourceKey> FLOWER_CONIFEROUS_FOREST = BOPFeatureUtils.createKey("flower_coniferous_forest");
public static final ResourceKey> FLOWER_DEFAULT_EXTENDED = BOPFeatureUtils.createKey("flower_default_extended");
- public static final ResourceKey> FLOWER_FIELD_1 = BOPFeatureUtils.createKey("flower_field_1");
- public static final ResourceKey> FLOWER_FIELD_2 = BOPFeatureUtils.createKey("flower_field_2");
+ public static final ResourceKey> FLOWER_FIELD = BOPFeatureUtils.createKey("flower_field");
public static final ResourceKey> FLOWER_GRASSLAND = BOPFeatureUtils.createKey("flower_grassland");
public static final ResourceKey> FLOWER_JACARANDA_GLADE = BOPFeatureUtils.createKey("flower_jacaranda_glade");
public static final ResourceKey> FLOWER_LAVENDER = BOPFeatureUtils.createKey("flower_lavender");
@@ -265,7 +266,7 @@ public static void bootstrap(BootstapContext> context)
register(context, BOPVegetationFeatures.PATCH_SEA_OATS, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.SEA_OATS))));
register(context, BOPVegetationFeatures.PATCH_SPROUTS, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.SPROUT))));
register(context, BOPVegetationFeatures.PATCH_TALL_LAVENDER, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.TALL_LAVENDER))));
- register(context, BOPVegetationFeatures.PATCH_TALL_WHITE_LAVENDER, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.TALL_WHITE_LAVENDER))));
+ register(context, BOPVegetationFeatures.PATCH_TALL_WHITE_LAVENDER, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BOPBlocks.TALL_WHITE_LAVENDER.defaultBlockState(), 3).add(BOPBlocks.WHITE_LAVENDER.defaultBlockState(), 1).build())), List.of(), 512));
register(context, BOPVegetationFeatures.PATCH_TINY_CACTUS, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.TINY_CACTUS))));
register(context, BOPVegetationFeatures.PATCH_TUNDRA_SHRUBS, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.TUNDRA_SHRUB))));
register(context, BOPVegetationFeatures.PATCH_WATERGRASS, Feature.RANDOM_PATCH, waterPatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.WATERGRASS))));
@@ -311,8 +312,7 @@ public static void bootstrap(BootstapContext> context)
register(context, BOPVegetationFeatures.FLOWER_CLOVER_PATCH, Feature.FLOWER, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(Blocks.AZURE_BLUET))));
register(context, BOPVegetationFeatures.FLOWER_CONIFEROUS_FOREST, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.CORNFLOWER.defaultBlockState(), 1).add(Blocks.OXEYE_DAISY.defaultBlockState(), 1).add(Blocks.POPPY.defaultBlockState(), 1).add(Blocks.DANDELION.defaultBlockState(), 1)), 64));
register(context, BOPVegetationFeatures.FLOWER_DEFAULT_EXTENDED, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.OXEYE_DAISY.defaultBlockState(), 1).add(Blocks.POPPY.defaultBlockState(), 1).add(Blocks.DANDELION.defaultBlockState(), 1)), 64));
- register(context, BOPVegetationFeatures.FLOWER_FIELD_1, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BOPBlocks.WHITE_LAVENDER.defaultBlockState(), 1)), 64));
- register(context, BOPVegetationFeatures.FLOWER_FIELD_2, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.LILY_OF_THE_VALLEY.defaultBlockState(), 1).add(BOPBlocks.WHITE_LAVENDER.defaultBlockState(), 1).add(Blocks.POPPY.defaultBlockState(), 1).add(Blocks.DANDELION.defaultBlockState(), 1)), 64));
+ register(context, BOPVegetationFeatures.FLOWER_FIELD, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BOPBlocks.WHITE_LAVENDER.defaultBlockState(), 1).add(Blocks.POPPY.defaultBlockState(), 1).add(Blocks.DANDELION.defaultBlockState(), 1)), 64));
register(context, BOPVegetationFeatures.FLOWER_GRASSLAND, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BOPBlocks.PINK_DAFFODIL.defaultBlockState(), 1)), 64));
register(context, BOPVegetationFeatures.FLOWER_JACARANDA_GLADE, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.LILY_OF_THE_VALLEY.defaultBlockState(), 3).add(Blocks.BLUE_ORCHID.defaultBlockState(), 1)), 64));
register(context, BOPVegetationFeatures.FLOWER_LAVENDER, Feature.FLOWER, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.LAVENDER))));
diff --git a/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java b/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java
index 317e385f0..0188b9557 100644
--- a/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java
+++ b/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java
@@ -103,8 +103,7 @@ public class BOPVegetationPlacements
public static final ResourceKey FLOWER_CONIFEROUS_FOREST = BOPPlacementUtils.createKey("flower_coniferous_forest");
public static final ResourceKey FLOWER_DEFAULT_EXTENDED_6 = BOPPlacementUtils.createKey("flower_default_extended_6");
public static final ResourceKey FLOWER_DEFAULT_EXTENDED_15 = BOPPlacementUtils.createKey("flower_default_extended_15");
- public static final ResourceKey FLOWER_FIELD_1 = BOPPlacementUtils.createKey("flower_field_1");
- public static final ResourceKey FLOWER_FIELD_2 = BOPPlacementUtils.createKey("flower_field_2");
+ public static final ResourceKey FLOWER_FIELD = BOPPlacementUtils.createKey("flower_field");
public static final ResourceKey FLOWER_GRASSLAND = BOPPlacementUtils.createKey("flower_grassland");
public static final ResourceKey FLOWER_MOOR = BOPPlacementUtils.createKey("flower_moor");
public static final ResourceKey FLOWER_MYSTIC_GROVE = BOPPlacementUtils.createKey("flower_mystic_grove");
@@ -246,8 +245,7 @@ public static void bootstrap(BootstapContext context)
final Holder> FLOWER_CLOVER_PATCH = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_CLOVER_PATCH);
final Holder> FLOWER_CONIFEROUS_FOREST = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_CONIFEROUS_FOREST);
final Holder> FLOWER_DEFAULT_EXTENDED = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_DEFAULT_EXTENDED);
- final Holder> FLOWER_FIELD_1 = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_FIELD_1);
- final Holder> FLOWER_FIELD_2 = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_FIELD_2);
+ final Holder> FLOWER_FIELD = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_FIELD);
final Holder> FLOWER_GRASSLAND = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_GRASSLAND);
final Holder> FLOWER_JACARANDA_GLADE = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_JACARANDA_GLADE);
final Holder> FLOWER_MOOR = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.FLOWER_MOOR);
@@ -382,7 +380,7 @@ public static void bootstrap(BootstapContext context)
register(context, BOPVegetationPlacements.PATCH_TALL_GRASS_128, PATCH_TALL_GRASS, RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome());
register(context, BOPVegetationPlacements.PATCH_TALL_LAVENDER, PATCH_TALL_LAVENDER, List.of(RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.PATCH_TALL_LAVENDER_FOREST, PATCH_TALL_LAVENDER, List.of(RarityFilter.onAverageOnceEvery(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
- register(context, BOPVegetationPlacements.PATCH_TALL_WHITE_LAVENDER, PATCH_TALL_WHITE_LAVENDER, List.of(RarityFilter.onAverageOnceEvery(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
+ register(context, BOPVegetationPlacements.PATCH_TALL_WHITE_LAVENDER, PATCH_TALL_WHITE_LAVENDER, List.of(RarityFilter.onAverageOnceEvery(7), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.PATCH_TINY_CACTUS, PATCH_TINY_CACTUS, List.of(RarityFilter.onAverageOnceEvery(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.PATCH_TUNDRA_SHRUBS, PATCH_TUNDRA_SHRUBS, VegetationPlacements.worldSurfaceSquaredWithCount(3));
register(context, BOPVegetationPlacements.RAINFOREST_CLIFFS_VINES, RAINFOREST_CLIFFS_VINES, VegetationPlacements.worldSurfaceSquaredWithCount(10));
@@ -411,8 +409,7 @@ public static void bootstrap(BootstapContext context)
register(context, BOPVegetationPlacements.FLOWER_CONIFEROUS_FOREST, FLOWER_CONIFEROUS_FOREST, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.FLOWER_DEFAULT_EXTENDED_6, FLOWER_DEFAULT_EXTENDED, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.FLOWER_DEFAULT_EXTENDED_15, FLOWER_DEFAULT_EXTENDED, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
- register(context, BOPVegetationPlacements.FLOWER_FIELD_1, FLOWER_FIELD_1, List.of(RarityFilter.onAverageOnceEvery(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
- register(context, BOPVegetationPlacements.FLOWER_FIELD_2, FLOWER_FIELD_2, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
+ register(context, BOPVegetationPlacements.FLOWER_FIELD, FLOWER_FIELD, List.of(RarityFilter.onAverageOnceEvery(5), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.FLOWER_GRASSLAND, FLOWER_GRASSLAND, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.FLOWER_MOOR, FLOWER_MOOR, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
register(context, BOPVegetationPlacements.FLOWER_MYSTIC_GROVE, FLOWER_MYSTIC_GROVE, List.of(RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome()));
diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/potted_white_lavender.png b/common/src/main/resources/assets/biomesoplenty/textures/block/potted_white_lavender.png
index 0df8ee3b8..a37590475 100644
Binary files a/common/src/main/resources/assets/biomesoplenty/textures/block/potted_white_lavender.png and b/common/src/main/resources/assets/biomesoplenty/textures/block/potted_white_lavender.png differ
diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_bottom.png b/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_bottom.png
index 490977da4..1d7cab687 100644
Binary files a/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_bottom.png and b/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_bottom.png differ
diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_top.png b/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_top.png
index 8978c11a5..6741e6238 100644
Binary files a/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_top.png and b/common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_top.png differ
diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender.png b/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender.png
index 79451c210..ed9a71aa5 100644
Binary files a/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender.png and b/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender.png differ
diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender_alt.png b/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender_alt.png
index 9a8a23a9b..22f04787f 100644
Binary files a/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender_alt.png and b/common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender_alt.png differ