Skip to content

Commit 8909b65

Browse files
committed
Validation fixes
1 parent efc8f9d commit 8909b65

16 files changed

Lines changed: 51 additions & 22 deletions

File tree

biome-distribution/stages/set_biomes_in_climates.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ stages:
197197
temperate-hot-dry:
198198
- CHAPARRAL: 1
199199
- MOORLAND: 1
200+
- PALM_FORREST: 1
200201
temperate-hot-dry-highlands:
201202
- DRY_TEMPERATE_MOUNTAINS: 1
202203
- DRY_TEMPERATE_WHITE_MOUNTAINS: 1
@@ -208,13 +209,14 @@ stages:
208209
temperate-warm-dry:
209210
- CHAPARRAL: 1
210211
- MOORLAND: 1
212+
- PALM_FORREST: 1
211213
temperate-warm-dry-highlands:
212214
- DRY_TEMPERATE_MOUNTAINS: 1
213215
- DRY_TEMPERATE_WHITE_MOUNTAINS: 1
214216

215217
temperate-hot-flat:
216218
- MOORLAND: 1
217-
- ALIEN_MARSH: 1
219+
- PALM_FORREST: 1
218220
- TEMPERATE_RAINFOREST: 1
219221
- ROCKY_GRASSLAND: 1
220222
- OAK_FOREST: 1
@@ -365,24 +367,24 @@ stages:
365367
# Orange hot steppe
366368
hot-steppe-flat-orange:
367369
- XERIC_SHRUBLAND: 1
368-
- PALM_FOREST: 1
370+
- DRY_PALM_FOREST: 1
369371
hot-steppe-orange:
370372
- XERIC_SHRUBLAND: 1
371-
- PALM_FOREST: 1
373+
- DRY_PALM_FOREST: 1
372374
hot-steppe-highlands-orange:
373375
- XERIC_MOUNTAINS: 1
374-
- PALM_FOREST: 1
376+
- DRY_PALM_FOREST: 1
375377

376378
# White hot steppe
377379
hot-steppe-flat-white:
378380
- XERIC_SHRUBLAND: 1
379381
- TAR_PITS: 1
380-
- PALM_FOREST: 1
382+
- DRY_PALM_FOREST: 1
381383
- FIRMIHIN_FOREST: 1
382384
hot-steppe-white:
383385
- XERIC_SHRUBLAND: 1
384386
- TAR_PITS: 1
385-
- PALM_FOREST: 1
387+
- DRY_PALM_FOREST: 1
386388
- FIRMIHIN_FOREST: 1
387389
hot-steppe-highlands-white:
388390
- XERIC_MOUNTAINS: 1

biomes/colors.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ PALM_FOREST: 0xfdffb5
2828

2929
BLACK_SAND_BEACH: 0x0c0c0e
3030

31-
JUNGLE: 0x00ff09
31+
JUNGLE: 0x00ff16
32+
TROPICAL_RAINFOREST: 0x00ff09
3233
BAMBOO_JUNGLE: 0x456a21
3334

3435
SALT_FLATS: 0xeeeeee
@@ -62,6 +63,7 @@ GRASS_SAVANNA: 0x524e1a
6263
FLOWERING_FOREST: 0x2a4d22
6364

6465
OVERGROWN_CLIFFS: 0x747a6a
66+
CLOUD_FOREST: 0x007a5f
6567

6668
DRY_SHRUBLAND: 0x7e873d
6769
MOORLAND: 0x8e964e
@@ -70,12 +72,14 @@ WILD_BUMPY_MOUNTAINS: 0x1f3821
7072
ROCKY_JUNGLE: 0x324533
7173

7274
DRY_WOODLANDS: 0x2f332b
75+
DRY_PALM_FOREST: 0x2f335b
7376

7477
CHAPARRAL: 0xb3944a
7578

7679
LUSH_SEA_CAVES: 0x3f5750
7780

7881
TEMPERATE_RAINFOREST: 0x203628
82+
TEMPERATE_MONTANE_RAINFOREST: 0x2f3f2f
7983
TROPICAL_FLOODPLAIN: 0x306938
8084

8185
MONSOON_FOREST: 0x121f17
@@ -92,6 +96,8 @@ PINE_BARRENS: 0x89910a
9296
MUDDY_COASTS: 0x39373c
9397

9498
BROADLEAF_FOREST: 0x67a34d
99+
AZALEA_FOREST: 0xfaa34d
100+
OAK_FOREST: 0x7fa34d
95101
FOREST_LOWLANDS: 0x96db79
96102
DARK_FOREST: 0x0a4526
97103
EUCALYPTUS_FOREST: 0x5f8575
@@ -101,6 +107,7 @@ TEMPERATE_OVERPASS: 0x409639
101107

102108
OAK_SAVANNA: 0xd8f75d
103109
TEMPERATE_GRASSLAND: 0x91bd59
110+
ROCKY_GRASSLAND: 0x404d2e
104111
SUNFLOWER_PRAIRIE: 0xffeb00
105112
PRAIRIE: 0xc9f75d
106113
STEPPE: 0x9db55b
@@ -123,6 +130,7 @@ TEMPERATE_SEA_ARCHES: 0x6b8e70
123130

124131
# Boreal Land Biomes (18)
125132
COLD_STEPPE: 0xd0a88b
133+
DRY_FIR_FIELDS: 0xd0f88b
126134

