diff --git a/biomes/mesa-yellow.json b/biomes/mesa-yellow.json index e719e208..1b3505fc 100644 --- a/biomes/mesa-yellow.json +++ b/biomes/mesa-yellow.json @@ -1,48 +1,9 @@ { - "decorators": [ - { - "chance": 0.009, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "stone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "stone_button" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } + "name": "Mesa Yellow", + "derivative": "SHATTERED_SAVANNA", + "vanillaDerivative": "BADLANDS", + "children": [ + "mesa-dark" ], "jigsawStructures": [ { @@ -50,45 +11,18 @@ "structure": "pillager" } ], - "entityInitialSpawns": [ + "generators": [ { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 + "min": 9, + "max": 16, + "generator": "plain-cliffs" }, { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 + "min": 11, + "max": 33, + "generator": "mountain" } ], - "children": [ - "mesa-dark" - ], - "objects": [ - - { - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "chance": 0.1, - "translate": { - "y": -2 - }, - "place": [ - "misc/tntower-1" - ] - } - ], - "name": "Yellow Mesa", "layers": [ { "minHeight": 1, @@ -187,20 +121,85 @@ ] } ], - "generators": [ + "decorators": [ { - "min": 9, - "max": 16, - "generator": "plain-cliffs" + "chance": 0.009, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "data": { + "face": "floor", + "powered": false, + "facing": "east" + }, + "block": "stone_button" + }, + { + "data": { + "face": "floor", + "powered": false, + "facing": "south" + }, + "block": "stone_button" + } + ], + "style": { + "style": "STATIC" + } }, { - "min": 11, - "max": 33, - "generator": "mountain" + "chance": 0.01, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "dead_bush" + } + ], + "style": { + "style": "STATIC" + } + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], + "objects": [ + { + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "chance": 0.1, + "translate": { + "y": -2 + }, + "place": [ + "misc/tntower-1" + ] } ], - "vanillaDerivative": "BADLANDS", - "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { "style": { diff --git a/biomes/mesa.json b/biomes/mesa.json index d6ad9583..f248f940 100644 --- a/biomes/mesa.json +++ b/biomes/mesa.json @@ -1,5 +1,5 @@ { - "name": "Mesa Cliffs", + "name": "Mesa", "derivative": "BADLANDS", "vanillaDerivative": "BADLANDS", "biomeScatter": [ @@ -17,18 +17,6 @@ "mesa-yellow", "mesa-blue" ], - "childStyle": { - "style": "GLOB", - "zoom": 1.2, - "exponent": 1.3, - "fracture": { - "style": "CELLULAR", - "zoom": 0.05, - "multiplier": 2 - } - }, - "childShrinkFactor": 1.0, - "generators": [ { "min": 25, @@ -168,6 +156,17 @@ ] } ], + "childStyle": { + "style": "GLOB", + "zoom": 1.2, + "exponent": 1.3, + "fracture": { + "style": "CELLULAR", + "zoom": 0.05, + "multiplier": 2 + } + }, + "childShrinkFactor": 1.0, "decorators": [ { "chance": 0.009, diff --git a/biomes/mountain-beach.json b/biomes/mountain-beach.json index b339f503..1a638dff 100644 --- a/biomes/mountain-beach.json +++ b/biomes/mountain-beach.json @@ -1,5 +1,37 @@ { + "name": "Mountain Beach", + "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", + "generators": [ + { + "min": 0, + "max": 2, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 6, + "palette": [ + { + "block": "stone" + } + ] + } + ], "objects": [ { "mode": "PAINT", @@ -36,41 +68,9 @@ } ] }, - "name": "Beach", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 6, - "palette": [ - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 0, - "max": 2, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] - }, - "derivative": "TAIGA_MOUNTAINS" + } } \ No newline at end of file diff --git a/biomes/mountain-cliffs.json b/biomes/mountain-cliffs.json index dfe43c19..1a3e039d 100644 --- a/biomes/mountain-cliffs.json +++ b/biomes/mountain-cliffs.json @@ -1,6 +1,24 @@ { + "name": "Mountain Cliffs", "vanillaDerivative": "TAIGA_MOUNTAINS", - "name": "Extreme mountains cliffs", + "derivative": "TAIGA_MOUNTAINS", + "generators": [ + { + "min": 11, + "max": 32, + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" + }, + { + "min": 12, + "max": 62, + "generator": "cracked-cliffs" + } + ], "layers": [ { "minHeight": 1, @@ -49,24 +67,6 @@ ] } ], - "generators": [ - { - "min": 11, - "max": 32, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" - }, - { - "min": 12, - "max": 62, - "generator": "cracked-cliffs" - } - ], - "derivative": "TAIGA_MOUNTAINS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mountain-forest-hills.json b/biomes/mountain-forest-hills.json index 5900e42e..3b4eafbf 100644 --- a/biomes/mountain-forest-hills.json +++ b/biomes/mountain-forest-hills.json @@ -2,26 +2,6 @@ "name": "Mountain Forest Hills", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", - "entityInitialSpawns": [ - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - } - ], "generators": [ { "generator": "plain", @@ -108,6 +88,26 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "palette": [ { diff --git a/biomes/mountain-forest.json b/biomes/mountain-forest.json index a0873757..62c052d3 100644 --- a/biomes/mountain-forest.json +++ b/biomes/mountain-forest.json @@ -1,27 +1,7 @@ { - "name": "Mountain Forest Hills", + "name": "Mountain Forest", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", - "entityInitialSpawns": [ - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 7 - } - ], "generators": [ { "generator": "plain", @@ -108,6 +88,26 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "palette": [ { diff --git a/biomes/mountain-hills.json b/biomes/mountain-hills.json index 13d75bec..9a29b993 100644 --- a/biomes/mountain-hills.json +++ b/biomes/mountain-hills.json @@ -5,10 +5,6 @@ "children": [ "mountain-forest" ], - "childStyle": { - "style": "IRIS_DOUBLE", - "zoom": 10 - }, "generators": [ { "generator": "smooth-dunes", @@ -100,6 +96,10 @@ ] } ], + "childStyle": { + "style": "IRIS_DOUBLE", + "zoom": 10 + }, "wall": { "palette": [ { diff --git a/biomes/mountain-lake.json b/biomes/mountain-lake.json index 0d26bc69..dad5c5d6 100644 --- a/biomes/mountain-lake.json +++ b/biomes/mountain-lake.json @@ -1,5 +1,5 @@ { - "name": "Mountain Plains", + "name": "Mountain Lake", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ diff --git a/biomes/mountain-main.json b/biomes/mountain-main.json index 8d1c44b0..9ae2685d 100644 --- a/biomes/mountain-main.json +++ b/biomes/mountain-main.json @@ -1,21 +1,10 @@ { - "name": "Extreme mountains", + "name": "Mountain Main", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", - "biomeZoom": 30, - "biomeStyle": { - "style": "IRIS", - "zoom": 0.7, - "exponent": 4 - }, "children": [ "mountain-middle" ], - "biomeScatter": [ - "PLAINS", - "FOREST" - ], - "rarity": 7, "generators": [ { "min": 70, @@ -91,6 +80,16 @@ ] } ], + "biomeZoom": 30, + "biomeScatter": [ + "PLAINS", + "FOREST" + ], + "biomeStyle": { + "style": "IRIS", + "zoom": 0.7, + "exponent": 4 + }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mountain-middle.json b/biomes/mountain-middle.json index 723ba6bf..cad4e60e 100644 --- a/biomes/mountain-middle.json +++ b/biomes/mountain-middle.json @@ -1,24 +1,10 @@ { - "name": "Middle Mountain", + "name": "Mountain Middle", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "children": [ "mountain-cliffs" ], - "childStyle": { - "style": "STATIC", - "exponent": 0.625, - "zoom": 1, - "fracture": { - "style": "VIGOCTAVE_SIMPLEX", - "multiplier": 4, - "zoom": 0.9 - } - }, - "biomeStyle": { - "style": "SIMPLEX" - }, - "biomeZoom": 0.4, "generators": [ { "generator": "mountain", @@ -105,6 +91,20 @@ ] } ], + "childStyle": { + "style": "STATIC", + "exponent": 0.625, + "zoom": 1, + "fracture": { + "style": "VIGOCTAVE_SIMPLEX", + "multiplier": 4, + "zoom": 0.9 + } + }, + "biomeStyle": { + "style": "SIMPLEX" + }, + "biomeZoom": 0.4, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mountain-plain-hills.json b/biomes/mountain-plain-hills.json index 32d10158..733ad713 100644 --- a/biomes/mountain-plain-hills.json +++ b/biomes/mountain-plain-hills.json @@ -1,8 +1,7 @@ { - "name": "Plains Hills", + "name": "Mountain Plains Hills", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", - "rarity": 3, "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index f083ca44..0b90a1db 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -9,10 +9,16 @@ "mountain-lake", "mountain-forest-hills" ], - "childStyle": { - "style": "IRIS_DOUBLE", - "zoom": 10 - }, + "jigsawStructures": [ + { + "rarity": 2000, + "structure": "pillager" + }, + { + "rarity": 950, + "structure": "village-tundra" + } + ], "generators": [ { "generator": "plain", @@ -25,16 +31,6 @@ "min": 7 } ], - "jigsawStructures": [ - { - "rarity": 2000, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], "layers": [ { "minHeight": 1, @@ -109,6 +105,10 @@ ] } ], + "childStyle": { + "style": "IRIS_DOUBLE", + "zoom": 10 + }, "wall": { "palette": [ { diff --git a/biomes/mountain-river-soft.json b/biomes/mountain-river-soft.json index 91c5debd..3b646e6a 100644 --- a/biomes/mountain-river-soft.json +++ b/biomes/mountain-river-soft.json @@ -1,5 +1,52 @@ { + "name": "Mountain River Soft", + "derivative": "RIVER", "vanillaDerivative": "RIVER", + "generators": [ + { + "generator": "river", + "max": -32, + "min": -40 + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "IRIS_DOUBLE", + "fracture": { + "style": "STATIC", + "multiplier": 30 + } + }, + "zoom": 0.7, + "palette": [ + { + "block": "cobblestone", + "weight": 3 + }, + { + "block": "clay", + "weight": 1 + }, + { + "block": "gravel", + "weight": 8 + } + ] + }, + { + "palette": [ + { + "block": "cobblestone" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.07, @@ -66,56 +113,9 @@ } } ], - "name": "Soft River", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "IRIS_DOUBLE", - "fracture": { - "style": "STATIC", - "multiplier": 30 - } - }, - "zoom": 0.7, - "palette": [ - { - "block": "cobblestone", - "weight": 3 - }, - { - "block": "clay", - "weight": 1 - }, - { - "block": "gravel", - "weight": 8 - } - ] - }, - { - "palette": [ - { - "block": "cobblestone" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "generator": "river", - "max": -32, - "min": -40 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "RIVER" + } } \ No newline at end of file diff --git a/biomes/mountain-river.json b/biomes/mountain-river.json index 99cad073..ee2a5e8e 100644 --- a/biomes/mountain-river.json +++ b/biomes/mountain-river.json @@ -1,5 +1,52 @@ { + "name": "Mountain River", + "derivative": "RIVER", "vanillaDerivative": "RIVER", + "generators": [ + { + "generator": "river", + "max": -7, + "min": -20 + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "IRIS_DOUBLE", + "fracture": { + "style": "STATIC", + "multiplier": 30 + } + }, + "zoom": 0.7, + "palette": [ + { + "block": "cobblestone", + "weight": 3 + }, + { + "block": "clay", + "weight": 1 + }, + { + "block": "gravel", + "weight": 8 + } + ] + }, + { + "palette": [ + { + "block": "cobblestone" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.07, @@ -66,56 +113,9 @@ } } ], - "name": "River", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "IRIS_DOUBLE", - "fracture": { - "style": "STATIC", - "multiplier": 30 - } - }, - "zoom": 0.7, - "palette": [ - { - "block": "cobblestone", - "weight": 3 - }, - { - "block": "clay", - "weight": 1 - }, - { - "block": "gravel", - "weight": 8 - } - ] - }, - { - "palette": [ - { - "block": "cobblestone" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "generator": "river", - "max": -7, - "min": -20 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "RIVER" + } } \ No newline at end of file diff --git a/biomes/mountain.json b/biomes/mountain.json index 72ae5478..0ed56a68 100644 --- a/biomes/mountain.json +++ b/biomes/mountain.json @@ -1,17 +1,10 @@ { - "name": "Extreme mountains", + "name": "Mountain", "derivative": "MOUNTAIN_EDGE", "vanillaDerivative": "MOUNTAIN_EDGE", - "biomeZoom": 30, - "biomeStyle": { - "style": "IRIS", - "zoom": 0.7, - "exponent": 4 - }, "children": [ "mountain-middle" ], - "rarity": 7, "generators": [ { "min": 70,