Skip to content

Commit 9368ecb

Browse files
duplexsystemduplexsystem
committed
Merge remote-tracking branch 'origin/main'
2 parents 5d3f1e6 + a783bed commit 9368ecb

28 files changed

Lines changed: 617 additions & 586 deletions

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
validate:
@@ -21,7 +21,7 @@ jobs:
2121
release:
2222
runs-on: ubuntu-latest
2323
needs: validate
24-
if: github.repository == 'PolyhedralDev/TerraOverworldConfig' && github.event_name == 'push'
24+
if: github.repository == 'PolyhedralDev/Tartarus' && github.event_name == 'push'
2525

2626
env:
2727
repo_url: ${{ github.server_url }}/${{ github.repository }}

distribution.yml renamed to biome-distribution/distribution.yml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
biomes:
2-
type: EXTRUSION
3-
extrusions:
4-
- << biome/extrusions/add_the_boundary.yml:extrusions
5-
provider:
6-
type: PIPELINE
7-
resolution: 4
8-
blend:
9-
amplitude: 2
10-
resolution: 2
11-
sampler:
12-
type: GAUSSIAN
13-
pipeline:
14-
source:
15-
type: SAMPLER
16-
biomes:
17-
- nether: 1
18-
sampler:
19-
dimensions: 2
20-
type: CONSTANT
21-
stages:
22-
- type: REPLACE
23-
from: nether
24-
to: $options.yml:biome-pool
25-
sampler:
26-
dimensions: 2
27-
type: CELLULAR
28-
return: CellValue
29-
salt: 69420101
30-
frequency: 1 / ${options.yml:biome-size}
31-
- type: FRACTAL_EXPAND
32-
sampler:
33-
type: WHITE_NOISE
34-
- type: FRACTAL_EXPAND
35-
sampler:
36-
type: WHITE_NOISE
37-
- type: FRACTAL_EXPAND
38-
sampler:
39-
type: WHITE_NOISE
40-
- type: FRACTAL_EXPAND
41-
sampler:
42-
type: WHITE_NOISE
43-
- type: SMOOTH
44-
sampler:
45-
type: WHITE_NOISE
46-
- type: SMOOTH
47-
sampler:
1+
biomes:
2+
type: EXTRUSION
3+
extrusions:
4+
- << biome-distribution/extrusions/add_the_boundary.yml:extrusions
5+
provider:
6+
type: PIPELINE
7+
resolution: 4
8+
blend:
9+
amplitude: 2
10+
resolution: 2
11+
sampler:
12+
type: GAUSSIAN
13+
pipeline:
14+
source:
15+
type: SAMPLER
16+
biomes:
17+
- nether: 1
18+
sampler:
19+
dimensions: 2
20+
type: CONSTANT
21+
stages:
22+
- type: REPLACE
23+
from: nether
24+
to: $options.yml:biome-pool
25+
sampler:
26+
dimensions: 2
27+
type: CELLULAR
28+
return: CellValue
29+
salt: 69420101
30+
frequency: 1 / ${options.yml:biome-size}
31+
- type: FRACTAL_EXPAND
32+
sampler:
33+
type: WHITE_NOISE
34+
- type: FRACTAL_EXPAND
35+
sampler:
36+
type: WHITE_NOISE
37+
- type: FRACTAL_EXPAND
38+
sampler:
39+
type: WHITE_NOISE
40+
- type: FRACTAL_EXPAND
41+
sampler:
42+
type: WHITE_NOISE
43+
- type: SMOOTH
44+
sampler:
45+
type: WHITE_NOISE
46+
- type: SMOOTH
47+
sampler:
4848
type: WHITE_NOISE

biome/extrusions/add_the_boundary.yml renamed to biome-distribution/extrusions/add_the_boundary.yml

File renamed without changes.

biome/base.yml renamed to biomes/abstract/base.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
id: BASE
2-
type: BIOME
3-
abstract: true
4-
extends:
5-
- ORES_DEFAULT
6-
7-
ocean:
8-
palette: BLOCK:minecraft:lava
1+
id: BASE
2+
type: BIOME
3+
abstract: true
4+
extends:
5+
- ORES_DEFAULT
6+
7+
ocean:
8+
palette: BLOCK:minecraft:lava
99
level: $options.yml:lava-level

