Skip to content

Commit cb4b1fd

Browse files
DeathShadezDeathShadez
authored
Merge pull request #18 from justaureus/rings-of-life
rings-of-life merge
2 parents 02d43df + 0cff033 commit cb4b1fd

89 files changed

Lines changed: 1520 additions & 439 deletions

File tree

Some content is hidden

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

‎biome-providers/presets/default.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@ biomes:
1616

1717
# Both End and Aether
1818
source: $biome-providers/sources/reimagEND.yml:source
19-
19+
2020
stages:
21-
# Distributes main end island and outer end seperately
22-
- << biome-providers/stages/outer_end.yml:stages
2321

24-
# Distributes outer end biomes
25-
- << biome-providers/stages/end_distribution.yml:stages
22+
# Distributes the outer end into different rings
23+
- << biome-providers/stages/ring_distribution.yml:stages
24+
25+
# Distributes aether pockets across certain rings of the outer end
26+
- << biome-providers/stages/aether_pockets.yml:stages
27+
28+
# Distributes void biomes across the outer end
29+
- << biome-providers/stages/void_distribution.yml:stages
30+
31+
# Distributes outer end biomes across each ring
32+
- << biome-providers/stages/end_biome_distribution.yml:stages
2633

2734
# Distributes aether biomes
2835
- << biome-providers/stages/aether_distribution.yml:stages

‎biome-providers/stages/aether_distribution.yml‎

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,51 @@
1-
distribution-map: &distribution-map
2-
dimensions: 2
3-
type: FBM
4-
octaves: 2
5-
sampler:
6-
type: OPEN_SIMPLEX_2
7-
salt: 6836
8-
frequency: 1 / ${meta.yml:biome-distribution.aether-biome-scale} / ${meta.yml:biome-distribution.global-scale}
9-
101
stages:
2+
- type: REPLACE
3+
sampler:
4+
dimensions: 2
5+
type: FBM
6+
octaves: 2
7+
sampler:
8+
type: CELLULAR
9+
return: CellValue
10+
salt: 6836
11+
frequency: 1 / ${meta.yml:biome-distribution.aether-region-scale} / ${meta.yml:biome-distribution.global-scale}
12+
from: aether
13+
to:
14+
- AETHER_CLOUD_SEA: 1
15+
- aether-coasts: 2
16+
- aether-lowlands: 3
17+
- aether-midlands: 3
18+
- aether-highlands: 2
19+
- aether-mountains: 1
20+
1121
- type: REPLACE_LIST
12-
sampler: *distribution-map
13-
default-from: aether
22+
sampler:
23+
dimensions: 2
24+
type: FBM
25+
octaves: 2
26+
sampler:
27+
type: CELLULAR
28+
return: CellValue
29+
salt: 4567
30+
frequency: 1 / ${meta.yml:biome-distribution.aether-biome-scale} / ${meta.yml:biome-distribution.global-scale}
31+
default-from: aether-coasts
1432
default-to:
15-
- AETHER_PLAINS: 1
16-
- AETHER_BUMPY: 1
17-
- AETHER_FOREST: 1
18-
- AETHER_LUSH_FOREST: 1
33+
- AETHER_INSIPID_COASTS: 1
34+
to:
35+
aether-lowlands:
1936
- AETHER_AZURE_MEADOWS: 1
2037
- AETHER_AUREATE_FOREST: 1
21-
- AETHER_DRIFTLANDS: 1
22-
- AETHER_LAVENDER_DRIFTLANDS: 1
38+
- AETHER_DRIFTFALLS: 1
39+
40+
aether-midlands:
41+
- AETHER_BRAMBLE_WILDS: 1
42+
- AETHER_GOLDEN_FIELDS: 1
43+
44+
aether-highlands:
2345
- AETHER_CRIMSON_HEIGHTS: 1
24-
- AETHER_MOSSY_WOODLANDS: 1
25-
- AETHER_REDWOOD_FOREST: 1
26-
- AETHER_DISCUS_AETHER: 1
27-
- AETHER_CLOUD_SEA: 1
28-
to:
29-
aether_highlands:
30-
- AETHER_HIGHLANDS: 1
31-
- AETHER_HIGHLANDS_FOREST: 1
46+
- AETHER_ORCHARD_WOODLANDS: 1
47+
48+
aether-mountains:
3249
- AETHER_FLOATING_CLIFFS: 1
33-
- AETHER_BRISTLED_FOREST: 1
34-
- AETHER_ANCIENT_WASTES: 1
35-
- AETHER_FROSTY_WOODS: 1
36-
- AETHER_RUGGED_CLIFFS: 1
50+
3751

