diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json index 4c6e9b5f..29d9713a 100644 --- a/biomes/cave/old-cavern.json +++ b/biomes/cave/old-cavern.json @@ -49,8 +49,7 @@ }, { "block": "jungle_leaves", - "weight": 1, - "data": {"persistent": true} + "weight": 1 }, { "block": "shroomlight", @@ -121,10 +120,7 @@ }, { "chance": 0.034, - "palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "jungle_leaves"}] }, { "chance": 0.0013, diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json index 6b20ce27..55c29abc 100644 --- a/biomes/cave/tropical-cavern.json +++ b/biomes/cave/tropical-cavern.json @@ -17,10 +17,7 @@ "weight": 2, "block": "stone" }, - { - "block": "jungle_leaves", - "data": {"persistent": true} - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "stone" diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/hills.json similarity index 91% rename from biomes/frozen/fzn-hills.json rename to biomes/frozen/hills.json index dac0ed1c..0b0605e5 100644 --- a/biomes/frozen/fzn-hills.json +++ b/biomes/frozen/hills.json @@ -32,7 +32,7 @@ } ], "customDerivitives": [{ - "id": "fznhills", + "id": "frozen_hills", "waterColor": "#216FC4", "downfallType": "snow", "temperature": -3, @@ -89,14 +89,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json similarity index 91% rename from biomes/frozen/fzn-mountain-cliffs.json rename to biomes/frozen/mountain-cliffs.json index 253065aa..133d137e 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/mountain-cliffs.json @@ -34,7 +34,7 @@ } ], "customDerivitives": [{ - "id": "fznmountaincliff", + "id": "frozen_mountaincliff", "downfallType": "snow", "temperature": -3, "waterColor": "#216FC4", @@ -116,14 +116,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], @@ -176,14 +170,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/mountain-middle.json similarity index 98% rename from biomes/frozen/fzn-mountain-middle.json rename to biomes/frozen/mountain-middle.json index f61381b3..35a7e38d 100644 --- a/biomes/frozen/fzn-mountain-middle.json +++ b/biomes/frozen/mountain-middle.json @@ -17,7 +17,7 @@ } ], "customDerivitives": [{ - "id": "fznmtnmiddle", + "id": "frozen_mountain_middle", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/mountain.json similarity index 95% rename from biomes/frozen/fzn-mountain.json rename to biomes/frozen/mountain.json index 83f828e0..1eeb6f6d 100644 --- a/biomes/frozen/fzn-mountain.json +++ b/biomes/frozen/mountain.json @@ -5,12 +5,12 @@ "rarity": 1, "vanillaDerivative": "SNOWY_MOUNTAINS", "children": [ - "frozen/fzn-mountain-middle", - "frozen/fzn-peak", - "frozen/fzn-mountain-cliffs" + "frozen/mountain-middle", + "frozen/peak", + "frozen/mountain-cliffs" ], "customDerivitives": [{ - "id": "fznmountain", + "id": "frozen_mountain", "waterColor": "#216FC4", "downfallType": "snow", "temperature": -3, diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/mountains.json similarity index 94% rename from biomes/frozen/fzn-mountains.json rename to biomes/frozen/mountains.json index 1fe9cb99..1fd03348 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/mountains.json @@ -5,11 +5,11 @@ "derivative": "SNOWY_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", "children": [ - "frozen/fzn-peak", - "frozen/fzn-vander" + "frozen/peak", + "frozen/vander" ], "customDerivitives": [{ - "id": "fznmountains", + "id": "frozen_mountains", "waterColor": "#216FC4", "downfallType": "snow", "temperature": -3, @@ -121,14 +121,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/peak.json similarity index 99% rename from biomes/frozen/fzn-peak.json rename to biomes/frozen/peak.json index ba58cd76..f8736fc3 100644 --- a/biomes/frozen/fzn-peak.json +++ b/biomes/frozen/peak.json @@ -4,7 +4,7 @@ "color": "#48ADEA", "vanillaDerivative": "SNOWY_TAIGA_MOUNTAINS", "customDerivitives": [{ - "id": "fznpeak", + "id": "frozen_peak", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/pine-hills.json similarity index 89% rename from biomes/frozen/fzn-pine-hills.json rename to biomes/frozen/pine-hills.json index acb864df..4d51a960 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/pine-hills.json @@ -32,7 +32,7 @@ } ], "customDerivitives": [{ - "id": "fznpinehills", + "id": "frozen_pine_hills", "downfallType": "snow", "temperature": -3, "waterColor": "#216FC4", @@ -87,14 +87,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/pine-plains.json similarity index 89% rename from biomes/frozen/fzn-pine-plains.json rename to biomes/frozen/pine-plains.json index cc3ae564..d0c3caa4 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/pine-plains.json @@ -4,7 +4,7 @@ "color": "#164898", "rarity": 1, "vanillaDerivative": "SNOWY_TAIGA", - "children": ["frozen/fzn-pine-hills"], + "children": ["frozen/pine-hills"], "generators": [ { "generator": "plain", @@ -18,7 +18,7 @@ } ], "customDerivitives": [{ - "id": "fznpineplain", + "id": "frozen_pine_plains", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", @@ -95,14 +95,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/pines.json similarity index 89% rename from biomes/frozen/fzn-pines.json rename to biomes/frozen/pines.json index 54e50860..70235af4 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/pines.json @@ -37,7 +37,7 @@ } ], "customDerivitives": [{ - "id": "fznpines", + "id": "frozen_pines", "waterColor": "#216FC4", "downfallType": "snow", "temperature": -3, @@ -94,14 +94,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], @@ -140,14 +134,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/plains.json similarity index 94% rename from biomes/frozen/fzn-plains.json rename to biomes/frozen/plains.json index 99007fa6..47a3bcff 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/plains.json @@ -4,7 +4,7 @@ "color": "#3E5D8F", "rarity": 1, "vanillaDerivative": "SNOWY_TAIGA", - "children": ["frozen/fzn-hills"], + "children": ["frozen/hills"], "generators": [ { "min": 4, @@ -18,7 +18,7 @@ } ], "customDerivitives": [{ - "id": "fznplains", + "id": "frozen_plains", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", @@ -190,14 +190,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/redwood-forest.json similarity index 93% rename from biomes/frozen/fzn-redwood-forest.json rename to biomes/frozen/redwood-forest.json index 712a771c..b8de3940 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -17,7 +17,7 @@ } ], "customDerivitives": [{ - "id": "fznredwoodfor", + "id": "frozen_redwood_forest", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", @@ -116,14 +116,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }, diff --git a/biomes/ocean/oce-fzn-ocean.json b/biomes/frozen/sea/ocean.json similarity index 100% rename from biomes/ocean/oce-fzn-ocean.json rename to biomes/frozen/sea/ocean.json diff --git a/biomes/ocean/oce-fzn-river.json b/biomes/frozen/sea/river.json similarity index 100% rename from biomes/ocean/oce-fzn-river.json rename to biomes/frozen/sea/river.json diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/shore/beach.json similarity index 99% rename from biomes/frozen/fzn-beach.json rename to biomes/frozen/shore/beach.json index 7ee6854a..3ac1ab19 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/shore/beach.json @@ -22,7 +22,7 @@ } ], "customDerivitives": [{ - "id": "fznbeach", + "id": "frozen_beach", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/spruce-hills.json similarity index 89% rename from biomes/frozen/fzn-spruce-hills.json rename to biomes/frozen/spruce-hills.json index 5d8d121b..e689840e 100644 --- a/biomes/frozen/fzn-spruce-hills.json +++ b/biomes/frozen/spruce-hills.json @@ -32,7 +32,7 @@ } ], "customDerivitives": [{ - "id": "fznsprucehill", + "id": "frozen_spruce_hills", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", @@ -94,14 +94,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/spruce-plains.json similarity index 88% rename from biomes/frozen/fzn-spruce-plains.json rename to biomes/frozen/spruce-plains.json index 1e434587..e335af91 100644 --- a/biomes/frozen/fzn-spruce-plains.json +++ b/biomes/frozen/spruce-plains.json @@ -4,7 +4,7 @@ "color": "#237695", "rarity": 1, "vanillaDerivative": "SNOWY_TAIGA", - "children": ["frozen/fzn-spruce-hills"], + "children": ["frozen/spruce-hills"], "layers": [ { "minHeight": 0, @@ -33,7 +33,7 @@ } ], "customDerivitives": [{ - "id": "fznspruceplains", + "id": "frozen_spruce_plains", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "downfallType": "snow", @@ -102,14 +102,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } }], diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/vander.json similarity index 94% rename from biomes/frozen/fzn-vander.json rename to biomes/frozen/vander.json index fc20ab2b..b1aae9f0 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/vander.json @@ -31,7 +31,7 @@ } ], "customDerivitives": [{ - "id": "fznvander", + "id": "frozen_vander", "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", @@ -168,14 +168,8 @@ "zoom": 0.2 }, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, - { - "block": "dark_oak_leaves", - "data": {"persistent": true} - } + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} ] } } diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/desert-dunes-red.json similarity index 100% rename from biomes/hot/hot-desert-dunes-red.json rename to biomes/hot/desert-dunes-red.json diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/desert-dunes.json similarity index 100% rename from biomes/hot/hot-desert-dunes.json rename to biomes/hot/desert-dunes.json diff --git a/biomes/hot/hot-mountain-cliffs.json b/biomes/hot/mountain-cliffs.json similarity index 100% rename from biomes/hot/hot-mountain-cliffs.json rename to biomes/hot/mountain-cliffs.json diff --git a/biomes/hot/hot-mountain-middle.json b/biomes/hot/mountain-middle.json similarity index 100% rename from biomes/hot/hot-mountain-middle.json rename to biomes/hot/mountain-middle.json diff --git a/biomes/hot/hot-mountain-plains.json b/biomes/hot/mountain-plains.json similarity index 100% rename from biomes/hot/hot-mountain-plains.json rename to biomes/hot/mountain-plains.json diff --git a/biomes/hot/hot-mountain.json b/biomes/hot/mountain.json similarity index 100% rename from biomes/hot/hot-mountain.json rename to biomes/hot/mountain.json diff --git a/biomes/hot/hot-oasis.json b/biomes/hot/oasis.json similarity index 100% rename from biomes/hot/hot-oasis.json rename to biomes/hot/oasis.json diff --git a/biomes/ocean/oce-hot-ocean-cliffs.json b/biomes/hot/sea/ocean-cliffs.json similarity index 100% rename from biomes/ocean/oce-hot-ocean-cliffs.json rename to biomes/hot/sea/ocean-cliffs.json diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/hot/sea/ocean.json similarity index 99% rename from biomes/ocean/oce-hot-ocean.json rename to biomes/hot/sea/ocean.json index dfbb17e2..48d90302 100644 --- a/biomes/ocean/oce-hot-ocean.json +++ b/biomes/hot/sea/ocean.json @@ -2,7 +2,7 @@ "name": "Hot Ocean", "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", - "children": ["ocean/oce-hot-ocean-cliffs"], + "children": ["hot/sea/ocean-cliffs"], "color": "#103140", "generators": [{ "min": -11, diff --git a/biomes/ocean/oce-hot-river.json b/biomes/hot/sea/river.json similarity index 100% rename from biomes/ocean/oce-hot-river.json rename to biomes/hot/sea/river.json diff --git a/biomes/hot/hot-beach-grass.json b/biomes/hot/shore/beach-grass.json similarity index 88% rename from biomes/hot/hot-beach-grass.json rename to biomes/hot/shore/beach-grass.json index 6b5c2d29..b398453a 100644 --- a/biomes/hot/hot-beach-grass.json +++ b/biomes/hot/shore/beach-grass.json @@ -49,15 +49,17 @@ }, { "partOf": "SHORE_LINE", - "verticalZoom": 0.2, - "chance": 0.08, - "variance": {"style": "SIMPLEX"}, - "stackMax": 6, - "zoom": 5, + "chance": 0.09, + "stackMin": 1, + "stackMax": 4, "palette": [{"block": "sugar_cane"}], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "IRIS"}, - "stackMin": 1 + "style": { + "style": "IRIS", + "zoom": 0.65 + }, + "heightVariance": { + "style": "STATIC" + } }, { "chance": 0.01, diff --git a/biomes/hot/hot-beach.json b/biomes/hot/shore/beach.json similarity index 87% rename from biomes/hot/hot-beach.json rename to biomes/hot/shore/beach.json index a54b3eb5..c47ce355 100644 --- a/biomes/hot/hot-beach.json +++ b/biomes/hot/shore/beach.json @@ -49,15 +49,17 @@ }, { "partOf": "SHORE_LINE", - "verticalZoom": 0.2, - "chance": 0.08, - "variance": {"style": "SIMPLEX"}, - "stackMax": 6, - "zoom": 5, + "chance": 0.09, + "stackMin": 1, + "stackMax": 4, "palette": [{"block": "sugar_cane"}], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "IRIS"}, - "stackMin": 1 + "style": { + "style": "IRIS", + "zoom": 0.65 + }, + "heightVariance": { + "style": "STATIC" + } } ], "wall": { diff --git a/biomes/hot/msa-blue.json b/biomes/mesa/blue.json similarity index 100% rename from biomes/hot/msa-blue.json rename to biomes/mesa/blue.json diff --git a/biomes/hot/msa-cliffs.json b/biomes/mesa/cliffs.json similarity index 100% rename from biomes/hot/msa-cliffs.json rename to biomes/mesa/cliffs.json diff --git a/biomes/hot/msa-dark.json b/biomes/mesa/dark.json similarity index 97% rename from biomes/hot/msa-dark.json rename to biomes/mesa/dark.json index 0453940b..8afe5082 100644 --- a/biomes/hot/msa-dark.json +++ b/biomes/mesa/dark.json @@ -5,10 +5,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "hot/msa-cliffs", - "hot/msa-red", - "hot/msa-green", - "hot/msa-blue" + "mesa/cliffs", + "mesa/red", + "mesa/green", + "mesa/blue" ], "generators": [ { diff --git a/biomes/hot/msa-green.json b/biomes/mesa/green.json similarity index 100% rename from biomes/hot/msa-green.json rename to biomes/mesa/green.json diff --git a/biomes/hot/msa-mesa.json b/biomes/mesa/mesa.json similarity index 95% rename from biomes/hot/msa-mesa.json rename to biomes/mesa/mesa.json index 8fd94446..91961281 100644 --- a/biomes/hot/msa-mesa.json +++ b/biomes/mesa/mesa.json @@ -10,14 +10,14 @@ "ERODED_BADLANDS" ], "children": [ - "hot/msa-valleys", - "hot/msa-red", - "hot/msa-blue", - "hot/msa-dark", - "hot/msa-green", - "hot/msa-red", - "hot/msa-yellow", - "hot/msa-blue" + "mesa/valleys", + "mesa/red", + "mesa/blue", + "mesa/dark", + "mesa/green", + "mesa/red", + "mesa/yellow", + "mesa/blue" ], "generators": [{ "min": 25, diff --git a/biomes/hot/msa-plateau-dirt-high.json b/biomes/mesa/plateau-dirt-high.json similarity index 100% rename from biomes/hot/msa-plateau-dirt-high.json rename to biomes/mesa/plateau-dirt-high.json diff --git a/biomes/hot/msa-plateau-dirt.json b/biomes/mesa/plateau-dirt.json similarity index 100% rename from biomes/hot/msa-plateau-dirt.json rename to biomes/mesa/plateau-dirt.json diff --git a/biomes/hot/msa-plateau-high.json b/biomes/mesa/plateau-high.json similarity index 98% rename from biomes/hot/msa-plateau-high.json rename to biomes/mesa/plateau-high.json index 16346638..1f43f845 100644 --- a/biomes/hot/msa-plateau-high.json +++ b/biomes/mesa/plateau-high.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt-high"], + "children": ["mesa/plateau-dirt-high"], "generators": [ { "min": 55, diff --git a/biomes/hot/msa-plateau.json b/biomes/mesa/plateau.json similarity index 99% rename from biomes/hot/msa-plateau.json rename to biomes/mesa/plateau.json index cca3d809..36071a4e 100644 --- a/biomes/hot/msa-plateau.json +++ b/biomes/mesa/plateau.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt"], + "children": ["mesa/plateau-dirt"], "generators": [ { "min": 35, diff --git a/biomes/hot/msa-red.json b/biomes/mesa/red.json similarity index 100% rename from biomes/hot/msa-red.json rename to biomes/mesa/red.json diff --git a/biomes/ocean/msa-river.json b/biomes/mesa/sea/river.json similarity index 100% rename from biomes/ocean/msa-river.json rename to biomes/mesa/sea/river.json diff --git a/biomes/hot/msa-beach.json b/biomes/mesa/shore/beach.json similarity index 100% rename from biomes/hot/msa-beach.json rename to biomes/mesa/shore/beach.json diff --git a/biomes/hot/msa-valleys.json b/biomes/mesa/valleys.json similarity index 100% rename from biomes/hot/msa-valleys.json rename to biomes/mesa/valleys.json diff --git a/biomes/hot/msa-yellow.json b/biomes/mesa/yellow.json similarity index 98% rename from biomes/hot/msa-yellow.json rename to biomes/mesa/yellow.json index 119db78c..318e51b1 100644 --- a/biomes/hot/msa-yellow.json +++ b/biomes/mesa/yellow.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#BDBF05", "vanillaDerivative": "BADLANDS", - "children": ["hot/msa-dark"], + "children": ["mesa/dark"], "generators": [ { "min": 9, diff --git a/biomes/mountain/mtn-cliffs.json b/biomes/mountain/cliffs.json similarity index 100% rename from biomes/mountain/mtn-cliffs.json rename to biomes/mountain/cliffs.json diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/forest-hills.json similarity index 97% rename from biomes/mountain/mtn-forest-hills.json rename to biomes/mountain/forest-hills.json index 8b28674b..6829bd67 100644 --- a/biomes/mountain/mtn-forest-hills.json +++ b/biomes/mountain/forest-hills.json @@ -209,10 +209,7 @@ {"block": "dark_oak_fence"}, {"block": "dark_oak_fence_gate"} ], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }], "chance": 1, "density": 5, diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/forest.json similarity index 97% rename from biomes/mountain/mtn-forest.json rename to biomes/mountain/forest.json index 04f1ffec..f7382a3d 100644 --- a/biomes/mountain/mtn-forest.json +++ b/biomes/mountain/forest.json @@ -209,10 +209,7 @@ {"block": "dark_oak_fence"}, {"block": "dark_oak_fence_gate"} ], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }], "chance": 1, "density": 5, diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/hills.json similarity index 99% rename from biomes/mountain/mtn-hills.json rename to biomes/mountain/hills.json index 92d5e9e3..a3542131 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/hills.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#48525F", "vanillaDerivative": "TAIGA_MOUNTAINS", - "children": ["mountain/mtn-forest"], + "children": ["mountain/forest"], "generators": [{ "generator": "smooth-dunes", "max": 23, diff --git a/biomes/mountain/mtn-main.json b/biomes/mountain/main.json similarity index 98% rename from biomes/mountain/mtn-main.json rename to biomes/mountain/main.json index c7ab282a..dbb8f45d 100644 --- a/biomes/mountain/mtn-main.json +++ b/biomes/mountain/main.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#2B2E32", "vanillaDerivative": "PLAINS", - "children": ["mountain/mtn-middle"], + "children": ["mountain/middle"], "generators": [ { "min": 70, diff --git a/biomes/mountain/mtn-middle.json b/biomes/mountain/middle.json similarity index 98% rename from biomes/mountain/mtn-middle.json rename to biomes/mountain/middle.json index f5811534..ac72b96e 100644 --- a/biomes/mountain/mtn-middle.json +++ b/biomes/mountain/middle.json @@ -3,7 +3,7 @@ "color": "#36383C", "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", - "children": ["mountain/mtn-cliffs"], + "children": ["mountain/cliffs"], "generators": [ { "generator": "mountain", diff --git a/biomes/mountain/mtn-mountain.json b/biomes/mountain/mountain.json similarity index 98% rename from biomes/mountain/mtn-mountain.json rename to biomes/mountain/mountain.json index 753139fc..c4dfb5c9 100644 --- a/biomes/mountain/mtn-mountain.json +++ b/biomes/mountain/mountain.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#4B4D4F", "vanillaDerivative": "MOUNTAIN_EDGE", - "children": ["mountain/mtn-middle"], + "children": ["mountain/middle"], "generators": [ { "min": 70, diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/plain-hills.json similarity index 100% rename from biomes/mountain/mtn-plain-hills.json rename to biomes/mountain/plain-hills.json diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/plains.json similarity index 100% rename from biomes/mountain/mtn-plains.json rename to biomes/mountain/plains.json diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/mountain/sea/lake.json similarity index 100% rename from biomes/ocean/oce-mtn-lake.json rename to biomes/mountain/sea/lake.json diff --git a/biomes/ocean/oce-mtn-river-soft.json b/biomes/mountain/sea/river-soft.json similarity index 100% rename from biomes/ocean/oce-mtn-river-soft.json rename to biomes/mountain/sea/river-soft.json diff --git a/biomes/ocean/oce-mtn-river.json b/biomes/mountain/sea/river.json similarity index 100% rename from biomes/ocean/oce-mtn-river.json rename to biomes/mountain/sea/river.json diff --git a/biomes/mountain/mtn-beach.json b/biomes/mountain/shore/beach.json similarity index 100% rename from biomes/mountain/mtn-beach.json rename to biomes/mountain/shore/beach.json diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/crimson-forest.json similarity index 100% rename from biomes/mushroom/mus-crimson-forest.json rename to biomes/mushroom/crimson-forest.json diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/forest-hills.json similarity index 99% rename from biomes/mushroom/mus-forest-hills.json rename to biomes/mushroom/forest-hills.json index effac767..c12bd2cc 100644 --- a/biomes/mushroom/mus-forest-hills.json +++ b/biomes/mushroom/forest-hills.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "mushills", + "id": "mushroom_hills", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", "waterFogColor": "#BD94DF", diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/forest.json similarity index 99% rename from biomes/mushroom/mus-forest.json rename to biomes/mushroom/forest.json index f257d7ad..d65591b0 100644 --- a/biomes/mushroom/mus-forest.json +++ b/biomes/mushroom/forest.json @@ -4,9 +4,9 @@ "rarity": 1, "color": "#BFA6BE", "vanillaDerivative": "MUSHROOM_FIELDS", - "children": ["mushroom/mus-forest-hills"], + "children": ["mushroom/forest-hills"], "customDerivitives": [{ - "id": "musforest", + "id": "mushroom_forest", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", "waterFogColor": "#BD94DF", diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/plains.json similarity index 99% rename from biomes/mushroom/mus-plains.json rename to biomes/mushroom/plains.json index c0fc919b..fa90da06 100644 --- a/biomes/mushroom/mus-plains.json +++ b/biomes/mushroom/plains.json @@ -5,7 +5,7 @@ "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", "customDerivitives": [{ - "id": "musplains", + "id": "mushroom_plains", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", "waterFogColor": "#BD94DF", diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/mushroom/sea/lake.json similarity index 100% rename from biomes/ocean/oce-mus-lake.json rename to biomes/mushroom/sea/lake.json diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/mushroom/sea/ocean.json similarity index 100% rename from biomes/ocean/oce-mus-ocean.json rename to biomes/mushroom/sea/ocean.json diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/shore/beach.json similarity index 98% rename from biomes/mushroom/mus-beach.json rename to biomes/mushroom/shore/beach.json index 796ab409..7c2d6cc8 100644 --- a/biomes/mushroom/mus-beach.json +++ b/biomes/mushroom/shore/beach.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "mus", + "id": "mushroom_beach", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", "waterFogColor": "#BD94DF", diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/warped-forest.json similarity index 100% rename from biomes/mushroom/mus-warped-forest.json rename to biomes/mushroom/warped-forest.json diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/deep.json similarity index 100% rename from biomes/ocean/oce-deep.json rename to biomes/ocean/deep.json diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/ocean.json similarity index 100% rename from biomes/ocean/oce-ocean.json rename to biomes/ocean/ocean.json diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/shore/beach.json similarity index 100% rename from biomes/ocean/oce-beach.json rename to biomes/ocean/shore/beach.json diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/warm-bottom.json similarity index 100% rename from biomes/ocean/oce-warm-bottom.json rename to biomes/ocean/warm-bottom.json diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/warm.json similarity index 99% rename from biomes/ocean/oce-warm.json rename to biomes/ocean/warm.json index 245c7120..42e49be3 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/warm.json @@ -3,7 +3,7 @@ "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "color": "#2A2180", - "children": ["ocean/oce-warm-bottom"], + "children": ["ocean/warm-bottom"], "generators": [{ "generator": "plain", "max": -10, diff --git a/biomes/hot/sav-acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json similarity index 93% rename from biomes/hot/sav-acacia-denmyre.json rename to biomes/savanna/acacia-denmyre.json index fa59964d..1a08e35c 100644 --- a/biomes/hot/sav-acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -5,7 +5,7 @@ "color": "#FFB641", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ - "id": "savdenmyre", + "id": "savanna_acacia_denmyre", "grassColor": "#DFD545", "foliageColor": "#D6A513", "waterColor": "#E2EF3B", @@ -116,13 +116,6 @@ { "find": [{"block": "acacia_planks"}], "replace": {"palette": [{"block": "stripped_acacia_wood"}]} - }, - { - "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "acacia_leaves", - "data": {"persistent": true} - }]} } ], "rotation": { diff --git a/biomes/hot/sav-cliff.json b/biomes/savanna/cliff.json similarity index 98% rename from biomes/hot/sav-cliff.json rename to biomes/savanna/cliff.json index 53cac96e..e74639da 100644 --- a/biomes/hot/sav-cliff.json +++ b/biomes/savanna/cliff.json @@ -4,9 +4,9 @@ "rarity": 1, "color": "#BF8931", "vanillaDerivative": "SAVANNA", - "children": ["hot/sav-acacia-denmyre"], + "children": ["savanna/acacia-denmyre"], "customDerivitives": [{ - "id": "savcliff", + "id": "savanna_cliffs", "grassColor": "#DFD545", "foliageColor": "#D6A513", "waterColor": "#E2EF3B", diff --git a/biomes/hot/sav-forest.json b/biomes/savanna/forest.json similarity index 99% rename from biomes/hot/sav-forest.json rename to biomes/savanna/forest.json index 52f1cbcf..2514dd6e 100644 --- a/biomes/hot/sav-forest.json +++ b/biomes/savanna/forest.json @@ -5,7 +5,7 @@ "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ - "id": "savforest", + "id": "savanna_forest", "grassColor": "#E2EF3B", "foliageColor": "#D6A513", "waterColor": "#E2EF3B", diff --git a/biomes/hot/sav-plateau.json b/biomes/savanna/plateau.json similarity index 99% rename from biomes/hot/sav-plateau.json rename to biomes/savanna/plateau.json index 1d29d958..e51c8a73 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/savanna/plateau.json @@ -5,7 +5,7 @@ "color": "#805B21", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ - "id": "savplateau", + "id": "savanna_plateau", "grassColor": "#FFCB31", "foliageColor": "#D6A513", "waterColor": "#E2EF3B", diff --git a/biomes/hot/sav-savanna.json b/biomes/savanna/savanna.json similarity index 99% rename from biomes/hot/sav-savanna.json rename to biomes/savanna/savanna.json index 6d20d8ac..1d72a1cf 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/savanna/savanna.json @@ -4,9 +4,9 @@ "rarity": 1, "color": "#604418", "vanillaDerivative": "SAVANNA", - "children": ["hot/sav-cliff"], + "children": ["savanna/cliff"], "customDerivitives": [{ - "id": "savsavanna", + "id": "savanna", "grassColor": "#DFD545", "foliageColor": "#D6A513", "waterColor": "#E2EF3B", diff --git a/biomes/hot/sav-beach.json b/biomes/savanna/shore/beach.json similarity index 98% rename from biomes/hot/sav-beach.json rename to biomes/savanna/shore/beach.json index b41ece4e..5e6b1eb3 100644 --- a/biomes/hot/sav-beach.json +++ b/biomes/savanna/shore/beach.json @@ -5,7 +5,7 @@ "color": "#DF9F39", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ - "id": "savbeach", + "id": "savanna_beach", "grassColor": "#E2EF3B", "foliageColor": "#D6A513", "waterColor": "#8DFFE8", diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/denmyre.json similarity index 90% rename from biomes/swamp/swa-denmyre.json rename to biomes/swamp/denmyre.json index 8b4bf807..f7204863 100644 --- a/biomes/swamp/swa-denmyre.json +++ b/biomes/swamp/denmyre.json @@ -121,10 +121,7 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { "find": [{"block": "acacia_fence"}], @@ -190,24 +187,15 @@ "edit": [ { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { "find": [{"block": "dark_oak_fence"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} } ], "density": 2, diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/marsh-rotten.json similarity index 99% rename from biomes/swamp/swa-marsh-rotten.json rename to biomes/swamp/marsh-rotten.json index 95facfd1..a24ea533 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/marsh-rotten.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "swamprottenmarsh", + "id": "swamp_marsh_rotten", "waterColor": "#684D1A", "grassColor": "#5C581A", "spawnRarity": 20, diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/marsh.json similarity index 94% rename from biomes/swamp/swa-marsh.json rename to biomes/swamp/marsh.json index d70e07b5..c778f946 100644 --- a/biomes/swamp/swa-marsh.json +++ b/biomes/swamp/marsh.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#36A300", "vanillaDerivative": "SWAMP", - "children": ["swamp/swa-marsh-rotten"], + "children": ["swamp/marsh-rotten"], "generators": [{ "min": 3, "max": 6, @@ -94,10 +94,7 @@ "edit": [ { "find": [{"block": "jungle_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} }, { "find": [{"block": "jungle_wood"}], diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/roofed-forest.json similarity index 99% rename from biomes/swamp/swa-roofed-forest.json rename to biomes/swamp/roofed-forest.json index 07b4809a..1df159c3 100644 --- a/biomes/swamp/swa-roofed-forest.json +++ b/biomes/swamp/roofed-forest.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#3F9F10", "vanillaDerivative": "DARK_FOREST", - "children": ["swamp/swa-lake"], + "children": ["swamp/sea/lake"], "generators": [{ "min": 4, "max": 11, diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/roofed-wayward.json similarity index 93% rename from biomes/swamp/swa-roofed-wayward.json rename to biomes/swamp/roofed-wayward.json index 2622f736..87f41178 100644 --- a/biomes/swamp/swa-roofed-wayward.json +++ b/biomes/swamp/roofed-wayward.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#489A20", "vanillaDerivative": "DARK_FOREST", - "children": ["swamp/swa-lake"], + "children": ["swamp/sea/lake"], "generators": [{ "min": -7, "max": -3, @@ -89,17 +89,11 @@ "edit": [ { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { "find": [{"block": "dark_oak_fence"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} } ], "rotation": { @@ -134,17 +128,11 @@ "edit": [ { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "dark_oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "dark_oak_leaves"}]} } ], "rotation": { diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/sea/lake.json similarity index 98% rename from biomes/swamp/swa-lake.json rename to biomes/swamp/sea/lake.json index d7330370..b2e066df 100644 --- a/biomes/swamp/swa-lake.json +++ b/biomes/swamp/sea/lake.json @@ -4,7 +4,7 @@ "color": "#6A9140", "derivative": "SWAMP", "vanillaDerivative": "SWAMP", - "children": ["swamp/swa-marsh"], + "children": ["swamp/marsh"], "generators": [{ "min": -8, "max": -5, diff --git a/biomes/ocean/oce-swa-ocean-tree.json b/biomes/swamp/sea/ocean-tree.json similarity index 97% rename from biomes/ocean/oce-swa-ocean-tree.json rename to biomes/swamp/sea/ocean-tree.json index 1fa4428f..67896ed0 100644 --- a/biomes/ocean/oce-swa-ocean-tree.json +++ b/biomes/swamp/sea/ocean-tree.json @@ -157,10 +157,7 @@ "edit": [ { "find": [{"block": "jungle_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} }, { "find": [{"block": "jungle_wood"}], diff --git a/biomes/ocean/oce-swa-ocean.json b/biomes/swamp/sea/ocean.json similarity index 100% rename from biomes/ocean/oce-swa-ocean.json rename to biomes/swamp/sea/ocean.json diff --git a/biomes/swamp/swa-beach.json b/biomes/swamp/shore/beach.json similarity index 88% rename from biomes/swamp/swa-beach.json rename to biomes/swamp/shore/beach.json index ad9d5aab..843af0d7 100644 --- a/biomes/swamp/swa-beach.json +++ b/biomes/swamp/shore/beach.json @@ -66,15 +66,17 @@ }, { "partOf": "SHORE_LINE", - "chance": 0.009, - "verticalZoom": 0.2, - "variance": {"style": "SIMPLEX"}, - "stackMax": 4, + "chance": 0.09, "stackMin": 1, - "zoom": 5, + "stackMax": 4, "palette": [{"block": "sugar_cane"}], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "STATIC"} + "style": { + "style": "IRIS", + "zoom": 0.65 + }, + "heightVariance": { + "style": "STATIC" + } } ], "objects": [{ @@ -92,10 +94,7 @@ "edit": [ { "find": [{"block": "jungle_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} }, { "find": [{"block": "jungle_wood"}], diff --git a/biomes/swamp/swa-willow-forest.json b/biomes/swamp/willow-forest.json similarity index 99% rename from biomes/swamp/swa-willow-forest.json rename to biomes/swamp/willow-forest.json index c686ebfd..c5b7bbd5 100644 --- a/biomes/swamp/swa-willow-forest.json +++ b/biomes/swamp/willow-forest.json @@ -5,8 +5,8 @@ "color": "#648D50", "vanillaDerivative": "DARK_FOREST", "children": [ - "swamp/swa-denmyre", - "swamp/swa-marsh" + "swamp/denmyre", + "swamp/marsh" ], "generators": [{ "min": 4, diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/birch-denmyre.json similarity index 90% rename from biomes/temperate/tem-birch-denmyre.json rename to biomes/temperate/birch-denmyre.json index b45327d0..f49d5382 100644 --- a/biomes/temperate/tem-birch-denmyre.json +++ b/biomes/temperate/birch-denmyre.json @@ -140,10 +140,7 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "birch_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }, { "find": [{"block": "acacia_fence"}], @@ -182,24 +179,15 @@ "edit": [ { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "birch_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }, { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "birch_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }, { "find": [{"block": "spruce_wood"}], - "replace": {"palette": [{ - "block": "birch_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} } ], "chance": 0.3, diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/birch-forest.json similarity index 81% rename from biomes/temperate/tem-birch-forest.json rename to biomes/temperate/birch-forest.json index 3cbf7851..41f12919 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -1,20 +1,25 @@ { - "name": "Temperate Birch Forest", - "derivative": "PLAINS", - "rarity": 1, - "color": "#D2DF20", + "name": "Birch Forest", + "derivative": "BIRCH_FOREST", "vanillaDerivative": "BIRCH_FOREST", - "children": ["temperate/tem-birch-denmyre"], - "generators": [{ - "min": 4, - "max": 7, - "generator": "smooth-dunes" - }], - "customDerivitives": [{ - "id": "temoak", - "foliageColor": "#6CC646", - "grassColor": "#A1C646", - "category": "forest" + "children": ["temperate/birch-thin"], + "childStyle": { + "style": "NOWHERE_SIMPLEX", + "zoom": 5 + }, + "color": "#d8fa5f", + "rarity": 3, + "biomeZoom": 50, + "generators": [ + { + "min": 5, + "max": 12, + "generator": "highplains" + }, + { + "min": 0, + "max": 50, + "generator": "rare-hills" }], "jigsawStructures": [ { @@ -62,6 +67,38 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "bee", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 70 + } + ], "objects": [ { "mode": "PAINT", @@ -158,7 +195,7 @@ }, { "chance": 0.08, - "density": 4, + "density": 2, "rotation": { "yAxis": { "min": 0, @@ -181,20 +218,19 @@ } } ], - "biomeZoom": 60, "biomeStyle": {"style": "IRIS"}, "decorators": [ { - "chance": 0.09, + "chance": 0.03, "variance": {"style": "STATIC"}, "zoom": 0.1, "palette": [ - {"block": "grass"}, {"block": "allium"}, {"block": "poppy"}, {"block": "dandelion"}, {"block": "azure_bluet"}, {"block": "pink_tulip"}, + {"block": "cornflower"}, {"block": "lily_of_the_valley"} ], "style": {"style": "STATIC"} @@ -221,9 +257,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "biomeScatter": [ - "FOREST", - "PLAINS" - ] + } } diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json new file mode 100644 index 00000000..1874cce2 --- /dev/null +++ b/biomes/temperate/birch-thin.json @@ -0,0 +1,228 @@ +{ + "name": "Birch Thin Forest", + "derivative": "BIRCH_FOREST", + "vanillaDerivative": "BIRCH_FOREST", + "color": "#e3fa93", + "rarity": 4, + "generators": [{ + "min": 5, + "max": 15, + "generator": "highplains" + }, + { + "min": 0, + "max": 40, + "generator": "rare-hills" + }], + "jigsawStructures": [ + { + "rarity": 900, + "structure": "pillager_outpost" + }, + { + "rarity": 1100, + "structure": "village-temperate" + } + ], + "layers": [ + { + "style": {"style": "STATIC"}, + "palette": [ + { + "block": "grass_block", + "weight": 30 + }, + { + "block": "coarse_dirt" + } + ] + }, + {"palette": [{"block": "dirt"}]}, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + {"block": "dirt"}, + {"block": "coarse_dirt"} + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": {"style": "STATIC"}, + "palette": [ + {"block": "stone"}, + {"block": "andesite"}, + {"block": "stone"} + ] + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "bee", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 50 + } + ], + "objects": [ + { + "mode": "PAINT", + "chance": 0.0025, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/bincluster1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.00375, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.9, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/birch/antioch3", + "trees/birch/antioch4", + "trees/birch/antioch5", + "trees/birch/antioch6", + "trees/birch/antioch7", + "trees/birch/antioch8", + "trees/birch/antioch9", + "trees/birch/antioch10", + "trees/birch/antioch11", + "trees/birch/antioch12", + "trees/birch/antioch13" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.08, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/birch/antioch3b", + "trees/birch/antioch4b", + "trees/birch/antioch5b", + "trees/birch/antioch6b" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "biomeZoom": 50, + "biomeStyle": {"style": "IRIS"}, + "decorators": [ + { + "chance": 0.03, + "variance": {"style": "STATIC"}, + "zoom": 0.1, + "palette": [ + {"block": "grass"}, + {"block": "allium"}, + {"block": "poppy"}, + {"block": "dandelion"}, + {"block": "azure_bluet"}, + {"block": "pink_tulip"}, + {"block": "lily_of_the_valley"} + ], + "style": {"style": "STATIC"} + }, + { + "chance": 0.4, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [{"block": "grass", "weight": 10}, {"block": "fern"}], + "style": {"style": "STATIC"} + }, + { + "chance": 0.017, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [{"block": "tall_grass"}], + "style": {"style": "STATIC"} + } + ], + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + {"block": "stone"}, + {"block": "andesite"}, + {"block": "stone"} + ] + } +} diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/combo-forest.json similarity index 82% rename from biomes/temperate/tem-oak-forest.json rename to biomes/temperate/combo-forest.json index 9d94f7c1..44709261 100644 --- a/biomes/temperate/tem-oak-forest.json +++ b/biomes/temperate/combo-forest.json @@ -1,22 +1,15 @@ { - "name": "Temperate Oak Forest", - "derivative": "DEEP_LUKEWARM_OCEAN", - "rarity": 1, - "color": "#BFEF10", + "name": "Combo Forest", + "derivative": "FOREST", "vanillaDerivative": "FOREST", - "children": ["temperate/tem-oak-denmyre"], - "customDerivitives": [{ - "id": "temoakforest", - "foliageColor": "#80B918", - "waterColor": "#25638E", - "grassColor": "#698E25", - "category": "forest" - }], + "children": ["temperate/oak-denmyre"], "generators": [{ - "min": 4, - "max": 7, + "min": 5, + "max": 12, "generator": "plain" }], + "rarity": 3, + "biomeZoom": 50, "layers": [ { "style": {"style": "STATIC"}, @@ -52,13 +45,39 @@ "structure": "village-temperate" } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.07, "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -95,7 +114,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -119,7 +138,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -161,23 +180,49 @@ } }, { - "chance": 0.18, + "chance": 0.9, + "density": 1, "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, "enabled": true }, "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric8", - "trees/oak/thoakgeneric10" + "trees/birch/antioch3", + "trees/birch/antioch4", + "trees/birch/antioch5", + "trees/birch/antioch6", + "trees/birch/antioch7", + "trees/birch/antioch8", + "trees/birch/antioch9", + "trees/birch/antioch10", + "trees/birch/antioch11", + "trees/birch/antioch12", + "trees/birch/antioch13" + ] + }, + { + "chance": 0.18, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/oak/toak1", + "trees/oak/toak2", + "trees/oak/toak3", + "trees/oak/toak4", + "trees/oak/toak8", + "trees/oak/toak10" ], "translate": { "x": 0, @@ -190,7 +235,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -216,7 +261,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -233,38 +278,8 @@ "y": 0, "z": 0 } - }, - { - "chance": 0.0015, - "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 - }, - "mode": "MIN_HEIGHT", - "place": ["trees/mixed/smoakog80"], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } } ], - "biomeZoom": 60, "biomeStyle": {"style": "IRIS"}, "decorators": [ { diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/flower-forest.json similarity index 97% rename from biomes/temperate/tem-flower-forest.json rename to biomes/temperate/flower-forest.json index 43306fbd..1916674a 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "temflowerfrst", + "id": "flower_forest", "foliageColor": "#64C329", "grassColor": "#48A620", "category": "forest" @@ -165,10 +165,7 @@ }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} } ], "place": [ @@ -523,10 +520,7 @@ "chance": 0.04, "variance": {"style": "STATIC"}, "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "oak_leaves"}] }, { "chance": 0.02, diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/highlands.json similarity index 100% rename from biomes/temperate/tem-highlands.json rename to biomes/temperate/highlands.json diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/island.json similarity index 97% rename from biomes/temperate/tem-island.json rename to biomes/temperate/island.json index 26443de7..a74beeff 100644 --- a/biomes/temperate/tem-island.json +++ b/biomes/temperate/island.json @@ -1,17 +1,17 @@ { "name": "Temperate Island", "derivative": "PLAINS", - "rarity": 1, + "rarity": 3, "color": "#A9AF50", "vanillaDerivative": "PLAINS", - "children": ["temperate/tem-wilds"], + "children": ["temperate/wilds"], "generators": [{ "min": 28, "max": 42, "generator": "plain" }], "customDerivitives": [{ - "id": "temisland", + "id": "island", "foliageColor": "#69DF51", "waterColor": "#48BFBC", "grassColor": "#BEDF51", diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/longtree-forest.json similarity index 98% rename from biomes/temperate/tem-longtree-forest.json rename to biomes/temperate/longtree-forest.json index 4a64cf16..f23a95e4 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -1,6 +1,6 @@ { "vanillaDerivative": "FOREST", - "rarity": 1, + "rarity": 5, "color": "#9B9F60", "name": "Long tree forest", "effects": [{ @@ -216,10 +216,7 @@ "chance": 0.02, "variance": {"style": "STATIC"}, "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "oak_leaves"}] }, { "chance": 0.02, diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json new file mode 100644 index 00000000..ac99c77c --- /dev/null +++ b/biomes/temperate/lush-plains-red.json @@ -0,0 +1,347 @@ +{ + "name": "Lush Plains Red", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "color": "#de3535", + "rarity": 5, + "generators": [{ + "min": 4, + "max": 7, + "generator": "plain" + }], + "jigsawStructures": [ + { + "rarity": 1700, + "structure": "pillager_outpost" + }, + { + "rarity": 1500, + "structure": "village-temperate" + } + ], + "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"} + ] + } + ], + "decorators": [ + { + "chance": 0.04, + "style": { + "style": "STATIC" + }, + "palette": [ + {"block": "rose_bush", "weight": 6}, + {"block": "poppy", "weight": 8} + ] + }, + { + "chance": 0.01, + "palette": [{"block": "tall_grass"}] + }, + { + "chance": 0.5, + "palette": [ + { + "block": "grass", + "weight": 15 + }, + { + "block": "fern", + "weight": 1 + } + ] + }, + { + "chance": 0.07, + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + } + ], + "objects": [ + { + "mode": "VACUUM", + "chance": 0.00975, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "VACUUM", + "chance": 0.00675, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp2"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/cave2"], + "translate": { + "x": 0, + "y": -57, + "z": 0 + } + }, + { + "chance": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8", + "trees/oak/hoakgeneric9", + "trees/oak/hoakgeneric1", + "trees/oak/shoakgeneric3", + "trees/oak/shoakgeneric4", + "trees/oak/shoakgeneric5", + "trees/oak/shoakgeneric6", + "trees/oak/shoakgeneric7", + "trees/oak/shoakgeneric8", + "trees/oak/shoakgeneric9", + "trees/oak/shoakgeneric1", + "trees/oak/shoakgeneric2" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 1.0E-4, + "mode": "VACUUM", + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/ruin1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.002, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/genericpeak1", + "clutter/genericpeak2", + "clutter/genericpeak3", + "clutter/genericpeak5", + "clutter/genericpeak6" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "place": [ + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ], + "chance": 0.07, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "structures/landstone1", + "structures/landstone2", + "structures/landstone3", + "structures/landstone4", + "structures/landstone5" + ], + "chance": 0.02, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "clutter/statue-villager-plains" + ], + "chance": 0.008, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + } + ], + "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 + } + ], + "biomeStyle": {"style": "IRIS"}, + "wall": {"palette": [ + {"block": "stone"}, + {"block": "andesite"} + ]} +} diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json new file mode 100644 index 00000000..a15cd4bd --- /dev/null +++ b/biomes/temperate/lush-plains-yellow.json @@ -0,0 +1,347 @@ +{ + "name": "Lush Plains Yellow", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "color": "#d8e310", + "rarity": 5, + "generators": [{ + "min": 4, + "max": 7, + "generator": "plain" + }], + "jigsawStructures": [ + { + "rarity": 1700, + "structure": "pillager_outpost" + }, + { + "rarity": 1500, + "structure": "village-temperate" + } + ], + "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"} + ] + } + ], + "decorators": [ + { + "chance": 0.05, + "style": { + "style": "STATIC" + }, + "palette": [ + {"block": "dandelion", "weight": 8}, + {"block": "sunflower", "weight": 1} + ] + }, + { + "chance": 0.01, + "palette": [{"block": "tall_grass"}] + }, + { + "chance": 0.5, + "palette": [ + { + "block": "grass", + "weight": 15 + }, + { + "block": "fern", + "weight": 1 + } + ] + }, + { + "chance": 0.08, + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ] + } + ], + "objects": [ + { + "mode": "VACUUM", + "chance": 0.00975, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "VACUUM", + "chance": 0.00675, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp2"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/cave2"], + "translate": { + "x": 0, + "y": -57, + "z": 0 + } + }, + { + "chance": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8", + "trees/oak/hoakgeneric9", + "trees/oak/hoakgeneric1", + "trees/oak/shoakgeneric3", + "trees/oak/shoakgeneric4", + "trees/oak/shoakgeneric5", + "trees/oak/shoakgeneric6", + "trees/oak/shoakgeneric7", + "trees/oak/shoakgeneric8", + "trees/oak/shoakgeneric9", + "trees/oak/shoakgeneric1", + "trees/oak/shoakgeneric2" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 1.0E-4, + "mode": "VACUUM", + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/ruin1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.002, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/genericpeak1", + "clutter/genericpeak2", + "clutter/genericpeak3", + "clutter/genericpeak5", + "clutter/genericpeak6" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "place": [ + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ], + "chance": 0.07, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "structures/landstone1", + "structures/landstone2", + "structures/landstone3", + "structures/landstone4", + "structures/landstone5" + ], + "chance": 0.02, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "clutter/statue-villager-plains" + ], + "chance": 0.008, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + } + ], + "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 + } + ], + "biomeStyle": {"style": "IRIS"}, + "wall": {"palette": [ + {"block": "stone"}, + {"block": "andesite"} + ]} +} diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json new file mode 100644 index 00000000..e3ab427e --- /dev/null +++ b/biomes/temperate/lush-plains.json @@ -0,0 +1,375 @@ +{ + "name": "Lush Plains", + "derivative": "JUNGLE_EDGE", + "vanillaDerivative": "JUNGLE_EDGE", + "color": "#68de35", + "generators": [{ + "min": 4, + "max": 7, + "generator": "plain" + }], + "rarity": 3, + "biomeZoom": 30, + "children": [ + "temperate/lush-plains-yellow", + "temperate/lush-plains-red" + ], + "childStyle": { + "style": "CELLULAR_IRIS_THICK", + "zoom": 20 + }, + "jigsawStructures": [ + { + "rarity": 1700, + "structure": "pillager_outpost" + }, + { + "rarity": 1500, + "structure": "village-temperate" + } + ], + "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"} + ] + } + ], + "decorators": [ + { + "chance": 0.06, + "variance": { + "style": "STATIC" + }, + "style": { + "style": "STATIC" + }, + "palette": [ + {"block": "orange_tulip"}, + {"block": "white_tulip"}, + {"block": "dandelion"}, + {"block": "poppy"}, + {"block": "blue_orchid"}, + {"block": "azure_bluet"}, + {"block": "red_tulip"}, + {"block": "allium"}, + {"block": "pink_tulip"}, + {"block": "oxeye_daisy"}, + {"block": "cornflower"}, + {"block": "lily_of_the_valley"}, + {"block": "rose_bush"}, + {"block": "lilac"} + ] + }, + { + "chance": 0.01, + "palette": [{"block": "tall_grass"}] + }, + { + "chance": 0.5, + "palette": [ + { + "block": "grass", + "weight": 15 + }, + { + "block": "fern", + "weight": 1 + } + ] + }, + { + "chance": 0.08, + "palette": [ + { + "block": "oak_leaves", + "data": { + "persistent": true + } + } + ], + "style": { + "style": "STATIC", + "zoom": 0.8 + } + } + ], + "objects": [ + { + "mode": "VACUUM", + "chance": 0.00975, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "VACUUM", + "chance": 0.00675, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp2"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/cave2"], + "translate": { + "x": 0, + "y": -57, + "z": 0 + } + }, + { + "chance": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8", + "trees/oak/hoakgeneric9", + "trees/oak/hoakgeneric1", + "trees/oak/shoakgeneric3", + "trees/oak/shoakgeneric4", + "trees/oak/shoakgeneric5", + "trees/oak/shoakgeneric6", + "trees/oak/shoakgeneric7", + "trees/oak/shoakgeneric8", + "trees/oak/shoakgeneric9", + "trees/oak/shoakgeneric1", + "trees/oak/shoakgeneric2" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 1.0E-4, + "mode": "VACUUM", + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/ruin1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.002, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/genericpeak1", + "clutter/genericpeak2", + "clutter/genericpeak3", + "clutter/genericpeak5", + "clutter/genericpeak6" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "place": [ + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ], + "chance": 0.07, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "structures/landstone1", + "structures/landstone2", + "structures/landstone3", + "structures/landstone4", + "structures/landstone5" + ], + "chance": 0.02, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "clutter/statue-villager-plains" + ], + "chance": 0.008, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + } + ], + "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 + } + ], + "biomeStyle": {"style": "IRIS"}, + "wall": {"palette": [ + {"block": "stone"}, + {"block": "andesite"} + ]} +} diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json new file mode 100644 index 00000000..a6d72893 --- /dev/null +++ b/biomes/temperate/meadows.json @@ -0,0 +1,394 @@ +{ + "name": "Meadows", + "derivative": "FOREST", + "vanillaDerivative": "FOREST", + "color": "#50af6b", + "rarity": 4, + "generators": [{ + "min": 5, + "max": 12, + "generator": "highplains" + }], + "customDerivitives": [ + { + "category": "plains", + "humidity": 0.8, + "temperature": 0.5, + "id": "meadow", + "downfallType": "rain", + "grassColor": "#83BB6D" + } + ], + "jigsawStructures": [ + { + "rarity": 2200, + "structure": "pillager_outpost" + }, + { + "rarity": 1900, + "structure": "village-temperate" + } + ], + "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"} + ] + } + ], + "decorators": [ + { + "chance": 0.04, + "variance": { + "style": "TRIOCTAVE_SIMPLEX", + "zoom": 6, + "fracture": { + "style": "STATIC", + "zoom": 0.2, + "multiplier": 10 + } + }, + "style": { + "style": "STATIC" + }, + "palette": [ + {"block": "cornflower"}, + {"block": "allium"}, + {"block": "cornflower"} + ] + }, + { + "chance": 0.02, + "variance": { + "style": "TRIOCTAVE_SIMPLEX", + "zoom": 6, + "fracture": { + "style": "STATIC", + "zoom": 0.2, + "multiplier": 10 + } + }, + "style": { + "style": "STATIC" + }, + "palette": [ + {"block": "poppy"}, + {"block": "pink_tulip"}, + {"block": "lily_of_the_valley"} + ] + }, + { + "chance": 0.005, + "palette": [{"block": "tall_grass"}] + }, + { + "chance": 0.1, + "palette": [{"block": "grass"}] + } + ], + "objects": [ + { + "mode": "VACUUM", + "chance": 0.00975, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "VACUUM", + "chance": 0.00675, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp2"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/cave2"], + "translate": { + "x": 0, + "y": -57, + "z": 0 + } + }, + { + "chance": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8", + "trees/oak/hoakgeneric9", + "trees/oak/hoakgeneric1", + "trees/oak/shoakgeneric3", + "trees/oak/shoakgeneric4", + "trees/oak/shoakgeneric5", + "trees/oak/shoakgeneric6", + "trees/oak/shoakgeneric7", + "trees/oak/shoakgeneric8", + "trees/oak/shoakgeneric9", + "trees/oak/shoakgeneric1", + "trees/oak/shoakgeneric2" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 1.0E-4, + "mode": "VACUUM", + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["structures/ruin1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.005, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.002, + "rotation": { + "yAxis": { + "min": 0, + "max": 360, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/genericpeak1", + "clutter/genericpeak2", + "clutter/genericpeak3", + "clutter/genericpeak5", + "clutter/genericpeak6" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "place": [ + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ], + "chance": 0.02, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "clutter/statue-villager-plains" + ], + "chance": 0.008, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "structures/ruins-greek-temple" + ], + "chance": 0.0005, + "mode": "VACUUM", + "translate": { + "y": -5 + }, + "rotation": { + "enabled": true, + "yAxis": { + "interval": 90, + "min": 0, + "max": 360, + "enabled": true + } + }, + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "chest", + "weight": 1 + }, + { + "block": "dirt", + "weight": 5 + } + ] + }, + "chance": 1 + } + ] + } + ], + "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 + }, + { + "entity": "horse", + "minSpawns": 2, + "maxSpawns": 5, + "rarity": 120 + } + ], + "biomeStyle": {"style": "IRIS"}, + "wall": {"palette": [ + {"block": "stone"}, + {"block": "andesite"} + ]} +} diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/oak-denmyre.json similarity index 71% rename from biomes/temperate/tem-oak-denmyre.json rename to biomes/temperate/oak-denmyre.json index 42c8f90a..8c1a591c 100644 --- a/biomes/temperate/tem-oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -1,12 +1,12 @@ { - "name": "Temperate Oak Denmyre", - "rarity": 1, + "name": "Oak Denmyre", + "rarity": 6, "color": "#C8FF00", "derivative": "FOREST", "vanillaDerivative": "FOREST", "generators": [{ - "min": 4, - "max": 7, + "min": 5, + "max": 12, "generator": "plain" }], "layers": [ @@ -72,10 +72,7 @@ "chance": 0.03, "variance": {"style": "STATIC"}, "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "oak_leaves"}] }, { "chance": 0.02, @@ -121,7 +118,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -135,7 +132,7 @@ } }, { - "chance": 0.5, + "chance": 0.2, "density": 2, "edit": [ { @@ -144,10 +141,7 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} }, { "find": [{"block": "acacia_fence"}], @@ -161,7 +155,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -183,56 +177,23 @@ } }, { - "edit": [ - { - "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} - }, - { - "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} - }, - { - "find": [{"block": "spruce_wood"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} - } - ], - "chance": 0.3, - "density": 2, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, "place": [ - "clutter/oakdenclutt1", - "clutter/oakdenclutt2", - "clutter/oakdenclutt3", - "clutter/oakdenclutt4", - "clutter/oakdenclutt5", - "clutter/oakdenclutt6", - "clutter/oakdenclutt7", - "clutter/oakdenclutt8", - "clutter/oakdenclutt9", - "clutter/oakdenclutt10" + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" ], - "translate": { - "x": 0, - "y": -1, - "z": 0 + "chance": 0.4, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } } } ], diff --git a/biomes/temperate/tem-oak.json b/biomes/temperate/oak-forest.json similarity index 68% rename from biomes/temperate/tem-oak.json rename to biomes/temperate/oak-forest.json index 11ba5d93..70abb1fe 100644 --- a/biomes/temperate/tem-oak.json +++ b/biomes/temperate/oak-forest.json @@ -1,22 +1,19 @@ { - "name": "Temperate Oak", + "name": "Oak Forest", "derivative": "FOREST", - "rarity": 1, "color": "#ADCF30", "vanillaDerivative": "FOREST", - "children": ["temperate/tem-oak-hills"], "generators": [{ "generator": "smooth-dunes", - "max": 4, - "min": 3 - }], - "customDerivitives": [{ - "id": "temoak", - "foliageColor": "#b76e79", - "waterColor": "#b76e79", - "grassColor": "#b76e79", - "category": "forest" + "max": 12, + "min": 5 + }, + { + "generator": "rare-hills", + "max": 40, + "min": 0 }], + "rarity": 3, "jigsawStructures": [ { "rarity": 1700, @@ -28,13 +25,22 @@ } ], "layers": [ - {"palette": [ - {"block": "grass_block"}, - {"block": "grass_block"}, - {"block": "grass_block"}, - {"block": "podzol"}, - {"block": "coarse_dirt"} - ]}, + { + "style": {"style": "STATIC"}, + "zoom": 0.656, + "palette": [ + { + "weight": 19, + "block": "grass_block" + }, + {"block": "coarse_dirt"}, + {"block": "gravel"}, + { + "weight": 19, + "block": "grass_block" + } + ] + }, { "minHeight": 2, "maxHeight": 2, @@ -130,7 +136,7 @@ "clutter/boulder9", "clutter/boulder10" ], - "chance": 0.4, + "chance": 0.1, "rotation": { "enabled": true, "yAxis": { @@ -154,7 +160,27 @@ "trees/oak/hoakgeneric4", "trees/oak/hoakgeneric5" ], - "chance": 0.5, + "chance": 0.08, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ], + "chance": 0.6, "rotation": { "enabled": true, "yAxis": { @@ -171,9 +197,9 @@ "trees/oak/shoakgeneric2", "trees/oak/shoakgeneric3", "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5" + "trees/oak/shoakgeneric4" ], - "chance": 0.5, + "chance": 0.1, "rotation": { "enabled": true, "yAxis": { @@ -186,19 +212,25 @@ }, { "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric4" + "trees/oak/toak1", + "trees/oak/toak2", + "trees/oak/toak3", + "trees/oak/toak4", + "trees/oak/toak5", + "trees/oak/toak6", + "trees/oak/toak7", + "trees/oak/toak8", + "trees/oak/toak9", + "trees/oak/toak10", + "trees/oak/toak11" ], - "chance": 0.5, + "chance": 0.1, "rotation": { "enabled": true, "yAxis": { "enabled": true, "interval": 90, - "min": -360, + "min": 0, "max": 360 } } @@ -215,10 +247,31 @@ "yAxis": { "enabled": true, "interval": 90, - "min": -360, + "min": 0, "max": 360 } } + }, + { + "place": [ + "trees/oak/massivegeneric1", + "trees/oak/massivegeneric2", + "trees/oak/massivegeneric3" + ], + "chance": 0.00001, + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + }, + "scale": { + "minimumScale": 0.6, + "maximumScale": 0.6 + } } ] } diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/plains.json similarity index 74% rename from biomes/temperate/tem-plains.json rename to biomes/temperate/plains.json index d59afeb2..a314ed46 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/plains.json @@ -1,25 +1,14 @@ { - "name": "Temperate Plains", + "name": "Plains", "derivative": "PLAINS", - "rarity": 1, - "color": "#9BAF50", "vanillaDerivative": "PLAINS", - "children": [ - "temperate/tem-plain-hills", - "temperate/tem-wilds" - ], - "customDerivitives": [{ - "id": "templains", - "foliageColor": "#7FA528", - "waterColor": "#2840A5", - "grassColor": "#A4C646", - "category": "forest" - }], + "color": "#9BAF50", "generators": [{ "min": 4, - "max": 7, + "max": 10, "generator": "plain" }], + "rarity": 2, "jigsawStructures": [ { "rarity": 1700, @@ -55,50 +44,20 @@ ] } ], - "childStyle": { - "style": "IRIS", - "zoom": 0.5, - "exponent": 2 - }, "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, + "chance": 0.004, "variance": { - "style": "CELLULAR", - "zoom": 0.3, + "style": "TRIOCTAVE_SIMPLEX", + "zoom": 6, "fracture": { - "style": "SIMPLEX", + "style": "STATIC", "zoom": 0.2, "multiplier": 10 } }, "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.3, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } + "style": "STATIC" }, "palette": [ {"block": "dandelion"}, @@ -155,7 +114,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -169,21 +128,24 @@ } }, { - "mode": "VACUUM", - "chance": 0.00675, + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, "enabled": true }, - "place": ["clutter/camp2"], + "place": ["structures/cave2"], "translate": { "x": 0, - "y": 0, + "y": -57, "z": 0 } }, @@ -192,7 +154,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -229,7 +191,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -247,7 +209,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -274,7 +236,7 @@ "rotation": { "yAxis": { "min": 0, - "max": 0, + "max": 360, "interval": 90, "enabled": true }, @@ -294,47 +256,13 @@ } }, { - "chance": 2.0E-7, - "edit": [ - { - "find": [{"block": "orange_terracotta"}], - "replace": {"palette": [{"block": "pink_concrete"}]} - }, - { - "find": [{"block": "red_terracotta"}], - "replace": {"palette": [{"block": "pink_wool"}]} - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "mode": "MIN_HEIGHT", "place": [ - "void/void", - "void/void", - "void/void", - "trees/mixed/smoakog80" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "place": [ - "trees/oak/truegeneric1", - "trees/oak/truegeneric3", - "trees/oak/truegeneric3", - "trees/oak/truegeneric4", - "trees/oak/truegeneric5", - "trees/oak/truegeneric6" + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" ], "chance": 0.07, "rotation": { @@ -342,7 +270,7 @@ "yAxis": { "enabled": true, "interval": 90, - "min": -360, + "min": 0, "max": 360 } } @@ -362,16 +290,104 @@ "yAxis": { "enabled": true, "interval": 90, - "min": -360, + "min": 0, "max": 360 } } + }, + { + "place": [ + "clutter/statue-villager-plains" + ], + "chance": 0.008, + "mode": "MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": 0, + "max": 360 + } + } + }, + { + "place": [ + "structures/ruins-greek-temple" + ], + "chance": 0.0005, + "mode": "VACUUM", + "translate": { + "y": -4 + }, + "rotation": { + "enabled": true, + "yAxis": { + "interval": 90, + "min": 0, + "max": 360, + "enabled": true + } + }, + "edit": [ + { + "find": [ + { + "block": "gold_block" + } + ], + "replace": { + "palette": [ + { + "block": "chest", + "weight": 1 + }, + { + "block": "dirt", + "weight": 5 + } + ] + }, + "chance": 1 + } + ] + } + ], + "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 + }, + { + "entity": "horse", + "minSpawns": 2, + "maxSpawns": 5, + "rarity": 120 } ], "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "biomeZoom": 60 + ]} } diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/plateau.json similarity index 96% rename from biomes/temperate/tem-plateau.json rename to biomes/temperate/plateau.json index 7bb7e808..6cd2aee4 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/plateau.json @@ -1,11 +1,11 @@ { "name": "Temperate Plateau", "derivative": "DEEP_LUKEWARM_OCEAN", - "rarity": 2, + "rarity": 4, "color": "#929F60", "vanillaDerivative": "FOREST", "customDerivitives": [{ - "id": "templateau", + "id": "plateau", "foliageColor": "#44A528", "waterColor": "#2883A5", "grassColor": "#28A54A", @@ -187,10 +187,7 @@ }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "oak_leaves"}]} } ], "place": [ @@ -306,10 +303,7 @@ "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [ - { - "block": "oak_leaves", - "data": {"persistent": true} - }, + {"block": "oak_leaves"}, {"block": "rose_bush"}, {"block": "cobblestone_slab"} ] diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json similarity index 97% rename from biomes/temperate/tem-sakura-pink-child.json rename to biomes/temperate/sakura-pink-child.json index 45af0f62..b9c663d5 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/sakura-pink-child.json @@ -1,11 +1,11 @@ { "name": "Temperate Sakura Child Forest", - "rarity": 1, + "rarity": 4, "color": "#EE96F4", "derivative": "FLOWER_FOREST", "vanillaDerivative": "FOREST", "customDerivitives": [{ - "id": "temsakurapinkchild", + "id": "sakura_child_forest", "foliageColor": "#AE42C9", "waterColor": "#A5FFED", "grassColor": "#83FF6C", @@ -210,10 +210,7 @@ "chance": 0.03, "variance": {"style": "STATIC"}, "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "oak_leaves"}] }, { "chance": 0.02, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json similarity index 96% rename from biomes/temperate/tem-sakura-pink-forest.json rename to biomes/temperate/sakura-pink-forest.json index c06a347c..b6818a14 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -1,17 +1,17 @@ { "name": "Temperate Sakura Pink Forest", "derivative": "FLOWER_FOREST", - "rarity": 2, + "rarity": 4, "color": "#DF4FE8", "vanillaDerivative": "FOREST", - "children": ["temperate/tem-sakura-pink-child"], + "children": ["temperate/sakura-pink-child"], "childStyle": { "style": "IRIS", "zoom": 0.3, "multiplier": 4 }, "customDerivitives": [{ - "id": "temsakurapink", + "id": "sakura_pink", "foliageColor": "#FFADF0", "waterColor": "#A5FFED", "grassColor": "#A8FF98", @@ -218,10 +218,7 @@ "chance": 0.03, "variance": {"style": "STATIC"}, "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }] + "palette": [{"block": "oak_leaves"}] }, { "chance": 0.02, diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/temperate/sea/ocean-deep.json similarity index 100% rename from biomes/ocean/oce-tem-ocean-deep.json rename to biomes/temperate/sea/ocean-deep.json diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/temperate/sea/ocean.json similarity index 100% rename from biomes/ocean/oce-tem-ocean.json rename to biomes/temperate/sea/ocean.json diff --git a/biomes/ocean/oce-tem-river.json b/biomes/temperate/sea/river.json similarity index 100% rename from biomes/ocean/oce-tem-river.json rename to biomes/temperate/sea/river.json diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/shore/beach.json similarity index 86% rename from biomes/temperate/tem-beach.json rename to biomes/temperate/shore/beach.json index 02c8d747..1962aad6 100644 --- a/biomes/temperate/tem-beach.json +++ b/biomes/temperate/shore/beach.json @@ -50,14 +50,24 @@ { "partOf": "SHORE_LINE", "chance": 0.09, - "verticalZoom": 0.2, - "variance": {"style": "SIMPLEX"}, - "stackMax": 2, "stackMin": 1, - "zoom": 5, + "stackMax": 4, "palette": [{"block": "sugar_cane"}], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "STATIC"} + "style": { + "style": "IRIS", + "zoom": 0.65 + }, + "heightVariance": { + "style": "STATIC" + } + } + ], + "entityInitialSpawns": [ + { + "entity": "turtle", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 80 } ], "objects": [{ diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/shore/oak-beach.json similarity index 100% rename from biomes/temperate/tem-oak-beach.json rename to biomes/temperate/shore/oak-beach.json diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/stranged-plains.json similarity index 91% rename from biomes/temperate/tem-stranged-plains.json rename to biomes/temperate/stranged-plains.json index 6db26b84..3990cc0e 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/stranged-plains.json @@ -1,6 +1,6 @@ { "name": "Stranged Plains", - "rarity": 1, + "rarity": 5, "color": "#F7F448", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", @@ -10,15 +10,15 @@ "exponent": 2 }, "customDerivitives": [{ - "id": "pemstrangeplains", - "foliageColor": "#65A528", - "waterColor": "#2873A5", - "grassColor": "#B8D92B", - "category": "forest" + "id": "estrangedplains", + "category": "plains", + "humidity": 0.45, + "temperature": 0.875, + "grassColor": "#b9bf4e" }], "generators": [{ "min": 4, - "max": 7, + "max": 10, "generator": "plain" }], "decorators": [ @@ -140,12 +140,12 @@ }, { "place": [ - "trees/oak/truegeneric1", - "trees/oak/truegeneric3", - "trees/oak/truegeneric3", - "trees/oak/truegeneric4", - "trees/oak/truegeneric5", - "trees/oak/truegeneric6" + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" ], "chance": 0.07, "rotation": { @@ -204,8 +204,6 @@ ] } ], - "biomeZoom": 60, - "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} diff --git a/biomes/temperate/tem-oak-hills.json b/biomes/temperate/tem-oak-hills.json deleted file mode 100644 index 100dc7e9..00000000 --- a/biomes/temperate/tem-oak-hills.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "name": "Temperate Oak Hills", - "rarity": 1, - "color": "#B6DF20", - "derivative": "FOREST", - "vanillaDerivative": "FOREST", - "customDerivitives": [{ - "id": "temoakhills", - "foliageColor": "#5CA528", - "waterColor": "#2851A5", - "grassColor": "#51A528", - "category": "forest" - }], - "generators": [ - { - "generator": "smooth-dunes", - "max": 30, - "min": 3 - }, - { - "generator": "small-cliffs", - "min": -17, - "max": 0 - } - ], - "jigsawStructures": [ - { - "rarity": 1700, - "structure": "pillager_outpost" - }, - { - "rarity": 1500, - "structure": "village-temperate" - } - ], - "layers": [ - {"palette": [ - {"block": "grass_block"}, - {"block": "grass_block"}, - {"block": "grass_block"}, - {"block": "podzol"}, - {"block": "coarse_dirt"} - ]}, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [{"block": "dirt"}] - }, - { - "style": {"style": "STATIC"}, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - {"block": "dirt"}, - {"block": "stone"} - ] - } - ], - "wall": {"palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "cobblestone"}, - {"block": "mossy_cobblestone"} - ]}, - "decorators": [ - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.3, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - }, - "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.35, - "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.03, - "palette": [{"block": "tall_grass"}] - }, - { - "chance": 0.5, - "palette": [{"block": "grass"}] - }, - { - "chance": 0.06, - "palette": [{"block": "fern"}] - }, - { - "chance": 0.04, - "palette": [{"block": "red_mushroom"}] - }, - { - "chance": 0.1, - "palette": [{"block": "large_fern"}] - }, - { - "chance": 0.05, - "palette": [{"block": "cobblestone_slab"}] - } - ], - "objects": [ - { - "place": [ - "clutter/boulder1", - "clutter/boulder2", - "clutter/boulder3", - "clutter/boulder4", - "clutter/boulder5", - "clutter/boulder6", - "clutter/boulder7", - "clutter/boulder8", - "clutter/boulder9", - "clutter/boulder10" - ], - "chance": 0.4, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - }, - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - }, - { - "place": [ - "trees/oak/hoakgeneric1", - "trees/oak/hoakgeneric2", - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5" - ], - "chance": 0.5, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - }, - { - "place": [ - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5" - ], - "chance": 0.5, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - }, - { - "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric4" - ], - "chance": 0.5, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - }, - { - "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" - ], - "chance": 0.6, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - } - ] -} diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/tem-plain-hills.json deleted file mode 100644 index 28d46bd0..00000000 --- a/biomes/temperate/tem-plain-hills.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "name": "Temperate Plains Hills", - "derivative": "PLAINS", - "rarity": 1, - "color": "#A4BF40", - "vanillaDerivative": "PLAINS", - "customDerivitives": [{ - "id": "templainhills", - "foliageColor": "#8AA528", - "waterColor": "#284CA5", - "grassColor": "#8AA528", - "category": "forest" - }], - "generators": [ - { - "min": 4, - "max": 7, - "generator": "plain" - }, - { - "generator": "small-cliffs", - "min": -17, - "max": 0 - } - ], - "jigsawStructures": [ - { - "rarity": 1700, - "structure": "pillager_outpost" - }, - { - "rarity": 1500, - "structure": "village-temperate" - } - ], - "layers": [ - {"palette": [{"block": "grass_block"}]}, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [{"block": "dirt"}] - }, - { - "style": {"style": "STATIC"}, - "minHeight": 1, - "maxHeight": 1, - "palette": [ - {"block": "dirt"}, - {"block": "stone"} - ] - } - ], - "wall": {"palette": [ - {"block": "stone"}, - {"block": "andesite"} - ]}, - "decorators": [ - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.3, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - }, - "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.3, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - {"block": "dandelion"}, - {"block": "poppy"}, - {"block": "blue_orchid"}, - {"block": "allium"}, - {"block": "azure_bluet"}, - {"block": "red_tulip"}, - {"block": "orange_tulip"}, - {"block": "white_tulip"}, - {"block": "pink_tulip"}, - {"block": "oxeye_daisy"}, - {"block": "cornflower"}, - {"block": "lily_of_the_valley"} - ] - }, - { - "chance": 0.01, - "palette": [{"block": "tall_grass"}] - }, - { - "chance": 0.5, - "palette": [{"block": "grass"}] - } - ], - "objects": [ - { - "place": [ - "trees/oak/truegeneric1", - "trees/oak/truegeneric3", - "trees/oak/truegeneric3", - "trees/oak/truegeneric4", - "trees/oak/truegeneric5", - "trees/oak/truegeneric6" - ], - "chance": 0.07, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - }, - { - "place": [ - "structures/landstone1", - "structures/landstone2", - "structures/landstone3", - "structures/landstone4", - "structures/landstone5" - ], - "chance": 0.02, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": -360, - "max": 360 - } - } - } - ] -} diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/wilds.json similarity index 98% rename from biomes/temperate/tem-wilds.json rename to biomes/temperate/wilds.json index 09297648..38d9e722 100644 --- a/biomes/temperate/tem-wilds.json +++ b/biomes/temperate/wilds.json @@ -4,9 +4,9 @@ "rarity": 1, "color": "#B6CF68", "vanillaDerivative": "PLAINS", - "children": ["temperate/tem-highlands"], + "children": ["temperate/highlands"], "customDerivitives": [{ - "id": "temwilds", + "id": "wilds", "foliageColor": "#237031", "waterColor": "#236270", "grassColor": "#28A538", diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/bamboo-forest.json similarity index 97% rename from biomes/tropical/tro-bamboo-forest.json rename to biomes/tropical/bamboo-forest.json index db9e790d..57d2da7f 100644 --- a/biomes/tropical/tro-bamboo-forest.json +++ b/biomes/tropical/bamboo-forest.json @@ -4,14 +4,14 @@ "rarity": 1, "color": "#9BFF00", "vanillaDerivative": "BAMBOO_JUNGLE", - "children": ["tropical/tro-wilds"], + "children": ["tropical/wilds"], "generators": [{ "min": 5, "max": 9, "generator": "plain" }], "customDerivitives": [{ - "id": "trobamboo", + "id": "tropical_bamboo_forest", "foliageColor": "#20A52F", "grassColor": "#1E7307", "waterColor": "#3AB2A2", @@ -100,10 +100,7 @@ }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "jungle_leaves"}]} }, { "find": [{"block": "stripped_birch_log"}], diff --git a/biomes/tropical/tro-beach-bamboo.json b/biomes/tropical/beach-bamboo.json similarity index 100% rename from biomes/tropical/tro-beach-bamboo.json rename to biomes/tropical/beach-bamboo.json diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/beach-charred.json similarity index 100% rename from biomes/tropical/tro-beach-charred.json rename to biomes/tropical/beach-charred.json diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/beach.json similarity index 100% rename from biomes/tropical/tro-beach.json rename to biomes/tropical/beach.json diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/highlands.json similarity index 99% rename from biomes/tropical/tro-highlands.json rename to biomes/tropical/highlands.json index 8a82f986..54db83ea 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/highlands.json @@ -10,7 +10,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "trohighlands", + "id": "tropical_highlands", "foliageColor": "#478F04", "grassColor": "#41A726", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-island-beach.json b/biomes/tropical/island-beach.json similarity index 100% rename from biomes/tropical/tro-island-beach.json rename to biomes/tropical/island-beach.json diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/jungle-denmyre.json similarity index 88% rename from biomes/tropical/tro-jungle-denmyre.json rename to biomes/tropical/jungle-denmyre.json index a5afd010..68a75ce1 100644 --- a/biomes/tropical/tro-jungle-denmyre.json +++ b/biomes/tropical/jungle-denmyre.json @@ -106,10 +106,7 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "jungle_leaves"}]} }, { "find": [{"block": "acacia_fence"}], @@ -149,24 +146,15 @@ "edit": [ { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "jungle_leaves"}]} }, { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "jungle_leaves"}]} }, { "find": [{"block": "spruce_wood"}], - "replace": {"palette": [{ - "block": "jungle_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "jungle_leaves"}]} } ], "density": 2, diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/mountain-extreme.json similarity index 90% rename from biomes/tropical/tro-mountain-extreme.json rename to biomes/tropical/mountain-extreme.json index 3b0a7fcb..8b9df0d0 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/mountain-extreme.json @@ -4,14 +4,14 @@ "rarity": 1, "color": "#838F70", "vanillaDerivative": "MODIFIED_JUNGLE", - "children": ["tropical/tro-mountain-water"], + "children": ["tropical/mountain-water"], "generators": [{ "generator": "mountain", "max": 190, "min": 85 }], "customDerivitives": [{ - "id": "tromtnextreme", + "id": "tropical_mountain_extreme", "foliageColor": "#478F04", "grassColor": "#41A726", "waterColor": "#3AB2A2", @@ -100,21 +100,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/mountain-middle.json similarity index 97% rename from biomes/tropical/tro-mountain-middle.json rename to biomes/tropical/mountain-middle.json index 2b2c9707..83a1341c 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/mountain-middle.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#39FF00", "vanillaDerivative": "JUNGLE_HILLS", - "children": ["tropical/tro-plains"], + "children": ["tropical/plains"], "generators": [ { "generator": "mountain", @@ -18,7 +18,7 @@ } ], "customDerivitives": [{ - "id": "tromtnmiddle", + "id": "tropical_mountain_middle", "foliageColor": "#478F04", "grassColor": "#41A726", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/mountain-plains.json similarity index 91% rename from biomes/tropical/tro-mountain-plains.json rename to biomes/tropical/mountain-plains.json index 7d5694a4..813714d0 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/mountain-plains.json @@ -10,7 +10,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "tromtnplains", + "id": "tropical_mountain_plains", "foliageColor": "#258F04", "grassColor": "#41A726", "category": "jungle", @@ -113,21 +113,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", diff --git a/biomes/tropical/tro-mountain-water.json b/biomes/tropical/mountain-water.json similarity index 98% rename from biomes/tropical/tro-mountain-water.json rename to biomes/tropical/mountain-water.json index 0661d687..8e89ab3b 100644 --- a/biomes/tropical/tro-mountain-water.json +++ b/biomes/tropical/mountain-water.json @@ -9,7 +9,7 @@ "min": 2 }], "customDerivitives": [{ - "id": "trowater", + "id": "tropical_mountain_water", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" }], diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/mountain.json similarity index 98% rename from biomes/tropical/tro-mountain.json rename to biomes/tropical/mountain.json index 66079295..9dd7eb3e 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/mountain.json @@ -4,14 +4,14 @@ "rarity": 1, "color": "#2057DF", "vanillaDerivative": "JUNGLE_HILLS", - "children": ["tropical/tro-mountain-middle"], + "children": ["tropical/mountain-middle"], "generators": [{ "min": 75, "max": 150, "generator": "mountain" }], "customDerivitives": [{ - "id": "tromountain", + "id": "tropical_mountain", "foliageColor": "#478F04", "grassColor": "#41A726", "category": "jungle", diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/plains-hills.json similarity index 99% rename from biomes/tropical/tro-plains-hills.json rename to biomes/tropical/plains-hills.json index 8d18237d..3265c2f7 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/plains-hills.json @@ -10,7 +10,7 @@ "min": -10 }], "customDerivitives": [{ - "id": "troplainshills", + "id": "tropical_plains_hills", "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/plains.json similarity index 98% rename from biomes/tropical/tro-plains.json rename to biomes/tropical/plains.json index cf7098c5..4a0b3c09 100644 --- a/biomes/tropical/tro-plains.json +++ b/biomes/tropical/plains.json @@ -4,14 +4,14 @@ "rarity": 1, "color": "#5EBF40", "vanillaDerivative": "JUNGLE", - "children": ["tropical/tro-plains-hills"], + "children": ["tropical/plains-hills"], "generators": [{ "generator": "smooth-dunes", "max": 20, "min": -10 }], "customDerivitives": [{ - "id": "troplain", + "id": "tropical_plains", "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/rainforest-hills.json similarity index 88% rename from biomes/tropical/tro-rainforest-hills.json rename to biomes/tropical/rainforest-hills.json index c45654d4..e8489001 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/rainforest-hills.json @@ -10,7 +10,7 @@ "generator": "plain-cliffs" }], "customDerivitives": [{ - "id": "trohills", + "id": "tropical_raionforest_hills", "foliageColor": "#258F04", "grassColor": "#41A726", "category": "jungle", @@ -37,10 +37,7 @@ "zoom": 0.35, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -79,21 +76,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", @@ -266,20 +254,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/rainforest-island.json similarity index 88% rename from biomes/tropical/tro-rainforest-island.json rename to biomes/tropical/rainforest-island.json index 777833f2..7e29786c 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/rainforest-island.json @@ -10,7 +10,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "troisle", + "id": "tropical_rainforest_island", "foliageColor": "#258F04", "grassColor": "#3FE727", "category": "jungle", @@ -23,10 +23,7 @@ "zoom": 0.6, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -70,21 +67,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", @@ -266,20 +254,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json similarity index 88% rename from biomes/tropical/tro-rainforest-wicked-child.json rename to biomes/tropical/rainforest-wicked-child.json index 0c54a722..ff09d9d7 100644 --- a/biomes/tropical/tro-rainforest-wicked-child.json +++ b/biomes/tropical/rainforest-wicked-child.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "trowkdchild", + "id": "tropical_rainforest_wicked_child", "foliageColor": "#478F04", "grassColor": "#197300", "category": "jungle", @@ -23,10 +23,7 @@ "zoom": 0.6, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -79,21 +76,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", @@ -275,20 +263,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/tropical/tro-rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json similarity index 84% rename from biomes/tropical/tro-rainforest-wicked-village.json rename to biomes/tropical/rainforest-wicked-village.json index 8c000515..7889f825 100644 --- a/biomes/tropical/tro-rainforest-wicked-village.json +++ b/biomes/tropical/rainforest-wicked-village.json @@ -10,7 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ - "id": "trowkdvilla", + "id": "tropical_rainforest_wicked_village", "foliageColor": "#478F04", "grassColor": "#197300", "category": "jungle", @@ -23,10 +23,7 @@ "zoom": 0.6, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -103,20 +100,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json similarity index 87% rename from biomes/tropical/tro-rainforest-wicked.json rename to biomes/tropical/rainforest-wicked.json index 758119b6..f0515857 100644 --- a/biomes/tropical/tro-rainforest-wicked.json +++ b/biomes/tropical/rainforest-wicked.json @@ -5,12 +5,12 @@ "color": "#10EF15", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "children": [ - "tropical/tro-rainforest-hills", - "tropical/tro-jungle-denmyre", - "tropical/tro-rainforest-wicked-child" + "tropical/rainforest-hills", + "tropical/jungle-denmyre", + "tropical/rainforest-wicked-child" ], "customDerivitives": [{ - "id": "trowkd", + "id": "tropical_rainforest_wicked", "foliageColor": "#478F04", "grassColor": "#197300", "category": "jungle", @@ -28,10 +28,7 @@ "zoom": 0.6, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -70,21 +67,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", @@ -266,20 +254,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/rainforest.json similarity index 88% rename from biomes/tropical/tro-rainforest.json rename to biomes/tropical/rainforest.json index 8b40a6ff..883be300 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/rainforest.json @@ -5,8 +5,8 @@ "rarity": 1, "color": "#20DF24", "children": [ - "tropical/tro-rainforest-hills", - "tropical/tro-jungle-denmyre" + "tropical/rainforest-hills", + "tropical/jungle-denmyre" ], "generators": [{ "min": 20, @@ -14,7 +14,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "trorainforest", + "id": "tropical_rainforest", "foliageColor": "#258F04", "grassColor": "#2DAF09", "waterColor": "#3AB2A2", @@ -27,10 +27,7 @@ "zoom": 0.6, "palette": [ {"block": "grass_block"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, { "weight": 2, "block": "grass_block" @@ -69,21 +66,12 @@ "variance": {"style": "IRIS"}, "zoom": 0.1, "palette": [ - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "tall_grass"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "grass"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - } + {"block": "jungle_leaves"} ], "style": { "style": "FRACTAL_BILLOW_IRIS", @@ -277,20 +265,11 @@ "zoom": 0.1, "palette": [ {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"}, - { - "data": {"persistent": true}, - "block": "jungle_leaves" - }, + {"block": "jungle_leaves"}, {"block": "stripped_jungle_wood"} ] } diff --git a/biomes/ocean/oce-tro-coral-ocean-cliffs.json b/biomes/tropical/sea/coral-ocean-cliffs.json similarity index 99% rename from biomes/ocean/oce-tro-coral-ocean-cliffs.json rename to biomes/tropical/sea/coral-ocean-cliffs.json index 09582ce4..84599237 100644 --- a/biomes/ocean/oce-tro-coral-ocean-cliffs.json +++ b/biomes/tropical/sea/coral-ocean-cliffs.json @@ -3,7 +3,7 @@ "derivative": "LUKEWARM_OCEAN", "vanillaDerivative": "LUKEWARM_OCEAN", "color": "#29449F", - "children": ["ocean/oce-tro-coral-ocean"], + "children": ["tropical/sea/coral-ocean"], "generators": [{ "min": -51, "max": -37, diff --git a/biomes/ocean/oce-tro-coral-ocean.json b/biomes/tropical/sea/coral-ocean.json similarity index 100% rename from biomes/ocean/oce-tro-coral-ocean.json rename to biomes/tropical/sea/coral-ocean.json diff --git a/biomes/ocean/oce-tro-ocean.json b/biomes/tropical/sea/ocean.json similarity index 98% rename from biomes/ocean/oce-tro-ocean.json rename to biomes/tropical/sea/ocean.json index bef752c1..f1f882bb 100644 --- a/biomes/ocean/oce-tro-ocean.json +++ b/biomes/tropical/sea/ocean.json @@ -4,8 +4,8 @@ "color": "#182960", "vanillaDerivative": "WARM_OCEAN", "children": [ - "ocean/oce-tro-coral-ocean", - "ocean/oce-tro-coral-ocean-cliffs" + "tropical/sea/coral-ocean", + "tropical/sea/coral-ocean-cliffs" ], "generators": [{ "min": -38, diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/tropical/sea/river-soft.json similarity index 100% rename from biomes/ocean/oce-tro-river-soft.json rename to biomes/tropical/sea/river-soft.json diff --git a/biomes/ocean/oce-tro-river-steep.json b/biomes/tropical/sea/river-steep.json similarity index 98% rename from biomes/ocean/oce-tro-river-steep.json rename to biomes/tropical/sea/river-steep.json index d998a9cd..5a812e47 100644 --- a/biomes/ocean/oce-tro-river-steep.json +++ b/biomes/tropical/sea/river-steep.json @@ -91,7 +91,7 @@ ] }, { - "place": ["landform/underwater/ellipsoid-1"], + "place": ["clutter/ellipsoid1"], "chance": 0.5, "underwater": true, "mode": "CENTER_HEIGHT", diff --git a/biomes/tropical/tro-submerged-volcanic.json b/biomes/tropical/submerged-volcanic.json similarity index 100% rename from biomes/tropical/tro-submerged-volcanic.json rename to biomes/tropical/submerged-volcanic.json diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json deleted file mode 100644 index ff10b0a6..00000000 --- a/biomes/tropical/tro-wilds.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "name": "Tropical Wilds", - "derivative": "JUNGLE", - "vanillaDerivative": "JUNGLE", - "rarity": 1, - "color": "#708F70", - "children": ["tropical/tro-highlands"], - "generators": [{ - "min": 10, - "max": 20, - "generator": "mountain" - }], - "customDerivitives": [{ - "id": "trowilds", - "foliageColor": "#2C8806", - "grassColor": "#183F0E", - "waterColor": "#11BA89", - "waterFogColor": "#11BA89", - "category": "jungle" - }], - "layers": [ - {"palette": [{"block": "grass_block"}]}, - {"palette": [{"block": "dirt"}]}, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - {"block": "dirt"}, - {"block": "coarse_dirt"} - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": {"style": "STATIC"}, - "palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "stone"} - ] - } - ], - "jigsawStructures": [ - { - "rarity": 1700, - "structure": "pillager_outpost" - }, - { - "rarity": 1000, - "structure": "village-tundra" - }, - { - "rarity": 1200, - "structure": "jungle-pyramid" - } - ], - "decorators": [ - { - "chance": 0.22, - "palette": [{"block": "tall_grass"}] - }, - { - "chance": 0.42, - "palette": [ - {"block": "grass"}, - {"block": "fern"} - ] - }, - { - "chance": 0.003, - "palette": [ - {"block": "oxeye_daisy"}, - {"block": "pink_tulip"}, - {"block": "lily_of_the_valley"} - ] - }, - { - "chance": 0.02, - "palette": [ - {"block": "dandelion"}, - {"block": "poppy"}, - {"block": "rose_bush"} - ] - }, - { - "chance": 0.01, - "variance": {"style": "IRIS"}, - "zoom": 0.5, - "palette": [{ - "data": {"age": 7}, - "block": "potatoes" - }], - "style": {"style": "IRIS"} - }, - { - "chance": 0.01, - "variance": {"style": "IRIS"}, - "zoom": 0.5, - "palette": [{ - "data": {"age": 7}, - "block": "carrots" - }], - "style": {"style": "IRIS"} - }, - { - "chance": 0.01, - "variance": {"style": "IRIS"}, - "zoom": 0.5, - "palette": [{ - "data": {"age": 7}, - "block": "beetroots" - }], - "style": {"style": "IRIS"} - } - ], - "effects": [{ - "interval": 250, - "chance": 5, - "particleEffect": "TOTEM", - "particleOffset": 2, - "particleAltY": 0.2, - "particleCount": 5 - }], - "objects": [ - { - "chance": 0.125, - "place": [ - "clutter/oakshrub1", - "clutter/oakshrub2", - "clutter/oakshrub3" - ], - "translate": {"y": -1} - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/camp1", - "clutter/bincluster1" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "biomeZoom": 40, - "biomeStyle": {"style": "IRIS"}, - "wall": { - "style": {"style": "STATIC"}, - "palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "stone"} - ] - }, - "biomeScatter": ["JUNGLE"] -} diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/volcanic-plains.json similarity index 96% rename from biomes/tropical/tro-volcanic-plains.json rename to biomes/tropical/volcanic-plains.json index 9faad996..9a4c9df8 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/volcanic-plains.json @@ -4,14 +4,14 @@ "rarity": 1, "color": "#40BF43", "vanillaDerivative": "THE_VOID", - "children": ["tropical/tro-volcanoes"], + "children": ["tropical/volcanoes"], "generators": [{ "min": 120, "max": 190, "generator": "mountain" }], "customDerivitives": [{ - "id": "trovolcanoplains", + "id": "tropical_volcanic_plains", "grassColor": "#9BC20D", "foliageColor": "#9CD320", "fogColor": "#DD793C", diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json similarity index 96% rename from biomes/tropical/tro-volcanoes-lava.json rename to biomes/tropical/volcanoes-lava.json index 703d0a4f..3cd864da 100644 --- a/biomes/tropical/tro-volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -5,7 +5,7 @@ "rarity": 1, "color": "#50AF52", "customDerivitives": [{ - "id": "trovolcanolava", + "id": "tropical_volcanic_lava", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", "fogColor": "#DD793C", diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/volcanoes.json similarity index 94% rename from biomes/tropical/tro-volcanoes.json rename to biomes/tropical/volcanoes.json index 41c00915..f601ec47 100644 --- a/biomes/tropical/tro-volcanoes.json +++ b/biomes/tropical/volcanoes.json @@ -5,13 +5,13 @@ "rarity": 1, "color": "#609F61", "customDerivitives": [{ - "id": "trovolcanolava", + "id": "tropical_volcano", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", "fogColor": "#DD793C", "downfallType": "none" }], - "children": ["tropical/tro-volcanoes-lava"], + "children": ["tropical/volcanoes-lava"], "generators": [ { "generator": "mountain", diff --git a/biomes/tropical/wilds.json b/biomes/tropical/wilds.json new file mode 100644 index 00000000..7e72a709 --- /dev/null +++ b/biomes/tropical/wilds.json @@ -0,0 +1,336 @@ +{ + "name": "Tropical Wilds", + "derivative": "JUNGLE", + "vanillaDerivative": "JUNGLE", + "rarity": 1, + "color": "#708F70", + "children": ["tropical/highlands"], + "generators": [{ + "min": 10, + "max": 20, + "generator": "mountain" + }], + "customDerivitives": [{ + "id": "tropical_wilds", + "foliageColor": "#2C8806", + "grassColor": "#183F0E", + "waterColor": "#11BA89", + "waterFogColor": "#11BA89", + "category": "jungle" + }], + "layers": [ + {"palette": [{"block": "grass_block"}]}, + {"palette": [{"block": "dirt"}]}, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + {"block": "dirt"}, + {"block": "coarse_dirt"} + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": {"style": "STATIC"}, + "palette": [ + {"block": "stone"}, + {"block": "andesite"}, + {"block": "stone"} + ] + } + ], + "jigsawStructures": [ + { + "rarity": 1700, + "structure": "pillager_outpost" + }, + { + "rarity": 1000, + "structure": "village-tundra" + }, + { + "rarity": 1200, + "structure": "jungle-pyramid" + } + ], + "decorators": [ + { + "chance": 0.22, + "palette": [{"block": "tall_grass"}] + }, + { + "chance": 0.42, + "palette": [ + {"block": "grass"}, + {"block": "fern"} + ] + }, + { + "chance": 0.003, + "palette": [ + {"block": "oxeye_daisy"}, + {"block": "pink_tulip"}, + {"block": "lily_of_the_valley"} + ] + }, + { + "chance": 0.02, + "palette": [ + {"block": "dandelion"}, + {"block": "poppy"}, + {"block": "rose_bush"} + ] + }, + { + "chance": 0.01, + "variance": {"style": "IRIS"}, + "zoom": 0.5, + "palette": [{ + "data": {"age": 7}, + "block": "potatoes" + }], + "style": {"style": "IRIS"} + }, + { + "chance": 0.01, + "variance": {"style": "IRIS"}, + "zoom": 0.5, + "palette": [{ + "data": {"age": 7}, + "block": "carrots" + }], + "style": {"style": "IRIS"} + }, + { + "chance": 0.01, + "variance": {"style": "IRIS"}, + "zoom": 0.5, + "palette": [{ + "data": {"age": 7}, + "block": "beetroots" + }], + "style": {"style": "IRIS"} + } + ], + "effects": [{ + "interval": 250, + "chance": 5, + "particleEffect": "TOTEM", + "particleOffset": 2, + "particleAltY": 0.2, + "particleCount": 5 + }], + "objects": [ + { + "chance": 0.125, + "place": [ + "clutter/oakshrub1", + "clutter/oakshrub2", + "clutter/oakshrub3" + ], + "translate": {"y": -1} + }, + { + "chance": 0.001, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.001, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/camp1", + "clutter/bincluster1" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "mode": "PAINT", + "chance": 0.0025, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/bincluster1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.00375, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["clutter/camp1"], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.4, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/jungle/cocogeneric2", + "trees/jungle/cocogeneric3", + "trees/jungle/cocogeneric4", + "trees/jungle/cocogeneric5", + "trees/jungle/lgeneric6", + "trees/jungle/lgeneric7", + "trees/jungle/lgeneric8", + "trees/jungle/lgeneric9", + "trees/jungle/lgeneric1", + "trees/jungle/lgeneric2", + "trees/jungle/lgeneric3" + ], + "translate": { + "x": 0, + "y": -5, + "z": 0 + } + }, + { + "chance": 0.45, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/jungle/sgeneric1", + "trees/jungle/sgeneric2", + "trees/jungle/sgeneric3", + "trees/jungle/sgeneric4" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.06, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/boulder1", + "clutter/boulder2", + "clutter/boulder4", + "clutter/boulder5", + "clutter/boulder6", + "clutter/boulder7", + "clutter/boulder8" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.01, + "mode": "FAST_MIN_HEIGHT", + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/jungle/largegeneric1", + "trees/jungle/largegeneric2", + "trees/jungle/largegeneric3", + "trees/jungle/largegeneric4", + "trees/jungle/largegeneric5" + ], + "translate": { + "x": 0, + "y": -12, + "z": 0 + } + } + ], + "biomeZoom": 40, + "biomeStyle": {"style": "IRIS"}, + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + {"block": "stone"}, + {"block": "andesite"}, + {"block": "stone"} + ] + }, + "biomeScatter": ["JUNGLE"] +} diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index 5d6ae921..260bffce 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -4,48 +4,50 @@ "rarity": 1, "color": "#23EBA3", "vanillaDerivative": "DARK_FOREST", - "children": ["tundra/tun-redwood-cliffs"], + "children": ["tundra/redwood-cliffs"], "generators": [{ "min": 4, "max": 10, "generator": "smooth-dunes" }], - "customDerivitives": [{ - "grassColor": "#bf4d24", - "id": "autumna", - "category": "forest", - "humidity": 0.3, - "downfallType": "rain", - "temperature": 0.6, - "foliageColor": "#bf2811", - "waterColor": "#80B4C6", - "waterFogColor": "#80B4C6", - "fogColor": "#8091C6" - }, - { - "grassColor": "#BF8924", - "id": "tunautumnb", - "category": "forest", - "humidity": 0.3, - "downfallType": "rain", - "temperature": 0.6, - "foliageColor": "#eb6e07", - "waterColor": "#80B4C6", - "waterFogColor": "#80B4C6", - "fogColor": "#8091C6" - }, - { - "grassColor": "#bf6724", - "id": "autumnc", - "category": "forest", - "humidity": 0.3, - "downfallType": "rain", - "temperature": 0.6, - "foliageColor": "#ebc107", - "waterColor": "#80B4C6", - "waterFogColor": "#80B4C6", - "fogColor": "#8091C6" - }], + "customDerivitives": [ + { + "id": "tundra_autumn_red", + "grassColor": "#bf4d24", + "category": "forest", + "humidity": 0.3, + "downfallType": "rain", + "temperature": 0.6, + "foliageColor": "#bf2811", + "waterColor": "#80B4C6", + "waterFogColor": "#80B4C6", + "fogColor": "#8091C6" + }, + { + "grassColor": "#BF8924", + "id": "tundra_autumn_orange", + "category": "forest", + "humidity": 0.3, + "downfallType": "rain", + "temperature": 0.6, + "foliageColor": "#eb6e07", + "waterColor": "#80B4C6", + "waterFogColor": "#80B4C6", + "fogColor": "#8091C6" + }, + { + "grassColor": "#bf6724", + "id": "tundra_autumn_yellow", + "category": "forest", + "humidity": 0.3, + "downfallType": "rain", + "temperature": 0.6, + "foliageColor": "#ebc107", + "waterColor": "#80B4C6", + "waterFogColor": "#80B4C6", + "fogColor": "#8091C6" + } + ], "biomeStyle": { "style": "STATIC", "zoom": 1 @@ -230,35 +232,19 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - { - "block": "birch_leaves" - }, - { - "block": "spruce_leaves" - } - ], - "exact": false, - "replace": { - "palette": [ - { - "block": "jungle_leaves" - }, - { - "block": "acacia_leaves" - }, - { - "block": "oak_leaves" - }, - { - "block": "dark_oak_leaves" - } - ] - } - } - ], + "edit": [{ + "find": [ + {"block": "birch_leaves"}, + {"block": "spruce_leaves"} + ], + "exact": false, + "replace": {"palette": [ + {"block": "jungle_leaves"}, + {"block": "acacia_leaves"}, + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} + ]} + }], "place": [ "trees/mixed/tredwood1", "trees/mixed/tredwood2", @@ -315,35 +301,19 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - { - "block": "birch_leaves" - }, - { - "block": "spruce_leaves" - } - ], - "exact": false, - "replace": { - "palette": [ - { - "block": "jungle_leaves" - }, - { - "block": "acacia_leaves" - }, - { - "block": "oak_leaves" - }, - { - "block": "dark_oak_leaves" - } - ] - } - } - ], + "edit": [{ + "find": [ + {"block": "birch_leaves"}, + {"block": "spruce_leaves"} + ], + "exact": false, + "replace": {"palette": [ + {"block": "jungle_leaves"}, + {"block": "acacia_leaves"}, + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} + ]} + }], "place": [ "trees/mixed/tredwoodsmol1", "trees/mixed/tredwoodsmol2", @@ -371,35 +341,19 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - { - "block": "birch_leaves" - }, - { - "block": "spruce_leaves" - } - ], - "exact": false, - "replace": { - "palette": [ - { - "block": "jungle_leaves" - }, - { - "block": "acacia_leaves" - }, - { - "block": "oak_leaves" - }, - { - "block": "dark_oak_leaves" - } - ] - } - } - ], + "edit": [{ + "find": [ + {"block": "birch_leaves"}, + {"block": "spruce_leaves"} + ], + "exact": false, + "replace": {"palette": [ + {"block": "jungle_leaves"}, + {"block": "acacia_leaves"}, + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} + ]} + }], "place": [ "clutter/spruceclutt1", "clutter/spruceclutt2", @@ -424,35 +378,19 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - { - "block": "birch_leaves" - }, - { - "block": "spruce_leaves" - } - ], - "exact": false, - "replace": { - "palette": [ - { - "block": "jungle_leaves" - }, - { - "block": "acacia_leaves" - }, - { - "block": "oak_leaves" - }, - { - "block": "dark_oak_leaves" - } - ] - } - } - ], + "edit": [{ + "find": [ + {"block": "birch_leaves"}, + {"block": "spruce_leaves"} + ], + "exact": false, + "replace": {"palette": [ + {"block": "jungle_leaves"}, + {"block": "acacia_leaves"}, + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} + ]} + }], "place": [ "clutter/rshrub1", "clutter/rshrub2" @@ -480,35 +418,19 @@ "trees/mixed/tredwoodbee3", "trees/mixed/tredwoodbee4" ], - "edit": [ - { - "find": [ - { - "block": "birch_leaves" - }, - { - "block": "spruce_leaves" - } - ], - "exact": false, - "replace": { - "palette": [ - { - "block": "jungle_leaves" - }, - { - "block": "acacia_leaves" - }, - { - "block": "oak_leaves" - }, - { - "block": "dark_oak_leaves" - } - ] - } - } - ], + "edit": [{ + "find": [ + {"block": "birch_leaves"}, + {"block": "spruce_leaves"} + ], + "exact": false, + "replace": {"palette": [ + {"block": "jungle_leaves"}, + {"block": "acacia_leaves"}, + {"block": "oak_leaves"}, + {"block": "dark_oak_leaves"} + ]} + }], "translate": { "x": 0, "y": -8, diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/bonsai-forest.json similarity index 95% rename from biomes/tundra/tun-bonsai-forest.json rename to biomes/tundra/bonsai-forest.json index f2532603..e751d8bc 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/bonsai-forest.json @@ -5,8 +5,8 @@ "rarity": 1, "vanillaDerivative": "FLOWER_FOREST", "children": [ - "tundra/tun-sequia-redwoods", - "tundra/tun-redwood-cliffs" + "tundra/sequia-redwoods", + "tundra/redwood-cliffs" ], "generators": [{ "min": 17, @@ -14,8 +14,8 @@ "generator": "plain" }], "customDerivitives": [{ + "id": "tundra_bonsai_forest", "grassColor": "#CB6E08", - "id": "tunbonsai", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -162,11 +162,10 @@ "enabled": true }, "place": [ - "sacred-bonsai/med-1", - "sacred-bonsai/med-2", - "sacred-bonsai/med-3", - "sacred-bonsai/med-4", - "sacred-bonsai/med-5" + "trees/bonsai/med-1", + "trees/bonsai/med-2", + "trees/bonsai/med-3", + "trees/bonsai/med-4" ], "translate": { "x": 0, @@ -204,10 +203,7 @@ "chance": 0.75, "edit": [{ "find": [{"block": "oak_leaves"}], - "replace": {"palette": [{ - "data": {"persistent": true}, - "block": "birch_leaves" - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }], "rotation": { "yAxis": { diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/forest-cliffs.json similarity index 99% rename from biomes/tundra/tun-forest-cliffs.json rename to biomes/tundra/forest-cliffs.json index 69d7f3e0..7789bae6 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -17,8 +17,8 @@ } ], "customDerivitives": [{ + "id": "tundra_forest_cliffs", "grassColor": "#56B16F", - "id": "tunforestcliff", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/forest.json similarity index 98% rename from biomes/tundra/tun-forest.json rename to biomes/tundra/forest.json index 83ac64a5..81ab9d05 100644 --- a/biomes/tundra/tun-forest.json +++ b/biomes/tundra/forest.json @@ -4,15 +4,15 @@ "rarity": 1, "color": "#169864", "vanillaDerivative": "TAIGA_MOUNTAINS", - "children": ["tundra/tun-forest-cliffs"], + "children": ["tundra/forest-cliffs"], "generators": [{ "generator": "smooth-dunes", "max": 14, "min": 8 }], "customDerivitives": [{ + "id": "tundra_forest", "grassColor": "#56B16F", - "id": "tunforest", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" diff --git a/biomes/tundra/tun-magic-forest.json b/biomes/tundra/magic-forest.json similarity index 100% rename from biomes/tundra/tun-magic-forest.json rename to biomes/tundra/magic-forest.json diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json similarity index 99% rename from biomes/tundra/tun-mountains-cliffs.json rename to biomes/tundra/mountains-cliffs.json index 11e60fab..1069b65c 100644 --- a/biomes/tundra/tun-mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -17,8 +17,8 @@ } ], "customDerivitives": [{ + "id": "tundra_magical_forest_cliffs", "grassColor": "#B0A747", - "id": "tunmagicforest", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/mountains.json similarity index 98% rename from biomes/tundra/tun-mountains.json rename to biomes/tundra/mountains.json index 6386d28e..3ea945fc 100644 --- a/biomes/tundra/tun-mountains.json +++ b/biomes/tundra/mountains.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#3AD0B2", "vanillaDerivative": "TAIGA_MOUNTAINS", - "children": ["tundra/tun-mountains-cliffs"], + "children": ["tundra/mountains-cliffs"], "generators": [{ "min": 66, "max": 89, @@ -21,8 +21,8 @@ } ], "customDerivitives": [{ + "id": "tundra_mountains", "grassColor": "#B0A747", - "id": "tunmountain", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json similarity index 98% rename from biomes/tundra/tun-redwood-cliffs.json rename to biomes/tundra/redwood-cliffs.json index a56b1e69..cee44753 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -17,8 +17,8 @@ } ], "customDerivitives": [{ + "id": "tundra_redwood_cliffs", "grassColor": "#A17E3C", - "id": "tunredwoodcliff", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -285,10 +285,7 @@ "chance": 0.45, "edit": [{ "find": [{"block": "oak_leaves"}], - "replace": {"palette": [{ - "data": {"persistent": true}, - "block": "birch_leaves" - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }], "rotation": { "yAxis": { diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/redwood-forest.json similarity index 97% rename from biomes/tundra/tun-redwood-forest.json rename to biomes/tundra/redwood-forest.json index 13e1cdae..4e73b825 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -4,15 +4,15 @@ "rarity": 1, "color": "#23EBA3", "vanillaDerivative": "DARK_FOREST", - "children": ["tundra/tun-redwood-cliffs"], + "children": ["tundra/redwood-cliffs"], "generators": [{ "min": 4, "max": 10, "generator": "smooth-dunes" }], "customDerivitives": [{ + "id": "tundra_redwood_forest", "grassColor": "#AC7B1F", - "id": "tunredwoodfrst", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -246,10 +246,7 @@ "chance": 0.45, "edit": [{ "find": [{"block": "oak_leaves"}], - "replace": {"palette": [{ - "data": {"persistent": true}, - "block": "birch_leaves" - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }], "rotation": { "yAxis": { diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/sea/lake.json similarity index 86% rename from biomes/tundra/tun-lake.json rename to biomes/tundra/sea/lake.json index 62dcf346..bf75d8e9 100644 --- a/biomes/tundra/tun-lake.json +++ b/biomes/tundra/sea/lake.json @@ -10,8 +10,8 @@ "generator": "river" }], "customDerivitives": [{ + "id": "tundra_lake", "grassColor": "#CB6E08", - "id": "tunlake", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -153,24 +153,15 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "acacia_fence"}], - "replace": {"palette": [{ - "block": "spruce_fence", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_fence"}]} }, { "find": [{"block": "acacia_wood"}], - "replace": {"palette": [{ - "block": "spruce_wood", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_wood"}]} } ], "rotation": { @@ -201,24 +192,15 @@ "edit": [ { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "spruce_wood"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} } ], "chance": 0.3, diff --git a/biomes/ocean/oce-tun-river-rocky.json b/biomes/tundra/sea/river-rocky.json similarity index 100% rename from biomes/ocean/oce-tun-river-rocky.json rename to biomes/tundra/sea/river-rocky.json diff --git a/biomes/ocean/oce-tun-river.json b/biomes/tundra/sea/river.json similarity index 98% rename from biomes/ocean/oce-tun-river.json rename to biomes/tundra/sea/river.json index e13188fe..ff2ba2a7 100644 --- a/biomes/ocean/oce-tun-river.json +++ b/biomes/tundra/sea/river.json @@ -3,7 +3,7 @@ "derivative": "COLD_OCEAN", "vanillaDerivative": "RIVER", "color": "#3E31BF", - "children": ["ocean/oce-tun-river-rocky"], + "children": ["tundra/sea/river-rocky"], "generators": [{ "generator": "river", "max": -10, diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json similarity index 99% rename from biomes/tundra/tun-sequia-redwoods.json rename to biomes/tundra/sequia-redwoods.json index 1c80d678..04f87303 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -10,8 +10,8 @@ "generator": "plain" }], "customDerivitives": [{ + "id": "tundra_sequoia_redwoods", "grassColor": "#7BA13C", - "id": "tunseqredwood", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#FFE0AF" diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/shore/beach-stone.json similarity index 100% rename from biomes/tundra/tun-tundra-beach-stone.json rename to biomes/tundra/shore/beach-stone.json diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/shore/beach.json similarity index 91% rename from biomes/tundra/tun-beach.json rename to biomes/tundra/shore/beach.json index 685fc072..935a8832 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/shore/beach.json @@ -69,6 +69,20 @@ } ], "style": {"style": "STATIC"} + }, + { + "partOf": "SHORE_LINE", + "chance": 0.06, + "stackMin": 1, + "stackMax": 4, + "palette": [{"block": "sugar_cane"}], + "style": { + "style": "IRIS", + "zoom": 0.65 + }, + "heightVariance": { + "style": "STATIC" + } } ], "objects": [{ diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json similarity index 86% rename from biomes/tundra/tun-spruce-denmyre.json rename to biomes/tundra/spruce-denmyre.json index d8cfcf90..da60fb9e 100644 --- a/biomes/tundra/tun-spruce-denmyre.json +++ b/biomes/tundra/spruce-denmyre.json @@ -10,8 +10,8 @@ "generator": "plain" }], "customDerivitives": [{ + "id": "tundra_spruce_denmyre", "grassColor": "#7BA13C", - "id": "tundenmyre", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -163,24 +163,15 @@ }, { "find": [{"block": "acacia_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "acacia_fence"}], - "replace": {"palette": [{ - "block": "spruce_fence", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_fence"}]} }, { "find": [{"block": "acacia_wood"}], - "replace": {"palette": [{ - "block": "spruce_wood", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_wood"}]} } ], "rotation": { @@ -211,24 +202,15 @@ "edit": [ { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "spruce_leaves"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} }, { "find": [{"block": "spruce_wood"}], - "replace": {"palette": [{ - "block": "spruce_leaves", - "data": {"persistent": true} - }]} + "replace": {"palette": [{"block": "spruce_leaves"}]} } ], "chance": 0.3, diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/taiga.json similarity index 97% rename from biomes/tundra/tun-taiga.json rename to biomes/tundra/taiga.json index 5eda4d61..39606bb0 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/taiga.json @@ -10,8 +10,8 @@ "generator": "plain" }], "customDerivitives": [{ + "id": "tundra_taiga", "grassColor": "#7BA13C", - "id": "tuntiaga", "waterColor": "#80B4C6", "waterFogColor": "#80B4C6", "fogColor": "#8091C6" @@ -203,10 +203,7 @@ "chance": 0.25, "edit": [{ "find": [{"block": "oak_leaves"}], - "replace": {"palette": [{ - "data": {"persistent": true}, - "block": "birch_leaves" - }]} + "replace": {"palette": [{"block": "birch_leaves"}]} }], "rotation": { "yAxis": { diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 6c6cb96e..2ef3b058 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 2001, "OVERWORLD-VERSION": 3.134, "name": "Overworld", "environment": "NORMAL", @@ -18,12 +18,12 @@ "regions": [ "mushroom", "swamp", - "frozen", - "tundra", "temperate", - "ocean", + "hot", "tropical", - "hot" + "temperate", + "frozen", + "tundra" ], "regionStyle": { "style": "NOWHERE_CELLULAR", @@ -40,9 +40,7 @@ }, "SEAS": "Sea settings (for the biomes that are oceans).", "seaZoom": 1.25, - "seaBiomeStyle": { - "style": "FRACTAL_FBM_IRIS" - }, + "seaBiomeStyle": {"style": "FRACTAL_FBM_IRIS"}, "LAND": "Land settings (for the biomes that are non-ocean).", "landZoom": 3.2, "landBiomeStyle": { @@ -56,13 +54,11 @@ }, "LOOT": "Contains a list of loot tables that are attempted to be applied to all chests that spawn.", "lootTries": 32, - "loot": { - "tables": [ - "global-treasure", - "global-tools", - "global-clutter" - ] - }, + "loot": {"tables": [ + "global-treasure", + "global-tools", + "global-clutter" + ]}, "ORES": "All settings in regards to deposits. Contains the ores spawning in your world.", "deposits": [ { @@ -72,11 +68,7 @@ "minPerChunk": 1, "minSize": 25, "maxSize": 25, - "palette": [ - { - "block": "granite" - } - ], + "palette": [{"block": "granite"}], "varience": 2 }, { @@ -86,11 +78,7 @@ "minPerChunk": 1, "minSize": 25, "maxSize": 25, - "palette": [ - { - "block": "andesite" - } - ], + "palette": [{"block": "andesite"}], "varience": 2 }, { @@ -100,11 +88,7 @@ "minPerChunk": 1, "minSize": 25, "maxSize": 25, - "palette": [ - { - "block": "diorite" - } - ], + "palette": [{"block": "diorite"}], "varience": 2 }, { @@ -114,11 +98,7 @@ "minPerChunk": 1, "minSize": 25, "maxSize": 25, - "palette": [ - { - "block": "gravel" - } - ], + "palette": [{"block": "gravel"}], "varience": 2 }, { @@ -128,11 +108,7 @@ "minPerChunk": 128, "minSize": 8, "maxSize": 4, - "palette": [ - { - "block": "deepslate" - } - ], + "palette": [{"block": "deepslate"}], "varience": 4 }, { @@ -143,30 +119,14 @@ "minSize": 8, "maxSize": 4, "palette": [ - { - "block": "deepslate_copper_ore" - }, - { - "block": "deepslate_diamond_ore" - }, - { - "block": "deepslate_emerald_ore" - }, - { - "block": "deepslate_gold_ore" - }, - { - "block": "deepslate_iron_ore" - }, - { - "block": "deepslate_coal_ore" - }, - { - "block": "deepslate_redstone_ore" - }, - { - "block": "deepslate_lapis_ore" - } + {"block": "deepslate_copper_ore"}, + {"block": "deepslate_diamond_ore"}, + {"block": "deepslate_emerald_ore"}, + {"block": "deepslate_gold_ore"}, + {"block": "deepslate_iron_ore"}, + {"block": "deepslate_coal_ore"}, + {"block": "deepslate_redstone_ore"}, + {"block": "deepslate_lapis_ore"} ], "varience": 4 }, @@ -177,11 +137,7 @@ "minPerChunk": 0, "minSize": 3, "maxSize": 6, - "palette": [ - { - "block": "diamond_ore" - } - ], + "palette": [{"block": "diamond_ore"}], "varience": 5 }, { @@ -191,14 +147,10 @@ "minPerChunk": 3, "minSize": 6, "maxSize": 10, - "palette": [ - { - "data": { - "lit": false - }, - "block": "redstone_ore" - } - ], + "palette": [{ + "data": {"lit": false}, + "block": "redstone_ore" + }], "varience": 7 }, { @@ -208,11 +160,7 @@ "minPerChunk": 1, "minSize": 3, "maxSize": 5, - "palette": [ - { - "block": "gold_ore" - } - ], + "palette": [{"block": "gold_ore"}], "varience": 3 }, { @@ -222,11 +170,7 @@ "minPerChunk": 2, "minSize": 3, "maxSize": 8, - "palette": [ - { - "block": "lapis_ore" - } - ], + "palette": [{"block": "lapis_ore"}], "varience": 5 }, { @@ -236,11 +180,7 @@ "minPerChunk": 8, "minSize": 4, "maxSize": 8, - "palette": [ - { - "block": "iron_ore" - } - ], + "palette": [{"block": "iron_ore"}], "varience": 7 }, { @@ -250,11 +190,7 @@ "minPerChunk": 8, "minSize": 4, "maxSize": 9, - "palette": [ - { - "block": "copper_ore" - } - ], + "palette": [{"block": "copper_ore"}], "varience": 7 }, { @@ -264,11 +200,7 @@ "minPerChunk": 9, "minSize": 6, "maxSize": 10, - "palette": [ - { - "block": "coal_ore" - } - ], + "palette": [{"block": "coal_ore"}], "varience": 9 } ], @@ -339,34 +271,28 @@ }, "fluid": { "fluidHeight": 12, - "fluidType": { - "block": "lava" - } + "fluidType": {"block": "lava"} } } ], - "caveBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, + "caveBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "CAVERNS//CARVING": "Carving layers that cut off certain parts of the world", "carving": true, - "carveLayers": [ - { - "style": { - "style": "PERLIN_IRIS_HALF", - "zoom": 0.2, - "fracture": { - "multiplier": 5, - "style": "PERLIN", - "zoom": 0.5 - } - }, - "fullPercent": 0.01, - "threshold": 0.68, - "minHeight": -50, - "maxHeight": 110 - } - ], + "carveLayers": [{ + "style": { + "style": "PERLIN_IRIS_HALF", + "zoom": 0.2, + "fracture": { + "multiplier": 5, + "style": "PERLIN", + "zoom": 0.5 + } + }, + "fullPercent": 0.01, + "threshold": 0.68, + "minHeight": -50, + "maxHeight": 110 + }], "RAVINES": "Settings regarding ravines. Iris does not know when and where they spawn, so it may look weird (with cave fluids)", "ravines": false, "ravineRarity": 500, @@ -409,12 +335,8 @@ "trigger": "PHANTOM" } ], - "skylandBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "islandBiomeStyle": { - "style": "CELLULAR_IRIS_DOUBLE" - }, + "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, + "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "shoreBiomeStyle": { "style": "CELLULAR", "fracture": { @@ -447,4 +369,4 @@ } } ] -} \ No newline at end of file +} diff --git a/generators/highplains.json b/generators/highplains.json new file mode 100644 index 00000000..d84274fa --- /dev/null +++ b/generators/highplains.json @@ -0,0 +1,19 @@ +{ + "interpolator": { + "function": "BILINEAR_STARCAST_3", + "horizontalScale": 50 + }, + "seed": 377394, + "composite": [{ + "style": { + "style": "IRIS_DOUBLE", + "zoom": 0.87, + "fracture": { + "style": "NOWHERE_SIMPLEX", + "zoom": 1.14 + } + }, + "seed": 474325, + "bezier": true + }] +} diff --git a/generators/rare-hills.json b/generators/rare-hills.json new file mode 100644 index 00000000..db25552e --- /dev/null +++ b/generators/rare-hills.json @@ -0,0 +1,26 @@ +{ + "interpolator": { + "function": "BILINEAR_STARCAST_6", + "horizontalScale": 8 + }, + "seed": 377394, + "composite": [ + { + "style": { + "style": "SIMPLEX_CELLS", + "zoom": 7.55, + "fracture": { + "style": "IRIS", + "zoom": 2.25, + "multiplier": 60 + }, + "exponent": 5.8 + }, + "seed": 928331, + "bezier": false, + "sinCentered": false, + "opacity": 1 + } + ], + "multiplicitive": false +} diff --git a/jigsaw-pieces/igloo/bottom.json b/jigsaw-pieces/igloo/bottom.json index 8e45f1a4..ae4acd74 100644 --- a/jigsaw-pieces/igloo/bottom.json +++ b/jigsaw-pieces/igloo/bottom.json @@ -13,63 +13,5 @@ }, "direction": "WEST_NEGATIVE_X" }], - "placementOptions": { - "overStilt": 0, - "chance": 1, - "meld": false, - "density": 1, - "boreExtendMinY": 0, - "edit": [], - "bottom": false, - "translateCenter": false, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "enabled": true - }, - "boreExtendMaxY": 0, - "smartBore": false, - "waterloggable": false, - "bore": true, - "translate": { - "yRandom": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "mode": "FAST_MAX_HEIGHT", - "carvingSupport": "SURFACE_ONLY", - "snow": 0, - "underwater": false, - "place": [], - "onwater": false, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "warp": { - "multiplier": 1, - "style": "FLAT", - "zoom": 1, - "maxFractureAccuracy": false, - "exponent": 1 - } - }, "object": "jigsaw/igloo/bottom" } diff --git a/jigsaw-pieces/igloo/middle.json b/jigsaw-pieces/igloo/middle.json index 3997b854..96086a51 100644 --- a/jigsaw-pieces/igloo/middle.json +++ b/jigsaw-pieces/igloo/middle.json @@ -16,7 +16,7 @@ }, { "targetName": "*", - "innerConnector": false, + "innerConnector": true, "entityCount": 1, "rotateConnector": false, "name": "", @@ -29,63 +29,5 @@ "direction": "EAST_POSITIVE_X" } ], - "placementOptions": { - "overStilt": 0, - "chance": 1, - "meld": false, - "density": 1, - "boreExtendMinY": 0, - "edit": [], - "bottom": false, - "translateCenter": false, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "enabled": true - }, - "boreExtendMaxY": 0, - "smartBore": false, - "waterloggable": false, - "bore": true, - "translate": { - "yRandom": 0, - "x": 0, - "y": 0, - "z": 0 - }, - "mode": "FAST_MAX_HEIGHT", - "carvingSupport": "SURFACE_ONLY", - "snow": 0, - "underwater": false, - "place": [], - "onwater": false, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "warp": { - "multiplier": 1, - "style": "FLAT", - "zoom": 1, - "maxFractureAccuracy": false, - "exponent": 1 - } - }, "object": "jigsaw/igloo/middle" } diff --git a/objects/clutter/ellipsoid1.iob b/objects/clutter/ellipsoid1.iob new file mode 100644 index 00000000..53f3b2cf Binary files /dev/null and b/objects/clutter/ellipsoid1.iob differ diff --git a/objects/clutter/statue-villager-acacia.iob b/objects/clutter/statue-villager-acacia.iob new file mode 100644 index 00000000..7cf80068 Binary files /dev/null and b/objects/clutter/statue-villager-acacia.iob differ diff --git a/objects/clutter/statue-villager-hell.iob b/objects/clutter/statue-villager-hell.iob new file mode 100644 index 00000000..b72299bc Binary files /dev/null and b/objects/clutter/statue-villager-hell.iob differ diff --git a/objects/clutter/statue-villager-ocean.iob b/objects/clutter/statue-villager-ocean.iob new file mode 100644 index 00000000..21d12b31 Binary files /dev/null and b/objects/clutter/statue-villager-ocean.iob differ diff --git a/objects/clutter/statue-villager-plains.iob b/objects/clutter/statue-villager-plains.iob new file mode 100644 index 00000000..8fad5309 Binary files /dev/null and b/objects/clutter/statue-villager-plains.iob differ diff --git a/objects/structures/ruins-greek-temple.iob b/objects/structures/ruins-greek-temple.iob new file mode 100644 index 00000000..acb4f040 Binary files /dev/null and b/objects/structures/ruins-greek-temple.iob differ diff --git a/objects/trees/oak/generic1.iob b/objects/trees/oak/generic1.iob new file mode 100644 index 00000000..17e7fd6f Binary files /dev/null and b/objects/trees/oak/generic1.iob differ diff --git a/objects/trees/oak/generic2.iob b/objects/trees/oak/generic2.iob new file mode 100644 index 00000000..d008bdaf Binary files /dev/null and b/objects/trees/oak/generic2.iob differ diff --git a/objects/trees/oak/generic3.iob b/objects/trees/oak/generic3.iob new file mode 100644 index 00000000..51b7323e Binary files /dev/null and b/objects/trees/oak/generic3.iob differ diff --git a/objects/trees/oak/generic4.iob b/objects/trees/oak/generic4.iob new file mode 100644 index 00000000..a313dca0 Binary files /dev/null and b/objects/trees/oak/generic4.iob differ diff --git a/objects/trees/oak/generic5.iob b/objects/trees/oak/generic5.iob new file mode 100644 index 00000000..837a6f30 Binary files /dev/null and b/objects/trees/oak/generic5.iob differ diff --git a/objects/trees/oak/generic6.iob b/objects/trees/oak/generic6.iob new file mode 100644 index 00000000..183d5170 Binary files /dev/null and b/objects/trees/oak/generic6.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index 2cd027b8..57094852 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -2,28 +2,28 @@ "name": "Frozen", "color": "#51BFBD", "landBiomes": [ - "frozen/fzn-plains", - "frozen/fzn-pines", - "frozen/fzn-plains", - "frozen/fzn-mountain", - "frozen/fzn-redwood-forest", - "frozen/fzn-hills", - "frozen/fzn-pine-plains", - "frozen/fzn-spruce-plains" + "frozen/plains", + "frozen/pines", + "frozen/plains", + "frozen/mountain", + "frozen/redwood-forest", + "frozen/hills", + "frozen/pine-plains", + "frozen/spruce-plains" ], - "shoreBiomes": ["frozen/fzn-beach"], - "seaBiomes": ["ocean/oce-fzn-river"], + "shoreBiomes": ["frozen/shore/beach"], + "seaBiomes": ["frozen/sea/ocean"], "caveBiomes": [ "cave/ice-cavern", "cave/cracked-cavern" ], - "riverBiomes": ["ocean/oce-fzn-river"], + "riverBiomes": ["frozen/sea/river"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 }], "spotBiomes": [{ - "biome": "frozen/fzn-vander", + "biome": "frozen/vander", "scale": 25, "type": "LAND", "shuffle": 328, diff --git a/regions/hot.json b/regions/hot.json index cec93565..cbec80d4 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -2,22 +2,22 @@ "name": "Hot", "color": "#E7D900", "landBiomes": [ - "hot/hot-desert-dunes", - "hot/hot-desert-dunes-red", - "hot/sav-forest", - "hot/sav-savanna", - "hot/sav-forest", - "hot/sav-plateau", - "hot/sav-acacia-denmyre", - "hot/msa-plateau", - "hot/msa-valleys", - "hot/msa-plateau-high", - "hot/msa-valleys", - "hot/msa-mesa", - "hot/msa-cliffs" + "hot/desert-dunes", + "hot/desert-dunes-red", + "savanna/forest", + "savanna/savanna", + "savanna/forest", + "savanna/plateau", + "savanna/acacia-denmyre", + "mesa/plateau", + "mesa/valleys", + "mesa/plateau-high", + "mesa/valleys", + "mesa/mesa", + "mesa/cliffs" ], - "shoreBiomes": ["hot/hot-beach"], - "seaBiomes": ["ocean/oce-hot-ocean"], + "shoreBiomes": ["hot/shore/beach"], + "seaBiomes": ["hot/sea/ocean"], "caveBiomes": [ "cave/sandy-cave", "cave/sandy-red-cave" @@ -64,7 +64,7 @@ } ], "spotBiomes": [{ - "biome": "hot/hot-oasis", + "biome": "hot/oasis", "scale": 5, "type": "SEA", "shuffle": 328, diff --git a/regions/mushroom.json b/regions/mushroom.json index 46935322..ce2cf201 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -2,18 +2,18 @@ "name": "Mushroom", "color": "#DD86DC", "landBiomes": [ - "mushroom/mus-forest", - "mushroom/mus-crimson-forest", - "mushroom/mus-forest-hills", - "mushroom/mus-plains", - "mushroom/mus-warped-forest" + "mushroom/forest", + "mushroom/crimson-forest", + "mushroom/forest-hills", + "mushroom/plains", + "mushroom/warped-forest" ], - "shoreBiomes": ["mushroom/mus-beach"], + "shoreBiomes": ["mushroom/shore/beach"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 }], - "seaBiomes": ["ocean/oce-mus-ocean"], + "seaBiomes": ["mushroom/sea/ocean"], "caveBiomes": [ "cave/tundra-cavern", "cave/murky-cavern-gleaming", diff --git a/regions/ocean.json b/regions/ocean.json deleted file mode 100644 index f21b060e..00000000 --- a/regions/ocean.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "Ocean", - "color": "#2D329C", - "landBiomes": ["ocean/oce-beach"], - "shoreBiomes": ["temperate/tem-beach"], - "seaBiomes": [ - "ocean/oce-deep", - "ocean/oce-ocean", - "ocean/oce-deep" - ], - "caveBiomes": [ - "cave/spiked-cavern", - "cave/tropical-cavern", - "cave/cavern-coral", - "cave/cavern-root", - "cave/lit-cavern", - "cave/old-cavern", - "cave/cracked-cavern" - ], - "riverBiomes": ["ocean/oce-ocean"], - "biomeImplosionRatio": 0.7, - "loot": {"tables": [ - "beach-clutter", - "global-treasure", - "ocean-clutter", - "tropical-treasure" - ]}, - "entityInitialSpawns": [ - { - "entity": "glowsquid", - "maxSpawns": 2, - "rarity": 40 - }, - { - "entity": "drowned", - "maxSpawns": 2, - "rarity": 45 - } - ], - "rarity": 3, - "effects": [ - { - "particleAltX": 0.001, - "particleAltY": 0.2, - "particleAltZ": 0.001, - "chance": 2, - "particleEffect": "BUBBLE_POP", - "particleOffset": 0, - "interval": 1350, - "particleCount": 0 - }, - { - "particleAltX": 0.001, - "particleAltY": 0.2, - "particleAltZ": 0.001, - "chance": 2, - "particleEffect": "WATER_BUBBLE", - "particleOffset": 0, - "interval": 1350, - "particleCount": 0 - } - ], - "seaBiomeZoom": 20, - "shoreRatio": 0.01, - "shoreHeightMin": 0, - "shoreHeightMax": 1, - "landBiomeZoom": 0.5, - "shoreBiomeZoom": 0.5 -} diff --git a/regions/swamp.json b/regions/swamp.json index c8c1f504..dbbe4af1 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -2,20 +2,20 @@ "name": "Swamp", "color": "#68411E", "landBiomes": [ - "swamp/swa-roofed-forest", - "swamp/swa-willow-forest", - "swamp/swa-lake", - "swamp/swa-roofed-wayward", - "swamp/swa-marsh" + "swamp/roofed-forest", + "swamp/willow-forest", + "swamp/sea/lake", + "swamp/roofed-wayward", + "swamp/marsh" ], - "shoreBiomes": ["swamp/swa-beach"], + "shoreBiomes": ["swamp/shore/beach"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 }], "seaBiomes": [ - "ocean/oce-swa-ocean", - "ocean/oce-swa-ocean-tree" + "swamp/sea/ocean", + "swamp/sea/ocean-tree" ], "caveBiomes": [ "cave/murky-cavern", diff --git a/regions/temperate.json b/regions/temperate.json index 0d52bcb3..7e10c05f 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -2,31 +2,30 @@ "name": "Temperate", "color": "#8BD03C", "landBiomes": [ - "temperate/tem-plateau", - "temperate/tem-flower-forest", - "temperate/tem-stranged-plains", - "temperate/tem-longtree-forest", - "temperate/tem-sakura-pink-forest", - "temperate/tem-oak", - "temperate/tem-plains", - "temperate/tem-oak-forest", - "temperate/tem-wilds", - "temperate/tem-birch-forest" + "temperate/plateau", + "temperate/stranged-plains", + "temperate/longtree-forest", + "temperate/sakura-pink-forest", + "temperate/combo-forest", + "temperate/plains", + "temperate/oak-forest", + "temperate/birch-forest", + "temperate/lush-plains" ], "shoreBiomes": [ - "temperate/tem-beach", - "temperate/tem-oak-beach" + "temperate/shore/beach", + "temperate/shore/oak-beach" ], "seaBiomes": [ - "ocean/oce-tem-river", - "ocean/oce-deep" + "temperate/sea/river", + "ocean/deep" ], "caveBiomes": [ "cave/old-cavern", "cave/cracked-cavern", "cave/lit-cavern" ], - "riverBiomes": ["ocean/oce-tem-river"], + "riverBiomes": ["temperate/sea/river"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 @@ -59,37 +58,37 @@ { "entity": "wolf", "maxSpawns": 2, - "minSpawns": 0, + "minSpawns": 1, "rarity": 18 }, { "entity": "goat", "maxSpawns": 2, - "minSpawns": 0, + "minSpawns": 1, "rarity": 38 }, { "entity": "horse", "maxSpawns": 3, - "minSpawns": 0, + "minSpawns": 1, "rarity": 60 }, { "entity": "llama", "maxSpawns": 3, - "minSpawns": 0, + "minSpawns": 1, "rarity": 65 }, { "entity": "fox", "maxSpawns": 1, - "minSpawns": 0, + "minSpawns": 1, "rarity": 40 }, { "entity": "bee", "maxSpawns": 1, - "minSpawns": 0, + "minSpawns": 1, "rarity": 30 } ], diff --git a/regions/tropical.json b/regions/tropical.json index af526e80..21a9657b 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -2,28 +2,28 @@ "name": "Tropical", "color": "#0F3415", "landBiomes": [ - "tropical/tro-rainforest", - "tropical/tro-plains", - "tropical/tro-bamboo-forest", - "tropical/tro-rainforest-wicked", - "tropical/tro-volcanic-plains", - "tropical/tro-mountain", - "tropical/tro-mountain-extreme", - "tropical/tro-mountain-plains", - "tropical/tro-wilds", - "tropical/tro-plains-hills" + "tropical/rainforest", + "tropical/plains", + "tropical/bamboo-forest", + "tropical/rainforest-wicked", + "tropical/volcanic-plains", + "tropical/mountain", + "tropical/mountain-extreme", + "tropical/mountain-plains", + "tropical/wilds", + "tropical/plains-hills" ], "shoreBiomes": [ - "tropical/tro-island-beach", - "tropical/tro-beach", - "tropical/tro-submerged-volcanic", - "tropical/tro-beach-bamboo" + "tropical/island-beach", + "tropical/beach", + "tropical/submerged-volcanic", + "tropical/beach-bamboo" ], "seaBiomes": [ - "tropical/tro-submerged-volcanic", - "ocean/oce-tro-ocean", - "tropical/tro-rainforest-island", - "ocean/oce-tro-river-soft" + "tropical/submerged-volcanic", + "tropical/sea/ocean", + "tropical/rainforest-island", + "tropical/sea/river-soft" ], "caveBiomes": [ "cave/tropical-cavern", @@ -74,7 +74,7 @@ { "entity": "ocelot", "maxSpawns": 2, - "minSpawns": 0, + "minSpawns": 1, "rarity": 10 }, { diff --git a/regions/tundra.json b/regions/tundra.json index 307c1162..3dab7e06 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -2,27 +2,28 @@ "name": "Tundra", "color": "#3CD0B1", "landBiomes": [ - "tundra/tun-taiga", - "tundra/tun-redwood-forest", - "tundra/tun-sequia-redwoods", - "tundra/tun-magic-forest", - "tundra/tun-forest", - "tundra/tun-spruce-denmyre", - "tundra/tun-lake", - "tundra/tun-mountains", - "tundra/tun-mountains", - "tundra/tun-mountains-cliffs", - "mountain/mtn-mountain", - "mountain/mtn-hills", - "mountain/mtn-forest-hills", - "mountain/mtn-forest", - "mountain/mtn-plains", - "mountain/mtn-cliffs", - "mountain/mtn-mountain", - "tundra/autumn" + "tundra/taiga", + "tundra/redwood-forest", + "tundra/sequia-redwoods", + "tundra/magic-forest", + "tundra/autumn", + "tundra/forest", + "tundra/spruce-denmyre", + "tundra/mountains", + "tundra/mountains", + "tundra/mountains-cliffs", + "mountain/hills", + "mountain/forest-hills", + "mountain/forest", + "mountain/plains", + "mountain/cliffs", + "mountain/mountain" ], - "shoreBiomes": ["tundra/tun-beach"], - "seaBiomes": ["ocean/oce-tun-river"], + "shoreBiomes": [ + "tundra/shore/beach", + "tundra/shore/beach-stone" + ], + "seaBiomes": ["mountain/sea/lake"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 @@ -69,7 +70,12 @@ "rarity": 20 } ], - "riverBiomes": ["ocean/oce-tun-river"], + "riverBiomes": [ + "tundra/sea/river", + "tundra/sea/river-rocky", + "mountain/sea/river", + "mountain/sea/river-soft" + ], "biomeImplosionRatio": 0.25, "deposits": [{ "minHeight": 15,