Skip to content

Commit 5f923d2

Browse files
DeathShadezDeathShadez
committed
Add pipeline blending & terrain-configuration
* Added pipeline blending * Changed void biome frequencies * Lowered max height of main_end biome from 75 to 70 * Turned configuration.yml settings into terrain-configuration settings in the meta.yml
1 parent 69f9693 commit 5f923d2

15 files changed

+165
-129
lines changed

‎biome-providers/presets/default.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,32 @@ biomes:
33
resolution: 4
44
initial-size: 15
55
blend:
6+
amplitude: 2
7+
resolution: 2
68
sampler:
7-
type: CONSTANT
9+
type: GAUSSIAN
810
pipeline:
911

1012
# End Only
1113
#source: $biome-providers/sources/end.yml:source
1214

13-
#Aether Only
15+
# Aether Only
1416
#source: $biome-providers/sources/aether.yml:source
1517

16-
#Both End and Aether
18+
# Both End and Aether
1719
source: $biome-providers/sources/reimagEND.yml:source
1820

1921
stages:
22+
# Distributes main end island and outer end seperately
2023
- << biome-providers/stages/outer_end.yml:stages
24+
25+
# Distributes outer end biomes
2126
- << biome-providers/stages/end_distribution.yml:stages
27+
28+
# Distributes aether biomes
2229
- << biome-providers/stages/aether_distribution.yml:stages
30+
31+
# Expanding and smoothing the edges of biomes
2332
- << biome-providers/stages/expand.yml:stages
2433
- << biome-providers/stages/expand.yml:stages
2534
- << biome-providers/stages/smooth.yml:stages
@@ -29,3 +38,5 @@ biomes:
2938
- << biome-providers/stages/smooth.yml:stages
3039
- << biome-providers/stages/smooth.yml:stages
3140
- << biome-providers/stages/smooth.yml:stages
41+
42+

‎biomes/abstract/terrain/eq_default.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ terrain:
1818
)
1919
)
2020
variables:
21-
threshold: $configuration.yml:island-threshold
22-
max: $configuration.yml:island-max-height
23-
min: $configuration.yml:island-min-height
24-
taper: $configuration.yml:island-taper
25-
flatness: $configuration.yml:island-flatness
26-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
21+
threshold: ${meta.yml:terrain-configuration.island-threshold}
22+
max: ${meta.yml:terrain-configuration.island-max-height}
23+
min: ${meta.yml:terrain-configuration.island-min-height}
24+
taper: ${meta.yml:terrain-configuration.island-taper}
25+
flatness: ${meta.yml:terrain-configuration.island-flatness}
26+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2727
samplers:
2828
simplex3:
2929
dimensions: 3
@@ -33,7 +33,7 @@ terrain:
3333
octaves: 5
3434
sampler:
3535
type: OPEN_SIMPLEX_2
36-
frequency: 0.002 / ${configuration.yml:island-scale}
36+
frequency: 0.002 / ${meta.yml:terrain-configuration.island-scale}
3737
undercarriageMask:
3838
dimensions: 3
3939
type: PROBABILITY
@@ -43,4 +43,4 @@ terrain:
4343
gain: 1
4444
sampler:
4545
type: OPEN_SIMPLEX_2
46-
frequency: 0.005 / ${configuration.yml:island-scale}
46+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}

‎biomes/abstract/terrain/eq_spikes.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ vars: &variables
3131
platformMaskNone: 0
3232
platformMaskFull: 0.1
3333

34-
threshold: $configuration.yml:island-threshold
35-
max: $configuration.yml:island-max-height
36-
min: $configuration.yml:island-min-height
37-
taper: $configuration.yml:island-taper
38-
flatness: $configuration.yml:island-flatness
39-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
34+
threshold: ${meta.yml:terrain-configuration.island-threshold}
35+
max: ${meta.yml:terrain-configuration.island-max-height}
36+
min: ${meta.yml:terrain-configuration.island-min-height}
37+
taper: ${meta.yml:terrain-configuration.island-taper}
38+
flatness: ${meta.yml:terrain-configuration.island-flatness}
39+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
4040

4141
terrain:
4242
sampler:
@@ -66,7 +66,7 @@ terrain:
6666
octaves: 5
6767
sampler:
6868
type: OPEN_SIMPLEX_2
69-
frequency: 0.002 / ${configuration.yml:island-scale}
69+
frequency: 0.002 / ${meta.yml:terrain-configuration.island-scale}
7070
undercarriageMask:
7171
dimensions: 3
7272
type: PROBABILITY
@@ -76,7 +76,7 @@ terrain:
7676
gain: 1
7777
sampler:
7878
type: OPEN_SIMPLEX_2
79-
frequency: 0.005 / ${configuration.yml:island-scale}
79+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
8080
ground: # Basic ground height map
8181
dimensions: 2
8282
type: FBM

‎biomes/aether/aether_bumpy.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ terrain:
2020
)
2121
)
2222
variables:
23-
threshold: $configuration.yml:island-threshold
24-
max: $configuration.yml:island-max-height
25-
min: $configuration.yml:island-min-height
26-
taper: $configuration.yml:island-taper
27-
flatness: $configuration.yml:island-flatness
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
23+
threshold: ${meta.yml:terrain-configuration.island-threshold}
24+
max: ${meta.yml:terrain-configuration.island-max-height}
25+
min: ${meta.yml:terrain-configuration.island-min-height}
26+
taper: ${meta.yml:terrain-configuration.island-taper}
27+
flatness: ${meta.yml:terrain-configuration.island-flatness}
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.002 / ${configuration.yml:island-scale}
38+
frequency: 0.002 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.005 / ${configuration.yml:island-scale}
48+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
colors:
5151
grass: 0xd2de85