biome-providers/stages/outer_end.yml renamed to biome-providers/stages/aether_pockets.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ distribution-map: &distribution-map
22
type: EXPRESSION
33
expression: split((noise(x/spread,z/spread)+1)*4/(radius/spread)-1)
44
variables:
5-
spread: 1500
6-
radius: 350
5+
spread: 3000
6+
radius: 500
77
functions:
88
split:
99
arguments: [x]
@@ -26,25 +26,10 @@ distribution-map: &distribution-map
2626
stages:
2727
- type: REPLACE
2828
sampler: *distribution-map
29-
from: outer_end
29+
from: ring5
3030
to:
31-
- aether: 24
31+
- aether: 32
32+
- aether-coasts: 16
33+
- AETHER_CLOUD_SEA: 16
3234
- STARFIELD: 32
33-
- end: 64
34-
- type: REPLACE_LIST
35-
sampler:
36-
dimensions: 2
37-
type: FBM
38-
octaves: 2
39-
sampler:
40-
type: OPEN_SIMPLEX_2
41-
salt: 1196
42-
frequency: 1 / ${meta.yml:biome-distribution.end-scale} / ${meta.yml:biome-distribution.global-scale}
43-
default-from: end
44-
default-to:
45-
- void: 1
46-
- end: 2
47-
to:
48-
aether:
49-
- aether: 2
50-
- aether_highlands: 1
35+
- ring5: 32

‎biome-providers/stages/end_biome_distribution.yml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
stages:
2+
- type: REPLACE
3+
sampler:
4+
dimensions: 2
5+
type: FBM
6+
octaves: 2
7+
sampler:
8+
type: OPEN_SIMPLEX_2
9+
salt: 6836
10+
frequency: 1 / ${meta.yml:biome-distribution.ring1-biome-scale} / ${meta.yml:biome-distribution.global-scale}
11+
from: ring1
12+
to:
13+
- END_BARRENS: 1
14+
- END_MIDLANDS: 1
15+
- END_HIGHLANDS: 1
16+
17+
- type: REPLACE
18+
sampler:
19+
dimensions: 2
20+
type: FBM
21+
octaves: 2
22+
sampler:
23+
type: OPEN_SIMPLEX_2
24+
salt: 6836
25+
frequency: 1 / ${meta.yml:biome-distribution.ring2-biome-scale} / ${meta.yml:biome-distribution.global-scale}
26+
from: ring2
27+
to:
28+
- SHATTERED_END: 4
29+
- SHATTERED_FOREST: 2
30+
- JAGGED_END: 2
31+
- DARK_END: 5
32+
- AMETHYST_END: 3
33+
- CRYING_END: 3
34+
- CORRUPTED_END: 3
35+
36+
- type: REPLACE
37+
sampler:
38+
dimensions: 2
39+
type: FBM
40+
octaves: 2
41+
sampler:
42+
type: OPEN_SIMPLEX_2
43+
salt: 6836
44+
frequency: 1 / ${meta.yml:biome-distribution.ring3-biome-scale} / ${meta.yml:biome-distribution.global-scale}
45+
from: ring3
46+
to:
47+
- STYGIAN_BARRENS: 2
48+
- CRAGGY_END: 3
49+
- CHORUVE_FOREST: 3
50+
- PEARLESCENT_END: 2
51+
- IVORY_EMPYREAN: 2
52+
53+
- type: REPLACE
54+
sampler:
55+
dimensions: 2
56+
type: FBM
57+
octaves: 2
58+
sampler:
59+
type: OPEN_SIMPLEX_2
60+
salt: 6836
61+
frequency: 1 / ${meta.yml:biome-distribution.ring4-biome-scale} / ${meta.yml:biome-distribution.global-scale}
62+
from: ring4
63+
to:
64+
- MAUVE_POOLS: 4
65+
- MAUVE_FOREST: 5
66+
- WARPED_FOREST: 2
67+
- WARPED_GROVE: 3
68+
- FLAXEN_FOREST: 4
69+
70+
- type: REPLACE
71+
sampler:
72+
dimensions: 2
73+
type: FBM
74+
octaves: 2
75+
sampler:
76+
type: CELLULAR
77+
return: CellValue
78+
salt: 6836
79+
frequency: 1 / ${meta.yml:biome-distribution.ring5-biome-scale} / ${meta.yml:biome-distribution.global-scale}
80+
from: ring5
81+
to:
82+
- END_BARRENS: 3
83+
- END_MIDLANDS: 2
84+
- END_HIGHLANDS: 1
85+
- END_MIDLANDS: 2
86+
- END_BARRENS: 3
87+
88+
- SHATTERED_END: 4
89+
- SHATTERED_FOREST: 2
90+
- JAGGED_END: 2
91+
- DARK_END: 3
92+
- AMETHYST_END: 3
93+
- CRYING_END: 3
94+
- CORRUPTED_END: 3
95+
- STYGIAN_BARRENS: 2
96+
- CRAGGY_END: 3
97+
- CHORUVE_FOREST: 3
98+
- PEARLESCENT_END: 2
99+
- IVORY_EMPYREAN: 2
100+
- MAUVE_POOLS: 4
101+
- MAUVE_FOREST: 4
102+
- WARPED_FOREST: 2
103+
- WARPED_GROVE: 3
104+
- FLAXEN_FOREST: 4

