Skip to content

Commit 5ca940e

Browse files
duplexsystemduplexsystem
committed
Merge remote-tracking branch 'origin/master'
2 parents e20a4a5 + 0587006 commit 5ca940e

21 files changed

Lines changed: 586 additions & 18 deletions

‎biome-distribution/stages/add_biome_color_variants.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,26 @@ stages:
77
to:
88
- MAPLE_GROVE: 2
99
- RED_MAPLE_GROVE: 1
10-
- YELLOW_MAPLE_GROVE: 2
10+
- YELLOW_MAPLE_GROVE: 2
11+
12+
- type: REPLACE
13+
from: arid-pale-garden
14+
sampler:
15+
type: CELLULAR
16+
return: CellValue
17+
frequency: 1 / 100 / ${customization.yml:variation-scale} / ${customization.yml:global-scale}
18+
to:
19+
- ARID_PALE_GARDEN: 1
20+
- ORANGE_ARID_PALE_GARDEN: 1
21+
- RED_ARID_PALE_GARDEN: 1
22+
23+
- type: REPLACE
24+
from: arid-pale-garden-coast
25+
sampler:
26+
type: CELLULAR
27+
return: CellValue
28+
frequency: 1 / 100 / ${customization.yml:variation-scale} / ${customization.yml:global-scale}
29+
to:
30+
- ARID_PALE_GARDEN_COAST: 1
31+
- ORANGE_ARID_PALE_GARDEN_COAST: 1
32+
- RED_ARID_PALE_GARDEN_COAST: 1

‎biome-distribution/stages/add_large_spot_coast.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,10 @@ stages:
8888
type: CONSTANT
8989
from: temperate-vast-forest
9090
replace: ocean
91-
to: temperate-vast-forest-coast
91+
to: temperate-vast-forest-coast
92+
- type: BORDER
93+
sampler:
94+
type: CONSTANT
95+
from: tropical-vast-forest
96+
replace: ocean
97+
to: tropical-vast-forest-coast

‎biome-distribution/stages/add_rivers.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,24 @@ stages:
123123
- SELF: 1
124124
- PALE_GARDEN_RIVER: 1
125125
sampler: *riverSampler
126+
- type: REPLACE
127+
from: USE_ARID_PALE_GARDEN_RIVER
128+
to:
129+
- SELF: 1
130+
- ARID_PALE_GARDEN_RIVER: 1
131+
sampler: *riverSampler
132+
- type: REPLACE
133+
from: USE_ORANGE_ARID_PALE_GARDEN_RIVER
134+
to:
135+
- SELF: 1
136+
- ORANGE_ARID_PALE_GARDEN_RIVER: 1
137+
sampler: *riverSampler
138+
- type: REPLACE
139+
from: USE_RED_ARID_PALE_GARDEN_RIVER
140+
to:
141+
- SELF: 1
142+
- RED_ARID_PALE_GARDEN_RIVER: 1
143+
sampler: *riverSampler
126144
# Pale Garden rivers
127145
- type: REPLACE
128146
from: USE_POLAR_PALE_GARDEN_RIVER

‎biome-distribution/stages/climate/temperature.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ stages:
107107
- temperate-vast-forest: *temperateCold
108108
- temperate-vast-forest: *temperateWarm
109109
- temperate-vast-forest: *temperateHot
110-
- tropical-savanna-wet: *tropicalCold
111-
- tropical-monsoon: *tropicalWarm
112-
- tropical-rainforest: *tropicalHot
110+
- tropical-vast-forest: *tropicalCold
111+
- tropical-vast-forest: *tropicalWarm
112+
- tropical-vast-forest: *tropicalHot

‎biome-distribution/stages/set_biomes_in_climates.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,10 @@ stages:
545545
- PALE_GARDEN: 1
546546
temperate-vast-forest-coast:
547547
- PALE_GARDEN_COAST: 1
548+
tropical-vast-forest:
549+
- arid-pale-garden: 1
550+
tropical-vast-forest-coast:
551+
- arid-pale-garden-coast: 1
548552

549553

550554
island-polar-shallow-ocean:

‎biomes/colors.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,19 @@ SAVANNA_OVERHANGS: 0x748c37
6767

6868
GRASS_SAVANNA: 0x524e1a
6969

70+
ARID_PALE_GARDEN: 0xb1bd93
71+
ARID_PALE_GARDEN_RIVER: 0x8cb8a7
72+
ARID_PALE_GARDEN_COAST: 0xacb391
73+
74+
RED_ARID_PALE_GARDEN: 0xbaa48f
75+
RED_ARID_PALE_GARDEN_RIVER: 0x97c0c2
76+
RED_ARID_PALE_GARDEN_COAST: 0xbfba95
77+
78+
ORANGE_ARID_PALE_GARDEN: 0xbda793
79+
ORANGE_ARID_PALE_GARDEN_RIVER: 0xa3cccb
80+
ORANGE_ARID_PALE_GARDEN_COAST: 0xd1cca7
81+
82+
7083
# Subtropical Land Biomes (23)
7184
FLOWERING_FOREST: 0x2a4d22
7285