‎biomes/aether/aether_crimson_heights.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ terrain:
2323
threshold: 0.6
2424
max: 300
2525
min: 100
26-
taper: $configuration.yml:island-taper
26+
taper: ${meta.yml:terrain-configuration.island-taper}
2727
flatness: 2
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.02 / ${configuration.yml:island-scale}
38+
frequency: 0.02 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.0005 / ${configuration.yml:island-scale}
48+
frequency: 0.0005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
colors:
5151
grass: 0xdb1818

‎biomes/aether/aether_driftlands.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ terrain:
2020
)
2121
)
2222
variables:
23-
threshold: $configuration.yml:island-threshold
24-
max: $configuration.yml:island-max-height
25-
min: $configuration.yml:island-min-height
26-
taper: $configuration.yml:island-taper
23+
threshold: ${meta.yml:terrain-configuration.island-threshold}
24+
max: ${meta.yml:terrain-configuration.island-max-height}
25+
min: ${meta.yml:terrain-configuration.island-min-height}
26+
taper: ${meta.yml:terrain-configuration.island-taper}
2727
flatness: 2
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.02 / ${configuration.yml:island-scale}
38+
frequency: 0.02 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.00005 / ${configuration.yml:island-scale}
48+
frequency: 0.00005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
colors:
5151
grass: 0xd2de85

‎biomes/aether/aether_lavender_driftlands.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ terrain:
2020
)
2121
)
2222
variables:
23-
threshold: $configuration.yml:island-threshold
24-
max: $configuration.yml:island-max-height
25-
min: $configuration.yml:island-min-height
26-
taper: $configuration.yml:island-taper
27-
flatness: $configuration.yml:island-flatness
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
23+
threshold: ${meta.yml:terrain-configuration.island-threshold}
24+
max: ${meta.yml:terrain-configuration.island-max-height}
25+
min: ${meta.yml:terrain-configuration.island-min-height}
26+
taper: ${meta.yml:terrain-configuration.island-taper}
27+
flatness: ${meta.yml:terrain-configuration.island-flatness}
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.02 / ${configuration.yml:island-scale}
38+
frequency: 0.02 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.00005 / ${configuration.yml:island-scale}
48+
frequency: 0.00005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
colors:
5151
grass: 0xFFABFF

‎biomes/end/crying_end.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ terrain:
2020
)
2121
)
2222
variables:
23-
threshold: $configuration.yml:island-threshold
24-
max: $configuration.yml:island-max-height
25-
min: $configuration.yml:island-min-height
26-
taper: $configuration.yml:island-taper
27-
flatness: $configuration.yml:island-flatness
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
23+
threshold: ${meta.yml:terrain-configuration.island-threshold}
24+
max: ${meta.yml:terrain-configuration.island-max-height}
25+
min: ${meta.yml:terrain-configuration.island-min-height}
26+
taper: ${meta.yml:terrain-configuration.island-taper}
27+
flatness: ${meta.yml:terrain-configuration.island-flatness}
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -36,7 +36,7 @@ terrain:
3636
sampler:
3737
type: CELLULAR
3838
return: CellValue
39-
frequency: 0.01 / ${configuration.yml:island-scale}
39+
frequency: 0.01 / ${meta.yml:terrain-configuration.island-scale}
4040
undercarriageMask:
4141
dimensions: 3
4242
type: PROBABILITY
@@ -46,7 +46,7 @@ terrain:
4646
gain: 1
4747
sampler:
4848
type: CELLULAR
49-
frequency: 0.05 / ${configuration.yml:island-scale}
49+
frequency: 0.05 / ${meta.yml:terrain-configuration.island-scale}
5050

5151
palette:
5252
- CRYING_END: 319

‎biomes/end/jagged_end.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terrain:
2121
)
2222
variables:
2323
threshold: 0.3
24-
max: $configuration.yml:island-max-height
25-
min: $configuration.yml:island-min-height
26-
taper: $configuration.yml:island-taper
27-
flatness: $configuration.yml:island-flatness
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
24+
max: ${meta.yml:terrain-configuration.island-max-height}
25+
min: ${meta.yml:terrain-configuration.island-min-height}
26+
taper: ${meta.yml:terrain-configuration.island-taper}
27+
flatness: ${meta.yml:terrain-configuration.island-flatness}
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.005 / ${configuration.yml:island-scale}
38+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.005 / ${configuration.yml:island-scale}
48+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
palette:
5151
- SHATTERED_GROUND: 319

‎biomes/end/main_end.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terrain:
2121
)
2222
variables:
2323
threshold: 0.75
24-
max: 75
24+
max: 70
2525
min: 0
26-
taper: $configuration.yml:island-taper
26+
taper: ${meta.yml:terrain-configuration.island-taper}
2727
flatness: 7
28-
undercarriageTranslate: $configuration.yml:island-undercarriage-translate
28+
undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
2929
samplers:
3030
simplex3:
3131
dimensions: 3
@@ -35,7 +35,7 @@ terrain:
3535
octaves: 5
3636
sampler:
3737
type: OPEN_SIMPLEX_2
38-
frequency: 0.002 / ${configuration.yml:island-scale}
38+
frequency: 0.002 / ${meta.yml:terrain-configuration.island-scale}
3939
undercarriageMask:
4040
dimensions: 3
4141
type: PROBABILITY
@@ -45,7 +45,7 @@ terrain:
4545
gain: 1
4646
sampler:
4747
type: OPEN_SIMPLEX_2
48-
frequency: 0.005 / ${configuration.yml:island-scale}
48+
frequency: 0.005 / ${meta.yml:terrain-configuration.island-scale}
4949

5050
palette:
5151
- BLOCK:minecraft:end_stone: 319

0 commit comments

Comments
 (0)