diff --git a/src/main/resources/default-config/abstract/biomes/beach_abstract.yml b/src/main/resources/default-config/abstract/biomes/beach_abstract.yml index 82c88dca9..890d65820 100644 --- a/src/main/resources/default-config/abstract/biomes/beach_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/beach_abstract.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 58)^2)) + 1) + (noise2(x, z)/4)" +noise-equation: "((-((y / 58)^2)) + 1) + (noise2(x, z)/5)" id: "BEACH_ABSTRACT" diff --git a/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml new file mode 100644 index 000000000..66f96f838 --- /dev/null +++ b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml @@ -0,0 +1,86 @@ +noise-equation: "((-((y / 36)^2)) + 1) + ((noise2(x, z)/3))" +id: "DEEP_OCEAN_ABSTRACT" + + +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 + +flora: + chance: 50 + attempts: 1 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + +carving: + - CAVE_OCEAN: 35 + +ores: + DIRT: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + GRAVEL: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + DIORITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + ANDESITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + GRANITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + COAL_ORE: + min: 5 + max: 15 + min-height: 0 + max-height: 128 + IRON_ORE: + min: 2 + max: 6 + min-height: 0 + max-height: 64 + GOLD_ORE: + min: 1 + max: 3 + min-height: 0 + max-height: 32 + LAPIS_ORE: + min: 1 + max: 4 + min-height: 0 + max-height: 32 + REDSTONE_ORE: + min: 1 + max: 4 + min-height: 0 + max-height: 16 + DIAMOND_ORE: + min: 1 + max: 2 + min-height: 0 + max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml index 5a90ff277..9710470c0 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2)*6)" +noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2)*4)" id: "MOUNTAINS_PRETTY" carving: @@ -104,7 +104,7 @@ flora: slabs: enable: true - threshold: 0.015 + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml index 5096add7d..2524fabc0 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2)*2)" +noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2))" id: "MOUNTAINS_PRETTY_0" carving: @@ -104,7 +104,7 @@ flora: slabs: enable: true - threshold: 0.015 + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml index c634c09a4..8d8f20e55 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2)*4)" +noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x/2, z/2)*3)" id: "MOUNTAINS_PRETTY_1" carving: @@ -104,7 +104,7 @@ flora: slabs: enable: true - threshold: 0.015 + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml index 08dcc0cef..142553b54 100644 --- a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 48)^2)) + 1) + ((noise2(x, z)/2))" +noise-equation: "((-((y / 48)^2)) + 1) + ((noise2(x, z)/3))" id: "OCEAN_ABSTRACT" diff --git a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml index b25c83e10..db15649e8 100644 --- a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 63)^2)) + 1) + |(noise2(x, z) / 2) + 0.1|" +noise-equation: "((-((y / 64)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|" id: "PLAINS_ABSTRACT" carving: diff --git a/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml new file mode 100644 index 000000000..c098b4081 --- /dev/null +++ b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml @@ -0,0 +1,86 @@ +noise-equation: "((-((y / 40)^2)) + 1) + ((noise2(x, z)/3))" +id: "SHELF_OCEAN_ABSTRACT" + + +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 + +flora: + chance: 50 + attempts: 1 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + +carving: + - CAVE_OCEAN: 35 + +ores: + DIRT: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + GRAVEL: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + DIORITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + ANDESITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + GRANITE: + min: 0 + max: 2 + min-height: 0 + max-height: 128 + COAL_ORE: + min: 5 + max: 15 + min-height: 0 + max-height: 128 + IRON_ORE: + min: 2 + max: 6 + min-height: 0 + max-height: 64 + GOLD_ORE: + min: 1 + max: 3 + min-height: 0 + max-height: 32 + LAPIS_ORE: + min: 1 + max: 4 + min-height: 0 + max-height: 32 + REDSTONE_ORE: + min: 1 + max: 4 + min-height: 0 + max-height: 16 + DIAMOND_ORE: + min: 1 + max: 2 + min-height: 0 + max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/desert.yml b/src/main/resources/default-config/biomes/desert.yml index 33f3d49f8..6ce18283a 100644 --- a/src/main/resources/default-config/biomes/desert.yml +++ b/src/main/resources/default-config/biomes/desert.yml @@ -38,7 +38,7 @@ trees: slabs: enable: true - threshold: 0.015 + threshold: 0.0075 palettes: - "minecraft:sand": "BLOCK:minecraft:sandstone_slab" use-stairs-if-available: true diff --git a/src/main/resources/default-config/biomes/forest/birch_forest.yml b/src/main/resources/default-config/biomes/forest/birch_forest.yml index 1680a73ca..093c8127f 100644 --- a/src/main/resources/default-config/biomes/forest/birch_forest.yml +++ b/src/main/resources/default-config/biomes/forest/birch_forest.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "BIRCH_FOREST" name: "Birch Forest" diff --git a/src/main/resources/default-config/biomes/forest/dark_forest.yml b/src/main/resources/default-config/biomes/forest/dark_forest.yml index 9ab9fc4c4..c718f5716 100644 --- a/src/main/resources/default-config/biomes/forest/dark_forest.yml +++ b/src/main/resources/default-config/biomes/forest/dark_forest.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "DARK_FOREST" name: "Birch Forest" diff --git a/src/main/resources/default-config/biomes/forest/jungle.yml b/src/main/resources/default-config/biomes/forest/jungle.yml index 6770aba10..6ff2204e6 100644 --- a/src/main/resources/default-config/biomes/forest/jungle.yml +++ b/src/main/resources/default-config/biomes/forest/jungle.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.25) / 2)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.25) / 3)" extends: "BASIC_ORES" id: "JUNGLE" name: "Jungle" diff --git a/src/main/resources/default-config/biomes/forest/oak_forest.yml b/src/main/resources/default-config/biomes/forest/oak_forest.yml index 7665edb97..24cea814c 100644 --- a/src/main/resources/default-config/biomes/forest/oak_forest.yml +++ b/src/main/resources/default-config/biomes/forest/oak_forest.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 1.5)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" extends: "BASIC_ORES" id: "FOREST" name: "Oak Forest" diff --git a/src/main/resources/default-config/biomes/forest/savanna.yml b/src/main/resources/default-config/biomes/forest/savanna.yml index 451c64764..94741ac42 100644 --- a/src/main/resources/default-config/biomes/forest/savanna.yml +++ b/src/main/resources/default-config/biomes/forest/savanna.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "SAVANNA" name: "Savanna" diff --git a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml index 7a2947745..8fc775bf8 100644 --- a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml +++ b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml @@ -1,7 +1,8 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 1.5)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" extends: "BASIC_ORES" id: "SNOWY_TAIGA" -name: "Taiga Forest" +erodible: true + palette: - BEDROCK: 0 @@ -17,7 +18,7 @@ snow: - min: 0 max: 255 chance: 100 -erodible: true + flora: chance: 40 diff --git a/src/main/resources/default-config/biomes/forest/taiga.yml b/src/main/resources/default-config/biomes/forest/taiga.yml index 51eff4d2f..0aa156ca9 100644 --- a/src/main/resources/default-config/biomes/forest/taiga.yml +++ b/src/main/resources/default-config/biomes/forest/taiga.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 1.5)" +noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" extends: "BASIC_ORES" id: "TAIGA" name: "Taiga Forest" diff --git a/src/main/resources/default-config/biomes/mesa.yml b/src/main/resources/default-config/biomes/mesa.yml index 3074a8f52..78c19b8fe 100644 --- a/src/main/resources/default-config/biomes/mesa.yml +++ b/src/main/resources/default-config/biomes/mesa.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((max(noise2(x/1.5, z/1.5)+0.1, 0)) + 0.1)*5), 3)/1.75 + |(noise2(x/1.5, z/1.5)+0.1)*1.5|" +noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((max(noise2(x/1.5, z/1.5)+0.1, 0)) + 0.1)*5), 3)/2.5 + |(noise2(x, z)+0.1)/3|" extends: "BASIC_ORES" id: "MESA" name: "Mesa" @@ -42,7 +42,7 @@ flora: max: 84 slabs: enable: true - threshold: 0.015 + threshold: 0.0075 palettes: - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" use-stairs-if-available: true diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml index e562be523..625842899 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*6), 3)/2.5 + |noise2(x/2.5, z/2.5)*2|" +noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*4), 3)/2.5 + |noise2(x/2.5, z/2.5)|" id: "ARID_MOUNTAINS" extends: "BASIC_ORES" diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml index 0b687cb56..865f5efeb 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*2), 3)/5 + |noise2(x/2.5, z/2.5)*2|" +noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)), 3)/5 + |noise2(x/2.5, z/2.5)|" id: "ARID_MOUNTAINS_0" extends: "BASIC_ORES" diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml index ef55967db..0572891c9 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*4), 3)/3 + |noise2(x/2.5, z/2.5)*2|" +noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*3), 3)/3 + |noise2(x/2.5, z/2.5)|" id: "ARID_MOUNTAINS_1" extends: "BASIC_ORES" diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone.yml index 8b400131a..65056541a 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone.yml @@ -1,6 +1,7 @@ extends: "MOUNTAINS_PRETTY" id: "MOUNTAINS_STONE" -noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*6, 0)" +noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*4 + noise2(x*8, z*8)*0.25, 0)" +prevent-smooth: true palette: - BEDROCK: 0 - BEDROCK_MOST: 1 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml index e191e6915..a03c44135 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml @@ -1,6 +1,7 @@ extends: "MOUNTAINS_PRETTY_0" id: "MOUNTAINS_STONE_0" -noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*2, 0)" +noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2), 0)" +prevent-smooth: true palette: - BEDROCK: 0 - BEDROCK_MOST: 1 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml index 9d30c3153..88fff85c7 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml @@ -1,6 +1,7 @@ extends: "MOUNTAINS_PRETTY_1" id: "MOUNTAINS_STONE_1" -noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*4, 0)" +noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*3 + noise2(x*8, z*8)*0.125, 0)" +prevent-smooth: true palette: - BEDROCK: 0 - BEDROCK_MOST: 1 diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean.yml new file mode 100644 index 000000000..91bc51d1d --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean.yml @@ -0,0 +1,4 @@ +extends: "DEEP_OCEAN_ABSTRACT" +id: "OCEAN_DEEP" +vanilla: OCEAN + diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml new file mode 100644 index 000000000..5ba30826b --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml @@ -0,0 +1,12 @@ +extends: "DEEP_OCEAN_ABSTRACT" +id: "COLD_OCEAN_DEEP" +vanilla: COLD_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - TUNDRA: 255 + - OCEANFLOOR: 60 +ocean: + level: 62 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml new file mode 100644 index 000000000..6c0cfff64 --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml @@ -0,0 +1,13 @@ +extends: "DEEP_OCEAN_ABSTRACT" +id: "FROZEN_OCEAN_DEEP" +vanilla: COLD_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - TUNDRA: 255 + - OCEANFLOOR: 60 +ocean: + palette: "COLD_OCEAN" + level: 62 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml new file mode 100644 index 000000000..6809b2bd2 --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml @@ -0,0 +1,39 @@ +extends: "DEEP_OCEAN_ABSTRACT" +id: "LUKEWARM_OCEAN_DEEP" +vanilla: LUKEWARM_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 +flora: + chance: 50 + attempts: 1 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + KELP_SHORT: + weight: 5 + y: + min: 32 + max: 64 + KELP_MEDIUM: + weight: 5 + y: + min: 32 + max: 64 + KELP_TALL: + weight: 5 + y: + min: 32 + max: 64 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml new file mode 100644 index 000000000..a852cb0ee --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml @@ -0,0 +1,43 @@ +extends: "DEEP_OCEAN_ABSTRACT" +id: "WARM_OCEAN_DEEP" +vanilla: WARM_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 +flora: + chance: 50 + attempts: 1 + simplex: + enable: true + frequency: 0.05 + seed: 4 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + KELP_SHORT: + weight: 1 + y: + min: 32 + max: 64 + KELP_MEDIUM: + weight: 1 + y: + min: 32 + max: 64 + KELP_TALL: + weight: 1 + y: + min: 32 + max: 64 diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean.yml new file mode 100644 index 000000000..1a39ebbdc --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean.yml @@ -0,0 +1,4 @@ +extends: "SHELF_OCEAN_ABSTRACT" +id: "OCEAN_SHELF" +vanilla: OCEAN + diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml new file mode 100644 index 000000000..ee2cf16d5 --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml @@ -0,0 +1,12 @@ +extends: "SHELF_OCEAN_ABSTRACT" +id: "COLD_OCEAN_SHELF" +vanilla: COLD_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - TUNDRA: 255 + - OCEANFLOOR: 60 +ocean: + level: 62 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml new file mode 100644 index 000000000..d256edf4c --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml @@ -0,0 +1,13 @@ +extends: "SHELF_OCEAN_ABSTRACT" +id: "FROZEN_OCEAN_SHELF" +vanilla: COLD_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - TUNDRA: 255 + - OCEANFLOOR: 60 +ocean: + palette: "COLD_OCEAN" + level: 62 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml new file mode 100644 index 000000000..2aa1c2c9c --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml @@ -0,0 +1,39 @@ +extends: "SHELF_OCEAN_ABSTRACT" +id: "LUKEWARM_OCEAN_SHELF" +vanilla: LUKEWARM_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 +flora: + chance: 50 + attempts: 1 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + KELP_SHORT: + weight: 5 + y: + min: 32 + max: 64 + KELP_MEDIUM: + weight: 5 + y: + min: 32 + max: 64 + KELP_TALL: + weight: 5 + y: + min: 32 + max: 64 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml new file mode 100644 index 000000000..1902f20d1 --- /dev/null +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml @@ -0,0 +1,43 @@ +extends: "SHELF_OCEAN_ABSTRACT" +id: "WARM_OCEAN_SHELF" +vanilla: WARM_OCEAN +palette: + - BEDROCK: 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 255 + - OCEANFLOOR: 60 +flora: + chance: 50 + attempts: 1 + simplex: + enable: true + frequency: 0.05 + seed: 4 + items: + TALL_SEAGRASS: + weight: 1 + y: + min: 32 + max: 64 + SEAGRASS: + weight: 3 + y: + min: 32 + max: 64 + KELP_SHORT: + weight: 1 + y: + min: 32 + max: 64 + KELP_MEDIUM: + weight: 1 + y: + min: 32 + max: 64 + KELP_TALL: + weight: 1 + y: + min: 32 + max: 64 diff --git a/src/main/resources/default-config/biomes/river.yml b/src/main/resources/default-config/biomes/river.yml index dfcad8c44..c61652f1c 100644 --- a/src/main/resources/default-config/biomes/river.yml +++ b/src/main/resources/default-config/biomes/river.yml @@ -1,4 +1,4 @@ -noise-equation: "((-((y / 58)^2)) + 1) + ((noise2(x, z)/2.5))" +noise-equation: "((-((y / 58)^2)) + 1) + ((noise2(x, z)/4))" extends: "BASIC_ORES" id: "RIVER" name: "River" diff --git a/src/main/resources/default-config/grids/ocean_deep.yml b/src/main/resources/default-config/grids/ocean_deep.yml new file mode 100644 index 000000000..21f8e9ee6 --- /dev/null +++ b/src/main/resources/default-config/grids/ocean_deep.yml @@ -0,0 +1,13 @@ +grid: + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] + - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] +id: OCEAN_DEEP \ No newline at end of file diff --git a/src/main/resources/default-config/grids/ocean_shelf.yml b/src/main/resources/default-config/grids/ocean_shelf.yml new file mode 100644 index 000000000..7edf19f28 --- /dev/null +++ b/src/main/resources/default-config/grids/ocean_shelf.yml @@ -0,0 +1,13 @@ +grid: + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] + - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] +id: OCEAN_SHELF \ No newline at end of file diff --git a/src/main/resources/default-config/pack.yml b/src/main/resources/default-config/pack.yml index 6f27044a9..05d9fcd46 100644 --- a/src/main/resources/default-config/pack.yml +++ b/src/main/resources/default-config/pack.yml @@ -1,13 +1,13 @@ id: DEFAULT grids: - - OCEAN - - OCEAN - - OCEAN - - OCEAN - - OCEAN - - OCEAN - - OCEAN - - OCEAN + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_DEEP + - OCEAN_SHELF - OCEAN - OCEAN - OCEAN @@ -58,7 +58,9 @@ blend: amplitude: 10 erode: enable: true - frequency: 0.002 - threshold: 0.001 - octaves: 4 + frequency: 0.005 + threshold: 0.1 grid: "BIOME:RIVER" +noise: + octaves: 5 + frequency: 0.0075 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/arid.yml b/src/main/resources/default-config/palettes/mountains/arid.yml index 107f54796..93bc8bda5 100644 --- a/src/main/resources/default-config/palettes/mountains/arid.yml +++ b/src/main/resources/default-config/palettes/mountains/arid.yml @@ -25,5 +25,5 @@ layers: layers: 1 id: ARID simplex: true -frequency: 0.04 +frequency: 0.05 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/grass.yml b/src/main/resources/default-config/palettes/mountains/grass.yml index 79faa4bbf..5ef0bfbf8 100644 --- a/src/main/resources/default-config/palettes/mountains/grass.yml +++ b/src/main/resources/default-config/palettes/mountains/grass.yml @@ -14,5 +14,5 @@ layers: layers: 1 id: MOUNTAIN_GRASS simplex: true -frequency: 0.05 +frequency: 0.075 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml b/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml index eff946ee7..1cd4d169a 100644 --- a/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml +++ b/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml @@ -19,7 +19,6 @@ layers: - "minecraft:stone": 1 layers: 1 id: MOUNTAIN_PRETTY -name: "Sandy Palette" simplex: true -frequency: 0.02 +frequency: 0.03 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/stone.yml b/src/main/resources/default-config/palettes/mountains/stone.yml index 7e4bdccca..914a5b407 100644 --- a/src/main/resources/default-config/palettes/mountains/stone.yml +++ b/src/main/resources/default-config/palettes/mountains/stone.yml @@ -10,5 +10,5 @@ layers: layers: 1 id: MOUNTAIN_STONE simplex: true -frequency: 0.05 +frequency: 0.075 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/stone_grass.yml b/src/main/resources/default-config/palettes/mountains/stone_grass.yml index daa990875..099b6fa71 100644 --- a/src/main/resources/default-config/palettes/mountains/stone_grass.yml +++ b/src/main/resources/default-config/palettes/mountains/stone_grass.yml @@ -18,5 +18,5 @@ layers: layers: 1 id: MOUNTAIN_STONE_GRASS simplex: true -frequency: 0.05 +frequency: 0.075 seed: 3 \ No newline at end of file