biome/biomes/abstract/mob_vex.yml renamed to biomes/abstract/mob_vex.yml

File renamed without changes.

biome/biomes/abstract/ores/ores_default.yml renamed to biomes/abstract/ores/ores_default.yml

File renamed without changes.

biome/terrain/eq_crystalline_veldts.yml renamed to biomes/abstract/terrain/eq_crystalline_veldts.yml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
id: EQ_CRYSTALLINE_VELDTS
2-
type: BIOME
3-
abstract: true
4-
5-
vars: &variables
6-
base: ${options.yml:bedrock-top-y} - 20
7-
bedrockTop: $options.yml:bedrock-top-y
8-
netherTop: $options.yml:nether-top-y
9-
10-
terrain:
11-
sampler:
12-
type: EXPRESSION
13-
dimensions: 3
14-
variables: *variables
15-
expression: |
16-
if (y > bedrockTop, -1,
17-
if (y > netherTop, y,
18-
max(
19-
//Nether sealed ground and lower terrain
20-
max(
21-
22-
//Generally flat lower ground
23-
(-((y / 24)^2) + 1 + |(simplex2(x, z) / 2) + 0.1|),
24-
25-
//CV terrain
26-
stepLipped(-y + 64, 1/6, 96, 0, 0) + simplex2(x, z)*120
27-
28-
),
29-
30-
//Nether sealed ground and higher terrain
31-
max(
32-
33-
//CV terrain upside down
34-
-(stepLipped(-y + 228, 1/9, 196, 0, 0) + simplex2(x, z)*120),
35-
36-
//Generally flat higher ground
37-
-(-((y / 24)^2) + 108 + |(simplex2(x, z) / 2) + 0.1|)
38-
39-
)
40-
)
41-
)
42-
)
43-
44-
sampler-2d:
45-
dimensions: 2
1+
id: EQ_CRYSTALLINE_VELDTS
2+
type: BIOME
3+
abstract: true
4+
5+
vars: &variables
6+
base: ${options.yml:bedrock-top-y} - 20
7+
bedrockTop: $options.yml:bedrock-top-y
8+
netherTop: $options.yml:nether-top-y
9+
10+
terrain:
11+
sampler:
12+
type: EXPRESSION
13+
dimensions: 3
14+
variables: *variables
15+
expression: |
16+
if (y > bedrockTop, -1,
17+
if (y > netherTop, y,
18+
max(
19+
//Nether sealed ground and lower terrain
20+
max(
21+
22+
//Generally flat lower ground
23+
(-((y / 24)^2) + 1 + |(simplex2(x, z) / 2) + 0.1|),
24+
25+
//CV terrain
26+
stepLipped(-y + 64, 1/6, 96, 0, 0) + simplex2(x, z)*120
27+
28+
),
29+
30+
//Nether sealed ground and higher terrain
31+
max(
32+
33+
//CV terrain upside down
34+
-(stepLipped(-y + 228, 1/9, 196, 0, 0) + simplex2(x, z)*120),
35+
36+
//Generally flat higher ground
37+
-(-((y / 24)^2) + 108 + |(simplex2(x, z) / 2) + 0.1|)
38+
39+
)
40+
)
41+
)
42+
)
43+
44+
sampler-2d:
45+
dimensions: 2
4646
type: CONSTANT

