From bb9265468f2c1f3d2271251c5aabac4c9d40f1a4 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 22 Nov 2020 07:29:05 -0500 Subject: [PATCH 1/3] Support vanilla biome conversion for structures not color --- biomes/frozen-beach.json | 1 + biomes/frozen-mountains-cliffs.json | 1 + biomes/frozen-mountains.json | 1 + biomes/frozen-ocean.json | 1 + biomes/frozen-peak.json | 1 + biomes/frozen-pines.json | 1 + biomes/frozen-plains-hills.json | 1 + biomes/frozen-plains.json | 1 + biomes/frozen-redwoods-forest.json | 1 + biomes/frozen-river.json | 1 + biomes/frozen-vander.json | 1 + biomes/hot-acacia-denmyre.json | 1 + biomes/hot-beach.json | 1 + biomes/hot-desert-hills.json | 1 + biomes/hot-desert-mountains.json | 1 + biomes/hot-desert-red.json | 1 + biomes/hot-desert.json | 1 + biomes/hot-dry-forest.json | 1 + biomes/hot-mesa-blue.json | 1 + biomes/hot-mesa-cliffs-yellow.json | 1 + biomes/hot-mesa-cliffs.json | 1 + biomes/hot-mesa-dark.json | 1 + biomes/hot-mesa-green.json | 1 + biomes/hot-mesa-red.json | 1 + biomes/hot-mesa-yellow.json | 1 + biomes/hot-ocean-cliffs.json | 1 + biomes/hot-ocean.json | 1 + biomes/hot-savanna-cliff.json | 1 + biomes/hot-savanna.json | 1 + biomes/hot-volcanic.json | 1 + biomes/mosaic-lith-black.json | 1 + biomes/mosaic-lith-cyan.json | 1 + biomes/mosaic-lith-green.json | 1 + biomes/mosaic-lith-purple.json | 1 + biomes/mosaic-lith-red.json | 1 + biomes/mosaic-lith-white.json | 1 + biomes/mushroom-beach.json | 1 + biomes/mushroom-crimson-forest.json | 1 + biomes/mushroom-forest.json | 1 + biomes/mushroom-ocean.json | 1 + biomes/mushroom-plains.json | 1 + biomes/mushroom-warped-forest.json | 1 + biomes/rocky-mountains-cliffs.json | 1 + biomes/rocky-mountains.json | 1 + biomes/rocky-ocean.json | 1 + biomes/swamp-beach.json | 1 + biomes/swamp-dark-oak-denmyre.json | 1 + biomes/swamp-marsh.json | 1 + biomes/swamp-mountain-forest.json | 1 + biomes/swamp-ocean.json | 1 + biomes/swamp-roofed-forest.json | 1 + biomes/swamp-roofed-wayward.json | 1 + biomes/swamp-willow-forest.json | 1 + biomes/temperate-beach.json | 1 + biomes/temperate-birch-denmyre.json | 1 + biomes/temperate-birch-forest.json | 1 + biomes/temperate-highlands.json | 1 + biomes/temperate-island.json | 1 + biomes/temperate-oak-denmyre.json | 1 + biomes/temperate-oak-forest.json | 1 + biomes/temperate-ocean-deep.json | 1 + biomes/temperate-ocean.json | 1 + biomes/temperate-plains.json | 1 + biomes/temperate-river.json | 1 + biomes/temperate-wilds.json | 1 + biomes/tropical-bamboo-forest.json | 1 + biomes/tropical-beach-bamboo.json | 1 + biomes/tropical-beach-charred.json | 1 + biomes/tropical-beach.json | 1 + biomes/tropical-coral-ocean-cliffs.json | 1 + biomes/tropical-coral-ocean.json | 1 + biomes/tropical-island-beach.json | 1 + biomes/tropical-jungle-denmyre.json | 1 + biomes/tropical-ocean.json | 1 + biomes/tropical-rainforest-hills.json | 1 + biomes/tropical-rainforest-island.json | 1 + biomes/tropical-rainforest-wicked.json | 1 + biomes/tropical-rainforest.json | 1 + biomes/tropical-submerged-volcanic.json | 1 + biomes/tundra-beach-stone.json | 1 + biomes/tundra-beach.json | 1 + biomes/tundra-bonsai-forest.json | 1 + biomes/tundra-mountains-cliffs.json | 1 + biomes/tundra-mountains-huge.json | 1 + biomes/tundra-mountains.json | 1 + biomes/tundra-ocean.json | 1 + biomes/tundra-redwood-cliffs.json | 1 + biomes/tundra-redwoods-forest.json | 1 + biomes/tundra-river.json | 1 + biomes/tundra-sequia-redwoods.json | 1 + biomes/tundra-spruce-denmyre.json | 1 + biomes/tundra-taiga.json | 1 + 92 files changed, 92 insertions(+) diff --git a/biomes/frozen-beach.json b/biomes/frozen-beach.json index c1a053b4..b623fd5c 100644 --- a/biomes/frozen-beach.json +++ b/biomes/frozen-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_BEACH", "seaLayers": [ { "minHeight": 1, diff --git a/biomes/frozen-mountains-cliffs.json b/biomes/frozen-mountains-cliffs.json index f2b1be32..8536abdf 100644 --- a/biomes/frozen-mountains-cliffs.json +++ b/biomes/frozen-mountains-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen-mountains.json b/biomes/frozen-mountains.json index 3ce0bb3a..887b3f6e 100644 --- a/biomes/frozen-mountains.json +++ b/biomes/frozen-mountains.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen-ocean.json b/biomes/frozen-ocean.json index d9a07655..7107fb13 100644 --- a/biomes/frozen-ocean.json +++ b/biomes/frozen-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "FROZEN_OCEAN", "seaLayers": [ { "minHeight": 3, diff --git a/biomes/frozen-peak.json b/biomes/frozen-peak.json index 29784978..4bf7407d 100644 --- a/biomes/frozen-peak.json +++ b/biomes/frozen-peak.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_TAIGA_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen-pines.json b/biomes/frozen-pines.json index 57d5a396..3339de64 100644 --- a/biomes/frozen-pines.json +++ b/biomes/frozen-pines.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_TAIGA", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen-plains-hills.json b/biomes/frozen-plains-hills.json index 43315101..aa96fbf3 100644 --- a/biomes/frozen-plains-hills.json +++ b/biomes/frozen-plains-hills.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_TAIGA_HILLS", "decorators": [ { "chance": 1, diff --git a/biomes/frozen-plains.json b/biomes/frozen-plains.json index dba3de29..e06927ce 100644 --- a/biomes/frozen-plains.json +++ b/biomes/frozen-plains.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_TAIGA", "decorators": [ { "chance": 1, diff --git a/biomes/frozen-redwoods-forest.json b/biomes/frozen-redwoods-forest.json index c494d381..b91fdf83 100644 --- a/biomes/frozen-redwoods-forest.json +++ b/biomes/frozen-redwoods-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_TAIGA", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen-river.json b/biomes/frozen-river.json index b9664e96..aa2f821e 100644 --- a/biomes/frozen-river.json +++ b/biomes/frozen-river.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "FROZEN_RIVER", "seaLayers": [ { "minHeight": 3, diff --git a/biomes/frozen-vander.json b/biomes/frozen-vander.json index d216c124..8a567f2a 100644 --- a/biomes/frozen-vander.json +++ b/biomes/frozen-vander.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SNOWY_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/hot-acacia-denmyre.json b/biomes/hot-acacia-denmyre.json index ce90218d..d1c8bdad 100644 --- a/biomes/hot-acacia-denmyre.json +++ b/biomes/hot-acacia-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SAVANNA", "decorators": [ { "chance": 0.1, diff --git a/biomes/hot-beach.json b/biomes/hot-beach.json index c0aeaa98..06131e43 100644 --- a/biomes/hot-beach.json +++ b/biomes/hot-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "entityInitialSpawns": [ {"entity": "cow", "maxSpawns": 1, "minSpawns": 1, "rarity": 6}, {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 6} diff --git a/biomes/hot-desert-hills.json b/biomes/hot-desert-hills.json index 5ff1cb60..c32ab11a 100644 --- a/biomes/hot-desert-hills.json +++ b/biomes/hot-desert-hills.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT", "decorators": [ { "verticalZoom": 5, diff --git a/biomes/hot-desert-mountains.json b/biomes/hot-desert-mountains.json index a02492f0..a993f7bc 100644 --- a/biomes/hot-desert-mountains.json +++ b/biomes/hot-desert-mountains.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT_HILLS", "decorators": [ { "verticalZoom": 20, diff --git a/biomes/hot-desert-red.json b/biomes/hot-desert-red.json index cffb426b..497fd609 100644 --- a/biomes/hot-desert-red.json +++ b/biomes/hot-desert-red.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT", "children": [ "hot-desert-hills" ], diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index 475ed52e..c083efd6 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT", "children": [ "hot-desert-hills" ], diff --git a/biomes/hot-dry-forest.json b/biomes/hot-dry-forest.json index cbe6d277..4faf1715 100644 --- a/biomes/hot-dry-forest.json +++ b/biomes/hot-dry-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SAVANNA", "biomeSkyScatter": [ "DESERT", "SWAMP", diff --git a/biomes/hot-mesa-blue.json b/biomes/hot-mesa-blue.json index fb8d3e01..e3d55f89 100644 --- a/biomes/hot-mesa-blue.json +++ b/biomes/hot-mesa-blue.json @@ -99,6 +99,7 @@ ] } ], + "vanillaDerivative": "BADLANDS", "generators": [ { "min": 4, diff --git a/biomes/hot-mesa-cliffs-yellow.json b/biomes/hot-mesa-cliffs-yellow.json index 1756109d..f2e3c1d5 100644 --- a/biomes/hot-mesa-cliffs-yellow.json +++ b/biomes/hot-mesa-cliffs-yellow.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BADLANDS_PLATEAU", "decorators": [ { "chance": 0.009, diff --git a/biomes/hot-mesa-cliffs.json b/biomes/hot-mesa-cliffs.json index 40bc3723..5cc8f8b1 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/hot-mesa-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BADLANDS_PLATEAU", "decorators": [ { "chance": 0.009, diff --git a/biomes/hot-mesa-dark.json b/biomes/hot-mesa-dark.json index 4c29eb42..6b513e1e 100644 --- a/biomes/hot-mesa-dark.json +++ b/biomes/hot-mesa-dark.json @@ -143,6 +143,7 @@ "generator": "mountain" } ], + "vanillaDerivative": "ERODED_BADLANDS", "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { diff --git a/biomes/hot-mesa-green.json b/biomes/hot-mesa-green.json index 909179dc..b9a38d93 100644 --- a/biomes/hot-mesa-green.json +++ b/biomes/hot-mesa-green.json @@ -99,6 +99,7 @@ ] } ], + "vanillaDerivative": "BADLANDS", "generators": [ { "min": 9, diff --git a/biomes/hot-mesa-red.json b/biomes/hot-mesa-red.json index f0a13bda..69149668 100644 --- a/biomes/hot-mesa-red.json +++ b/biomes/hot-mesa-red.json @@ -123,6 +123,7 @@ "generator": "mountain" } ], + "vanillaDerivative": "BADLANDS", "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { diff --git a/biomes/hot-mesa-yellow.json b/biomes/hot-mesa-yellow.json index a35a65f6..0a9e35b3 100644 --- a/biomes/hot-mesa-yellow.json +++ b/biomes/hot-mesa-yellow.json @@ -182,6 +182,7 @@ "generator": "mountain" } ], + "vanillaDerivative": "BADLANDS", "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { diff --git a/biomes/hot-ocean-cliffs.json b/biomes/hot-ocean-cliffs.json index 636a4d7f..104d9d8f 100644 --- a/biomes/hot-ocean-cliffs.json +++ b/biomes/hot-ocean-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WARM_OCEAN", "decorators": [ { "chance": 0.0009, diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index d753437e..12acde4a 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WARM_OCEAN", "effects": [ { "particleAltX": 0.001, diff --git a/biomes/hot-savanna-cliff.json b/biomes/hot-savanna-cliff.json index 013d5974..dfdb9bdb 100644 --- a/biomes/hot-savanna-cliff.json +++ b/biomes/hot-savanna-cliff.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SAVANNA", "biomeSkyScatter": [ "DESERT", "SAVANNA" diff --git a/biomes/hot-savanna.json b/biomes/hot-savanna.json index 37fb4633..2f82c7dc 100644 --- a/biomes/hot-savanna.json +++ b/biomes/hot-savanna.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SAVANNA", "biomeSkyScatter": [ "DESERT", "SAVANNA" diff --git a/biomes/hot-volcanic.json b/biomes/hot-volcanic.json index 108c785f..5bf9855c 100644 --- a/biomes/hot-volcanic.json +++ b/biomes/hot-volcanic.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT_HILLS", "name": "Volcanic", "layers": [ { diff --git a/biomes/mosaic-lith-black.json b/biomes/mosaic-lith-black.json index 5690b0a1..6f2bf883 100644 --- a/biomes/mosaic-lith-black.json +++ b/biomes/mosaic-lith-black.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DESERT", "biomeSkyScatter": [ "DESERT", "SAVANNA" diff --git a/biomes/mosaic-lith-cyan.json b/biomes/mosaic-lith-cyan.json index dc8fce5b..480dd52f 100644 --- a/biomes/mosaic-lith-cyan.json +++ b/biomes/mosaic-lith-cyan.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "decorators": [ { "chance": 0.0045, diff --git a/biomes/mosaic-lith-green.json b/biomes/mosaic-lith-green.json index 5f28ca32..c7c5fdb6 100644 --- a/biomes/mosaic-lith-green.json +++ b/biomes/mosaic-lith-green.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "decorators": [ { "chance": 0.0045, diff --git a/biomes/mosaic-lith-purple.json b/biomes/mosaic-lith-purple.json index 68b40cd1..f55a7672 100644 --- a/biomes/mosaic-lith-purple.json +++ b/biomes/mosaic-lith-purple.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "decorators": [ { "chance": 0.0045, diff --git a/biomes/mosaic-lith-red.json b/biomes/mosaic-lith-red.json index ccfa221c..eb4d0e17 100644 --- a/biomes/mosaic-lith-red.json +++ b/biomes/mosaic-lith-red.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "decorators": [ { "chance": 0.0045, diff --git a/biomes/mosaic-lith-white.json b/biomes/mosaic-lith-white.json index fa117405..4b8d124a 100644 --- a/biomes/mosaic-lith-white.json +++ b/biomes/mosaic-lith-white.json @@ -151,6 +151,7 @@ "generator": "plain-cliffs" } ], + "vanillaDerivative": "PLAINS", "derivative": "BASALT_DELTAS", "carvingBiome": "mosaic-lith-black", "wall": { diff --git a/biomes/mushroom-beach.json b/biomes/mushroom-beach.json index 900f6517..dcac9716 100644 --- a/biomes/mushroom-beach.json +++ b/biomes/mushroom-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MUSHROOM_FIELD_SHORE", "name": "Mushroom Beach", "layers": [ { diff --git a/biomes/mushroom-crimson-forest.json b/biomes/mushroom-crimson-forest.json index 0b8d013c..90ddb12f 100644 --- a/biomes/mushroom-crimson-forest.json +++ b/biomes/mushroom-crimson-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.009, diff --git a/biomes/mushroom-forest.json b/biomes/mushroom-forest.json index 29d42520..e05271dc 100644 --- a/biomes/mushroom-forest.json +++ b/biomes/mushroom-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MUSHROOM_FIELDS", "effects": [ { "volume": 6.2, diff --git a/biomes/mushroom-ocean.json b/biomes/mushroom-ocean.json index 51745c8c..039b3fa0 100644 --- a/biomes/mushroom-ocean.json +++ b/biomes/mushroom-ocean.json @@ -200,6 +200,7 @@ } } ], + "vanillaDerivative": "OCEAN", "name": "Mushroom Ocean", "layers": [ { diff --git a/biomes/mushroom-plains.json b/biomes/mushroom-plains.json index 65f89331..a601258e 100644 --- a/biomes/mushroom-plains.json +++ b/biomes/mushroom-plains.json @@ -18,6 +18,7 @@ "rarity": 5 } ], + "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.005, diff --git a/biomes/mushroom-warped-forest.json b/biomes/mushroom-warped-forest.json index 4983ca3d..0a7402fb 100644 --- a/biomes/mushroom-warped-forest.json +++ b/biomes/mushroom-warped-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.009, diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountains-cliffs.json index 54ddf8ce..c0cb7588 100644 --- a/biomes/rocky-mountains-cliffs.json +++ b/biomes/rocky-mountains-cliffs.json @@ -33,6 +33,7 @@ } } ], + "vanillaDerivative": "MODIFIED_GRAVELLY_MOUNTAINS", "objects": [ { "chance": 0.5, diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json index 905c755e..500b2c4e 100644 --- a/biomes/rocky-mountains.json +++ b/biomes/rocky-mountains.json @@ -31,6 +31,7 @@ } } ], + "vanillaDerivative": "GRAVELLY_MOUNTAINS", "biomeZoom": 30, "derivative": "MOUNTAINS", "biomeStyle": { diff --git a/biomes/rocky-ocean.json b/biomes/rocky-ocean.json index c6efd82a..7881e635 100644 --- a/biomes/rocky-ocean.json +++ b/biomes/rocky-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "LUKEWARM_OCEAN", "decorators": [ { "chance": 0.0006, diff --git a/biomes/swamp-beach.json b/biomes/swamp-beach.json index 751966db..65d2954e 100644 --- a/biomes/swamp-beach.json +++ b/biomes/swamp-beach.json @@ -124,5 +124,6 @@ "beach-clutter" ] }, + "vanillaDerivative": "BEACH", "derivative": "SWAMP" } \ No newline at end of file diff --git a/biomes/swamp-dark-oak-denmyre.json b/biomes/swamp-dark-oak-denmyre.json index d919d8a0..51fa5f7d 100644 --- a/biomes/swamp-dark-oak-denmyre.json +++ b/biomes/swamp-dark-oak-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DARK_FOREST", "decorators": [ { "chance": 0.01, diff --git a/biomes/swamp-marsh.json b/biomes/swamp-marsh.json index 2a7f5bc1..57567af8 100644 --- a/biomes/swamp-marsh.json +++ b/biomes/swamp-marsh.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SWAMP", "biomeSkyScatter": [ "SWAMP", "DESERT", diff --git a/biomes/swamp-mountain-forest.json b/biomes/swamp-mountain-forest.json index 32548de3..4637103d 100644 --- a/biomes/swamp-mountain-forest.json +++ b/biomes/swamp-mountain-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "SWAMP_HILLS", "decorators": [ { "chance": 0.01, diff --git a/biomes/swamp-ocean.json b/biomes/swamp-ocean.json index 95ada8a6..85e3c54f 100644 --- a/biomes/swamp-ocean.json +++ b/biomes/swamp-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "OCEAN", "decorators": [ { "partOf": "SEA_SURFACE", diff --git a/biomes/swamp-roofed-forest.json b/biomes/swamp-roofed-forest.json index 6a049d60..9afe1096 100644 --- a/biomes/swamp-roofed-forest.json +++ b/biomes/swamp-roofed-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DARK_FOREST", "children": [ "swamp-dark-oak-denmyre" ], diff --git a/biomes/swamp-roofed-wayward.json b/biomes/swamp-roofed-wayward.json index 04a8e645..37805fdd 100644 --- a/biomes/swamp-roofed-wayward.json +++ b/biomes/swamp-roofed-wayward.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DARK_FOREST", "children": [ "swamp-dark-oak-denmyre" ], diff --git a/biomes/swamp-willow-forest.json b/biomes/swamp-willow-forest.json index 18034cd1..1b084b6d 100644 --- a/biomes/swamp-willow-forest.json +++ b/biomes/swamp-willow-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DARK_FOREST", "effects": [ { "volume": 6.2, diff --git a/biomes/temperate-beach.json b/biomes/temperate-beach.json index 371d0537..76616b02 100644 --- a/biomes/temperate-beach.json +++ b/biomes/temperate-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "decorators": [ { "chance": 0.003, diff --git a/biomes/temperate-birch-denmyre.json b/biomes/temperate-birch-denmyre.json index 3ba1424e..14193f48 100644 --- a/biomes/temperate-birch-denmyre.json +++ b/biomes/temperate-birch-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BIRCH_FOREST", "decorators": [ { "chance": 0.01, diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index 40a33280..50fd52ab 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BIRCH_FOREST", "biomeSkyScatter": [ "FOREST", "JUNGLE" diff --git a/biomes/temperate-highlands.json b/biomes/temperate-highlands.json index 3f10f4b4..694c6b2b 100644 --- a/biomes/temperate-highlands.json +++ b/biomes/temperate-highlands.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "biomeSkyScatter": [ "SWAMP", "DESERT" diff --git a/biomes/temperate-island.json b/biomes/temperate-island.json index 049506f5..4e3c8f28 100644 --- a/biomes/temperate-island.json +++ b/biomes/temperate-island.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "biomeSkyScatter": [ "JUNGLE" ], diff --git a/biomes/temperate-oak-denmyre.json b/biomes/temperate-oak-denmyre.json index 1d46a86c..51f74bb0 100644 --- a/biomes/temperate-oak-denmyre.json +++ b/biomes/temperate-oak-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "FOREST", "decorators": [ { "chance": 0.4, diff --git a/biomes/temperate-oak-forest.json b/biomes/temperate-oak-forest.json index 99678807..b866ab80 100644 --- a/biomes/temperate-oak-forest.json +++ b/biomes/temperate-oak-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "FOREST", "biomeSkyScatter": [ "FOREST", "JUNGLE" diff --git a/biomes/temperate-ocean-deep.json b/biomes/temperate-ocean-deep.json index c83e4352..ff78f6f3 100644 --- a/biomes/temperate-ocean-deep.json +++ b/biomes/temperate-ocean-deep.json @@ -213,6 +213,7 @@ ] } ], + "vanillaDerivative": "DEEP_OCEAN", "generators": [ { "min": -57, diff --git a/biomes/temperate-ocean.json b/biomes/temperate-ocean.json index bdea0cbb..7ff59590 100644 --- a/biomes/temperate-ocean.json +++ b/biomes/temperate-ocean.json @@ -2,6 +2,7 @@ "children": [ "temperate-ocean-deep" ], + "vanillaDerivative": "OCEAN", "decorators": [ { "chance": 0.0006, diff --git a/biomes/temperate-plains.json b/biomes/temperate-plains.json index 0ba19775..1e263259 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate-plains.json @@ -5,6 +5,7 @@ "children": [ "temperate-wilds" ], + "vanillaDerivative": "PLAINS", "decorators": [ { "chance": 0.19, diff --git a/biomes/temperate-river.json b/biomes/temperate-river.json index db2cd63d..4b4be6f2 100644 --- a/biomes/temperate-river.json +++ b/biomes/temperate-river.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "RIVER", "decorators": [ { "chance": 0.0006, diff --git a/biomes/temperate-wilds.json b/biomes/temperate-wilds.json index 6d431cfc..5d8fc077 100644 --- a/biomes/temperate-wilds.json +++ b/biomes/temperate-wilds.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "PLAINS", "biomeSkyScatter": [ "SWAMP", "DESERT" diff --git a/biomes/tropical-bamboo-forest.json b/biomes/tropical-bamboo-forest.json index 66b36f17..9dff82ec 100644 --- a/biomes/tropical-bamboo-forest.json +++ b/biomes/tropical-bamboo-forest.json @@ -218,6 +218,7 @@ "children": [ "temperate-wilds" ], + "vanillaDerivative": "BAMBOO_JUNGLE", "decorators": [ { "chance": 0.25, diff --git a/biomes/tropical-beach-bamboo.json b/biomes/tropical-beach-bamboo.json index bb07e2a6..76321a9c 100644 --- a/biomes/tropical-beach-bamboo.json +++ b/biomes/tropical-beach-bamboo.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "rarity": 3, "effects": [ { diff --git a/biomes/tropical-beach-charred.json b/biomes/tropical-beach-charred.json index 2fde1e3e..88873d04 100644 --- a/biomes/tropical-beach-charred.json +++ b/biomes/tropical-beach-charred.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-beach.json b/biomes/tropical-beach.json index 0a8f4f9e..39af29e0 100644 --- a/biomes/tropical-beach.json +++ b/biomes/tropical-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "JUNGLE", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-coral-ocean-cliffs.json b/biomes/tropical-coral-ocean-cliffs.json index 9abb8177..7753d8d2 100644 --- a/biomes/tropical-coral-ocean-cliffs.json +++ b/biomes/tropical-coral-ocean-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "LUKEWARM_OCEAN", "effects": [ { "particleAltX": 0.3, diff --git a/biomes/tropical-coral-ocean.json b/biomes/tropical-coral-ocean.json index b543226a..71c3a7a1 100644 --- a/biomes/tropical-coral-ocean.json +++ b/biomes/tropical-coral-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WARM_OCEAN", "effects": [ { "particleAltX": 0.3, diff --git a/biomes/tropical-island-beach.json b/biomes/tropical-island-beach.json index 2b512f24..2335af33 100644 --- a/biomes/tropical-island-beach.json +++ b/biomes/tropical-island-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-jungle-denmyre.json b/biomes/tropical-jungle-denmyre.json index fef3d8c7..c00051c9 100644 --- a/biomes/tropical-jungle-denmyre.json +++ b/biomes/tropical-jungle-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "JUNGLE", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-ocean.json b/biomes/tropical-ocean.json index 99e9570a..b14042f4 100644 --- a/biomes/tropical-ocean.json +++ b/biomes/tropical-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WARM_OCEAN", "effects": [ { "particleAltX": 0.3, diff --git a/biomes/tropical-rainforest-hills.json b/biomes/tropical-rainforest-hills.json index 5b54594c..054492b5 100644 --- a/biomes/tropical-rainforest-hills.json +++ b/biomes/tropical-rainforest-hills.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "JUNGLE_HILLS", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-rainforest-island.json b/biomes/tropical-rainforest-island.json index 01b39037..466b3abe 100644 --- a/biomes/tropical-rainforest-island.json +++ b/biomes/tropical-rainforest-island.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "seaLayers": [ { "minHeight": 64, diff --git a/biomes/tropical-rainforest-wicked.json b/biomes/tropical-rainforest-wicked.json index 197c249d..a40ea161 100644 --- a/biomes/tropical-rainforest-wicked.json +++ b/biomes/tropical-rainforest-wicked.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-rainforest.json b/biomes/tropical-rainforest.json index 5ec8e148..1cd51dfd 100644 --- a/biomes/tropical-rainforest.json +++ b/biomes/tropical-rainforest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "JUNGLE", "effects": [ { "particleAltX": 0.301, diff --git a/biomes/tropical-submerged-volcanic.json b/biomes/tropical-submerged-volcanic.json index 073def44..dc8f3fe2 100644 --- a/biomes/tropical-submerged-volcanic.json +++ b/biomes/tropical-submerged-volcanic.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WARM_OCEAN", "effects": [ { "particleAltX": 0.001, diff --git a/biomes/tundra-beach-stone.json b/biomes/tundra-beach-stone.json index fca74b17..d4c8e425 100644 --- a/biomes/tundra-beach-stone.json +++ b/biomes/tundra-beach-stone.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "name": "Stone Beach", "layers": [ { diff --git a/biomes/tundra-beach.json b/biomes/tundra-beach.json index 7a876bc3..6b433b3d 100644 --- a/biomes/tundra-beach.json +++ b/biomes/tundra-beach.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "BEACH", "decorators": [ { "chance": 0.006, diff --git a/biomes/tundra-bonsai-forest.json b/biomes/tundra-bonsai-forest.json index 78e83b9f..adbd48d4 100644 --- a/biomes/tundra-bonsai-forest.json +++ b/biomes/tundra-bonsai-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "FLOWER_FOREST", "children": [ "tundra-sequia-redwoods", "tundra-redwood-cliffs" diff --git a/biomes/tundra-mountains-cliffs.json b/biomes/tundra-mountains-cliffs.json index 44f84f13..e2a5d556 100644 --- a/biomes/tundra-mountains-cliffs.json +++ b/biomes/tundra-mountains-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "TAIGA_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/tundra-mountains-huge.json b/biomes/tundra-mountains-huge.json index b7f8bc31..6ca8dfd3 100644 --- a/biomes/tundra-mountains-huge.json +++ b/biomes/tundra-mountains-huge.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "TAIGA_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/tundra-mountains.json b/biomes/tundra-mountains.json index 43cce67c..5cb5d5eb 100644 --- a/biomes/tundra-mountains.json +++ b/biomes/tundra-mountains.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "TAIGA_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/tundra-ocean.json b/biomes/tundra-ocean.json index b91b8952..2cf4d5a8 100644 --- a/biomes/tundra-ocean.json +++ b/biomes/tundra-ocean.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "COLD_OCEAN", "children": [ "rocky-ocean" ], diff --git a/biomes/tundra-redwood-cliffs.json b/biomes/tundra-redwood-cliffs.json index be859d0f..85815243 100644 --- a/biomes/tundra-redwood-cliffs.json +++ b/biomes/tundra-redwood-cliffs.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WOODED_MOUNTAINS", "decorators": [ { "chance": 0.009, diff --git a/biomes/tundra-redwoods-forest.json b/biomes/tundra-redwoods-forest.json index 80bc6511..25883dd0 100644 --- a/biomes/tundra-redwoods-forest.json +++ b/biomes/tundra-redwoods-forest.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "DARK_FOREST", "children": [ "tundra-sequia-redwoods", "tundra-redwood-cliffs" diff --git a/biomes/tundra-river.json b/biomes/tundra-river.json index 2baadc1d..777995f1 100644 --- a/biomes/tundra-river.json +++ b/biomes/tundra-river.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "RIVER", "children": [ "rocky-ocean" ], diff --git a/biomes/tundra-sequia-redwoods.json b/biomes/tundra-sequia-redwoods.json index 8f3d26fd..442d6113 100644 --- a/biomes/tundra-sequia-redwoods.json +++ b/biomes/tundra-sequia-redwoods.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WOODED_HILLS", "decorators": [ { "chance": 0.009, diff --git a/biomes/tundra-spruce-denmyre.json b/biomes/tundra-spruce-denmyre.json index 3ce2f609..d43b85fe 100644 --- a/biomes/tundra-spruce-denmyre.json +++ b/biomes/tundra-spruce-denmyre.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "WOODED_HILLS", "decorators": [ { "chance": 0.003, diff --git a/biomes/tundra-taiga.json b/biomes/tundra-taiga.json index 8549a597..ae9f7413 100644 --- a/biomes/tundra-taiga.json +++ b/biomes/tundra-taiga.json @@ -1,4 +1,5 @@ { + "vanillaDerivative": "TAIGA", "decorators": [ { "chance": 0.003, From 5c8c96193ad48ef267644539acedff91318f4e50 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 22 Nov 2020 07:29:18 -0500 Subject: [PATCH 2/3] Go away lithics (sorry to see you go but your just too much) --- dimensions/overworld.json | 3 +-- regions/mosaic.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 02ce567d..169e491b 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -14,8 +14,7 @@ "temperate", "temperate", "tundra", - "frozen", - "mosaic" + "frozen" ], "seaBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" diff --git a/regions/mosaic.json b/regions/mosaic.json index 8bec7f6c..9af27745 100644 --- a/regions/mosaic.json +++ b/regions/mosaic.json @@ -108,5 +108,5 @@ ] }, "shoreHeightZoom": 1.14, - "rarity": 20 + "rarity": 200 } \ No newline at end of file From 546daeddaa110edf4830f349cfef03d42a04aee8 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 22 Nov 2020 13:00:35 -0500 Subject: [PATCH 3/3] SLOOOOPEEEE --- biomes/hot-beach.json | 16 ++++++++++++++++ biomes/hot-desert-mountains.json | 16 ++++++++++++++++ biomes/mushroom-ocean.json | 17 ++++++++++------- biomes/rocky-mountains-cliffs.json | 2 +- biomes/rocky-mountains.json | 15 +++++++++++++++ biomes/tundra-redwoods-forest.json | 18 ++++++++++++++++++ 6 files changed, 76 insertions(+), 8 deletions(-) diff --git a/biomes/hot-beach.json b/biomes/hot-beach.json index 06131e43..aa254347 100644 --- a/biomes/hot-beach.json +++ b/biomes/hot-beach.json @@ -5,6 +5,22 @@ {"entity": "chicken", "maxSpawns": 1, "minSpawns": 1, "rarity": 6} ], "decorators": [ + { + "chance": 0.0005, + "variance": { + "style": "STATIC" + }, + "stackMax": 2, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "cactus" + } + ], + "stackMin": 1 + }, { "chance": 0.003, "variance": { diff --git a/biomes/hot-desert-mountains.json b/biomes/hot-desert-mountains.json index a993f7bc..2bbc13be 100644 --- a/biomes/hot-desert-mountains.json +++ b/biomes/hot-desert-mountains.json @@ -110,6 +110,22 @@ ], "name": "Desert Mountains", "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "slopeCondition": { + "minimumSlope": 4.75 + }, + "palette": [ + { + "block": "yellow_concrete_powder", + "weight": 2 + }, + { + "block": "sand" + } + ] + }, { "style": { "style": "STATIC" diff --git a/biomes/mushroom-ocean.json b/biomes/mushroom-ocean.json index 039b3fa0..2de44c03 100644 --- a/biomes/mushroom-ocean.json +++ b/biomes/mushroom-ocean.json @@ -215,13 +215,16 @@ "block": "clay" }, { - "block": "coarse_dirt" + "block": "stone" + }, + { + "block": "cobblestone" + }, + { + "block": "andesite" }, { "block": "gravel" - }, - { - "block": "dirt" } ] }, @@ -297,17 +300,17 @@ "waterlogged": false, "type": "bottom" }, - "block": "sandstone_slab" + "block": "stone_slab" }, { "data": { "waterlogged": false, "type": "bottom" }, - "block": "smooth_sandstone_slab" + "block": "andesite_slab" }, { - "weight": 2, + "weight": 1, "block": "air" } ] diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountains-cliffs.json index c0cb7588..dc34e39c 100644 --- a/biomes/rocky-mountains-cliffs.json +++ b/biomes/rocky-mountains-cliffs.json @@ -137,5 +137,5 @@ "MOUNTAINS", "SWAMP" ], - "rarity": 2 + "rarity": 19 } \ No newline at end of file diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json index 500b2c4e..d533aa62 100644 --- a/biomes/rocky-mountains.json +++ b/biomes/rocky-mountains.json @@ -72,6 +72,21 @@ ], "name": "Rock Mountains", "layers": [ + { + "minHeight": 2, + "maxHeight": 4, + "slopeCondition": { + "minimumSlope": 3.95 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "cyan_terracotta" + } + ] + }, { "minHeight": 2, "maxHeight": 3, diff --git a/biomes/tundra-redwoods-forest.json b/biomes/tundra-redwoods-forest.json index 25883dd0..b5d5c037 100644 --- a/biomes/tundra-redwoods-forest.json +++ b/biomes/tundra-redwoods-forest.json @@ -394,6 +394,24 @@ ], "name": "Redwood Forest", "layers": [ + { + "minHeight": 2, + "maxHeight": 4, + "slopeCondition": { + "minimumSlope": 3.25 + }, + "palette": [ + { + "block": "coarse_dirt" + }, + { + "block": "dirt" + }, + { + "block": "podzol" + } + ] + }, { "palette": [ {