diff --git a/biomes/frozen-beach.json b/biomes/frozen/frozen-beach.json similarity index 100% rename from biomes/frozen-beach.json rename to biomes/frozen/frozen-beach.json diff --git a/biomes/frozen-hills.json b/biomes/frozen/frozen-hills.json similarity index 100% rename from biomes/frozen-hills.json rename to biomes/frozen/frozen-hills.json diff --git a/biomes/frozen-ice-cavern.json b/biomes/frozen/frozen-ice-cavern.json similarity index 100% rename from biomes/frozen-ice-cavern.json rename to biomes/frozen/frozen-ice-cavern.json diff --git a/biomes/frozen-mountain-cliffs.json b/biomes/frozen/frozen-mountain-cliffs.json similarity index 98% rename from biomes/frozen-mountain-cliffs.json rename to biomes/frozen/frozen-mountain-cliffs.json index 1c6f36e8..dddf208b 100644 --- a/biomes/frozen-mountain-cliffs.json +++ b/biomes/frozen/frozen-mountain-cliffs.json @@ -2,11 +2,6 @@ "name": "Frozen Mountain Cliffs", "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" - ], "layers": [ { "minHeight": 2, @@ -245,7 +240,6 @@ "rarity": 6 } ], - "childShrinkFactor": 20, "wall": { "style": { "style": "IRIS" diff --git a/biomes/frozen-mountain-middle.json b/biomes/frozen/frozen-mountain-middle.json similarity index 98% rename from biomes/frozen-mountain-middle.json rename to biomes/frozen/frozen-mountain-middle.json index ae61cace..6993ef92 100644 --- a/biomes/frozen-mountain-middle.json +++ b/biomes/frozen/frozen-mountain-middle.json @@ -3,7 +3,7 @@ "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-mountain-cliffs" + "frozen/frozen-mountain-cliffs" ], "generators": [ { diff --git a/biomes/frozen-mountain.json b/biomes/frozen/frozen-mountain.json similarity index 94% rename from biomes/frozen-mountain.json rename to biomes/frozen/frozen-mountain.json index c399f5a5..380e5ac4 100644 --- a/biomes/frozen-mountain.json +++ b/biomes/frozen/frozen-mountain.json @@ -3,9 +3,9 @@ "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-mountain-middle", - "frozen-peak", - "frozen-mountain-cliffs" + "frozen/frozen-mountain-middle", + "frozen/frozen-peak", + "frozen/frozen-mountain-cliffs" ], "layers": [ { diff --git a/biomes/frozen-mountains.json b/biomes/frozen/frozen-mountains.json similarity index 98% rename from biomes/frozen-mountains.json rename to biomes/frozen/frozen-mountains.json index 1c0ea1c1..ae1102bf 100644 --- a/biomes/frozen-mountains.json +++ b/biomes/frozen/frozen-mountains.json @@ -3,9 +3,7 @@ "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" + "frozen/frozen-peak" ], "layers": [ { @@ -232,7 +230,7 @@ ] } ], - "childShrinkFactor": 20, + "childShrinkFactor": 25, "wall": { "style": { "style": "STATIC" diff --git a/biomes/frozen-ocean.json b/biomes/frozen/frozen-ocean.json similarity index 100% rename from biomes/frozen-ocean.json rename to biomes/frozen/frozen-ocean.json diff --git a/biomes/frozen-peak.json b/biomes/frozen/frozen-peak.json similarity index 100% rename from biomes/frozen-peak.json rename to biomes/frozen/frozen-peak.json diff --git a/biomes/frozen-pine-hills.json b/biomes/frozen/frozen-pine-hills.json similarity index 100% rename from biomes/frozen-pine-hills.json rename to biomes/frozen/frozen-pine-hills.json diff --git a/biomes/frozen-pine-plains.json b/biomes/frozen/frozen-pine-plains.json similarity index 98% rename from biomes/frozen-pine-plains.json rename to biomes/frozen/frozen-pine-plains.json index f90c47d3..8c112396 100644 --- a/biomes/frozen-pine-plains.json +++ b/biomes/frozen/frozen-pine-plains.json @@ -3,7 +3,7 @@ "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-pine-hills" + "frozen/frozen-pine-hills" ], "generators": [ { diff --git a/biomes/frozen-pines.json b/biomes/frozen/frozen-pines.json similarity index 99% rename from biomes/frozen-pines.json rename to biomes/frozen/frozen-pines.json index 0fad4545..54aeddd5 100644 --- a/biomes/frozen-pines.json +++ b/biomes/frozen/frozen-pines.json @@ -3,7 +3,7 @@ "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-vander" + "frozen/frozen-vander" ], "layers": [ { diff --git a/biomes/frozen-plains.json b/biomes/frozen/frozen-plains.json similarity index 99% rename from biomes/frozen-plains.json rename to biomes/frozen/frozen-plains.json index 5a503e59..0d8b5e8d 100644 --- a/biomes/frozen-plains.json +++ b/biomes/frozen/frozen-plains.json @@ -3,7 +3,7 @@ "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-hills" + "frozen/frozen-hills" ], "generators": [ { diff --git a/biomes/frozen-redwood-forest.json b/biomes/frozen/frozen-redwood-forest.json similarity index 100% rename from biomes/frozen-redwood-forest.json rename to biomes/frozen/frozen-redwood-forest.json diff --git a/biomes/frozen-river.json b/biomes/frozen/frozen-river.json similarity index 100% rename from biomes/frozen-river.json rename to biomes/frozen/frozen-river.json diff --git a/biomes/frozen-spruce-hills.json b/biomes/frozen/frozen-spruce-hills.json similarity index 100% rename from biomes/frozen-spruce-hills.json rename to biomes/frozen/frozen-spruce-hills.json diff --git a/biomes/frozen-spruce-plains.json b/biomes/frozen/frozen-spruce-plains.json similarity index 98% rename from biomes/frozen-spruce-plains.json rename to biomes/frozen/frozen-spruce-plains.json index 069cd0ae..be173abe 100644 --- a/biomes/frozen-spruce-plains.json +++ b/biomes/frozen/frozen-spruce-plains.json @@ -3,7 +3,7 @@ "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ - "frozen-spruce-hills" + "frozen/frozen-spruce-hills" ], "layers": [ { diff --git a/biomes/frozen-vander.json b/biomes/frozen/frozen-vander.json similarity index 98% rename from biomes/frozen-vander.json rename to biomes/frozen/frozen-vander.json index e9849495..74bad61c 100644 --- a/biomes/frozen-vander.json +++ b/biomes/frozen/frozen-vander.json @@ -7,10 +7,10 @@ "SNOWY_MOUNTAINS" ], "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-mountains", - "frozen-mountains" + "frozen/frozen-peak", + "frozen/frozen-mountains", + "frozen/frozen-mountains", + "frozen/frozen-mountains" ], "layers": [ { diff --git a/biomes/hot-beach-grass.json b/biomes/hot/hot-beach-grass.json similarity index 99% rename from biomes/hot-beach-grass.json rename to biomes/hot/hot-beach-grass.json index 41fbd6ef..f5ac811c 100644 --- a/biomes/hot-beach-grass.json +++ b/biomes/hot/hot-beach-grass.json @@ -3,7 +3,7 @@ "derivative": "FOREST", "vanillaDerivative": "DESERT_LAKES", "children": [ - "ocean" + "ocean/ocean" ], "layers": [ { diff --git a/biomes/hot-beach.json b/biomes/hot/hot-beach.json similarity index 99% rename from biomes/hot-beach.json rename to biomes/hot/hot-beach.json index 6f91ea0b..038c7ccb 100644 --- a/biomes/hot-beach.json +++ b/biomes/hot/hot-beach.json @@ -3,7 +3,7 @@ "derivative": "WARM_OCEAN", "vanillaDerivative": "DESERT_LAKES", "children": [ - "ocean" + "ocean/ocean" ], "layers": [ { diff --git a/biomes/hot-desert-dunes-red.json b/biomes/hot/hot-desert-dunes-red.json similarity index 100% rename from biomes/hot-desert-dunes-red.json rename to biomes/hot/hot-desert-dunes-red.json diff --git a/biomes/hot-desert-dunes.json b/biomes/hot/hot-desert-dunes.json similarity index 100% rename from biomes/hot-desert-dunes.json rename to biomes/hot/hot-desert-dunes.json diff --git a/biomes/hot-desert-red.json b/biomes/hot/hot-desert-red.json similarity index 100% rename from biomes/hot-desert-red.json rename to biomes/hot/hot-desert-red.json diff --git a/biomes/hot-desert.json b/biomes/hot/hot-desert.json similarity index 99% rename from biomes/hot-desert.json rename to biomes/hot/hot-desert.json index f21c237a..678a24e8 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot/hot-desert.json @@ -3,7 +3,7 @@ "derivative": "DESERT", "vanillaDerivative": "DESERT", "children": [ - "hot-oasis" + "hot/hot-oasis" ], "generators": [ { diff --git a/biomes/hot-mountain-cliffs.json b/biomes/hot/hot-mountain-cliffs.json similarity index 100% rename from biomes/hot-mountain-cliffs.json rename to biomes/hot/hot-mountain-cliffs.json diff --git a/biomes/hot-mountain-middle.json b/biomes/hot/hot-mountain-middle.json similarity index 98% rename from biomes/hot-mountain-middle.json rename to biomes/hot/hot-mountain-middle.json index ad1ead5b..688d0de3 100644 --- a/biomes/hot-mountain-middle.json +++ b/biomes/hot/hot-mountain-middle.json @@ -3,7 +3,7 @@ "derivative": "DESERT", "vanillaDerivative": "DESERT", "children": [ - "hot-mountain-cliffs" + "hot/hot-mountain-cliffs" ], "generators": [ { diff --git a/biomes/hot-mountain-plains.json b/biomes/hot/hot-mountain-plains.json similarity index 100% rename from biomes/hot-mountain-plains.json rename to biomes/hot/hot-mountain-plains.json diff --git a/biomes/hot-mountain.json b/biomes/hot/hot-mountain.json similarity index 98% rename from biomes/hot-mountain.json rename to biomes/hot/hot-mountain.json index 912b0840..ec466398 100644 --- a/biomes/hot-mountain.json +++ b/biomes/hot/hot-mountain.json @@ -3,7 +3,7 @@ "derivative": "DESERT", "vanillaDerivative": "DESERT", "children": [ - "hot-mountain-middle" + "hot/hot-mountain-middle" ], "generators": [ { diff --git a/biomes/hot-oasis.json b/biomes/hot/hot-oasis.json similarity index 100% rename from biomes/hot-oasis.json rename to biomes/hot/hot-oasis.json diff --git a/biomes/hot-ocean-cliffs.json b/biomes/hot/hot-ocean-cliffs.json similarity index 100% rename from biomes/hot-ocean-cliffs.json rename to biomes/hot/hot-ocean-cliffs.json diff --git a/biomes/hot-ocean.json b/biomes/hot/hot-ocean.json similarity index 98% rename from biomes/hot-ocean.json rename to biomes/hot/hot-ocean.json index b35c413c..9fd57f63 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot/hot-ocean.json @@ -3,10 +3,10 @@ "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "children": [ - "hot-desert", - "hot-desert", - "hot-river", - "hot-ocean-cliffs" + "hot/hot-desert", + "hot/hot-desert", + "hot/hot-river", + "hot/hot-ocean-cliffs" ], "generators": [ { diff --git a/biomes/hot-river.json b/biomes/hot/hot-river.json similarity index 100% rename from biomes/hot-river.json rename to biomes/hot/hot-river.json diff --git a/biomes/hot-sandy-cave.json b/biomes/hot/hot-sandy-cave.json similarity index 100% rename from biomes/hot-sandy-cave.json rename to biomes/hot/hot-sandy-cave.json diff --git a/biomes/hot-sandy-red-cave.json b/biomes/hot/hot-sandy-red-cave.json similarity index 100% rename from biomes/hot-sandy-red-cave.json rename to biomes/hot/hot-sandy-red-cave.json diff --git a/biomes/mesa-beach.json b/biomes/mesa/mesa-beach.json similarity index 97% rename from biomes/mesa-beach.json rename to biomes/mesa/mesa-beach.json index b2a91f46..94ae4822 100644 --- a/biomes/mesa-beach.json +++ b/biomes/mesa/mesa-beach.json @@ -2,9 +2,6 @@ "name": "Mesa beach", "derivative": "DESERT_LAKES", "vanillaDerivative": "DESERT_LAKES", - "children": [ - "ocean" - ], "generators": [ { "min": 0, diff --git a/biomes/mesa-blue.json b/biomes/mesa/mesa-blue.json similarity index 100% rename from biomes/mesa-blue.json rename to biomes/mesa/mesa-blue.json diff --git a/biomes/mesa-cliffs.json b/biomes/mesa/mesa-cliffs.json similarity index 100% rename from biomes/mesa-cliffs.json rename to biomes/mesa/mesa-cliffs.json diff --git a/biomes/mesa-dark.json b/biomes/mesa/mesa-dark.json similarity index 98% rename from biomes/mesa-dark.json rename to biomes/mesa/mesa-dark.json index 49ae036a..2217400b 100644 --- a/biomes/mesa-dark.json +++ b/biomes/mesa/mesa-dark.json @@ -3,10 +3,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "mesa-cliffs", - "mesa-red", - "mesa-green", - "mesa-blue" + "mesa/mesa-cliffs", + "mesa/mesa-red", + "mesa/mesa-green", + "mesa/mesa-blue" ], "generators": [ { diff --git a/biomes/mesa-green.json b/biomes/mesa/mesa-green.json similarity index 100% rename from biomes/mesa-green.json rename to biomes/mesa/mesa-green.json diff --git a/biomes/mesa-plateau-dirt-high.json b/biomes/mesa/mesa-plateau-dirt-high.json similarity index 100% rename from biomes/mesa-plateau-dirt-high.json rename to biomes/mesa/mesa-plateau-dirt-high.json diff --git a/biomes/mesa-plateau-dirt.json b/biomes/mesa/mesa-plateau-dirt.json similarity index 100% rename from biomes/mesa-plateau-dirt.json rename to biomes/mesa/mesa-plateau-dirt.json diff --git a/biomes/mesa-plateau-high.json b/biomes/mesa/mesa-plateau-high.json similarity index 99% rename from biomes/mesa-plateau-high.json rename to biomes/mesa/mesa-plateau-high.json index 40dfc08c..1d1ede16 100644 --- a/biomes/mesa-plateau-high.json +++ b/biomes/mesa/mesa-plateau-high.json @@ -8,7 +8,7 @@ "ERODED_BADLANDS" ], "children": [ - "mesa-plateau-dirt-high" + "mesa/mesa-plateau-dirt-high" ], "generators": [ { diff --git a/biomes/mesa-plateau.json b/biomes/mesa/mesa-plateau.json similarity index 99% rename from biomes/mesa-plateau.json rename to biomes/mesa/mesa-plateau.json index 62d6634a..e4c93f60 100644 --- a/biomes/mesa-plateau.json +++ b/biomes/mesa/mesa-plateau.json @@ -8,7 +8,7 @@ "ERODED_BADLANDS" ], "children": [ - "mesa-plateau-dirt" + "mesa/mesa-plateau-dirt" ], "generators": [ { diff --git a/biomes/mesa-red.json b/biomes/mesa/mesa-red.json similarity index 100% rename from biomes/mesa-red.json rename to biomes/mesa/mesa-red.json diff --git a/biomes/mesa-river.json b/biomes/mesa/mesa-river.json similarity index 100% rename from biomes/mesa-river.json rename to biomes/mesa/mesa-river.json diff --git a/biomes/mesa-valleys.json b/biomes/mesa/mesa-valleys.json similarity index 99% rename from biomes/mesa-valleys.json rename to biomes/mesa/mesa-valleys.json index 48864979..840e0549 100644 --- a/biomes/mesa-valleys.json +++ b/biomes/mesa/mesa-valleys.json @@ -15,7 +15,6 @@ "generator": "smooth-dunes" } ], - "layers": [ { "minHeight": 1, diff --git a/biomes/mesa-yellow.json b/biomes/mesa/mesa-yellow.json similarity index 98% rename from biomes/mesa-yellow.json rename to biomes/mesa/mesa-yellow.json index e719e208..7a894837 100644 --- a/biomes/mesa-yellow.json +++ b/biomes/mesa/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/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/mesa.json similarity index 95% rename from biomes/mesa.json rename to biomes/mesa/mesa.json index d6ad9583..5d53448d 100644 --- a/biomes/mesa.json +++ b/biomes/mesa/mesa.json @@ -1,5 +1,5 @@ { - "name": "Mesa Cliffs", + "name": "Mesa", "derivative": "BADLANDS", "vanillaDerivative": "BADLANDS", "biomeScatter": [ @@ -8,27 +8,15 @@ "ERODED_BADLANDS" ], "children": [ - "mesa-valleys", - "mesa-red", - "mesa-blue", - "mesa-dark", - "mesa-green", - "mesa-red", - "mesa-yellow", - "mesa-blue" + "mesa/mesa-valleys", + "mesa/mesa-red", + "mesa/mesa-blue", + "mesa/mesa-dark", + "mesa/mesa-green", + "mesa/mesa-red", + "mesa/mesa-yellow", + "mesa/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/mountain-beach.json similarity index 95% rename from biomes/mountain-beach.json rename to biomes/mountain/mountain-beach.json index b339f503..1a638dff 100644 --- a/biomes/mountain-beach.json +++ b/biomes/mountain/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/mountain-cliffs.json similarity index 97% rename from biomes/mountain-cliffs.json rename to biomes/mountain/mountain-cliffs.json index dfe43c19..1a3e039d 100644 --- a/biomes/mountain-cliffs.json +++ b/biomes/mountain/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/mountain-forest-hills.json similarity index 100% rename from biomes/mountain-forest-hills.json rename to biomes/mountain/mountain-forest-hills.json index 5900e42e..3b4eafbf 100644 --- a/biomes/mountain-forest-hills.json +++ b/biomes/mountain/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/mountain-forest.json similarity index 99% rename from biomes/mountain-forest.json rename to biomes/mountain/mountain-forest.json index a0873757..62c052d3 100644 --- a/biomes/mountain-forest.json +++ b/biomes/mountain/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/mountain-hills.json similarity index 99% rename from biomes/mountain-hills.json rename to biomes/mountain/mountain-hills.json index 13d75bec..fc574155 100644 --- a/biomes/mountain-hills.json +++ b/biomes/mountain/mountain-hills.json @@ -3,12 +3,8 @@ "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "children": [ - "mountain-forest" + "mountain/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/mountain-lake.json similarity index 99% rename from biomes/mountain-lake.json rename to biomes/mountain/mountain-lake.json index 0d26bc69..dad5c5d6 100644 --- a/biomes/mountain-lake.json +++ b/biomes/mountain/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/mountain-main.json similarity index 98% rename from biomes/mountain-main.json rename to biomes/mountain/mountain-main.json index 8d1c44b0..391d078f 100644 --- a/biomes/mountain-main.json +++ b/biomes/mountain/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" + "mountain/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/mountain-middle.json similarity index 98% rename from biomes/mountain-middle.json rename to biomes/mountain/mountain-middle.json index 723ba6bf..adf755d9 100644 --- a/biomes/mountain-middle.json +++ b/biomes/mountain/mountain-middle.json @@ -1,24 +1,10 @@ { - "name": "Middle Mountain", + "name": "Mountain Middle", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "children": [ - "mountain-cliffs" + "mountain/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/mountain-plain-hills.json similarity index 98% rename from biomes/mountain-plain-hills.json rename to biomes/mountain/mountain-plain-hills.json index 32d10158..733ad713 100644 --- a/biomes/mountain-plain-hills.json +++ b/biomes/mountain/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/mountain-plains.json similarity index 98% rename from biomes/mountain-plains.json rename to biomes/mountain/mountain-plains.json index f083ca44..528dcc52 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain/mountain-plains.json @@ -3,16 +3,18 @@ "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "children": [ - "mountain-forest", - "mountain-hills", - "mountain-plain-hills", - "mountain-lake", - "mountain-forest-hills" + "mountain/mountain-lake" + ], + "jigsawStructures": [ + { + "rarity": 2000, + "structure": "pillager" + }, + { + "rarity": 950, + "structure": "village-tundra" + } ], - "childStyle": { - "style": "IRIS_DOUBLE", - "zoom": 10 - }, "generators": [ { "generator": "plain", @@ -25,16 +27,6 @@ "min": 7 } ], - "jigsawStructures": [ - { - "rarity": 2000, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], "layers": [ { "minHeight": 1, @@ -109,6 +101,10 @@ ] } ], + "childStyle": { + "style": "IRIS_DOUBLE", + "zoom": 10 + }, "wall": { "palette": [ { diff --git a/biomes/mountain-river-soft.json b/biomes/mountain/mountain-river-soft.json similarity index 97% rename from biomes/mountain-river-soft.json rename to biomes/mountain/mountain-river-soft.json index 91c5debd..3b646e6a 100644 --- a/biomes/mountain-river-soft.json +++ b/biomes/mountain/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/mountain-river.json similarity index 97% rename from biomes/mountain-river.json rename to biomes/mountain/mountain-river.json index 99cad073..ee2a5e8e 100644 --- a/biomes/mountain-river.json +++ b/biomes/mountain/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/mountain.json similarity index 96% rename from biomes/mountain.json rename to biomes/mountain/mountain.json index 72ae5478..7a466f45 100644 --- a/biomes/mountain.json +++ b/biomes/mountain/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" + "mountain/mountain-middle" ], - "rarity": 7, "generators": [ { "min": 70, diff --git a/biomes/mountains-plains.json b/biomes/mountains-plains.json deleted file mode 100644 index 8b6fd5db..00000000 --- a/biomes/mountains-plains.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "name": "Plains", - "derivative": "PLAINS", - "vanillaDerivative": "PLAINS", - "biomeScatter": [ - "PLAINS", - "FOREST" - ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "structure": "village-temperate", - "rarity": 350 - } - ], - "generators": [ - { - "generator": "smooth-dunes", - "max": 5, - "min": 4 - } - ], - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], - "wall": { - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - } - ] - }, - "decorators": [ - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.3, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10, - "fracture": { - "style": "STATIC", - "multiplier": 15 - } - } - }, - "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.3, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - { - "block": "dandelion" - }, - { - "block": "poppy" - }, - { - "block": "blue_orchid" - }, - { - "block": "allium" - }, - { - "block": "azure_bluet" - }, - { - "block": "red_tulip" - }, - { - "block": "orange_tulip" - }, - { - "block": "white_tulip" - }, - { - "block": "pink_tulip" - }, - { - "block": "oxeye_daisy" - }, - { - "block": "cornflower" - }, - { - "block": "lily_of_the_valley" - } - ] - }, - { - "chance": 0.01, - "palette": [ - { - "block": "tall_grass" - } - ] - }, - { - "chance": 0.5, - "palette": [ - { - "block": "grass" - } - ] - } - ], - "objects": [ - - { - "place": [ - "tree/oak/1", - "tree/oak/2", - "tree/oak/3", - "tree/oak/4", - "tree/oak/5", - "tree/oak/6" - ], - "chance": 0.07, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - }, - { - "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" - ], - "chance": 0.02, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - } - ] -} diff --git a/biomes/mushroom-beach.json b/biomes/mushroom/mushroom-beach.json similarity index 99% rename from biomes/mushroom-beach.json rename to biomes/mushroom/mushroom-beach.json index 49426140..0038eaa5 100644 --- a/biomes/mushroom-beach.json +++ b/biomes/mushroom/mushroom-beach.json @@ -1,6 +1,14 @@ { - "vanillaDerivative": "MUSHROOM_FIELD_SHORE", "name": "Mushroom Beach", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELD_SHORE", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], "layers": [ { "minHeight": 3, @@ -25,7 +33,6 @@ } ], "objects": [ - { "name": "standard-surface-portals", "chance": 0.00505, @@ -110,15 +117,6 @@ "carvingSupport": "SURFACE_ONLY" } ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-crimson-forest.json b/biomes/mushroom/mushroom-crimson-forest.json similarity index 99% rename from biomes/mushroom-crimson-forest.json rename to biomes/mushroom/mushroom-crimson-forest.json index bd436489..4f4a9007 100644 --- a/biomes/mushroom-crimson-forest.json +++ b/biomes/mushroom/mushroom-crimson-forest.json @@ -1,5 +1,57 @@ { + "name": "Crimson Mushroom Swamp", + "derivative": "CRIMSON_FOREST", "vanillaDerivative": "MUSHROOM_FIELDS", + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "crimson_nylium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 4, + "max": 39, + "generator": "plain-cliffs" + } + ], "decorators": [ { "chance": 0.009, @@ -418,58 +470,6 @@ } } ], - "name": "Crimson Mushroom Swamp", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "crimson_nylium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 39, - "generator": "plain-cliffs" - } - ], - "derivative": "CRIMSON_FOREST", "wall": { "style": { "style": "STATIC" @@ -480,7 +480,6 @@ } ] }, - "rarity": 19, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-forest-hills.json b/biomes/mushroom/mushroom-forest-hills.json similarity index 99% rename from biomes/mushroom-forest-hills.json rename to biomes/mushroom/mushroom-forest-hills.json index 1cb202b7..246773da 100644 --- a/biomes/mushroom-forest-hills.json +++ b/biomes/mushroom/mushroom-forest-hills.json @@ -1,5 +1,111 @@ { + "name": "Mushroom Forest Hills", + "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", + "generators": [ + { + "min": 12, + "max": 46, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "red_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "brown_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 4, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 3, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "volume": 6.2, @@ -337,112 +443,6 @@ } } ], - "name": "Mushroom Forest", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "red_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "brown_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 4, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 3, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 12, - "max": 46, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-forest.json b/biomes/mushroom/mushroom-forest.json similarity index 99% rename from biomes/mushroom-forest.json rename to biomes/mushroom/mushroom-forest.json index 4af83fc3..52099411 100644 --- a/biomes/mushroom-forest.json +++ b/biomes/mushroom/mushroom-forest.json @@ -1,15 +1,9 @@ { + "name": "Mushroom Forest", + "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", - "effects": [ - { - "volume": 6.2, - "minPitch": 0.2, - "chance": 8, - "maxPitch": 0.3, - "sound": "AMBIENT_WARPED_FOREST_ADDITIONS", - "interval": 6000, - "soundDistance": 3 - } + "children": [ + "mushroom/mushroom-forest-hills" ], "jigsawStructures": [ { @@ -25,6 +19,121 @@ "rarity": 1000 } ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "red_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "brown_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 4, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 3, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 6, + "max": 24, + "generator": "plain" + } + ], + "effects": [ + { + "volume": 6.2, + "minPitch": 0.2, + "chance": 8, + "maxPitch": 0.3, + "sound": "AMBIENT_WARPED_FOREST_ADDITIONS", + "interval": 6000, + "soundDistance": 3 + } + ], "entityInitialSpawns": [ { "maxSpawns": 5, @@ -33,9 +142,6 @@ "rarity": 5 } ], - "children": [ - "mushroom-forest-hills" - ], "decorators": [ { "chance": 0.009, @@ -438,112 +544,6 @@ } } ], - "name": "Mushroom Forest", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "red_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "brown_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 4, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 3, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 24, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-lake.json b/biomes/mushroom/mushroom-lake.json similarity index 99% rename from biomes/mushroom-lake.json rename to biomes/mushroom/mushroom-lake.json index 802bce1e..d897f943 100644 --- a/biomes/mushroom-lake.json +++ b/biomes/mushroom/mushroom-lake.json @@ -1,4 +1,7 @@ { + "name": "Mushroom Lake", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELDS", "effects": [ { "volume": 6.2, @@ -10,6 +13,64 @@ "soundDistance": 3 } ], + "layers": [ + { + "zoom": 0.3, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 7, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 9, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": -30, + "max": -10, + "generator": "river" + } + ], "entityInitialSpawns": [ { "maxSpawns": 5, @@ -18,7 +79,6 @@ "rarity": 5 } ], - "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.005, @@ -212,66 +272,6 @@ } } ], - "name": "Mushroom Plains", - "layers": [ - { - "zoom": 0.3, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 7, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 9, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": -30, - "max": -10, - "generator": "river" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-ocean.json b/biomes/mushroom/mushroom-ocean.json similarity index 100% rename from biomes/mushroom-ocean.json rename to biomes/mushroom/mushroom-ocean.json index 15dbb815..2b1d9c43 100644 --- a/biomes/mushroom-ocean.json +++ b/biomes/mushroom/mushroom-ocean.json @@ -1,4 +1,61 @@ { + "name": "Mushroom Ocean", + "derivative": "OCEAN", + "vanillaDerivative": "OCEAN", + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.825, + "palette": [ + { + "block": "clay" + }, + { + "block": "stone" + }, + { + "block": "cobblestone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], + "generators": [ + { + "min": -51, + "max": -39, + "generator": "ocean" + } + ], "decorators": [ { "chance": 0.06, @@ -212,68 +269,11 @@ } } ], - "vanillaDerivative": "OCEAN", - "name": "Mushroom Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.825, - "palette": [ - { - "block": "clay" - }, - { - "block": "stone" - }, - { - "block": "cobblestone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -51, - "max": -39, - "generator": "ocean" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "OCEAN", "wall": { "style": { "style": "IRIS" diff --git a/biomes/mushroom-plains.json b/biomes/mushroom/mushroom-plains.json similarity index 100% rename from biomes/mushroom-plains.json rename to biomes/mushroom/mushroom-plains.json index 6ea94e4a..c3a84e42 100644 --- a/biomes/mushroom-plains.json +++ b/biomes/mushroom/mushroom-plains.json @@ -1,4 +1,62 @@ { + "name": "Mushroom Plains", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELDS", + "layers": [ + { + "zoom": 0.3, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 7, + "block": "mycelium" + }, + { + "weight": 9, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 6, + "max": 14, + "generator": "plain" + } + ], "effects": [ { "volume": 6.2, @@ -18,7 +76,6 @@ "rarity": 5 } ], - "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.005, @@ -212,63 +269,6 @@ } } ], - "name": "Mushroom Plains", - "layers": [ - { - "zoom": 0.3, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 7, - "block": "mycelium" - }, - { - "weight": 9, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 14, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-warped-forest.json b/biomes/mushroom/mushroom-warped-forest.json similarity index 99% rename from biomes/mushroom-warped-forest.json rename to biomes/mushroom/mushroom-warped-forest.json index e8bf5631..c4678aa3 100644 --- a/biomes/mushroom-warped-forest.json +++ b/biomes/mushroom/mushroom-warped-forest.json @@ -1,5 +1,51 @@ { + "name": "Mushroom Warped Forest", + "derivative": "WARPED_FOREST", "vanillaDerivative": "MUSHROOM_FIELDS", + "generators": [ + { + "min": 6, + "max": 39, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "warped_nylium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 45, + "maxHeight": 65, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "blackstone" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -78,7 +124,6 @@ } ], "objects": [ - { "chance": 0.21, "density": 2, @@ -518,52 +563,6 @@ } } ], - "name": "Corrupted Mushroom Swamp", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "warped_nylium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 45, - "maxHeight": 65, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 39, - "generator": "plain-cliffs" - } - ], - "derivative": "WARPED_FOREST", "wall": { "style": { "style": "STATIC" @@ -574,7 +573,6 @@ } ] }, - "rarity": 19, "slab": { "style": { "style": "STATIC" diff --git a/biomes/ocean-beach.json b/biomes/ocean/ocean-beach.json similarity index 99% rename from biomes/ocean-beach.json rename to biomes/ocean/ocean-beach.json index 9ca202d4..bf113479 100644 --- a/biomes/ocean-beach.json +++ b/biomes/ocean/ocean-beach.json @@ -1,5 +1,5 @@ { - "name": "ocean land", + "name": "Ocean Beach", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "generators": [ @@ -9,6 +9,44 @@ "min": -30 } ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.2, @@ -111,44 +149,6 @@ } } ], - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], "biomeZoom": 60, "biomeStyle": { "style": "IRIS" diff --git a/biomes/ocean-deep.json b/biomes/ocean/ocean-deep.json similarity index 99% rename from biomes/ocean-deep.json rename to biomes/ocean/ocean-deep.json index 7a0ea4e8..91963891 100644 --- a/biomes/ocean-deep.json +++ b/biomes/ocean/ocean-deep.json @@ -1,5 +1,5 @@ { - "name": "Deep Ocean", + "name": "Ocean Deep", "derivative": "DEEP_OCEAN", "vanillaDerivative": "DEEP_OCEAN", "generators": [ diff --git a/biomes/ocean-warm-bottom.json b/biomes/ocean/ocean-warm-bottom.json similarity index 99% rename from biomes/ocean-warm-bottom.json rename to biomes/ocean/ocean-warm-bottom.json index 2e03e5a3..b4cc6119 100644 --- a/biomes/ocean-warm-bottom.json +++ b/biomes/ocean/ocean-warm-bottom.json @@ -1,5 +1,5 @@ { - "name": "Warm Ocean", + "name": "Ocean Warm Bottom", "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "generators": [ diff --git a/biomes/ocean-warm.json b/biomes/ocean/ocean-warm.json similarity index 99% rename from biomes/ocean-warm.json rename to biomes/ocean/ocean-warm.json index 86ce8ab8..b5cc4e23 100644 --- a/biomes/ocean-warm.json +++ b/biomes/ocean/ocean-warm.json @@ -1,16 +1,10 @@ { - "name": "Warm Ocean Top", + "name": "Ocean Warm", "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "children": [ - "ocean-warm-bottom" + "ocean/ocean-warm-bottom" ], - "childStyle": { - "style": "GLOB", - "zoom": 1, - "exponent": 1.3 - }, - "childShrinkFactor": 1.0, "generators": [ { "generator": "plain", @@ -52,6 +46,12 @@ ] } ], + "childStyle": { + "style": "GLOB", + "zoom": 1, + "exponent": 1.3 + }, + "childShrinkFactor": 1.0, "decorators": [ { "chance": 0.02, diff --git a/biomes/ocean.json b/biomes/ocean/ocean.json similarity index 100% rename from biomes/ocean.json rename to biomes/ocean/ocean.json index a21fcc17..33b1fe04 100644 --- a/biomes/ocean.json +++ b/biomes/ocean/ocean.json @@ -2,21 +2,6 @@ "name": "Ocean", "derivative": "OCEAN", "vanillaDerivative": "OCEAN", - "childStyle": { - "style": "SIMPLEX", - "zoom": 2, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "multiplier": 50, - "fracture": { - "style": "CELLULAR", - "zoom": 0.3, - "multiplier": 25 - } - } - }, - "childShrinkFactor": 1.0, "generators": [ { "generator": "mountain", @@ -71,6 +56,21 @@ ] } ], + "childStyle": { + "style": "SIMPLEX", + "zoom": 2, + "fracture": { + "style": "SIMPLEX", + "zoom": 0.8, + "multiplier": 50, + "fracture": { + "style": "CELLULAR", + "zoom": 0.3, + "multiplier": 25 + } + } + }, + "childShrinkFactor": 1.0, "decorators": [ { "chance": 0.02, diff --git a/biomes/rocky-mountain-cliffs.json b/biomes/rocky-mountain-cliffs.json deleted file mode 100644 index d3d1b17a..00000000 --- a/biomes/rocky-mountain-cliffs.json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "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" - } - } - ], - "children": [ - "rocky-mountains", - "rocky-ocean" - ], - "vanillaDerivative": "MODIFIED_GRAVELLY_MOUNTAINS", - "objects": [ - { - "chance": 0.5, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "boulder/boulder1", - "boulder/boulder2", - "boulder/boulder4", - "boulder/boulder5", - "boulder/boulder6", - "boulder/boulder7", - "boulder/boulder8" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "name": "Shattered Rock Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 11, - "max": 32, - "generator": "plain" - }, - { - "min": 12, - "max": 62, - "generator": "plain-cliffs" - } - ], - "biomeZoom": 30, - "derivative": "MOUNTAINS", - "biomeStyle": { - "style": "IRIS" - }, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "biomeScatter": [ - "PLAINS", - "TAIGA_HILLS", - "MOUNTAINS", - "SWAMP" - ], - "rarity": 19 -} \ No newline at end of file diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json deleted file mode 100644 index 0eec1754..00000000 --- a/biomes/rocky-mountains.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], - "objects": [ - { - "chance": 0.5, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "boulder/boulder1", - "boulder/boulder2", - "boulder/boulder4", - "boulder/boulder5", - "boulder/boulder6", - "boulder/boulder7", - "boulder/boulder8" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "vanillaDerivative": "GRAVELLY_MOUNTAINS", - "biomeZoom": 30, - "derivative": "MOUNTAINS", - "biomeStyle": { - "style": "IRIS" - }, - "children": [ - "rocky-mountain-cliffs" - ], - "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" - } - } - ], - "name": "Rock Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 4, - "slopeCondition": { - "minimumSlope": 3.95 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "cyan_terracotta" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 29, - "max": 63, - "generator": "plain" - } - ], - "childShrinkFactor": 8, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "biomeScatter": [ - "PLAINS", - "TAIGA_HILLS", - "MOUNTAINS", - "SWAMP" - ], - "rarity": 7 -} \ No newline at end of file diff --git a/biomes/savanna-acacia-denmyre.json b/biomes/savanna/savanna-acacia-denmyre.json similarity index 99% rename from biomes/savanna-acacia-denmyre.json rename to biomes/savanna/savanna-acacia-denmyre.json index cbec7b1a..9fa57a35 100644 --- a/biomes/savanna-acacia-denmyre.json +++ b/biomes/savanna/savanna-acacia-denmyre.json @@ -1,5 +1,60 @@ { + "name": "Savanna Acacia Denmyre", + "derivative": "DESERT", "vanillaDerivative": "SAVANNA", + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.1, @@ -158,60 +213,6 @@ } } ], - "name": "Acacia Denmyre", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], "entityInitialSpawns": [ { "entity": "cow", @@ -226,7 +227,6 @@ "rarity": 6 } ], - "derivative": "DESERT", "wall": { "style": { "style": "STATIC" @@ -242,6 +242,5 @@ "block": "stone" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/savanna-beach-grass.json b/biomes/savanna/savanna-beach.json similarity index 99% rename from biomes/savanna-beach-grass.json rename to biomes/savanna/savanna-beach.json index a9dbb28e..a07491a1 100644 --- a/biomes/savanna-beach-grass.json +++ b/biomes/savanna/savanna-beach.json @@ -1,5 +1,68 @@ { + "name": "Savanna Beach", + "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", + "generators": [ + { + "min": 0, + "max": 0, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "loot": { + "tables": [ + "forest-food" + ] + }, "entityInitialSpawns": [ { "entity": "cow", @@ -27,7 +90,6 @@ } ], "objects": [ - { "chance": 0.001, "rotation": { @@ -79,7 +141,6 @@ } ], "biomeZoom": 60, - "derivative": "SAVANNA", "biomeStyle": { "style": "IRIS" }, @@ -100,68 +161,6 @@ } } ], - "name": "Savanna Beach", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 0, - "max": 0, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "forest-food" - ] - }, "wall": { "style": { "style": "STATIC" diff --git a/biomes/savanna-cliff.json b/biomes/savanna/savanna-cliff.json similarity index 99% rename from biomes/savanna-cliff.json rename to biomes/savanna/savanna-cliff.json index d2ce664b..2fab1725 100644 --- a/biomes/savanna-cliff.json +++ b/biomes/savanna/savanna-cliff.json @@ -1,5 +1,90 @@ { + "name": "Savanna Cliffs", + "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", + "children": [ + "savanna/savanna-acacia-denmyre" + ], + "generators": [ + { + "min": 9, + "max": 28, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "sandstone" + }, + { + "block": "sand" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "sand" + }, + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "style": { + "style": "STATIC" + }, + "zoom": 0.75, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "DESERT", "SAVANNA" @@ -81,9 +166,6 @@ "rarity": 6 } ], - "children": [ - "savanna-acacia-denmyre" - ], "objects": [ { "chance": 0.07, @@ -198,89 +280,7 @@ } } ], - "name": "Savanna Cliffs", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "sandstone" - }, - { - "block": "sand" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "sand" - }, - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "zoom": 0.75, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 9, - "max": 28, - "generator": "plain" - } - ], "biomeZoom": 20, - "derivative": "SAVANNA", "biomeStyle": { "style": "IRIS" }, diff --git a/biomes/savanna-forest.json b/biomes/savanna/savanna-forest.json similarity index 99% rename from biomes/savanna-forest.json rename to biomes/savanna/savanna-forest.json index 95b71b56..29de5593 100644 --- a/biomes/savanna-forest.json +++ b/biomes/savanna/savanna-forest.json @@ -1,5 +1,69 @@ { + "name": "Savanna Forest", + "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", + "generators": [ + { + "min": 7, + "max": 10, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.75, + "palette": [ + { + "weight": 2, + "block": "grass_block" + }, + { + "block": "brown_concrete_powder" + }, + { + "weight": 4, + "block": "grass_block" + }, + { + "block": "brown_concrete_powder" + }, + { + "weight": 7, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "DESERT" ], @@ -97,7 +161,6 @@ } ], "objects": [ - { "mode": "PAINT", "chance": 0.0025, @@ -271,76 +334,12 @@ "rarity": 6 } ], - "name": "Savanna Forest", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.75, - "palette": [ - { - "weight": 2, - "block": "grass_block" - }, - { - "block": "brown_concrete_powder" - }, - { - "weight": 4, - "block": "grass_block" - }, - { - "block": "brown_concrete_powder" - }, - { - "weight": 7, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 7, - "max": 10, - "generator": "plain" - } - ], "biomeZoom": 20, "loot": { "tables": [ "cactus-clutter" ] }, - "derivative": "SAVANNA", "biomeStyle": { "style": "IRIS" }, @@ -363,6 +362,5 @@ "biomeScatter": [ "SAVANNA", "DESERT" - ], - "rarity": 6 + ] } diff --git a/biomes/savanna-plateau.json b/biomes/savanna/savanna-plateau.json similarity index 96% rename from biomes/savanna-plateau.json rename to biomes/savanna/savanna-plateau.json index 3703e538..ebd08720 100644 --- a/biomes/savanna-plateau.json +++ b/biomes/savanna/savanna-plateau.json @@ -1,5 +1,81 @@ { + "name": "Savanna Plateau", + "derivative": "SAVANNA_PLATEAU", "vanillaDerivative": "SAVANNA", + "generators": [ + { + "min": 15, + "max": 20, + "generator": "canyon-steep" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "granite" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "style": { + "style": "STATIC" + }, + "zoom": 0.75, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "DESERT", "SAVANNA" @@ -82,7 +158,6 @@ } ], "objects": [ - { "chance": 0.00175, "rotation": { @@ -237,93 +312,7 @@ } } ], - "name": "Savanna plateau", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "granite" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "zoom": 0.75, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 15, - "max": 20, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, - "generator": "plain" - } - ], "biomeZoom": 60, - "derivative": "SAVANNA_PLATEAU", "biomeStyle": { "style": "IRIS" }, @@ -346,6 +335,5 @@ "biomeScatter": [ "SAVANNA", "DESERT" - ], - "rarity": 40 + ] } diff --git a/biomes/savanna.json b/biomes/savanna/savanna.json similarity index 99% rename from biomes/savanna.json rename to biomes/savanna/savanna.json index c315505f..8f792f13 100644 --- a/biomes/savanna.json +++ b/biomes/savanna/savanna.json @@ -1,5 +1,89 @@ { + "name": "Savanna", + "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", + "children": [ + "savanna/savanna-cliff" + ], + "generators": [ + { + "min": 7, + "max": 15, + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "granite" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "style": { + "style": "STATIC" + }, + "zoom": 0.75, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "DESERT", "SAVANNA" @@ -81,9 +165,6 @@ } } ], - "children": [ - "savanna-cliff" - ], "objects": [ { "chance": 0.00175, @@ -239,88 +320,7 @@ } } ], - "name": "Savanna", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "granite" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "zoom": 0.75, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 7, - "max": 15, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" - } - ], "biomeZoom": 20, - "derivative": "SAVANNA", "biomeStyle": { "style": "IRIS" }, diff --git a/biomes/swamp-beach.json b/biomes/swamp/swamp-beach.json similarity index 99% rename from biomes/swamp-beach.json rename to biomes/swamp/swamp-beach.json index 89ec8744..3c27b5db 100644 --- a/biomes/swamp-beach.json +++ b/biomes/swamp/swamp-beach.json @@ -1,4 +1,51 @@ { + "name": "Swamp Beach", + "derivative": "SWAMP", + "vanillaDerivative": "BEACH", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "style": { + "style": "STATIC" + }, + "zoom": 0.25, + "palette": [ + { + "block": "dirt" + }, + { + "block": "podzol" + }, + { + "block": "coarse_dirt" + }, + { + "block": "podzol" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "weight": 2, + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.004, @@ -84,7 +131,6 @@ "rarity": 6 } ], - "name": "Swamp Beach", "objects": [ { "place": [ @@ -159,55 +205,9 @@ } } ], - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "style": { - "style": "STATIC" - }, - "zoom": 0.25, - "palette": [ - { - "block": "dirt" - }, - { - "block": "podzol" - }, - { - "block": "coarse_dirt" - }, - { - "block": "podzol" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "weight": 2, - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] - }, - "vanillaDerivative": "BEACH", - "derivative": "SWAMP" + } } \ No newline at end of file diff --git a/biomes/swamp-dark-oak-denmyre.json b/biomes/swamp/swamp-denmyre.json similarity index 99% rename from biomes/swamp-dark-oak-denmyre.json rename to biomes/swamp/swamp-denmyre.json index 79b05d56..a87e1bf8 100644 --- a/biomes/swamp-dark-oak-denmyre.json +++ b/biomes/swamp/swamp-denmyre.json @@ -1,5 +1,60 @@ { + "name": "Swamp Denmyre", + "derivative": "SWAMP", "vanillaDerivative": "DARK_FOREST", + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.01, @@ -79,7 +134,6 @@ } ], "objects": [ - { "mode": "PAINT", "chance": 0.0025, @@ -313,61 +367,6 @@ "rarity": 6 } ], - "name": "Swamp Denmyre", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], - "derivative": "SWAMP", "wall": { "style": { "style": "STATIC" diff --git a/biomes/swamp-lake.json b/biomes/swamp/swamp-lake.json similarity index 98% rename from biomes/swamp-lake.json rename to biomes/swamp/swamp-lake.json index 1d038337..0c97d3f6 100644 --- a/biomes/swamp-lake.json +++ b/biomes/swamp/swamp-lake.json @@ -1,7 +1,9 @@ { + "name": "Swampy Marsh", + "derivative": "SWAMP", "vanillaDerivative": "SWAMP", "children": [ - "swamp-marsh" + "swamp/swamp-marsh" ], "jigsawStructures": [ { @@ -13,6 +15,71 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": -8, + "max": -5, + "generator": "river" + } + ], + "layers": [ + { + "style": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -109,74 +176,7 @@ } } ], - "name": "Swampy Marsh", - "layers": [ - { - "style": { - "style": "IRIS" - }, - "zoom": 0.5, - "palette": [ - { - "weight": 3, - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "weight": 4, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": -8, - "max": -5, - "generator": "river" - } - ], "biomeZoom": 9, - "derivative": "SWAMP", "biomeStyle": { "style": "IRIS" }, @@ -195,6 +195,5 @@ "block": "stone" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/swamp-marsh-rotten.json b/biomes/swamp/swamp-marsh-rotten.json similarity index 98% rename from biomes/swamp-marsh-rotten.json rename to biomes/swamp/swamp-marsh-rotten.json index cf143340..bc78e1fa 100644 --- a/biomes/swamp-marsh-rotten.json +++ b/biomes/swamp/swamp-marsh-rotten.json @@ -1,5 +1,75 @@ { + "name": "Swamp Marsh Rotten", + "derivative": "SWAMP_HILLS", "vanillaDerivative": "SWAMP", + "generators": [ + { + "min": 7, + "max": 3, + "generator": "mountain" + } + ], + "layers": [ + { + "style": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "block": "coarse_dirt" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.005, @@ -151,77 +221,7 @@ } } ], - "name": "Rotten Swampy Marsh", - "layers": [ - { - "style": { - "style": "IRIS" - }, - "zoom": 0.5, - "palette": [ - { - "weight": 3, - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "block": "coarse_dirt" - }, - { - "weight": 4, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 7, - "max": 3, - "generator": "mountain" - } - ], "biomeZoom": 9, - "derivative": "SWAMP_HILLS", "biomeStyle": { "style": "IRIS" }, @@ -240,6 +240,5 @@ "block": "stone" } ] - }, - "rarity": 12 + } } \ No newline at end of file diff --git a/biomes/swamp-marsh.json b/biomes/swamp/swamp-marsh.json similarity index 98% rename from biomes/swamp-marsh.json rename to biomes/swamp/swamp-marsh.json index 1b66d708..5d6d7fe8 100644 --- a/biomes/swamp-marsh.json +++ b/biomes/swamp/swamp-marsh.json @@ -1,7 +1,9 @@ { + "name": "Swamp Marsh", + "derivative": "SWAMP", "vanillaDerivative": "SWAMP", "children": [ - "swamp-marsh-rotten" + "swamp/swamp-marsh-rotten" ], "jigsawStructures": [ { @@ -13,6 +15,71 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": 6, + "max": 3, + "generator": "mountain" + } + ], + "layers": [ + { + "style": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -181,74 +248,7 @@ } } ], - "name": "Swampy Marsh", - "layers": [ - { - "style": { - "style": "IRIS" - }, - "zoom": 0.5, - "palette": [ - { - "weight": 3, - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "weight": 4, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 3, - "generator": "mountain" - } - ], "biomeZoom": 9, - "derivative": "SWAMP", "biomeStyle": { "style": "IRIS" }, @@ -267,6 +267,5 @@ "block": "stone" } ] - }, - "rarity": 4 + } } \ No newline at end of file diff --git a/biomes/swamp-murky-cavern-gleaming.json b/biomes/swamp/swamp-murky-cavern-gleaming.json similarity index 99% rename from biomes/swamp-murky-cavern-gleaming.json rename to biomes/swamp/swamp-murky-cavern-gleaming.json index 93ee4b79..d1e99bc8 100644 --- a/biomes/swamp-murky-cavern-gleaming.json +++ b/biomes/swamp/swamp-murky-cavern-gleaming.json @@ -1,125 +1,14 @@ { - "decorators": [ + "name": "Swamp Murky Cavern Gleaming", + "derivative": "SWAMP", + "vanillaDerivative": "SWAMP", + "generators": [ { - "chance": 0.0001, - "palette": [ - { - "block": "barrel" - } - ] - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "brown_mushroom" - }, - { - "block": "red_mushroom" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "cobweb" - } - ], - "style": { - "style": "STATIC" - } + "min": 4, + "max": 6, + "generator": "plain" } ], - "objects": [ - { - "chance": 0.00175, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "camp/camp" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "PAINT", - "chance": 0.005, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "camp/barrel-bin" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.005, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "boulder/boulder1", - "boulder/boulder2", - "boulder/boulder3", - "boulder/boulder4", - "boulder/boulder5", - "boulder/boulder6", - "boulder/boulder7", - "boulder/boulder8", - "boulder/boulder9", - "boulder/boulder10", - "boulder/boulder11", - "boulder/boulder12", - "boulder/boulder13", - "boulder/boulder14", - "boulder/boulder15" - ], - "translate": { - "x": 0, - "y": -2, - "z": 0 - } - } - ], - "name": "Gleaming Murky Cavern", "layers": [ { "minHeight": 1, @@ -317,11 +206,124 @@ ] } ], - "generators": [ + "decorators": [ { - "min": 4, - "max": 6, - "generator": "plain" + "chance": 0.0001, + "palette": [ + { + "block": "barrel" + } + ] + }, + { + "chance": 0.01, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "brown_mushroom" + }, + { + "block": "red_mushroom" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.001, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "cobweb" + } + ], + "style": { + "style": "STATIC" + } + } + ], + "objects": [ + { + "chance": 0.00175, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "camp/camp" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "camp/barrel-bin" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "boulder/boulder1", + "boulder/boulder2", + "boulder/boulder3", + "boulder/boulder4", + "boulder/boulder5", + "boulder/boulder6", + "boulder/boulder7", + "boulder/boulder8", + "boulder/boulder9", + "boulder/boulder10", + "boulder/boulder11", + "boulder/boulder12", + "boulder/boulder13", + "boulder/boulder14", + "boulder/boulder15" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } } ], "loot": { @@ -329,8 +331,6 @@ "cave-clutter" ] }, - "derivative": "SWAMP", - "rarity": 11, "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp-murky-cavern.json b/biomes/swamp/swamp-murky-cavern.json similarity index 97% rename from biomes/swamp-murky-cavern.json rename to biomes/swamp/swamp-murky-cavern.json index 6531e6fd..30cfb17a 100644 --- a/biomes/swamp-murky-cavern.json +++ b/biomes/swamp/swamp-murky-cavern.json @@ -1,4 +1,43 @@ { + "name": "Swamp Murky Cavern", + "derivative": "SWAMP", + "vanillaDerivative": "SWAMP", + "children": [ + "swamp/swamp-murky-cavern-gleaming" + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "block": "stone" + }, + { + "weight": 2, + "block": "cobblestone" + }, + { + "weight": 2, + "block": "mossy_cobblestone" + }, + { + "block": "mossy_stone_bricks" + } + ] + } + ], + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -7,9 +46,6 @@ "rarity": 5 } ], - "children": [ - "swamp-murky-cavern-gleaming" - ], "decorators": [ { "chance": 0.0001, @@ -130,46 +166,11 @@ } } ], - "name": "Murky Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "block": "stone" - }, - { - "weight": 2, - "block": "cobblestone" - }, - { - "weight": 2, - "block": "mossy_cobblestone" - }, - { - "block": "mossy_stone_bricks" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "SWAMP", "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp/swamp-ocean-tree.json similarity index 100% rename from biomes/swamp-ocean-tree.json rename to biomes/swamp/swamp-ocean-tree.json index 55632f7e..18c3e312 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp/swamp-ocean-tree.json @@ -1,5 +1,63 @@ { + "name": "Swamp Ocean tree", + "derivative": "SWAMP", "vanillaDerivative": "OCEAN", + "generators": [ + { + "min": -1, + "max": 0, + "generator": "river" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "VASCULAR", + "zoom": 0.8, + "fracture": { + "multiplier": 2, + "style": "STATIC" + } + }, + "zoom": 0.825, + "palette": [ + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "block": "gravel" + }, + { + "block": "clay" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "partOf": "SEA_SURFACE", @@ -249,69 +307,11 @@ } } ], - "name": "Swamp Ocean tree", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "VASCULAR", - "zoom": 0.8, - "fracture": { - "multiplier": 2, - "style": "STATIC" - } - }, - "zoom": 0.825, - "palette": [ - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "gravel" - }, - { - "block": "clay" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -1, - "max": 0, - "generator": "river" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "SWAMP", "wall": { "style": { "style": "IRIS" diff --git a/biomes/swamp-ocean.json b/biomes/swamp/swamp-ocean.json similarity index 100% rename from biomes/swamp-ocean.json rename to biomes/swamp/swamp-ocean.json index c782125b..5b8fda51 100644 --- a/biomes/swamp-ocean.json +++ b/biomes/swamp/swamp-ocean.json @@ -1,5 +1,63 @@ { + "name": "Swamp Ocean", + "derivative": "SWAMP", "vanillaDerivative": "OCEAN", + "generators": [ + { + "min": -2, + "max": 0, + "generator": "river" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "VASCULAR", + "zoom": 0.8, + "fracture": { + "multiplier": 2, + "style": "STATIC" + } + }, + "zoom": 0.825, + "palette": [ + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "block": "gravel" + }, + { + "block": "clay" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "partOf": "SEA_SURFACE", @@ -161,69 +219,11 @@ } } ], - "name": "Swamp Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "VASCULAR", - "zoom": 0.8, - "fracture": { - "multiplier": 2, - "style": "STATIC" - } - }, - "zoom": 0.825, - "palette": [ - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "gravel" - }, - { - "block": "clay" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -2, - "max": 0, - "generator": "river" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "SWAMP", "wall": { "style": { "style": "IRIS" diff --git a/biomes/swamp-roofed-forest.json b/biomes/swamp/swamp-roofed-forest.json similarity index 99% rename from biomes/swamp-roofed-forest.json rename to biomes/swamp/swamp-roofed-forest.json index 4799bc3d..47d62374 100644 --- a/biomes/swamp-roofed-forest.json +++ b/biomes/swamp/swamp-roofed-forest.json @@ -1,7 +1,9 @@ { + "name": "Swamp Roofed Forest", + "derivative": "SWAMP", "vanillaDerivative": "DARK_FOREST", "children": [ - "swamp-lake" + "swamp/swamp-lake" ], "jigsawStructures": [ { @@ -13,6 +15,61 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": 4, + "max": 11, + "generator": "plain" + } + ], + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "weight": 5, + "block": "grass_block" + }, + { + "weight": 2, + "block": "podzol" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.01, @@ -508,62 +565,6 @@ } } ], - "name": "Roofed Swamp", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "weight": 5, - "block": "grass_block" - }, - { - "weight": 2, - "block": "podzol" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 11, - "generator": "plain" - } - ], "entityInitialSpawns": [ { "entity": "cow", @@ -578,7 +579,6 @@ "rarity": 6 } ], - "derivative": "SWAMP", "wall": { "style": { "style": "STATIC" diff --git a/biomes/swamp-roofed-wayward.json b/biomes/swamp/swamp-roofed-wayward.json similarity index 99% rename from biomes/swamp-roofed-wayward.json rename to biomes/swamp/swamp-roofed-wayward.json index ee9f7630..c9c63e60 100644 --- a/biomes/swamp-roofed-wayward.json +++ b/biomes/swamp/swamp-roofed-wayward.json @@ -1,7 +1,9 @@ { + "name": "Swamp Roofed Wayward", + "derivative": "SWAMP", "vanillaDerivative": "DARK_FOREST", "children": [ - "swamp-lake" + "swamp/swamp-lake" ], "jigsawStructures": [ { @@ -13,6 +15,61 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": -7, + "max": -3, + "generator": "plain" + } + ], + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "weight": 5, + "block": "grass_block" + }, + { + "weight": 2, + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.03, @@ -491,62 +548,6 @@ } } ], - "name": "Roofed Marsh", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "weight": 5, - "block": "grass_block" - }, - { - "weight": 2, - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": -7, - "max": -3, - "generator": "plain" - } - ], "entityInitialSpawns": [ { "entity": "cow", @@ -561,7 +562,6 @@ "rarity": 6 } ], - "derivative": "SWAMP", "wall": { "style": { "style": "STATIC" diff --git a/biomes/swamp-willow-forest.json b/biomes/swamp/swamp-willow-forest.json similarity index 99% rename from biomes/swamp-willow-forest.json rename to biomes/swamp/swamp-willow-forest.json index ebd93bc9..9cec88f3 100644 --- a/biomes/swamp-willow-forest.json +++ b/biomes/swamp/swamp-willow-forest.json @@ -1,5 +1,66 @@ { + "name": "Swamp Willow Forest", + "derivative": "SWAMP", "vanillaDerivative": "DARK_FOREST", + "children": [ + "swamp/swamp-denmyre", + "swamp/swamp-marsh" + ], + "generators": [ + { + "min": 4, + "max": 11, + "generator": "plain" + } + ], + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "weight": 5, + "block": "grass_block" + }, + { + "weight": 2, + "block": "podzol" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "interval": 65656, @@ -30,10 +91,6 @@ "particleCount": 0 } ], - "children": [ - "swamp-dark-oak-denmyre", - "swamp-marsh" - ], "decorators": [ { "chance": 0.01, @@ -469,63 +526,6 @@ } } ], - "name": "Roofed Willow", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "weight": 5, - "block": "grass_block" - }, - { - "weight": 2, - "block": "podzol" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 11, - "generator": "plain" - } - ], - "derivative": "SWAMP", "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate-beach.json b/biomes/temperate/temperate-beach.json similarity index 99% rename from biomes/temperate-beach.json rename to biomes/temperate/temperate-beach.json index 9357e13b..f78bc784 100644 --- a/biomes/temperate-beach.json +++ b/biomes/temperate/temperate-beach.json @@ -1,5 +1,34 @@ { + "name": "Temperate Beach", + "derivative": "BEACH", "vanillaDerivative": "BEACH", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -105,40 +134,11 @@ } } ], - "name": "Beach", - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "BEACH", "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate-birch-denmyre.json b/biomes/temperate/temperate-birch-denmyre.json similarity index 99% rename from biomes/temperate-birch-denmyre.json rename to biomes/temperate/temperate-birch-denmyre.json index c2f11ec3..c51ba8ce 100644 --- a/biomes/temperate-birch-denmyre.json +++ b/biomes/temperate/temperate-birch-denmyre.json @@ -1,5 +1,60 @@ { + "name": "Temperate Birch Denmyre", + "derivative": "FOREST", "vanillaDerivative": "BIRCH_FOREST", + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "jigsawStructures": [ { "rarity": 1000, @@ -336,66 +391,11 @@ "rarity": 7 } ], - "name": "Birch Denmyre", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], "loot": { "tables": [ "forest-food" ] }, - "derivative": "FOREST", "wall": { "style": { "style": "STATIC" @@ -411,6 +411,5 @@ "block": "stone" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate/temperate-birch-forest.json similarity index 98% rename from biomes/temperate-birch-forest.json rename to biomes/temperate/temperate-birch-forest.json index 3fa695be..fdd4ad09 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate/temperate-birch-forest.json @@ -1,5 +1,10 @@ - { +{ + "name": "Temperate Birch Forest", + "derivative": "PLAINS", "vanillaDerivative": "BIRCH_FOREST", + "children": [ + "temperate/temperate-birch-denmyre" + ], "jigsawStructures": [ { "rarity": 1000, @@ -10,6 +15,71 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "smooth-dunes" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.656, + "palette": [ + { + "weight": 19, + "block": "grass_block" + }, + { + "block": "gravel" + }, + { + "weight": 19, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -167,7 +237,6 @@ } ], "biomeZoom": 60, - "derivative": "PLAINS", "biomeStyle": { "style": "IRIS" }, @@ -236,75 +305,6 @@ } } ], - "children": [ - "temperate-birch-denmyre" - ], - "name": "Birch Forest", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.656, - "palette": [ - { - "weight": 19, - "block": "grass_block" - }, - { - "block": "gravel" - }, - { - "weight": 19, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "smooth-dunes" - } - ], "loot": { "tables": [ "forest-food" diff --git a/biomes/temperate-bonsai.json b/biomes/temperate/temperate-bonsai.json similarity index 99% rename from biomes/temperate-bonsai.json rename to biomes/temperate/temperate-bonsai.json index 087d7653..903c6d0d 100644 --- a/biomes/temperate-bonsai.json +++ b/biomes/temperate/temperate-bonsai.json @@ -1,13 +1,9 @@ { - "name": "Plains Bonsais", + "name": "Temperate Bonsai", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plain-hills" - ], - "biomeScatter": [ - "FOREST", - "PLAINS" + "temperate/temperate-plain-hills" ], "jigsawStructures": [ { @@ -19,11 +15,6 @@ "structure": "village-temperate" } ], - "childStyle": { - "style": "SIMPLEX", - "zoom": 0.5, - "exponent": 2.0 - }, "generators": [ { "generator": "smooth-dunes", @@ -31,6 +22,60 @@ "min": 3 } ], + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], + "biomeScatter": [ + "FOREST", + "PLAINS" + ], + "childStyle": { + "style": "SIMPLEX", + "zoom": 0.5, + "exponent": 2.0 + }, "decorators": [ { "chance": 0.19, @@ -266,51 +311,6 @@ } } ], - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/temperate-cracked-cavern.json b/biomes/temperate/temperate-cracked-cavern.json similarity index 97% rename from biomes/temperate-cracked-cavern.json rename to biomes/temperate/temperate-cracked-cavern.json index 7c57e56d..396ae4f2 100644 --- a/biomes/temperate-cracked-cavern.json +++ b/biomes/temperate/temperate-cracked-cavern.json @@ -1,15 +1,37 @@ { + "name": "Temperate Cracked Cavern", + "derivative": "PLAINS", "vanillaDerivative": "THE_VOID", - "entitySpawnOverrides": [ + "children": [ + "temperate/temperate-lit-cavern" + ], + "generators": [ { - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 7 + "min": 4, + "max": 6, + "generator": "plain" } ], - "children": [ - "temperate-lit-cavern" + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "cobblestone" + } + ] + } ], "decorators": [ { @@ -106,33 +128,12 @@ } } ], - "name": "Cracked Cavern", - "layers": [ + "entitySpawnOverrides": [ { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "cobblestone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" + "trigger": "SKELETON", + "entity": "shroud", + "cancelSourceSpawn": true, + "rarity": 7 } ], "loot": { @@ -140,8 +141,6 @@ "cave-clutter" ] }, - "derivative": "PLAINS", - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate-flower-forest.json b/biomes/temperate/temperate-flower-forest.json similarity index 98% rename from biomes/temperate-flower-forest.json rename to biomes/temperate/temperate-flower-forest.json index 2b5b29a4..3a4fb1b5 100644 --- a/biomes/temperate-flower-forest.json +++ b/biomes/temperate/temperate-flower-forest.json @@ -1,6 +1,69 @@ { + "name": "Temperate Flower Forest", + "derivative": "FLOWER_FOREST", "vanillaDerivative": "FLOWER_FOREST", - "entityInitialSpawns": [{ + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.656, + "palette": [{ + "weight": 19, + "block": "grass_block" + }, + { + "block": "gravel" + }, + { + "weight": 26, + "block": "grass_block" + } + ] + }, + { + "palette": [{ + "block": "dirt" + }] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [{ + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [{ + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "entityInitialSpawns": [ + { "entity": "cow", "maxSpawns": 3, "minSpawns": 1, @@ -31,7 +94,8 @@ "rarity": 3 } ], - "objects": [{ + "objects": [ + { "chance": 0.07, "rotation": { "yAxis": { @@ -426,11 +490,11 @@ } } ], - "derivative": "FLOWER_FOREST", "biomeStyle": { "style": "IRIS" }, - "decorators": [{ + "decorators": [ + { "chance": 0.3, "variance": { "style": "CELLULAR", @@ -641,64 +705,6 @@ }] } ], - "name": "Flower Forest", - "layers": [{ - "style": { - "style": "STATIC" - }, - "zoom": 0.656, - "palette": [{ - "weight": 19, - "block": "grass_block" - }, - { - "block": "gravel" - }, - { - "weight": 26, - "block": "grass_block" - } - ] - }, - { - "palette": [{ - "block": "dirt" - }] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [{ - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [{ - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [{ - "min": 4, - "max": 7, - "generator": "plain" - }], "loot": { "tables": [ "forest-food" diff --git a/biomes/temperate-highlands.json b/biomes/temperate/temperate-highlands.json similarity index 99% rename from biomes/temperate-highlands.json rename to biomes/temperate/temperate-highlands.json index acb1349f..8bc046bb 100644 --- a/biomes/temperate-highlands.json +++ b/biomes/temperate/temperate-highlands.json @@ -1,4 +1,6 @@ { + "name": "Temperate Highlands", + "derivative": "FOREST", "vanillaDerivative": "PLAINS", "jigsawStructures": [ { @@ -6,6 +8,71 @@ "structure": "pillager" } ], + "generators": [ + { + "min": 12, + "max": 24, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.256, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -151,74 +218,7 @@ } } ], - "name": "Highlands", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.256, - "palette": [ - { - "weight": 3, - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "weight": 4, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 12, - "max": 24, - "generator": "plain" - } - ], "biomeZoom": 9, - "derivative": "FOREST", "biomeStyle": { "style": "IRIS" }, @@ -237,6 +237,5 @@ "block": "stone" } ] - }, - "rarity": 4 -} + } +} \ No newline at end of file diff --git a/biomes/temperate-island.json b/biomes/temperate/temperate-island.json similarity index 98% rename from biomes/temperate-island.json rename to biomes/temperate/temperate-island.json index 5aa0a669..2ef98d0b 100644 --- a/biomes/temperate-island.json +++ b/biomes/temperate/temperate-island.json @@ -1,7 +1,9 @@ { + "name": "Temperate Island", + "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-wilds" + "temperate/temperate-wilds" ], "jigsawStructures": [ { @@ -13,6 +15,59 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 28, + "max": 42, + "generator": "plain" + } + ], + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -139,62 +194,7 @@ } } ], - "name": "Island", - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 28, - "max": 42, - "generator": "plain" - } - ], "biomeZoom": 60, - "derivative": "PLAINS", "biomeStyle": { "style": "IRIS" }, diff --git a/biomes/temperate-lit-cavern.json b/biomes/temperate/temperate-lit-cavern.json similarity index 98% rename from biomes/temperate-lit-cavern.json rename to biomes/temperate/temperate-lit-cavern.json index 3e04cdf2..bd7eb938 100644 --- a/biomes/temperate-lit-cavern.json +++ b/biomes/temperate/temperate-lit-cavern.json @@ -1,5 +1,32 @@ { + "name": "Temperate Lit Cavern", + "derivative": "PLAINS", "vanillaDerivative": "THE_VOID", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + } + ] + } + ], "decorators": [ { "chance": 0.0001, @@ -103,39 +130,11 @@ } } ], - "name": "Lit Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "PLAINS", - "rarity": 6, "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-longtree-forest.json b/biomes/temperate/temperate-longtree-forest.json new file mode 100644 index 00000000..fbdfcff1 --- /dev/null +++ b/biomes/temperate/temperate-longtree-forest.json @@ -0,0 +1,666 @@ +{ + "name": "Temperate Longtree Forest", + "derivative": "BAMBOO_JUNGLE_HILLS", + "vanillaDerivative": "THE_VOID", + "jigsawStructures": [ + { + "rarity": 1000, + "structure": "pillager" + }, + { + "rarity": 800, + "structure": "village-temperate" + } + ], + "generators": [ + { + "generator": "smooth-dunes", + "max": 10, + "min": 4 + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.656, + "palette": [ + { + "weight": 19, + "block": "grass_block" + }, + { + "block": "gravel" + }, + { + "weight": 59, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "decorators": [ + { + "chance": 0.0015, + "stackMax": 6, + "palette": [ + { + "block": "sugar_cane" + } + ], + "stackMin": 1 + }, + { + "chance": 0.003, + "variance": { + "style": "STATIC" + }, + "palette": [ + { + "data": { + "face": "floor", + "powered": false, + "facing": "east" + }, + "block": "stone_button" + }, + { + "data": { + "face": "floor", + "powered": false, + "facing": "south" + }, + "block": "stone_button" + } + ] + }, + { + "chance": 0.006, + "stackMax": 6, + "palette": [ + { + "block": "sunflower" + } + ], + "stackMin": 3 + }, + { + "stackMin": 1, + "stackMax": 11, + "chance": 0.0049, + "variance": { + "style": "STATIC", + "zoom": 0.1 + }, + "topPalette": [ + { + "data": { + "stage": 0, + "age": 0, + "leaves": "small" + }, + "block": "bamboo" + } + ], + "palette": [ + { + "data": { + "stage": 0, + "age": 0, + "leaves": "none" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 0, + "leaves": "none" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 0, + "age": 1, + "leaves": "none" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 1, + "leaves": "none" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 0, + "age": 0, + "leaves": "small" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 0, + "leaves": "small" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 0, + "age": 1, + "leaves": "small" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 1, + "leaves": "small" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 0, + "age": 0, + "leaves": "large" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 0, + "leaves": "large" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 0, + "age": 1, + "leaves": "large" + }, + "block": "bamboo" + }, + { + "data": { + "stage": 1, + "age": 1, + "leaves": "large" + }, + "block": "bamboo" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.4, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "weight": 1, + "block": "grass" + } + ] + }, + { + "chance": 0.02, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + }, + { + "chance": 0.02, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "tall_grass" + } + ] + }, + { + "chance": 0.03, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "weight": 2, + "block": "rose_bush" + }, + { + "block": "peony" + }, + { + "block": "lilac" + }, + { + "block": "dandelion" + } + ] + }, + { + "chance": 0.02, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "poppy" + }, + { + "block": "dandelion" + }, + { + "block": "oxeye_daisy" + } + ] + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pandaUwU", + "maxSpawns": 1, + "rarity": 40 + }, + { + "entity": "panda", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "fox", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5 + } + ], + "objects": [ + { + "chance": 0.7, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/stone-clutt-1", + "clutter/stone-clutt-2", + "clutter/stone-clutt-3", + "clutter/stone-clutt-4", + "clutter/stone-clutt-5", + "clutter/stone-clutt-6", + "clutter/stone-clutt-7", + "boulder/boulder1", + "boulder/boulder2", + "boulder/boulder4", + "boulder/boulder5", + "boulder/boulder6", + "boulder/boulder7", + "boulder/boulder8" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.00995, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "camp/camp" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.3, + "edit": [ + { + "find": [ + { + "block": "oak_wood" + } + ], + "replace": { + "palette": [ + { + "block": "dark_oak_wood" + } + ] + } + } + ], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "sakura/tronco" + ], + "translate": { + "x": 0, + "y": 1, + "z": 0 + } + }, + { + "place": [ + "bush/small/1", + "bush/small/2" + ], + "chance": 0.3, + "density": 2, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": -360, + "max": 360 + } + } + }, + { + "chance": 0.000001, + "density": 1, + "edit": [ + { + "find": [ + { + "block": "barrier" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "sakura/corazoncaido" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "chance": 0.3, + "edit": [ + { + "find": [ + { + "block": "pink_glazed_terracotta" + } + ], + "replace": { + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + } + }, + { + "find": [ + { + "block": "pink_stained_glass" + } + ], + "replace": { + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + } + }, + { + "find": [ + { + "block": "pink_wool" + } + ], + "replace": { + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + } + }, + { + "find": [ + { + "block": "pink_concrete" + } + ], + "replace": { + "palette": [ + { + "block": "shroomlight", + "data": { + "persistent": true + } + } + ] + } + } + ], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "sakura/sakura1", + "sakura/sakura2", + "sakura/sakura3", + "sakura/sakura4", + "sakura/sakura5" + ], + "translate": { + "x": 0, + "y": -5, + "z": 0 + } + }, + { + "chance": 0.002, + "density": 1, + "mode": "VACUUM", + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "sakura/manantial" + ], + "translate": { + "x": 0, + "y": -3, + "z": 0 + } + }, + { + "chance": 0.00001, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "void/void", + "sakura/corazoncristal" + ], + "translate": { + "x": 0, + "y": 55, + "z": 0 + } + } + ], + "effects": [ + { + "particleAltX": 0.301, + "particleAltY": -0.33885, + "particleAltZ": 0.301, + "chance": 3, + "particleEffect": "TOTEM", + "particleOffset": 12, + "interval": 550, + "particleCount": 3 + } + ], + "slab": { + "palette": [ + { + "weight": 1, + "block": "cobblestone_slab" + }, + { + "weight": 10, + "block": "air" + } + ], + "style": { + "style": "STATIC" + } + }, + "rarity": 90 +} diff --git a/biomes/temperate-oak-beach.json b/biomes/temperate/temperate-oak-beach.json similarity index 99% rename from biomes/temperate-oak-beach.json rename to biomes/temperate/temperate-oak-beach.json index ed05d283..56b786ff 100644 --- a/biomes/temperate-oak-beach.json +++ b/biomes/temperate/temperate-oak-beach.json @@ -1,5 +1,63 @@ { + "name": "Temperate Oak Beach", + "derivative": "DEEP_LUKEWARM_OCEAN", "vanillaDerivative": "FOREST", + "generators": [ + { + "min": 0, + "max": 0, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -79,7 +137,6 @@ } ], "biomeZoom": 60, - "derivative": "DEEP_LUKEWARM_OCEAN", "biomeStyle": { "style": "IRIS" }, @@ -117,63 +174,6 @@ } } ], - "name": "Oak Beach", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 0, - "max": 0, - "generator": "plain" - } - ], "loot": { "tables": [ "forest-food" diff --git a/biomes/temperate-oak-denmyre.json b/biomes/temperate/temperate-oak-denmyre.json similarity index 99% rename from biomes/temperate-oak-denmyre.json rename to biomes/temperate/temperate-oak-denmyre.json index 0c5b99aa..4fe05752 100644 --- a/biomes/temperate-oak-denmyre.json +++ b/biomes/temperate/temperate-oak-denmyre.json @@ -1,4 +1,6 @@ { + "name": "Temperate Oak Denmyre", + "derivative": "FOREST", "vanillaDerivative": "FOREST", "jigsawStructures": [ { @@ -9,6 +11,59 @@ "rarity": 350, "structure": "village-temperate" } + ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } ], "decorators": [ { @@ -123,7 +178,8 @@ "block": "cobblestone_slab" } ] - }], + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -345,66 +401,11 @@ } } ], - "name": "Oak Denmyre", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], "loot": { "tables": [ "forest-food" ] }, - "derivative": "FOREST", "wall": { "style": { "style": "STATIC" @@ -420,6 +421,5 @@ "block": "stone" } ] - }, - "rarity": 4 -} + } +} \ No newline at end of file diff --git a/biomes/temperate-oak-forest.json b/biomes/temperate/temperate-oak-forest.json similarity index 99% rename from biomes/temperate-oak-forest.json rename to biomes/temperate/temperate-oak-forest.json index da465e18..9ad4bc01 100644 --- a/biomes/temperate-oak-forest.json +++ b/biomes/temperate/temperate-oak-forest.json @@ -1,5 +1,10 @@ { + "name": "Temperate Oak Forest", + "derivative": "DEEP_LUKEWARM_OCEAN", "vanillaDerivative": "FOREST", + "children": [ + "temperate/temperate-oak-denmyre" + ], "jigsawStructures": [ { "rarity": 1000, @@ -10,6 +15,62 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -293,13 +354,9 @@ } ], "biomeZoom": 60, - "derivative": "DEEP_LUKEWARM_OCEAN", "biomeStyle": { "style": "IRIS" }, - "children": [ - "temperate-oak-denmyre" - ], "decorators": [ { "chance": 0.8, @@ -400,63 +457,7 @@ "block": "cobblestone_slab" } ] - }], - "name": "Oak Forest", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } + } ], "loot": { "tables": [ diff --git a/biomes/temperate-oak-hills.json b/biomes/temperate/temperate-oak-hills.json similarity index 99% rename from biomes/temperate-oak-hills.json rename to biomes/temperate/temperate-oak-hills.json index a79d3823..89e5c6cc 100644 --- a/biomes/temperate-oak-hills.json +++ b/biomes/temperate/temperate-oak-hills.json @@ -1,8 +1,7 @@ { - "name": "Oak Hills", + "name": "Temperate Oak Hills", "derivative": "FOREST", "vanillaDerivative": "FOREST", - "rarity": 2, "generators": [ { "generator": "smooth-dunes", @@ -76,7 +75,7 @@ } ] }, -"decorators": [ + "decorators": [ { "chance": 0.2, "variance": { diff --git a/biomes/temperate-oak.json b/biomes/temperate/temperate-oak.json similarity index 99% rename from biomes/temperate-oak.json rename to biomes/temperate/temperate-oak.json index 18b43273..ab6f9b45 100644 --- a/biomes/temperate-oak.json +++ b/biomes/temperate/temperate-oak.json @@ -1,9 +1,9 @@ { - "name": "Oak", + "name": "Temperate Oak", "derivative": "FOREST", "vanillaDerivative": "FOREST", "children": [ - "temperate-oak-hills" + "temperate/temperate-oak-hills" ], "generators": [ { diff --git a/biomes/temperate-ocean-deep.json b/biomes/temperate/temperate-ocean-deep.json similarity index 99% rename from biomes/temperate-ocean-deep.json rename to biomes/temperate/temperate-ocean-deep.json index 7474109c..f9f3c672 100644 --- a/biomes/temperate-ocean-deep.json +++ b/biomes/temperate/temperate-ocean-deep.json @@ -1,4 +1,68 @@ { + "name": "Temperate Ocean Deep", + "derivative": "DEEP_OCEAN", + "vanillaDerivative": "DEEP_OCEAN", + "generators": [ + { + "min": -57, + "max": -25, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "FRACTAL_FBM_IRIS" + }, + "zoom": 0.725, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0006, @@ -168,76 +232,11 @@ } } ], - "name": "Deep Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "FRACTAL_FBM_IRIS" - }, - "zoom": 0.725, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "vanillaDerivative": "DEEP_OCEAN", - "generators": [ - { - "min": -57, - "max": -25, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "DEEP_OCEAN", - "rarity": 6, "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate-ocean.json b/biomes/temperate/temperate-ocean.json similarity index 98% rename from biomes/temperate-ocean.json rename to biomes/temperate/temperate-ocean.json index 1ac95742..7e0bdb9b 100644 --- a/biomes/temperate-ocean.json +++ b/biomes/temperate/temperate-ocean.json @@ -1,8 +1,71 @@ { - "children": [ - "temperate-ocean-deep" - ], + "name": "Temperate Ocean", + "derivative": "LUKEWARM_OCEAN", "vanillaDerivative": "OCEAN", + "children": [ + "temperate/temperate-ocean-deep" + ], + "generators": [ + { + "min": -31, + "max": -7, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "FRACTAL_FBM_IRIS" + }, + "zoom": 0.825, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0006, @@ -171,74 +234,11 @@ } } ], - "name": "Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "FRACTAL_FBM_IRIS" - }, - "zoom": 0.825, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -31, - "max": -7, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "LUKEWARM_OCEAN", "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate-old-cavern.json b/biomes/temperate/temperate-old-cavern.json similarity index 99% rename from biomes/temperate-old-cavern.json rename to biomes/temperate/temperate-old-cavern.json index 6975719d..90dec859 100644 --- a/biomes/temperate-old-cavern.json +++ b/biomes/temperate/temperate-old-cavern.json @@ -1,5 +1,5 @@ { - "name": "Old cavern", + "name": "Temperate Old Cavern", "derivative": "FOREST", "vanillaDerivative": "THE_VOID", "generators": [ @@ -72,7 +72,7 @@ ] } ], - "decorators": [ + "decorators": [ { "chance": 0.02, "palette": [ diff --git a/biomes/temperate-plain-hills.json b/biomes/temperate/temperate-plain-hills.json similarity index 98% rename from biomes/temperate-plain-hills.json rename to biomes/temperate/temperate-plain-hills.json index 9f8fde57..d12e37ef 100644 --- a/biomes/temperate-plain-hills.json +++ b/biomes/temperate/temperate-plain-hills.json @@ -1,8 +1,7 @@ { - "name": "Plains Hills", + "name": "Temperate Plains Hills", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", - "rarity": 3, "generators": [ { "min": 4, diff --git a/biomes/temperate-plains.json b/biomes/temperate/temperate-plains.json similarity index 99% rename from biomes/temperate-plains.json rename to biomes/temperate/temperate-plains.json index 741fb00a..4e1471a1 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate/temperate-plains.json @@ -1,10 +1,10 @@ { - "name": "Plains", + "name": "Temperate Plains", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plain-hills", - "temperate-wilds" + "temperate/temperate-plain-hills", + "temperate/temperate-wilds" ], "jigsawStructures": [ { @@ -16,11 +16,6 @@ "structure": "village-temperate" } ], - "childStyle": { - "style": "IRIS", - "zoom": 0.5, - "exponent": 2.0 - }, "generators": [ { "min": 4, @@ -28,6 +23,56 @@ "generator": "plain" } ], + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], + "childStyle": { + "style": "IRIS", + "zoom": 0.5, + "exponent": 2.0 + }, "decorators": [ { "chance": 0.19, @@ -468,51 +513,6 @@ } } ], - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], "entityInitialSpawns": [ { "entity": "cow", @@ -539,7 +539,6 @@ "rarity": 7 } ], - "biomeZoom": 60, "biomeStyle": { "style": "IRIS" }, @@ -552,5 +551,6 @@ "block": "andesite" } ] - } -} + }, + "biomeZoom": 60 +} \ No newline at end of file diff --git a/biomes/temperate-plateau.json b/biomes/temperate/temperate-plateau.json similarity index 99% rename from biomes/temperate-plateau.json rename to biomes/temperate/temperate-plateau.json index c75e0e21..aeb09ef5 100644 --- a/biomes/temperate-plateau.json +++ b/biomes/temperate/temperate-plateau.json @@ -1,5 +1,73 @@ { + "name": "Temperate Plateau", + "derivative": "DEEP_LUKEWARM_OCEAN", "vanillaDerivative": "FOREST", + "generators": [ + { + "min": 30, + "max": 55, + "generator": "canyon-steep" + }, + { + "min": 2, + "max": 3, + "generator": "smooth-dunes" + }, + { + "min": 2, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -310,8 +378,6 @@ } } ], - "biomeZoom": 60, - "derivative": "DEEP_LUKEWARM_OCEAN", "biomeStyle": { "style": "IRIS" }, @@ -371,73 +437,6 @@ ] } ], - "name": "temperate plateau", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 30, - "max": 55, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "forest-food" @@ -462,5 +461,5 @@ "biomeScatter": [ "FOREST" ], - "rarity": 40 -} + "biomeZoom": 60 +} \ No newline at end of file diff --git a/biomes/temperate-river.json b/biomes/temperate/temperate-river.json similarity index 98% rename from biomes/temperate-river.json rename to biomes/temperate/temperate-river.json index 7da150c7..97758e09 100644 --- a/biomes/temperate-river.json +++ b/biomes/temperate/temperate-river.json @@ -1,5 +1,75 @@ { + "name": "Temperate River", + "derivative": "RIVER", "vanillaDerivative": "RIVER", + "generators": [ + { + "generator": "river", + "max": -7, + "min": -12 + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "CELLULAR_IRIS_DOUBLE" + }, + "zoom": 0.525, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "weight": 2, + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0006, @@ -103,79 +173,9 @@ } } ], - "name": "River", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "zoom": 0.525, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "weight": 2, - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "generator": "river", - "max": -7, - "min": -12 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "RIVER" -} + } +} \ No newline at end of file diff --git a/biomes/temperate-wilds.json b/biomes/temperate/temperate-wilds.json similarity index 98% rename from biomes/temperate-wilds.json rename to biomes/temperate/temperate-wilds.json index a240711b..4e5375a9 100644 --- a/biomes/temperate-wilds.json +++ b/biomes/temperate/temperate-wilds.json @@ -1,7 +1,9 @@ { + "name": "Temperate Wilds", + "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-highlands" + "temperate/temperate-highlands" ], "jigsawStructures": [ { @@ -209,7 +211,6 @@ } } ], - "name": "Wilds", "layers": [ { "palette": [ @@ -263,8 +264,6 @@ "generator": "plain" } ], - "biomeZoom": 40, - "derivative": "PLAINS", "biomeStyle": { "style": "IRIS" }, @@ -283,5 +282,6 @@ "block": "stone" } ] - } -} + }, + "biomeZoom": 40 +} \ No newline at end of file diff --git a/biomes/tropical-bamboo-forest.json b/biomes/tropical/tropical-bamboo-forest.json similarity index 99% rename from biomes/tropical-bamboo-forest.json rename to biomes/tropical/tropical-bamboo-forest.json index 78cef964..05ae346f 100644 --- a/biomes/tropical-bamboo-forest.json +++ b/biomes/tropical/tropical-bamboo-forest.json @@ -1,4 +1,63 @@ { + "name": "Tropical Bamboo Forest", + "derivative": "DESERT", + "vanillaDerivative": "BAMBOO_JUNGLE", + "children": [ + "temperate/temperate-wilds" + ], + "generators": [ + { + "min": 5, + "max": 9, + "generator": "plain" + } + ], + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "BAMBOO_JUNGLE" ], @@ -231,7 +290,6 @@ } ], "biomeZoom": 10, - "derivative": "DESERT", "biomeStyle": { "style": "IRIS" }, @@ -247,10 +305,6 @@ "particleCount": 0 } ], - "children": [ - "temperate-wilds" - ], - "vanillaDerivative": "BAMBOO_JUNGLE", "decorators": [ { "chance": 0.25, @@ -392,60 +446,6 @@ } } ], - "name": "Bamboo Forest", - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], "wall": { "style": { "style": "STATIC" diff --git a/biomes/tropical-beach-bamboo.json b/biomes/tropical/tropical-beach-bamboo.json similarity index 99% rename from biomes/tropical-beach-bamboo.json rename to biomes/tropical/tropical-beach-bamboo.json index 320a9a53..1d10250c 100644 --- a/biomes/tropical-beach-bamboo.json +++ b/biomes/tropical/tropical-beach-bamboo.json @@ -1,6 +1,34 @@ { + "name": "Tropical Beach Bamboo", + "derivative": "JUNGLE", "vanillaDerivative": "BEACH", - "rarity": 3, + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -169,45 +197,16 @@ } } ], - "name": "Bamboo Beach", - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "JUNGLE", "wall": { "palette": [ { "block": "smooth_sandstone" } ] - } + } } \ No newline at end of file diff --git a/biomes/tropical-beach-charred.json b/biomes/tropical/tropical-beach-charred.json similarity index 98% rename from biomes/tropical-beach-charred.json rename to biomes/tropical/tropical-beach-charred.json index 7824cdd4..591afc77 100644 --- a/biomes/tropical-beach-charred.json +++ b/biomes/tropical/tropical-beach-charred.json @@ -1,5 +1,34 @@ { + "name": "Tropical Beach Charred", + "derivative": "DESERT_LAKES", "vanillaDerivative": "BEACH", + "generators": [ + { + "min": -1, + "max": 1, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "palette": [ + { + "block": "black_concrete_powder" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -97,40 +126,11 @@ } } ], - "name": "Tropical Charred Beach", - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "palette": [ - { - "block": "black_concrete_powder" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -1, - "max": 1, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "DESERT_LAKES", "wall": { "palette": [ { @@ -155,6 +155,5 @@ "block": "air" } ] - }, - "rarity": 17 + } } \ No newline at end of file diff --git a/biomes/tropical-beach.json b/biomes/tropical/tropical-beach.json similarity index 100% rename from biomes/tropical-beach.json rename to biomes/tropical/tropical-beach.json index 05b9531d..3f6061d5 100644 --- a/biomes/tropical-beach.json +++ b/biomes/tropical/tropical-beach.json @@ -1,5 +1,34 @@ { + "name": "Tropical Beach", + "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", + "generators": [ + { + "min": -5, + "max": 5, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -126,40 +155,11 @@ } } ], - "name": "Tropical Beach", - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 5, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "JUNGLE", "wall": { "palette": [ { diff --git a/biomes/tropical-cavern-coral.json b/biomes/tropical/tropical-cavern-coral.json similarity index 98% rename from biomes/tropical-cavern-coral.json rename to biomes/tropical/tropical-cavern-coral.json index afb2f284..ee08e206 100644 --- a/biomes/tropical-cavern-coral.json +++ b/biomes/tropical/tropical-cavern-coral.json @@ -1,4 +1,39 @@ { + "name": "Tropical Cavern Coral", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "weight": 3, + "block": "dead_brain_coral_block" + }, + { + "block": "dead_tube_coral_block" + }, + { + "block": "dead_brain_coral_block" + }, + { + "block": "dead_fire_coral_block" + } + ] + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -199,46 +234,11 @@ } } ], - "name": "Coral Cavern", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "weight": 3, - "block": "dead_brain_coral_block" - }, - { - "block": "dead_tube_coral_block" - }, - { - "block": "dead_brain_coral_block" - }, - { - "block": "dead_fire_coral_block" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "FOREST", - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical-cavern-root.json b/biomes/tropical/tropical-cavern-root.json similarity index 98% rename from biomes/tropical-cavern-root.json rename to biomes/tropical/tropical-cavern-root.json index 4125a9ca..56cee52b 100644 --- a/biomes/tropical-cavern-root.json +++ b/biomes/tropical/tropical-cavern-root.json @@ -1,4 +1,29 @@ { + "name": "Tropical Cavern Root", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "layers": [ + { + "minHeight": 1, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -129,30 +154,5 @@ "z": 0 } } - ], - "name": "Tropical Root", - "layers": [ - { - "minHeight": 1, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], - "derivative": "FOREST", - "rarity": 4 + ] } \ No newline at end of file diff --git a/biomes/tropical-cavern.json b/biomes/tropical/tropical-cavern.json similarity index 99% rename from biomes/tropical-cavern.json rename to biomes/tropical/tropical-cavern.json index 473ffc54..33a7e960 100644 --- a/biomes/tropical-cavern.json +++ b/biomes/tropical/tropical-cavern.json @@ -1,4 +1,53 @@ { + "name": "Tropical Cavern", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "weight": 2, + "block": "stone" + }, + { + "block": "jungle_leaves", + "data": { + "persistent": true + } + }, + { + "weight": 2, + "block": "stone" + }, + { + "block": "andesite" + }, + { + "weight": 2, + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -94,59 +143,11 @@ } } ], - "name": "Tropical Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "weight": 2, - "block": "stone" - }, - { - "block": "jungle_leaves", - "data": { - "persistent": true - } - }, - { - "weight": 2, - "block": "stone" - }, - { - "block": "andesite" - }, - { - "weight": 2, - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "FOREST", "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical-coral-ocean-cliffs.json b/biomes/tropical/tropical-coral-ocean-cliffs.json similarity index 99% rename from biomes/tropical-coral-ocean-cliffs.json rename to biomes/tropical/tropical-coral-ocean-cliffs.json index b31a0e81..2be62633 100644 --- a/biomes/tropical-coral-ocean-cliffs.json +++ b/biomes/tropical/tropical-coral-ocean-cliffs.json @@ -1,7 +1,47 @@ { + "name": "Tropical Coral Ocean Cliffs", + "derivative": "LUKEWARM_OCEAN", "vanillaDerivative": "LUKEWARM_OCEAN", "children": [ - "tropical-coral-ocean" + "tropical/tropical-coral-ocean" + ], + "generators": [ + { + "min": -51, + "max": -37, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } ], "effects": [ { @@ -1679,51 +1719,11 @@ } } ], - "name": "Coral Ocean Cliffs", - "layers": [ - { - "minHeight": 2, - "maxHeight": 6, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -51, - "max": -37, - "generator": "plain-cliffs" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "LUKEWARM_OCEAN", "wall": { "palette": [ { @@ -1747,7 +1747,6 @@ }, "zoom": 0.1 }, - "rarity": 4, "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical-coral-ocean.json b/biomes/tropical/tropical-coral-ocean.json similarity index 99% rename from biomes/tropical-coral-ocean.json rename to biomes/tropical/tropical-coral-ocean.json index 524d9cb2..67923fa2 100644 --- a/biomes/tropical-coral-ocean.json +++ b/biomes/tropical/tropical-coral-ocean.json @@ -1,5 +1,45 @@ { + "name": "Tropical Coral Ocean", + "derivative": "LUKEWARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", + "generators": [ + { + "min": -51, + "max": -37, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "effects": [ { "particleAltX": 0.3, @@ -1652,51 +1692,11 @@ } } ], - "name": "Coral Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 6, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -51, - "max": -37, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "LUKEWARM_OCEAN", "wall": { "palette": [ { @@ -1720,7 +1720,6 @@ }, "zoom": 0.1 }, - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical-highlands.json b/biomes/tropical/tropical-highlands.json similarity index 99% rename from biomes/tropical-highlands.json rename to biomes/tropical/tropical-highlands.json index b3663a25..f025c8e5 100644 --- a/biomes/tropical-highlands.json +++ b/biomes/tropical/tropical-highlands.json @@ -1,4 +1,6 @@ { + "name": "Tropical Highlands", + "derivative": "JUNGLE", "vanillaDerivative": "PLAINS", "jigsawStructures": [ { @@ -6,6 +8,71 @@ "structure": "pillager" } ], + "generators": [ + { + "min": 22, + "max": 44, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.256, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "cow", @@ -151,74 +218,7 @@ } } ], - "name": "Tropical Highlands", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.256, - "palette": [ - { - "weight": 3, - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "weight": 4, - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 22, - "max": 44, - "generator": "plain" - } - ], "biomeZoom": 9, - "derivative": "JUNGLE", "biomeStyle": { "style": "IRIS" }, @@ -237,6 +237,5 @@ "block": "stone" } ] - }, - "rarity": 4 -} + } +} \ No newline at end of file diff --git a/biomes/tropical-island-beach.json b/biomes/tropical/tropical-island-beach.json similarity index 68% rename from biomes/tropical-island-beach.json rename to biomes/tropical/tropical-island-beach.json index f62eb448..72d30466 100644 --- a/biomes/tropical-island-beach.json +++ b/biomes/tropical/tropical-island-beach.json @@ -1,16 +1,48 @@ { + "name": "Tropical Island Beach", + "derivative": "JUNGLE", "vanillaDerivative": "BEACH", - "effects": [{ - "particleAltX": 0.301, - "particleAltY": -0.33885, - "particleAltZ": 0.301, - "chance": 1, - "particleEffect": "TOTEM", - "particleOffset": 12, - "interval": 550, - "particleCount": 0 - }], - "entityInitialSpawns": [{ + "generators": [ + { + "min": -7, + "max": -3, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], + "effects": [ + { + "particleAltX": 0.301, + "particleAltY": -0.33885, + "particleAltZ": 0.301, + "chance": 1, + "particleEffect": "TOTEM", + "particleOffset": 12, + "interval": 550, + "particleCount": 0 + } + ], + "entityInitialSpawns": [ + { "entity": "chicken", "maxSpawns": 1, "minSpawns": 1, @@ -23,13 +55,15 @@ "rarity": 6 } ], - "decorators": [{ + "decorators": [ + { "chance": 0.01, "variance": { "style": "STATIC" }, "zoom": 0.3, - "palette": [{ + "palette": [ + { "data": { "face": "floor", "powered": false, @@ -59,9 +93,11 @@ }, "stackMax": 5, "zoom": 5, - "palette": [{ + "palette": [ + { "block": "sugar_cane" - }], + } + ], "style": { "style": "STATIC" }, @@ -71,18 +107,25 @@ "stackMin": 1 } ], - "objects": [{ + "objects": [ + { "chance": 1, - "edit": [{ - "find": [{ - "block": "player_wall_head" - }], - "replace": { - "palette": [{ - "block": "air" - }] + "edit": [ + { + "find": [ + { + "block": "player_wall_head" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + } } - }], + ], "rotation": { "yAxis": { "min": 0, @@ -108,44 +151,26 @@ "y": -1, "z": 0 } - }], - "name": "Tropical Island Beach", - "layers": [{ - "minHeight": 3, - "maxHeight": 6, - "palette": [{ - "block": "sand" - }] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [{ - "block": "dirt" - }] } ], - "generators": [{ - "min": -7, - "max": -3, - "generator": "plain" - }], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "JUNGLE", "wall": { - "palette": [{ - "block": "smooth_sandstone" - }] + "palette": [ + { + "block": "smooth_sandstone" + } + ] }, "slab": { "style": { "style": "STATIC" }, - "palette": [{ + "palette": [ + { "data": { "waterlogged": false, "type": "bottom" @@ -165,4 +190,4 @@ } ] } -} +} \ No newline at end of file diff --git a/biomes/tropical-jungle-denmyre.json b/biomes/tropical/tropical-jungle-denmyre.json similarity index 99% rename from biomes/tropical-jungle-denmyre.json rename to biomes/tropical/tropical-jungle-denmyre.json index a66fd324..177c8baa 100644 --- a/biomes/tropical-jungle-denmyre.json +++ b/biomes/tropical/tropical-jungle-denmyre.json @@ -1,5 +1,61 @@ { + "name": "Tropical Jungle Denmyre", + "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.01, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -259,62 +315,6 @@ } } ], - "name": "Jungle Denmyre", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.01, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], - "derivative": "JUNGLE", "wall": { "style": { "style": "STATIC" @@ -330,6 +330,5 @@ "block": "stone" } ] - }, - "rarity": 3 + } } \ No newline at end of file diff --git a/biomes/tropical-mountain-extreme.json b/biomes/tropical/tropical-mountain-extreme.json similarity index 98% rename from biomes/tropical-mountain-extreme.json rename to biomes/tropical/tropical-mountain-extreme.json index 5e539f49..285794dc 100644 --- a/biomes/tropical-mountain-extreme.json +++ b/biomes/tropical/tropical-mountain-extreme.json @@ -1,16 +1,10 @@ { - "name": "Tropical Mountains", + "name": "Tropical Mountain Extreme", "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "children": [ - "tropical-mountain-water" + "tropical/tropical-mountain-water" ], - "childStyle": { - "style": "GLOB", - "zoom": 0.4, - "exponent": 7.6 - }, - "childShrinkFactor": 1, "generators": [ { "generator": "mountain", @@ -52,6 +46,12 @@ ] } ], + "childStyle": { + "style": "GLOB", + "zoom": 0.4, + "exponent": 7.6 + }, + "childShrinkFactor": 1, "decorators": [ { "chance": 0.7, @@ -231,4 +231,4 @@ } } ] -} +} \ No newline at end of file diff --git a/biomes/tropical-mountain-middle.json b/biomes/tropical/tropical-mountain-middle.json similarity index 98% rename from biomes/tropical-mountain-middle.json rename to biomes/tropical/tropical-mountain-middle.json index fdae869c..2fbe77fc 100644 --- a/biomes/tropical-mountain-middle.json +++ b/biomes/tropical/tropical-mountain-middle.json @@ -1,14 +1,10 @@ { - "name": "Middle Mountain", + "name": "Tropical Mountain Middle", "derivative": "JUNGLE_HILLS", "vanillaDerivative": "JUNGLE_HILLS", "children": [ - "tropical-plains" + "tropical/tropical-plains" ], - "biomeStyle": { - "style": "SIMPLEX" - }, - "biomeZoom": 0.4, "generators": [ { "generator": "mountain", @@ -80,6 +76,10 @@ ] } ], + "biomeStyle": { + "style": "SIMPLEX" + }, + "biomeZoom": 0.4, "lockLayers": true, "decorators": [ { diff --git a/biomes/tropical-mountain-plains.json b/biomes/tropical/tropical-mountain-plains.json similarity index 98% rename from biomes/tropical-mountain-plains.json rename to biomes/tropical/tropical-mountain-plains.json index fe5a40e3..f73a7ff9 100644 --- a/biomes/tropical-mountain-plains.json +++ b/biomes/tropical/tropical-mountain-plains.json @@ -1,16 +1,10 @@ { - "name": "Tropical Mountains", + "name": "Tropical Mountain Plains", "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "children": [ - "tropical-mountain-extreme" + "tropical/tropical-mountain-extreme" ], - "childStyle": { - "style": "GLOB", - "zoom": 0.4, - "exponent": 7.6 - }, - "childShrinkFactor": 1, "generators": [ { "min": 90, @@ -47,6 +41,12 @@ ] } ], + "childStyle": { + "style": "GLOB", + "zoom": 0.4, + "exponent": 7.6 + }, + "childShrinkFactor": 1, "decorators": [ { "chance": 0.7, diff --git a/biomes/tropical-mountain-water.json b/biomes/tropical/tropical-mountain-water.json similarity index 98% rename from biomes/tropical-mountain-water.json rename to biomes/tropical/tropical-mountain-water.json index 46ec00e3..a3ecdf04 100644 --- a/biomes/tropical-mountain-water.json +++ b/biomes/tropical/tropical-mountain-water.json @@ -1,5 +1,5 @@ { - "name": "Tropical Mountains Water", + "name": "Tropical Mountain Water", "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "generators": [ @@ -148,4 +148,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/biomes/tropical-mountain.json b/biomes/tropical/tropical-mountain.json similarity index 98% rename from biomes/tropical-mountain.json rename to biomes/tropical/tropical-mountain.json index d2717642..67b7f279 100644 --- a/biomes/tropical-mountain.json +++ b/biomes/tropical/tropical-mountain.json @@ -2,16 +2,9 @@ "name": "Extreme mountains", "derivative": "JUNGLE_HILLS", "vanillaDerivative": "JUNGLE_HILLS", - "biomeZoom": 30, - "biomeStyle": { - "style": "IRIS", - "zoom": 0.7, - "exponent": 4 - }, "children": [ - "tropical-mountain-middle" + "tropical/tropical-mountain-middle" ], - "rarity": 7, "generators": [ { "min": 10, @@ -186,5 +179,11 @@ "y": -2 } } - ] + ], + "biomeZoom": 30, + "biomeStyle": { + "style": "IRIS", + "zoom": 0.7, + "exponent": 4 + } } \ No newline at end of file diff --git a/biomes/tropical-ocean.json b/biomes/tropical/tropical-ocean.json similarity index 99% rename from biomes/tropical-ocean.json rename to biomes/tropical/tropical-ocean.json index 8a3b883b..a8d02624 100644 --- a/biomes/tropical-ocean.json +++ b/biomes/tropical/tropical-ocean.json @@ -1,5 +1,73 @@ { + "name": "Tropical Ocean", + "derivative": "DEEP_WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", + "children": [ + "tropical/tropical-coral-ocean", + "tropical/tropical-coral-ocean-cliffs" + ], + "generators": [ + { + "min": -38, + "max": -20, + "generator": "river" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 2, + "style": { + "style": "VASCULAR", + "zoom": 0.9, + "fracture": { + "multiplier": 60, + "style": "IRIS_DOUBLE", + "zoom": 2, + "fracture": { + "multiplier": 50, + "style": "STATIC" + } + } + }, + "zoom": 0.825, + "palette": [ + { + "weight": 2, + "block": "sand" + }, + { + "block": "dirt" + }, + { + "block": "gravel" + }, + { + "block": "clay" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "effects": [ { "particleAltX": 0.3, @@ -15,10 +83,6 @@ } ], "childShrinkFactor": 3, - "children": [ - "tropical-coral-ocean", - "tropical-coral-ocean-cliffs" - ], "decorators": [ { "chance": 0.03, @@ -289,76 +353,11 @@ } } ], - - "name": "Tropical Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 2, - "style": { - "style": "VASCULAR", - "zoom": 0.9, - "fracture": { - "multiplier": 60, - "style": "IRIS_DOUBLE", - "zoom": 2, - "fracture": { - "multiplier": 50, - "style": "STATIC" - } - } - }, - "zoom": 0.825, - "palette": [ - { - "weight": 2, - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "gravel" - }, - { - "block": "clay" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -38, - "max": -20, - "generator": "river" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "DEEP_WARM_OCEAN", "wall": { "palette": [ { diff --git a/biomes/tropical-plains-hills.json b/biomes/tropical/tropical-plains-hills.json similarity index 99% rename from biomes/tropical-plains-hills.json rename to biomes/tropical/tropical-plains-hills.json index b14f2a3a..e0f8ec6a 100644 --- a/biomes/tropical-plains-hills.json +++ b/biomes/tropical/tropical-plains-hills.json @@ -2,7 +2,6 @@ "name": "Tropical Plains Hills", "derivative": "JUNGLE_HILLS", "vanillaDerivative": "JUNGLE_HILLS", - "rarity": 2, "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/tropical-plains.json b/biomes/tropical/tropical-plains.json similarity index 98% rename from biomes/tropical-plains.json rename to biomes/tropical/tropical-plains.json index fab2c62c..327da235 100644 --- a/biomes/tropical-plains.json +++ b/biomes/tropical/tropical-plains.json @@ -3,13 +3,8 @@ "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", "children": [ - "tropical-plains-hills" + "tropical/tropical-plains-hills" ], - "childStyle": { - "style": "SIMPLEX", - "zoom": 0.5, - "exponent": 2.0 - }, "generators": [ { "generator": "smooth-dunes", @@ -50,6 +45,11 @@ ] } ], + "childStyle": { + "style": "SIMPLEX", + "zoom": 0.5, + "exponent": 2.0 + }, "decorators": [ { "chance": 0.7, diff --git a/biomes/tropical-rainforest-hills.json b/biomes/tropical/tropical-rainforest-hills.json similarity index 99% rename from biomes/tropical-rainforest-hills.json rename to biomes/tropical/tropical-rainforest-hills.json index c8b09480..f16d6c7e 100644 --- a/biomes/tropical-rainforest-hills.json +++ b/biomes/tropical/tropical-rainforest-hills.json @@ -1,5 +1,64 @@ { + "name": "Rainforest Hills", + "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE_HILLS", + "generators": [ + { + "min": 32, + "max": 65, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.35, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -220,65 +279,6 @@ } } ], - "name": "Rainforest Hills", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.35, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 32, - "max": 65, - "generator": "plain-cliffs" - } - ], - "derivative": "JUNGLE", "wall": { "style": { "style": "IRIS" @@ -316,6 +316,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 8 + } } \ No newline at end of file diff --git a/biomes/tropical-rainforest-island.json b/biomes/tropical/tropical-rainforest-island.json similarity index 99% rename from biomes/tropical-rainforest-island.json rename to biomes/tropical/tropical-rainforest-island.json index 85a9b6c9..a2e811f1 100644 --- a/biomes/tropical-rainforest-island.json +++ b/biomes/tropical/tropical-rainforest-island.json @@ -1,5 +1,64 @@ { + "name": "Tropical Rainforest Island", + "derivative": "JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", + "generators": [ + { + "min": 49, + "max": 65, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FRACTAL_BILLOW_IRIS" + }, + "zoom": 0.6, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "seaLayers": [ { "minHeight": 64, @@ -272,65 +331,6 @@ } } ], - "name": "Rainforest Oasis", - "layers": [ - { - "style": { - "style": "FRACTAL_BILLOW_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 49, - "max": 65, - "generator": "plain" - } - ], - "derivative": "JUNGLE", "wall": { "style": { "style": "IRIS" @@ -368,6 +368,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/tropical-rainforest-wicked-child.json b/biomes/tropical/tropical-rainforest-wicked-child.json similarity index 99% rename from biomes/tropical-rainforest-wicked-child.json rename to biomes/tropical/tropical-rainforest-wicked-child.json index c4864001..27ebe6a9 100644 --- a/biomes/tropical-rainforest-wicked-child.json +++ b/biomes/tropical/tropical-rainforest-wicked-child.json @@ -1,5 +1,64 @@ { + "name": "Tropical Rainforest Wicked Child", + "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", + "generators": [ + { + "min": 3, + "max": 50, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FRACTAL_BILLOW_IRIS" + }, + "zoom": 0.6, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -261,65 +320,6 @@ } } ], - "name": "Wicked Rainforest", - "layers": [ - { - "style": { - "style": "FRACTAL_BILLOW_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 50, - "generator": "plain" - } - ], - "derivative": "MODIFIED_JUNGLE", "wall": { "style": { "style": "IRIS" @@ -357,6 +357,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 12 + } } \ No newline at end of file diff --git a/biomes/tropical-rainforest-wicked-village.json b/biomes/tropical/tropical-rainforest-wicked-village.json similarity index 98% rename from biomes/tropical-rainforest-wicked-village.json rename to biomes/tropical/tropical-rainforest-wicked-village.json index 19683ea9..618fd6fb 100644 --- a/biomes/tropical-rainforest-wicked-village.json +++ b/biomes/tropical/tropical-rainforest-wicked-village.json @@ -1,4 +1,6 @@ { + "name": "Tropical Rainforest Wicked Village", + "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "jigsawStructures": [ { @@ -10,6 +12,63 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 3, + "max": 50, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FRACTAL_BILLOW_IRIS" + }, + "zoom": 0.6, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -101,65 +160,6 @@ } } ], - "name": "Wicked Rainforest Village", - "layers": [ - { - "style": { - "style": "FRACTAL_BILLOW_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 50, - "generator": "plain" - } - ], - "derivative": "MODIFIED_JUNGLE", "wall": { "style": { "style": "IRIS" @@ -197,6 +197,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 12 + } } \ No newline at end of file diff --git a/biomes/tropical-rainforest-wicked.json b/biomes/tropical/tropical-rainforest-wicked.json similarity index 97% rename from biomes/tropical-rainforest-wicked.json rename to biomes/tropical/tropical-rainforest-wicked.json index 4e38b263..a01579e0 100644 --- a/biomes/tropical-rainforest-wicked.json +++ b/biomes/tropical/tropical-rainforest-wicked.json @@ -1,5 +1,70 @@ { + "name": "Tropical Rainforest Wicked", + "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", + "children": [ + "tropical/tropical-rainforest-hills", + "tropical/tropical-jungle-denmyre", + "tropical/tropical-rainforest-wicked-child", + "tropical/tropical-rainforest-wicked-village" + ], + "generators": [ + { + "min": 3, + "max": 50, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FRACTAL_BILLOW_IRIS" + }, + "zoom": 0.6, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -26,12 +91,6 @@ "rarity": 6 } ], - "children": [ - "tropical-rainforest-hills", - "tropical-jungle-denmyre", - "tropical-rainforest-wicked-child", - "tropical-rainforest-wicked-village" - ], "decorators": [ { "chance": 0.45, @@ -267,65 +326,6 @@ } } ], - "name": "Wicked Rainforest", - "layers": [ - { - "style": { - "style": "FRACTAL_BILLOW_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 50, - "generator": "plain" - } - ], - "derivative": "MODIFIED_JUNGLE", "wall": { "style": { "style": "IRIS" @@ -363,6 +363,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 12 + } } \ No newline at end of file diff --git a/biomes/tropical-rainforest.json b/biomes/tropical/tropical-rainforest.json similarity index 98% rename from biomes/tropical-rainforest.json rename to biomes/tropical/tropical-rainforest.json index 1eaad210..9ae9cdce 100644 --- a/biomes/tropical-rainforest.json +++ b/biomes/tropical/tropical-rainforest.json @@ -1,5 +1,68 @@ { + "name": "Tropical Rainforest", + "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", + "children": [ + "tropical/tropical-rainforest-hills", + "tropical/tropical-jungle-denmyre" + ], + "generators": [ + { + "min": 20, + "max": 35, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FRACTAL_BILLOW_IRIS" + }, + "zoom": 0.6, + "palette": [ + { + "block": "grass_block" + }, + { + "data": { + "persistent": true + }, + "block": "jungle_leaves" + }, + { + "weight": 2, + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "particleAltX": 0.301, @@ -26,10 +89,6 @@ "rarity": 4 } ], - "children": [ - "tropical-rainforest-hills", - "tropical-jungle-denmyre" - ], "decorators": [ { "chance": 0.45, @@ -275,65 +334,6 @@ } } ], - "name": "Rainforest", - "layers": [ - { - "style": { - "style": "FRACTAL_BILLOW_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "grass_block" - }, - { - "data": { - "persistent": true - }, - "block": "jungle_leaves" - }, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 20, - "max": 35, - "generator": "plain" - } - ], - "derivative": "JUNGLE", "wall": { "style": { "style": "IRIS" @@ -371,6 +371,5 @@ "block": "stripped_jungle_wood" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/tropical-river-soft.json b/biomes/tropical/tropical-river-soft.json similarity index 98% rename from biomes/tropical-river-soft.json rename to biomes/tropical/tropical-river-soft.json index 0db1e51a..a574ca06 100644 --- a/biomes/tropical-river-soft.json +++ b/biomes/tropical/tropical-river-soft.json @@ -1,6 +1,14 @@ { + "name": "Tropical River Soft", + "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", - "name": "River Soft", + "generators": [ + { + "min": -51, + "max": -37, + "generator": "plain" + } + ], "layers": [ { "minHeight": 2, @@ -233,13 +241,5 @@ }, "waterloggable": true } - ], - "generators": [ - { - "min": -51, - "max": -37, - "generator": "plain" - } - ], - "derivative": "WARM_OCEAN" + ] } \ No newline at end of file diff --git a/biomes/tropical-river-steep.json b/biomes/tropical/tropical-river-steep.json similarity index 98% rename from biomes/tropical-river-steep.json rename to biomes/tropical/tropical-river-steep.json index 21afadea..cc2b5257 100644 --- a/biomes/tropical-river-steep.json +++ b/biomes/tropical/tropical-river-steep.json @@ -1,6 +1,14 @@ { + "name": "Tropical River Steep", + "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", - "name": "River Steep", + "generators": [ + { + "generator": "river", + "max": -6, + "min": -15 + } + ], "layers": [ { "minHeight": 2, @@ -182,17 +190,9 @@ "waterloggable": true } ], - "generators": [ - { - "generator": "river", - "max": -6, - "min": -15 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "WARM_OCEAN" + } } \ No newline at end of file diff --git a/biomes/tropical-submerged-volcanic.json b/biomes/tropical/tropical-submerged-volcanic.json similarity index 98% rename from biomes/tropical-submerged-volcanic.json rename to biomes/tropical/tropical-submerged-volcanic.json index 401b44bd..3c743037 100644 --- a/biomes/tropical-submerged-volcanic.json +++ b/biomes/tropical/tropical-submerged-volcanic.json @@ -1,18 +1,14 @@ { + "name": "Tropical Submerged Volcanic", + "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", - "effects": [ + "generators": [ { - "particleAltX": 0.001, - "particleAltY": 0.13885, - "particleAltZ": 0.001, - "chance": 1, - "particleEffect": "CAMPFIRE_SIGNAL_SMOKE", - "particleOffset": 0, - "interval": 150, - "particleCount": 0 + "min": -24, + "max": -3, + "generator": "canyon-steep" } ], - "name": "Submerged Volcanic", "layers": [ { "minHeight": 2, @@ -82,11 +78,16 @@ ] } ], - "generators": [ + "effects": [ { - "min": -24, - "max": -3, - "generator": "canyon-steep" + "particleAltX": 0.001, + "particleAltY": 0.13885, + "particleAltZ": 0.001, + "chance": 1, + "particleEffect": "CAMPFIRE_SIGNAL_SMOKE", + "particleOffset": 0, + "interval": 150, + "particleCount": 0 } ], "loot": { @@ -94,7 +95,6 @@ "ocean-clutter" ] }, - "derivative": "WARM_OCEAN", "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical-volcanic-plains.json b/biomes/tropical/tropical-volcanic-plains.json similarity index 97% rename from biomes/tropical-volcanic-plains.json rename to biomes/tropical/tropical-volcanic-plains.json index 29b89a3b..b9007633 100644 --- a/biomes/tropical-volcanic-plains.json +++ b/biomes/tropical/tropical-volcanic-plains.json @@ -1,17 +1,10 @@ { - "name": "Volcanic Plains", + "name": "Tropical Volcanic Plains", "derivative": "THE_VOID", "vanillaDerivative": "THE_VOID", - "rarity": 2, "children": [ - "tropical-volcanoes" + "tropical/tropical-volcanoes" ], - "childStyle": { - "style": "SIMPLEX", - "zoom": 1.3, - "exponent": 1.9 - }, - "childShrinkFactor": 1, "generators": [ { "min": 190, @@ -81,6 +74,12 @@ ] } ], + "childStyle": { + "style": "SIMPLEX", + "zoom": 1.3, + "exponent": 1.9 + }, + "childShrinkFactor": 1, "objects": [ { "place": [ diff --git a/biomes/tropical-volcanoes-lava.json b/biomes/tropical/tropical-volcanoes-lava.json similarity index 96% rename from biomes/tropical-volcanoes-lava.json rename to biomes/tropical/tropical-volcanoes-lava.json index e49a3300..4c90d020 100644 --- a/biomes/tropical-volcanoes-lava.json +++ b/biomes/tropical/tropical-volcanoes-lava.json @@ -1,5 +1,5 @@ { - "name": "Volcanoes Lava", + "name": "Tropical Volcanoes Lava", "derivative": "THE_VOID", "vanillaDerivative": "THE_VOID", "generators": [ @@ -59,4 +59,4 @@ } ] } -} +} \ No newline at end of file diff --git a/biomes/tropical-volcanoes.json b/biomes/tropical/tropical-volcanoes.json similarity index 92% rename from biomes/tropical-volcanoes.json rename to biomes/tropical/tropical-volcanoes.json index ccdd05cb..7306d38c 100644 --- a/biomes/tropical-volcanoes.json +++ b/biomes/tropical/tropical-volcanoes.json @@ -1,16 +1,10 @@ { - "name": "Volcanoes", + "name": "Tropical Volcanoes", "derivative": "THE_VOID", "vanillaDerivative": "THE_VOID", "children": [ - "tropical-volcanoes-lava" + "tropical/tropical-volcanoes-lava" ], - "childStyle": { - "style": "GLOB", - "zoom": 0.2, - "exponent": 4 - }, - "childShrinkFactor": 1, "generators": [ { "generator": "mountain", @@ -66,5 +60,11 @@ } ] } - ] -} + ], + "childStyle": { + "style": "GLOB", + "zoom": 0.2, + "exponent": 4 + }, + "childShrinkFactor": 1 +} \ No newline at end of file diff --git a/biomes/tropical-wilds.json b/biomes/tropical/tropical-wilds.json similarity index 99% rename from biomes/tropical-wilds.json rename to biomes/tropical/tropical-wilds.json index 8b2700b5..b1681973 100644 --- a/biomes/tropical-wilds.json +++ b/biomes/tropical/tropical-wilds.json @@ -1,7 +1,9 @@ { + "name": "Tropical Wilds", + "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", "children": [ - "tropical-highlands" + "tropical/tropical-highlands" ], "jigsawStructures": [ { @@ -9,6 +11,59 @@ "structure": "pillager" } ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.22, @@ -209,62 +264,7 @@ } } ], - "name": "Tropical Wilds", - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], "biomeZoom": 40, - "derivative": "JUNGLE", "biomeStyle": { "style": "IRIS" }, @@ -287,4 +287,4 @@ "biomeScatter": [ "JUNGLE" ] -} +} \ No newline at end of file diff --git a/biomes/tundra-beach-stone.json b/biomes/tundra/tundra-beach-stone.json similarity index 98% rename from biomes/tundra-beach-stone.json rename to biomes/tundra/tundra-beach-stone.json index a0b5caeb..16a98beb 100644 --- a/biomes/tundra-beach-stone.json +++ b/biomes/tundra/tundra-beach-stone.json @@ -1,6 +1,14 @@ { + "name": "Tundra Stone Beach", + "derivative": "BEACH", "vanillaDerivative": "BEACH", - "name": "Stone Beach", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], "layers": [ { "minHeight": 3, @@ -130,15 +138,6 @@ "carvingSupport": "SURFACE_ONLY" } ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], - "derivative": "BEACH", - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra-beach.json b/biomes/tundra/tundra-beach.json similarity index 99% rename from biomes/tundra-beach.json rename to biomes/tundra/tundra-beach.json index 9c50b6fd..10419817 100644 --- a/biomes/tundra-beach.json +++ b/biomes/tundra/tundra-beach.json @@ -1,5 +1,38 @@ { + "name": "Tundra Beach", + "derivative": "BEACH", "vanillaDerivative": "BEACH", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 6, + "style": { + "style": "STATIC" + }, + "zoom": 0.25, + "palette": [ + { + "block": "sand" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + } + ] + } + ], "decorators": [ { "chance": 0.006, @@ -168,44 +201,11 @@ "rarity": 7 } ], - "name": "Cold Beach", - "layers": [ - { - "minHeight": 3, - "maxHeight": 6, - "style": { - "style": "STATIC" - }, - "zoom": 0.25, - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], "loot": { "tables": [ "beach-clutter" ] }, - "derivative": "BEACH", "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra-bonsai-forest.json b/biomes/tundra/tundra-bonsai-forest.json similarity index 99% rename from biomes/tundra-bonsai-forest.json rename to biomes/tundra/tundra-bonsai-forest.json index dfbadcc4..a06b2275 100644 --- a/biomes/tundra-bonsai-forest.json +++ b/biomes/tundra/tundra-bonsai-forest.json @@ -1,8 +1,10 @@ { + "name": "Tundra Bonsai Forest", + "derivative": "TAIGA", "vanillaDerivative": "FLOWER_FOREST", "children": [ - "tundra-sequia-redwoods", - "tundra-redwood-cliffs" + "tundra/tundra-sequia-redwoods", + "tundra/tundra-redwood-cliffs" ], "jigsawStructures": [ { @@ -14,6 +16,52 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 17, + "max": 19, + "generator": "plain" + } + ], + "layers": [ + { + "palette": [ + { + "block": "podzol" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -422,54 +470,6 @@ } } ], - "name": "Bonsai Forest", - "layers": [ - { - "palette": [ - { - "block": "podzol" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 17, - "max": 19, - "generator": "plain" - } - ], - "derivative": "TAIGA", "wall": { "style": { "style": "STATIC" diff --git a/biomes/tundra-cavern.json b/biomes/tundra/tundra-cavern.json similarity index 98% rename from biomes/tundra-cavern.json rename to biomes/tundra/tundra-cavern.json index 9123076f..309bf5e0 100644 --- a/biomes/tundra-cavern.json +++ b/biomes/tundra/tundra-cavern.json @@ -1,4 +1,38 @@ { + "name": "Tundra Cavern", + "derivative": "FROZEN_OCEAN", + "vanillaDerivative": "FROZEN_OCEAN", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "cobblestone" + }, + { + "block": "gravel" + } + ] + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -90,44 +124,11 @@ } } ], - "name": "Tundra Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "cobblestone" - }, - { - "block": "gravel" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "FROZEN_OCEAN", "slab": { "style": { "style": "IRIS" diff --git a/biomes/tundra-forest-cliffs.json b/biomes/tundra/tundra-forest-cliffs.json similarity index 99% rename from biomes/tundra-forest-cliffs.json rename to biomes/tundra/tundra-forest-cliffs.json index e3d54ae7..6c05c67f 100644 --- a/biomes/tundra-forest-cliffs.json +++ b/biomes/tundra/tundra-forest-cliffs.json @@ -1,5 +1,82 @@ { + "name": "Tundra Forest Cliffs", + "derivative": "MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", + "generators": [ + { + "generator": "smooth-dunes", + "max": 14, + "min": 8 + }, + { + "min": 12, + "max": 17, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 5.2 + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -281,84 +358,7 @@ } } ], - "name": "Shattered Mountains", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 5.2 - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "generator": "smooth-dunes", - "max": 14, - "min": 8 - }, - { - "min": 12, - "max": 17, - "generator": "plain-cliffs" - } - ], "biomeZoom": 30, - "derivative": "MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -383,6 +383,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "rarity": 4 + ] } \ No newline at end of file diff --git a/biomes/tundra-forest.json b/biomes/tundra/tundra-forest.json similarity index 99% rename from biomes/tundra-forest.json rename to biomes/tundra/tundra-forest.json index adce6c7a..a466ca14 100644 --- a/biomes/tundra-forest.json +++ b/biomes/tundra/tundra-forest.json @@ -1,5 +1,80 @@ { + "name": "Tundra Forest", + "derivative": "MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", + "children": [ + "tundra/tundra-forest-cliffs" + ], + "generators": [ + { + "generator": "smooth-dunes", + "max": 14, + "min": 8 + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 5.3 + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "chicken", @@ -113,13 +188,9 @@ } ], "biomeZoom": 30, - "derivative": "MOUNTAINS", "biomeStyle": { "style": "IRIS" }, - "children": [ - "tundra-forest-cliffs" - ], "decorators": [ { "chance": 0.01, @@ -194,77 +265,6 @@ } } ], - "name": "Tundra Forest", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 5.3 - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "generator": "smooth-dunes", - "max": 14, - "min": 8 - } - ], "childShrinkFactor": 8, "wall": { "style": { @@ -285,6 +285,5 @@ "biomeScatter": [ "TAIGA_HILLS", "MOUNTAINS" - ], - "rarity": 2 + ] } diff --git a/biomes/tundra-lake.json b/biomes/tundra/tundra-lake.json similarity index 99% rename from biomes/tundra-lake.json rename to biomes/tundra/tundra-lake.json index f63fe6d4..7efdbb87 100644 --- a/biomes/tundra-lake.json +++ b/biomes/tundra/tundra-lake.json @@ -1,4 +1,6 @@ { + "name": "Tundra Lake", + "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", "jigsawStructures": [ { @@ -10,6 +12,13 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": -30, + "max": -15, + "generator": "river" + } + ], "decorators": [ { "chance": 0.003, @@ -147,6 +156,52 @@ } } ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "entityInitialSpawns": [ { "entity": "chicken", @@ -368,61 +423,6 @@ } } ], - "name": "tundra lake", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": -30, - "max": -15, - "generator": "river" - } - ], - "derivative": "SNOWY_TUNDRA", "wall": { "style": { "style": "STATIC" @@ -438,6 +438,5 @@ "block": "stone" } ] - }, - "rarity": 2 -} + } +} \ No newline at end of file diff --git a/biomes/tundra-mountains-cliffs.json b/biomes/tundra/tundra-mountains-cliffs.json similarity index 99% rename from biomes/tundra-mountains-cliffs.json rename to biomes/tundra/tundra-mountains-cliffs.json index bf9d5975..569d8704 100644 --- a/biomes/tundra-mountains-cliffs.json +++ b/biomes/tundra/tundra-mountains-cliffs.json @@ -1,5 +1,82 @@ { + "name": "Tundra Mountains Cliffs", + "derivative": "MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", + "generators": [ + { + "min": 11, + "max": 32, + "generator": "mountain" + }, + { + "min": 12, + "max": 62, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 5.2 + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -290,84 +367,7 @@ } } ], - "name": "Shattered Mountains", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 5.2 - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 11, - "max": 32, - "generator": "mountain" - }, - { - "min": 12, - "max": 62, - "generator": "plain-cliffs" - } - ], "biomeZoom": 30, - "derivative": "MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -392,6 +392,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "rarity": 4 + ] } \ No newline at end of file diff --git a/biomes/tundra-mountains.json b/biomes/tundra/tundra-mountains.json similarity index 98% rename from biomes/tundra-mountains.json rename to biomes/tundra/tundra-mountains.json index 12aa00ba..f345b743 100644 --- a/biomes/tundra-mountains.json +++ b/biomes/tundra/tundra-mountains.json @@ -1,5 +1,80 @@ { + "name": "Tundra Mountains", + "derivative": "MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", + "children": [ + "tundra/tundra-mountains-cliffs" + ], + "generators": [ + { + "min": 66, + "max": 89, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 5.3 + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -117,13 +192,9 @@ } ], "biomeZoom": 30, - "derivative": "MOUNTAINS", "biomeStyle": { "style": "IRIS" }, - "children": [ - "tundra-mountains-cliffs" - ], "decorators": [ { "chance": 0.01, @@ -198,77 +269,6 @@ } } ], - "name": "Mountains", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 5.3 - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 66, - "max": 89, - "generator": "mountain" - } - ], "childShrinkFactor": 8, "wall": { "style": { @@ -291,6 +291,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "rarity": 2 + ] } \ No newline at end of file diff --git a/biomes/tundra-redwood-cliffs.json b/biomes/tundra/tundra-redwood-cliffs.json similarity index 97% rename from biomes/tundra-redwood-cliffs.json rename to biomes/tundra/tundra-redwood-cliffs.json index 304e9431..cba625df 100644 --- a/biomes/tundra-redwood-cliffs.json +++ b/biomes/tundra/tundra-redwood-cliffs.json @@ -1,9 +1,7 @@ { + "name": "Tundra Redwood Cliffs", + "derivative": "TAIGA", "vanillaDerivative": "DARK_FOREST", - "entityInitialSpawns": [ - {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, - {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, - {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}], "generators": [ { "min": 15, @@ -16,7 +14,69 @@ "generator": "plain-cliffs" } ], - "derivative": "TAIGA", + "layers": [ + { + "style": { + "style": "SIMPLEX", + "fracture": { + "style": "FRACTAL_WATER", + "zoom": 0.35, + "multiplier": 23 + } + }, + "zoom": 0.7, + "palette": [ + { + "block": "coarse_dirt" + }, + { + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "block": "podzol" + }, + { + "block": "grass_block" + }, + { + "block": "coarse_dirt" + } + + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "style": { + "style": "STATIC" + }, + "minHeight": 1, + "maxHeight": 1, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], + "entityInitialSpawns": [ + {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, + {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, + {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7} + ], "wall": { "style": { "style": "FRACTAL_WATER" @@ -439,64 +499,5 @@ "z": 0 } } - ], - "name": "Redwood Forest Hills", - "layers": [ - { - "style": { - "style": "SIMPLEX", - "fracture": { - "style": "FRACTAL_WATER", - "zoom": 0.35, - "multiplier": 23 - } - }, - "zoom": 0.7, - "palette": [ - { - "block": "coarse_dirt" - }, - { - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "block": "podzol" - }, - { - "block": "grass_block" - }, - { - "block": "coarse_dirt" - } - - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } ] } \ No newline at end of file diff --git a/biomes/tundra-redwoods-forest.json b/biomes/tundra/tundra-redwood-forest.json similarity index 97% rename from biomes/tundra-redwoods-forest.json rename to biomes/tundra/tundra-redwood-forest.json index 266f3842..820909a5 100644 --- a/biomes/tundra-redwoods-forest.json +++ b/biomes/tundra/tundra-redwood-forest.json @@ -1,11 +1,79 @@ { + "name": "Tundra Redwood Forest", + "derivative": "TAIGA", "vanillaDerivative": "DARK_FOREST", - "entityInitialSpawns": [ - {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, - {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, - {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}], "children": [ - "tundra-redwood-cliffs" + "tundra/tundra-redwood-cliffs" + ], + "generators": [ + { + "min": 4, + "max": 10, + "generator": "smooth-dunes" + } + ], + "layers": [ + { + "style": { + "style": "SIMPLEX", + "fracture": { + "style": "FRACTAL_WATER", + "zoom": 0.39, + "multiplier": 23 + } + }, + "zoom": 0.7, + "palette": [ + { + "block": "coarse_dirt" + }, + { + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "block": "podzol" + }, + { + "block": "grass_block" + }, + { + "block": "coarse_dirt" + } + + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "style": { + "style": "STATIC" + }, + "minHeight": 1, + "maxHeight": 1, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], + "entityInitialSpawns": [ + {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, + {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, + {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7} ], "jigsawStructures": [ { @@ -17,14 +85,6 @@ "structure": "village-tundra" } ], - "generators": [ - { - "min": 4, - "max": 10, - "generator": "smooth-dunes" - } - ], - "derivative": "TAIGA", "wall": { "style": { "style": "FRACTAL_WATER" @@ -448,64 +508,5 @@ "z": 0 } } - ], - "name": "Redwood Forest", - "layers": [ - { - "style": { - "style": "SIMPLEX", - "fracture": { - "style": "FRACTAL_WATER", - "zoom": 0.39, - "multiplier": 23 - } - }, - "zoom": 0.7, - "palette": [ - { - "block": "coarse_dirt" - }, - { - "block": "grass_block" - }, - { - "block": "podzol" - }, - { - "block": "podzol" - }, - { - "block": "grass_block" - }, - { - "block": "coarse_dirt" - } - - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } ] } \ No newline at end of file diff --git a/biomes/rocky-ocean.json b/biomes/tundra/tundra-river-rocky.json similarity index 99% rename from biomes/rocky-ocean.json rename to biomes/tundra/tundra-river-rocky.json index 254859fc..51545c30 100644 --- a/biomes/rocky-ocean.json +++ b/biomes/tundra/tundra-river-rocky.json @@ -1,5 +1,70 @@ { + "name": "Tundra River Rocky", + "derivative": "LUKEWARM_OCEAN", "vanillaDerivative": "LUKEWARM_OCEAN", + "generators": [ + { + "min": -31, + "max": -7, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.825, + "palette": [ + { + "block": "stone" + }, + { + "block": "clay" + }, + { + "block": "cobblestone" + }, + { + "block": "gravel" + }, + { + "block": "cobblestone" + }, + { + "block": "dirt" + }, + { + "block": "cobblestone" + }, + { + "block": "andesite" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0006, @@ -165,76 +230,11 @@ } } ], - "name": "Rocky Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.825, - "palette": [ - { - "block": "stone" - }, - { - "block": "clay" - }, - { - "block": "cobblestone" - }, - { - "block": "gravel" - }, - { - "block": "cobblestone" - }, - { - "block": "dirt" - }, - { - "block": "cobblestone" - }, - { - "block": "andesite" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -31, - "max": -7, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "LUKEWARM_OCEAN", "wall": { "style": { "style": "IRIS" @@ -254,7 +254,6 @@ } ] }, - "rarity": 3, "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra-river.json b/biomes/tundra/tundra-river.json similarity index 98% rename from biomes/tundra-river.json rename to biomes/tundra/tundra-river.json index 70fbf99f..43de040d 100644 --- a/biomes/tundra-river.json +++ b/biomes/tundra/tundra-river.json @@ -1,7 +1,70 @@ { + "name": "Tundra River", + "derivative": "COLD_OCEAN", "vanillaDerivative": "RIVER", "children": [ - "rocky-ocean" + "tundra/tundra-river-rocky" + ], + "generators": [ + { + "generator": "river", + "max": -10, + "min": -27 + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "zoom": 0.825, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } ], "decorators": [ { @@ -128,74 +191,11 @@ } } ], - "name": "Cold River", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "zoom": 0.825, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "generator": "river", - "max": -10, - "min": -27 - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "COLD_OCEAN", "wall": { "style": { "style": "STATIC" diff --git a/biomes/tundra-sequia-redwoods.json b/biomes/tundra/tundra-sequia-redwoods.json similarity index 99% rename from biomes/tundra-sequia-redwoods.json rename to biomes/tundra/tundra-sequia-redwoods.json index 0293aa65..aa443ae5 100644 --- a/biomes/tundra-sequia-redwoods.json +++ b/biomes/tundra/tundra-sequia-redwoods.json @@ -1,4 +1,6 @@ { + "name": "Tundra Sequoia Redwoods", + "derivative": "TAIGA", "vanillaDerivative": "WOODED_HILLS", "jigsawStructures": [ { @@ -10,6 +12,65 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": 17, + "max": 19, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "IRIS_DOUBLE", + "fracture": { + "style": "IRIS", + "zoom": 0.2 + } + }, + "zoom": 0.2, + "palette": [ + { + "weight": 2, + "block": "podzol" + }, + { + "weight": 2, + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -337,67 +398,6 @@ } } ], - "name": "Sequoia Redwoods", - "layers": [ - { - "style": { - "style": "IRIS_DOUBLE", - "fracture": { - "style": "IRIS", - "zoom": 0.2 - } - }, - "zoom": 0.2, - "palette": [ - { - "weight": 2, - "block": "podzol" - }, - { - "weight": 2, - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 17, - "max": 19, - "generator": "plain" - } - ], - "derivative": "TAIGA", "wall": { "style": { "style": "STATIC" @@ -407,6 +407,5 @@ "block": "coarse_dirt" } ] - }, - "rarity": 7 + } } \ No newline at end of file diff --git a/biomes/tundra-spiked-cavern.json b/biomes/tundra/tundra-spiked-cavern.json similarity index 99% rename from biomes/tundra-spiked-cavern.json rename to biomes/tundra/tundra-spiked-cavern.json index 272e2977..fb511014 100644 --- a/biomes/tundra-spiked-cavern.json +++ b/biomes/tundra/tundra-spiked-cavern.json @@ -1,4 +1,6 @@ { + "name": "Tundra Spiked Cavern", + "derivative": "FROZEN_OCEAN", "vanillaDerivative": "THE_VOID", "jigsawStructures": [ { @@ -10,6 +12,37 @@ "structure": "village-temperate" } ], + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "style": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "cobblestone" + }, + { + "block": "gravel" + } + ] + } + ], "decorators": [ { "chance": 0.0001, @@ -163,44 +196,11 @@ } } ], - "name": "Spiked Tundra Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "cobblestone" - }, - { - "block": "gravel" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "FROZEN_OCEAN", "slab": { "style": { "style": "IRIS" diff --git a/biomes/tundra-spruce-denmyre.json b/biomes/tundra/tundra-spruce-denmyre.json similarity index 99% rename from biomes/tundra-spruce-denmyre.json rename to biomes/tundra/tundra-spruce-denmyre.json index 1d791d06..d88918ae 100644 --- a/biomes/tundra-spruce-denmyre.json +++ b/biomes/tundra/tundra-spruce-denmyre.json @@ -1,4 +1,6 @@ { + "name": "Tundra Spruce Denmyre", + "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", "jigsawStructures": [ { @@ -10,6 +12,59 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "FLAT" + }, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -368,61 +423,6 @@ } } ], - "name": "Spruce Denmyre", - "layers": [ - { - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - } - ], - "derivative": "SNOWY_TUNDRA", "wall": { "style": { "style": "STATIC" @@ -438,6 +438,5 @@ "block": "stone" } ] - }, - "rarity": 2 + } } \ No newline at end of file diff --git a/biomes/tundra-taiga.json b/biomes/tundra/tundra-taiga.json similarity index 99% rename from biomes/tundra-taiga.json rename to biomes/tundra/tundra-taiga.json index 9293f077..f4cd288a 100644 --- a/biomes/tundra-taiga.json +++ b/biomes/tundra/tundra-taiga.json @@ -1,4 +1,6 @@ { + "name": "Tundra Taiga", + "derivative": "GIANT_TREE_TAIGA", "vanillaDerivative": "TAIGA", "jigsawStructures": [ { @@ -10,6 +12,56 @@ "structure": "village-tundra" } ], + "generators": [ + { + "min": 5, + "max": 14, + "generator": "plain" + } + ], + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.92, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.003, @@ -323,57 +375,6 @@ } } ], - "name": "Cold Tundra", - "layers": [ - { - "style": { - "style": "STATIC" - }, - "zoom": 0.92, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 5, - "max": 14, - "generator": "plain" - } - ], "entityInitialSpawns": [ { "entity": "chicken", @@ -394,7 +395,6 @@ "rarity": 7 } ], - "derivative": "GIANT_TREE_TAIGA", "wall": { "style": { "style": "STATIC" diff --git a/dimensions/overworld.json b/dimensions/overworld.json index cfd767b6..dfb614c5 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,13 +1,21 @@ { + "version": 2, + "name": "Overworld", + "environment": "NORMAL", + "fluidHeight": 63, + + "CONTINENTS": "Continent settings containing placement of the continents.", + "continentZoom": 1, + "landChance": 0.69, + "biomeZoom": 8, "continentalStyle": { "style": "CELLULAR_HEIGHT_IRIS_DOUBLE", "zoom": 12.925, "exponent": 10.1 }, - "stronghold": "stronghold", - "decorate": true, - "landZoom": 3.15, - "placeObjects": true, + + "REGIONS": "Contains the list of regions and their placement style", + "regionZoom": 20, "regions": [ "mushroom", "swamp", @@ -23,33 +31,6 @@ "mesa", "ocean" ], - "seaBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "seaZoom": 1.25, - "biomeZoom": 8, - "lootTries": 32, - "caveBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "continentZoom": 1, - "postProcessing": true, - "postProcessCaves": true, - "Nipple-Remover": true, - "landBiomeStyle": { - "style": "CELLULAR", - "fracture": { - "multiplier": 18, - "maxFractureAccuracy": true, - "style": "FRACTAL_WATER", - "zoom": 0.255, - "fracture": { - "maxFractureAccuracy": true, - "style": "STATIC", - "multiplier": 4 - } - } - }, "regionStyle": { "style": "CELLULAR_IRIS_DOUBLE", "fracture": { @@ -64,184 +45,16 @@ } } }, - "aggressiveBiomeReshuffle": true, - "entitySpawnOverrides": [ - { - "cancelSourceSpawn": true, - "entity": "fred", - "rarity": 60, - "trigger": "VEX" - }, - { - "cancelSourceSpawn": true, - "entity": "fred", - "rarity": 260, - "trigger": "PANDA" - }, - { - "cancelSourceSpawn": true, - "entity": "dan", - "rarity": 250, - "trigger": "CREEPER" - }, - { - "cancelSourceSpawn": true, - "entity": "phantomapi", - "rarity": 70, - "trigger": "PHANTOM" - } - ], - "terrainZoom": 1, - "coordFractureZoom": 0.15, - "fluidHeight": 63, - "ravines": false, - "ravineRarity": 500, - "ravineRibRarity": 3, - "fluidPalette": { - "palette": [ - { - "block": "water" - } - ] - }, - "rockPalette": { - "palette": [ - { - "weight": 10, - "block": "stone" - }, - { - "block": "granite" - }, - { - "block": "andesite" - } - ], - "style": { - "style": "IRIS_THICK", - "zoom": 1.26, - "fracture": { - "style": "STATIC", - "multiplier": 3 - } - } - }, - "loot": { - "tables": [ - "global-treasure", - "global-tools", - "global-clutter" - ] - }, - "coordFractureDistance": 926, - "carving": true, - "carveLayers": [ - { - "style": { - "style": "IRIS_DOUBLE", - "zoom": 1, - "fracture": { - "multiplier": 5, - "style": "FRACTAL_SMOKE", - "zoom": 0.5 - } - }, - "fullPercent": 0.01, - "threshold": 0.75, - "minHeight": -40, - "maxHeight": 70 - }, - { - "style": { - "style": "PERLIN_IRIS_HALF", - "zoom": 0.3, - "fracture": { - "multiplier": 5, - "style": "FRACTAL_SMOKE", - "zoom": 0.5 - } - }, - "fullPercent": 0.5, - "threshold": 0.68, - "minHeight": -50, - "maxHeight": 100 - } - ], - "caves": true, - "caveLayers": [ - { - "canBreakSurface": true, - "caveThickness": 0.5, - "caveZoom": 0.7, - "horizontalSlope": { - "min": -40, - "max": 60, - "generator": { - "style": "SIMPLEX", - "zoom": 2 - } - }, - "verticalSlope": { - "min": 10, - "max": 110, - "generator": { - "style": "SIMPLEX", - "zoom": 4 - } - } - }, - { - "canBreakSurface": false, - "caveThickness": 0.5, - "caveZoom": 0.7, - "horizontalSlope": { - "min": -40, - "max": 30, - "generator": { - "style": "IRIS", - "zoom": 2 - } - }, - "verticalSlope": { - "min": 60, - "max": 255, - "generator": { - "style": "IRIS", - "zoom": 4 - } - } - }, + "SEAS": "Sea settings (for the biomes that are oceans).", + "seaZoom": 1.25, + "seaBiomeStyle": { + "style": "CELLULAR_IRIS_DOUBLE" + }, - { - "canBreakSurface": false, - "caveThickness": 0.1, - "caveZoom": 0.7, - "horizontalSlope": { - "min": -40, - "max": 50, - "generator": { - "style": "PERLIN", - "zoom": 2 - } - }, - "verticalSlope": { - "min": -40, - "max": 80, - "generator": { - "style": "PERLIN", - "zoom": 2 - } - }, - "fluid": { - "fluidHeight": 12, - "fluidType": { - "block": "lava" - } - } - } - ], - "shoreBiomeStyle": { + "LAND": "Land settings (for the biomes that are non-ocean).", + "landZoom": 3.15, + "landBiomeStyle": { "style": "CELLULAR", "fracture": { "multiplier": 18, @@ -255,9 +68,18 @@ } } }, - "landChance": 0.69, - "preventLeafDecay": true, - "version": 2, + + "LOOT": "Contains a list of loot tables that are attempted to be applied to all chests that spawn.", + "lootTries": 32, + "loot": { + "tables": [ + "global-treasure", + "global-tools", + "global-clutter" + ] + }, + + "ORES": "All settings in regards to deposits. Contains the ores spawning in your world.", "deposits": [ { "minHeight": 19, @@ -420,7 +242,206 @@ "varience": 9 } ], - "environment": "NORMAL", + "rockPalette": { + "palette": [ + { + "weight": 10, + "block": "stone" + }, + { + "block": "granite" + }, + { + "block": "andesite" + } + ], + "style": { + "style": "IRIS_THICK", + "zoom": 1.26, + "fracture": { + "style": "STATIC", + "multiplier": 3 + } + } + }, + + "CAVES": "All settings in regards to caves. Contains a toggle and the cave carve layers.", + "caves": true, + "caveLayers": [ + { + "canBreakSurface": true, + "caveThickness": 0.5, + "caveZoom": 0.7, + "horizontalSlope": { + "min": -40, + "max": 60, + "generator": { + "style": "SIMPLEX", + "zoom": 2 + } + }, + "verticalSlope": { + "min": 10, + "max": 110, + "generator": { + "style": "SIMPLEX", + "zoom": 4 + } + } + }, + { + "canBreakSurface": false, + "caveThickness": 0.5, + "caveZoom": 0.7, + "horizontalSlope": { + "min": -40, + "max": 30, + "generator": { + "style": "IRIS", + "zoom": 2 + } + }, + "verticalSlope": { + "min": 60, + "max": 255, + "generator": { + "style": "IRIS", + "zoom": 4 + } + } + }, + + + { + "canBreakSurface": false, + "caveThickness": 0.1, + "caveZoom": 0.7, + "horizontalSlope": { + "min": -40, + "max": 50, + "generator": { + "style": "PERLIN", + "zoom": 2 + } + }, + "verticalSlope": { + "min": -40, + "max": 80, + "generator": { + "style": "PERLIN", + "zoom": 2 + } + }, + "fluid": { + "fluidHeight": 12, + "fluidType": { + "block": "lava" + } + } + } + ], + "caveBiomeStyle": { + "style": "CELLULAR_IRIS_DOUBLE" + }, + + "CARVING": "Carving layers that cut off certain parts of the world", + "carving": true, + "carveLayers": [ + { + "style": { + "style": "IRIS_DOUBLE", + "zoom": 1, + "fracture": { + "multiplier": 5, + "style": "FRACTAL_SMOKE", + "zoom": 0.5 + } + }, + "fullPercent": 0.01, + "threshold": 0.75, + "minHeight": -40, + "maxHeight": 70 + }, + { + "style": { + "style": "PERLIN_IRIS_HALF", + "zoom": 0.3, + "fracture": { + "multiplier": 5, + "style": "FRACTAL_SMOKE", + "zoom": 0.5 + } + }, + "fullPercent": 0.5, + "threshold": 0.68, + "minHeight": -50, + "maxHeight": 100 + } + ], + + "RAVINES": "Settings regarding ravines. Iris does not know when and where they spawn, so it may look weird (with cave fluids)", + "ravines": false, + "ravineRarity": 500, + "ravineRibRarity": 3, + + "OTHER": "Other settings you probably should not touch.", + "aggressiveBiomeReshuffle": true, + "coordFractureDistance": 926, + "coordFractureZoom": 0.15, + "dimensionAngleDeg": 69, + "preventLeafDecay": true, + "postProcessCaves": true, + "postProcessing": true, + "placeObjects": true, + "terrainZoom": 1, + "stronghold": "stronghold", + "decorate": true, + "entitySpawnOverrides": [ + { + "cancelSourceSpawn": true, + "entity": "fred", + "rarity": 60, + "trigger": "VEX" + }, + { + "cancelSourceSpawn": true, + "entity": "fred", + "rarity": 260, + "trigger": "PANDA" + }, + { + "cancelSourceSpawn": true, + "entity": "dan", + "rarity": 250, + "trigger": "CREEPER" + }, + { + "cancelSourceSpawn": true, + "entity": "phantomapi", + "rarity": 70, + "trigger": "PHANTOM" + } + ], + "skylandBiomeStyle": { + "style": "CELLULAR_IRIS_DOUBLE" + }, + "islandBiomeStyle": { + "style": "CELLULAR_IRIS_DOUBLE" + }, + "shoreBiomeStyle": { + "style": "CELLULAR", + "fracture": { + "multiplier": 18, + "maxFractureAccuracy": true, + "style": "FRACTAL_WATER", + "zoom": 0.255, + "fracture": { + "maxFractureAccuracy": true, + "style": "STATIC", + "multiplier": 4 + } + } + }, "overlayNoise": [ { "min": 0, @@ -438,14 +459,5 @@ "zoom": 1.1 } } - ], - "islandBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "skylandBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "name": "Overworld", - "regionZoom": 20, - "dimensionAngleDeg": 19 + ] } \ No newline at end of file diff --git a/regions/frozen.json b/regions/frozen.json index 68ef0f1e..b20fd067 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -1,27 +1,27 @@ { "name": "Frozen", "landBiomes": [ - "frozen-plains", - "frozen-pines", - "frozen-plains", - "frozen-mountain", - "frozen-redwood-forest", - "frozen-hills", - "frozen-pine-plains", - "frozen-spruce-plains" + "frozen/frozen-plains", + "frozen/frozen-pines", + "frozen/frozen-plains", + "frozen/frozen-mountain", + "frozen/frozen-redwood-forest", + "frozen/frozen-hills", + "frozen/frozen-pine-plains", + "frozen/frozen-spruce-plains" ], "shoreBiomes": [ - "frozen-beach" + "frozen/frozen-beach" ], "seaBiomes": [ - "frozen-river" + "frozen/frozen-river" ], "caveBiomes": [ - "frozen-ice-cavern", - "temperate-cracked-cavern" + "frozen/frozen-ice-cavern", + "temperate/temperate-cracked-cavern" ], "riverBiomes": [ - "frozen-river" + "frozen/frozen-river" ], "structures": [ { @@ -34,14 +34,14 @@ ], "spotBiomes": [ { - "biome": "frozen-ocean", + "biome": "frozen/frozen-ocean", "scale": 5, "type": "SEA", "shuffle": 328, "rarity": 36 }, { - "biome": "frozen-vander", + "biome": "frozen/frozen-vander", "scale": 5, "type": "LAND", "shuffle": 328, diff --git a/regions/hot.json b/regions/hot.json index cfde78f0..b99cb495 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -1,20 +1,20 @@ { "name": "Hot", "landBiomes": [ - "hot-desert-red", - "hot-desert-dunes-red", - "hot-desert-dunes", - "hot-desert" + "hot/hot-desert-red", + "hot/hot-desert-dunes-red", + "hot/hot-desert-dunes", + "hot/hot-desert" ], "shoreBiomes": [ - "hot-beach-grass", - "hot-beach" + "hot/hot-beach-grass", + "hot/hot-beach" ], "seaBiomes": [ - "hot-ocean" + "hot/hot-ocean" ], "caveBiomes": [ - "hot-sandy-cave" + "hot/hot-sandy-cave" ], "riverStyle": { "style": "VASCULAR", diff --git a/regions/mesa.json b/regions/mesa.json index 828bd996..a8738c9c 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -1,24 +1,24 @@ { "name": "Mesa", "landBiomes": [ - "mesa-plateau", - "mesa-valleys", - "mesa-plateau-high", - "mesa-valleys", - "mesa", - "mesa-cliffs" + "mesa/mesa-plateau", + "mesa/mesa-valleys", + "mesa/mesa-plateau-high", + "mesa/mesa-valleys", + "mesa/mesa", + "mesa/mesa-cliffs" ], "shoreBiomes": [ - "mesa-beach" + "mesa/mesa-beach" ], "seaBiomes": [ - "mesa-river" + "mesa/mesa-river" ], "caveBiomes": [ - "temperate-old-cavern" + "temperate/temperate-old-cavern" ], "riverBiomes": [ - "mesa-river" + "mesa/mesa-river" ], "structures": [ { @@ -31,7 +31,7 @@ ], "spotBiomes": [ { - "biome": "hot-ocean", + "biome": "hot/hot-ocean", "scale": 5, "type": "SEA", "shuffle": 328, diff --git a/regions/mountain.json b/regions/mountain.json index 68fcf679..d858eb89 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -1,27 +1,27 @@ { "name": "Mountains", "landBiomes": [ - "mountain", - "mountain-hills", - "mountain-forest-hills", - "mountain-forest", - "mountain-plains", - "mountain-cliffs", - "mountain" + "mountain/mountain", + "mountain/mountain-hills", + "mountain/mountain-forest-hills", + "mountain/mountain-forest", + "mountain/mountain-plains", + "mountain/mountain-cliffs", + "mountain/mountain" ], "shoreBiomes": [ - "mountain-beach" + "mountain/mountain-beach" ], "seaBiomes": [ - "mountain-river-soft" + "mountain/mountain-river-soft" ], "caveBiomes": [ - "temperate-old-cavern", - "temperate-cracked-cavern", - "tundra-cavern" + "temperate/temperate-old-cavern", + "temperate/temperate-cracked-cavern", + "tundra/tundra-cavern" ], "riverBiomes": [ - "mountain-river" + "mountain/mountain-river" ], "structures": [ { diff --git a/regions/mushroom.json b/regions/mushroom.json index 560ee87e..c0bf6875 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -1,15 +1,15 @@ { "name": "Mushroom", "landBiomes": [ - "mushroom-forest", - "mushroom-forest-hills", - "mushroom-plains" + "mushroom/mushroom-forest", + "mushroom/mushroom-forest-hills", + "mushroom/mushroom-plains" ], "shoreBiomes": [ - "mushroom-beach" + "mushroom/mushroom-beach" ], "seaBiomes": [ - "mushroom-ocean" + "mushroom/mushroom-ocean" ], "blockDrops": [ { @@ -50,14 +50,14 @@ }, "spotBiomes": [ { - "biome": "mushroom-crimson-forest", + "biome": "mushroom/mushroom-crimson-forest", "scale": 0.78, "type": "LAND", "shuffle": 44, "rarity": 52 }, { - "biome": "mushroom-warped-forest", + "biome": "mushroom/mushroom-warped-forest", "scale": 0.77, "type": "LAND", "shuffle": 44, diff --git a/regions/ocean.json b/regions/ocean.json index 03607782..2594cef6 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -1,25 +1,27 @@ { "name": "Ocean", "landBiomes": [ - "ocean-beach" + "ocean/ocean-beach" ], "shoreBiomes": [ - "temperate-beach" + "temperate/temperate-beach" ], "seaBiomes": [ - "ocean" + "ocean/ocean-deep", + "ocean/ocean", + "ocean/ocean-deep" ], "caveBiomes": [ - "tundra-spiked-cavern", - "tropical-cavern", - "tropical-cavern-coral", - "tropical-cavern-root", - "temperate-lit-cavern", - "temperate-old-cavern", - "temperate-cracked-cavern" + "tundra/tundra-spiked-cavern", + "tropical/tropical-cavern", + "tropical/tropical-cavern-coral", + "tropical/tropical-cavern-root", + "temperate/temperate-lit-cavern", + "temperate/temperate-old-cavern", + "temperate/temperate-cracked-cavern" ], "riverBiomes": [ - "ocean" + "ocean/ocean" ], "biomeImplosionRatio": 0.7, "rarity": 2, diff --git a/regions/savanna.json b/regions/savanna.json index b97167be..f7207ae6 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -1,23 +1,21 @@ { "name": "Savanna", "landBiomes": [ - "savanna", - "savanna-forest", - "savanna", - "savanna", - "savanna-forest", - "savanna", - "savanna-plateau", - "savanna-acacia-denmyre" + "savanna/savanna-forest", + "savanna/savanna", + "savanna/savanna", + "savanna/savanna-forest", + "savanna/savanna-plateau", + "savanna/savanna-acacia-denmyre" ], "shoreBiomes": [ - "savanna-beach-grass" + "savanna/savanna-beach" ], "seaBiomes": [ - "temperate-river" + "temperate/temperate-river" ], "caveBiomes": [ - "temperate-old-cavern" + "temperate/temperate-old-cavern" ], "riverStyle": { "style": "VASCULAR", @@ -98,7 +96,7 @@ "varience": 4 } ], - "landBiomeZoom": 1.25, + "landBiomeZoom": 2, "effects": [ { "potionTicksMin": 87, diff --git a/regions/swamp.json b/regions/swamp.json index 062621e7..d8e8efc8 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -1,22 +1,22 @@ { "name": "Swamp", "landBiomes": [ - "swamp-roofed-forest", - "swamp-willow-forest", - "swamp-lake", - "swamp-roofed-wayward", - "swamp-marsh" + "swamp/swamp-roofed-forest", + "swamp/swamp-willow-forest", + "swamp/swamp-lake", + "swamp/swamp-roofed-wayward", + "swamp/swamp-marsh" ], "shoreBiomes": [ - "swamp-beach" + "swamp/swamp-beach" ], "seaBiomes": [ - "swamp-ocean", - "swamp-ocean-tree" + "swamp/swamp-ocean", + "swamp/swamp-ocean-tree" ], "caveBiomes": [ - "swamp-murky-cavern", - "swamp-murky-cavern-gleaming" + "swamp/swamp-murky-cavern", + "swamp/swamp-murky-cavern-gleaming" ], "riverStyle": { "style": "VASCULAR", diff --git a/regions/temperate.json b/regions/temperate.json index af0fd172..eefa747d 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -1,37 +1,37 @@ { "name":"Temperate", "landBiomes":[ - "temperate-plateau", - "temperate-flower-forest", - "temperate-longtree-forest", - "temperate-oak", - "temperate-plains", - "temperate-oak-forest", - "temperate-wilds", - "temperate-birch-forest" + "temperate/temperate-plateau", + "temperate/temperate-flower-forest", + "temperate/temperate-longtree-forest", + "temperate/temperate-oak", + "temperate/temperate-plains", + "temperate/temperate-oak-forest", + "temperate/temperate-wilds", + "temperate/temperate-birch-forest" ], "shoreBiomes":[ - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-beach", - "temperate-oak-beach" + "temperate/temperate-oak-beach", + "temperate/temperate-oak-beach", + "temperate/temperate-oak-beach", + "temperate/temperate-beach", + "temperate/temperate-oak-beach" ], "seaBiomes":[ - "temperate-river" + "temperate/temperate-river" ], "caveBiomes":[ - "temperate-old-cavern", - "temperate-cracked-cavern", - "temperate-lit-cavern" + "temperate/temperate-old-cavern", + "temperate/temperate-cracked-cavern", + "temperate/temperate-lit-cavern" ], "riverBiomes":[ - "temperate-river" + "temperate/temperate-river" ], "spotBiomes":[ { "as":"LAND", - "biome":"temperate-island", + "biome":"temperate/temperate-island", "scale":1.65, "type":"SEA", "rarity":119 diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index d54818ee..20e05223 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -1,24 +1,24 @@ { "name": "Tropical mountain", "landBiomes": [ - "tropical-plains", - "tropical-mountain", - "tropical-wilds", - "tropical-plains", - "tropical-mountain-extreme", - "tropical-wilds", - "tropical-plains-hills" + "tropical/tropical-plains", + "tropical/tropical-mountain", + "temperate/temperate-wilds", + "tropical/tropical-plains", + "tropical/tropical-mountain-extreme", + "tropical/tropical-wilds", + "tropical/tropical-plains-hills" ], "shoreBiomes": [ - "tropical-beach" + "tropical/tropical-beach" ], "seaBiomes": [ - "tropical-river-steep", - "tropical-river-soft" + "tropical/tropical-river-steep", + "tropical/tropical-river-soft" ], "riverBiomes": [ - "tropical-river-steep", - "tropical-river-soft" + "tropical/tropical-river-steep", + "tropical/tropical-river-soft" ], "structures": [ { @@ -59,7 +59,7 @@ ], "riverRarity": 1, "caveBiomes": [ - "temperate-old-cavern" + "temperate/temperate-old-cavern" ], "landBiomeZoom": 2, "riverStyle": { diff --git a/regions/tropical.json b/regions/tropical.json index 493b9b66..04f992ce 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -1,28 +1,27 @@ { "name": "Tropical", "landBiomes": [ - "tropical-rainforest", - "tropical-plains", - "tropical-bamboo-forest", - "tropical-plains", - "tropical-rainforest-wicked", - "tropical-wilds", - "tropical-volcanic-plains" + "tropical/tropical-rainforest", + "tropical/tropical-plains", + "tropical/tropical-bamboo-forest", + "tropical/tropical-plains", + "tropical/tropical-rainforest-wicked", + "tropical/tropical-wilds", + "tropical/tropical-volcanic-plains" ], "shoreBiomes": [ - "tropical-island-beach", - "tropical-beach", - "tropical-beach-charred", - "tropical-beach-bamboo" + "tropical/tropical-island-beach", + "tropical/tropical-beach", + "tropical/tropical-beach-bamboo" ], "seaBiomes": [ - "tropical-ocean", - "tropical-river-soft" + "tropical/tropical-ocean", + "tropical/tropical-river-soft" ], "caveBiomes": [ - "tropical-cavern", - "tropical-cavern-coral", - "tropical-cavern-root" + "tropical/tropical-cavern", + "tropical/tropical-cavern-coral", + "tropical/tropical-cavern-root" ], "biomeImplosionRatio": 0.25, "riverStyle": { @@ -37,7 +36,7 @@ "spotBiomes": [ { "as": "SEA", - "biome": "tropical-submerged-volcanic", + "biome": "tropical/tropical-submerged-volcanic", "scale": 10, "type": "SEA", "shuffle": 1, @@ -45,7 +44,7 @@ }, { "as": "LAND", - "biome": "tropical-rainforest-island", + "biome": "tropical/tropical-rainforest-island", "scale": 2.65, "type": "SEA", "rarity": 139 diff --git a/regions/tundra.json b/regions/tundra.json index 40a33cd1..9803deee 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -1,30 +1,30 @@ { "name": "Tundra", "landBiomes": [ - "tundra-taiga", - "tundra-redwoods-forest", - "tundra-sequia-redwoods", - "tundra-forest", - "tundra-spruce-denmyre", - "tundra-lake", - "tundra-mountains", - "tundra-mountains", - "tundra-mountains-cliffs", - "mountain-forest" + "tundra/tundra-taiga", + "tundra/tundra-redwood-forest", + "tundra/tundra-sequia-redwoods", + "tundra/tundra-forest", + "tundra/tundra-spruce-denmyre", + "tundra/tundra-lake", + "tundra/tundra-mountains", + "tundra/tundra-mountains", + "tundra/tundra-mountains-cliffs", + "mountain/mountain-forest" ], "shoreBiomes": [ - "tundra-beach", - "tundra-beach-stone" + "tundra/tundra-beach", + "tundra/tundra-beach-stone" ], "seaBiomes": [ - "tundra-river" + "tundra/tundra-river" ], "caveBiomes": [ - "tundra-cavern", - "tundra-spiked-cavern" + "tundra/tundra-cavern", + "tundra/tundra-spiked-cavern" ], "riverBiomes": [ - "tundra-river" + "tundra/tundra-river" ], "biomeImplosionRatio": 0.25, "deposits": [