From 063937f74c8b7bae5da122bf3ba2c09c8787e428 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 12:34:17 -0700 Subject: [PATCH 01/26] Drop Generator Complexity --- biomes/frozen-hills.json | 12 +++++++++- biomes/frozen-pine-plains.json | 7 +++++- biomes/frozen-river.json | 2 +- biomes/hot-desert-mountains.json | 2 +- biomes/hot-mesa-river.json | 2 +- biomes/hot-oasis.json | 2 +- biomes/hot-ocean.json | 2 +- biomes/hot-river.json | 4 ++-- biomes/mountain-forest-hills.json | 7 +++++- biomes/mountain-forest.json | 7 +++++- biomes/mountain-middle.json | 2 +- biomes/mountain-plains.json | 7 +++++- biomes/mountain-river-soft.json | 2 +- biomes/mushroom-lake.json | 2 +- biomes/mushroom-ocean-soft.json | 2 +- biomes/ocean-steep.json | 2 +- biomes/ocean-warm-bottom.json | 2 +- biomes/ocean-warm.json | 2 +- biomes/swamp-ocean-tree.json | 2 +- biomes/swamp-ocean.json | 2 +- biomes/temperate-river-loud.json | 2 +- biomes/temperate-soft-river.json | 2 +- biomes/tropical-ocean.json | 2 +- biomes/tundra-lake.json | 2 +- biomes/tundra-river.json | 2 +- generators/mountain-gen.json | 40 ------------------------------- generators/mountain-land.json | 26 -------------------- generators/mountainous.json | 40 ------------------------------- generators/ocean-steep.json | 16 ------------- generators/ocean-steep.json.bak | 16 ------------- generators/soft-river.json | 17 ------------- 31 files changed, 56 insertions(+), 181 deletions(-) delete mode 100644 generators/mountain-gen.json delete mode 100644 generators/mountain-land.json delete mode 100644 generators/mountainous.json delete mode 100644 generators/ocean-steep.json delete mode 100644 generators/ocean-steep.json.bak delete mode 100644 generators/soft-river.json diff --git a/biomes/frozen-hills.json b/biomes/frozen-hills.json index 6e714afb..7ced4741 100644 --- a/biomes/frozen-hills.json +++ b/biomes/frozen-hills.json @@ -5,7 +5,17 @@ "rarity": 3, "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 10, "min": 6 } diff --git a/biomes/frozen-pine-plains.json b/biomes/frozen-pine-plains.json index 72622865..950a31b7 100644 --- a/biomes/frozen-pine-plains.json +++ b/biomes/frozen-pine-plains.json @@ -7,7 +7,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 6, "min": 7 } diff --git a/biomes/frozen-river.json b/biomes/frozen-river.json index 86791f51..bf2eb314 100644 --- a/biomes/frozen-river.json +++ b/biomes/frozen-river.json @@ -153,7 +153,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -19 } diff --git a/biomes/hot-desert-mountains.json b/biomes/hot-desert-mountains.json index 326667f0..9b2962a8 100644 --- a/biomes/hot-desert-mountains.json +++ b/biomes/hot-desert-mountains.json @@ -178,7 +178,7 @@ { "min": 82, "max": 114, - "generator": "mountainous" + "generator": "mountain" } ], "loot": { diff --git a/biomes/hot-mesa-river.json b/biomes/hot-mesa-river.json index dedb6d85..592f1316 100644 --- a/biomes/hot-mesa-river.json +++ b/biomes/hot-mesa-river.json @@ -57,7 +57,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -4, "min": -15 } diff --git a/biomes/hot-oasis.json b/biomes/hot-oasis.json index 5fc44762..1ad168de 100644 --- a/biomes/hot-oasis.json +++ b/biomes/hot-oasis.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -7, "min": -8 } diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index e7de357b..ced92ba9 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -218,7 +218,7 @@ { "min": 11, "max": 7, - "generator": "ocean-steep" + "generator": "canyon-steep" } ], "loot": { diff --git a/biomes/hot-river.json b/biomes/hot-river.json index 57be78d9..184f55da 100644 --- a/biomes/hot-river.json +++ b/biomes/hot-river.json @@ -35,10 +35,10 @@ } ] } - ], + ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -5, "min": -15 } diff --git a/biomes/mountain-forest-hills.json b/biomes/mountain-forest-hills.json index 2abcc466..ccaa9cde 100644 --- a/biomes/mountain-forest-hills.json +++ b/biomes/mountain-forest-hills.json @@ -24,7 +24,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 5, + "min": 2 + }, + { + "generator": "mountain", "max": 4, "min": 3 } diff --git a/biomes/mountain-forest.json b/biomes/mountain-forest.json index 2abcc466..ccaa9cde 100644 --- a/biomes/mountain-forest.json +++ b/biomes/mountain-forest.json @@ -24,7 +24,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 5, + "min": 2 + }, + { + "generator": "mountain", "max": 4, "min": 3 } diff --git a/biomes/mountain-middle.json b/biomes/mountain-middle.json index 75ae0d39..723ba6bf 100644 --- a/biomes/mountain-middle.json +++ b/biomes/mountain-middle.json @@ -26,7 +26,7 @@ "min": 0 }, { - "generator": "mountain-plain", + "generator": "plain", "max": 95, "min": 40 } diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index 7bb82023..e361357c 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -13,7 +13,12 @@ }, "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 8, "min": 7 } diff --git a/biomes/mountain-river-soft.json b/biomes/mountain-river-soft.json index 73629e44..91c5debd 100644 --- a/biomes/mountain-river-soft.json +++ b/biomes/mountain-river-soft.json @@ -107,7 +107,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -32, "min": -40 } diff --git a/biomes/mushroom-lake.json b/biomes/mushroom-lake.json index 7ff8cd93..e9ea33ca 100644 --- a/biomes/mushroom-lake.json +++ b/biomes/mushroom-lake.json @@ -350,7 +350,7 @@ { "min": -30, "max": -10, - "generator": "soft-river" + "generator": "river" } ], "derivative": "MUSHROOM_FIELDS", diff --git a/biomes/mushroom-ocean-soft.json b/biomes/mushroom-ocean-soft.json index 20514e30..52af2219 100644 --- a/biomes/mushroom-ocean-soft.json +++ b/biomes/mushroom-ocean-soft.json @@ -265,7 +265,7 @@ { "min": -31, "max": -7, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json index b439d7fa..4f716a0e 100644 --- a/biomes/ocean-steep.json +++ b/biomes/ocean-steep.json @@ -4,7 +4,7 @@ "vanillaDerivative": "OCEAN", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -5, "min": -25 } diff --git a/biomes/ocean-warm-bottom.json b/biomes/ocean-warm-bottom.json index 0add9b70..7e37fed7 100644 --- a/biomes/ocean-warm-bottom.json +++ b/biomes/ocean-warm-bottom.json @@ -4,7 +4,7 @@ "vanillaDerivative": "WARM_OCEAN", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -30, "min": -40 } diff --git a/biomes/ocean-warm.json b/biomes/ocean-warm.json index f0bb023f..c1122ae4 100644 --- a/biomes/ocean-warm.json +++ b/biomes/ocean-warm.json @@ -13,7 +13,7 @@ "childShrinkFactor": 1.0, "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -19 } diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index aa320d6b..adade079 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -302,7 +302,7 @@ { "min": -1, "max": 0, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/swamp-ocean.json b/biomes/swamp-ocean.json index 12a5fa66..c782125b 100644 --- a/biomes/swamp-ocean.json +++ b/biomes/swamp-ocean.json @@ -215,7 +215,7 @@ { "min": -2, "max": 0, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/temperate-river-loud.json b/biomes/temperate-river-loud.json index d46ceeba..ee5862f9 100644 --- a/biomes/temperate-river-loud.json +++ b/biomes/temperate-river-loud.json @@ -167,7 +167,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -30 } diff --git a/biomes/temperate-soft-river.json b/biomes/temperate-soft-river.json index 4bfa58a0..747d747d 100644 --- a/biomes/temperate-soft-river.json +++ b/biomes/temperate-soft-river.json @@ -167,7 +167,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -40, "min": -50 } diff --git a/biomes/tropical-ocean.json b/biomes/tropical-ocean.json index eb641464..03e6dfd8 100644 --- a/biomes/tropical-ocean.json +++ b/biomes/tropical-ocean.json @@ -361,7 +361,7 @@ { "min": -38, "max": -20, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/tundra-lake.json b/biomes/tundra-lake.json index d05c497a..30951a4c 100644 --- a/biomes/tundra-lake.json +++ b/biomes/tundra-lake.json @@ -501,7 +501,7 @@ { "min": -30, "max": -15, - "generator": "soft-river" + "generator": "river" } ], "derivative": "SNOWY_TUNDRA", diff --git a/biomes/tundra-river.json b/biomes/tundra-river.json index 236771c9..70fbf99f 100644 --- a/biomes/tundra-river.json +++ b/biomes/tundra-river.json @@ -185,7 +185,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -10, "min": -27 } diff --git a/generators/mountain-gen.json b/generators/mountain-gen.json deleted file mode 100644 index 86c44143..00000000 --- a/generators/mountain-gen.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 18 - }, - "seed": 530530, - "composite": [ - { - "seed": 5346, - "style": { - "style": "TRIOCTAVE_FRACTAL_CUBIC", - "zoom": 1.7, - "fracture": { - "style": "IRIS_THICK", - "zoom": 0.8, - "exponent": 1.2, - "multiplier": 55 - } - }, - "exponent": 4, - "negative": true - }, - { - "seed": 1714, - "style": { - "style": "IRIS_THICK", - "zoom": 0.6, - "exponent": 0.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.7, - "multiplier": 50 - } - }, - "negative": true, - "opacity": 0.1 - } - ] -} \ No newline at end of file diff --git a/generators/mountain-land.json b/generators/mountain-land.json deleted file mode 100644 index 819783b8..00000000 --- a/generators/mountain-land.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "interpolator": { - "function": "HERMITE_STARCAST_12", - "horizontalScale": 15 - }, - "seed": 9875476, - "composite": [ - { - "seed": 5644, - "style": { - "style": "IRIS", - "zoom": 1.9, - "fracture": { - "style": "PERLIN_IRIS_DOUBLE", - "zoom": 0.8, - "multiplier": 30, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - } - } - } - ] -} \ No newline at end of file diff --git a/generators/mountainous.json b/generators/mountainous.json deleted file mode 100644 index e15f85c6..00000000 --- a/generators/mountainous.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 10 - }, - "seed": 133434, - "composite": [ - { - "seed": 2343, - "style": { - "style": "BIOCTAVE_FRACTAL_CUBIC", - "zoom": 1.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.2, - "multiplier": 50 - } - }, - "exponent": 4, - "negative": true - }, - { - "seed": 1714, - "style": { - "style": "BIOCTAVE_FRACTAL_BILLOW_SIMPLEX", - "zoom": 0.6, - "exponent": 0.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.2, - "multiplier": 50 - } - }, - "negative": true, - "opacity": 0.1 - } - ] -} \ No newline at end of file diff --git a/generators/ocean-steep.json b/generators/ocean-steep.json deleted file mode 100644 index 3de946fe..00000000 --- a/generators/ocean-steep.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 6 - }, - "seed": 2133, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file diff --git a/generators/ocean-steep.json.bak b/generators/ocean-steep.json.bak deleted file mode 100644 index 3de946fe..00000000 --- a/generators/ocean-steep.json.bak +++ /dev/null @@ -1,16 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 6 - }, - "seed": 2133, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file diff --git a/generators/soft-river.json b/generators/soft-river.json deleted file mode 100644 index 5e8138b1..00000000 --- a/generators/soft-river.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 30 - }, - "seed": 2133, - "exponent": 1.125, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file From 6792baae833ee42ea64336ae46c32dfba50f37b3 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 13:47:20 -0700 Subject: [PATCH 02/26] make this per region you dummy --- biomes/frozen-beach.json | 84 +------- biomes/frozen-plains.json | 84 +------- biomes/frozen-redwood-forest.json | 84 +------- biomes/frozen-river.json | 2 +- biomes/frozen-spruce-plains.json | 84 +------- biomes/hot-acacia-denmyre.json | 84 +------- biomes/hot-desert-dunes-red.json | 84 +------- biomes/hot-desert-dunes.json | 84 +------- biomes/hot-desert-hills.json | 84 +------- biomes/hot-desert.json | 84 +------- biomes/hot-dry-forest.json | 84 +------- biomes/hot-mesa-plateau-dirt-high.json | 2 +- biomes/hot-mesa-plateau-dirt.json | 2 +- biomes/hot-mesa-plateau-high.json | 4 +- biomes/hot-mesa-plateau.json | 4 +- biomes/hot-mesa-river.json | 2 +- biomes/hot-mesa-valleys.json | 82 -------- biomes/hot-mesa-yellow.json | 84 +------- biomes/hot-oasis.json | 2 +- biomes/hot-ocean.json | 2 +- biomes/hot-river.json | 2 +- biomes/hot-savanna-beach-grass.json | 84 +------- biomes/hot-savanna-plateau.json | 86 +------- biomes/hot-savanna.json | 84 +------- biomes/mosaic-lith-black.json | 84 +------- biomes/mosaic-lith-cyan.json | 84 +------- biomes/mosaic-lith-green.json | 84 +------- biomes/mosaic-lith-purple.json | 84 +------- biomes/mosaic-lith-red.json | 84 +------- biomes/mosaic-lith-white.json | 84 +------- biomes/mountain-beach.json | 2 +- biomes/mountains-plains.json | 84 +------- biomes/mushroom-crimson-forest.json | 84 +------- biomes/mushroom-lake.json | 84 +------- biomes/mushroom-plains.json | 84 +------- biomes/mushroom-warped-forest.json | 84 +------- biomes/ocean-steep.json | 2 +- biomes/ocean-warm-bottom.json | 2 +- biomes/ocean-warm.json | 2 +- biomes/swamp-dark-oak-denmyre.json | 84 +------- biomes/swamp-lake.json | 84 +------- biomes/swamp-marsh-rotten.json | 84 +------- biomes/swamp-marsh.json | 84 +------- biomes/swamp-mountain-forest.json | 84 +------- biomes/swamp-roofed-forest.json | 84 +------- biomes/temperate-beach.json | 84 +------- biomes/temperate-birch-denmyre.json | 84 +------- biomes/temperate-birch-forest.json | 84 +------- biomes/temperate-bonsai.json | 84 +------- biomes/temperate-highlands.json | 84 +------- biomes/temperate-longtree-forest.json | 84 +------- biomes/temperate-oak-beach.json | 84 +------- biomes/temperate-oak-denmyre.json | 96 +-------- biomes/temperate-oak-forest.json | 84 +------- biomes/temperate-oak.json | 84 +------- biomes/temperate-plains.json | 84 +------- biomes/temperate-plateau.json | 199 ++++++++++--------- biomes/temperate-river-loud.json | 2 +- biomes/temperate-wilds.json | 84 +------- biomes/tropical-bamboo-forest.json | 84 +------- biomes/tropical-beach.json | 84 +------- biomes/tropical-jungle-denmyre.json | 84 +------- biomes/tropical-mountain-middle.json | 2 +- biomes/tropical-rainforest-island.json | 84 +------- biomes/tropical-rainforest-wicked-child.json | 84 +------- biomes/tropical-rainforest-wicked.json | 84 +------- biomes/tropical-rainforest.json | 84 +------- biomes/tropical-submerged-volcanic.json | 2 +- biomes/tundra-bonsai-forest.json | 84 +------- biomes/tundra-lake.json | 84 +------- biomes/tundra-redwoods-forest.json | 84 +------- biomes/tundra-river-loud.json | 2 +- biomes/tundra-sequia-redwoods.json | 84 +------- biomes/tundra-spruce-denmyre.json | 84 +------- biomes/tundra-taiga.json | 84 +------- generators/flat.json | 15 -- generators/loud-river.json | 16 -- generators/smooth-land-steep.json | 26 --- regions/frozen.json | 85 ++++++++ regions/hot.json | 86 ++++++++ regions/mountains.json | 85 ++++++++ regions/temperate.json | 87 +++++++- regions/tropical.json | 85 ++++++++ 83 files changed, 609 insertions(+), 4913 deletions(-) delete mode 100644 generators/flat.json delete mode 100644 generators/loud-river.json delete mode 100644 generators/smooth-land-steep.json diff --git a/biomes/frozen-beach.json b/biomes/frozen-beach.json index 4d45b974..8eb411c9 100644 --- a/biomes/frozen-beach.json +++ b/biomes/frozen-beach.json @@ -23,89 +23,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "density": 3, diff --git a/biomes/frozen-plains.json b/biomes/frozen-plains.json index e1c35e49..ec1cd45e 100644 --- a/biomes/frozen-plains.json +++ b/biomes/frozen-plains.json @@ -41,89 +41,7 @@ "frozen-hills" ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.000256, "snow": 0.25, diff --git a/biomes/frozen-redwood-forest.json b/biomes/frozen-redwood-forest.json index 7210a27d..83480eeb 100644 --- a/biomes/frozen-redwood-forest.json +++ b/biomes/frozen-redwood-forest.json @@ -5,89 +5,7 @@ "SNOWY_MOUNTAINS" ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.02, "density": 3, diff --git a/biomes/frozen-river.json b/biomes/frozen-river.json index bf2eb314..c222b338 100644 --- a/biomes/frozen-river.json +++ b/biomes/frozen-river.json @@ -153,7 +153,7 @@ ], "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -10, "min": -19 } diff --git a/biomes/frozen-spruce-plains.json b/biomes/frozen-spruce-plains.json index 4c694b5d..fb291e9f 100644 --- a/biomes/frozen-spruce-plains.json +++ b/biomes/frozen-spruce-plains.json @@ -86,89 +86,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.8, "snow": 1, diff --git a/biomes/hot-acacia-denmyre.json b/biomes/hot-acacia-denmyre.json index 5aa4141e..cbec7b1a 100644 --- a/biomes/hot-acacia-denmyre.json +++ b/biomes/hot-acacia-denmyre.json @@ -96,89 +96,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.5, "density": 2, diff --git a/biomes/hot-desert-dunes-red.json b/biomes/hot-desert-dunes-red.json index 1dffd55b..18f98474 100644 --- a/biomes/hot-desert-dunes-red.json +++ b/biomes/hot-desert-dunes-red.json @@ -16,89 +16,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "density": 3, diff --git a/biomes/hot-desert-dunes.json b/biomes/hot-desert-dunes.json index ba27dacb..9eee3045 100644 --- a/biomes/hot-desert-dunes.json +++ b/biomes/hot-desert-dunes.json @@ -16,89 +16,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "density": 3, diff --git a/biomes/hot-desert-hills.json b/biomes/hot-desert-hills.json index f3056e80..d127e81e 100644 --- a/biomes/hot-desert-hills.json +++ b/biomes/hot-desert-hills.json @@ -66,89 +66,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "density": 3, diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index 3e64364f..f844fce4 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -24,89 +24,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "density": 3, diff --git a/biomes/hot-dry-forest.json b/biomes/hot-dry-forest.json index c0b3843b..80458731 100644 --- a/biomes/hot-dry-forest.json +++ b/biomes/hot-dry-forest.json @@ -97,89 +97,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/hot-mesa-plateau-dirt-high.json b/biomes/hot-mesa-plateau-dirt-high.json index aa522fc4..0c890318 100644 --- a/biomes/hot-mesa-plateau-dirt-high.json +++ b/biomes/hot-mesa-plateau-dirt-high.json @@ -10,7 +10,7 @@ { "min": 55, "max": 45, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, diff --git a/biomes/hot-mesa-plateau-dirt.json b/biomes/hot-mesa-plateau-dirt.json index a1e467dc..34325a3a 100644 --- a/biomes/hot-mesa-plateau-dirt.json +++ b/biomes/hot-mesa-plateau-dirt.json @@ -10,7 +10,7 @@ { "min": 33, "max": 35, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, diff --git a/biomes/hot-mesa-plateau-high.json b/biomes/hot-mesa-plateau-high.json index a1fb5b6d..6f42dccd 100644 --- a/biomes/hot-mesa-plateau-high.json +++ b/biomes/hot-mesa-plateau-high.json @@ -14,7 +14,7 @@ { "min": 55, "max": 45, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, @@ -41,7 +41,7 @@ }, "zoom": 0.4, "palette": [ - { + { "block": "red_terracotta" }, { diff --git a/biomes/hot-mesa-plateau.json b/biomes/hot-mesa-plateau.json index f27d52cc..f9b489cc 100644 --- a/biomes/hot-mesa-plateau.json +++ b/biomes/hot-mesa-plateau.json @@ -14,7 +14,7 @@ { "min": 35, "max": 35, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, @@ -41,7 +41,7 @@ }, "zoom": 0.4, "palette": [ - { + { "block": "red_terracotta" }, { diff --git a/biomes/hot-mesa-river.json b/biomes/hot-mesa-river.json index 592f1316..53528c67 100644 --- a/biomes/hot-mesa-river.json +++ b/biomes/hot-mesa-river.json @@ -57,7 +57,7 @@ ], "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -4, "min": -15 } diff --git a/biomes/hot-mesa-valleys.json b/biomes/hot-mesa-valleys.json index 5695d10f..83ccfa78 100644 --- a/biomes/hot-mesa-valleys.json +++ b/biomes/hot-mesa-valleys.json @@ -260,88 +260,6 @@ } } ] - },{ - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" }, { "chance": 0.00175, diff --git a/biomes/hot-mesa-yellow.json b/biomes/hot-mesa-yellow.json index 80b3607a..81b3ef37 100644 --- a/biomes/hot-mesa-yellow.json +++ b/biomes/hot-mesa-yellow.json @@ -72,89 +72,7 @@ "hot-mesa-dark" ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "rotation": { "yAxis": { diff --git a/biomes/hot-oasis.json b/biomes/hot-oasis.json index 1ad168de..8583a71d 100644 --- a/biomes/hot-oasis.json +++ b/biomes/hot-oasis.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -7, "min": -8 } diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index ced92ba9..0a75011f 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -218,7 +218,7 @@ { "min": 11, "max": 7, - "generator": "canyon-steep" + "generator": "plain" } ], "loot": { diff --git a/biomes/hot-river.json b/biomes/hot-river.json index 184f55da..31237f8c 100644 --- a/biomes/hot-river.json +++ b/biomes/hot-river.json @@ -38,7 +38,7 @@ ], "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -5, "min": -15 } diff --git a/biomes/hot-savanna-beach-grass.json b/biomes/hot-savanna-beach-grass.json index 0b758475..a9dbb28e 100644 --- a/biomes/hot-savanna-beach-grass.json +++ b/biomes/hot-savanna-beach-grass.json @@ -27,89 +27,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "rotation": { diff --git a/biomes/hot-savanna-plateau.json b/biomes/hot-savanna-plateau.json index 4a4532fc..01040d97 100644 --- a/biomes/hot-savanna-plateau.json +++ b/biomes/hot-savanna-plateau.json @@ -82,89 +82,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.00175, "rotation": { @@ -391,7 +309,7 @@ { "min": 15, "max": 20, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, diff --git a/biomes/hot-savanna.json b/biomes/hot-savanna.json index 14826702..601ecf5a 100644 --- a/biomes/hot-savanna.json +++ b/biomes/hot-savanna.json @@ -85,89 +85,7 @@ "hot-savanna-cliff" ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.00175, "rotation": { diff --git a/biomes/mosaic-lith-black.json b/biomes/mosaic-lith-black.json index 39fcc880..d792672d 100644 --- a/biomes/mosaic-lith-black.json +++ b/biomes/mosaic-lith-black.json @@ -53,89 +53,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mosaic-lith-cyan.json b/biomes/mosaic-lith-cyan.json index 1897e2db..2443b601 100644 --- a/biomes/mosaic-lith-cyan.json +++ b/biomes/mosaic-lith-cyan.json @@ -63,89 +63,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mosaic-lith-green.json b/biomes/mosaic-lith-green.json index 52b53355..3e601f73 100644 --- a/biomes/mosaic-lith-green.json +++ b/biomes/mosaic-lith-green.json @@ -61,89 +61,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mosaic-lith-purple.json b/biomes/mosaic-lith-purple.json index 8b93fe36..575a72b6 100644 --- a/biomes/mosaic-lith-purple.json +++ b/biomes/mosaic-lith-purple.json @@ -42,89 +42,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mosaic-lith-red.json b/biomes/mosaic-lith-red.json index d0cf5fcb..071cfb8a 100644 --- a/biomes/mosaic-lith-red.json +++ b/biomes/mosaic-lith-red.json @@ -130,89 +130,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mosaic-lith-white.json b/biomes/mosaic-lith-white.json index d95ed61c..ff053d22 100644 --- a/biomes/mosaic-lith-white.json +++ b/biomes/mosaic-lith-white.json @@ -24,89 +24,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.06, "edit": [ diff --git a/biomes/mountain-beach.json b/biomes/mountain-beach.json index 142be71f..b339f503 100644 --- a/biomes/mountain-beach.json +++ b/biomes/mountain-beach.json @@ -64,7 +64,7 @@ { "min": 0, "max": 2, - "generator": "flat" + "generator": "plain" } ], "loot": { diff --git a/biomes/mountains-plains.json b/biomes/mountains-plains.json index 1d192bbb..04f5a805 100644 --- a/biomes/mountains-plains.json +++ b/biomes/mountains-plains.json @@ -147,89 +147,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "place": [ "tree/oak/1", diff --git a/biomes/mushroom-crimson-forest.json b/biomes/mushroom-crimson-forest.json index 226c750d..bd436489 100644 --- a/biomes/mushroom-crimson-forest.json +++ b/biomes/mushroom-crimson-forest.json @@ -61,89 +61,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.21, "density": 2, diff --git a/biomes/mushroom-lake.json b/biomes/mushroom-lake.json index e9ea33ca..802bce1e 100644 --- a/biomes/mushroom-lake.json +++ b/biomes/mushroom-lake.json @@ -68,89 +68,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.08, "density": 2, diff --git a/biomes/mushroom-plains.json b/biomes/mushroom-plains.json index e7dee366..6ea94e4a 100644 --- a/biomes/mushroom-plains.json +++ b/biomes/mushroom-plains.json @@ -68,89 +68,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.08, "density": 2, diff --git a/biomes/mushroom-warped-forest.json b/biomes/mushroom-warped-forest.json index 2a69c56f..e8bf5631 100644 --- a/biomes/mushroom-warped-forest.json +++ b/biomes/mushroom-warped-forest.json @@ -78,89 +78,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.21, "density": 2, diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json index 4f716a0e..0b6bac65 100644 --- a/biomes/ocean-steep.json +++ b/biomes/ocean-steep.json @@ -4,7 +4,7 @@ "vanillaDerivative": "OCEAN", "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -5, "min": -25 } diff --git a/biomes/ocean-warm-bottom.json b/biomes/ocean-warm-bottom.json index 7e37fed7..2e03e5a3 100644 --- a/biomes/ocean-warm-bottom.json +++ b/biomes/ocean-warm-bottom.json @@ -4,7 +4,7 @@ "vanillaDerivative": "WARM_OCEAN", "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -30, "min": -40 } diff --git a/biomes/ocean-warm.json b/biomes/ocean-warm.json index c1122ae4..86ce8ab8 100644 --- a/biomes/ocean-warm.json +++ b/biomes/ocean-warm.json @@ -13,7 +13,7 @@ "childShrinkFactor": 1.0, "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -10, "min": -19 } diff --git a/biomes/swamp-dark-oak-denmyre.json b/biomes/swamp-dark-oak-denmyre.json index fd3aea18..79b05d56 100644 --- a/biomes/swamp-dark-oak-denmyre.json +++ b/biomes/swamp-dark-oak-denmyre.json @@ -79,89 +79,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/swamp-lake.json b/biomes/swamp-lake.json index 2b62aec1..1d038337 100644 --- a/biomes/swamp-lake.json +++ b/biomes/swamp-lake.json @@ -84,89 +84,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.35, "density": 2, diff --git a/biomes/swamp-marsh-rotten.json b/biomes/swamp-marsh-rotten.json index a4606cfc..cf143340 100644 --- a/biomes/swamp-marsh-rotten.json +++ b/biomes/swamp-marsh-rotten.json @@ -71,89 +71,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.4, "density": 2, diff --git a/biomes/swamp-marsh.json b/biomes/swamp-marsh.json index 4a7c4be7..1b66d708 100644 --- a/biomes/swamp-marsh.json +++ b/biomes/swamp-marsh.json @@ -84,89 +84,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "place": [ "tree/jungle/1", diff --git a/biomes/swamp-mountain-forest.json b/biomes/swamp-mountain-forest.json index 884e1d41..26a45f76 100644 --- a/biomes/swamp-mountain-forest.json +++ b/biomes/swamp-mountain-forest.json @@ -98,89 +98,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.000256, "rotation": { diff --git a/biomes/swamp-roofed-forest.json b/biomes/swamp-roofed-forest.json index 4053012a..4799bc3d 100644 --- a/biomes/swamp-roofed-forest.json +++ b/biomes/swamp-roofed-forest.json @@ -101,89 +101,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.05, "edit": [ diff --git a/biomes/temperate-beach.json b/biomes/temperate-beach.json index 03d313ce..9357e13b 100644 --- a/biomes/temperate-beach.json +++ b/biomes/temperate-beach.json @@ -82,89 +82,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/temperate-birch-denmyre.json b/biomes/temperate-birch-denmyre.json index b858a514..c2f11ec3 100644 --- a/biomes/temperate-birch-denmyre.json +++ b/biomes/temperate-birch-denmyre.json @@ -95,89 +95,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index b811c1c0..8711da68 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -37,89 +37,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/temperate-bonsai.json b/biomes/temperate-bonsai.json index e43f6a47..5c27d8ce 100644 --- a/biomes/temperate-bonsai.json +++ b/biomes/temperate-bonsai.json @@ -146,89 +146,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.3, "rotation": { diff --git a/biomes/temperate-highlands.json b/biomes/temperate-highlands.json index 95889582..2deab915 100644 --- a/biomes/temperate-highlands.json +++ b/biomes/temperate-highlands.json @@ -119,89 +119,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.35, "density": 2, diff --git a/biomes/temperate-longtree-forest.json b/biomes/temperate-longtree-forest.json index 2e877c22..c1dd82f7 100644 --- a/biomes/temperate-longtree-forest.json +++ b/biomes/temperate-longtree-forest.json @@ -359,89 +359,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.7, "rotation": { diff --git a/biomes/temperate-oak-beach.json b/biomes/temperate-oak-beach.json index cc326688..161089c8 100644 --- a/biomes/temperate-oak-beach.json +++ b/biomes/temperate-oak-beach.json @@ -27,89 +27,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.001, "rotation": { diff --git a/biomes/temperate-oak-denmyre.json b/biomes/temperate-oak-denmyre.json index 4d678901..a35b5739 100644 --- a/biomes/temperate-oak-denmyre.json +++ b/biomes/temperate-oak-denmyre.json @@ -24,7 +24,7 @@ }, { "block": "grass" - }, + }, { "block": "grass" }, @@ -64,7 +64,7 @@ } ] }, - { + { "chance": 0.02, "variance": { "style": "STATIC" @@ -76,7 +76,7 @@ } ] }, - { + { "chance": 0.03, "variance": { "style": "STATIC" @@ -88,7 +88,7 @@ } ] }, - { + { "chance": 0.05, "variance": { "style": "STATIC" @@ -101,7 +101,7 @@ } ] }, - { + { "chance": 0.05, "variance": { "style": "STATIC" @@ -113,7 +113,7 @@ "block": "poppy" } ] - }, + }, { "chance": 0.03, "variance": { @@ -153,89 +153,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.00975, diff --git a/biomes/temperate-oak-forest.json b/biomes/temperate-oak-forest.json index 3172bc32..8276a4e0 100644 --- a/biomes/temperate-oak-forest.json +++ b/biomes/temperate-oak-forest.json @@ -37,89 +37,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.07, "rotation": { diff --git a/biomes/temperate-oak.json b/biomes/temperate-oak.json index 12035c30..92a85d69 100644 --- a/biomes/temperate-oak.json +++ b/biomes/temperate-oak.json @@ -186,89 +186,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "place": [ "boulder/boulder1", diff --git a/biomes/temperate-plains.json b/biomes/temperate-plains.json index 8576b500..25067d97 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate-plains.json @@ -142,89 +142,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "VACUUM", "chance": 0.00975, diff --git a/biomes/temperate-plateau.json b/biomes/temperate-plateau.json index 43ec5dc6..4a1205c4 100644 --- a/biomes/temperate-plateau.json +++ b/biomes/temperate-plateau.json @@ -104,7 +104,7 @@ } ] }, - "chance": 0.20 + "chance": 0.2 } ], "mode": "VACUUM", @@ -315,25 +315,31 @@ "biomeStyle": { "style": "IRIS" }, - "decorators": [ - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "weight": 1, - "block": "grass" - }, - { - "block": "grass" - }, - { - "block": "grass" - }, - { + "decorators": [ + { + "chance": 0.8, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "weight": 1, + "block": "grass" + }, + { + "block": "grass" + }, + { + "block": "grass" + }, + { + "chance": 7, + "block": "grass" + } + ] + }, + { "chance": 0.8, "variance": { "style": "STATIC" @@ -347,90 +353,85 @@ "style": { "style": "STATIC" } + }, + { + "chance": 0.03, + "variance": { + "style": "STATIC" }, - { - "chance": 7, - "block": "grass" - } - ] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "block": "oak_leaves", - "data": { + "zoom": 0.2, + "palette": [ + { + "block": "oak_leaves", + "data": { "persistent": true } - } - ] - }, - { - "chance": 0.02, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { + } + ] + }, + { + "chance": 0.02, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { "block": "tall_grass" - } - ] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { + } + ] + }, + { + "chance": 0.03, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { "block": "rose_bush" - } - ] - }, - { - "chance": 0.05, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "chance": 3, - "block": "red_mushroom" - } - ] - }, - { - "chance": 0.05, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { - "chance": 3, - "block": "poppy" - } - ] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [ - { + } + ] + }, + { + "chance": 0.05, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "chance": 3, + "block": "red_mushroom" + } + ] + }, + { + "chance": 0.05, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "chance": 3, + "block": "poppy" + } + ] + }, + { + "chance": 0.03, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { "block": "cobblestone_slab" - } - ] - }], + } + ] + } + ], "name": "temperate plateau", "layers": [ { @@ -485,7 +486,7 @@ { "min": 30, "max": 55, - "generator": "smooth-land-steep" + "generator": "canyon-steep" }, { "min": 2, diff --git a/biomes/temperate-river-loud.json b/biomes/temperate-river-loud.json index ee5862f9..94ef2dd0 100644 --- a/biomes/temperate-river-loud.json +++ b/biomes/temperate-river-loud.json @@ -167,7 +167,7 @@ ], "generators": [ { - "generator": "canyon-steep", + "generator": "plain", "max": -10, "min": -30 } diff --git a/biomes/temperate-wilds.json b/biomes/temperate-wilds.json index 07bb3c4c..d2e47ac4 100644 --- a/biomes/temperate-wilds.json +++ b/biomes/temperate-wilds.json @@ -149,89 +149,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.125, "place": [ diff --git a/biomes/tropical-bamboo-forest.json b/biomes/tropical-bamboo-forest.json index 68b06cae..78cef964 100644 --- a/biomes/tropical-bamboo-forest.json +++ b/biomes/tropical-bamboo-forest.json @@ -3,89 +3,7 @@ "BAMBOO_JUNGLE" ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.5, "rotation": { diff --git a/biomes/tropical-beach.json b/biomes/tropical-beach.json index 139ef404..05b9531d 100644 --- a/biomes/tropical-beach.json +++ b/biomes/tropical-beach.json @@ -82,89 +82,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 1, "edit": [ diff --git a/biomes/tropical-jungle-denmyre.json b/biomes/tropical-jungle-denmyre.json index d2813085..a66fd324 100644 --- a/biomes/tropical-jungle-denmyre.json +++ b/biomes/tropical-jungle-denmyre.json @@ -86,89 +86,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.5, "density": 2, diff --git a/biomes/tropical-mountain-middle.json b/biomes/tropical-mountain-middle.json index 09ccfd79..5d48b8bd 100644 --- a/biomes/tropical-mountain-middle.json +++ b/biomes/tropical-mountain-middle.json @@ -21,7 +21,7 @@ "min": 20 }, { - "generator": "canyon-steep", + "generator": "plain", "max": 50, "min": 0 } diff --git a/biomes/tropical-rainforest-island.json b/biomes/tropical-rainforest-island.json index 98b3ff6e..85a9b6c9 100644 --- a/biomes/tropical-rainforest-island.json +++ b/biomes/tropical-rainforest-island.json @@ -124,89 +124,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tropical-rainforest-wicked-child.json b/biomes/tropical-rainforest-wicked-child.json index 5a12fa44..c4864001 100644 --- a/biomes/tropical-rainforest-wicked-child.json +++ b/biomes/tropical-rainforest-wicked-child.json @@ -113,89 +113,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tropical-rainforest-wicked.json b/biomes/tropical-rainforest-wicked.json index da377084..4e38b263 100644 --- a/biomes/tropical-rainforest-wicked.json +++ b/biomes/tropical-rainforest-wicked.json @@ -119,89 +119,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tropical-rainforest.json b/biomes/tropical-rainforest.json index cf23dd13..1eaad210 100644 --- a/biomes/tropical-rainforest.json +++ b/biomes/tropical-rainforest.json @@ -127,89 +127,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tropical-submerged-volcanic.json b/biomes/tropical-submerged-volcanic.json index 2b16289e..401b44bd 100644 --- a/biomes/tropical-submerged-volcanic.json +++ b/biomes/tropical-submerged-volcanic.json @@ -86,7 +86,7 @@ { "min": -24, "max": -3, - "generator": "smooth-land-steep" + "generator": "canyon-steep" } ], "loot": { diff --git a/biomes/tundra-bonsai-forest.json b/biomes/tundra-bonsai-forest.json index e1e53a47..dfbadcc4 100644 --- a/biomes/tundra-bonsai-forest.json +++ b/biomes/tundra-bonsai-forest.json @@ -181,89 +181,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.00375, "rotation": { diff --git a/biomes/tundra-lake.json b/biomes/tundra-lake.json index 30951a4c..f63fe6d4 100644 --- a/biomes/tundra-lake.json +++ b/biomes/tundra-lake.json @@ -168,89 +168,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tundra-redwoods-forest.json b/biomes/tundra-redwoods-forest.json index e10a6363..6c7a4dc7 100644 --- a/biomes/tundra-redwoods-forest.json +++ b/biomes/tundra-redwoods-forest.json @@ -163,89 +163,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "place": [ diff --git a/biomes/tundra-river-loud.json b/biomes/tundra-river-loud.json index f419886d..f6b84b8c 100644 --- a/biomes/tundra-river-loud.json +++ b/biomes/tundra-river-loud.json @@ -185,7 +185,7 @@ ], "generators": [ { - "generator": "loud-river", + "generator": "river", "max": -15, "min": -20 } diff --git a/biomes/tundra-sequia-redwoods.json b/biomes/tundra-sequia-redwoods.json index c7b7ecb9..0293aa65 100644 --- a/biomes/tundra-sequia-redwoods.json +++ b/biomes/tundra-sequia-redwoods.json @@ -181,89 +181,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "place": [ "patch/graveldirt1", diff --git a/biomes/tundra-spruce-denmyre.json b/biomes/tundra-spruce-denmyre.json index 2a29bb00..1d791d06 100644 --- a/biomes/tundra-spruce-denmyre.json +++ b/biomes/tundra-spruce-denmyre.json @@ -168,89 +168,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tundra-taiga.json b/biomes/tundra-taiga.json index b65b4937..9293f077 100644 --- a/biomes/tundra-taiga.json +++ b/biomes/tundra-taiga.json @@ -154,89 +154,7 @@ } ], "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - }, + { "chance": 0.00256, "rotation": { diff --git a/generators/flat.json b/generators/flat.json deleted file mode 100644 index 95f43f1e..00000000 --- a/generators/flat.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_12", - "horizontalScale": 40 - }, - "seed": 41240, - "composite": [ - { - "seed": 2343, - "style": { - "style": "FLAT" - } - } - ] -} diff --git a/generators/loud-river.json b/generators/loud-river.json deleted file mode 100644 index 676c92ca..00000000 --- a/generators/loud-river.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 1 - }, - "seed": 2133, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} diff --git a/generators/smooth-land-steep.json b/generators/smooth-land-steep.json deleted file mode 100644 index 3f164635..00000000 --- a/generators/smooth-land-steep.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 5 - }, - "seed": 133434, - "composite": [ - { - "seed": 2343, - "style": { - "style": "SIMPLEX", - "zoom": 1.9, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "multiplier": 30, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - } - } - } - ] -} \ No newline at end of file diff --git a/regions/frozen.json b/regions/frozen.json index 348da1dc..2d98c871 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -86,6 +86,91 @@ "frozen-clutter" ] }, + "objects": [ + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "ruined_portal/giant_portal_1", + "ruined_portal/giant_portal_2", + "ruined_portal/giant_portal_3", + "ruined_portal/portal_1", + "ruined_portal/portal_2", + "ruined_portal/portal_3", + "ruined_portal/portal_4", + "ruined_portal/portal_5", + "ruined_portal/portal_6", + "ruined_portal/portal_7", + "ruined_portal/portal_8", + "ruined_portal/portal_9", + "ruined_portal/portal_10" + ], + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + }, + "chance": 0.1 + }, + { + "find": [ + { + "block": "netherrack" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.07 + }, + { + "find": [ + { + "block": "obsidian" + } + ], + "replace": { + "palette": [ + { + "block": "crying_obsidian" + } + ] + }, + "chance": 0.15 + }, + { + "find": [ + { + "block": "lava" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.20 + } + ], + "mode": "VACUUM", + "carvingSupport": "SURFACE_ONLY" + } + ], "shoreHeightZoom": 1.14, "riverThickness": 0.006, "rarity": 8 diff --git a/regions/hot.json b/regions/hot.json index 233e34a3..309faa56 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -154,6 +154,92 @@ "particleCount": 0 } ], + "objects": [ + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "ruined_portal/giant_portal_1", + "ruined_portal/giant_portal_2", + "ruined_portal/giant_portal_3", + "ruined_portal/portal_1", + "ruined_portal/portal_2", + "ruined_portal/portal_3", + "ruined_portal/portal_4", + "ruined_portal/portal_5", + "ruined_portal/portal_6", + "ruined_portal/portal_7", + "ruined_portal/portal_8", + "ruined_portal/portal_9", + "ruined_portal/portal_10" + ], + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + }, + "chance": 0.1 + }, + { + "find": [ + { + "block": "netherrack" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.07 + }, + { + "find": [ + { + "block": "obsidian" + } + ], + "replace": { + "palette": [ + { + "block": "crying_obsidian" + } + ] + }, + "chance": 0.15 + }, + { + "find": [ + { + "block": "lava" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.20 + } + ], + "mode": "VACUUM", + "carvingSupport": "SURFACE_ONLY" + } + ], + "shoreHeightMin": 3.2, "shoreBiomes": [ "hot-beach-grass", diff --git a/regions/mountains.json b/regions/mountains.json index 09f94e5f..99e8c39e 100644 --- a/regions/mountains.json +++ b/regions/mountains.json @@ -17,6 +17,91 @@ "tundra-spiked-cavern", "temperate-lit-cavern" ], + "objects": [ + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "ruined_portal/giant_portal_1", + "ruined_portal/giant_portal_2", + "ruined_portal/giant_portal_3", + "ruined_portal/portal_1", + "ruined_portal/portal_2", + "ruined_portal/portal_3", + "ruined_portal/portal_4", + "ruined_portal/portal_5", + "ruined_portal/portal_6", + "ruined_portal/portal_7", + "ruined_portal/portal_8", + "ruined_portal/portal_9", + "ruined_portal/portal_10" + ], + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + }, + "chance": 0.1 + }, + { + "find": [ + { + "block": "netherrack" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.07 + }, + { + "find": [ + { + "block": "obsidian" + } + ], + "replace": { + "palette": [ + { + "block": "crying_obsidian" + } + ] + }, + "chance": 0.15 + }, + { + "find": [ + { + "block": "lava" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.20 + } + ], + "mode": "VACUUM", + "carvingSupport": "SURFACE_ONLY" + } + ], "riverStyle": { "style": "VASCULAR", "zoom": 4.77, diff --git a/regions/temperate.json b/regions/temperate.json index 6710ede1..93fb0c82 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -20,7 +20,7 @@ "temperate-oak-forest", "temperate-plains", "temperate-birch-forest" - + ], "biomeImplosionRatio": 0.25, "seaBiomes": [ @@ -45,6 +45,91 @@ "varience": 4 } ], + "objects": [ + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "ruined_portal/giant_portal_1", + "ruined_portal/giant_portal_2", + "ruined_portal/giant_portal_3", + "ruined_portal/portal_1", + "ruined_portal/portal_2", + "ruined_portal/portal_3", + "ruined_portal/portal_4", + "ruined_portal/portal_5", + "ruined_portal/portal_6", + "ruined_portal/portal_7", + "ruined_portal/portal_8", + "ruined_portal/portal_9", + "ruined_portal/portal_10" + ], + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + }, + "chance": 0.1 + }, + { + "find": [ + { + "block": "netherrack" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.07 + }, + { + "find": [ + { + "block": "obsidian" + } + ], + "replace": { + "palette": [ + { + "block": "crying_obsidian" + } + ] + }, + "chance": 0.15 + }, + { + "find": [ + { + "block": "lava" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.20 + } + ], + "mode": "VACUUM", + "carvingSupport": "SURFACE_ONLY" + } + ], "riverRarity": 1, "caveBiomes": [ "temperate-old-cavern", diff --git a/regions/tropical.json b/regions/tropical.json index f5a75b08..1d1b6a0f 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -81,6 +81,91 @@ "global-tools" ] }, + "objects": [ + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "ruined_portal/giant_portal_1", + "ruined_portal/giant_portal_2", + "ruined_portal/giant_portal_3", + "ruined_portal/portal_1", + "ruined_portal/portal_2", + "ruined_portal/portal_3", + "ruined_portal/portal_4", + "ruined_portal/portal_5", + "ruined_portal/portal_6", + "ruined_portal/portal_7", + "ruined_portal/portal_8", + "ruined_portal/portal_9", + "ruined_portal/portal_10" + ], + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "air" + } + ] + }, + "chance": 0.1 + }, + { + "find": [ + { + "block": "netherrack" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.07 + }, + { + "find": [ + { + "block": "obsidian" + } + ], + "replace": { + "palette": [ + { + "block": "crying_obsidian" + } + ] + }, + "chance": 0.15 + }, + { + "find": [ + { + "block": "lava" + } + ], + "replace": { + "palette": [ + { + "block": "magma_block" + } + ] + }, + "chance": 0.20 + } + ], + "mode": "VACUUM", + "carvingSupport": "SURFACE_ONLY" + } + ], "shoreHeightZoom": 2.14, "rarity": 4 } \ No newline at end of file From 26125133b3aceb2fdc2c15dd1ef32dfe60c44346 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 14:05:36 -0700 Subject: [PATCH 03/26] latgest tweak, still looks the same lmao --- biomes/.util/ruined_portals.json | 2 +- biomes/frozen-pine-hills.json | 2 +- biomes/frozen-plains.json | 7 +++++- biomes/frozen-spruce-hills.json | 2 +- biomes/frozen-spruce-plains.json | 2 +- biomes/hot-desert-red.json | 2 +- biomes/hot-desert.json | 2 +- biomes/hot-mesa-plateau-dirt-high.json | 2 +- biomes/hot-mesa-plateau-dirt.json | 2 +- biomes/hot-mesa-plateau-high.json | 2 +- biomes/hot-mesa-plateau.json | 2 +- biomes/hot-mesa-valleys.json | 2 +- biomes/hot-mountain-plains.json | 2 +- biomes/hot-savanna-plateau.json | 2 +- biomes/hot-savanna.json | 7 +++++- biomes/mountain-cliffs.json | 7 +++++- biomes/mountain-hills.json | 2 +- biomes/mountain-main.json | 7 +++++- biomes/mountain.json | 8 ++++++- biomes/mountains-plains-hills.json | 2 +- biomes/mountains-plains.json | 2 +- biomes/ocean-deep.json | 2 +- biomes/temperate-birch-forest.json | 2 +- biomes/temperate-bonsai.json | 2 +- biomes/temperate-longtree-forest.json | 2 +- biomes/temperate-oak-hills.json | 2 +- biomes/temperate-oak.json | 2 +- biomes/temperate-plateau.json | 2 +- biomes/tropical-lake.json | 2 +- biomes/tropical-mountain-middle.json | 2 +- biomes/tropical-mountain.json | 2 +- biomes/tropical-plains-hills.json | 2 +- biomes/tropical-plains.json | 2 +- biomes/tundra-forest-cliffs.json | 2 +- biomes/tundra-forest.json | 2 +- biomes/tundra-redwoods-forest.json | 2 +- generators/mountain-plain.json | 22 ------------------- .../{desert-dunes.json => smooth-dunes.json} | 0 38 files changed, 62 insertions(+), 58 deletions(-) delete mode 100644 generators/mountain-plain.json rename generators/{desert-dunes.json => smooth-dunes.json} (100%) diff --git a/biomes/.util/ruined_portals.json b/biomes/.util/ruined_portals.json index 2ba8dac8..4b843102 100644 --- a/biomes/.util/ruined_portals.json +++ b/biomes/.util/ruined_portals.json @@ -13,7 +13,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "min": 0, "max": 10 } diff --git a/biomes/frozen-pine-hills.json b/biomes/frozen-pine-hills.json index 2e721caa..89acd561 100644 --- a/biomes/frozen-pine-hills.json +++ b/biomes/frozen-pine-hills.json @@ -4,7 +4,7 @@ "vanillaDerivative": "SNOWY_TAIGA", "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 20, "min": 6 } diff --git a/biomes/frozen-plains.json b/biomes/frozen-plains.json index ec1cd45e..1d0f4c8d 100644 --- a/biomes/frozen-plains.json +++ b/biomes/frozen-plains.json @@ -305,7 +305,12 @@ { "min": 4, "max": 6, - "generator": "mountain-plain" + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" } ], "wall": { diff --git a/biomes/frozen-spruce-hills.json b/biomes/frozen-spruce-hills.json index dc704b29..52eab118 100644 --- a/biomes/frozen-spruce-hills.json +++ b/biomes/frozen-spruce-hills.json @@ -4,7 +4,7 @@ "vanillaDerivative": "SNOWY_TAIGA", "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 20, "min": 6 } diff --git a/biomes/frozen-spruce-plains.json b/biomes/frozen-spruce-plains.json index fb291e9f..5b0a82f8 100644 --- a/biomes/frozen-spruce-plains.json +++ b/biomes/frozen-spruce-plains.json @@ -7,7 +7,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 6, "min": 3 } diff --git a/biomes/hot-desert-red.json b/biomes/hot-desert-red.json index d1b98b61..2a426df2 100644 --- a/biomes/hot-desert-red.json +++ b/biomes/hot-desert-red.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "desert-dunes", + "generator": "smooth-dunes", "max": 35, "min": 25 } diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index f844fce4..f16b02a2 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 18, "min": -8 } diff --git a/biomes/hot-mesa-plateau-dirt-high.json b/biomes/hot-mesa-plateau-dirt-high.json index 0c890318..40def21c 100644 --- a/biomes/hot-mesa-plateau-dirt-high.json +++ b/biomes/hot-mesa-plateau-dirt-high.json @@ -15,7 +15,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/hot-mesa-plateau-dirt.json b/biomes/hot-mesa-plateau-dirt.json index 34325a3a..edc6b8df 100644 --- a/biomes/hot-mesa-plateau-dirt.json +++ b/biomes/hot-mesa-plateau-dirt.json @@ -15,7 +15,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/hot-mesa-plateau-high.json b/biomes/hot-mesa-plateau-high.json index 6f42dccd..94cc9213 100644 --- a/biomes/hot-mesa-plateau-high.json +++ b/biomes/hot-mesa-plateau-high.json @@ -19,7 +19,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/hot-mesa-plateau.json b/biomes/hot-mesa-plateau.json index f9b489cc..4d665b56 100644 --- a/biomes/hot-mesa-plateau.json +++ b/biomes/hot-mesa-plateau.json @@ -19,7 +19,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/hot-mesa-valleys.json b/biomes/hot-mesa-valleys.json index 83ccfa78..9cdee0da 100644 --- a/biomes/hot-mesa-valleys.json +++ b/biomes/hot-mesa-valleys.json @@ -6,7 +6,7 @@ { "min": 5, "max": 15, - "generator": "smooth-land" + "generator": "smooth-dunes" } ], "jigsawStructures": [ diff --git a/biomes/hot-mountain-plains.json b/biomes/hot-mountain-plains.json index a663ca47..0a6d22f7 100644 --- a/biomes/hot-mountain-plains.json +++ b/biomes/hot-mountain-plains.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 2, "min": 3 } diff --git a/biomes/hot-savanna-plateau.json b/biomes/hot-savanna-plateau.json index 01040d97..3703e538 100644 --- a/biomes/hot-savanna-plateau.json +++ b/biomes/hot-savanna-plateau.json @@ -314,7 +314,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/hot-savanna.json b/biomes/hot-savanna.json index 601ecf5a..c2967ea0 100644 --- a/biomes/hot-savanna.json +++ b/biomes/hot-savanna.json @@ -312,7 +312,12 @@ { "min": 7, "max": 15, - "generator": "mountain-plain" + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" } ], "biomeZoom": 20, diff --git a/biomes/mountain-cliffs.json b/biomes/mountain-cliffs.json index 0a9d775b..dfe43c19 100644 --- a/biomes/mountain-cliffs.json +++ b/biomes/mountain-cliffs.json @@ -53,7 +53,12 @@ { "min": 11, "max": 32, - "generator": "mountain-plain" + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" }, { "min": 12, diff --git a/biomes/mountain-hills.json b/biomes/mountain-hills.json index 6732457d..13d75bec 100644 --- a/biomes/mountain-hills.json +++ b/biomes/mountain-hills.json @@ -11,7 +11,7 @@ }, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 23, "min": 5 } diff --git a/biomes/mountain-main.json b/biomes/mountain-main.json index 0e71d563..8d1c44b0 100644 --- a/biomes/mountain-main.json +++ b/biomes/mountain-main.json @@ -20,7 +20,12 @@ { "min": 70, "max": 120, - "generator": "mountain-plain" + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" } ], "layers": [ diff --git a/biomes/mountain.json b/biomes/mountain.json index f925ed18..72ae5478 100644 --- a/biomes/mountain.json +++ b/biomes/mountain.json @@ -16,8 +16,14 @@ { "min": 70, "max": 140, - "generator": "mountain-plain" + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" } + ], "layers": [ { diff --git a/biomes/mountains-plains-hills.json b/biomes/mountains-plains-hills.json index 63470a49..32d10158 100644 --- a/biomes/mountains-plains-hills.json +++ b/biomes/mountains-plains-hills.json @@ -5,7 +5,7 @@ "rarity": 3, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 10, "min": 5 }, diff --git a/biomes/mountains-plains.json b/biomes/mountains-plains.json index 04f5a805..8b6fd5db 100644 --- a/biomes/mountains-plains.json +++ b/biomes/mountains-plains.json @@ -18,7 +18,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 5, "min": 4 } diff --git a/biomes/ocean-deep.json b/biomes/ocean-deep.json index a2bf7437..ec12d71b 100644 --- a/biomes/ocean-deep.json +++ b/biomes/ocean-deep.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DEEP_OCEAN", "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": -25, "min": -50 } diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index 8711da68..6c04ef14 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -296,7 +296,7 @@ { "min": 4, "max": 7, - "generator": "smooth-land" + "generator": "smooth-dunes" } ], "loot": { diff --git a/biomes/temperate-bonsai.json b/biomes/temperate-bonsai.json index 5c27d8ce..f18d8161 100644 --- a/biomes/temperate-bonsai.json +++ b/biomes/temperate-bonsai.json @@ -26,7 +26,7 @@ }, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 14, "min": 3 } diff --git a/biomes/temperate-longtree-forest.json b/biomes/temperate-longtree-forest.json index c1dd82f7..556b0d8d 100644 --- a/biomes/temperate-longtree-forest.json +++ b/biomes/temperate-longtree-forest.json @@ -609,7 +609,7 @@ } ], "generators": [{ - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 10, "min": 4 }], diff --git a/biomes/temperate-oak-hills.json b/biomes/temperate-oak-hills.json index e12070f2..a79d3823 100644 --- a/biomes/temperate-oak-hills.json +++ b/biomes/temperate-oak-hills.json @@ -5,7 +5,7 @@ "rarity": 2, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 30, "min": 3 }, diff --git a/biomes/temperate-oak.json b/biomes/temperate-oak.json index 92a85d69..18b43273 100644 --- a/biomes/temperate-oak.json +++ b/biomes/temperate-oak.json @@ -7,7 +7,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 4, "min": 3 } diff --git a/biomes/temperate-plateau.json b/biomes/temperate-plateau.json index 4a1205c4..e28dd9e2 100644 --- a/biomes/temperate-plateau.json +++ b/biomes/temperate-plateau.json @@ -491,7 +491,7 @@ { "min": 2, "max": 3, - "generator": "smooth-land" + "generator": "smooth-dunes" }, { "min": 2, diff --git a/biomes/tropical-lake.json b/biomes/tropical-lake.json index db5eac54..7a0ad3e5 100644 --- a/biomes/tropical-lake.json +++ b/biomes/tropical-lake.json @@ -12,7 +12,7 @@ }, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": -20, "min": -30 } diff --git a/biomes/tropical-mountain-middle.json b/biomes/tropical-mountain-middle.json index 5d48b8bd..fdae869c 100644 --- a/biomes/tropical-mountain-middle.json +++ b/biomes/tropical-mountain-middle.json @@ -16,7 +16,7 @@ "min": 10 }, { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 55, "min": 20 }, diff --git a/biomes/tropical-mountain.json b/biomes/tropical-mountain.json index 43556663..d2717642 100644 --- a/biomes/tropical-mountain.json +++ b/biomes/tropical-mountain.json @@ -16,7 +16,7 @@ { "min": 10, "max": 50, - "generator": "smooth-land" + "generator": "smooth-dunes" } ], "layers": [ diff --git a/biomes/tropical-plains-hills.json b/biomes/tropical-plains-hills.json index b1beb7c4..b14f2a3a 100644 --- a/biomes/tropical-plains-hills.json +++ b/biomes/tropical-plains-hills.json @@ -5,7 +5,7 @@ "rarity": 2, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 15, "min": -10 } diff --git a/biomes/tropical-plains.json b/biomes/tropical-plains.json index 5ce9d1e5..fab2c62c 100644 --- a/biomes/tropical-plains.json +++ b/biomes/tropical-plains.json @@ -12,7 +12,7 @@ }, "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 20, "min": -10 } diff --git a/biomes/tundra-forest-cliffs.json b/biomes/tundra-forest-cliffs.json index 7a177553..e3d54ae7 100644 --- a/biomes/tundra-forest-cliffs.json +++ b/biomes/tundra-forest-cliffs.json @@ -347,7 +347,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 14, "min": 8 }, diff --git a/biomes/tundra-forest.json b/biomes/tundra-forest.json index 7ca38aea..adce6c7a 100644 --- a/biomes/tundra-forest.json +++ b/biomes/tundra-forest.json @@ -260,7 +260,7 @@ ], "generators": [ { - "generator": "smooth-land", + "generator": "smooth-dunes", "max": 14, "min": 8 } diff --git a/biomes/tundra-redwoods-forest.json b/biomes/tundra-redwoods-forest.json index 6c7a4dc7..266f3842 100644 --- a/biomes/tundra-redwoods-forest.json +++ b/biomes/tundra-redwoods-forest.json @@ -21,7 +21,7 @@ { "min": 4, "max": 10, - "generator": "smooth-land" + "generator": "smooth-dunes" } ], "derivative": "TAIGA", diff --git a/generators/mountain-plain.json b/generators/mountain-plain.json deleted file mode 100644 index cfa6184b..00000000 --- a/generators/mountain-plain.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 90 - }, - "seed": 7246661, - "composite": [ - { - "style": { - "style": "SIMPLEX", - "zoom": 0.87, - "fracture": { - "style": "IRIS_THICK", - "zoom": 0.195, - "multiplier": 18 - } - }, - "seed": 10056, - "bezier": true - } - ] -} \ No newline at end of file diff --git a/generators/desert-dunes.json b/generators/smooth-dunes.json similarity index 100% rename from generators/desert-dunes.json rename to generators/smooth-dunes.json From 0f95ef1a60f822ccae30b781825ad0119954b7ee Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 14:23:41 -0700 Subject: [PATCH 04/26] 9 is too much --- generators/canyon-steep.json | 2 +- generators/cracked-cliffs.json | 2 +- generators/dunes.json | 2 +- generators/mountain-cracked-cliffs.json | 2 +- generators/mountain.json | 2 +- generators/ocean.json | 2 +- generators/plain-cliffs.json | 2 +- generators/plain.json | 2 +- generators/river.json | 2 +- generators/small-cliffs.json | 2 +- generators/smooth-dunes.json | 2 +- generators/smooth-land.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/generators/canyon-steep.json b/generators/canyon-steep.json index 912444e8..b6697e31 100644 --- a/generators/canyon-steep.json +++ b/generators/canyon-steep.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 3 }, "seed": 530, diff --git a/generators/cracked-cliffs.json b/generators/cracked-cliffs.json index 43451395..d3bb0b8f 100644 --- a/generators/cracked-cliffs.json +++ b/generators/cracked-cliffs.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 4 }, "seed": 7246661, diff --git a/generators/dunes.json b/generators/dunes.json index 277b75ee..b8b7a4ed 100644 --- a/generators/dunes.json +++ b/generators/dunes.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 20 }, "seed": 54654, diff --git a/generators/mountain-cracked-cliffs.json b/generators/mountain-cracked-cliffs.json index 43451395..d3bb0b8f 100644 --- a/generators/mountain-cracked-cliffs.json +++ b/generators/mountain-cracked-cliffs.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 4 }, "seed": 7246661, diff --git a/generators/mountain.json b/generators/mountain.json index 42bac646..9a0c2486 100644 --- a/generators/mountain.json +++ b/generators/mountain.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 30 }, "seed": 530530, diff --git a/generators/ocean.json b/generators/ocean.json index 6ccb63fe..a3717589 100644 --- a/generators/ocean.json +++ b/generators/ocean.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 65 }, "seed": 9246661, diff --git a/generators/plain-cliffs.json b/generators/plain-cliffs.json index 51a5805d..e525c95c 100644 --- a/generators/plain-cliffs.json +++ b/generators/plain-cliffs.json @@ -16,7 +16,7 @@ } ], "interpolator":{ - "function":"BILINEAR_STARCAST_9", + "function":"BILINEAR_STARCAST_6", "horizontalScale":39 }, "seed":7246661, diff --git a/generators/plain.json b/generators/plain.json index 445c5578..07f8c11a 100644 --- a/generators/plain.json +++ b/generators/plain.json @@ -1,6 +1,6 @@ { "interpolator":{ - "function":"BILINEAR_STARCAST_9", + "function":"BILINEAR_STARCAST_6", "horizontalScale":33 }, "seed":7246661, diff --git a/generators/river.json b/generators/river.json index 572d0881..94a014a5 100644 --- a/generators/river.json +++ b/generators/river.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_3", "horizontalScale": 4 }, "exponent": 1.125, diff --git a/generators/small-cliffs.json b/generators/small-cliffs.json index d77c87c0..0e870600 100644 --- a/generators/small-cliffs.json +++ b/generators/small-cliffs.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 4 }, "seed": 2343, diff --git a/generators/smooth-dunes.json b/generators/smooth-dunes.json index 0c31afa3..48d6083a 100644 --- a/generators/smooth-dunes.json +++ b/generators/smooth-dunes.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_9", + "function": "BILINEAR_STARCAST_6", "horizontalScale": 15 }, "seed": 133434, diff --git a/generators/smooth-land.json b/generators/smooth-land.json index a3ff7f8e..d436b8b9 100644 --- a/generators/smooth-land.json +++ b/generators/smooth-land.json @@ -1,6 +1,6 @@ { "interpolator": { - "function": "HERMITE_STARCAST_9", + "function": "HERMITE_STARCAST_6", "horizontalScale": 6 }, "seed": 133434, From 751652aef20d45df787ec6e70d108304834fdbf2 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:02:56 -0700 Subject: [PATCH 05/26] d d --- generators/smooth-dunes.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/generators/smooth-dunes.json b/generators/smooth-dunes.json index 48d6083a..76f417bb 100644 --- a/generators/smooth-dunes.json +++ b/generators/smooth-dunes.json @@ -9,17 +9,7 @@ "seed": 2343, "style": { "style": "SIMPLEX", - "zoom": 2.2, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.4, - "multiplier": 10, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - } + "zoom": 2.2 }, "exponent": 0.5, "opacity": 1.0 From 5b2fde93805a8bec687e717e04f39d21790c52a0 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:15:35 -0700 Subject: [PATCH 06/26] RemovedMosaic --- biomes/mosaic-lith-black.json | 263 -------------------------- biomes/mosaic-lith-cyan.json | 261 -------------------------- biomes/mosaic-lith-green.json | 234 ----------------------- biomes/mosaic-lith-purple.json | 201 -------------------- biomes/mosaic-lith-red.json | 327 --------------------------------- biomes/mosaic-lith-white.json | 198 -------------------- 6 files changed, 1484 deletions(-) delete mode 100644 biomes/mosaic-lith-black.json delete mode 100644 biomes/mosaic-lith-cyan.json delete mode 100644 biomes/mosaic-lith-green.json delete mode 100644 biomes/mosaic-lith-purple.json delete mode 100644 biomes/mosaic-lith-red.json delete mode 100644 biomes/mosaic-lith-white.json diff --git a/biomes/mosaic-lith-black.json b/biomes/mosaic-lith-black.json deleted file mode 100644 index d792672d..00000000 --- a/biomes/mosaic-lith-black.json +++ /dev/null @@ -1,263 +0,0 @@ -{ - "vanillaDerivative": "STONE_SHORE", - "biomeSkyScatter": [ - "DESERT", - "SAVANNA" - ], - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 3, - "palette": [ - { - "block": "blackstone_wall" - }, - { - "block": "polished_blackstone_wall" - } - ], - "stackMin": 1 - }, - { - "chance": 0.00035, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "polished_blackstone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "polished_blackstone_button" - } - ] - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "blackstone" - } - ] - } - }, - { - "find": [ - { - "block": "white_stained_glass" - } - ], - "replace": { - "palette": [ - { - "block": "red_stained_glass" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - }, - { - "chance": 0.3, - "edit": [ - { - "find": [ - { - "block": "nether_wart_block" - } - ], - "replace": { - "palette": [ - { - "block": "black_concrete", - "backup": { - "block": "coal_block" - } - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "corrupted/crimsonwood-1", - "corrupted/crimsonwood-2", - "corrupted/crimsonwood-3", - "corrupted/crimsonwood-4", - "corrupted/crimsonwood-5" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "name": "Black Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "black_concrete" - }, - { - "weight": 2, - "block": "black_concrete_powder" - }, - { - "weight": 2, - "block": "black_terracotta" - }, - { - "weight": 2, - "block": "black_concrete" - }, - { - "weight": 2, - "block": "black_concrete_powder" - }, - { - "weight": 2, - "block": "black_concrete" - }, - { - "weight": 2, - "block": "black_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 12, - "max": 70, - "generator": "mountain" - } - ], - "biomeZoom": 20, - "derivative": "BADLANDS", - "carvingBiome": "mosaic-lith-white", - "biomeStyle": { - "style": "IRIS" - }, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "black_concrete" - } - ] - }, - "biomeScatter": [ - "SAVANNA", - "DESERT" - ] -} \ No newline at end of file diff --git a/biomes/mosaic-lith-cyan.json b/biomes/mosaic-lith-cyan.json deleted file mode 100644 index 2443b601..00000000 --- a/biomes/mosaic-lith-cyan.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "vanillaDerivative": "STONE_SHORE", - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 6, - "palette": [ - { - "block": "twisting_vines_plant" - } - ], - "stackMin": 3 - }, - { - "chance": 0.0175, - "palette": [ - { - "data": { - "waterlogged": false - }, - "block": "tube_coral" - }, - { - "data": { - "waterlogged": false - }, - "block": "tube_coral_fan" - } - ] - }, - { - "chance": 0.00035, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "warped_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "warped_button" - } - ] - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "light_blue_concrete" - } - ] - } - }, - { - "find": [ - { - "block": "white_stained_glass" - } - ], - "replace": { - "palette": [ - { - "block": "blue_stained_glass" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - }, - { - "chance": 0.3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "corrupted/warpedwood-1", - "corrupted/warpedwood-2", - "corrupted/warpedwood-3", - "corrupted/warpedwood-4", - "corrupted/warpedwood-5", - "corrupted/warpedwood-6" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "name": "Cyan Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "light_blue_concrete" - }, - { - "weight": 2, - "block": "light_blue_concrete_powder" - }, - { - "weight": 2, - "block": "light_blue_terracotta" - }, - { - "weight": 2, - "block": "light_blue_concrete" - }, - { - "weight": 2, - "block": "light_blue_concrete_powder" - }, - { - "weight": 2, - "block": "light_blue_concrete" - }, - { - "weight": 2, - "block": "light_blue_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 96, - "generator": "mountain" - } - ], - "derivative": "WARPED_FOREST", - "carvingBiome": "mosaic-lith-purple", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "light_blue_concrete" - } - ] - }, - "slab": { - "palette": [ - { - "block": "warped_slab" - }, - { - "weight": 3, - "block": "air" - } - ], - "style": { - "style": "STATIC" - } - } -} \ No newline at end of file diff --git a/biomes/mosaic-lith-green.json b/biomes/mosaic-lith-green.json deleted file mode 100644 index 3e601f73..00000000 --- a/biomes/mosaic-lith-green.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "vanillaDerivative": "STONE_SHORE", - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 3, - "palette": [ - { - "block": "mossy_cobblestone_wall" - } - ], - "stackMin": 1 - }, - { - "chance": 0.0025, - "variance": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "pickles": 1 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": false, - "pickles": 2 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": false, - "pickles": 3 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": false, - "pickles": 4 - }, - "block": "sea_pickle" - } - ] - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "green_terracotta" - } - ] - } - }, - { - "find": [ - { - "block": "white_stained_glass" - } - ], - "replace": { - "palette": [ - { - "block": "lime_stained_glass" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - } - ], - "name": "Green Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "green_concrete" - }, - { - "weight": 2, - "block": "green_concrete_powder" - }, - { - "weight": 2, - "block": "green_terracotta" - }, - { - "weight": 2, - "block": "green_concrete" - }, - { - "weight": 2, - "block": "green_concrete_powder" - }, - { - "weight": 2, - "block": "green_concrete" - }, - { - "weight": 2, - "block": "green_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 42, - "max": 68, - "generator": "plain-cliffs" - } - ], - "derivative": "SWAMP", - "carvingBiome": "mosaic-lith-red", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "green_concrete" - } - ] - }, - "slab": { - "palette": [ - { - "block": "mossy_cobblestone_slab" - }, - { - "weight": 3, - "block": "air" - } - ], - "style": { - "style": "STATIC" - } - } -} \ No newline at end of file diff --git a/biomes/mosaic-lith-purple.json b/biomes/mosaic-lith-purple.json deleted file mode 100644 index 575a72b6..00000000 --- a/biomes/mosaic-lith-purple.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "vanillaDerivative": "STONE_SHORE", - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 4, - "palette": [ - { - "block": "crimson_fence" - } - ], - "stackMin": 1 - }, - { - "chance": 0.0175, - "palette": [ - { - "data": { - "waterlogged": false - }, - "block": "bubble_coral" - }, - { - "data": { - "waterlogged": false - }, - "block": "bubble_coral_fan" - } - ] - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "purple_concrete" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - } - ], - "name": "Purple Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "purple_concrete" - }, - { - "weight": 2, - "block": "purple_concrete_powder" - }, - { - "weight": 2, - "block": "purple_terracotta" - }, - { - "weight": 2, - "block": "purple_concrete" - }, - { - "weight": 2, - "block": "purple_concrete_powder" - }, - { - "weight": 2, - "block": "purple_concrete" - }, - { - "weight": 2, - "block": "purple_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 42, - "max": 96, - "generator": "mountain" - } - ], - "derivative": "BASALT_DELTAS", - "carvingBiome": "mosaic-lith-cyan", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "purple_concrete" - } - ] - }, - "slab": { - "palette": [ - { - "block": "crimson_slab" - }, - { - "weight": 3, - "block": "air" - } - ], - "style": { - "style": "STATIC" - } - } -} \ No newline at end of file diff --git a/biomes/mosaic-lith-red.json b/biomes/mosaic-lith-red.json deleted file mode 100644 index 071cfb8a..00000000 --- a/biomes/mosaic-lith-red.json +++ /dev/null @@ -1,327 +0,0 @@ -{ - "vanillaDerivative": "STONE_SHORE", - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 3, - "palette": [ - { - "block": "red_nether_brick_wall" - }, - { - "block": "nether_brick_wall" - } - ], - "stackMin": 1 - }, - { - "chance": 0.0175, - "palette": [ - { - "data": { - "waterlogged": false - }, - "block": "fire_coral" - }, - { - "data": { - "waterlogged": false - }, - "block": "fire_coral_fan" - } - ] - }, - { - "chance": 0.00035, - "palette": [ - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 6 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 7 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 8 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 9 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 10 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 11 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 12 - }, - "block": "redstone_wire" - }, - { - "data": { - "east": "none", - "south": "none", - "north": "none", - "west": "none", - "power": 13 - }, - "block": "redstone_wire" - } - ] - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "red_terracotta" - } - ] - } - }, - { - "find": [ - { - "block": "white_stained_glass" - } - ], - "replace": { - "palette": [ - { - "block": "black_stained_glass" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - }, - { - "chance": 0.3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "corrupted/crimsonwood-1", - "corrupted/crimsonwood-2", - "corrupted/crimsonwood-3", - "corrupted/crimsonwood-4", - "corrupted/crimsonwood-5" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "name": "Red Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "red_concrete" - }, - { - "weight": 2, - "block": "red_concrete_powder" - }, - { - "weight": 2, - "block": "red_terracotta" - }, - { - "weight": 2, - "block": "red_concrete" - }, - { - "weight": 2, - "block": "red_concrete_powder" - }, - { - "weight": 2, - "block": "red_concrete" - }, - { - "weight": 2, - "block": "red_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 25, - "max": 60, - "generator": "plain" - } - ], - "derivative": "CRIMSON_FOREST", - "carvingBiome": "mosaic-lith-green", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "red_concrete" - } - ] - }, - "slab": { - "palette": [ - { - "block": "red_nether_brick_slab" - }, - { - "weight": 4, - "block": "air" - } - ], - "style": { - "style": "STATIC" - } - } -} \ No newline at end of file diff --git a/biomes/mosaic-lith-white.json b/biomes/mosaic-lith-white.json deleted file mode 100644 index ff053d22..00000000 --- a/biomes/mosaic-lith-white.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "entitySpawnOverrides": [ - { - "entity": "brian", - "trigger": "GHAST", - "cancelSourceSpawn": true - }, - { - "entity": "brian", - "trigger": "MAGMA_CUBE", - "cancelSourceSpawn": true - } - ], - "decorators": [ - { - "chance": 0.0045, - "stackMax": 3, - "palette": [ - { - "block": "diorite_wall" - } - ], - "stackMin": 1 - } - ], - "objects": [ - - { - "chance": 0.06, - "edit": [ - { - "find": [ - { - "block": "blue_terracotta" - } - ], - "replace": { - "palette": [ - { - "block": "light_gray_stained_glass" - } - ] - } - }, - { - "find": [ - { - "block": "white_stained_glass" - } - ], - "replace": { - "palette": [ - { - "block": "white_concrete" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "crystal/crystal-1", - "crystal/crystal-2", - "crystal/crystal-3", - "crystal/crystal-4", - "crystal/crystal-5", - "crystal/crystal-6", - "crystal/crystal-7", - "crystal/crystal-8", - "crystal/crystal-9", - "crystal/crystal-10" - ], - "translate": { - "yRandom": 25, - "x": 0, - "y": 9, - "z": 0 - } - } - ], - "name": "White Mosaic", - "layers": [ - { - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 1.1, - "palette": [ - { - "weight": 2, - "block": "white_concrete" - }, - { - "weight": 2, - "block": "white_concrete_powder" - }, - { - "weight": 2, - "block": "white_terracotta" - }, - { - "weight": 2, - "block": "white_concrete" - }, - { - "weight": 2, - "block": "white_concrete_powder" - }, - { - "weight": 2, - "block": "white_concrete" - }, - { - "weight": 2, - "block": "white_concrete_powder" - } - ] - }, - { - "minHeight": 12, - "maxHeight": 16, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "FLAT" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 28, - "max": 41, - "generator": "plain-cliffs" - } - ], - "vanillaDerivative": "STONE_SHORE", - "derivative": "BASALT_DELTAS", - "carvingBiome": "mosaic-lith-black", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "white_concrete" - } - ] - }, - "slab": { - "palette": [ - { - "block": "diorite_slab" - }, - { - "weight": 3, - "block": "air" - } - ], - "style": { - "style": "STATIC" - } - } -} \ No newline at end of file From 4b2f269c1fffe2fcd6597179cc7970f141f65fba Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:15:42 -0700 Subject: [PATCH 07/26] redid jungle trees --- objects/tree/jungle/1.iob | Bin 142505 -> 21096 bytes objects/tree/jungle/2.iob | Bin 101714 -> 14650 bytes objects/tree/jungle/3.iob | Bin 68126 -> 10626 bytes objects/tree/jungle/4.iob | Bin 74734 -> 11744 bytes objects/tree/jungle/5.iob | Bin 25080 -> 4415 bytes objects/tree/jungle/6.iob | Bin 3769 -> 3520 bytes objects/tree/jungle/7.iob | Bin 11021 -> 1712 bytes objects/tree/jungle/8.iob | Bin 18712 -> 2784 bytes objects/tree/jungle/9.iob | Bin 9094 -> 1930 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/objects/tree/jungle/1.iob b/objects/tree/jungle/1.iob index 2cf16228d6c97565aaee98ee5d94220709dc7102..3412b5b59e1151efdbe8bc5a8a1f19ab2efc7e43 100644 GIT binary patch literal 21096 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 literal 142505 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 literal 101714 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 I#rWs{0j>1jCjbBd diff --git a/objects/tree/jungle/4.iob b/objects/tree/jungle/4.iob index 5baabecfbf2323dca0a3adb836739b430f25e08a..6836479b02ca836705ffdebf8efd21dbd45e7afb 100644 GIT binary patch literal 11744 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 MjB=rMkUcy80oGvynE(I) diff --git a/objects/tree/jungle/6.iob b/objects/tree/jungle/6.iob index 2f7b3f5f3b4975b6c6261e802b79940402a5c036..16006da76ad1bfefd585ad0731a66957df5a92d1 100644 GIT binary patch literal 3520 zcmbW3U2hvz5Qf+G+D_Vl_yd*t19C%)gapbB0*PL6$4wMfR=b6u;8bza!ar}5IOciY z*=-7~WRg_d*)wzIop(OYSvO6y*EG#nJYP0@&(4llkAHpg_}MQ%e9!u)KaZE)i?hY6 z^Y7m9cGxXe=LfGAC#!CMd3tvKd;h*Vz4-8c@w!*O?bv&McF`R*k8WZ9xLE#n(mj8B zdiwHk@z?R{;P0d6=_lrsZte>d^}!hDWQ4NL0K!)z_*78uQU%&AC_ zRG>d5v%M?d-lHoOuiBE3p9|fLer}o#fBe60M#$0TMolx~EKYgGyv>y8XXqzbZ?gX~ z>lQn@rrlgMbM)=zx+I>hdY)impJE^Lh|^*ZK6=+<_K9OWeO%YmMsM7A>=SFwGvPfv z)#X_STmIU{t_$G^3-?y&1Tmqy?xf>ia#R0YxfvGeMF9}A3AYL-v-|p;f=@4 zcktzJ9}1Ve#X~<=&%WYulYRQDmzOx1AEf`ZvEE!^BTqAnd>^U5b4%Zl)@_)t^fM7L z1ea{EXWm#_tKwZVX#XOF1SgZh z3-OKXET%qqX8y6fLvP(O%hb7e+F#={3E(D|#Is(PtmSnXEM;adQa-MoND=G|GTfY1 zv1+E+nYB_*)~M$2inTaO>#4NvN_$#srSmgI%CGP|?>^4xHFP_lDAQT>6rp zTlC<}L3$vcaHun3{hdMii}?^aH?H&1ORcw%N_LMy&y=;iT|0Y|*zH=Xp8dx64zxeo zTdd;vXKkwgg$v7O7d*Y?QL|!gORpUk@i!;q4|kBgFzzl)DvtBFZXTL_zfXVpIwN~X zG35QB9;_>$iZlf?eN|GA)G>S1J73nzI+dUGt~o;=p58s?T{#SOc23e4^zJu~oRoFP zF(=7Gy>n_m%=LZwc`o?NmxnxNo*Vf^Iw!8(&pAW(=gLU&^V{ON@=IkOTX9+YrMLc* zUV2~a>vyB@oM}#{>oB$k&Xcj7$I^Sho2zU0m#kXtfNqXH^&N2D+{1T8|IBd3)7LpL zo_SPUvnYJ`=R1;p{vKgXhStpe-XuFnd-O#g(>N8+^I-2hw%ilZh_xFx@d+zJ|gk ANdN!< literal 3769 zcmbW3%}*0y5XRr#ejqK1A6E}XuN)LjOf+1K9z2HEmJ!ANQl!_4z%s zwIo#vK(@0p@4Pe5e6}g2&6LtDJvY+E%Ta%P=gsz=m#>~ZmF)S){-ErQiv7ux&wAS} zi}7SBVKNgqPE19xlv$I2s%rmTwQs z;&VCPeb*mPib1d3+1~n8j>h83!Nf53R!3me5kR<91gCs+yq8wHez5HN_A=h#!ESNf zAMYHW$K=ChldEw&TE28|fulF<4U664fK=@lz5d`}$D!|~Gr)d3^YrTl>-+yC-#rs2 zt#?^huJP$s`e#b+&r{;oK8LRrt>Z|~Q|QObHM`K@{Y~j2&S=|}R{j;i!blxJ%3fE$ zQ&v?ei6+sknx&R#o?5A)#nGsy=9|??YD?a%s_MJsE$Qn$HT92PETe1hA%iC1+ite^~bf5EP%EZaO&cBOak9YL_*O3gpwh_v&G&#%l-xLL(qLI#t zapbax#is1rujGMSoHV<_N!&@4JgmzK_V{#M`h+JN*pC>&pBeX>WZ3WMK5^%=kIwwT zj?eX}n1o>#HY5)}_yXU|xbTW!@=*KJNlF{yb99JT^eVVS9iM5~=n$uMD{07v@8~Xe z{Z4MMlc|oG;>~m;OI=A^GwDIG&3)p)9=ORQnCKDkVJD|Qkn?V;{FvL1#a1C_I zeR>a{V2!>a55Wf|uk38++e$@NCPw3yaaU;_NSdaQ8^s67WJrUWVX3QOR6b^Sda`LbH&X4gKKT}Nq zQd4k8&Y4Z}={fPdPzCUS7r#*EO>xxoibmj>T24RUhb{w0KHncBDw6G*beV&{sE+FnP#TM`O7xFJ7lwERMf4mQFxQD zDd?m>l_WD|YT?;7LFpfOD$;P>pv271(0rM4AGv45lw5?KJXnq|&gIE{#113Z@a#d( znX`uE?oCtnEP;k z%;_fQt}C{gPyDkF0tZ{k^^h#)9vv`8Z}HtmzQHbBM!reB{EOqeC+r)g?{OBs*hSo9 zzhDns@Zbak@j!)2bdeKw9(qC~dR6|JFetq9Tc3v>dsX^+un8XSLg^wXn5Yvx-*cRI z|K^A}7cX2f2h>w@A%F1HqhSqrB4&Eq)~A!>o~bj!UM5;7Th;qZcgUkVNPg?@zWMi# zV+F_5Z!;|ee zhsJ|8`gPy=7JDX-eziQXqKRkv8r$w!Q+J2ns4wT<$<~S(sdvPRcg~?v$2{Gn+RB;x oOq4vwZ$a&U>GAHqR_@%V&U@t4eJp(_eH-WGS@S0Sm@~ diff --git a/objects/tree/jungle/7.iob b/objects/tree/jungle/7.iob index 8b5bc749b178ba7262e8ac90b3affa3909c76991..e3089b74687d4d9ecf1bda74404a164494bd4f0a 100644 GIT binary patch literal 1712 zcmZXUyKWOf7=>pqrXf56QXYT`3M7ylx>R&DQG~2yiHw4SybhNq*ua`R(5u76%B&aY`It-dn-sdzFr z;_-1h|27NurrQ$ig0hc(6Yc4^`0MPavwc$<)xv3wjqD;XWd&QhE9;}l=@xxxzQo0Y zj&ytUYd;QjeXe_A3gOKR8F3oqbRp$%s21CV_JHFqQX5czy#k>kg-@@Q2HHFwU7eNBErXx#wI za}#De=jA%^PyeeP@yu6;+;@=v1-+r}YviH1-;rmNxwmwh`vPVbU})}F_#NnZ$X=%} zPxMPa)o;aZeKX;w|0^S1nDs#@Z-^|R*>j=tw|{XWXCCl#_r(q^MBjVtyu5+cD*oda zYv}B#`{Mk`lU-+S?`S{_>-R|ag{CGQVevF5!Pus(Bv%4Nw z@85nO_XmC(cgNLne>bkrXOEsVT86Ta4wv4eokxpCiLgEE`Q*__qkw}=&QQ@e|6asz zH&>hc?O}DlCV_hU&Z9-6B+xoc0yR2$^jV{Tz0G}J(MIlnu1n{)FB&C*IaJd#GBva2 zetn+23(p>X(kNgzcW_o@jnNLU+3kt_%o^f)(k_q^?R~)Jt)N!@`DxyqQaEFCAMSnO zjPq-z3)Vbeu;%H4HIH*^IMtFzT?{nZqG+^5(P)W+X%vl?RwJ|)MQAOG{#q3MwJ7>4 zQ8107zt$@HD^c>=TNM4ZDEbT9s8tVDf9>|@uSCH#iY!a3)VEaTW;~)ia(gg~;+RHJ zYw2*B0gDbAJ=6F|t7*4D8wo_9J7&<%iByJWhvJn*$-+Wf1=DE8*RB=HhkOaJ+w&S( z6p+j15}09AqM1P@ni*80nL!;&ax|J5R9ejpD$&fK4&~j-+@cy!l-Ht}e5KV)zB6wZ zf7jb*@^zkZZ8VyJSX#}TJQI)Tg55p?vGc5g63v_}(agzn@yML)wy)!}L^D1+lqP0@ zW%HIsX(UQf87!LN#W~DbEtm;qFGm~ga#=_-3*XGHg zxi${1x5=SZkR6&fz=kO!lZ!A`gSOwUlu*6B&V3U2Xmh{d&Y5ac;~~+6Nun9jHM%G- H)LDN6&q)BA diff --git a/objects/tree/jungle/8.iob b/objects/tree/jungle/8.iob index 504bee8453ece9b10ac55b04ffd2dadae3e397e8..b54d26a21b005dbfdfd884882c4c1f6ade39f306 100644 GIT binary patch literal 2784 zcmZXW&2AGx5QN9;UFSk1UH~Z%zzGgWpj^1+fVgpqB4h=Fj6#Cqgr7GLiQ}QZsu>Fj zN9#^^SO53Sx|DKQN_nd1usk`rUT=;*yf`{}|MpE8%Cm3l%hmby^7GB>ueX<9E><6Z zUR`}UUH)2cj(?w(m;b3RR?8o&&FQE0=4N?$zB+#O{QK&9BW`thb9{4syE-dn_O1-| zu2w~yHCjUJP7>s$%=xMhWfDIVH;A3-dto|{zKo{GqX*+p)kpTbvatP7Cfk+zC;scb z_4j3L`qBDXaP_gpE#&~YFmrHv4vZfanOKX4uZ}~$_E)#fesDhIM1K0z2iX_-4{oPU zz;De{b?O@%E&IH;;H2+)8fV-1!_Q29$+PI`eM{X_%X8c6*tNP#k5eD9ljY8IG@c5X z16}Df`IVN3@?~cF3spZFKbR`6sp=P{KXaqiKjeBQc-3#Ycsj;B=jas$d*(PASDRjW zTd#e9>cO7A#=rVx{XFsMceC#}#|3Si`fRFwYIabnOq^*SFLh}zj8lIawLN_&j$@HO zyA#^|^}fVzh#%(P?9!Loc;e7A6xj#%Ec-yu z!Qnr9?epV2l5;yRierEEPH5&3f8>#K+4tCcsd%v?Km0OJ;Nt3@-$(vK+Vt!zd2_!dKKY_gJoX8my`c{F1s|5YyZ42iO2gld1YGJUiT5bp1co0g6mtAZbhPR;gT=E1Mtg4 zk@Mci5AS>AoC~!47wg`qU$T;^ohiIg>ovx zhtenU^6$Nrzx_Edjyk~;5lVl+b7v>aJO~){9T}J=2&ZinY&qx=WPiD$?$*s-H8s>R%SH%8 zt#j&es%qEnc5CgI*4nT6$?xfp{JzZ3+b=h_hYxqxA0OWR{doK7^Wo3WhwFb2_wWC@ zxqrC6{cyPY{mnmzyZij>aQkreaQArFw_Uri=<3nMqq9dRk2Z~Nn@3+Y8gOUVb?4Ew zqrd%Fh+jXwzka&8zk1rY#fP6gI(f8dG;42HVSDxH*`p_owl#m{A+&gO_Gr^+7RQct zJA3rx(W6FF5Q|;c)uT&C$0y0;!?!B@w|zFR9eCns{wXVK`o@qA<_N5I+eFB(mKEHZ2AL!)y?2Pa#v4;wxM z(rCn4xl$(`9sy^kI|8okS)|msO_bW%cVTK%6+WV;Y?Dn`wn2G~bH!-LpK+TmOp7+e z+45&}(WV?*q*&eNT(#NG+w-{1cXAbN*dA4zjBEahHf{TF+@GGSXw&ELrHs?I<4?3X zm2IM0Qy)t3&K|`Lm058^C5jt5jcPM1)xbxuAmw5yw;ACVjumS)>*@A2C}rA2C}LD^PYgqROIJfif#rphU3(9h!pHC=Q{^ z8dbToDCVNfin;hY+6z&9Qh8EgDH`QJhZMVVq8f=8{@1id`wQ zVpmEO7gM6Rn8P~n?u8AX&>F?*bb~^YS`-7+Wkt&6<$ zuI{3iZQ@(%nbK&UTQY0P*sf19S`- zm~<#A(4rWVE^9z+167E)ixS0Mlql|^L~$1-in};hN3jl{lf?Ec=a)ut7v+3haGSca z!I+dN#-v2?DFDBpUNS@BDUTO__K#;6RBG3wCRc6>L|oN<{- zjYe3=tl5?q+1IAS$*56`FPRnN%b}TJi{|dy$*h@Sjp9tXvF0tHQS7C2c>&q*xqvL1 zid+4BXcTY7twJhJqgXC7E0&8xQ>=?caWG_7j17rmY!t^*om;ejXQv)i zD+kW^p4_}<;FCo8=t`o=I!lxr(4x8RB^pdGGB4!C-MqYzCCW2bqC9gY$}?A@JaZkI zYO*Ldjm(;x7j$T)WsBJG8B`Izf9F7l=Z)v4yHB=6$th8uOcLeY<52d!MR}OGto?PN z(ThBZl+H)MN)#0;QBGwM3Bd96B0#ENEA&VQ8d9?R;~@- zHG%6{w}Ty;I>%c#b)K@><^L!dG-I75%JnJHzPogX7n!y1u47R)oTsj55xEwn;%rv# vN!ej;XNRW4%l4uwuCIbbSsaNnO&-lDXLeVAyhxPeQKFpZ8s)#zn6ds3w@H(v diff --git a/objects/tree/jungle/9.iob b/objects/tree/jungle/9.iob index 04ad5c72dcd403670968ee4d0a61a17d9fbf2769..aa2cfe252673d418056163b27fce138505ec0a5d 100644 GIT binary patch literal 1930 zcmb7^L5~ta5QTe&0n|1A1C#v$TwD((8ZJf;d-CRm5JPrn6@##0U|0W*e{*+%@qMob z#Xy2Kf!AGK_3Cw1Hz}o)l+rVOPtw!#`M5g$cy@aJ;q9CBB)$ALo|YH$(beMh*X8u{ zr2I4~M>l0PxExoD(e$G1zv^9=^Gd67y67+F%W{~W?*-k?W|xD}_i@$#F--6OY~P4| zP>!la|7tX;%HDJ~Uwko3ubM424fFE4ncS9J*Wo`%d$BL=U~W`5sUzRf+y`lPkFd*Q z`h!P!cdQaeXrkQzB_Q&>8xur|KkIL^^X*PjqRm-!?%SO&yd6`x*^mM>lcQfj(KA z`REJ!T`yT&S3J#(F6F1+jz=#i%$vW*YJgg< zPOFMQea?7n&#`xw5W>3a&aM zdOn_!BC=CjSL!;fIC@Rd+?#6r+vbi2|E9@EeTQk;zkfp}=3&iFGt`@`GLpVkmHU zRHI-pYVZe4K2K5WniI_~8aes5Dt`zKjehLUN|MO$$~p|^b#ROlFJHh^|3I;76ckG7)n<4n5w z(J`D`$KmxtQKU~;wWE+xfGFf{n?F&GOx~xJMp*<@OI$Sa90Dli&hHwbs%tiWp=Qzc zOs)yg0%K+2Qw0c$7g|K95)h897T3~RKrq};4zs>hR5hXuSkj#43Qp{FCpe#~PHdx*tJXFV zDo#jzlzkpg+nH3GPvfwwISZqWx+56z5v4mpFj~Q=yN?A7TZ#=5t=KHl>%st$(nBod zxsTDv3FRzjfeIo5RRvUuV2RPi#~-IQm7nvOg+GlN`u7UZJcS9ebxtxKnoOQG4axMn zN;AxZ1gMf>4q6ueGy~wL_~@<)&=SL`1uE^zSTX{%2q$QNE{A)Vtej8|Wj!?w|HIFF zCFib!7s_eCuq!t|A6}fhV)OPvV@r2Jc@`|tv@YWb?1k_9i-Y|g(5oIBKWZ%&TwA!2 zi;Lr89w9@ylyFTXdwtQRO%m<>Ih)tkQ1e2tc@g1*;#s2ah4K!=xhiGc0u^KyPlG1t z=j2@h+IP=>F zP((s8<7L>PJ;mkPHxrs*$NwLpUP$IDW?XjU^8@!mCO-s8q?#U?<2E>NlicP7UE1V_ zAYzzq02N#OvE_lnCYM;Z$LE;BZ^^MxYitJx{5Z6ygRzBh4$y>LwZ>~uCzRKqr7oOq ze!M@yrH7cRLm`SOd|Q3d6vr_q8Gd0Pqh~qEc-phYjOCq+EKVZ1$RP2&==K#nTbB>Y MU&k1Dp`{c052`YnPXGV_ From 900a62699071f23d3dce2d9332c9137c3834ce48 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:44:46 -0700 Subject: [PATCH 08/26] Fixing redundancy in frozen biome --- 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 From 55efa2111baa41f39142fa18f7dfc8cc58405ad4 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:25 -0700 Subject: [PATCH 09/26] Fixed redundancy in hot region --- biomes/hot-desert-hills.json | 196 ----------------------------- biomes/hot-desert.json | 3 + biomes/hot-mesa-cliffs-yellow.json | 192 ---------------------------- biomes/hot-mesa-cliffs.json | 2 +- biomes/hot-mesa-dark.json | 1 - biomes/hot-mesa.json | 2 +- biomes/hot-ocean.json | 6 + regions/hot-red-desert.json | 70 ----------- regions/hot.json | 1 - 9 files changed, 11 insertions(+), 462 deletions(-) delete mode 100644 biomes/hot-desert-hills.json delete mode 100644 biomes/hot-mesa-cliffs-yellow.json delete mode 100644 regions/hot-red-desert.json diff --git a/biomes/hot-desert-hills.json b/biomes/hot-desert-hills.json deleted file mode 100644 index d127e81e..00000000 --- a/biomes/hot-desert-hills.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "vanillaDerivative": "DESERT", - "decorators": [ - { - "verticalZoom": 5, - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "stackMax": 5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "cactus" - } - ], - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 1 - }, - { - "chance": 0.00135, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "polished_blackstone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "polished_blackstone_button" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.05, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "rarity": 2, - "name": "Desert Hills", - "layers": [ - { - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 9, - "palette": [ - { - "block": "sandstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "cactus-clutter" - ] - }, - "derivative": "DESERT", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "sandstone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "smooth_sandstone_slab" - }, - { - "weight": 2, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index f16b02a2..cb398164 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -9,6 +9,9 @@ "min": -8 } ], + "children": [ + "hot-oasis" + ], "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/hot-mesa-cliffs-yellow.json b/biomes/hot-mesa-cliffs-yellow.json deleted file mode 100644 index 224041dd..00000000 --- a/biomes/hot-mesa-cliffs-yellow.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "vanillaDerivative": "BADLANDS_PLATEAU", - "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" - } - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "name": "Yellow Mesa", - "layers": [ - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "white_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "red_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "yellow_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "generators": [ - { - "min": 1, - "max": 6, - "generator": "plain" - }, - { - "min": 9, - "max": 35, - "generator": "mountain" - } - ], - "derivative": "SHATTERED_SAVANNA", - "lockLayers": true, - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "red_terracotta" - }, - { - "block": "gray_terracotta" - }, - { - "block": "yellow_terracotta" - } - ] - }, - "rarity": 9 -} \ No newline at end of file diff --git a/biomes/hot-mesa-cliffs.json b/biomes/hot-mesa-cliffs.json index ee96cabd..1f4ad96c 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/hot-mesa-cliffs.json @@ -1,7 +1,7 @@ { "vanillaDerivative": "BADLANDS_PLATEAU", "children": [ - "hot-mesa-cliffs-yellow" + "hot-mesa-cliffs" ], "decorators": [ { diff --git a/biomes/hot-mesa-dark.json b/biomes/hot-mesa-dark.json index 5904a438..1363f39d 100644 --- a/biomes/hot-mesa-dark.json +++ b/biomes/hot-mesa-dark.json @@ -147,7 +147,6 @@ "childShrinkFactor": 0.35, "children": [ "hot-mesa-cliffs", - "hot-mesa-cliffs-yellow", "hot-mesa-red", "hot-mesa-green", "hot-mesa-blue" diff --git a/biomes/hot-mesa.json b/biomes/hot-mesa.json index 20e4882a..045fd14f 100644 --- a/biomes/hot-mesa.json +++ b/biomes/hot-mesa.json @@ -9,7 +9,7 @@ ], "children": [ "hot-mesa-valleys", - "hot-mesa-blue", + "hot-mesa-red", "hot-mesa-blue", "hot-mesa-dark", "hot-mesa-green", diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index 0a75011f..254f5908 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -1,5 +1,11 @@ { "vanillaDerivative": "WARM_OCEAN", + "children": [ + "hot-desert", + "hot-desert", + "hot-river", + "hot-ocean-cliffs" + ], "decorators": [ { "chance": 0.0009, diff --git a/regions/hot-red-desert.json b/regions/hot-red-desert.json deleted file mode 100644 index 5759ff5e..00000000 --- a/regions/hot-red-desert.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "riverBiomes": [ - "hot-river" - ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], - "spotBiomes": [ - { - "biome": "hot-ocean", - "scale": 5, - "type": "SEA", - "shuffle": 328, - "rarity": 36 - } - ], - "landBiomes": [ - "hot-mountain-plains", - "hot-mountain", - "hot-mountain-plains" - - - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-river" - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, - "deposits": [ - { - "minHeight": 8, - "maxPerChunk": 12, - "maxHeight": 57, - "minPerChunk": 7, - "minSize": 12, - "maxSize": 22, - "palette": [ - { - "block": "blackstone" - } - ], - "varience": 4 - } - ], - "riverRarity": 1, - "landBiomeZoom": 1.25, - "shoreHeightMin": 1.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "Red desert", - "shoreHeightMax": 2.2, - "shoreHeightZoom": 1.14, - "riverThickness": 0.006, - "rarity": 8 -} \ No newline at end of file diff --git a/regions/hot.json b/regions/hot.json index 309faa56..86359ba2 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -58,7 +58,6 @@ "hot-desert-red", "hot-desert", "hot-desert-dunes", - "hot-volcanic", "hot-desert-red", "hot-desert", "hot-desert-dunes-red", From 212b594a7a327f0230bde5a68cb6c68d4cd2bef6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:36 -0700 Subject: [PATCH 10/26] >:( --- regions/mosaic.json | 103 -------------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 regions/mosaic.json diff --git a/regions/mosaic.json b/regions/mosaic.json deleted file mode 100644 index 0de06ae9..00000000 --- a/regions/mosaic.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "landBiomes": [ - "mosaic-lith-black", - "mosaic-lith-green", - "mosaic-lith-purple", - "mosaic-lith-red", - "mosaic-lith-white", - "mosaic-lith-cyan" - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-ocean" - ], - "deposits": [ - { - "minHeight": 25, - "maxPerChunk": 3, - "maxHeight": 50, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "gold_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 30, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "lapis_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 11, - "maxPerChunk": 15, - "maxHeight": 99, - "minPerChunk": 5, - "minSize": 14, - "maxSize": 21, - "palette": [ - { - "data": { - "axis": "x" - }, - "block": "basalt" - }, - { - "data": { - "axis": "y" - }, - "block": "basalt" - }, - { - "data": { - "axis": "z" - }, - "block": "basalt" - } - ], - "varience": 5 - } - ], - "caveBiomes": [ - "hot-sandy-cave" - ], - "landBiomeZoom": 1.25, - "effects": [ - { - "particleAltX": 0.001, - "particleAltY": 0.00885, - "particleAltZ": 0.001, - "chance": 2, - "particleEffect": "CAMPFIRE_SIGNAL_SMOKE", - "particleOffset": 0, - "interval": 1350, - "particleCount": 0 - } - ], - "shoreHeightMin": 3.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "The Mosaics", - "shoreHeightMax": 6.2, - "loot": { - "tables": [ - "hot-food", - "hot-treasure" - ] - }, - "shoreHeightZoom": 1.14, - "rarity": 150 -} \ No newline at end of file From 61b3980df5957f228c1e7ef0bc2cb8312923a048 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:08:51 -0700 Subject: [PATCH 11/26] redundandy in mountains --- ...s-hills.json => mountain-plain-hills.json} | 0 biomes/mountain-plains.json | 2 + regions/mountain.json | 6 +- regions/mountains.json | 114 ------------------ 4 files changed, 6 insertions(+), 116 deletions(-) rename biomes/{mountains-plains-hills.json => mountain-plain-hills.json} (100%) delete mode 100644 regions/mountains.json diff --git a/biomes/mountains-plains-hills.json b/biomes/mountain-plain-hills.json similarity index 100% rename from biomes/mountains-plains-hills.json rename to biomes/mountain-plain-hills.json diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index e361357c..6f198f1b 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -5,6 +5,8 @@ "children": [ "mountain-forest", "mountain-hills", + "mountains-plains-hills", + "mountain-lake", "mountain-forest-hills" ], "childStyle": { diff --git a/regions/mountain.json b/regions/mountain.json index 6ee48fe7..fcab7695 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -20,9 +20,11 @@ ], "landBiomes": [ "mountain", + "mountain-hills", + "mountain-forest-hills", + "mountain-forest", "mountain-plains", - "mountain-plains", - "mountain-plains", + "mountain-cliffs", "mountain" ], "biomeImplosionRatio": 0.25, diff --git a/regions/mountains.json b/regions/mountains.json deleted file mode 100644 index 99e8c39e..00000000 --- a/regions/mountains.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "name": "Mountains", - "landBiomes": [ - "mountains-plains", - "mountain-main", - "temperate-lake" - ], - "seaBiomes": [ - "temperate-soft-river", - "temperate-river-loud" - ], - "biomeImplosionRatio": 0.7, - "shoreBiomes": [ - "mountain-beach" - ], - "caveBiomes": [ - "tundra-spiked-cavern", - "temperate-lit-cavern" - ], - "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.001, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - } - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - } -} From 8031491dc893d740e12af94e6b0e77bcebac6c2b Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:15:34 -0700 Subject: [PATCH 12/26] mush/rock tweaks --- biomes/mushroom-ocean-soft.json | 342 ----------------------------- biomes/ocean-steep.json | 204 ----------------- biomes/rocky-mountains-cliffs.json | 4 + regions/mushroom.json | 8 +- 4 files changed, 8 insertions(+), 550 deletions(-) delete mode 100644 biomes/mushroom-ocean-soft.json delete mode 100644 biomes/ocean-steep.json diff --git a/biomes/mushroom-ocean-soft.json b/biomes/mushroom-ocean-soft.json deleted file mode 100644 index 52af2219..00000000 --- a/biomes/mushroom-ocean-soft.json +++ /dev/null @@ -1,342 +0,0 @@ -{ - "decorators": [ - { - "chance": 0.06, - "variance": { - "style": "STATIC" - }, - "zoom": 20, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.1, - "verticalZoom": 20, - "variance": { - "style": "STATIC" - }, - "stackMax": 9, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "STATIC" - }, - "stackMin": 1 - }, - { - "chance": 0.005, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 2 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 3 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 4 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.1, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" - ], - "edit": [ - { - "find": [ - { - "block": "oak_stairs" - } - ], - "replace": { - "palette": [ - { - "block": "oak_planks" - } - ] - } - } - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.3, - "edit": [ - { - "find": [ - { - "block": "shroomlight" - } - ], - "replace": { - "palette": [ - { - "block": "mushroom_stem" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.25, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "vanillaDerivative": "OCEAN", - "name": "Mushroom Ocean soft", - "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": -31, - "max": -7, - "generator": "river" - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "features": [ - { - "rarity": 48, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], - "derivative": "OCEAN", - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "clay" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "red_sand" - }, - { - "block": "smooth_red_sandstone" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_red_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "stone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "andesite_slab" - }, - { - "weight": 1, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json deleted file mode 100644 index 0b6bac65..00000000 --- a/biomes/ocean-steep.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "name": "Ocean Steep", - "derivative": "OCEAN", - "vanillaDerivative": "OCEAN", - "generators": [ - { - "generator": "plain", - "max": -5, - "min": -25 - } - ], - "layers": [ - { - "minHeight": 2, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3 - }, - "style": { - "style": "FRACTAL_FBM_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "gravel" - } - ] - } - ], - "decorators": [ - { - "chance": 0.1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "stackMin": 4, - "stackMax": 10 - }, - { - "chance": 0.05, - "palette": [ - { - "block": "seagrass" - } - ] - }, - { - "chance": 0.05, - "palette": [ - { - "block": "tall_seagrass", - "data": { - "half": "lower" - } - } - ], - "topPalette": [ - { - "block": "tall_seagrass", - "data": { - "half": "upper" - } - } - ] - } - ], - "objects": [ - { - "place": [ - "ships/generic" - ], - "chance": 0.01, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - }, - { - "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" - ], - "chance": 1, - "mode": "FAST_MIN_HEIGHT", - "underwater": true, - "waterloggable": true, - "edit": [ - { - "find": [ - { - "block": "grass_block" - }, - { - "block": "dirt" - } - ], - "replace": { - "palette": [ - { - "block": "clay" - } - ] - } - }, - { - "find": [ - { - "block": "tall_grass" - }, - { - "block": "grass" - } - ], - "replace": { - "palette": [ - { - "block": "seagrass" - } - ] - } - } - ] - }, - { - "place": [ - "landform/underwater/ellipsoid-1" - ], - "chance": 0.5, - "underwater": true, - "mode": "CENTER_HEIGHT", - "edit": [ - { - "find": [ - { - "block": "clay" - } - ], - "replace": { - "style": { - "style": "GLOB", - "zoom": 0.02 - }, - "palette": [ - { - "weight": 2, - "block": "clay" - }, - { - "weight": 1, - "block": "cave_air" - } - ] - } - } - ] - }, - { - "place": [ - "ships/generic" - ], - "chance": 0.005, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - } - ] -} \ No newline at end of file diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountains-cliffs.json index 16e017b7..d3d1b17a 100644 --- a/biomes/rocky-mountains-cliffs.json +++ b/biomes/rocky-mountains-cliffs.json @@ -29,6 +29,10 @@ } } ], + "children": [ + "rocky-mountains", + "rocky-ocean" + ], "vanillaDerivative": "MODIFIED_GRAVELLY_MOUNTAINS", "objects": [ { diff --git a/regions/mushroom.json b/regions/mushroom.json index e4496e83..9cdf1e48 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -42,20 +42,20 @@ "scale": 0.78, "type": "LAND", "shuffle": 44, - "rarity": 262 + "rarity": 52 }, { "biome": "mushroom-warped-forest", "scale": 0.77, "type": "LAND", "shuffle": 44, - "rarity": 261 + "rarity": 31 } ], "landBiomes": [ "mushroom-forest", - "mushroom-plains", - "mushroom-warped-forest" + "mushroom-forest-hills", + "mushroom-plains" ], "biomeImplosionRatio": 0.25, "seaBiomes": [ From 6798ed19502f824e5c113c197f60dec3f0a5acb2 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:31:39 -0700 Subject: [PATCH 13/26] Swamp patches --- ...rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} | 0 biomes/rocky-mountains.json | 2 +- biomes/swamp-ocean-tree.json | 4 ++-- regions/swamp.json | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) rename biomes/{rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} (100%) diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountain-cliffs.json similarity index 100% rename from biomes/rocky-mountains-cliffs.json rename to biomes/rocky-mountain-cliffs.json diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json index d46d5430..0eec1754 100644 --- a/biomes/rocky-mountains.json +++ b/biomes/rocky-mountains.json @@ -44,7 +44,7 @@ "style": "IRIS" }, "children": [ - "rocky-mountains-cliffs" + "rocky-mountain-cliffs" ], "decorators": [ { diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index adade079..0524cc31 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -156,7 +156,7 @@ ], "translate": { "x": 0, - "y": -4, + "y": -6, "z": 0 } }, @@ -244,7 +244,7 @@ } }, "translate": { - "y": -4 + "y": -6 } } ], diff --git a/regions/swamp.json b/regions/swamp.json index 53852594..c1cfadba 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -37,6 +37,7 @@ "swamp-willow-forest", "swamp-lake", "swamp-roofed-wayward", + "swamp-mountain-forest", "swamp-marsh" ], "biomeImplosionRatio": 0.26, @@ -61,7 +62,8 @@ } ], "caveBiomes": [ - "swamp-murky-cavern" + "swamp-murky-cavern", + "swamp-murky-cavern-gleaming" ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, From 9bb6630a1fb185fd3108dcd7fd0c4a6caa264b99 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:44:46 -0700 Subject: [PATCH 14/26] 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 From b770766585822243c504e7d34b26fce7002a6830 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:25 -0700 Subject: [PATCH 15/26] Fixed redundancy in hot region --- biomes/hot-desert-hills.json | 196 ----------------------------- biomes/hot-desert.json | 3 + biomes/hot-mesa-cliffs-yellow.json | 192 ---------------------------- biomes/hot-mesa-cliffs.json | 2 +- biomes/hot-mesa-dark.json | 1 - biomes/hot-mesa.json | 2 +- biomes/hot-ocean.json | 6 + regions/hot-red-desert.json | 70 ----------- regions/hot.json | 1 - 9 files changed, 11 insertions(+), 462 deletions(-) delete mode 100644 biomes/hot-desert-hills.json delete mode 100644 biomes/hot-mesa-cliffs-yellow.json delete mode 100644 regions/hot-red-desert.json diff --git a/biomes/hot-desert-hills.json b/biomes/hot-desert-hills.json deleted file mode 100644 index d127e81e..00000000 --- a/biomes/hot-desert-hills.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "vanillaDerivative": "DESERT", - "decorators": [ - { - "verticalZoom": 5, - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "stackMax": 5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "cactus" - } - ], - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 1 - }, - { - "chance": 0.00135, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "polished_blackstone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "polished_blackstone_button" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.05, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "rarity": 2, - "name": "Desert Hills", - "layers": [ - { - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 9, - "palette": [ - { - "block": "sandstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "cactus-clutter" - ] - }, - "derivative": "DESERT", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "sandstone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "smooth_sandstone_slab" - }, - { - "weight": 2, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index f16b02a2..cb398164 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -9,6 +9,9 @@ "min": -8 } ], + "children": [ + "hot-oasis" + ], "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/hot-mesa-cliffs-yellow.json b/biomes/hot-mesa-cliffs-yellow.json deleted file mode 100644 index 224041dd..00000000 --- a/biomes/hot-mesa-cliffs-yellow.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "vanillaDerivative": "BADLANDS_PLATEAU", - "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" - } - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "name": "Yellow Mesa", - "layers": [ - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "white_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "red_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "yellow_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "generators": [ - { - "min": 1, - "max": 6, - "generator": "plain" - }, - { - "min": 9, - "max": 35, - "generator": "mountain" - } - ], - "derivative": "SHATTERED_SAVANNA", - "lockLayers": true, - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "red_terracotta" - }, - { - "block": "gray_terracotta" - }, - { - "block": "yellow_terracotta" - } - ] - }, - "rarity": 9 -} \ No newline at end of file diff --git a/biomes/hot-mesa-cliffs.json b/biomes/hot-mesa-cliffs.json index ee96cabd..1f4ad96c 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/hot-mesa-cliffs.json @@ -1,7 +1,7 @@ { "vanillaDerivative": "BADLANDS_PLATEAU", "children": [ - "hot-mesa-cliffs-yellow" + "hot-mesa-cliffs" ], "decorators": [ { diff --git a/biomes/hot-mesa-dark.json b/biomes/hot-mesa-dark.json index 5904a438..1363f39d 100644 --- a/biomes/hot-mesa-dark.json +++ b/biomes/hot-mesa-dark.json @@ -147,7 +147,6 @@ "childShrinkFactor": 0.35, "children": [ "hot-mesa-cliffs", - "hot-mesa-cliffs-yellow", "hot-mesa-red", "hot-mesa-green", "hot-mesa-blue" diff --git a/biomes/hot-mesa.json b/biomes/hot-mesa.json index 20e4882a..045fd14f 100644 --- a/biomes/hot-mesa.json +++ b/biomes/hot-mesa.json @@ -9,7 +9,7 @@ ], "children": [ "hot-mesa-valleys", - "hot-mesa-blue", + "hot-mesa-red", "hot-mesa-blue", "hot-mesa-dark", "hot-mesa-green", diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index 0a75011f..254f5908 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -1,5 +1,11 @@ { "vanillaDerivative": "WARM_OCEAN", + "children": [ + "hot-desert", + "hot-desert", + "hot-river", + "hot-ocean-cliffs" + ], "decorators": [ { "chance": 0.0009, diff --git a/regions/hot-red-desert.json b/regions/hot-red-desert.json deleted file mode 100644 index 5759ff5e..00000000 --- a/regions/hot-red-desert.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "riverBiomes": [ - "hot-river" - ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], - "spotBiomes": [ - { - "biome": "hot-ocean", - "scale": 5, - "type": "SEA", - "shuffle": 328, - "rarity": 36 - } - ], - "landBiomes": [ - "hot-mountain-plains", - "hot-mountain", - "hot-mountain-plains" - - - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-river" - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, - "deposits": [ - { - "minHeight": 8, - "maxPerChunk": 12, - "maxHeight": 57, - "minPerChunk": 7, - "minSize": 12, - "maxSize": 22, - "palette": [ - { - "block": "blackstone" - } - ], - "varience": 4 - } - ], - "riverRarity": 1, - "landBiomeZoom": 1.25, - "shoreHeightMin": 1.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "Red desert", - "shoreHeightMax": 2.2, - "shoreHeightZoom": 1.14, - "riverThickness": 0.006, - "rarity": 8 -} \ No newline at end of file diff --git a/regions/hot.json b/regions/hot.json index 309faa56..86359ba2 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -58,7 +58,6 @@ "hot-desert-red", "hot-desert", "hot-desert-dunes", - "hot-volcanic", "hot-desert-red", "hot-desert", "hot-desert-dunes-red", From bdd6138ec977ec909a9df52677db44a203c3504e Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:36 -0700 Subject: [PATCH 16/26] >:( --- regions/mosaic.json | 103 -------------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 regions/mosaic.json diff --git a/regions/mosaic.json b/regions/mosaic.json deleted file mode 100644 index 0de06ae9..00000000 --- a/regions/mosaic.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "landBiomes": [ - "mosaic-lith-black", - "mosaic-lith-green", - "mosaic-lith-purple", - "mosaic-lith-red", - "mosaic-lith-white", - "mosaic-lith-cyan" - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-ocean" - ], - "deposits": [ - { - "minHeight": 25, - "maxPerChunk": 3, - "maxHeight": 50, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "gold_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 30, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "lapis_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 11, - "maxPerChunk": 15, - "maxHeight": 99, - "minPerChunk": 5, - "minSize": 14, - "maxSize": 21, - "palette": [ - { - "data": { - "axis": "x" - }, - "block": "basalt" - }, - { - "data": { - "axis": "y" - }, - "block": "basalt" - }, - { - "data": { - "axis": "z" - }, - "block": "basalt" - } - ], - "varience": 5 - } - ], - "caveBiomes": [ - "hot-sandy-cave" - ], - "landBiomeZoom": 1.25, - "effects": [ - { - "particleAltX": 0.001, - "particleAltY": 0.00885, - "particleAltZ": 0.001, - "chance": 2, - "particleEffect": "CAMPFIRE_SIGNAL_SMOKE", - "particleOffset": 0, - "interval": 1350, - "particleCount": 0 - } - ], - "shoreHeightMin": 3.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "The Mosaics", - "shoreHeightMax": 6.2, - "loot": { - "tables": [ - "hot-food", - "hot-treasure" - ] - }, - "shoreHeightZoom": 1.14, - "rarity": 150 -} \ No newline at end of file From 95796405ce5552e94b399eb5570c1632813a48ba Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:08:51 -0700 Subject: [PATCH 17/26] redundandy in mountains --- ...s-hills.json => mountain-plain-hills.json} | 0 biomes/mountain-plains.json | 2 + regions/mountain.json | 6 +- regions/mountains.json | 114 ------------------ 4 files changed, 6 insertions(+), 116 deletions(-) rename biomes/{mountains-plains-hills.json => mountain-plain-hills.json} (100%) delete mode 100644 regions/mountains.json diff --git a/biomes/mountains-plains-hills.json b/biomes/mountain-plain-hills.json similarity index 100% rename from biomes/mountains-plains-hills.json rename to biomes/mountain-plain-hills.json diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index e361357c..6f198f1b 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -5,6 +5,8 @@ "children": [ "mountain-forest", "mountain-hills", + "mountains-plains-hills", + "mountain-lake", "mountain-forest-hills" ], "childStyle": { diff --git a/regions/mountain.json b/regions/mountain.json index 6ee48fe7..fcab7695 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -20,9 +20,11 @@ ], "landBiomes": [ "mountain", + "mountain-hills", + "mountain-forest-hills", + "mountain-forest", "mountain-plains", - "mountain-plains", - "mountain-plains", + "mountain-cliffs", "mountain" ], "biomeImplosionRatio": 0.25, diff --git a/regions/mountains.json b/regions/mountains.json deleted file mode 100644 index 99e8c39e..00000000 --- a/regions/mountains.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "name": "Mountains", - "landBiomes": [ - "mountains-plains", - "mountain-main", - "temperate-lake" - ], - "seaBiomes": [ - "temperate-soft-river", - "temperate-river-loud" - ], - "biomeImplosionRatio": 0.7, - "shoreBiomes": [ - "mountain-beach" - ], - "caveBiomes": [ - "tundra-spiked-cavern", - "temperate-lit-cavern" - ], - "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.001, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - } - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - } -} From 81ab552ed72a0f7c788504ff085c5fd2c4dfb8d0 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:15:34 -0700 Subject: [PATCH 18/26] mush/rock tweaks --- biomes/mushroom-ocean-soft.json | 342 ----------------------------- biomes/ocean-steep.json | 204 ----------------- biomes/rocky-mountains-cliffs.json | 4 + regions/mushroom.json | 8 +- 4 files changed, 8 insertions(+), 550 deletions(-) delete mode 100644 biomes/mushroom-ocean-soft.json delete mode 100644 biomes/ocean-steep.json diff --git a/biomes/mushroom-ocean-soft.json b/biomes/mushroom-ocean-soft.json deleted file mode 100644 index 52af2219..00000000 --- a/biomes/mushroom-ocean-soft.json +++ /dev/null @@ -1,342 +0,0 @@ -{ - "decorators": [ - { - "chance": 0.06, - "variance": { - "style": "STATIC" - }, - "zoom": 20, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.1, - "verticalZoom": 20, - "variance": { - "style": "STATIC" - }, - "stackMax": 9, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "STATIC" - }, - "stackMin": 1 - }, - { - "chance": 0.005, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 2 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 3 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 4 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.1, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" - ], - "edit": [ - { - "find": [ - { - "block": "oak_stairs" - } - ], - "replace": { - "palette": [ - { - "block": "oak_planks" - } - ] - } - } - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.3, - "edit": [ - { - "find": [ - { - "block": "shroomlight" - } - ], - "replace": { - "palette": [ - { - "block": "mushroom_stem" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.25, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "vanillaDerivative": "OCEAN", - "name": "Mushroom Ocean soft", - "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": -31, - "max": -7, - "generator": "river" - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "features": [ - { - "rarity": 48, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], - "derivative": "OCEAN", - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "clay" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "red_sand" - }, - { - "block": "smooth_red_sandstone" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_red_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "stone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "andesite_slab" - }, - { - "weight": 1, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json deleted file mode 100644 index 0b6bac65..00000000 --- a/biomes/ocean-steep.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "name": "Ocean Steep", - "derivative": "OCEAN", - "vanillaDerivative": "OCEAN", - "generators": [ - { - "generator": "plain", - "max": -5, - "min": -25 - } - ], - "layers": [ - { - "minHeight": 2, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3 - }, - "style": { - "style": "FRACTAL_FBM_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "gravel" - } - ] - } - ], - "decorators": [ - { - "chance": 0.1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "stackMin": 4, - "stackMax": 10 - }, - { - "chance": 0.05, - "palette": [ - { - "block": "seagrass" - } - ] - }, - { - "chance": 0.05, - "palette": [ - { - "block": "tall_seagrass", - "data": { - "half": "lower" - } - } - ], - "topPalette": [ - { - "block": "tall_seagrass", - "data": { - "half": "upper" - } - } - ] - } - ], - "objects": [ - { - "place": [ - "ships/generic" - ], - "chance": 0.01, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - }, - { - "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" - ], - "chance": 1, - "mode": "FAST_MIN_HEIGHT", - "underwater": true, - "waterloggable": true, - "edit": [ - { - "find": [ - { - "block": "grass_block" - }, - { - "block": "dirt" - } - ], - "replace": { - "palette": [ - { - "block": "clay" - } - ] - } - }, - { - "find": [ - { - "block": "tall_grass" - }, - { - "block": "grass" - } - ], - "replace": { - "palette": [ - { - "block": "seagrass" - } - ] - } - } - ] - }, - { - "place": [ - "landform/underwater/ellipsoid-1" - ], - "chance": 0.5, - "underwater": true, - "mode": "CENTER_HEIGHT", - "edit": [ - { - "find": [ - { - "block": "clay" - } - ], - "replace": { - "style": { - "style": "GLOB", - "zoom": 0.02 - }, - "palette": [ - { - "weight": 2, - "block": "clay" - }, - { - "weight": 1, - "block": "cave_air" - } - ] - } - } - ] - }, - { - "place": [ - "ships/generic" - ], - "chance": 0.005, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - } - ] -} \ No newline at end of file diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountains-cliffs.json index 16e017b7..d3d1b17a 100644 --- a/biomes/rocky-mountains-cliffs.json +++ b/biomes/rocky-mountains-cliffs.json @@ -29,6 +29,10 @@ } } ], + "children": [ + "rocky-mountains", + "rocky-ocean" + ], "vanillaDerivative": "MODIFIED_GRAVELLY_MOUNTAINS", "objects": [ { diff --git a/regions/mushroom.json b/regions/mushroom.json index e4496e83..9cdf1e48 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -42,20 +42,20 @@ "scale": 0.78, "type": "LAND", "shuffle": 44, - "rarity": 262 + "rarity": 52 }, { "biome": "mushroom-warped-forest", "scale": 0.77, "type": "LAND", "shuffle": 44, - "rarity": 261 + "rarity": 31 } ], "landBiomes": [ "mushroom-forest", - "mushroom-plains", - "mushroom-warped-forest" + "mushroom-forest-hills", + "mushroom-plains" ], "biomeImplosionRatio": 0.25, "seaBiomes": [ From 0b89943095ed9274cc0b62da0e0e85e690e0fbe7 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:31:39 -0700 Subject: [PATCH 19/26] Swamp patches --- ...rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} | 0 biomes/rocky-mountains.json | 2 +- biomes/swamp-ocean-tree.json | 4 ++-- regions/swamp.json | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) rename biomes/{rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} (100%) diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountain-cliffs.json similarity index 100% rename from biomes/rocky-mountains-cliffs.json rename to biomes/rocky-mountain-cliffs.json diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json index d46d5430..0eec1754 100644 --- a/biomes/rocky-mountains.json +++ b/biomes/rocky-mountains.json @@ -44,7 +44,7 @@ "style": "IRIS" }, "children": [ - "rocky-mountains-cliffs" + "rocky-mountain-cliffs" ], "decorators": [ { diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index adade079..0524cc31 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -156,7 +156,7 @@ ], "translate": { "x": 0, - "y": -4, + "y": -6, "z": 0 } }, @@ -244,7 +244,7 @@ } }, "translate": { - "y": -4 + "y": -6 } } ], diff --git a/regions/swamp.json b/regions/swamp.json index 53852594..c1cfadba 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -37,6 +37,7 @@ "swamp-willow-forest", "swamp-lake", "swamp-roofed-wayward", + "swamp-mountain-forest", "swamp-marsh" ], "biomeImplosionRatio": 0.26, @@ -61,7 +62,8 @@ } ], "caveBiomes": [ - "swamp-murky-cavern" + "swamp-murky-cavern", + "swamp-murky-cavern-gleaming" ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, From d9a38fcecf4c707b135ca80cb06339153edd6e46 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:40:33 -0700 Subject: [PATCH 20/26] Fixed redundancy in hot region --- biomes/temperate-birch-forest.json | 2 +- biomes/temperate-bonsai.json | 2 +- biomes/temperate-flower-forest-free.json | 529 ------------------ biomes/temperate-flower-forest.json | 15 +- biomes/temperate-lake.json | 212 ------- ...-hills.json => temperate-plain-hills.json} | 0 biomes/temperate-plains.json | 2 +- biomes/temperate-river-loud.json | 181 ------ biomes/temperate-soft-river.json | 181 ------ regions/temperate.json | 7 +- 10 files changed, 6 insertions(+), 1125 deletions(-) delete mode 100644 biomes/temperate-flower-forest-free.json delete mode 100644 biomes/temperate-lake.json rename biomes/{temperate-plains-hills.json => temperate-plain-hills.json} (100%) delete mode 100644 biomes/temperate-river-loud.json delete mode 100644 biomes/temperate-soft-river.json diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index 6c04ef14..9d3cece3 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -1,4 +1,4 @@ -{ + { "vanillaDerivative": "BIRCH_FOREST", "jigsawStructures": [ { diff --git a/biomes/temperate-bonsai.json b/biomes/temperate-bonsai.json index f18d8161..087d7653 100644 --- a/biomes/temperate-bonsai.json +++ b/biomes/temperate-bonsai.json @@ -3,7 +3,7 @@ "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plains-hills" + "temperate-plain-hills" ], "biomeScatter": [ "FOREST", diff --git a/biomes/temperate-flower-forest-free.json b/biomes/temperate-flower-forest-free.json deleted file mode 100644 index 72792a32..00000000 --- a/biomes/temperate-flower-forest-free.json +++ /dev/null @@ -1,529 +0,0 @@ -{ - "vanillaDerivative": "Flower Forest", - "entityInitialSpawns": [{ - "entity": "cow", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "pig", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "sheep", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 7 - } - ], - "objects": [ - { - "chance": 0.01, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.004, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "sakura/tronco" - ], - "translate": { - "x": 0, - "y": 1, - "z": 0 - } - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.4, - "mode": "PAINT", - "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 - } - }, - { - "chance": 0.2, - "mode": "PAINT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "rocks/r1", - "rocks/r3" - ], - "translate": { - "x": 0, - "y": 1, - "z": 0 - } - }, - { - "chance": 0.2, - "mode": "PAINT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "rocks/r2", - "rocks/r3", - "rocks/r4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.00036, - "edit": [{ - "find": [{ - "block": "white_wool" - }], - "replace": { - "palette": [{ - "block": "oak_wood" - }] - } - }, - { - "find": [{ - "block": "black_wool" - }], - "replace": { - "palette": [{ - "block": "oak_wood" - }] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "sm-tree/oakw-oakl" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "derivative": "FLOWER_FOREST", - "biomeStyle": { - "style": "IRIS" - }, - "decorators": [{ - "chance": 0.3, - "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" - }, - { - "weight": 1, - "block": "grass" - }, - { - "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.1, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "weight": 1, - "block": "grass" - }, - { - "block": "grass" - }, - { - "block": "grass" - }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [{ - "block": "rose_bush" - }], - "style": { - "style": "STATIC" - } - }, - { - "chance": 7, - "block": "grass" - }, { - "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" - },{ - "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.04, - "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.5, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "grass" - }] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "rose_bush" - }] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "cobblestone_slab" - }] - } - ], - "name": "Flower Forest free", - "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": 3, - "max": 10, - "generator": "plain" - }], - "loot": { - "tables": [ - "forest-food" - ] - }, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [{ - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "biomeScatter": [ - "FLOWER_FOREST" - ], - "rarity": 15 -} \ No newline at end of file diff --git a/biomes/temperate-flower-forest.json b/biomes/temperate-flower-forest.json index 101aa7ce..2683123a 100644 --- a/biomes/temperate-flower-forest.json +++ b/biomes/temperate-flower-forest.json @@ -1,5 +1,5 @@ { - "vanillaDerivative": "Flower Forest", + "vanillaDerivative": "FLOWER_FOREST", "entityInitialSpawns": [{ "entity": "cow", "maxSpawns": 3, @@ -510,19 +510,6 @@ { "block": "grass" }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [{ - "block": "rose_bush" - }], - "style": { - "style": "STATIC" - } - }, { "chance": 7, "block": "grass" diff --git a/biomes/temperate-lake.json b/biomes/temperate-lake.json deleted file mode 100644 index da965c14..00000000 --- a/biomes/temperate-lake.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "name": "lake", - "derivative": "TAIGA_MOUNTAINS"", - "vanillaDerivative": "PLAINS", - "generators": [ - { - "generator": "plain", - "max": -30, - "min": -40 - } - ], - "decorators": [ - { - "chance": 0.19, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "grass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.02, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "age": 7 - }, - "block": "wheat" - } - ], - "style": { - "style": "IRIS", - "zoom": 0.28 - } - }, - { - "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": [], - "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", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "pig", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - } - ], - "biomeZoom": 60, - "biomeStyle": { - "style": "IRIS" - }, - "wall": { - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - } - ] - } -} \ No newline at end of file diff --git a/biomes/temperate-plains-hills.json b/biomes/temperate-plain-hills.json similarity index 100% rename from biomes/temperate-plains-hills.json rename to biomes/temperate-plain-hills.json diff --git a/biomes/temperate-plains.json b/biomes/temperate-plains.json index 25067d97..dd15926f 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate-plains.json @@ -3,7 +3,7 @@ "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plains-hills" + "temperate-plain-hills" ], "jigsawStructures": [ { diff --git a/biomes/temperate-river-loud.json b/biomes/temperate-river-loud.json deleted file mode 100644 index 94ef2dd0..00000000 --- a/biomes/temperate-river-loud.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "vanillaDerivative": "RIVER", - "decorators": [ - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 5, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 6, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "River Loud", - "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": "plain", - "max": -10, - "min": -30 - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "DEEP_OCEAN" -} \ No newline at end of file diff --git a/biomes/temperate-soft-river.json b/biomes/temperate-soft-river.json deleted file mode 100644 index 747d747d..00000000 --- a/biomes/temperate-soft-river.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "vanillaDerivative": "RIVER", - "decorators": [ - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 5, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 6, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "Soft 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": -40, - "min": -50 - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "DEEP_OCEAN" -} \ No newline at end of file diff --git a/regions/temperate.json b/regions/temperate.json index 93fb0c82..01628d9c 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -13,6 +13,7 @@ ], "landBiomes": [ "temperate-plateau", + "temperate-wilds", "temperate-flower-forest", "temperate-longtree-forest", "temperate-oak", @@ -134,7 +135,7 @@ "caveBiomes": [ "temperate-old-cavern", "temperate-cracked-cavern", - "temperate-cracked-cavern" + "temperate-lit-cavern" ], "landBiomeZoom": 1.25, "riverStyle": { @@ -147,10 +148,6 @@ "temperate-oak-beach", "temperate-oak-beach", "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", "temperate-beach", "temperate-oak-beach" ], From 9b2251a8f0e83adb28346b37faf81c758de45ca1 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:55:11 -0700 Subject: [PATCH 21/26] Fixed Tropical Redundancy --- biomes/tropical-lake.json | 150 ------------------ ...ns.json => tropical-mountain-extreme.json} | 2 +- ...ins.json => tropical-mountain-plains.json} | 2 +- ...ater.json => tropical-mountain-water.json} | 0 regions/tropical-mountain.json | 7 +- regions/tropical.json | 4 +- 6 files changed, 7 insertions(+), 158 deletions(-) delete mode 100644 biomes/tropical-lake.json rename biomes/{tropical-mountains.json => tropical-mountain-extreme.json} (99%) rename biomes/{tropical-mountains-plains.json => tropical-mountain-plains.json} (99%) rename biomes/{tropical-mountains-water.json => tropical-mountain-water.json} (100%) diff --git a/biomes/tropical-lake.json b/biomes/tropical-lake.json deleted file mode 100644 index 7a0ad3e5..00000000 --- a/biomes/tropical-lake.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "name": "Tropical lake", - "derivative": "JUNGLE", - "vanillaDerivative": "JUNGLE", - "children": [ - "tropical-plains-hills" - ], - "childStyle": { - "style": "SIMPLEX", - "zoom": 0.5, - "exponent": 2.0 - }, - "generators": [ - { - "generator": "smooth-dunes", - "max": -20, - "min": -30 - } - ], - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "style": { - "style": "STATIC" - }, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], - "decorators": [ - { - "chance": 0.7, - "palette": [ - { - "weight": 2, - "block": "grass" - }, - { - "weight": 1, - "block": "tall_grass" - } - ] - }, - { - "chance": 0.06, - "variance": { - "style": "STATIC" - }, - "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" - } - ] - } - ], - "objects": [ - { - "mode": "PAINT", - "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" - ], - "chance": 1, - "density": 5 - }, - { - "place": [ - "tree/jungle/1", - "tree/jungle/2", - "tree/jungle/3", - "tree/jungle/4", - "tree/jungle/5", - "tree/jungle/6", - "tree/jungle/7", - "tree/jungle/8", - "tree/jungle/9" - ], - "chance": 1, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - }, - "translate": { - "y": -2 - } - } - ] -} \ No newline at end of file diff --git a/biomes/tropical-mountains.json b/biomes/tropical-mountain-extreme.json similarity index 99% rename from biomes/tropical-mountains.json rename to biomes/tropical-mountain-extreme.json index 59e9b0b6..5e539f49 100644 --- a/biomes/tropical-mountains.json +++ b/biomes/tropical-mountain-extreme.json @@ -3,7 +3,7 @@ "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "children": [ - "tropical-mountains-water" + "tropical-mountain-water" ], "childStyle": { "style": "GLOB", diff --git a/biomes/tropical-mountains-plains.json b/biomes/tropical-mountain-plains.json similarity index 99% rename from biomes/tropical-mountains-plains.json rename to biomes/tropical-mountain-plains.json index ccc315d2..fe5a40e3 100644 --- a/biomes/tropical-mountains-plains.json +++ b/biomes/tropical-mountain-plains.json @@ -3,7 +3,7 @@ "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "children": [ - "tropical-mountains" + "tropical-mountain-extreme" ], "childStyle": { "style": "GLOB", diff --git a/biomes/tropical-mountains-water.json b/biomes/tropical-mountain-water.json similarity index 100% rename from biomes/tropical-mountains-water.json rename to biomes/tropical-mountain-water.json diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index df4b161c..0679d6fd 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -23,12 +23,11 @@ "landBiomes": [ "tropical-plains", "tropical-mountain", - "tropical-plains", - "tropical-plains", "temperate-wilds", - "tropical-mountains", + "tropical-plains", + "tropical-mountain-extreme", "temperate-wilds", - "tropical-plains" + "tropical-plains-hills" ], "biomeImplosionRatio": 0.25, "seaBiomes": [ diff --git a/regions/tropical.json b/regions/tropical.json index 1d1b6a0f..77416669 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -69,9 +69,9 @@ "landBiomeZoom": 1.25, "shoreHeightMin": 3.2, "shoreBiomes": [ + "tropical-island-beach", "tropical-beach", - "tropical-beach", - "tropical-beach", + "tropical-beach-charred", "tropical-beach-bamboo" ], "name": "Tropical", From 3799d368d7b10b55e473919531df569c8338c15e Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:58:22 -0700 Subject: [PATCH 22/26] Fixed Tundra Redundancy --- biomes/tundra-mountains-huge.json | 300 ------------------------------ biomes/tundra-ocean.json | 279 --------------------------- biomes/tundra-river-loud.json | 240 ------------------------ 3 files changed, 819 deletions(-) delete mode 100644 biomes/tundra-mountains-huge.json delete mode 100644 biomes/tundra-ocean.json delete mode 100644 biomes/tundra-river-loud.json diff --git a/biomes/tundra-mountains-huge.json b/biomes/tundra-mountains-huge.json deleted file mode 100644 index 2f1b0db4..00000000 --- a/biomes/tundra-mountains-huge.json +++ /dev/null @@ -1,300 +0,0 @@ -{ - "vanillaDerivative": "TAIGA_MOUNTAINS", - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], - "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 - } - ], - "objects": [ - { - "place": [ - "patch/graveldirt1", - "patch/graveldirt2", - "patch/graveldirt3", - "patch/graveldirt4" - ], - "chance": 0.75, - "mode": "PAINT" - }, - { - "chance": 0.8, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "evergreen/fantasy_evergreen_large1", - "evergreen/fantasy_evergreen_large2", - "evergreen/fantasy_evergreen_large1", - "evergreen/fantasy_evergreen_large2", - "evergreen/fantasy_evergreen_large1", - "evergreen/fantasy_evergreen_large2", - "evergreen/fantasy_evergreen_large3", - "evergreen/fantasy_evergreen_large4", - "evergreen/fantasy_evergreen_large5", - "evergreen/fantasy_evergreen_large6", - "evergreen/fantasy_evergreen_medium1", - "evergreen/fantasy_evergreen_medium2", - "evergreen/fantasy_evergreen_medium3" - ], - "translate": { - "x": 0, - "y": -2, - "z": 0 - } - }, - { - "chance": 0.005, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.25, - "place": [ - "pine/pine1", - "pine/pine2", - "pine/pine3", - "pine/pine4", - "pine/pine5", - "pine/pine6", - "pine/pine7", - "pine/pine8", - "pine/pine9", - "pine/pine10", - "pine/pine11", - "pine/pine12" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "biomeZoom": 30, - "derivative": "MOUNTAINS", - "biomeStyle": { - "style": "IRIS" - }, - "decorators": [ - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.1, - "palette": [ - { - "block": "white_tulip" - }, - { - "block": "blue_orchid" - }, - { - "block": "poppy" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "age": 0 - }, - "block": "sweet_berry_bush" - }, - { - "data": { - "age": 1 - }, - "block": "sweet_berry_bush" - }, - { - "data": { - "age": 2 - }, - "block": "sweet_berry_bush" - }, - { - "data": { - "age": 3 - }, - "block": "sweet_berry_bush" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.2, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "grass" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "name": "Mountains Huge", - "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": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 96, - "max": 139, - "generator": "mountain" - } - ], - "childShrinkFactor": 8, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "biomeScatter": [ - "MOUNTAINS" - ], - "rarity": 8 -} \ No newline at end of file diff --git a/biomes/tundra-ocean.json b/biomes/tundra-ocean.json deleted file mode 100644 index 111d89c0..00000000 --- a/biomes/tundra-ocean.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "vanillaDerivative": "COLD_OCEAN", - "children": [ - "rocky-ocean" - ], - "decorators": [ - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 20, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 24, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.01, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" - ], - "edit": [ - { - "find": [ - { - "block": "oak_stairs" - } - ], - "replace": { - "palette": [ - { - "block": "oak_planks" - } - ] - } - } - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, - { - "chance": 0.004, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/gall-1", - "ships/gall-2", - "ships/gall-3" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, - { - "chance": 0.2, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "statue/sub-stat-1", - "statue/sub-stat-2", - "statue/sub-stat-3", - "statue/sub-stat-4", - "statue/sub-stat-5" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - } - ], - "name": "Cold Ocean", - "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": [ - { - "min": -33, - "max": -7, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "COLD_OCEAN", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "sandstone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "smooth_sandstone_slab" - }, - { - "weight": 2, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/tundra-river-loud.json b/biomes/tundra-river-loud.json deleted file mode 100644 index f6b84b8c..00000000 --- a/biomes/tundra-river-loud.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "vanillaDerivative": "RIVER", - "children": [ - "rocky-ocean" - ], - "decorators": [ - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 20, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 24, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.01, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, - { - "chance": 0.1, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "statue/sub-stat-1", - "statue/sub-stat-2", - "statue/sub-stat-3", - "statue/sub-stat-4", - "statue/sub-stat-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "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": -15, - "min": -20 - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "COLD_OCEAN", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "sandstone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "smooth_sandstone_slab" - }, - { - "weight": 2, - "block": "air" - } - ] - } -} \ No newline at end of file From b8fdb046b647120441362a3da99350cc28085f6e Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 19:06:41 -0700 Subject: [PATCH 23/26] Deep Clean --- biomes/frozen-mountain.json | 2 +- biomes/hot-mountain-middle.json | 2 -- biomes/mountain-plains.json | 2 +- biomes/mushroom-ocean.json | 12 ------------ biomes/ocean-deep.json | 5 ++++- biomes/temperate-longtree-forest.json | 19 ++----------------- biomes/temperate-oak-denmyre.json | 21 +++------------------ biomes/temperate-oak-forest.json | 15 --------------- biomes/tropical-coral-ocean-cliffs.json | 12 ------------ biomes/tropical-coral-ocean.json | 12 ------------ biomes/tropical-ocean.json | 13 +------------ biomes/tropical-volcanic-plains.json | 2 +- 12 files changed, 13 insertions(+), 104 deletions(-) diff --git a/biomes/frozen-mountain.json b/biomes/frozen-mountain.json index 88190ad2..6b7f29fc 100644 --- a/biomes/frozen-mountain.json +++ b/biomes/frozen-mountain.json @@ -11,7 +11,7 @@ "children": [ "frozen-mountain-middle", "frozen-peak", - "frozen-mountains-cliffs" + "frozen-mountain-cliffs" ], "biomeScatter": [ "PLAINS", diff --git a/biomes/hot-mountain-middle.json b/biomes/hot-mountain-middle.json index 9c820784..178c302a 100644 --- a/biomes/hot-mountain-middle.json +++ b/biomes/hot-mountain-middle.json @@ -98,6 +98,4 @@ } ] } -}, - "rarity": 29 } \ No newline at end of file diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index 6f198f1b..f083ca44 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -5,7 +5,7 @@ "children": [ "mountain-forest", "mountain-hills", - "mountains-plains-hills", + "mountain-plain-hills", "mountain-lake", "mountain-forest-hills" ], diff --git a/biomes/mushroom-ocean.json b/biomes/mushroom-ocean.json index 0cb8fa28..15dbb815 100644 --- a/biomes/mushroom-ocean.json +++ b/biomes/mushroom-ocean.json @@ -273,18 +273,6 @@ "ocean-clutter" ] }, - "features": [ - { - "rarity": 48, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], "derivative": "OCEAN", "wall": { "style": { diff --git a/biomes/ocean-deep.json b/biomes/ocean-deep.json index ec12d71b..7a0ea4e8 100644 --- a/biomes/ocean-deep.json +++ b/biomes/ocean-deep.json @@ -97,7 +97,10 @@ ], "loot": { "tables": [ - "ocean-treasure" + "ocean-clutter", + "global-treasure", + "cold-food", + "tropical-treasure" ] }, "objects": [ diff --git a/biomes/temperate-longtree-forest.json b/biomes/temperate-longtree-forest.json index 556b0d8d..d4b0723e 100644 --- a/biomes/temperate-longtree-forest.json +++ b/biomes/temperate-longtree-forest.json @@ -243,26 +243,11 @@ "block": "grass" }, { - "block": "grass" + "block": "rose_bush" }, { - "block": "grass" + "block": "dandelion" }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "rose_bush" - } - ], - "style": { - "style": "STATIC" - } - }, { "chance": 7, "block": "grass" diff --git a/biomes/temperate-oak-denmyre.json b/biomes/temperate-oak-denmyre.json index a35b5739..24aae25f 100644 --- a/biomes/temperate-oak-denmyre.json +++ b/biomes/temperate-oak-denmyre.json @@ -23,29 +23,14 @@ "block": "grass" }, { - "block": "grass" + "block": "lily_of_the_valley" }, { - "block": "grass" + "block": "allium" }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "rose_bush" - } - ], - "style": { - "style": "STATIC" - } - }, { "chance": 7, - "block": "grass" + "block": "poppy" } ] }, diff --git a/biomes/temperate-oak-forest.json b/biomes/temperate-oak-forest.json index 8276a4e0..6ff90548 100644 --- a/biomes/temperate-oak-forest.json +++ b/biomes/temperate-oak-forest.json @@ -317,21 +317,6 @@ { "block": "grass" }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "rose_bush" - } - ], - "style": { - "style": "STATIC" - } - }, { "chance": 7, "block": "grass" diff --git a/biomes/tropical-coral-ocean-cliffs.json b/biomes/tropical-coral-ocean-cliffs.json index 1a920f55..b31a0e81 100644 --- a/biomes/tropical-coral-ocean-cliffs.json +++ b/biomes/tropical-coral-ocean-cliffs.json @@ -1723,18 +1723,6 @@ "ocean-clutter" ] }, - "features": [ - { - "rarity": 33, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], "derivative": "LUKEWARM_OCEAN", "wall": { "palette": [ diff --git a/biomes/tropical-coral-ocean.json b/biomes/tropical-coral-ocean.json index 0efb9408..524d9cb2 100644 --- a/biomes/tropical-coral-ocean.json +++ b/biomes/tropical-coral-ocean.json @@ -1652,18 +1652,6 @@ } } ], - "features": [ - { - "rarity": 38, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], "name": "Coral Ocean", "layers": [ { diff --git a/biomes/tropical-ocean.json b/biomes/tropical-ocean.json index 03e6dfd8..8a3b883b 100644 --- a/biomes/tropical-ocean.json +++ b/biomes/tropical-ocean.json @@ -289,18 +289,7 @@ } } ], - "features": [ - { - "rarity": 38, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], + "name": "Tropical Ocean", "layers": [ { diff --git a/biomes/tropical-volcanic-plains.json b/biomes/tropical-volcanic-plains.json index 6d7ea88e..29b89a3b 100644 --- a/biomes/tropical-volcanic-plains.json +++ b/biomes/tropical-volcanic-plains.json @@ -15,7 +15,7 @@ "generators": [ { "min": 190, - "max": 290, + "max": 256, "generator": "plain" } ], From b6505a9c61960000b770251524c5517923bf3192 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 19:28:22 -0700 Subject: [PATCH 24/26] more removes --- biomes/hot-desert-dunes-red.json | 2 +- biomes/hot-desert-dunes.json | 2 +- generators/dunes.json | 24 ------------------------ generators/smooth-land.json | 26 -------------------------- regions/tundra.json | 1 - 5 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 generators/dunes.json delete mode 100644 generators/smooth-land.json diff --git a/biomes/hot-desert-dunes-red.json b/biomes/hot-desert-dunes-red.json index 18f98474..1881b953 100644 --- a/biomes/hot-desert-dunes-red.json +++ b/biomes/hot-desert-dunes-red.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "dunes", + "generator": "smooth-dunes", "max": 30, "min": 10 } diff --git a/biomes/hot-desert-dunes.json b/biomes/hot-desert-dunes.json index 9eee3045..a7c90f45 100644 --- a/biomes/hot-desert-dunes.json +++ b/biomes/hot-desert-dunes.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "dunes", + "generator": "smooth-dunes", "max": 30, "min": 10 } diff --git a/generators/dunes.json b/generators/dunes.json deleted file mode 100644 index b8b7a4ed..00000000 --- a/generators/dunes.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_6", - "horizontalScale": 20 - }, - "seed": 54654, - "composite": [ - { - "seed": 2343, - "exponent": 5, - "negative": true, - "style": { - "style": "BIOCTAVE_FRACTAL_CUBIC", - "zoom": 2.2, - "fracture": { - "style": "IRIS_THICK", - "zoom": 0.8, - "exponent": 0.2, - "multiplier": 10 - } - } - } - ] -} \ No newline at end of file diff --git a/generators/smooth-land.json b/generators/smooth-land.json deleted file mode 100644 index d436b8b9..00000000 --- a/generators/smooth-land.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "interpolator": { - "function": "HERMITE_STARCAST_6", - "horizontalScale": 6 - }, - "seed": 133434, - "composite": [ - { - "seed": 2343, - "style": { - "style": "SIMPLEX", - "zoom": 1.9, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "multiplier": 30, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - } - } - } - ] -} \ No newline at end of file diff --git a/regions/tundra.json b/regions/tundra.json index a53ea29d..b67347c5 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -7,7 +7,6 @@ "tundra-redwoods-forest", "tundra-sequia-redwoods", "tundra-forest", - "tundra-bonsai-forest", "tundra-spruce-denmyre", "tundra-lake", "tundra-mountains", From d7c2e7dcc7bb7ff4c3b5f9622df7eba6336fc6a5 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 19:34:18 -0700 Subject: [PATCH 25/26] bloop --- generators/mountain-cracked-cliffs.json | 33 ------------------------- 1 file changed, 33 deletions(-) delete mode 100644 generators/mountain-cracked-cliffs.json diff --git a/generators/mountain-cracked-cliffs.json b/generators/mountain-cracked-cliffs.json deleted file mode 100644 index d3bb0b8f..00000000 --- a/generators/mountain-cracked-cliffs.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_6", - "horizontalScale": 4 - }, - "seed": 7246661, - "composite": [ - { - "style": { - "style": "GLOB", - "zoom": 0.4, - "exponent": 0.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.1, - "multiplier": 5 - } - }, - "negative": true, - "seed": 10056 - } - ], - - "cliffHeightMax": 80, - "cliffHeightMin": 35, - "cliffHeightGenerator": { - "seed": 2348, - "style": { - "style": "CELLULAR_HEIGHT" - }, - "zoom": 0.4 - } -} \ No newline at end of file From 417c7ef7674f49e6184817c7427939fc705922ac Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 19:54:17 -0700 Subject: [PATCH 26/26] d --- biomes/frozen-pine-plains.json | 1 - biomes/mountain-forest-hills.json | 6 ++++++ biomes/mountain-forest.json | 5 +++++ biomes/tropical-cavern.json | 4 +++- regions/savanna.json | 4 ++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/biomes/frozen-pine-plains.json b/biomes/frozen-pine-plains.json index 950a31b7..ac0a1d51 100644 --- a/biomes/frozen-pine-plains.json +++ b/biomes/frozen-pine-plains.json @@ -114,7 +114,6 @@ "pine/pine9" ], "chance": 0.09, - "persistent": true, "rotation": { "enabled": true, "yAxis": { diff --git a/biomes/mountain-forest-hills.json b/biomes/mountain-forest-hills.json index ccaa9cde..5900e42e 100644 --- a/biomes/mountain-forest-hills.json +++ b/biomes/mountain-forest-hills.json @@ -290,6 +290,12 @@ "spruce-medium/spruce42", "spruce-medium/spruce43" ], + "edit": [ + { + "find": [{"block": "dark_oak_fence"}, {"block": "dark_oak_fence_gate"}], + "replace": {"palette": [{"block": "spruce_leaves", "data": {"persistent": true}}]} + } + ], "chance": 1, "density": 5, "rotation": { diff --git a/biomes/mountain-forest.json b/biomes/mountain-forest.json index ccaa9cde..a0873757 100644 --- a/biomes/mountain-forest.json +++ b/biomes/mountain-forest.json @@ -290,6 +290,11 @@ "spruce-medium/spruce42", "spruce-medium/spruce43" ], + "edit": [ + { + "find": [{"block": "dark_oak_fence"}, {"block": "dark_oak_fence_gate"}], + "replace": {"palette": [{"block": "spruce_leaves", "data": {"persistent": true}}]} + }], "chance": 1, "density": 5, "rotation": { diff --git a/biomes/tropical-cavern.json b/biomes/tropical-cavern.json index 05801f7a..473ffc54 100644 --- a/biomes/tropical-cavern.json +++ b/biomes/tropical-cavern.json @@ -110,7 +110,9 @@ }, { "block": "jungle_leaves", - "persistent": true + "data": { + "persistent": true + } }, { "weight": 2, diff --git a/regions/savanna.json b/regions/savanna.json index 71b7642e..25f15003 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -58,6 +58,10 @@ "hot-savanna", "hot-dry-forest", "hot-savanna", + "hot-savanna", + "hot-dry-forest", + "hot-savanna", + "hot-mountain", "hot-savanna-plateau", "hot-acacia-denmyre" ],