Skip to content

Commit 3602d58

Browse files
AViewFromTheTopAViewFromTheTop
committed
Merge branch '1.21.2' into 1.21.4
2 parents 5c1748c + c72dce9 commit 3602d58

File tree

59 files changed

+881
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+881
-689
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ hi
8181
- Added Clovers.
8282
- Clovers generate in biomes in the `wilderwild:feature/has_clovers` tag.
8383
- Fixed Wilder Wild's blocks having incorrect flammability values.
84+
- Removed shallow pools from the Oasis biome as they weren't visually pleasing.
85+
- Mesoglea features no longer carve "fake caves," instead only generating in areas with Water or Air nearby.
8486

8587
# Music
8688
- Added three new tracks by Willow/pictochats_.

‎src/main/generated/data/wilderwild/worldgen/biome/oasis.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
[],
3434
[
3535
"minecraft:lake_lava_underground",
36-
"minecraft:lake_lava_surface",
37-
"wilderwild:sand_pool",
38-
"wilderwild:messy_sand_pool"
36+
"minecraft:lake_lava_surface"
3937
],
4038
[
4139
"minecraft:amethyst_geode"

‎src/main/generated/data/wilderwild/worldgen/configured_feature/beta_beach_sand_transition_disk.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"type": "frozenlib:fading_disk_tag_feature",
2+
"type": "frozenlib:fading_disk_feature",
33
"config": {
44
"fade_start_distance_percent": 0.5,
55
"heightmap": "OCEAN_FLOOR_WG",
66
"inner_chance": 0.5,
77
"inner_percent": 0.5,
8-
"inner_replaceable_blocks": "wilderwild:feature/small_sand_transition_replaceable",
8+
"inner_replaceable_blocks": "#wilderwild:feature/small_sand_transition_replaceable",
99
"inner_state": {
1010
"type": "minecraft:simple_state_provider",
1111
"state": {
1212
"Name": "minecraft:sand"
1313
}
1414
},
15-
"outer_replaceable_blocks": "wilderwild:feature/small_sand_transition_replaceable",
15+
"outer_replaceable_blocks": "#wilderwild:feature/small_sand_transition_replaceable",
1616
"outer_state": {
1717
"type": "minecraft:simple_state_provider",
1818
"state": {

‎src/main/generated/data/wilderwild/worldgen/configured_feature/blue_mesoglea_path.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"type": "frozenlib:noise_path_feature",
2+
"type": "frozenlib:requires_air_or_water_in_area_noise_path_feature",
33
"config": {
4+
"air_search_distance": 2,
45
"is_3d": true,
56
"max_threshold": 0.5875,
67
"min_threshold": 0.5125,
78
"noise": 1,
89
"noise_scale": 0.025,
9-
"only_place_when_exposed": false,
1010
"placement_chance": 1.0,
11-
"radius": 14,
11+
"radius": 12,
1212
"replaceable_blocks": "#wilderwild:feature/mesoglea_path_replaceable",
1313
"scale_y": true,
1414
"state": {

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_disk_and_pile.json

+49-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,54 @@
11
{
2-
"type": "frozenlib:fading_disk_with_pile_tag_feature",
2+
"type": "frozenlib:combo_feature",
33
"config": {
4-
"fade_start_distance_percent": 0.8,
5-
"heightmap": "OCEAN_FLOOR_WG",
6-
"inner_chance": 0.925,
7-
"inner_percent": 0.65,
8-
"inner_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
9-
"inner_state": {
10-
"type": "minecraft:simple_state_provider",
11-
"state": {
12-
"Name": "minecraft:coarse_dirt"
4+
"features": [
5+
{
6+
"feature": {
7+
"type": "minecraft:block_pile",
8+
"config": {
9+
"state_provider": {
10+
"type": "minecraft:simple_state_provider",
11+
"state": {
12+
"Name": "minecraft:coarse_dirt"
13+
}
14+
}
15+
}
16+
},
17+
"placement": []
18+
},
19+
{
20+
"feature": {
21+
"type": "frozenlib:fading_disk_feature",
22+
"config": {
23+
"fade_start_distance_percent": 0.8,
24+
"heightmap": "OCEAN_FLOOR_WG",
25+
"inner_chance": 0.925,
26+
"inner_percent": 0.65,
27+
"inner_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
28+
"inner_state": {
29+
"type": "minecraft:simple_state_provider",
30+
"state": {
31+
"Name": "minecraft:coarse_dirt"
32+
}
33+
},
34+
"outer_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
35+
"outer_state": {
36+
"type": "minecraft:simple_state_provider",
37+
"state": {
38+
"Name": "minecraft:coarse_dirt"
39+
}
40+
},
41+
"placement_chance": 0.95,
42+
"radius": {
43+
"type": "minecraft:uniform",
44+
"max_inclusive": 4,
45+
"min_inclusive": 2
46+
},
47+
"use_heightmap_instead_of_circular_placement": true
48+
}
49+
},
50+
"placement": []
1351
}
14-
},
15-
"outer_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
16-
"outer_state": {
17-
"type": "minecraft:simple_state_provider",
18-
"state": {
19-
"Name": "minecraft:coarse_dirt"
20-
}
21-
},
22-
"placement_chance": 0.95,
23-
"radius": {
24-
"type": "minecraft:uniform",
25-
"max_inclusive": 4,
26-
"min_inclusive": 2
27-
},
28-
"use_heightmap_instead_of_circular_placement": true
52+
]
2953
}
3054
}

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_path.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 0.3,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.65,
1111
"radius": 11,
12-
"replaceable_blocks": "wilderwild:feature/coarse_path_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/coarse_path_replaceable",
1313
"scale_y": false,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_path_clearing.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 0.175,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.7,
1111
"radius": 3,
12-
"replaceable_blocks": "wilderwild:feature/coarse_clearing_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/coarse_clearing_replaceable",
1313
"scale_y": false,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_path_rare.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 0.3,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.25,
1111
"radius": 6,
12-
"replaceable_blocks": "wilderwild:feature/coarse_path_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/coarse_path_replaceable",
1313
"scale_y": false,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_path_small.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 1.0,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.715,
1111
"radius": 8,
12-
"replaceable_blocks": "wilderwild:feature/small_coarse_dirt_path_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/small_coarse_dirt_path_replaceable",
1313
"scale_y": true,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/coarse_dirt_transition_disk.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"type": "frozenlib:fading_disk_tag_feature",
2+
"type": "frozenlib:fading_disk_feature",
33
"config": {
44
"fade_start_distance_percent": 0.5,
55
"heightmap": "OCEAN_FLOOR_WG",
66
"inner_chance": 0.925,
77
"inner_percent": 0.65,
8-
"inner_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
8+
"inner_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
99
"inner_state": {
1010
"type": "minecraft:simple_state_provider",
1111
"state": {
1212
"Name": "minecraft:coarse_dirt"
1313
}
1414
},
15-
"outer_replaceable_blocks": "wilderwild:feature/coarse_dirt_disk_replaceable",
15+
"outer_replaceable_blocks": "#wilderwild:feature/coarse_dirt_disk_replaceable",
1616
"outer_state": {
1717
"type": "minecraft:simple_state_provider",
1818
"state": {

‎src/main/generated/data/wilderwild/worldgen/configured_feature/gabbro_disk.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"type": "frozenlib:fading_disk_tag_feature",
2+
"type": "frozenlib:fading_disk_feature",
33
"config": {
44
"fade_start_distance_percent": 0.675,
55
"heightmap": "OCEAN_FLOOR_WG",
66
"inner_chance": 0.7,
77
"inner_percent": 0.325,
8-
"inner_replaceable_blocks": "minecraft:base_stone_overworld",
8+
"inner_replaceable_blocks": "#minecraft:base_stone_overworld",
99
"inner_state": {
1010
"type": "minecraft:simple_state_provider",
1111
"state": {
1212
"Name": "wilderwild:gabbro"
1313
}
1414
},
15-
"outer_replaceable_blocks": "minecraft:base_stone_overworld",
15+
"outer_replaceable_blocks": "#minecraft:base_stone_overworld",
1616
"outer_state": {
1717
"type": "minecraft:simple_state_provider",
1818
"state": {

‎src/main/generated/data/wilderwild/worldgen/configured_feature/gabbro_pile.json

+49-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,54 @@
11
{
2-
"type": "frozenlib:fading_disk_with_pile_tag_feature",
2+
"type": "frozenlib:combo_feature",
33
"config": {
4-
"fade_start_distance_percent": 0.675,
5-
"heightmap": "OCEAN_FLOOR_WG",
6-
"inner_chance": 0.7,
7-
"inner_percent": 0.325,
8-
"inner_replaceable_blocks": "wilderwild:feature/magma_replaceable",
9-
"inner_state": {
10-
"type": "minecraft:simple_state_provider",
11-
"state": {
12-
"Name": "wilderwild:gabbro"
4+
"features": [
5+
{
6+
"feature": {
7+
"type": "minecraft:block_pile",
8+
"config": {
9+
"state_provider": {
10+
"type": "minecraft:simple_state_provider",
11+
"state": {
12+
"Name": "wilderwild:gabbro"
13+
}
14+
}
15+
}
16+
},
17+
"placement": []
18+
},
19+
{
20+
"feature": {
21+
"type": "frozenlib:fading_disk_feature",
22+
"config": {
23+
"fade_start_distance_percent": 0.675,
24+
"heightmap": "OCEAN_FLOOR_WG",
25+
"inner_chance": 0.7,
26+
"inner_percent": 0.325,
27+
"inner_replaceable_blocks": "#wilderwild:feature/magma_replaceable",
28+
"inner_state": {
29+
"type": "minecraft:simple_state_provider",
30+
"state": {
31+
"Name": "wilderwild:gabbro"
32+
}
33+
},
34+
"outer_replaceable_blocks": "#wilderwild:feature/magma_replaceable",
35+
"outer_state": {
36+
"type": "minecraft:simple_state_provider",
37+
"state": {
38+
"Name": "wilderwild:gabbro"
39+
}
40+
},
41+
"placement_chance": 0.8,
42+
"radius": {
43+
"type": "minecraft:uniform",
44+
"max_inclusive": 4,
45+
"min_inclusive": 2
46+
},
47+
"use_heightmap_instead_of_circular_placement": true
48+
}
49+
},
50+
"placement": []
1351
}
14-
},
15-
"outer_replaceable_blocks": "wilderwild:feature/magma_replaceable",
16-
"outer_state": {
17-
"type": "minecraft:simple_state_provider",
18-
"state": {
19-
"Name": "wilderwild:gabbro"
20-
}
21-
},
22-
"placement_chance": 0.8,
23-
"radius": {
24-
"type": "minecraft:uniform",
25-
"max_inclusive": 4,
26-
"min_inclusive": 2
27-
},
28-
"use_heightmap_instead_of_circular_placement": false
52+
]
2953
}
3054
}

‎src/main/generated/data/wilderwild/worldgen/configured_feature/gravel_and_pale_moss_path.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"features": [
55
{
66
"feature": {
7-
"type": "frozenlib:noise_path_tag_feature",
7+
"type": "frozenlib:noise_path_feature",
88
"config": {
99
"is_3d": false,
1010
"max_threshold": 0.3,
@@ -14,7 +14,7 @@
1414
"only_place_when_exposed": false,
1515
"placement_chance": 0.35,
1616
"radius": 9,
17-
"replaceable_blocks": "wilderwild:feature/gravel_and_pale_moss_path_replaceable",
17+
"replaceable_blocks": "#wilderwild:feature/gravel_and_pale_moss_path_replaceable",
1818
"scale_y": false,
1919
"state": {
2020
"type": "minecraft:simple_state_provider",
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"feature": {
32-
"type": "frozenlib:noise_path_tag_feature",
32+
"type": "frozenlib:noise_path_feature",
3333
"config": {
3434
"is_3d": false,
3535
"max_threshold": 0.31,
@@ -39,7 +39,7 @@
3939
"only_place_when_exposed": false,
4040
"placement_chance": 0.25,
4141
"radius": 9,
42-
"replaceable_blocks": "wilderwild:feature/gravel_and_pale_moss_path_replaceable",
42+
"replaceable_blocks": "#wilderwild:feature/gravel_and_pale_moss_path_replaceable",
4343
"scale_y": false,
4444
"state": {
4545
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/gravel_path_clearing.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 0.175,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.7,
1111
"radius": 3,
12-
"replaceable_blocks": "wilderwild:feature/gravel_clearing_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/gravel_clearing_replaceable",
1313
"scale_y": false,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

‎src/main/generated/data/wilderwild/worldgen/configured_feature/gravel_path_rare.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"type": "frozenlib:noise_path_tag_feature",
2+
"type": "frozenlib:noise_path_feature",
33
"config": {
44
"is_3d": false,
55
"max_threshold": 0.3,
@@ -9,7 +9,7 @@
99
"only_place_when_exposed": false,
1010
"placement_chance": 0.21,
1111
"radius": 6,
12-
"replaceable_blocks": "wilderwild:feature/gravel_path_replaceable",
12+
"replaceable_blocks": "#wilderwild:feature/gravel_path_replaceable",
1313
"scale_y": false,
1414
"state": {
1515
"type": "minecraft:simple_state_provider",

0 commit comments

Comments
 (0)