Merge pull request #124 from IrisDimensions/CaveRefactor

Merge me daddy

biomes/cave/cracked-cavern.json

@@ -2,7 +2,7 @@
     "name": "Temperate Cracked Cavern",
     "derivative": "PLAINS",
     "vanillaDerivative": "THE_VOID",
-    "children": ["temperate/lit-cavern"],
+    "children": ["cave/lit-cavern"],
     "generators": [{
         "min": 4,
         "max": 6,

biomes/cave/murky-cavern.json

@@ -2,7 +2,7 @@
     "name": "Swamp Murky Cavern",
     "derivative": "SWAMP",
     "vanillaDerivative": "SWAMP",
-    "children": ["swamp/murky-cavern-gleaming"],
+    "children": ["cave/murky-cavern-gleaming"],
     "layers": [{
         "minHeight": 1,
         "maxHeight": 2,

biomes/frozen/fzn-beach.json

@@ -41,7 +41,7 @@
     }],
     "objects": [
         {
-            "chance": 0.01,
+            "chance": 0.003,
             "density": 3,
             "snow": 0.35,
             "rotation": {
@@ -66,7 +66,7 @@
             }
         },
         {
-            "chance": 0.01,
+            "chance": 0.05,
             "density": 3,
             "mode": "FAST_MIN_HEIGHT",
             "snow": 0.35,

biomes/frozen/fzn-hills.json

@@ -51,7 +51,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-mountain-cliffs.json

@@ -41,7 +41,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,
@@ -60,7 +60,7 @@
     ],
     "objects": [
         {
-            "chance": 0.05,
+            "chance": 0.003,
             "mode": "FAST_MIN_HEIGHT",
             "density": 3,
             "snow": 0.35,

biomes/frozen/fzn-mountain-middle.json

@@ -2,7 +2,6 @@
     "name": "Frozen Mountain Middle",
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
-    "children": ["frozen/mountain-cliffs"],
     "generators": [
         {
             "generator": "mountain",
@@ -95,7 +94,7 @@
         "exponent": 0.625,
         "zoom": 1,
         "fracture": {
-            "style": "VIGOCTAVE_SIMPLEX",
+            "style": "SIMPLEX",
             "multiplier": 4,
             "zoom": 0.9
         }

biomes/frozen/fzn-mountain.json

@@ -3,9 +3,9 @@
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
     "children": [
-        "frozen/mountain-middle",
-        "frozen/peak",
-        "frozen/mountain-cliffs"
+        "frozen/fzn-mountain-middle",
+        "frozen/fzn-peak",
+        "frozen/fzn-mountain-cliffs"
     ],
     "layers": [
         {
@@ -61,7 +61,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-mountains.json

@@ -2,7 +2,10 @@
     "name": "Frozen Mountains",
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
-    "children": ["frozen/peak"],
+    "children": [
+        "frozen/fzn-peak",
+        "frozen/fzn-vander"
+    ],
     "layers": [
         {
             "minHeight": 2,
@@ -42,7 +45,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,
@@ -63,7 +66,7 @@
     ],
     "objects": [
         {
-            "chance": 0.05,
+            "chance": 0.003,
             "mode": "FAST_MIN_HEIGHT",
             "density": 3,
             "snow": 0.35,

biomes/frozen/fzn-peak.json

@@ -116,7 +116,7 @@
     }],
     "objects": [
         {
-            "chance": 0.2,
+            "chance": 0.003,
             "mode": "FAST_MIN_HEIGHT",
             "density": 3,
             "snow": 0.35,

biomes/frozen/fzn-pine-hills.json

@@ -44,7 +44,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-pine-plains.json

@@ -2,7 +2,7 @@
     "name": "Frozen Pine Plains",
     "derivative": "SNOWY_TAIGA",
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/pine-hills"],
+    "children": ["frozen/fzn-pine-hills"],
     "generators": [
         {
             "generator": "plain",
@@ -52,7 +52,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-pines.json

@@ -2,7 +2,6 @@
     "name": "Frozen Pines",
     "derivative": "SNOWY_TAIGA",
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/vander"],
     "layers": [
         {
             "minHeight": 0,
@@ -57,7 +56,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,
@@ -94,11 +93,7 @@
                 "ice-spikes/sp-2",
                 "ice-spikes/sp-3",
                 "ice-spikes/sp-4",
-                "ice-spikes/sp-5",
-                "ice-spikes/tp-1",
-                "ice-spikes/tp-2",
-                "ice-spikes/tp-3",
-                "ice-spikes/tp-4"
+                "ice-spikes/sp-5"
             ],
             "translate": {
                 "x": 0,
@@ -139,7 +134,7 @@
             }
         },
         {
-            "chance": 0.05,
+            "chance": 0.06,
             "density": 3,
             "snow": 0.35,
             "rotation": {

biomes/frozen/fzn-plains.json

@@ -2,7 +2,7 @@
     "name": "Frozen Plains",
     "derivative": "SNOWY_TAIGA",
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/hills"],
+    "children": ["frozen/fzn-hills"],
     "generators": [
         {
             "min": 4,
@@ -52,7 +52,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,
@@ -161,11 +161,7 @@
                 "ice-spikes/sp-2",
                 "ice-spikes/sp-3",
                 "ice-spikes/sp-4",
-                "ice-spikes/sp-5",
-                "ice-spikes/tp-1",
-                "ice-spikes/tp-2",
-                "ice-spikes/tp-3",
-                "ice-spikes/tp-4"
+                "ice-spikes/sp-5"
             ],
             "translate": {
                 "x": 0,

biomes/frozen/fzn-redwood-forest.json

@@ -50,7 +50,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,
@@ -87,11 +87,7 @@
                 "ice-spikes/sp-2",
                 "ice-spikes/sp-3",
                 "ice-spikes/sp-4",
-                "ice-spikes/sp-5",
-                "ice-spikes/tp-1",
-                "ice-spikes/tp-2",
-                "ice-spikes/tp-3",
-                "ice-spikes/tp-4"
+                "ice-spikes/sp-5"
             ],
             "translate": {
                 "x": 0,

biomes/frozen/fzn-spruce-hills.json

@@ -44,7 +44,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-spruce-plains.json

@@ -2,7 +2,7 @@
     "name": "Frozen Spruce Plains",
     "derivative": "SNOWY_TAIGA",
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/spruce-hills"],
+    "children": ["frozen/fzn-spruce-hills"],
     "layers": [
         {
             "minHeight": 0,
@@ -40,7 +40,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/frozen/fzn-vander.json

@@ -2,12 +2,6 @@
     "name": "Frozen Vander",
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
-    "children": [
-        "frozen/peak",
-        "frozen/mountains",
-        "frozen/mountains",
-        "frozen/mountains"
-    ],
     "layers": [
         {
             "maxHeight": 3,
@@ -41,7 +35,7 @@
         },
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-beach-grass.json

@@ -2,7 +2,6 @@
     "name": "Hot Beach Grass",
     "derivative": "FOREST",
     "vanillaDerivative": "DESERT_LAKES",
-    "children": ["ocean/ocean"],
     "layers": [
         {
             "minHeight": 1,

biomes/hot/hot-beach.json

@@ -2,7 +2,6 @@
     "name": "Hot Beach",
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "DESERT_LAKES",
-    "children": ["ocean/ocean"],
     "layers": [
         {
             "minHeight": 3,

biomes/hot/hot-desert-dunes-red.json

@@ -30,7 +30,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-desert-dunes.json

@@ -30,7 +30,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-mountain-cliffs.json

@@ -52,7 +52,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-mountain-middle.json

@@ -2,7 +2,7 @@
     "name": "Hot Mountain Middle",
     "derivative": "DESERT",
     "vanillaDerivative": "DESERT",
-    "children": ["hot/cliffs"],
+    "children": ["hot/hot-cliffs"],
     "generators": [
         {
             "generator": "mountain",
@@ -55,7 +55,7 @@
         "exponent": 0.625,
         "zoom": 1,
         "fracture": {
-            "style": "VIGOCTAVE_SIMPLEX",
+            "style": "SIMPLEX",
             "multiplier": 4,
             "zoom": 0.9
         }

biomes/hot/hot-mountain-plains.json

@@ -22,7 +22,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-mountain.json

@@ -2,7 +2,7 @@
     "name": "Hot Mountains",
     "derivative": "DESERT",
     "vanillaDerivative": "DESERT",
-    "children": ["hot/middle"],
+    "children": ["hot/hot-middle"],
     "generators": [{
         "min": 90,
         "max": 140,
@@ -11,7 +11,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1500,

biomes/hot/hot-oasis.json

@@ -7,24 +7,22 @@
         "max": 7,
         "min": -2
     }],
-    "layers": [
-        {
-            "minHeight": 5,
-            "maxHeight": 5,
-            "style": {"style": "FRACTAL_WATER"},
-            "zoom": 0.7,
-            "palette": [
-                {
-                    "weight": 1,
-                    "block": "grass_block"
-                },
-                {
-                    "weight": 1,
-                    "block": "moss_block"
-                }
-            ]
-        }
-    ],
+    "layers": [{
+        "minHeight": 5,
+        "maxHeight": 5,
+        "style": {"style": "FRACTAL_WATER"},
+        "zoom": 0.7,
+        "palette": [
+            {
+                "weight": 1,
+                "block": "grass_block"
+            },
+            {
+                "weight": 1,
+                "block": "moss_block"
+            }
+        ]
+    }],
     "decorators": [
         {
             "verticalZoom": 5,

biomes/mesa/msa-dark.json

@@ -3,10 +3,10 @@
     "derivative": "SHATTERED_SAVANNA",
     "vanillaDerivative": "ERODED_BADLANDS",
     "children": [
-        "mesa/cliffs",
-        "mesa/red",
-        "mesa/green",
-        "mesa/blue"
+        "mesa/msa-cliffs",
+        "mesa/msa-red",
+        "mesa/msa-green",
+        "mesa/msa-blue"
     ],
     "generators": [
         {

biomes/mesa/msa-mesa.json

@@ -8,14 +8,14 @@
         "ERODED_BADLANDS"
     ],
     "children": [
-        "mesa/valleys",
-        "mesa/red",
-        "mesa/blue",
-        "mesa/dark",
-        "mesa/green",
-        "mesa/red",
-        "mesa/yellow",
-        "mesa/blue"
+        "mesa/msa-valleys",
+        "mesa/msa-red",
+        "mesa/msa-blue",
+        "mesa/msa-dark",
+        "mesa/msa-green",
+        "mesa/msa-red",
+        "mesa/msa-yellow",
+        "mesa/msa-blue"
     ],
     "generators": [{
         "min": 25,
@@ -24,7 +24,7 @@
     }],
     "layers": [
         {
-            "style": {"style": "FRACTAL_SMOKE"},
+            "style": {"style": "IRIS"},
             "zoom": 0.6,
             "minHeight": 2,
             "maxHeight": 2,

biomes/mesa/msa-plateau-dirt-high.json

@@ -24,11 +24,7 @@
         {
             "minHeight": 5,
             "maxHeight": 5,
-            "slopeCondition": {
-                "minimumSlope": 0,
-                "maximumSlope": 3
-            },
-            "style": {"style": "CELLULAR"},
+            "style": {"style": "IRIS"},
             "zoom": 0.7,
             "palette": [
                 {"block": "grass_block"},
@@ -39,102 +35,33 @@
         },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "terracotta"}]
         },
         {
             "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "orange_terracotta"}]
         },
         {
             "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "white_terracotta"}]
         },
         {
             "minHeight": 4,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "terracotta"}]
         },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "yellow_terracotta"}]
         },
-        {
-            "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "orange_terracotta"}]
-        },
-        {
-            "minHeight": 5,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "brown_terracotta"}]
-        },
-        {
-            "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "red_terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
         }
     ],
     "lockLayers": true,

biomes/mesa/msa-plateau-dirt.json

@@ -24,10 +24,6 @@
         {
             "minHeight": 5,
             "maxHeight": 5,
-            "slopeCondition": {
-                "minimumSlope": 0,
-                "maximumSlope": 3
-            },
             "style": {"style": "CELLULAR"},
             "zoom": 0.7,
             "palette": [
@@ -39,102 +35,33 @@
         },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "terracotta"}]
         },
         {
             "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "orange_terracotta"}]
         },
         {
             "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "white_terracotta"}]
         },
         {
             "minHeight": 4,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "terracotta"}]
         },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "yellow_terracotta"}]
         },
-        {
-            "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "orange_terracotta"}]
-        },
-        {
-            "minHeight": 5,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
         {
             "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
+            "maxHeight": 8,
             "palette": [{"block": "brown_terracotta"}]
-        },
-        {
-            "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "red_terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
         }
     ],
     "decorators": [{

biomes/mesa/msa-plateau-high.json

@@ -0,0 +1,97 @@
+{
+    "name": "Mesa Plateau High",
+    "derivative": "BADLANDS",
+    "vanillaDerivative": "BADLANDS",
+    "biomeScatter": [
+        "BADLANDS",
+        "BADLANDS_PLATEAU",
+        "ERODED_BADLANDS"
+    ],
+    "children": ["mesa/msa-plateau-dirt-high"],
+    "generators": [
+        {
+            "min": 55,
+            "max": 45,
+            "generator": "canyon-steep"
+        },
+        {
+            "min": 2,
+            "max": 3,
+            "generator": "smooth-dunes"
+        },
+        {
+            "min": 2,
+            "max": 6,
+            "generator": "cracked-cliffs"
+        }
+    ],
+    "layers": [
+        {
+            "minHeight": 5,
+            "maxHeight": 5,
+            "style": {"style": "IRIS"},
+            "zoom": 0.4,
+            "palette": [
+                {"block": "red_terracotta"},
+                {"block": "terracotta"},
+                {"block": "terracotta"},
+                {"block": "terracotta"},
+                {"block": "terracotta"}
+            ]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 8,
+            "palette": [{"block": "terracotta"}]
+        },
+        {
+            "minHeight": 2,
+            "maxHeight": 8,
+            "palette": [{"block": "orange_terracotta"}]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 8,
+            "palette": [{"block": "white_terracotta"}]
+        },
+        {
+            "minHeight": 4,
+            "maxHeight": 8,
+            "palette": [{"block": "terracotta"}]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 8,
+            "palette": [{"block": "yellow_terracotta"}]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 8,
+            "palette": [{"block": "brown_terracotta"}]
+        }
+    ],
+    "lockLayers": true,
+    "decorators": [{
+        "chance": 0.05,
+        "palette": [{"block": "tall_grass"}]
+    }],
+    "biomeStyle": {"style": "IRIS"},
+    "objects": [{
+        "place": [
+            "desert/tower",
+            "desert/tower-twin"
+        ],
+        "chance": 5.0E-4,
+        "density": 2,
+        "mode": "FAST_STILT",
+        "rotation": {
+            "enabled": true,
+            "yAxis": {
+                "enabled": true,
+                "interval": 90,
+                "min": -360,
+                "max": 360
+            }
+        }
+    }]
+}

biomes/mesa/msa-plateau.json

@@ -7,7 +7,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["mesa/plateau-dirt"],
+    "children": ["mesa/msa-plateau-dirt"],
     "generators": [
         {
             "min": 35,

biomes/mesa/msa-valleys.json

@@ -23,17 +23,8 @@
                 "maximumSlope": 2
             },
             "style": {
-                "style": "SIMPLEX",
-                "zoom": 1.4,
-                "fracture": {
-                    "style": "FRACTAL_BILLOW_SIMPLEX",
-                    "zoom": 0.4,
-                    "multiplier": 50,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 3
-                    }
-                }
+                "style": "IRIS",
+                "zoom": 1.4
             },
             "zoom": 0.9,
             "minHeight": 1,
@@ -142,22 +133,18 @@
     ],
     "decorators": [
         {
-            "chance": 0.2,
+            "chance": 0.189,
             "variance": {
                 "style": "CELLULAR",
                 "zoom": 0.3,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
+                "style": "SIMPLEX",
                 "zoom": 0.3,
                 "fracture": {
                     "style": "STATIC",

biomes/mesa/msa-yellow.json

@@ -2,7 +2,7 @@
     "name": "Mesa Yellow",
     "derivative": "SHATTERED_SAVANNA",
     "vanillaDerivative": "BADLANDS",
-    "children": ["mesa/dark"],
+    "children": ["mesa/msa-dark"],
     "generators": [
         {
             "min": 9,

biomes/mesa/plateau-high.json

@@ -1,170 +0,0 @@
-{
-    "name": "Mesa Plateau High",
-    "derivative": "BADLANDS",
-    "vanillaDerivative": "BADLANDS",
-    "biomeScatter": [
-        "BADLANDS",
-        "BADLANDS_PLATEAU",
-        "ERODED_BADLANDS"
-    ],
-    "children": ["mesa/plateau-dirt-high"],
-    "generators": [
-        {
-            "min": 55,
-            "max": 45,
-            "generator": "canyon-steep"
-        },
-        {
-            "min": 2,
-            "max": 3,
-            "generator": "smooth-dunes"
-        },
-        {
-            "min": 2,
-            "max": 6,
-            "generator": "cracked-cliffs"
-        }
-    ],
-    "layers": [
-        {
-            "minHeight": 5,
-            "maxHeight": 5,
-            "slopeCondition": {
-                "minimumSlope": 0,
-                "maximumSlope": 3
-            },
-            "style": {"style": "CELLULAR"},
-            "zoom": 0.4,
-            "palette": [
-                {"block": "red_terracotta"},
-                {"block": "terracotta"},
-                {"block": "terracotta"},
-                {"block": "terracotta"},
-                {"block": "terracotta"}
-            ]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "orange_terracotta"}]
-        },
-        {
-            "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "white_terracotta"}]
-        },
-        {
-            "minHeight": 4,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "yellow_terracotta"}]
-        },
-        {
-            "minHeight": 1,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "orange_terracotta"}]
-        },
-        {
-            "minHeight": 5,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "brown_terracotta"}]
-        },
-        {
-            "minHeight": 2,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "red_terracotta"}]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 10,
-            "slopeCondition": {
-                "minimumSlope": 3,
-                "maximumSlope": 255
-            },
-            "palette": [{"block": "terracotta"}]
-        }
-    ],
-    "lockLayers": true,
-    "decorators": [{
-        "chance": 0.05,
-        "palette": [{"block": "tall_grass"}]
-    }],
-    "biomeStyle": {"style": "IRIS"},
-    "objects": [{
-        "place": [
-            "desert/tower",
-            "desert/tower-twin"
-        ],
-        "chance": 5.0E-4,
-        "density": 2,
-        "mode": "FAST_STILT",
-        "rotation": {
-            "enabled": true,
-            "yAxis": {
-                "enabled": true,
-                "interval": 90,
-                "min": -360,
-                "max": 360
-            }
-        }
-    }]
-}

biomes/mountain/mtn-forest-hills.json

@@ -17,7 +17,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -103,20 +103,16 @@
             "chance": 0.2,
             "variance": {
                 "style": "CELLULAR",
-                "zoom": 0.3,
+                "zoom": 0.25,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
+                "style": "SIMPLEX",
+                "zoom": 0.2,
                 "fracture": {
                     "style": "STATIC",
                     "multiplier": 8

biomes/mountain/mtn-forest.json

@@ -17,7 +17,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -103,20 +103,16 @@
             "chance": 0.2,
             "variance": {
                 "style": "CELLULAR",
-                "zoom": 0.3,
+                "zoom": 0.25,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
+                "style": "SIMPLEX",
+                "zoom": 0.2,
                 "fracture": {
                     "style": "STATIC",
                     "multiplier": 8

biomes/mountain/mtn-hills.json

@@ -2,7 +2,7 @@
     "name": "Mountain Hills",
     "derivative": "TAIGA_MOUNTAINS",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/forest"],
+    "children": ["mountain/mtn-forest"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 23,
@@ -11,7 +11,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -81,20 +81,16 @@
             "chance": 0.2,
             "variance": {
                 "style": "CELLULAR",
-                "zoom": 0.3,
+                "zoom": 0.25,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
+                "style": "SIMPLEX",
+                "zoom": 0.2,
                 "fracture": {
                     "style": "STATIC",
                     "multiplier": 8
@@ -129,16 +125,11 @@
                 "zoom": 0.3,
                 "fracture": {
                     "style": "SIMPLEX",
-                    "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "zoom": 0.2
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
+                "style": "SIMPLEX",
                 "zoom": 0.3,
                 "fracture": {
                     "style": "STATIC",

biomes/mountain/mtn-main.json

@@ -2,7 +2,7 @@
     "name": "Mountain Main",
     "derivative": "PLAINS",
     "vanillaDerivative": "PLAINS",
-    "children": ["mountain/middle"],
+    "children": ["mountain/mtn-middle"],
     "generators": [
         {
             "min": 70,
@@ -18,7 +18,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -105,16 +105,11 @@
                 "zoom": 0.3,
                 "fracture": {
                     "style": "SIMPLEX",
-                    "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "zoom": 0.2
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
+                "style": "SIMPLEX",
                 "zoom": 0.3,
                 "fracture": {
                     "style": "STATIC",

biomes/mountain/mtn-middle.json

@@ -2,7 +2,7 @@
     "name": "Mountain Middle",
     "derivative": "TAIGA_MOUNTAINS",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/cliffs"],
+    "children": ["mountain/mtn-cliffs"],
     "generators": [
         {
             "generator": "mountain",
@@ -68,7 +68,7 @@
         "exponent": 0.625,
         "zoom": 1,
         "fracture": {
-            "style": "VIGOCTAVE_SIMPLEX",
+            "style": "SIMPLEX",
             "multiplier": 4,
             "zoom": 0.9
         }
@@ -107,11 +107,7 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {

biomes/mountain/mtn-mountain.json

@@ -2,7 +2,7 @@
     "name": "Mountain",
     "derivative": "MOUNTAIN_EDGE",
     "vanillaDerivative": "MOUNTAIN_EDGE",
-    "children": ["mountain/middle"],
+    "children": ["mountain/mtn-middle"],
     "generators": [
         {
             "min": 70,
@@ -18,7 +18,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -96,11 +96,7 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {

biomes/mountain/mtn-plain-hills.json

@@ -17,7 +17,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -54,11 +54,7 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {

biomes/mountain/mtn-plains.json

@@ -2,11 +2,10 @@
     "name": "Mountain Plains",
     "derivative": "TAIGA_MOUNTAINS",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/lake"],
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "rarity": 1000,
@@ -92,11 +91,7 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
@@ -137,11 +132,7 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {

biomes/mushroom/mus-forest.json

@@ -2,7 +2,7 @@
     "name": "Mushroom Forest",
     "derivative": "MUSHROOM_FIELDS",
     "vanillaDerivative": "MUSHROOM_FIELDS",
-    "children": ["mushroom/forest-hills"],
+    "children": ["mushroom/mus-forest-hills"],
     "layers": [
         {
             "minHeight": 3,

biomes/ocean/oce-beach.json

@@ -20,15 +20,6 @@
                 {"block": "dirt"},
                 {"block": "coarse_dirt"}
             ]
-        },
-        {
-            "minHeight": 6,
-            "maxHeight": 18,
-            "style": {"style": "STATIC"},
-            "palette": [
-                {"block": "dirt"},
-                {"block": "stone"}
-            ]
         }
     ],
     "decorators": [
@@ -36,20 +27,16 @@
             "chance": 0.2,
             "variance": {
                 "style": "CELLULAR",
-                "zoom": 0.3,
+                "zoom": 0.25,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
+                "style": "SIMPLEX",
+                "zoom": 0.2,
                 "fracture": {
                     "style": "STATIC",
                     "multiplier": 8

biomes/ocean/oce-deep.json

@@ -15,7 +15,7 @@
                 "minimumSlope": 0,
                 "maximumSlope": 3
             },
-            "style": {"style": "FRACTAL_FBM_IRIS"},
+            "style": {"style": "IRIS"},
             "zoom": 0.6,
             "palette": [
                 {"block": "sand"},

biomes/ocean/oce-fzn-ocean.json

@@ -55,13 +55,7 @@
         {
             "minHeight": 3,
             "maxHeight": 6,
-            "style": {
-                "style": "FRACTAL_WATER",
-                "fracture": {
-                    "multiplier": 9.25,
-                    "style": "IRIS_DOUBLE"
-                }
-            },
+            "style": {"style": "IRIS"},
             "zoom": 1.16,
             "palette": [
                 {
@@ -91,7 +85,7 @@
     ],
     "objects": [
         {
-            "chance": 0.4,
+            "chance": 0.003,
             "mode": "FAST_MIN_HEIGHT",
             "density": 3,
             "snow": 0.35,

biomes/ocean/oce-fzn-river.json

@@ -35,13 +35,7 @@
         {
             "minHeight": 3,
             "maxHeight": 6,
-            "style": {
-                "style": "FRACTAL_WATER",
-                "fracture": {
-                    "multiplier": 9.25,
-                    "style": "IRIS_DOUBLE"
-                }
-            },
+            "style": {"style": "IRIS"},
             "zoom": 1.16,
             "palette": [
                 {
@@ -71,7 +65,7 @@
     ],
     "objects": [
         {
-            "chance": 0.05,
+            "chance": 0.003,
             "density": 3,
             "snow": 0.45,
             "rotation": {

biomes/ocean/oce-hot-ocean.json

@@ -2,10 +2,7 @@
     "name": "Hot Ocean",
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
-    "children": [
-        "hot/river",
-        "hot/ocean-cliffs"
-    ],
+    "children": ["ocean/oce-hot-ocean-cliffs"],
     "generators": [{
         "min": -11,
         "max": -7,

biomes/ocean/oce-mtn-lake.json

@@ -66,20 +66,16 @@
             "chance": 0.2,
             "variance": {
                 "style": "CELLULAR",
-                "zoom": 0.3,
+                "zoom": 0.25,
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
-                "zoom": 0.3,
+                "style": "SIMPLEX",
+                "zoom": 0.2,
                 "fracture": {
                     "style": "STATIC",
                     "multiplier": 8
@@ -115,15 +111,11 @@
                 "fracture": {
                     "style": "SIMPLEX",
                     "zoom": 0.2,
-                    "multiplier": 10,
-                    "fracture": {
-                        "style": "STATIC",
-                        "multiplier": 15
-                    }
+                    "multiplier": 10
                 }
             },
             "style": {
-                "style": "TRIOCTAVE_SIMPLEX",
+                "style": "SIMPLEX",
                 "zoom": 0.3,
                 "fracture": {
                     "style": "STATIC",

biomes/ocean/oce-ocean.json

@@ -5,7 +5,7 @@
     "generators": [{
         "generator": "mountain",
         "max": -35,
-        "min": -60
+        "min": -50
     }],
     "layers": [
         {

biomes/ocean/oce-swa-ocean-tree.json

@@ -141,7 +141,7 @@
             }
         },
         {
-            "mode": "FAST_MIN_HEIGHT",
+            "mode": "VACUUM",
             "place": [
                 "tree/jungle/1",
                 "tree/jungle/2",
@@ -184,7 +184,7 @@
                     "max": 360
                 }
             },
-            "translate": {"y": -6}
+            "translate": {"y": 0}
         }
     ],
     "wall": {

biomes/ocean/oce-swa-ocean.json

@@ -14,9 +14,7 @@
             "style": {
                 "style": "VASCULAR",
                 "zoom": 0.8,
-                "fracture": {
-                    "style": "STATIC"
-                }
+                "fracture": {"style": "STATIC"}
             },
             "zoom": 0.825,
             "palette": [

biomes/ocean/oce-tem-ocean-deep.json

@@ -3,8 +3,8 @@
     "derivative": "DEEP_OCEAN",
     "vanillaDerivative": "DEEP_OCEAN",
     "generators": [{
-        "min": -57,
-        "max": -25,
+        "min": -52,
+        "max": -37,
         "generator": "plain"
     }],
     "layers": [

biomes/ocean/oce-tem-ocean.json

@@ -2,7 +2,7 @@
     "name": "Temperate Ocean",
     "derivative": "LUKEWARM_OCEAN",
     "vanillaDerivative": "OCEAN",
-    "children": ["temperate/ocean-deep"],
+    "children": ["temperate/oce-tmp-ocean-deep"],
     "generators": [{
         "min": -31,
         "max": -7,

biomes/ocean/oce-tro-coral-ocean-cliffs.json

@@ -2,7 +2,7 @@
     "name": "Tropical Coral Ocean Cliffs",
     "derivative": "LUKEWARM_OCEAN",
     "vanillaDerivative": "LUKEWARM_OCEAN",
-    "children": ["tropical/coral-ocean"],
+    "children": ["ocean/oce-tro-coral-ocean"],
     "generators": [{
         "min": -51,
         "max": -37,

biomes/ocean/oce-tro-ocean.json

@@ -3,8 +3,8 @@
     "derivative": "DEEP_WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
     "children": [
-        "tropical/coral-ocean",
-        "tropical/coral-ocean-cliffs"
+        "ocean/oce-tro-coral-ocean",
+        "ocean/oce-tro-coral-ocean-cliffs"
     ],
     "generators": [{
         "min": -38,

biomes/ocean/oce-tun-river.json

@@ -2,7 +2,7 @@
     "name": "Tundra River",
     "derivative": "COLD_OCEAN",
     "vanillaDerivative": "RIVER",
-    "children": ["tundra/river-rocky"],
+    "children": ["ocean/oce-tun-river-rocky"],
     "generators": [{
         "generator": "river",
         "max": -10,

biomes/ocean/oce-warm.json

@@ -2,7 +2,7 @@
     "name": "Ocean Warm",
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
-    "children": ["ocean/warm-bottom"],
+    "children": ["ocean/oce-warm-bottom"],
     "generators": [{
         "generator": "plain",
         "max": -10,

biomes/savanna/sav-acacia-denmyre.json

@@ -32,7 +32,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "structure": "village-savanna",

biomes/savanna/sav-cliff.json

@@ -2,7 +2,7 @@
     "name": "Savanna Cliffs",
     "derivative": "SAVANNA",
     "vanillaDerivative": "SAVANNA",
-    "children": ["savanna/acacia-denmyre"],
+    "children": ["savanna/sav-acacia-denmyre"],
     "generators": [{
         "min": 9,
         "max": 28,
@@ -11,7 +11,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "structure": "village-savanna",

biomes/savanna/sav-forest.json

@@ -47,7 +47,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "structure": "village-savanna",

biomes/savanna/sav-plateau.json

@@ -10,7 +10,7 @@
     "jigsawStructures": [
         {
             "rarity": 1700,
-            "structure": "pillager"
+            "structure": "pillager_outpost"
         },
         {
             "structure": "village-savanna",