‎biome-providers/stages/end_distribution.yml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎biome-providers/stages/ring_distribution.yml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
stages:
2+
- type: REPLACE
3+
sampler:
4+
type: EXPRESSION
5+
expression: |
6+
circle(centerRadius+buffer+ring1Width, x+noise(x,z)-1, z+noise(x,z)-1, 1)
7+
variables:
8+
centerRadius: ${meta.yml:biome-distribution.main-end-scale}
9+
buffer: ${meta.yml:biome-distribution.void-buffer-scale}
10+
ring1Width: ${meta.yml:biome-distribution.ring1-width}
11+
functions:
12+
circle: {arguments: [r, x, z, l], expression: "if(x*x+z*z>r*r,-1,l)"}
13+
samplers:
14+
noise:
15+
type: OPEN_SIMPLEX_2
16+
dimensions: 2
17+
salt: 3912
18+
frequency: 0.1
19+
from: outer_end
20+
to:
21+
- ring2: 1
22+
- ring1: 1
23+
24+
- type: REPLACE
25+
sampler:
26+
type: EXPRESSION
27+
expression: |
28+
circle(centerRadius+buffer+ring1Width+ring2Width, x+noise(x,z)-1, z+noise(x,z)-1, 1)
29+
variables:
30+
centerRadius: ${meta.yml:biome-distribution.main-end-scale}
31+
buffer: ${meta.yml:biome-distribution.void-buffer-scale}
32+
ring1Width: ${meta.yml:biome-distribution.ring1-width}
33+
ring2Width: ${meta.yml:biome-distribution.ring2-width}
34+
functions:
35+
circle: {arguments: [r, x, z, l], expression: "if(x*x+z*z>r*r,-1,l)"}
36+
samplers:
37+
noise:
38+
type: OPEN_SIMPLEX_2
39+
dimensions: 2
40+
salt: 3912
41+
frequency: 0.1
42+
from: ring2
43+
to:
44+
- ring3: 1
45+
- ring2: 1
46+
47+
- type: REPLACE
48+
sampler:
49+
type: EXPRESSION
50+
expression: |
51+
circle(centerRadius+buffer+ring1Width+ring2Width+ring3Width, x+noise(x,z)-1, z+noise(x,z)-1, 1)
52+
variables:
53+
centerRadius: ${meta.yml:biome-distribution.main-end-scale}
54+
buffer: ${meta.yml:biome-distribution.void-buffer-scale}
55+
ring1Width: ${meta.yml:biome-distribution.ring1-width}
56+
ring2Width: ${meta.yml:biome-distribution.ring2-width}
57+
ring3Width: ${meta.yml:biome-distribution.ring3-width}
58+
functions:
59+
circle: {arguments: [r, x, z, l], expression: "if(x*x+z*z>r*r,-1,l)"}
60+
samplers:
61+
noise:
62+
type: OPEN_SIMPLEX_2
63+
dimensions: 2
64+
salt: 3912
65+
frequency: 0.1
66+
from: ring3
67+
to:
68+
- ring4: 1
69+
- ring3: 1
70+
71+
- type: REPLACE
72+
sampler:
73+
type: EXPRESSION
74+
expression: |
75+
circle(centerRadius+buffer+ring1Width+ring2Width+ring3Width+ring4Width, x+noise(x,z)-1, z+noise(x,z)-1, 1)
76+
variables:
77+
centerRadius: ${meta.yml:biome-distribution.main-end-scale}
78+
buffer: ${meta.yml:biome-distribution.void-buffer-scale}
79+
ring1Width: ${meta.yml:biome-distribution.ring1-width}
80+
ring2Width: ${meta.yml:biome-distribution.ring2-width}
81+
ring3Width: ${meta.yml:biome-distribution.ring3-width}
82+
ring4Width: ${meta.yml:biome-distribution.ring4-width}
83+
functions:
84+
circle: {arguments: [r, x, z, l], expression: "if(x*x+z*z>r*r,-1,l)"}
85+
samplers:
86+
noise:
87+
type: OPEN_SIMPLEX_2
88+
dimensions: 2
89+
salt: 3912
90+
frequency: 0.1
91+
from: ring4
92+
to:
93+
- ring5: 1
94+
- ring4: 1
95+
96+
97+

0 commit comments

Comments
 (0)