diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index 6c04ef14..9d3cece3 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -1,4 +1,4 @@ -{ + { "vanillaDerivative": "BIRCH_FOREST", "jigsawStructures": [ { diff --git a/biomes/temperate-bonsai.json b/biomes/temperate-bonsai.json index f18d8161..087d7653 100644 --- a/biomes/temperate-bonsai.json +++ b/biomes/temperate-bonsai.json @@ -3,7 +3,7 @@ "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plains-hills" + "temperate-plain-hills" ], "biomeScatter": [ "FOREST", diff --git a/biomes/temperate-flower-forest-free.json b/biomes/temperate-flower-forest-free.json deleted file mode 100644 index 72792a32..00000000 --- a/biomes/temperate-flower-forest-free.json +++ /dev/null @@ -1,529 +0,0 @@ -{ - "vanillaDerivative": "Flower Forest", - "entityInitialSpawns": [{ - "entity": "cow", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "pig", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "sheep", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 7 - } - ], - "objects": [ - { - "chance": 0.01, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.004, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "sakura/tronco" - ], - "translate": { - "x": 0, - "y": 1, - "z": 0 - } - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.4, - "mode": "PAINT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/stone-clutt-1", - "clutter/stone-clutt-2", - "clutter/stone-clutt-3", - "clutter/stone-clutt-4", - "clutter/stone-clutt-5", - "clutter/stone-clutt-6", - "clutter/stone-clutt-7", - "boulder/boulder1", - "boulder/boulder2", - "boulder/boulder4", - "boulder/boulder5", - "boulder/boulder6", - "boulder/boulder7", - "boulder/boulder8" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.2, - "mode": "PAINT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "rocks/r1", - "rocks/r3" - ], - "translate": { - "x": 0, - "y": 1, - "z": 0 - } - }, - { - "chance": 0.2, - "mode": "PAINT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "rocks/r2", - "rocks/r3", - "rocks/r4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.00036, - "edit": [{ - "find": [{ - "block": "white_wool" - }], - "replace": { - "palette": [{ - "block": "oak_wood" - }] - } - }, - { - "find": [{ - "block": "black_wool" - }], - "replace": { - "palette": [{ - "block": "oak_wood" - }] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "sm-tree/oakw-oakl" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "derivative": "FLOWER_FOREST", - "biomeStyle": { - "style": "IRIS" - }, - "decorators": [{ - "chance": 0.3, - "variance": { - "style": "CELLULAR", - "zoom": 0.3, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10, - "fracture": { - "style": "STATIC", - "multiplier": 15 - } - } - }, - "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.3, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [{ - "block": "dandelion" - }, - { - "weight": 1, - "block": "grass" - }, - { - "block": "poppy" - }, - { - "block": "blue_orchid" - }, - { - "block": "allium" - }, - { - "block": "azure_bluet" - }, - { - "block": "red_tulip" - }, - { - "block": "orange_tulip" - }, - { - "block": "white_tulip" - }, - { - "block": "pink_tulip" - }, - { - "block": "oxeye_daisy" - }, - { - "block": "cornflower" - }, - { - "block": "lily_of_the_valley" - } - ] - }, - { - "chance": 0.1, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "weight": 1, - "block": "grass" - }, - { - "block": "grass" - }, - { - "block": "grass" - }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [{ - "block": "rose_bush" - }], - "style": { - "style": "STATIC" - } - }, - { - "chance": 7, - "block": "grass" - }, { - "block": "dandelion" - }, - { - "block": "poppy" - }, - { - "block": "blue_orchid" - }, - { - "block": "allium" - }, - { - "block": "azure_bluet" - }, - { - "block": "red_tulip" - }, - { - "block": "orange_tulip" - }, - { - "block": "white_tulip" - }, - { - "block": "pink_tulip" - }, - { - "block": "oxeye_daisy" - }, - { - "block": "cornflower" - }, - { - "block": "lily_of_the_valley" - },{ - "block": "dandelion" - }, - { - "block": "poppy" - }, - { - "block": "blue_orchid" - }, - { - "block": "allium" - }, - { - "block": "azure_bluet" - }, - { - "block": "red_tulip" - }, - { - "block": "orange_tulip" - }, - { - "block": "white_tulip" - }, - { - "block": "pink_tulip" - }, - { - "block": "oxeye_daisy" - }, - { - "block": "cornflower" - }, - { - "block": "lily_of_the_valley" - } - ] - }, - { - "chance": 0.04, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "oak_leaves", - "data": { - "persistent": true - } - }] - }, - { - "chance": 0.02, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "tall_grass" - }] - }, - { - "chance": 0.5, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "grass" - }] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "rose_bush" - }] - }, - { - "chance": 0.03, - "variance": { - "style": "STATIC" - }, - "zoom": 0.2, - "palette": [{ - "block": "cobblestone_slab" - }] - } - ], - "name": "Flower Forest free", - "layers": [{ - "style": { - "style": "STATIC" - }, - "zoom": 0.656, - "palette": [{ - "weight": 19, - "block": "grass_block" - }, - { - "block": "gravel" - }, - { - "weight": 26, - "block": "grass_block" - } - ] - }, - { - "palette": [{ - "block": "dirt" - }] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [{ - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [{ - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [{ - "min": 3, - "max": 10, - "generator": "plain" - }], - "loot": { - "tables": [ - "forest-food" - ] - }, - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [{ - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - }, - "biomeScatter": [ - "FLOWER_FOREST" - ], - "rarity": 15 -} \ No newline at end of file diff --git a/biomes/temperate-flower-forest.json b/biomes/temperate-flower-forest.json index 101aa7ce..2683123a 100644 --- a/biomes/temperate-flower-forest.json +++ b/biomes/temperate-flower-forest.json @@ -1,5 +1,5 @@ { - "vanillaDerivative": "Flower Forest", + "vanillaDerivative": "FLOWER_FOREST", "entityInitialSpawns": [{ "entity": "cow", "maxSpawns": 3, @@ -510,19 +510,6 @@ { "block": "grass" }, - { - "chance": 0.8, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [{ - "block": "rose_bush" - }], - "style": { - "style": "STATIC" - } - }, { "chance": 7, "block": "grass" diff --git a/biomes/temperate-lake.json b/biomes/temperate-lake.json deleted file mode 100644 index da965c14..00000000 --- a/biomes/temperate-lake.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "name": "lake", - "derivative": "TAIGA_MOUNTAINS"", - "vanillaDerivative": "PLAINS", - "generators": [ - { - "generator": "plain", - "max": -30, - "min": -40 - } - ], - "decorators": [ - { - "chance": 0.19, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "grass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.02, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "age": 7 - }, - "block": "wheat" - } - ], - "style": { - "style": "IRIS", - "zoom": 0.28 - } - }, - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.3, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10, - "fracture": { - "style": "STATIC", - "multiplier": 15 - } - } - }, - "style": { - "style": "TRIOCTAVE_SIMPLEX", - "zoom": 0.3, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - { - "block": "dandelion" - }, - { - "block": "poppy" - }, - { - "block": "blue_orchid" - }, - { - "block": "allium" - }, - { - "block": "azure_bluet" - }, - { - "block": "red_tulip" - }, - { - "block": "orange_tulip" - }, - { - "block": "white_tulip" - }, - { - "block": "pink_tulip" - }, - { - "block": "oxeye_daisy" - }, - { - "block": "cornflower" - }, - { - "block": "lily_of_the_valley" - } - ] - }, - { - "chance": 0.01, - "palette": [ - { - "block": "tall_grass" - } - ] - }, - { - "chance": 0.5, - "palette": [ - { - "block": "grass" - } - ] - } - ], - "objects": [], - "layers": [ - { - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "pig", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - } - ], - "biomeZoom": 60, - "biomeStyle": { - "style": "IRIS" - }, - "wall": { - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - } - ] - } -} \ No newline at end of file diff --git a/biomes/temperate-plains-hills.json b/biomes/temperate-plain-hills.json similarity index 100% rename from biomes/temperate-plains-hills.json rename to biomes/temperate-plain-hills.json diff --git a/biomes/temperate-plains.json b/biomes/temperate-plains.json index 25067d97..dd15926f 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate-plains.json @@ -3,7 +3,7 @@ "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "children": [ - "temperate-plains-hills" + "temperate-plain-hills" ], "jigsawStructures": [ { diff --git a/biomes/temperate-river-loud.json b/biomes/temperate-river-loud.json deleted file mode 100644 index 94ef2dd0..00000000 --- a/biomes/temperate-river-loud.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "vanillaDerivative": "RIVER", - "decorators": [ - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 5, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 6, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "River Loud", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "zoom": 0.525, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "weight": 2, - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "generator": "plain", - "max": -10, - "min": -30 - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "DEEP_OCEAN" -} \ No newline at end of file diff --git a/biomes/temperate-soft-river.json b/biomes/temperate-soft-river.json deleted file mode 100644 index 747d747d..00000000 --- a/biomes/temperate-soft-river.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "vanillaDerivative": "RIVER", - "decorators": [ - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.07, - "variance": { - "style": "STATIC" - }, - "zoom": 5, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.013, - "verticalZoom": 88, - "variance": { - "style": "STATIC" - }, - "stackMax": 6, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 2 - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "stone-clutt/obelisk-1", - "stone-clutt/obelisk-2", - "stone-clutt/obelisk-3", - "stone-clutt/obelisk-4", - "stone-clutt/obelisk-5", - "stone-clutt/obelisk-6", - "stone-clutt/obelisk-7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "Soft River", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "CELLULAR_IRIS_DOUBLE" - }, - "zoom": 0.525, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "weight": 2, - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "generator": "river", - "max": -40, - "min": -50 - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "derivative": "DEEP_OCEAN" -} \ No newline at end of file diff --git a/regions/temperate.json b/regions/temperate.json index 93fb0c82..01628d9c 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -13,6 +13,7 @@ ], "landBiomes": [ "temperate-plateau", + "temperate-wilds", "temperate-flower-forest", "temperate-longtree-forest", "temperate-oak", @@ -134,7 +135,7 @@ "caveBiomes": [ "temperate-old-cavern", "temperate-cracked-cavern", - "temperate-cracked-cavern" + "temperate-lit-cavern" ], "landBiomeZoom": 1.25, "riverStyle": { @@ -147,10 +148,6 @@ "temperate-oak-beach", "temperate-oak-beach", "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", "temperate-beach", "temperate-oak-beach" ],