Merge remote-tracking branch 'origin/2.0-Breaking'

duplexsystem · duplexsystem · commit efc8f9d94729 · 2025-10-03T12:43:29.000-06:00
diff --git a/biome-distribution/stages/add_coast.yml b/biome-distribution/stages/add_coast.yml
@@ -20,5 +20,5 @@ stages:
       SELF: 1
     sampler:
       type: OPEN_SIMPLEX_2
-      frequency: 1 / 300 / ${customization.yml:global-scale}
+      frequency: 1 / 150 / ${customization.yml:global-scale}
       salt: 1023
diff --git a/biome-distribution/stages/add_rivers.yml b/biome-distribution/stages/add_rivers.yml
@@ -73,13 +73,15 @@ stages:
     from: USE_DESERT_RIVER
     to:
       - SELF: 1
-      - DESERT_RIVER: 1
+      - GALLERY_FOREST: 1
+      - DESERT_RIVER: 2
     sampler: *riverSampler
   # Red desert rivers
   - type: REPLACE
     from: USE_RED_DESERT_RIVER
     to:
       - SELF: 1
+      - GALLERY_FOREST: 1
       - RED_DESERT_RIVER: 1
     sampler: *riverSampler
   # Regular rivers with temperate marshes
@@ -130,7 +132,8 @@ stages:
     from: USE_TROPICAL_RIVER
     to:
       - SELF: 1
-      - TROPICAL_RIVER: 1
+      - GALLERY_FOREST: 1
+      - TROPICAL_RIVER: 2
     sampler: *riverSampler
   # Tropical coastal rivers with mangrove swamps
   - type: REPLACE
diff --git a/biome-distribution/stages/set_biomes_in_climates.yml b/biome-distribution/stages/set_biomes_in_climates.yml
@@ -447,9 +447,9 @@ stages:
         - JUNGLE: 1
         - ROCKY_JUNGLE: 1
         - TROPICAL_RAINFOREST: 1
+        - TROPICAL_FLOODPLAIN: 1
       tropical-rainforest:
         - BAMBOO_JUNGLE: 1
-        - TROPICAL_FLOODPLAIN: 1
         - OVERGROWN_CLIFFS: 1
         - CLOUD_FOREST: 1
         - TROPICAL_RAINFOREST: 1
@@ -490,7 +490,6 @@ stages:
 
       tropical-coast-flat:
         - MUDDY_COASTS: 1
-        - MANGROVE_SWAMP: 1
         - PALM_BEACH: 1
       tropical-coast: LUSH_SEA_CAVES
       tropical-coast-highlands: LUSH_SEA_CAVES
diff --git a/biomes/abstract/terrain/land/eq_global_river.yml b/biomes/abstract/terrain/land/eq_global_river.yml
@@ -32,10 +32,10 @@ terrain:
       erosionStrengthVariation: # Used to roughen up the walls
         dimensions: 3
         type: FBM
-        octaves: 2
+        octaves: 4
         sampler:
           type: OPEN_SIMPLEX_2
-          frequency: 0.03
+          frequency: 0.05
           salt: 5
       openings:
         dimensions: 2
diff --git a/biomes/colors.yml b/biomes/colors.yml
@@ -84,6 +84,7 @@ MONSOON_FOREST: 0x121f17
 BEACH: 0xe6e7a8
 ARCHIPELAGO: 0xbfff6b
 MARSH: 0x719740
+GALLERY_FOREST: 0x719000
 ALIEN_MARSH: 0x33cccc
 SHALE_BEACH: 0x868784
 SHRUB_BEACH: 0x89907b
diff --git a/biomes/land/dry/warm_semi_arid/plain/drybrush.yml b/biomes/land/dry/warm_semi_arid/plain/drybrush.yml
@@ -10,7 +10,7 @@ color: $biomes/colors.yml:DRYBRUSH
 
 tags:
   - LAND_CAVES
-  - USE_RIVER
+  - USE_DESERT_RIVER
 
 vanilla: minecraft:savanna
 
diff --git a/biomes/land/maritime/wet/gallery_forest.yml b/biomes/land/maritime/wet/gallery_forest.yml
@@ -0,0 +1,40 @@
+id: GALLERY_FOREST
+type: BIOME
+extends:
+  - ENVIRONMENT_LAND_MARITIME_WET
+  - EQ_WARPED_WETLANDS
+  - CARVING_OCEAN
+  - BASE
+color: $biomes/colors.yml:GALLERY_FOREST
+
+vanilla: minecraft:river
+
+colors:
+  grass: 0x61b354
+  foliage: 0x75c458
+
+tags:
+  - LAND_CAVES
+  - USE_RIVER_TEMPERATE_MARSH
+
+palette:
+  - GRASS: $meta.yml:top-y
+  - GRASS_MARSH: ${meta.yml:ocean-level} + 11
+  - << meta.yml:palette-underwater
+  - << meta.yml:palette-bottom
+
+slant:
+  - threshold: 0.4
+    palette:
+      - << meta.yml:palette-slant-generic
+      - << meta.yml:palette-bottom
+
+features:
+  trees:
+    - DENSE_PALM_TREES
+    - SUBTROPICAL_BUSHES
+  flora:
+    - TALL_GRASS
+    - SUGAR_CANE
+    - SMALL_DRIPLEAF
+    - BIG_DRIPLEAF
diff --git a/biomes/land/maritime/wet/swamp.yml b/biomes/land/maritime/wet/swamp.yml
@@ -2,7 +2,7 @@ id: SWAMP
 type: BIOME
 extends:
   - ENVIRONMENT_LAND_MARITIME_WET