127135
TAIGA: 0x96b793
128136
TAIGA_CLEARING: 0x96b700
@@ -192,6 +200,7 @@ TROPICAL_OCEAN_TRENCH: 0x046a8a
192200
TROPICAL_DEEP_OCEAN_VENTS: 0x0094c2
193201
TROPICAL_DEEP_DEPTHS: 0x0082ab
194202
TROPICAL_DEEP_DEPTHS_TRENCH: 0x015d7a
203+
TROPICAL_ISLAND_SHALLOWS: 0x02b075
195204
CORAL_OCEAN: 0x31c7f5
196205
CORAL_OCEAN_SLOPES: 0x33cfff
197206
CORAL_OCEAN_OVERHANGS: 0x2bb0d9
@@ -200,6 +209,7 @@ SHALLOW_CORAL_OCEAN: 0x31c7c4
200209

201210
LUKEWARM_RIVER: 0x00aee3
202211
TROPICAL_RIVER: 0x02bcf5
212+
TRAVERTINE_TERRACES_RIVER: 0x00ddff
203213

204214
DESERT_RIVER: 0x7db8ad
205215
RED_DESERT_RIVER: 0x71a69c
@@ -213,6 +223,7 @@ SUBTROPICAL_OCEAN_TRENCH: 0x06618f
213223
SUBTROPICAL_DEEP_OCEAN_VENTS: 0x0b80ba
214224
SUBTROPICAL_DEEP_DEPTHS: 0x256299
215225
SUBTROPICAL_DEEP_DEPTHS_TRENCH: 0x1b476e
226+
SUBTROPICAL_ISLAND_SHALLOWS: 0x0d968b
216227

217228
# Temperate Aquatic Biomes (3)
218229
ROCKY_SHALLOW_OCEAN: 0x45A1E0
@@ -227,6 +238,7 @@ DEEP_DEPTHS_TRENCH: 0x23376b
227238
KELP_FOREST: 0x28b36b
228239
KELP_FOREST_GRAVEL: 0x399e6a
229240
SEAGRASS_MEADOW: 0x3ddf4f
241+
ISLAND_SHALLOWS: 0x178784
230242

231243
# Boreal Aquatic Biomes (2)
232244
COLD_OCEAN: 0x2080c9
@@ -238,6 +250,7 @@ COLD_DEEP_OCEAN_VENTS: 0x1867a3
238250
COLD_DEEP_DEPTHS: 0x15598c
239251
COLD_DEEP_DEPTHS_TRENCH: 0x0f3e61
240252
COLD_RIVER: 0x2040c9
253+
COLD_ISLAND_SHALLOWS: 0x208099
241254

242255
# Polar Aquatic Biomes (3)
243256
FROZEN_RIVER: 0x9c9ff3
@@ -250,6 +263,7 @@ FROZEN_DEEP_OCEAN_VENTS: 0x6ea1cc
250263
FROZEN_DEEP_DEPTHS: 0x5f8db3
251264
FROZEN_DEEP_DEPTHS_TRENCH: 0x446480
252265
ICEBERG_OCEAN: 0x829bd1
266+
FROZEN_ISLAND_SHALLOWS: 0x83c0a3
253267

254268
# Other Aquatic Biomes (1)
255269
RIVER: 0x0084ff

biomes/land/dry/cold_semi_arid/dry_fir_fields.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:COLD_STEPPE
8+
color: $biomes/colors.yml:DRY_FIR_FIELDS
99

1010
tags:
1111
- LAND_CAVES

biomes/land/dry/warm_semi_arid/plain/palm_forest.yml renamed to biomes/land/dry/warm_semi_arid/plain/dry_palm_forest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
id: PALM_FOREST
1+
id: DRY_PALM_FOREST
22
type: BIOME
33
extends:
44
- COLOR_XERIC
55
- ENVIRONMENT_LAND_DRY_WARM_SEMI_ARID
66
- EQ_BUTTES
77
- CARVING_LAND
88
- BASE
9-
color: $biomes/colors.yml:DRY_WOODLANDS
9+
color: $biomes/colors.yml:DRY_PALM_FOREST
1010

1111
vanilla: minecraft:savanna
1212

biomes/land/temperate/oceanic/forest/oak_forest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_MULTI_TERRACED_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:BROADLEAF_FOREST
8+
color: $biomes/colors.yml:OAK_FOREST
99

1010
tags:
1111
- LAND_CAVES

biomes/land/temperate/oceanic/plain/rocky_grassland.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:TEMPERATE_GRASSLAND
8+
color: $biomes/colors.yml:ROCKY_GRASSLAND
99

1010
tags:
1111
- LAND_CAVES

biomes/land/temperate/subtropical_humid/forest/azalea_forest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_MULTI_TERRACED_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:BROADLEAF_FOREST
8+
color: $biomes/colors.yml:AZALEA_FOREST
99

1010
tags:
1111
- LAND_CAVES

biomes/land/temperate/subtropical_humid/forest/temperate_montane_rainforest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_MULTI_TERRACED_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:TEMPERATE_RAINFOREST
8+
color: $biomes/colors.yml:TEMPERATE_MONTANE_RAINFOREST
99

1010
tags:
1111
- LAND_CAVES

biomes/land/tropical/equatorial/forest/tropical_rainforest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends:
55
- EQ_LAND
66
- CARVING_LAND
77
- BASE
8-
color: $biomes/colors.yml:JUNGLE
8+
color: $biomes/colors.yml:TROPICAL_RAINFOREST
99

1010
vanilla: minecraft:jungle
1111

biomes/land/tropical/equatorial/mountain/cloud_forest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extends:
77
- ORES_EMERALD
88
- DEPOSITS_INFESTED
99
- BASE
10-
color: $biomes/colors.yml:OVERGROWN_CLIFFS
10+
color: $biomes/colors.yml:CLOUD_FOREST
1111

1212
vanilla: minecraft:jungle
1313

0 commit comments

Comments
 (0)