Skip to content

Commit

Permalink
Merge branch '1.21.4' into 1.21.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AViewFromTheTop committed Feb 4, 2025
2 parents cb43783 + 3602d58 commit 3e88e69
Show file tree
Hide file tree
Showing 59 changed files with 881 additions and 689 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ hi
- Added Clovers.
- Clovers generate in biomes in the `wilderwild:feature/has_clovers` tag.
- Fixed Wilder Wild's blocks having incorrect flammability values.
- Removed shallow pools from the Oasis biome as they weren't visually pleasing.
- Mesoglea features no longer carve "fake caves," instead only generating in areas with Water or Air nearby.

# Music
- Added three new tracks by Willow/pictochats_.
Expand Down
4 changes: 1 addition & 3 deletions src/main/generated/data/wilderwild/worldgen/biome/oasis.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
[],
[
"minecraft:lake_lava_underground",
"minecraft:lake_lava_surface",
"wilderwild:sand_pool",
"wilderwild:messy_sand_pool"
"minecraft:lake_lava_surface"
],
[
"minecraft:amethyst_geode"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"type": "frozenlib:fading_disk_tag_feature",
"type": "frozenlib:fading_disk_feature",
"config": {
"fade_start_distance_percent": 0.5,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.5,
"inner_percent": 0.5,
"inner_replaceable_blocks": "wilderwild:feature/small_sand_transition_replaceable",
"inner_replaceable_blocks": "#wilderwild:feature/small_sand_transition_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:sand"
}
},
"outer_replaceable_blocks": "wilderwild:feature/small_sand_transition_replaceable",
"outer_replaceable_blocks": "#wilderwild:feature/small_sand_transition_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"type": "frozenlib:noise_path_feature",
"type": "frozenlib:requires_air_or_water_in_area_noise_path_feature",
"config": {
"air_search_distance": 2,
"is_3d": true,
"max_threshold": 0.5875,
"min_threshold": 0.5125,
"noise": 1,
"noise_scale": 0.025,
"only_place_when_exposed": false,
"placement_chance": 1.0,
"radius": 14,
"radius": 12,
"replaceable_blocks": "#wilderwild:feature/mesoglea_path_replaceable",
"scale_y": true,
"state": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,54 @@
{
"type": "frozenlib:fading_disk_with_pile_tag_feature",
"type": "frozenlib:combo_feature",
"config": {
"fade_start_distance_percent": 0.8,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.925,
"inner_percent": 0.65,
"inner_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
"features": [
{
"feature": {
"type": "minecraft:block_pile",
"config": {
"state_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
}
}
}
},
"placement": []
},
{
"feature": {
"type": "frozenlib:fading_disk_feature",
"config": {
"fade_start_distance_percent": 0.8,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.925,
"inner_percent": 0.65,
"inner_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
}
},
"outer_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
}
},
"placement_chance": 0.95,
"radius": {
"type": "minecraft:uniform",
"max_inclusive": 4,
"min_inclusive": 2
},
"use_heightmap_instead_of_circular_placement": true
}
},
"placement": []
}
},
"outer_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
}
},
"placement_chance": 0.95,
"radius": {
"type": "minecraft:uniform",
"max_inclusive": 4,
"min_inclusive": 2
},
"use_heightmap_instead_of_circular_placement": true
]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.3,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.65,
"radius": 11,
"replaceable_blocks": "wilderwild:feature/coarse_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/coarse_path_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.175,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.7,
"radius": 3,
"replaceable_blocks": "wilderwild:feature/coarse_clearing_replaceable",
"replaceable_blocks": "#wilderwild:feature/coarse_clearing_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.3,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.25,
"radius": 6,
"replaceable_blocks": "wilderwild:feature/coarse_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/coarse_path_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 1.0,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.715,
"radius": 8,
"replaceable_blocks": "wilderwild:feature/small_coarse_dirt_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/small_coarse_dirt_path_replaceable",
"scale_y": true,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"type": "frozenlib:fading_disk_tag_feature",
"type": "frozenlib:fading_disk_feature",
"config": {
"fade_start_distance_percent": 0.5,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.925,
"inner_percent": 0.65,
"inner_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
"inner_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:coarse_dirt"
}
},
"outer_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
"outer_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"type": "frozenlib:fading_disk_tag_feature",
"type": "frozenlib:fading_disk_feature",
"config": {
"fade_start_distance_percent": 0.675,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.7,
"inner_percent": 0.325,
"inner_replaceable_blocks": "minecraft:base_stone_overworld",
"inner_replaceable_blocks": "#minecraft:base_stone_overworld",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
}
},
"outer_replaceable_blocks": "minecraft:base_stone_overworld",
"outer_replaceable_blocks": "#minecraft:base_stone_overworld",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,54 @@
{
"type": "frozenlib:fading_disk_with_pile_tag_feature",
"type": "frozenlib:combo_feature",
"config": {
"fade_start_distance_percent": 0.675,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.7,
"inner_percent": 0.325,
"inner_replaceable_blocks": "wilderwild:feature/magma_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
"features": [
{
"feature": {
"type": "minecraft:block_pile",
"config": {
"state_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
}
}
}
},
"placement": []
},
{
"feature": {
"type": "frozenlib:fading_disk_feature",
"config": {
"fade_start_distance_percent": 0.675,
"heightmap": "OCEAN_FLOOR_WG",
"inner_chance": 0.7,
"inner_percent": 0.325,
"inner_replaceable_blocks": "#wilderwild:feature/magma_replaceable",
"inner_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
}
},
"outer_replaceable_blocks": "#wilderwild:feature/magma_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
}
},
"placement_chance": 0.8,
"radius": {
"type": "minecraft:uniform",
"max_inclusive": 4,
"min_inclusive": 2
},
"use_heightmap_instead_of_circular_placement": true
}
},
"placement": []
}
},
"outer_replaceable_blocks": "wilderwild:feature/magma_replaceable",
"outer_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "wilderwild:gabbro"
}
},
"placement_chance": 0.8,
"radius": {
"type": "minecraft:uniform",
"max_inclusive": 4,
"min_inclusive": 2
},
"use_heightmap_instead_of_circular_placement": false
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"features": [
{
"feature": {
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.3,
Expand All @@ -14,7 +14,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.35,
"radius": 9,
"replaceable_blocks": "wilderwild:feature/gravel_and_pale_moss_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/gravel_and_pale_moss_path_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand All @@ -29,7 +29,7 @@
},
{
"feature": {
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.31,
Expand All @@ -39,7 +39,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.25,
"radius": 9,
"replaceable_blocks": "wilderwild:feature/gravel_and_pale_moss_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/gravel_and_pale_moss_path_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.175,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.7,
"radius": 3,
"replaceable_blocks": "wilderwild:feature/gravel_clearing_replaceable",
"replaceable_blocks": "#wilderwild:feature/gravel_clearing_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "frozenlib:noise_path_tag_feature",
"type": "frozenlib:noise_path_feature",
"config": {
"is_3d": false,
"max_threshold": 0.3,
Expand All @@ -9,7 +9,7 @@
"only_place_when_exposed": false,
"placement_chance": 0.21,
"radius": 6,
"replaceable_blocks": "wilderwild:feature/gravel_path_replaceable",
"replaceable_blocks": "#wilderwild:feature/gravel_path_replaceable",
"scale_y": false,
"state": {
"type": "minecraft:simple_state_provider",
Expand Down
Loading

0 comments on commit 3e88e69

Please sign in to comment.