-  - EQ_SWAMP
+  - EQ_MANGROVE_SWAMP
   - CARVING_OCEAN
   - BASE
 color: $biomes/colors.yml:SWAMP
diff --git a/biomes/land/temperate/subtropical_humid/forest/azalea_forest.yml b/biomes/land/temperate/subtropical_humid/forest/azalea_forest.yml
@@ -21,6 +21,7 @@ colors:
 
 palette:
   - GRASS: $meta.yml:top-y
+  - GRASS_MOSSY: 90
   - << meta.yml:palette-ocean-level-sand
   - << meta.yml:palette-underwater
   - << meta.yml:palette-bottom
@@ -56,6 +57,8 @@ features:
   trees:
     - DENSE_AZALEA_TREE_PATCHES
     - SUBTROPICAL_BUSHES
+    - SPARSE_DARK_OAK_TREE_PATCHES
+    - SPARSE_FALLEN_DARK_OAK_TREES
   landforms:
     - MOSSY_BOULDERS
     - SMALL_MOSSY_BOULDER_PATCHES
diff --git a/biomes/land/tropical/equatorial/forest/tropical_floodplain.yml b/biomes/land/tropical/equatorial/forest/tropical_floodplain.yml
@@ -2,7 +2,7 @@ id: TROPICAL_FLOODPLAIN
 type: BIOME
 extends:
   - ENVIRONMENT_LAND_TROPICAL_EQUATORIAL
-  - EQ_SWAMP
+  - EQ_MANGROVE_SWAMP
   - CARVING_OCEAN
   - BASE
 color: $biomes/colors.yml:TROPICAL_FLOODPLAIN
diff --git a/customization.yml b/customization.yml
@@ -55,7 +55,7 @@ terrain-ocean-depth: 100
 # 1 means 100% inland, 0 means the coast, and -1 means 100% ocean.
 # These options are primarily used in the math/samplers/continents.yml config file.
 
-continental-offset: 0
+continental-offset: 0.15
 # Controls the land / ocean ratio.
 # - A value of 0 results in equal land and ocean
 # - A value of 1 results in 100% land
@@ -66,7 +66,7 @@ continental-offset: 0
 # Dividing your desired land percentage by 50 then subtracting 1 will give
 # you the equivalent continental-offset, i.e. land% / 50 - 1 = offset
 #
-# Default: 0.2
+# Default: 0.15
 
 continental-spread: 1
 # Controls how much variation there is in the continental value from
@@ -85,11 +85,11 @@ continental-scale: 2
 # this produces larger landmasses and larger oceans, and vice-versa when
 # decreasing it. This does not control the ratio of land / ocean, for that
 # you should change continental-offset instead.
-# Default: 1
+# Default: 2
 
-continental-coast-width: 20
+continental-coast-width: 15
 # Determines the width of costal biomes in blocks.
-# Default: 20
+# Default: 15
 
 continental-coast-threshold: 0.05
 # Determines how far from a continental value of 0 is considered for calculating 
@@ -200,13 +200,13 @@ flatness-factor: 0.95
 # Temperature
 # ---
 
-temperature-scale: 1
+temperature-scale: 0.95
 # Controls the scale of temperature zones. Most biomes are placed according to
 # a temperature map so hot biomes can't generate next to cold biomes, as well as
 # allowing for biomes of similar temperatures to generate together. Increasing this
 # will increase the distance between temperature changes, which results in things like
 # hot and cold biomes generating further apart - and vice versa when decreasing it.
-# Default: 1
+# Default: 0.95
 
 temperature-min: -1
 # Default: -1
@@ -248,11 +248,11 @@ precipitation-land-threshold: 0.4
 # Variation
 # ---
 
-variation-scale: 1
+variation-scale: 1.5
 # Controls scale of biome variations within each climate zone.
 # Decreasing this will result in more smaller biomes to generate in any given
 # climate, while increasing it will result in larger climate variations.
-# Default: 1
+# Default: 1.5
 
 # ---
 # Caves
@@ -286,11 +286,11 @@ river-spread-scale: 1
 # rivers, smaller scale = closer packed together rivers.
 # Default: 1
 
-river-min-width: 13
+river-min-width: 10
 # Controls in blocks the minimum width of rivers.
 # Default: 13
 
-river-max-width: 30
+river-max-width: 24
 # Controls in blocks the maximum width of rivers.
 # Default: 30
 
