From e9bf05083c604712d57a359631b76005c11f4527 Mon Sep 17 00:00:00 2001 From: Forstride Date: Thu, 15 Feb 2024 23:59:50 -0500 Subject: [PATCH] Added White Lavender/Tall White Lavender to the Field biome, tweaked Lavender textures --- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 17 +++++---- .../biomesoplenty/worldgen/biome/field.json | 8 ++--- .../worldgen/biome/forested_field.json | 5 +-- .../configured_feature/flower_field_1.json | 20 +---------- .../configured_feature/flower_field_2.json | 8 ++--- .../patch_tall_white_lavender.json | 33 ++++++++++++++++++ .../placed_feature/flower_field_1.json | 2 +- .../placed_feature/flower_field_2.json | 2 +- .../placed_feature/flower_wildflower.json | 19 ++++++++++ .../patch_tall_white_lavender.json | 19 ++++++++++ .../biomesoplenty/api/block/BOPBlocks.java | 3 ++ .../java/biomesoplenty/api/item/BOPItems.java | 3 ++ .../biome/BOPOverworldBiomes.java | 9 ++--- .../biomesoplenty/block/FlowerBlockBOP.java | 2 +- .../java/biomesoplenty/init/ModBlocks.java | 3 ++ .../java/biomesoplenty/init/ModClient.java | 3 ++ .../biomesoplenty/init/ModCreativeTab.java | 6 ++-- .../java/biomesoplenty/init/ModItems.java | 3 ++ .../biomesoplenty/init/ModVanillaCompat.java | 4 +++ .../biomesoplenty/init/ModVillagerTrades.java | 2 ++ .../feature/BOPVegetationFeatures.java | 6 ++-- .../placement/BOPVegetationPlacements.java | 9 +++-- .../biomesoplenty/blockstates/lavender.json | 5 ++- .../blockstates/potted_white_lavender.json | 5 +++ .../blockstates/tall_white_lavender.json | 6 ++++ .../blockstates/white_lavender.json | 8 +++++ .../assets/biomesoplenty/lang/en_us.json | 3 ++ .../models/block/lavender_alt.json | 6 ++++ .../models/block/potted_white_lavender.json | 6 ++++ .../block/tall_white_lavender_bottom.json | 6 ++++ .../models/block/tall_white_lavender_top.json | 6 ++++ .../models/block/white_lavender.json | 6 ++++ .../models/block/white_lavender_alt.json | 6 ++++ .../models/item/potted_white_lavender.json | 6 ++++ .../models/item/tall_white_lavender.json | 6 ++++ .../models/item/white_lavender.json | 6 ++++ .../biomesoplenty/shaders/block.properties | 4 +-- .../biomesoplenty/textures/block/lavender.png | Bin 266 -> 267 bytes .../textures/block/lavender_alt.png | Bin 0 -> 263 bytes .../textures/block/potted_lavender.png | Bin 241 -> 240 bytes .../textures/block/potted_white_lavender.png | Bin 0 -> 240 bytes .../textures/block/tall_lavender_bottom.png | Bin 446 -> 267 bytes .../textures/block/tall_lavender_top.png | Bin 431 -> 276 bytes .../block/tall_white_lavender_bottom.png | Bin 0 -> 267 bytes .../block/tall_white_lavender_top.png | Bin 0 -> 276 bytes .../textures/block/white_lavender.png | Bin 0 -> 267 bytes .../textures/block/white_lavender_alt.png | Bin 0 -> 263 bytes .../white_dye_from_tall_white_lavender.json | 33 ++++++++++++++++++ .../misc/white_dye_from_white_lavender.json | 33 ++++++++++++++++++ .../blocks/potted_white_lavender.json | 33 ++++++++++++++++++ .../blocks/tall_white_lavender.json | 28 +++++++++++++++ .../loot_tables/blocks/white_lavender.json | 19 ++++++++++ .../white_dye_from_tall_white_lavender.json | 13 +++++++ .../white_dye_from_white_lavender.json | 13 +++++++ .../minecraft/tags/blocks/flower_pots.json | 1 + .../minecraft/tags/blocks/small_flowers.json | 1 + .../tags/blocks/sword_efficient.json | 1 + .../minecraft/tags/blocks/tall_flowers.json | 1 + .../minecraft/tags/items/small_flowers.json | 1 + .../minecraft/tags/items/tall_flowers.json | 1 + .../blocks/unbreakable_infertile_crops.json | 1 + 61 files changed, 397 insertions(+), 53 deletions(-) create mode 100644 common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json create mode 100644 common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_wildflower.json create mode 100644 common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/potted_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/tall_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/blockstates/white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/lavender_alt.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/potted_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_bottom.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_top.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/block/white_lavender_alt.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/tall_white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/lavender_alt.png create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/potted_white_lavender.png create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_bottom.png create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/tall_white_lavender_top.png create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender.png create mode 100644 common/src/main/resources/assets/biomesoplenty/textures/block/white_lavender_alt.png create mode 100644 common/src/main/resources/data/biomesoplenty/advancements/recipes/misc/white_dye_from_tall_white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/advancements/recipes/misc/white_dye_from_white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/loot_tables/blocks/tall_white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/loot_tables/blocks/white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/recipes/white_dye_from_tall_white_lavender.json create mode 100644 common/src/main/resources/data/biomesoplenty/recipes/white_dye_from_white_lavender.json diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 2de8915f7a..eacadbcc39 100644 --- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.20.4 2024-02-01T18:22:35.6922753 Registries +// 1.20.4 2024-02-15T23:51:12.4888173 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 -d662a9e04a7840345595d343cc34426393c04699 data/biomesoplenty/worldgen/biome/field.json +d60223aecf7e092fd753a8de34e0d0058a331a53 data/biomesoplenty/worldgen/biome/field.json 0ca60f25f9961787ec5f174f8be6f29463c4decc data/biomesoplenty/worldgen/biome/fir_clearing.json 83a5d2dfdd6a0e7fd5a8c3d111c863bc254f6604 data/biomesoplenty/worldgen/biome/floodplain.json -a9636d9d8c3cbbb4afcf2f57615b9762318e87e1 data/biomesoplenty/worldgen/biome/forested_field.json +88a7d57d8776b0196ac2b71039b71299d0a1b930 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,8 @@ 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 -859d57cbe93736c8ff5584fa65679b97fc39dfe4 data/biomesoplenty/worldgen/configured_feature/flower_field_1.json -c63127092cfe762fc5adf937bd208f67c4ce0832 data/biomesoplenty/worldgen/configured_feature/flower_field_2.json +acadf67b3ddae8bb4f6feee2036394e612ae1ddb data/biomesoplenty/worldgen/configured_feature/flower_field_1.json +442a5bcc3ca24db935e07b46d112c1a8c5842edb data/biomesoplenty/worldgen/configured_feature/flower_field_2.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,6 +247,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 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 @@ -430,8 +431,8 @@ 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 -ec6c880fe45a5421db544aa9cbc0279d1cae3a97 data/biomesoplenty/worldgen/placed_feature/flower_field_1.json -977af58b49ff46669661d5d15581a36f997ccc35 data/biomesoplenty/worldgen/placed_feature/flower_field_2.json +240ac02e7b7d783f0116eec633603efdcf9ae445 data/biomesoplenty/worldgen/placed_feature/flower_field_1.json +c970201d2b5c1226ec8dd81c448c4622a72d804c data/biomesoplenty/worldgen/placed_feature/flower_field_2.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 @@ -451,6 +452,7 @@ c85908914ebbbdface27da7524af002623d49619 data/biomesoplenty/worldgen/placed_feat 04d342758c64e5c565de41efe923a811b431179b data/biomesoplenty/worldgen/placed_feature/flower_violet.json 1da06a1c0419889e8c0e3fb5eaa01b914b7f813d data/biomesoplenty/worldgen/placed_feature/flower_wasteland.json 8d07e41719604b44d6af460b24cee853ec77d197 data/biomesoplenty/worldgen/placed_feature/flower_wetland.json +13141404fd12113fdd01432805813df0968a9e64 data/biomesoplenty/worldgen/placed_feature/flower_wildflower.json f2fe7ca33c22cb4b6ba6ef8d0c6476b51ac4f880 data/biomesoplenty/worldgen/placed_feature/giant_glowshroom_cave.json 319dc186d37a1aaef6ff83642105c3dc4350863e data/biomesoplenty/worldgen/placed_feature/giant_tree.json 954e0eee6093d18bce7ce5b251c22c8d38ab0ec2 data/biomesoplenty/worldgen/placed_feature/glowing_grotto_mud.json @@ -559,6 +561,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 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 875de491a5..c8e0e14a1e 100644 --- a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json +++ b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/field.json @@ -84,13 +84,13 @@ "minecraft:red_mushroom_normal", "minecraft:patch_pumpkin", "minecraft:patch_berry_rare", - "biomesoplenty:flower_field_1", - "biomesoplenty:patch_lilac_normal", "biomesoplenty:rose_bush_normal", + "biomesoplenty:sunflower", "biomesoplenty:trees_field", - "biomesoplenty:flower_field_2", + "biomesoplenty:flower_field_1", + "biomesoplenty:patch_tall_white_lavender", "biomesoplenty:patch_sprouts_10", - "biomesoplenty:sunflower", + "biomesoplenty:flower_wildflower", "biomesoplenty:patch_grass_6" ], [ 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 e36f59f7a5..115cabc47d 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 @@ -84,11 +84,12 @@ "minecraft:red_mushroom_normal", "minecraft:patch_pumpkin", "minecraft:patch_berry_rare", - "biomesoplenty:flower_field_1", - "biomesoplenty:patch_lilac_normal", "biomesoplenty:rose_bush_normal", + "biomesoplenty:sunflower", "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_1.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/flower_field_1.json index d28954aa8c..d09ed6875f 100644 --- 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 @@ -10,25 +10,7 @@ "entries": [ { "data": { - "Name": "minecraft:lily_of_the_valley" - }, - "weight": 1 - }, - { - "data": { - "Name": "minecraft:azure_bluet" - }, - "weight": 1 - }, - { - "data": { - "Name": "minecraft:poppy" - }, - "weight": 1 - }, - { - "data": { - "Name": "minecraft:dandelion" + "Name": "biomesoplenty:white_lavender" }, "weight": 1 } 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_2.json index b18aa7123c..7385cca2d8 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_2.json @@ -10,25 +10,25 @@ "entries": [ { "data": { - "Name": "minecraft:pink_tulip" + "Name": "minecraft:lily_of_the_valley" }, "weight": 1 }, { "data": { - "Name": "minecraft:red_tulip" + "Name": "biomesoplenty:white_lavender" }, "weight": 1 }, { "data": { - "Name": "minecraft:white_tulip" + "Name": "minecraft:poppy" }, "weight": 1 }, { "data": { - "Name": "minecraft:orange_tulip" + "Name": "minecraft:dandelion" }, "weight": 1 } 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 new file mode 100644 index 0000000000..3afd2709f7 --- /dev/null +++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/patch_tall_white_lavender.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "biomesoplenty:tall_white_lavender", + "Properties": { + "half": "lower" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + }, + "tries": 96, + "xz_spread": 7, + "y_spread": 3 + } +} \ No newline at end of file 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_1.json index b45de1a0dc..3cff7e01db 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_1.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 4 + "chance": 3 }, { "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 index 7035f9890d..b20f44f737 100644 --- 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 @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 8 + "chance": 4 }, { "type": "minecraft:in_square" diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_wildflower.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_wildflower.json new file mode 100644 index 0000000000..e0b5dad8e5 --- /dev/null +++ b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/flower_wildflower.json @@ -0,0 +1,19 @@ +{ + "feature": "biomesoplenty:flower_wildflower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "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 new file mode 100644 index 0000000000..d9d2004fdf --- /dev/null +++ b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/patch_tall_white_lavender.json @@ -0,0 +1,19 @@ +{ + "feature": "biomesoplenty:patch_tall_white_lavender", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java index b16e430261..a2ca9525ef 100644 --- a/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -373,6 +373,8 @@ public class BOPBlocks public static Block VIOLET; public static Block LAVENDER; public static Block TALL_LAVENDER; + public static Block WHITE_LAVENDER; + public static Block TALL_WHITE_LAVENDER; public static Block BLUE_HYDRANGEA; public static Block GOLDENROD; public static Block ORANGE_COSMOS; @@ -434,6 +436,7 @@ public class BOPBlocks public static Block POTTED_ROSE; public static Block POTTED_VIOLET; public static Block POTTED_LAVENDER; + public static Block POTTED_WHITE_LAVENDER; public static Block POTTED_ORANGE_COSMOS; public static Block POTTED_PINK_DAFFODIL; public static Block POTTED_PINK_HIBISCUS; diff --git a/common/src/main/java/biomesoplenty/api/item/BOPItems.java b/common/src/main/java/biomesoplenty/api/item/BOPItems.java index b0e709acd9..a5e9bf3f5f 100644 --- a/common/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/common/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -391,6 +391,8 @@ public class BOPItems public static Item VIOLET; public static Item LAVENDER; public static Item TALL_LAVENDER; + public static Item WHITE_LAVENDER; + public static Item TALL_WHITE_LAVENDER; public static Item BLUE_HYDRANGEA; public static Item GOLDENROD; public static Item ORANGE_COSMOS; @@ -454,6 +456,7 @@ public class BOPItems public static Item POTTED_ROSE; public static Item POTTED_VIOLET; public static Item POTTED_LAVENDER; + public static Item POTTED_WHITE_LAVENDER; public static Item POTTED_ORANGE_COSMOS; public static Item POTTED_PINK_DAFFODIL; public static Item POTTED_PINK_HIBISCUS; diff --git a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java index 0ad91b350b..a7757a52a0 100644 --- a/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java +++ b/common/src/main/java/biomesoplenty/biome/BOPOverworldBiomes.java @@ -390,24 +390,25 @@ public static Biome field(HolderGetter placedFeatureGetter, Holde BiomeDefaultFeatures.addDefaultMushrooms(biomeBuilder); addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_PUMPKIN); BiomeDefaultFeatures.addRareBerryBushes(biomeBuilder); - addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_FIELD_1); - addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.LILAC_NORMAL); addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.ROSE_BUSH_NORMAL); + addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.SUNFLOWER); // 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_2); + 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); - addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.SUNFLOWER); } + addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_WILDFLOWER); addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_GRASS_6); return biomeWithColorOverrides(true, 0.4F, 0.7F, 0x63B26D, 0x63B26D, spawnBuilder, biomeBuilder, FOREST_MUSIC); diff --git a/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java b/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java index 0de0b1b9d3..592307f6b6 100644 --- a/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java +++ b/common/src/main/java/biomesoplenty/block/FlowerBlockBOP.java @@ -40,7 +40,7 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, Block block = state.getBlock(); VoxelShape shape = NORMAL; - if (block == BOPBlocks.LAVENDER || block == BOPBlocks.PINK_HIBISCUS) + if (block == BOPBlocks.LAVENDER || block == BOPBlocks.WHITE_LAVENDER || block == BOPBlocks.PINK_HIBISCUS) { shape = LARGE; } diff --git a/common/src/main/java/biomesoplenty/init/ModBlocks.java b/common/src/main/java/biomesoplenty/init/ModBlocks.java index 387d0e97d7..03ddeccfbf 100644 --- a/common/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/common/src/main/java/biomesoplenty/init/ModBlocks.java @@ -440,6 +440,8 @@ private static void registerBlocks(BiConsumer func) VIOLET = register(func, new FlowerBlockBOP(MobEffects.CONFUSION, 10, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "violet"); LAVENDER = register(func, new FlowerBlockBOP(MobEffects.HEALTH_BOOST, 5, BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_MAGENTA).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "lavender"); TALL_LAVENDER = register(func, new TallFlowerBlockBOP(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "tall_lavender"); + WHITE_LAVENDER = register(func, new FlowerBlockBOP(MobEffects.HEALTH_BOOST, 5, BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.SNOW).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "white_lavender"); + TALL_WHITE_LAVENDER = register(func, new TallFlowerBlockBOP(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "tall_white_lavender"); BLUE_HYDRANGEA = register(func, new TallFlowerBlockBOP(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "blue_hydrangea"); GOLDENROD = register(func, new TallFlowerBlockBOP(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "goldenrod"); ORANGE_COSMOS = register(func, new FlowerBlockBOP(MobEffects.ABSORPTION, 7, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ)), "orange_cosmos"); @@ -503,6 +505,7 @@ private static void registerBlocks(BiConsumer func) POTTED_ROSE = register(func, new FlowerPotBlock(ROSE, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_rose"); POTTED_VIOLET = register(func, new FlowerPotBlock(VIOLET, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_violet"); POTTED_LAVENDER = register(func, new FlowerPotBlock(LAVENDER, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_lavender"); + POTTED_WHITE_LAVENDER = register(func, new FlowerPotBlock(WHITE_LAVENDER, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_white_lavender"); POTTED_ORANGE_COSMOS = register(func, new FlowerPotBlock(ORANGE_COSMOS, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_orange_cosmos"); POTTED_PINK_DAFFODIL = register(func, new FlowerPotBlock(PINK_DAFFODIL, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_pink_daffodil"); POTTED_PINK_HIBISCUS = register(func, new FlowerPotBlock(PINK_HIBISCUS, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_pink_hibiscus"); diff --git a/common/src/main/java/biomesoplenty/init/ModClient.java b/common/src/main/java/biomesoplenty/init/ModClient.java index 3bf3d12d77..ca5db828d8 100644 --- a/common/src/main/java/biomesoplenty/init/ModClient.java +++ b/common/src/main/java/biomesoplenty/init/ModClient.java @@ -119,6 +119,7 @@ public static void setupRenderTypes() RenderHelper.setRenderType(ROSE, cutoutRenderType); RenderHelper.setRenderType(VIOLET, cutoutRenderType); RenderHelper.setRenderType(LAVENDER, cutoutRenderType); + RenderHelper.setRenderType(WHITE_LAVENDER, cutoutRenderType); RenderHelper.setRenderType(WILDFLOWER, cutoutRenderType); RenderHelper.setRenderType(ORANGE_COSMOS, cutoutRenderType); RenderHelper.setRenderType(PINK_DAFFODIL, cutoutRenderType); @@ -129,6 +130,7 @@ public static void setupRenderTypes() RenderHelper.setRenderType(WILTED_LILY, cutoutRenderType); RenderHelper.setRenderType(BURNING_BLOSSOM, cutoutRenderType); RenderHelper.setRenderType(TALL_LAVENDER, cutoutRenderType); + RenderHelper.setRenderType(TALL_WHITE_LAVENDER, cutoutRenderType); RenderHelper.setRenderType(BLUE_HYDRANGEA, cutoutRenderType); RenderHelper.setRenderType(GOLDENROD, cutoutRenderType); RenderHelper.setRenderType(ICY_IRIS, cutoutRenderType); @@ -234,6 +236,7 @@ public static void setupRenderTypes() RenderHelper.setRenderType(POTTED_ROSE, cutoutRenderType); RenderHelper.setRenderType(POTTED_VIOLET, cutoutRenderType); RenderHelper.setRenderType(POTTED_LAVENDER, cutoutRenderType); + RenderHelper.setRenderType(POTTED_WHITE_LAVENDER, cutoutRenderType); RenderHelper.setRenderType(POTTED_ORANGE_COSMOS, cutoutRenderType); RenderHelper.setRenderType(POTTED_PINK_DAFFODIL, cutoutRenderType); RenderHelper.setRenderType(POTTED_PINK_HIBISCUS, cutoutRenderType); diff --git a/common/src/main/java/biomesoplenty/init/ModCreativeTab.java b/common/src/main/java/biomesoplenty/init/ModCreativeTab.java index 2a6c682a52..73bc7bd62e 100644 --- a/common/src/main/java/biomesoplenty/init/ModCreativeTab.java +++ b/common/src/main/java/biomesoplenty/init/ModCreativeTab.java @@ -29,9 +29,9 @@ public static void registerCreativeTabs(BiConsumer new ItemStack(BOPItems.BOP_ICON)) diff --git a/common/src/main/java/biomesoplenty/init/ModItems.java b/common/src/main/java/biomesoplenty/init/ModItems.java index d64ddbe97c..e10f4ac065 100644 --- a/common/src/main/java/biomesoplenty/init/ModItems.java +++ b/common/src/main/java/biomesoplenty/init/ModItems.java @@ -397,6 +397,8 @@ public static void registerBlockItems(BiConsumer func) VIOLET = register(func, "violet", new BlockItem(BOPBlocks.VIOLET, new Item.Properties())); LAVENDER = register(func, "lavender", new BlockItem(BOPBlocks.LAVENDER, new Item.Properties())); TALL_LAVENDER = register(func, "tall_lavender", new BlockItem(BOPBlocks.TALL_LAVENDER, new Item.Properties())); + WHITE_LAVENDER = register(func, "white_lavender", new BlockItem(BOPBlocks.WHITE_LAVENDER, new Item.Properties())); + TALL_WHITE_LAVENDER = register(func, "tall_white_lavender", new BlockItem(BOPBlocks.TALL_WHITE_LAVENDER, new Item.Properties())); BLUE_HYDRANGEA = register(func, "blue_hydrangea", new BlockItem(BOPBlocks.BLUE_HYDRANGEA, new Item.Properties())); WILDFLOWER = register(func, "wildflower", new BlockItem(BOPBlocks.WILDFLOWER, new Item.Properties())); GOLDENROD = register(func, "goldenrod", new BlockItem(BOPBlocks.GOLDENROD, new Item.Properties())); @@ -454,6 +456,7 @@ public static void registerBlockItems(BiConsumer func) POTTED_ROSE = register(func, "potted_rose", new BlockItem(BOPBlocks.POTTED_ROSE, new Item.Properties())); POTTED_VIOLET = register(func, "potted_violet", new BlockItem(BOPBlocks.POTTED_VIOLET, new Item.Properties())); POTTED_LAVENDER = register(func, "potted_lavender", new BlockItem(BOPBlocks.POTTED_LAVENDER, new Item.Properties())); + POTTED_WHITE_LAVENDER = register(func, "potted_white_lavender", new BlockItem(BOPBlocks.POTTED_WHITE_LAVENDER, new Item.Properties())); POTTED_ORANGE_COSMOS = register(func, "potted_orange_cosmos", new BlockItem(BOPBlocks.POTTED_ORANGE_COSMOS, new Item.Properties())); POTTED_PINK_DAFFODIL = register(func, "potted_pink_daffodil", new BlockItem(BOPBlocks.POTTED_PINK_DAFFODIL, new Item.Properties())); POTTED_PINK_HIBISCUS = register(func, "potted_pink_hibiscus", new BlockItem(BOPBlocks.POTTED_PINK_HIBISCUS, new Item.Properties())); diff --git a/common/src/main/java/biomesoplenty/init/ModVanillaCompat.java b/common/src/main/java/biomesoplenty/init/ModVanillaCompat.java index def8b3713b..cdab2f3c23 100644 --- a/common/src/main/java/biomesoplenty/init/ModVanillaCompat.java +++ b/common/src/main/java/biomesoplenty/init/ModVanillaCompat.java @@ -176,6 +176,7 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerFlammable(BOPBlocks.ROSE, 60, 100); registerFlammable(BOPBlocks.VIOLET, 60, 100); registerFlammable(BOPBlocks.LAVENDER, 60, 100); + registerFlammable(BOPBlocks.WHITE_LAVENDER, 60, 100); registerFlammable(BOPBlocks.WILDFLOWER, 60, 100); registerFlammable(BOPBlocks.PINK_DAFFODIL, 60, 100); registerFlammable(BOPBlocks.PINK_HIBISCUS, 60, 100); @@ -183,6 +184,7 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerFlammable(BOPBlocks.GLOWFLOWER, 60, 100); registerFlammable(BOPBlocks.WILTED_LILY, 60, 100); registerFlammable(BOPBlocks.TALL_LAVENDER, 60, 100); + registerFlammable(BOPBlocks.TALL_WHITE_LAVENDER, 60, 100); registerFlammable(BOPBlocks.BLUE_HYDRANGEA, 60, 100); registerFlammable(BOPBlocks.GOLDENROD, 60, 100); registerFlammable(BOPBlocks.ICY_IRIS, 60, 100); @@ -292,6 +294,7 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerCompostable(0.65F, BOPBlocks.ROSE); registerCompostable(0.65F, BOPBlocks.VIOLET); registerCompostable(0.65F, BOPBlocks.LAVENDER); + registerCompostable(0.65F, BOPBlocks.WHITE_LAVENDER); registerCompostable(0.65F, BOPBlocks.WILDFLOWER); registerCompostable(0.65F, BOPBlocks.ORANGE_COSMOS); registerCompostable(0.65F, BOPBlocks.PINK_DAFFODIL); @@ -303,6 +306,7 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerCompostable(0.65F, BOPBlocks.BURNING_BLOSSOM); registerCompostable(0.65F, BOPBlocks.TALL_LAVENDER); + registerCompostable(0.65F, BOPBlocks.TALL_WHITE_LAVENDER); registerCompostable(0.65F, BOPBlocks.BLUE_HYDRANGEA); registerCompostable(0.65F, BOPBlocks.GOLDENROD); registerCompostable(0.65F, BOPBlocks.ICY_IRIS); diff --git a/common/src/main/java/biomesoplenty/init/ModVillagerTrades.java b/common/src/main/java/biomesoplenty/init/ModVillagerTrades.java index 4f2ea4807b..eb92b4ae59 100644 --- a/common/src/main/java/biomesoplenty/init/ModVillagerTrades.java +++ b/common/src/main/java/biomesoplenty/init/ModVillagerTrades.java @@ -37,6 +37,7 @@ public static void addWanderingVillagerTrades(WandererTradesEvent event) new ItemsForEmeralds(BOPBlocks.VIOLET, 1, 1, 12, 1), new ItemsForEmeralds(BOPBlocks.LAVENDER, 1, 1, 12, 1), + new ItemsForEmeralds(BOPBlocks.WHITE_LAVENDER, 1, 1, 12, 1), new ItemsForEmeralds(BOPBlocks.WILDFLOWER, 1, 1, 12, 1), new ItemsForEmeralds(BOPBlocks.WHITE_PETALS, 1, 1, 12, 1), new ItemsForEmeralds(BOPBlocks.ORANGE_COSMOS, 1, 1, 12, 1), @@ -45,6 +46,7 @@ public static void addWanderingVillagerTrades(WandererTradesEvent event) new ItemsForEmeralds(BOPBlocks.WATERLILY, 1, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.WILTED_LILY, 1, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.TALL_LAVENDER, 2, 1, 8, 1), + new ItemsForEmeralds(BOPBlocks.TALL_WHITE_LAVENDER, 2, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.BLUE_HYDRANGEA, 2, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.GOLDENROD, 2, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.CLOVER, 1, 1, 12, 1), diff --git a/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java b/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java index f00bcab80d..eacae7157f 100644 --- a/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java +++ b/common/src/main/java/biomesoplenty/worldgen/feature/BOPVegetationFeatures.java @@ -73,6 +73,7 @@ public class BOPVegetationFeatures public static final ResourceKey> PATCH_SEA_OATS = BOPFeatureUtils.createKey("patch_sea_oats"); public static final ResourceKey> PATCH_SPROUTS = BOPFeatureUtils.createKey("patch_sprouts"); public static final ResourceKey> PATCH_TALL_LAVENDER = BOPFeatureUtils.createKey("patch_tall_lavender"); + public static final ResourceKey> PATCH_TALL_WHITE_LAVENDER = BOPFeatureUtils.createKey("patch_tall_white_lavender"); public static final ResourceKey> PATCH_TINY_CACTUS = BOPFeatureUtils.createKey("patch_tiny_cactus"); public static final ResourceKey> PATCH_TUNDRA_SHRUBS = BOPFeatureUtils.createKey("patch_tundra_shrubs"); public static final ResourceKey> PATCH_WATERGRASS = BOPFeatureUtils.createKey("patch_watergrass"); @@ -264,6 +265,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_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)))); @@ -309,8 +311,8 @@ 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(Blocks.LILY_OF_THE_VALLEY.defaultBlockState(), 1).add(Blocks.AZURE_BLUET.defaultBlockState(), 1).add(Blocks.POPPY.defaultBlockState(), 1).add(Blocks.DANDELION.defaultBlockState(), 1)), 64)); - register(context, BOPVegetationFeatures.FLOWER_FIELD_2, Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.PINK_TULIP.defaultBlockState(), 1).add(Blocks.RED_TULIP.defaultBlockState(), 1).add(Blocks.WHITE_TULIP.defaultBlockState(), 1).add(Blocks.ORANGE_TULIP.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_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 021fad4ca1..317e385f02 100644 --- a/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java +++ b/common/src/main/java/biomesoplenty/worldgen/placement/BOPVegetationPlacements.java @@ -74,6 +74,7 @@ public class BOPVegetationPlacements public static final ResourceKey PATCH_TALL_GRASS_128 = BOPPlacementUtils.createKey("patch_tall_grass_128"); public static final ResourceKey PATCH_TALL_LAVENDER = BOPPlacementUtils.createKey("patch_tall_lavender"); public static final ResourceKey PATCH_TALL_LAVENDER_FOREST = BOPPlacementUtils.createKey("patch_tall_lavender_forest"); + public static final ResourceKey PATCH_TALL_WHITE_LAVENDER = BOPPlacementUtils.createKey("patch_tall_white_lavender"); public static final ResourceKey PATCH_TINY_CACTUS = BOPPlacementUtils.createKey("patch_tiny_cactus"); public static final ResourceKey PATCH_TUNDRA_SHRUBS = BOPPlacementUtils.createKey("patch_tundra_shrubs"); public static final ResourceKey RAINFOREST_CLIFFS_VINES = BOPPlacementUtils.createKey("rainforest_cliffs_vines"); @@ -119,6 +120,7 @@ public class BOPVegetationPlacements public static final ResourceKey FLOWER_VIOLET = BOPPlacementUtils.createKey("flower_violet"); public static final ResourceKey FLOWER_WASTELAND = BOPPlacementUtils.createKey("flower_wasteland"); public static final ResourceKey FLOWER_WETLAND = BOPPlacementUtils.createKey("flower_wetland"); + public static final ResourceKey FLOWER_WILDFLOWER = BOPPlacementUtils.createKey("flower_wildflower"); public static final ResourceKey GOLDENROD = BOPPlacementUtils.createKey("goldenrod"); public static final ResourceKey LILAC_NORMAL = BOPPlacementUtils.createKey("patch_lilac_normal"); public static final ResourceKey LILAC_EXTRA = BOPPlacementUtils.createKey("patch_lilac_extra"); @@ -224,6 +226,7 @@ public static void bootstrap(BootstapContext context) final Holder> PATCH_SPROUTS = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.PATCH_SPROUTS); final Holder> PATCH_TALL_GRASS = configuredFeatureGetter.getOrThrow(VegetationFeatures.PATCH_TALL_GRASS); final Holder> PATCH_TALL_LAVENDER = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.PATCH_TALL_LAVENDER); + final Holder> PATCH_TALL_WHITE_LAVENDER = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.PATCH_TALL_WHITE_LAVENDER); final Holder> PATCH_TINY_CACTUS = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.PATCH_TINY_CACTUS); final Holder> PATCH_TUNDRA_SHRUBS = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.PATCH_TUNDRA_SHRUBS); final Holder> RAINFOREST_CLIFFS_VINES = configuredFeatureGetter.getOrThrow(BOPVegetationFeatures.RAINFOREST_CLIFFS_VINES); @@ -379,6 +382,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_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)); @@ -407,8 +411,8 @@ 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(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); - register(context, BOPVegetationPlacements.FLOWER_FIELD_2, FLOWER_FIELD_2, List.of(RarityFilter.onAverageOnceEvery(8), 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_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())); @@ -424,6 +428,7 @@ public static void bootstrap(BootstapContext context) register(context, BOPVegetationPlacements.FLOWER_VIOLET, FLOWER_VIOLET, VegetationPlacements.worldSurfaceSquaredWithCount(2)); register(context, BOPVegetationPlacements.FLOWER_WASTELAND, FLOWER_WASTELAND, List.of(RarityFilter.onAverageOnceEvery(6), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); register(context, BOPVegetationPlacements.FLOWER_WETLAND, FLOWER_WETLAND, List.of(RarityFilter.onAverageOnceEvery(4), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); + register(context, BOPVegetationPlacements.FLOWER_WILDFLOWER, FLOWER_WILDFLOWER, List.of(RarityFilter.onAverageOnceEvery(2), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); register(context, BOPVegetationPlacements.GOLDENROD, GOLDENROD, List.of(RarityFilter.onAverageOnceEvery(5), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); register(context, BOPVegetationPlacements.LILAC_NORMAL, PATCH_LILAC, List.of(RarityFilter.onAverageOnceEvery(5), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); register(context, BOPVegetationPlacements.LILAC_EXTRA, PATCH_LILAC, List.of(RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, BiomeFilter.biome())); diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/lavender.json b/common/src/main/resources/assets/biomesoplenty/blockstates/lavender.json index 7b16d2d5c8..0e354816ef 100644 --- a/common/src/main/resources/assets/biomesoplenty/blockstates/lavender.json +++ b/common/src/main/resources/assets/biomesoplenty/blockstates/lavender.json @@ -1,5 +1,8 @@ { "variants": { - "": { "model": "biomesoplenty:block/lavender" } + "": [ + { "model": "biomesoplenty:block/lavender" }, + { "model": "biomesoplenty:block/lavender_alt" } + ] } } diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/potted_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/blockstates/potted_white_lavender.json new file mode 100644 index 0000000000..9df84ecb2f --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/blockstates/potted_white_lavender.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/potted_white_lavender" } + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/tall_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/blockstates/tall_white_lavender.json new file mode 100644 index 0000000000..916db6cb29 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/blockstates/tall_white_lavender.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "biomesoplenty:block/tall_white_lavender_bottom" }, + "half=upper": { "model": "biomesoplenty:block/tall_white_lavender_top" } + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/blockstates/white_lavender.json b/common/src/main/resources/assets/biomesoplenty/blockstates/white_lavender.json new file mode 100644 index 0000000000..80d57ee523 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/blockstates/white_lavender.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "biomesoplenty:block/white_lavender" }, + { "model": "biomesoplenty:block/white_lavender_alt" } + ] + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/lang/en_us.json b/common/src/main/resources/assets/biomesoplenty/lang/en_us.json index 9e9ecf3dbe..9b5e0f78f1 100644 --- a/common/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/common/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -401,6 +401,7 @@ "block.biomesoplenty.potted_umbran_sapling": "Potted Umbran Sapling", "block.biomesoplenty.potted_violet": "Potted Violet", "block.biomesoplenty.potted_snowblossom_sapling": "Potted Snowblossom Sapling", + "block.biomesoplenty.potted_white_lavender": "Potted White Lavender", "block.biomesoplenty.potted_willow_sapling": "Potted Willow Sapling", "block.biomesoplenty.potted_wilted_lily": "Potted Wilted Lily", "block.biomesoplenty.potted_yellow_maple_sapling": "Potted Yellow Maple Sapling", @@ -476,6 +477,7 @@ "block.biomesoplenty.stripped_willow_log": "Stripped Willow Log", "block.biomesoplenty.stripped_willow_wood": "Stripped Willow Wood", "block.biomesoplenty.tall_lavender": "Tall Lavender", + "block.biomesoplenty.tall_white_lavender": "Tall White Lavender", "block.biomesoplenty.thermal_calcite": "Thermal Calcite", "block.biomesoplenty.thermal_calcite_vent": "Thermal Calcite Vent", "block.biomesoplenty.tiny_cactus": "Tiny Cactus", @@ -504,6 +506,7 @@ "block.biomesoplenty.watergrass": "Watergrass", "block.biomesoplenty.waterlily": "Waterlily", "block.biomesoplenty.webbing": "Webbing", + "block.biomesoplenty.white_lavender": "White Lavender", "block.biomesoplenty.white_petals": "White Petals", "block.biomesoplenty.white_sand": "White Sand", "block.biomesoplenty.white_sandstone": "White Sandstone", diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/lavender_alt.json b/common/src/main/resources/assets/biomesoplenty/models/block/lavender_alt.json new file mode 100644 index 0000000000..a566f95304 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/lavender_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/lavender_alt" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/potted_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/block/potted_white_lavender.json new file mode 100644 index 0000000000..36906a5f50 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/potted_white_lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "biomesoplenty:block/potted_white_lavender" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_bottom.json b/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_bottom.json new file mode 100644 index 0000000000..6ed01d61bb --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/tall_white_lavender_bottom" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_top.json b/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_top.json new file mode 100644 index 0000000000..4157e5da50 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/tall_white_lavender_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/tall_white_lavender_top" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender.json new file mode 100644 index 0000000000..3415cdc092 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/white_lavender" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender_alt.json b/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender_alt.json new file mode 100644 index 0000000000..9a538ececa --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/block/white_lavender_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/white_lavender_alt" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json new file mode 100644 index 0000000000..037d3d6602 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/item/potted_white_lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/flower_pot" + } +} diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/tall_white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/tall_white_lavender.json new file mode 100644 index 0000000000..1ca6be7287 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/item/tall_white_lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:block/tall_white_lavender_top" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json b/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json new file mode 100644 index 0000000000..3662f43bf4 --- /dev/null +++ b/common/src/main/resources/assets/biomesoplenty/models/item/white_lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:block/white_lavender" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/biomesoplenty/shaders/block.properties b/common/src/main/resources/assets/biomesoplenty/shaders/block.properties index cb4ff34a09..d96dfd1441 100644 --- a/common/src/main/resources/assets/biomesoplenty/shaders/block.properties +++ b/common/src/main/resources/assets/biomesoplenty/shaders/block.properties @@ -13,8 +13,8 @@ block.10031 = biomesoplenty:sprout biomesoplenty:dune_grass biomesoplenty:desert block.10059 = biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:fir_sapling biomesoplenty:pine_sapling biomesoplenty:red_maple_sapling biomesoplenty:orange_maple_sapling biomesoplenty:yellow_maple_sapling biomesoplenty:redwood_sapling biomesoplenty:mahogany_sapling biomesoplenty:jacaranda_sapling biomesoplenty:palm_sapling biomesoplenty:willow_sapling biomesoplenty:dead_sapling biomesoplenty:magic_sapling biomesoplenty:umbran_sapling biomesoplenty:hellbark_sapling biomesoplenty:empyreal_sapling biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:wildflower biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:white_petals biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:bush biomesoplenty:clover biomesoplenty:tundra_shrub biomesoplenty:toadstool biomesoplenty:glowshroom biomesoplenty:hair biomesoplenty:endbloom # Tall Plants -block.10175 = biomesoplenty:tall_lavender:half=lower biomesoplenty:blue_hydrangea:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:reed:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:sea_oats:half=lower -block.10176 = biomesoplenty:tall_lavender:half=upper biomesoplenty:blue_hydrangea:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:reed:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:sea_oats:half=upper biomesoplenty:huge_clover_petal +block.10175 = biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:blue_hydrangea:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:reed:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:sea_oats:half=lower +block.10176 = biomesoplenty:tall_lavender:half=upper biomesoplenty:tall_white_lavender:half=upper biomesoplenty:blue_hydrangea:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:reed:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:sea_oats:half=upper biomesoplenty:huge_clover_petal # Leaves block.10018 = biomesoplenty:null_leaves biomesoplenty:origin_leaves biomesoplenty:flowering_oak_leaves biomesoplenty:snowblossom_leaves biomesoplenty:rainbow_birch_leaves biomesoplenty:fir_leaves biomesoplenty:pine_leaves biomesoplenty:red_maple_leaves biomesoplenty:orange_maple_leaves biomesoplenty:yellow_maple_leaves biomesoplenty:redwood_leaves biomesoplenty:mahogany_leaves biomesoplenty:jacaranda_leaves biomesoplenty:palm_leaves biomesoplenty:willow_leaves biomesoplenty:dead_leaves biomesoplenty:magic_leaves biomesoplenty:umbran_leaves biomesoplenty:hellbark_leaves biomesoplenty:empyreal_leaves diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/lavender.png b/common/src/main/resources/assets/biomesoplenty/textures/block/lavender.png index 41730c3a9349c47d59eab84836a6de1ffc432a0e..854d372dd8ea99b827c4b7bad0c69d03e759866f 100644 GIT binary patch delta 205 zcmeBT>SmhYR^L&2ZgJ<`w5YA_F0*4wt$Y%7E2nrfFfhog{-^~~93?@1!T%wE;a>CJ zNT3*Jfk$L90|VbC5N0$qwc8F9%96`l+)#Mrip4|7p8Iv*(w5xhHueTI&gOc`wWToI|@#04-(kboFyt=akR{06q>_ AOaK4? delta 204 zcmeBX>SCJURzJP;+{VtkrBPeMTxRc*5>RZj6{U|=vg<;n=8I7)*2g8xGR!@cIc zkw7ud0*}aI1_r)uAk28~#LlHa!E{d-#}JL+*ltFlBMKbMh6z9a_vbt3S{G+2=otQb zZ}T8lM)>qIVdIn)_bYb3&bi9vrSmxN;#Suw7d%fC)@-~uH^JknpAVD4PVLuberE#C z9+fa~xOlNS%G|s0G|-o>80m3cHS+G+8X9E+b2;srqrr(iZ@WwQ#W6%9IJSq8?|=diQ})`&|Lx_jTTVZtVJpD< z_nP#aZeGKv{lbqqf=_uc+!QaU5;9=ER@Zbo@4I#W?0?GT%*Mt0>{t7qt!h|clk)zE ul-n66M)PY%G2L6FwTcfiIGS6Ey=2>Yiq-f`h}AEkeGHzielF{r5}E)UmsWoO literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/potted_lavender.png b/common/src/main/resources/assets/biomesoplenty/textures/block/potted_lavender.png index 5d8869b43ad2f6e91bcca2c5dff6123ed5f36854..8a55dcab87252bb4f83dfc6f3945cad1dd882862 100644 GIT binary patch delta 178 zcmey!_ zBY|R^1s;*b3=Di*K$vl(S(Oe@(AU$&F+?Lcw&$QAgCYmB;ewa@9~ZYgsMs?p_23Wb z#<-9TAM?t@Gnpk>62ep%4IZe+KDOm-Kd$X*wCp?&(?Y!iRyz_l&S4AsvSt2>6@GQr X)@*j~7wz8;G?~HE)z4*}Q$iB}zw|~z delta 179 zcmeys_>pmfTmAIXa~nJFmPTz2bD8avs2fviRXN3*fq}u~lq(~U;wTC73;quQ4ELJ% zMgqk+3p^r=85sDsfiUB_6FZjz1^ql-978mMQ_naG9Z=w4cHmL?|G!XHvBb-^l~vhL zZlSnnO09YNvM;Pg0t!Ks7<69vzGu}5Zqm`blCM>8+3JD#bDs`*i_Q)1?WHGQbW|{y XZ(%dpY^B!)G@8NF)z4*}Q$iB}IsHO! 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 new file mode 100644 index 0000000000000000000000000000000000000000..0df8ee3b8ebeb2946313ec333b431083a760d444 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-oV|U;G|Np;l<^Jfh9@`=pgE&+F2_ZnqT|D7NK#HRz$S)YE00bEB zHSdiCig6ZrL>4nJ@NEELM!(a4?SO*5o-U3d8o{wW2L%}vIhYL>yxjk|xaC2`o=K?( ze@HjRg>3kkS0zopr0K+s=761SM literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/biomesoplenty/textures/block/tall_lavender_bottom.png b/common/src/main/resources/assets/biomesoplenty/textures/block/tall_lavender_bottom.png index 32126d2ceca82a1d6f2b133b7f1eab5b3ddb8d98..2004df6596aff07d4c904bf375792e56bf06e172 100644 GIT binary patch delta 222 zcmdnT+|4vWl7pFnfk8u;KX{^|LcLIcPl#(wsg+NnZsip3sMxJ8{U+ovuWW8lr1xNLt#zg6QaMn0aqf42wvz0r8FuaU#sUG!1e`*=%#zg?65 z8ehCTzw5gQ7pu>XX>Ep0FSBYS1g(AqEp)qku|g~)MLGP2!7M4IUhyT>@q0fqechtF RdLhtq22WQ%mvv4FO#n4qRV)Ai delta 402 zcmV;D0d4+^0=@%~83+ad001BJ|6!3KAb$yPNLh0L01m?d01m?e$8V@)0003~Nkl5QgVWqLh$OzSsbTl3Jp8R)B(n6;Rj$D$yxkfgMmtv{--@yhs!xA+dnt zedGQ&^G^K9xo2kXKmUK`+*~WA*zWOq-P&KN#4Nymayjhls96eYn+Uj<-E8)efsO_u(@$H;Z?(lef;s> zi@3YJjlY5i90E!d??$hM{NeGSa2gR8S4SbjJ4X2a{E3+5xIvnlYXZc&&~DD23nBns ze&?-QMi#|2L&k9jSy9l;fXnQ{7=IN*jLAa);2ZV<9Npbs(UK?2l}$5CSz;}XT`FR>-Ij`~;H w`qXF4B!tMbbDM(@P=i36#~^Nn7{ko$7hlFc zzmF40ag+r41^BY|R^1s;*b3=DjSK$uZf!>a)(Sm^2E7@`pz+vmu~Y{+pW zLE-6t`*rO(-!HgGu_gy3{X56}=zE3ZliRnJTw5zQA?DbHcOeBSiyky?S6!~WaC!y1 zOC0-FS)t}4<507#y$U?r((WlN)eGgHmsNf}^VR0KnBQLtKKdPadG2HT+oR9UurufX Z;%3ugZaaS1`NvIvN+V4Tg`k}v zSXc=bQ4kxSVD&pX%ZVg*4rFI{cFx&3xy8R>t8C 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 new file mode 100644 index 0000000000000000000000000000000000000000..490977da442dd1af2b7bec8205e86b42e14abb34 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|+7+aec(I8*-#A$?o-M>q8Vg|9cHtp!qSB|(0{|3QFZ^Zq6Kfg+p* z9+AZi417Q~-+o35)?gK&V1cKLV~9quX&<9dg8|3k0|)=_&$+a+BEU;?_1d_7>XI=A z-kgcc_E+>96s{%k#Uwi*T{}?3mVO z*z_{1Mncf)N6bP0l+XkK D91~oN literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..8978c11a52f581db3df3e3347e23bb9dca47c25e GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-oW6$6J|Np;l>;CAb9)mbj+aeeL2_Znq9ckALfD}hbkY6xR0SGYM zYu+0P6yq%Lh%9Dc;M)(vj25iHDnP+PPZ!4!jo{cmM?Pjljw1;QPygGmYtQ+9!9|KS zIUwoZIp#;-D;%HPzP04qTDb`^$1c1pNLlotal7hr<%QEL*j?h-x5^4N7a50|W$jhq z*_L)sVX0my|Gcd7>zS`M$Hn~qQt;95z{_(V+ut62c7~lf{}(r#7IXWFbn#xGNS%G|s0G|-oV|U;G|Np;l<^Jfh9@`=pgE&+F2_ZnqT|D7NK#HRz$S)YE00bEB zHSdiCig6ZrL>4nJ@T~)3#>HU^K~Bi@O1TaS?83{1OV8P BWKjSB literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..9a8a23a9bfabdf6b2059479e7fe1bb2d954ce526 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-oW0&9m|Np;l?*8bk9)mbj+aeeL2_Zm9|Cj&X0V$4>AirRs0uW%h z*St3pD8^af5n0T@z_%ZS87)|YRe*vio-U3d8o{wWjC=FB(|O;m^Jo84E@w6_-e