From a07ace39135897bd0594f86e85777b7ec08e77cc Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Mon, 5 Jul 2021 19:59:45 -0700 Subject: [PATCH] Better Frozen --- biomes/frozen/beach.json | 40 +++++++++++---------- biomes/frozen/hills.json | 8 ++--- biomes/frozen/ice-cavern.json | 2 +- biomes/frozen/mountain-cliffs.json | 45 ++++++++++++------------ biomes/frozen/mountain-middle.json | 5 ++- biomes/frozen/mountain.json | 4 +-- biomes/frozen/mountains.json | 45 ++++++++++++------------ biomes/frozen/ocean.json | 17 +++++---- biomes/frozen/peak.json | 13 ++++--- biomes/frozen/pines.json | 6 +--- biomes/frozen/redwood-forest.json | 6 +--- biomes/frozen/river.json | 56 +++++++++++++++--------------- biomes/frozen/vander.json | 23 ++++++------ 13 files changed, 134 insertions(+), 136 deletions(-) diff --git a/biomes/frozen/beach.json b/biomes/frozen/beach.json index 01e14864..14bc6657 100644 --- a/biomes/frozen/beach.json +++ b/biomes/frozen/beach.json @@ -1,6 +1,6 @@ { "name": "Frozen Beach", - "derivative": "SNOWY_BEACH", + "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_BEACH", "layers": [ { @@ -55,7 +55,7 @@ ], "objects": [ { - "chance": 0.001, + "chance": 0.01, "density": 3, "snow": 0.35, "rotation": { @@ -68,22 +68,6 @@ "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", @@ -98,6 +82,7 @@ { "chance": 0.01, "density": 3, + "mode": "FAST_MIN_HEIGHT", "snow": 0.35, "rotation": { "yAxis": { @@ -127,6 +112,7 @@ }, { "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -143,7 +129,23 @@ "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" + "ice-spikes/ice-spec-5", + "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" ], "translate": { "x": 0, diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json index 661fca28..ac878d58 100644 --- a/biomes/frozen/hills.json +++ b/biomes/frozen/hills.json @@ -92,6 +92,7 @@ }, { "chance": 0.005, + "mode": "FAST_MIN_HEIGHT", "edit": [{ "find": [{"block": "vine"}], "replace": {"palette": [{"block": "air"}]} @@ -113,12 +114,7 @@ "stone-clutt/obelisk-5", "stone-clutt/obelisk-6", "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + ] } ], "decorators": [{ diff --git a/biomes/frozen/ice-cavern.json b/biomes/frozen/ice-cavern.json index 8addeab1..aa8ce625 100644 --- a/biomes/frozen/ice-cavern.json +++ b/biomes/frozen/ice-cavern.json @@ -1,6 +1,6 @@ { "name": "Frozen Ice Cavern", - "derivative": "FROZEN_OCEAN", + "derivative": "BASALT_DELTAS", "vanillaDerivative": "FROZEN_OCEAN", "layers": [ { diff --git a/biomes/frozen/mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json index b9d115fb..013fddc8 100644 --- a/biomes/frozen/mountain-cliffs.json +++ b/biomes/frozen/mountain-cliffs.json @@ -1,6 +1,6 @@ { "name": "Frozen Mountain Cliffs", - "derivative": "SNOWY_TAIGA_MOUNTAINS", + "derivative": "SNOWY_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", "layers": [ { @@ -58,13 +58,10 @@ "FROZEN_OCEAN", "FROZEN_RIVER" ], - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "objects": [ { - "chance": 0.02, + "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -77,21 +74,6 @@ "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", @@ -106,6 +88,7 @@ }, { "chance": 0.5, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -146,6 +129,7 @@ }, { "chance": 0.01, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -170,6 +154,7 @@ }, { "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -186,7 +171,23 @@ "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" + "ice-spikes/ice-spec-5", + "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" ], "translate": { "x": 0, diff --git a/biomes/frozen/mountain-middle.json b/biomes/frozen/mountain-middle.json index acb10ba2..c9b04b07 100644 --- a/biomes/frozen/mountain-middle.json +++ b/biomes/frozen/mountain-middle.json @@ -1,7 +1,7 @@ { "name": "Frozen Mountain Middle", - "derivative": "SNOWY_TAIGA", - "vanillaDerivative": "SNOWY_TAIGA", + "derivative": "SNOWY_MOUNTAINS", + "vanillaDerivative": "SNOWY_MOUNTAINS", "children": ["frozen/mountain-cliffs"], "generators": [ { @@ -102,7 +102,6 @@ }, "biomeStyle": {"style": "SIMPLEX"}, "biomeZoom": 0.4, - "biomeSkyScatter": ["MOUNTAINS"], "wall": {"palette": [ {"block": "ice"}, {"block": "ice"}, diff --git a/biomes/frozen/mountain.json b/biomes/frozen/mountain.json index c727d4f7..6dd17062 100644 --- a/biomes/frozen/mountain.json +++ b/biomes/frozen/mountain.json @@ -1,7 +1,7 @@ { "name": "Frozen Mountains", - "derivative": "SNOWY_TAIGA", - "vanillaDerivative": "SNOWY_TAIGA", + "derivative": "SNOWY_MOUNTAINS", + "vanillaDerivative": "SNOWY_MOUNTAINS", "children": [ "frozen/mountain-middle", "frozen/peak", diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json index df39fff9..026ca373 100644 --- a/biomes/frozen/mountains.json +++ b/biomes/frozen/mountains.json @@ -1,6 +1,6 @@ { "name": "Frozen Mountains", - "derivative": "SNOWY_TAIGA_MOUNTAINS", + "derivative": "SNOWY_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", "children": ["frozen/peak"], "layers": [ @@ -61,13 +61,10 @@ "generator": "mountain" } ], - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "objects": [ { - "chance": 0.02, + "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -80,22 +77,6 @@ "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", @@ -109,6 +90,7 @@ }, { "chance": 0.5, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -158,6 +140,7 @@ }, { "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -174,7 +157,23 @@ "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" + "ice-spikes/ice-spec-5", + "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" ], "translate": { "x": 0, diff --git a/biomes/frozen/ocean.json b/biomes/frozen/ocean.json index bf19e6a3..d4591afc 100644 --- a/biomes/frozen/ocean.json +++ b/biomes/frozen/ocean.json @@ -92,6 +92,7 @@ "objects": [ { "chance": 0.4, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -105,11 +106,6 @@ }, "onwater": true, "place": [ - "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", @@ -122,7 +118,8 @@ } }, { - "chance": 0.05, + "chance": 0.2, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -153,7 +150,8 @@ } }, { - "chance": 0.3, + "chance": 0.2, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -166,6 +164,11 @@ }, "onwater": true, "place": [ + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", "ice-spikes/ice-spec-1", "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", diff --git a/biomes/frozen/peak.json b/biomes/frozen/peak.json index 35d7045d..00ae55c8 100644 --- a/biomes/frozen/peak.json +++ b/biomes/frozen/peak.json @@ -114,13 +114,10 @@ {"block": "air"} ] }], - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "objects": [ { - "chance": 0.05, + "chance": 0.2, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -151,6 +148,7 @@ }, { "chance": 0.05, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -163,6 +161,11 @@ "enabled": true }, "place": [ + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", "ice-spikes/ice-spec-1", "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json index c4d2f4b1..0fbb97d0 100644 --- a/biomes/frozen/pines.json +++ b/biomes/frozen/pines.json @@ -1,6 +1,6 @@ { "name": "Frozen Pines", - "derivative": "SNOWY_TAIGA_MOUNTAINS", + "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": ["frozen/vander"], "layers": [ @@ -64,10 +64,6 @@ "structure": "village-snowy" } ], - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "objects": [ { "chance": 0.02, diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json index 77a6af3f..c9a6e42c 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -1,6 +1,6 @@ { "name": "Frozen Redwood Forest", - "derivative": "SNOWY_TAIGA_MOUNTAINS", + "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "generators": [ { @@ -43,10 +43,6 @@ ] } ], - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "jigsawStructures": [ { "rarity": 1700, diff --git a/biomes/frozen/river.json b/biomes/frozen/river.json index 20060481..b92872c1 100644 --- a/biomes/frozen/river.json +++ b/biomes/frozen/river.json @@ -1,6 +1,6 @@ { "name": "Frozen River", - "derivative": "DEEP_FROZEN_OCEAN", + "derivative": "FROZEN_RIVER", "vanillaDerivative": "FROZEN_RIVER", "layers": [ {"palette": [ @@ -71,7 +71,7 @@ ], "objects": [ { - "chance": 0.01, + "chance": 0.05, "density": 3, "snow": 0.45, "rotation": { @@ -84,38 +84,38 @@ "enabled": true }, "onwater": true, + "place": [ + "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.2, + "density": 3, + "snow": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "onwater": true, "place": [ "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.1, - "density": 3, - "snow": 0.01, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "onwater": true, - "place": [ "ice-spikes/ice-spec-1", "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json index 23e710e1..be18b535 100644 --- a/biomes/frozen/vander.json +++ b/biomes/frozen/vander.json @@ -1,11 +1,7 @@ { "name": "Frozen Vander", - "derivative": "SNOWY_TAIGA_MOUNTAINS", + "derivative": "SNOWY_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], "children": [ "frozen/peak", "frozen/mountains", @@ -91,7 +87,8 @@ ], "objects": [ { - "chance": 0.03, + "chance": 0.07, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -121,7 +118,8 @@ } }, { - "chance": 0.05, + "chance": 0.1, + "mode": "FAST_MIN_HEIGHT", "density": 3, "rotation": { "yAxis": { @@ -196,7 +194,8 @@ } }, { - "chance": 0.05, + "chance": 0.1, + "mode": "FAST_MIN_HEIGHT", "density": 3, "snow": 0.35, "rotation": { @@ -209,6 +208,11 @@ "enabled": true }, "place": [ + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", "ice-spikes/ice-spec-1", "ice-spikes/ice-spec-2", "ice-spikes/ice-spec-3", @@ -219,8 +223,7 @@ "x": 0, "y": 0, "z": 0 - }, - "mode": "VACUUM" + } } ], "entityInitialSpawns": [