From 9bb6630a1fb185fd3108dcd7fd0c4a6caa264b99 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:44:46 -0700 Subject: [PATCH] Fixing redundancy in frozen region --- biomes/frozen-mountain-cliffs.json | 256 ++++++++++++++++++++++----- biomes/frozen-mountain-middle.json | 7 +- biomes/frozen-mountain.json | 4 +- biomes/frozen-mountains-cliffs.json | 260 ---------------------------- biomes/frozen-plains-hills.json | 184 -------------------- 5 files changed, 223 insertions(+), 488 deletions(-) delete mode 100644 biomes/frozen-mountains-cliffs.json delete mode 100644 biomes/frozen-plains-hills.json diff --git a/biomes/frozen-mountain-cliffs.json b/biomes/frozen-mountain-cliffs.json index 89df0555..868dd169 100644 --- a/biomes/frozen-mountain-cliffs.json +++ b/biomes/frozen-mountain-cliffs.json @@ -1,14 +1,206 @@ { - "vanillaDerivative": "SNOWY_TAIGA", - "name": "Frozen mountains cliffs", + "vanillaDerivative": "SNOWY_MOUNTAINS", + "biomeSkyScatter": [ + "SNOWY_TAIGA", + "SNOWY_MOUNTAINS" + ], + "objects": [ + { + "chance": 0.02, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "chance": 0.5, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": true + }, + "place": [ + "frosted-spruce/large-5", + "frosted-spruce/large-6", + "frosted-spruce/large-7", + "frosted-spruce/large-8", + "frosted-spruce/large-9", + "frosted-spruce/large-10", + "frosted-spruce/large-12", + "frosted-spruce/large-13", + "frosted-spruce/large-14", + "frosted-spruce/large-15", + "frosted-spruce/large-16", + "frosted-spruce/large-17", + "frosted-spruce/large-18", + "frosted-spruce/large-19", + "frosted-spruce/large-20", + "frosted-spruce/large-21", + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.01, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": true + }, + "place": [ + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.05, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "biomeZoom": 30, + "derivative": "SNOWY_TAIGA_MOUNTAINS", + "biomeStyle": { + "style": "IRIS" + }, + "decorators": [ + { + "chance": 1, + "variance": { + "style": "IRIS", + "zoom": 0.2 + }, + "palette": [ + { + "data": { + "layers": 1 + }, + "block": "snow" + }, + { + "data": { + "layers": 2 + }, + "block": "snow" + }, + { + "data": { + "layers": 3 + }, + "block": "snow" + }, + { + "data": { + "layers": 4 + }, + "block": "snow" + } + ] + } + ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], + "children": [ + "frozen-peak", + "frozen-mountains", + "frozen-vander" + ], + "name": "Frozen Mountains", "layers": [ { - "minHeight": 1, - "maxHeight": 1, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3.295 - }, + "minHeight": 2, + "maxHeight": 3, "palette": [ { "block": "snow_block" @@ -16,17 +208,11 @@ ] }, { - "minHeight": 1, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 3.95 - }, + "minHeight": 2, + "maxHeight": 4, "palette": [ { - "block": "gravel" - }, - { - "block": "cyan_terracotta" + "block": "packed_ice" } ] }, @@ -37,13 +223,11 @@ "style": "STATIC" }, "palette": [ - { - "block": "stone" - }, { "block": "andesite" }, { + "weight": 2, "block": "stone" } ] @@ -51,36 +235,26 @@ ], "generators": [ { - "min": 11, - "max": 32, - "generator": "plain" - }, - { - "min": 12, - "max": 62, - "generator": "cracked-cliffs" + "min": 14, + "max": 65, + "generator": "plain-cliffs" } ], - "biomeZoom": 30, - "derivative": "SNOWY_TAIGA", - "biomeStyle": { - "style": "IRIS" - }, + "childShrinkFactor": 20, "wall": { + "style": { + "style": "IRIS" + }, "palette": [ { - "block": "stone" - }, - { - "block": "andesite" + "block": "packed_ice" } ] }, "biomeScatter": [ - "PLAINS", + "SNOWY_TAIGA_MOUNTAINS", "TAIGA_HILLS", "MOUNTAINS", - "SWAMP" - ], - "rarity": 19 + "ICE_SPIKES" + ] } \ No newline at end of file diff --git a/biomes/frozen-mountain-middle.json b/biomes/frozen-mountain-middle.json index 2c55c4f2..62868d91 100644 --- a/biomes/frozen-mountain-middle.json +++ b/biomes/frozen-mountain-middle.json @@ -115,10 +115,13 @@ "wall": { "palette": [ { - "block": "stone" + "block": "ice" }, { - "block": "andesite" + "block": "ice" + }, + { + "block": "cave_air" } ] } diff --git a/biomes/frozen-mountain.json b/biomes/frozen-mountain.json index d42c403f..88190ad2 100644 --- a/biomes/frozen-mountain.json +++ b/biomes/frozen-mountain.json @@ -9,7 +9,9 @@ "exponent": 4 }, "children": [ - "frozen-mountain-middle" + "frozen-mountain-middle", + "frozen-peak", + "frozen-mountains-cliffs" ], "biomeScatter": [ "PLAINS", diff --git a/biomes/frozen-mountains-cliffs.json b/biomes/frozen-mountains-cliffs.json deleted file mode 100644 index 868dd169..00000000 --- a/biomes/frozen-mountains-cliffs.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "vanillaDerivative": "SNOWY_MOUNTAINS", - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], - "objects": [ - { - "chance": 0.02, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", - "ice-spikes/sp-1", - "ice-spikes/sp-2", - "ice-spikes/sp-3", - "ice-spikes/sp-4", - "ice-spikes/sp-5", - "ice-spikes/tp-1", - "ice-spikes/tp-2", - "ice-spikes/tp-3", - "ice-spikes/tp-4" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.5, - "density": 3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": false - }, - "enabled": true - }, - "place": [ - "frosted-spruce/large-5", - "frosted-spruce/large-6", - "frosted-spruce/large-7", - "frosted-spruce/large-8", - "frosted-spruce/large-9", - "frosted-spruce/large-10", - "frosted-spruce/large-12", - "frosted-spruce/large-13", - "frosted-spruce/large-14", - "frosted-spruce/large-15", - "frosted-spruce/large-16", - "frosted-spruce/large-17", - "frosted-spruce/large-18", - "frosted-spruce/large-19", - "frosted-spruce/large-20", - "frosted-spruce/large-21", - "frosted-spruce/large-22", - "frosted-spruce/large-23", - "frosted-spruce/large-24", - "frosted-spruce/large-25" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.01, - "density": 3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": false - }, - "enabled": true - }, - "place": [ - "frosted-spruce/large-22", - "frosted-spruce/large-23", - "frosted-spruce/large-24", - "frosted-spruce/large-25" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ice-spec-1", - "ice-spikes/ice-spec-2", - "ice-spikes/ice-spec-3", - "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", - "biomeStyle": { - "style": "IRIS" - }, - "decorators": [ - { - "chance": 1, - "variance": { - "style": "IRIS", - "zoom": 0.2 - }, - "palette": [ - { - "data": { - "layers": 1 - }, - "block": "snow" - }, - { - "data": { - "layers": 2 - }, - "block": "snow" - }, - { - "data": { - "layers": 3 - }, - "block": "snow" - }, - { - "data": { - "layers": 4 - }, - "block": "snow" - } - ] - } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" - ], - "name": "Frozen Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "andesite" - }, - { - "weight": 2, - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 14, - "max": 65, - "generator": "plain-cliffs" - } - ], - "childShrinkFactor": 20, - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - "biomeScatter": [ - "SNOWY_TAIGA_MOUNTAINS", - "TAIGA_HILLS", - "MOUNTAINS", - "ICE_SPIKES" - ] -} \ No newline at end of file diff --git a/biomes/frozen-plains-hills.json b/biomes/frozen-plains-hills.json deleted file mode 100644 index 8176c83e..00000000 --- a/biomes/frozen-plains-hills.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "vanillaDerivative": "SNOWY_TAIGA_HILLS", - "decorators": [ - { - "chance": 1, - "variance": { - "style": "IRIS", - "zoom": 0.2 - }, - "palette": [ - { - "data": { - "layers": 1 - }, - "block": "snow" - }, - { - "data": { - "layers": 2 - }, - "block": "snow" - }, - { - "data": { - "layers": 3 - }, - "block": "snow" - }, - { - "data": { - "layers": 4 - }, - "block": "snow" - } - ] - } - ], - "objects": [ - { - "chance": 0.01, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", - "ice-spikes/sp-1", - "ice-spikes/sp-2", - "ice-spikes/sp-3", - "ice-spikes/sp-4", - "ice-spikes/sp-5", - "ice-spikes/tp-1", - "ice-spikes/tp-2", - "ice-spikes/tp-3", - "ice-spikes/tp-4" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ice-spec-1", - "ice-spikes/ice-spec-2", - "ice-spikes/ice-spec-3", - "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "Frozen Hills", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], - "derivative": "ICE_SPIKES", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } -} \ No newline at end of file