Skip to content

Commit

Permalink
Added White Lavender/Tall White Lavender to the Field biome, tweaked …
Browse files Browse the repository at this point in the history
…Lavender textures
  • Loading branch information
Forstride committed Feb 16, 2024
1 parent 0a4ee21 commit e9bf050
Show file tree
Hide file tree
Showing 61 changed files with 397 additions and 53 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 4
"chance": 3
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 8
"chance": 4
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
3 changes: 3 additions & 0 deletions common/src/main/java/biomesoplenty/api/block/BOPBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/biomesoplenty/api/item/BOPItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,24 +390,25 @@ public static Biome field(HolderGetter<PlacedFeature> 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/biomesoplenty/init/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,8 @@ private static void registerBlocks(BiConsumer<ResourceLocation, Block> 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");
Expand Down Expand Up @@ -503,6 +505,7 @@ private static void registerBlocks(BiConsumer<ResourceLocation, Block> 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");
Expand Down
Loading

0 comments on commit e9bf050

Please sign in to comment.