biome/terrain/eq_hell_mountains.yml renamed to biomes/abstract/terrain/eq_hell_mountains.yml

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
id: EQ_HELL_MOUNTAINS
2-
type: BIOME
3-
abstract: true
4-
5-
vars: &variables
6-
base: ${options.yml:bottom-y} + 20
7-
height: ${options.yml:bedrock-top-y} - 20
8-
bedrockTop: $options.yml:bedrock-top-y
9-
netherTop: $options.yml:nether-top-y
10-
11-
terrain:
12-
sampler:
13-
type: EXPRESSION
14-
dimensions: 3
15-
variables: *variables
16-
expression: |
17-
if (y > bedrockTop, -1,
18-
if (y > netherTop, y,
19-
max( -y + base +
20-
terraceParabolic(
21-
terraceParabolic(
22-
terraceParabolic(
23-
(noise(x, z)+1) * height + (-bubbles(x, z)-0.75)/2 * 10,
24-
10, terraceVariation(x, z)*2, 0, 1
25-
),
26-
20, terraceVariation(x, z+1000)*3, 0, 1
27-
),
28-
30, terraceVariation(x, z+2000)*4, 0, 1
29-
),
30-
31-
-(-((y / 32)^2) + 52 + |(simplex2(x, z) * 5) + 0.1|)
32-
)
33-
)
34-
)
35-
samplers:
36-
bubbles:
37-
dimensions: 2
38-
type: LINEAR
39-
min: -1
40-
max: 0.2
41-
sampler:
42-
type: CELLULAR
43-
frequency: 0.09
44-
noise:
45-
dimensions: 2
46-
type: DOMAIN_WARP
47-
amplitude: 0.15
48-
warp:
49-
type: GAUSSIAN
50-
sampler:
51-
type: DOMAIN_WARP
52-
amplitude: 5
53-
warp:
54-
type: FBM
55-
octaves: 2
56-
sampler:
57-
type: OPEN_SIMPLEX_2
58-
salt: 1
59-
sampler:
60-
type: FBM
61-
octaves: 4
62-
sampler:
63-
type: LINEAR
64-
min: -1
65-
max: 0.2
66-
sampler:
67-
type: CELLULAR
68-
frequency: 0.005
69-
terraceVariation:
70-
dimensions: 2
71-
type: FBM
72-
octaves: 3
73-
lacunarity: 2.5
74-
sampler:
75-
type: OPEN_SIMPLEX_2
76-
frequency: 0.0015
77-
78-
sampler-2d:
79-
dimensions: 2
1+
id: EQ_HELL_MOUNTAINS
2+
type: BIOME
3+
abstract: true
4+
5+
vars: &variables
6+
base: ${options.yml:bottom-y} + 20
7+
height: ${options.yml:bedrock-top-y} - 20
8+
bedrockTop: $options.yml:bedrock-top-y
9+
netherTop: $options.yml:nether-top-y
10+
11+
terrain:
12+
sampler:
13+
type: EXPRESSION
14+
dimensions: 3
15+
variables: *variables
16+
expression: |
17+
if (y > bedrockTop, -1,
18+
if (y > netherTop, y,
19+
max( -y + base +
20+
terraceParabolic(
21+
terraceParabolic(
22+
terraceParabolic(
23+
(noise(x, z)+1) * height + (-bubbles(x, z)-0.75)/2 * 10,
24+
10, terraceVariation(x, z)*2, 0, 1
25+
),
26+
20, terraceVariation(x, z+1000)*3, 0, 1
27+
),
28+
30, terraceVariation(x, z+2000)*4, 0, 1
29+
),
30+
31+
-(-((y / 32)^2) + 52 + |(simplex2(x, z) * 5) + 0.1|)
32+
)
33+
)
34+
)
35+
samplers:
36+
bubbles:
37+
dimensions: 2
38+
type: LINEAR
39+
min: -1
40+
max: 0.2
41+
sampler:
42+
type: CELLULAR
43+
frequency: 0.09
44+
noise:
45+
dimensions: 2
46+
type: DOMAIN_WARP
47+
amplitude: 0.15
48+
warp:
49+
type: GAUSSIAN
50+
sampler:
51+
type: DOMAIN_WARP
52+
amplitude: 5
53+
warp:
54+
type: FBM
55+
octaves: 2
56+
sampler:
57+
type: OPEN_SIMPLEX_2
58+
salt: 1
59+
sampler:
60+
type: FBM
61+
octaves: 4
62+
sampler:
63+
type: LINEAR
64+
min: -1
65+
max: 0.2
66+
sampler:
67+
type: CELLULAR
68+
frequency: 0.005
69+
terraceVariation:
70+
dimensions: 2
71+
type: FBM
72+
octaves: 3
73+
lacunarity: 2.5
74+
sampler:
75+
type: OPEN_SIMPLEX_2
76+
frequency: 0.0015
77+
78+
sampler-2d:
79+
dimensions: 2
8080
type: CONSTANT

0 commit comments

Comments
 (0)