‎biomes/land/unique/pale_garden/dry/arid_pale_garden.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
id: ARID_PALE_GARDEN
2+
type: BIOME
3+
extends:
4+
- ENVIRONMENT_LAND_DRY_WARM_SEMI_ARID
5+
- PALE_GARDEN
6+
color: $biomes/colors.yml:ARID_PALE_GARDEN
7+
8+
vanilla: minecraft:pale_garden
9+
10+
tags:
11+
- RESIN_ROOTS
12+
- USE_ARID_PALE_GARDEN_RIVER
13+
14+
colors:
15+
water: 0x32A598
16+
water-fog: 0x32A598
17+
18+
palette:
19+
- SANDY_GRASS: $meta.yml:top-y
20+
- SAND: ${meta.yml:ocean-level} - 1
21+
- << meta.yml:palette-bottom
22+
23+
features:
24+
flora:
25+
- GRASS
26+
- PALE_MOSS_CARPET
27+
- EYEBLOSSOM_PATCH
28+
- CAVE_GLOW_LICHEN
29+
- CACTUS_SPARSE
30+
- DEAD_BUSHES
31+
- DRY_GRASS
32+
trees:
33+
- DEAD_PALE_FOREST_TREES
34+
- DENSE_FALLEN_PALE_OAK_TREES
35+
- PALE_OAK_BUSHES
36+
landforms:
37+
- PALE_MOSSY_BOULDERS

‎biomes/land/unique/pale_garden/dry/arid_pale_garden_coast.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
id: ARID_PALE_GARDEN_COAST
2+
type: BIOME
3+
extends:
4+
- ENVIRONMENT_LAND_DRY_WARM_SEMI_ARID
5+
- ARID_PALE_GARDEN
6+
color: $biomes/colors.yml:ARID_PALE_GARDEN_COAST
7+
8+
vanilla: minecraft:pale_garden
9+
10+
tags:
11+
- RESIN_ROOTS
12+
- USE_ARID_PALE_GARDEN_RIVER
13+
14+
palette:
15+
- SAND: $meta.yml:top-y
16+
- << meta.yml:palette-bottom

‎biomes/land/unique/pale_garden/dry/orange_arid_pale_garden.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
id: ORANGE_ARID_PALE_GARDEN
2+
type: BIOME
3+
extends:
4+
- PALE_GARDEN
5+
color: $biomes/colors.yml:ORANGE_ARID_PALE_GARDEN
6+
7+
vanilla: minecraft:pale_garden
8+
9+
tags:
10+
- RESIN_ROOTS
11+
- USE_ORANGE_ARID_PALE_GARDEN_RIVER
12+
13+
colors:
14+
water: 0x32A598
15+
water-fog: 0x32A598
16+
17+
palette:
18+
- RED_WHITE_SANDY_GRASS_MIX: $meta.yml:top-y
19+
- RED_WHITE_SAND_MIX: ${meta.yml:ocean-level} - 1
20+
- << meta.yml:palette-bottom
21+
22+
features:
23+
flora:
24+
- GRASS
25+
- PALE_MOSS_CARPET
26+
- EYEBLOSSOM_PATCH
27+
- CAVE_GLOW_LICHEN
28+
- CACTUS_SPARSE
29+
- DEAD_BUSHES
30+
- DRY_GRASS
31+
trees:
32+
- DEAD_PALE_FOREST_TREES
33+
- DENSE_FALLEN_PALE_OAK_TREES
34+
- PALE_OAK_BUSHES
35+
landforms:
36+
- PALE_MOSSY_BOULDERS

‎biomes/land/unique/pale_garden/dry/orange_arid_pale_garden_coast.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
id: ORANGE_ARID_PALE_GARDEN_COAST
2+
type: BIOME
3+
extends:
4+
- ENVIRONMENT_LAND_DRY_WARM_SEMI_ARID
5+
- ORANGE_ARID_PALE_GARDEN
6+
color: $biomes/colors.yml:ORANGE_ARID_PALE_GARDEN_COAST
7+
8+
vanilla: minecraft:pale_garden
9+
10+
tags:
11+
- RESIN_ROOTS
12+
- USE_ARID_PALE_GARDEN_RIVER
13+
14+
palette:
15+
- RED_WHITE_SAND_MIX: $meta.yml:top-y
16+
- << meta.yml:palette-bottom

0 commit comments

Comments
 (0)