Skip to content

Commit

Permalink
Added Empyreal tree generation, renamed Algae Blooms to Endblooms, fi…
Browse files Browse the repository at this point in the history
…xed map colors for various wood blocks
  • Loading branch information
Forstride committed Jan 15, 2024
1 parent a6e7266 commit ffb29cd
Show file tree
Hide file tree
Showing 77 changed files with 697 additions and 128 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-14T14:06:30.6167642 Registries
// 1.20.4 2024-01-15T12:56:55.8947933 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 @@ -13,9 +13,9 @@ d0c0bdd9fc7b09e7d046e35faea8cc6d752b468a data/biomesoplenty/worldgen/biome/crag.
401cb408a8b99f3fd8b696f9759d9f1f8a1a945e data/biomesoplenty/worldgen/biome/dead_forest.json
506de7d82a9bf0a7caea3390590dc9d1fa2028b0 data/biomesoplenty/worldgen/biome/dryland.json
d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_beach.json
1d2989a8aed931ff5de5fabff53cd9014d8f0c21 data/biomesoplenty/worldgen/biome/end_corruption.json
a7750ccecb4f2b9cceb60bc237458b6c0650c149 data/biomesoplenty/worldgen/biome/end_corruption.json
32b9b82ab839f70df725c3aceaf2ea2a0bb2cbd3 data/biomesoplenty/worldgen/biome/end_reef.json
01773716ee0f40a49bb0f57b9abd91d5195f0be2 data/biomesoplenty/worldgen/biome/end_wilds.json
38c7df0391f6c076440791154d7ea693ccb5befe data/biomesoplenty/worldgen/biome/end_wilds.json
a89d541384f1a879bb82d9c984d98c512474d27c data/biomesoplenty/worldgen/biome/erupting_inferno.json
d662a9e04a7840345595d343cc34426393c04699 data/biomesoplenty/worldgen/biome/field.json
0ca60f25f9961787ec5f174f8be6f29463c4decc data/biomesoplenty/worldgen/biome/fir_clearing.json
Expand Down Expand Up @@ -132,6 +132,7 @@ eb32815d593d6f64b435a5740d0ef633abecb03c data/biomesoplenty/worldgen/configured_
3dae5b2ef0083880df71c23055035a7419d6b29b data/biomesoplenty/worldgen/configured_feature/dripstone_splatter.json
4e41d0e05784172880bed9933f984af09933c869 data/biomesoplenty/worldgen/configured_feature/dying_tree.json
4acbdd9bf7bf6740488eec2ad2b414f9a7045a65 data/biomesoplenty/worldgen/configured_feature/dying_tree_wasteland.json
ea8051a14c382bfa3465e23abd4abea4f9f49ccb data/biomesoplenty/worldgen/configured_feature/empyreal_tree.json
41b8e6785b0b4ecf66d49659149ddff56e981dd6 data/biomesoplenty/worldgen/configured_feature/enderphyte_bonemeal.json
b1416a5c56c7fc22006287da8a1e69e1b2294ebb data/biomesoplenty/worldgen/configured_feature/extra_glow_lichen.json
2698ce19cc32db355c2c137b4904bbb8ea469e81 data/biomesoplenty/worldgen/configured_feature/eyebulb.json
Expand All @@ -149,7 +150,7 @@ ed721b819f2b9ee9315389913d189902a8925629 data/biomesoplenty/worldgen/configured_
0beeb94c5073f6eb6cc31c5c2c50bf27d0570065 data/biomesoplenty/worldgen/configured_feature/flower_clover_patch.json
33bc88ffffb0bf9918842fd518f5b434ce324987 data/biomesoplenty/worldgen/configured_feature/flower_coniferous_forest.json
c7d25ac7875db71cf74e75eecfa951e05724fa54 data/biomesoplenty/worldgen/configured_feature/flower_default_extended.json
28651bdcbd78bf94d9b43af6ee5741cd4650a6e4 data/biomesoplenty/worldgen/configured_feature/flower_end_wilds.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
c9ea79a9695944845e10e169dc2ca7b091d957c3 data/biomesoplenty/worldgen/configured_feature/flower_grassland.json
Expand Down Expand Up @@ -215,7 +216,6 @@ d0604daa873d67e12bd3f0ce62d7994671c5b124 data/biomesoplenty/worldgen/configured_
f9a397d007b98bf36c83d256856fd0fcc45d3a37 data/biomesoplenty/worldgen/configured_feature/nether_vines.json
76fa38cb0a73a9f1330c2e773bfa3fe6187723db data/biomesoplenty/worldgen/configured_feature/null_lake.json
68b8cab5ece0e989c54a9bd1e173cdb125cb81a9 data/biomesoplenty/worldgen/configured_feature/null_tree.json
b30b546db0d147741d48bf7644eb24d2f164f667 data/biomesoplenty/worldgen/configured_feature/null_trees.json
6141c480c606ffa99a495c76b5a9b59ffebfb789 data/biomesoplenty/worldgen/configured_feature/oak_bush.json
6227de33c6e00775d2282294f22bfe801c230003 data/biomesoplenty/worldgen/configured_feature/obsidian_splatter.json
003763f1fe56dd5a747789831f851173ffbf6af9 data/biomesoplenty/worldgen/configured_feature/orange_maple_leaf_piles.json
Expand Down Expand Up @@ -298,6 +298,8 @@ d852d7d051385150216f01df78b5b8b9c2a4a95e data/biomesoplenty/worldgen/configured_
348f23e002165065629468c03307b8708b21c0d3 data/biomesoplenty/worldgen/configured_feature/trees_dead_forest.json
f65947e9697a2ce1d73ea2fe2879c7f19c92fb2a data/biomesoplenty/worldgen/configured_feature/trees_dense_woodland.json
88efeb6994cb58e74ae26f25aae8f9b52dfab671 data/biomesoplenty/worldgen/configured_feature/trees_dryland.json
b30b546db0d147741d48bf7644eb24d2f164f667 data/biomesoplenty/worldgen/configured_feature/trees_end_corruption.json
1e0e1f876b7f30b19a55f11e3647e579c7e97db0 data/biomesoplenty/worldgen/configured_feature/trees_end_wilds.json
4099fe136d5a5f2d712108931d88159d8aa81d58 data/biomesoplenty/worldgen/configured_feature/trees_field.json
c5a22c26fd099d67a30e64a2956cc4b5c265f431 data/biomesoplenty/worldgen/configured_feature/trees_field_forest.json
2a34a8affa673f46a2dc57a01266026fc0ba35bd data/biomesoplenty/worldgen/configured_feature/trees_fungal_jungle.json
Expand Down Expand Up @@ -343,7 +345,7 @@ c548e3e1710931daabe90c90b6b7ad46c66bedda data/biomesoplenty/worldgen/configured_
8e6232109853baaff3ad94b3d71ab48a4bb8485c data/biomesoplenty/worldgen/placed_feature/acacia_bush_tree.json
581470e919aac08a1a1d6a59099383d4cb13c6e7 data/biomesoplenty/worldgen/placed_feature/acacia_twiglet.json
5b240cfa80edf39078866602b63410068a2dae30 data/biomesoplenty/worldgen/placed_feature/acacia_twiglet_small.json
0381b44f5e62e5796b4a89805d3c337730562c51 data/biomesoplenty/worldgen/placed_feature/anomaly.json
1699eadab7ffbae37df4b087fe4dc68b3dd87b59 data/biomesoplenty/worldgen/placed_feature/anomaly.json
176edb4fcaa5785050c8543834fc6c30848fe124 data/biomesoplenty/worldgen/placed_feature/aspen_tree.json
be901a659bb8f63b29dfd8cb8c85b0b2f2793ec9 data/biomesoplenty/worldgen/placed_feature/barnacles.json
7395a3d04e360d03dc998ebc9cf6b8d66e41433d data/biomesoplenty/worldgen/placed_feature/big_dripleaf.json
Expand Down Expand Up @@ -397,6 +399,7 @@ a79a43b2350e6eef3daed3a575b57ee0217526d9 data/biomesoplenty/worldgen/placed_feat
93ebeb932529e0412da7a81b35ebc3f4ec6c1705 data/biomesoplenty/worldgen/placed_feature/dripstone_splatter.json
269cf00674447e4dd65dfbdd3d707584d9fee76b data/biomesoplenty/worldgen/placed_feature/dying_tree.json
cbcf035bd0bb9e25ecb5bc2209d26e8c5c33d09e data/biomesoplenty/worldgen/placed_feature/dying_tree_wasteland.json
006771e0d678d20af641ee60bd482cd149d12684 data/biomesoplenty/worldgen/placed_feature/empyreal_tree.json
f13585cefdf4acfb499765e8ce9b3d5434810996 data/biomesoplenty/worldgen/placed_feature/enderphyte_bonemeal.json
553a721beea09a5d22327b334cfba3c39b98253b data/biomesoplenty/worldgen/placed_feature/extra_glow_lichen.json
1ad627927faad8a79fa43cc6f3a0f6e8fbfa02bb data/biomesoplenty/worldgen/placed_feature/eyebulb.json
Expand Down Expand Up @@ -481,9 +484,8 @@ eaafc116edf17b5a3c48e7bdc68f62ba84fd2deb data/biomesoplenty/worldgen/placed_feat
97840a5e6998b7403cf670f9700321ce266c1319 data/biomesoplenty/worldgen/placed_feature/nether_bone_spine.json
a0515b53a5b94f2ed1d7dbd87db0585612d83dda data/biomesoplenty/worldgen/placed_feature/nether_bramble.json
1a38b33f693e7e19b9e5975269ae2ab5cf1c2472 data/biomesoplenty/worldgen/placed_feature/nether_vines.json
d88a28ca97427a9545959e6fe871b36bd7c9e292 data/biomesoplenty/worldgen/placed_feature/null_lake.json
80bb59dc216bafd56c5be5e7bd27ae7d2858eb4e data/biomesoplenty/worldgen/placed_feature/null_lake.json
b6593e87126d0d5ee1b9117723911931e9d2bef2 data/biomesoplenty/worldgen/placed_feature/null_tree.json
78e79cd90e01538621760accfbdb128e391a43d9 data/biomesoplenty/worldgen/placed_feature/null_trees.json
062fefe110d24798d1df521817e98394fe648a62 data/biomesoplenty/worldgen/placed_feature/oak_bush.json
2669995131b210204c99f3f718cae309ba9e822f data/biomesoplenty/worldgen/placed_feature/obsidian_splatter.json
7fcd3ef78b62a0c814a8e780b79f63c9cf9aaa87 data/biomesoplenty/worldgen/placed_feature/orange_maple_leaf_piles.json
Expand Down Expand Up @@ -604,6 +606,8 @@ e54d937f5f0efc535b9c3c890c5ab5a03c160d9c data/biomesoplenty/worldgen/placed_feat
ca750e70d7f6e1021a0fbb259fb906e655de6a51 data/biomesoplenty/worldgen/placed_feature/trees_dead_forest.json
7c03d2260414c9fbcb05c5eec8b6d784832e8aab data/biomesoplenty/worldgen/placed_feature/trees_dense_woodland.json
8e5d3b1f584ab71f6dcbf34416c998f49010222c data/biomesoplenty/worldgen/placed_feature/trees_dryland.json
2bcbf1e7cf586192f3853c2e0e0f076fc7b0fa01 data/biomesoplenty/worldgen/placed_feature/trees_end_corruption.json
790608163cf3030d6f3c960ba861610d02c037cf data/biomesoplenty/worldgen/placed_feature/trees_end_wilds.json
addefe9727278378c9ff4343d1c06f3e896c5637 data/biomesoplenty/worldgen/placed_feature/trees_field.json
7ab14dace30e8179070243d0635691a27d7b1935 data/biomesoplenty/worldgen/placed_feature/trees_field_forest.json
5f464874f713cc05db22d853b7460ad0646d6370 data/biomesoplenty/worldgen/placed_feature/trees_fir_clearing.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
[],
[
"biomesoplenty:null_trees"
"biomesoplenty:trees_end_corruption"
]
],
"has_precipitation": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
[],
[],
[
"biomesoplenty:trees_end_wilds",
"biomesoplenty:flower_end_wilds",
"biomesoplenty:patch_enderphytes"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"type": "biomesoplenty:empyreal_tree",
"config": {
"alt_foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:air"
}
},
"decorators": [],
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:empyreal_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
}
},
"hanging_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:air"
}
},
"max_height": 12,
"min_height": 3,
"trunk_fruit_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:air"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:empyreal_log",
"Properties": {
"axis": "y"
}
}
},
"vine_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:air"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:algae_bloom"
"Name": "biomesoplenty:endbloom"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "minecraft:random_selector",
"config": {
"default": "biomesoplenty:empyreal_tree",
"features": [
{
"chance": 0.075,
"feature": "biomesoplenty:empyreal_tree"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 1
"chance": 2
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"feature": "biomesoplenty:empyreal_tree",
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:would_survive",
"state": {
"Name": "biomesoplenty:empyreal_sapling",
"Properties": {
"stage": "0"
}
}
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"feature": "biomesoplenty:null_lake",
"placement": [
{
"type": "minecraft:count",
"count": 1
"type": "minecraft:rarity_filter",
"chance": 1
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"feature": "biomesoplenty:null_trees",
"feature": "biomesoplenty:trees_end_corruption",
"placement": [
{
"type": "minecraft:count",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"feature": "biomesoplenty:trees_end_wilds",
"placement": [
{
"type": "minecraft:count",
"count": {
"type": "minecraft:weighted_list",
"distribution": [
{
"data": 1,
"weight": 4
},
{
"data": 2,
"weight": 1
}
]
}
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:surface_water_depth_filter",
"max_water_depth": 0
},
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR"
},
{
"type": "minecraft:biome"
}
]
}
4 changes: 2 additions & 2 deletions common/src/main/java/biomesoplenty/api/block/BOPBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public class BOPBlocks
public static Block GLOWFLOWER;
public static Block WILTED_LILY;
public static Block BURNING_BLOSSOM;
public static Block ALGAE_BLOOM;
public static Block ENDBLOOM;

public static Block SPROUT;
public static Block BUSH;
Expand Down Expand Up @@ -435,7 +435,7 @@ public class BOPBlocks
public static Block POTTED_GLOWFLOWER;
public static Block POTTED_WILTED_LILY;
public static Block POTTED_BURNING_BLOSSOM;
public static Block POTTED_ALGAE_BLOOM;
public static Block POTTED_ENDBLOOM;
public static Block POTTED_SPROUT;
public static Block POTTED_TINY_CACTUS;
public static Block POTTED_TOADSTOOL;
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/biomesoplenty/api/item/BOPItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public class BOPItems
public static Item GLOWFLOWER;
public static Item WILTED_LILY;
public static Item BURNING_BLOSSOM;
public static Item ALGAE_BLOOM;
public static Item ENDBLOOM;

public static Item SPROUT;
public static Item BUSH;
Expand Down Expand Up @@ -454,7 +454,7 @@ public class BOPItems
public static Item POTTED_GLOWFLOWER;
public static Item POTTED_WILTED_LILY;
public static Item POTTED_BURNING_BLOSSOM;
public static Item POTTED_ALGAE_BLOOM;
public static Item POTTED_ENDBLOOM;
public static Item POTTED_SPROUT;
public static Item POTTED_TINY_CACTUS;
public static Item POTTED_TOADSTOOL;
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public static Biome endWilds(HolderGetter<PlacedFeature> placedFeatureGetter, Ho
{
BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.TREES_END_WILDS);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.FLOWER_END_WILDS);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.PATCH_ENDERPHYTES);
return baseEndBiome(biomeBuilder);
Expand All @@ -60,7 +61,7 @@ public static Biome endCorruption(HolderGetter<PlacedFeature> placedFeatureGette
biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
biomeBuilder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPEndPlacements.ANOMALY);
biomeBuilder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPEndPlacements.NULL_LAKE);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.NULL_TREES);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.TREES_END_CORRUPTION);
return baseEndBiome(biomeBuilder);
}
}
6 changes: 0 additions & 6 deletions common/src/main/java/biomesoplenty/block/AnomalyBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ public boolean propagatesSkylightDown(BlockState state, BlockGetter getter, Bloc
return state.getValue(ANOMALY_TYPE) != AnomalyType.STABLE;
}

@Override
public float getShadeBrightness(BlockState state, BlockGetter getter, BlockPos pos)
{
return 1.0F;
}

@Override
public RenderShape getRenderShape(BlockState state)
{
Expand Down
Loading

0 comments on commit ffb29cd

Please sign in to comment.