Merge pull request #100 from IrisDimensions/ReduceSwampVillages

Drop the structures rarity
2025-12-29 03:39:15 +00:00 · 2021-07-04 13:09:17 -07:00
parent 021395dadf 8be5351796
commit 43e047f933
620 changed files with 2002 additions and 1132 deletions
--- a/biomes/frozen/frozen-beach.json
+++ b/biomes/frozen/frozen-beach.json
@@ -65,15 +65,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-hills.json
+++ b/biomes/frozen/frozen-hills.json
@@ -71,15 +71,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-ice-cavern.json
+++ b/biomes/frozen/frozen-ice-cavern.json
--- a/biomes/frozen/frozen-mountain-cliffs.json
+++ b/biomes/frozen/frozen-mountain-cliffs.json
@@ -52,15 +52,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-mountain-middle.json
+++ b/biomes/frozen/frozen-mountain-middle.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-mountain-cliffs"
+        "frozen/mountain-cliffs"
    ],
    "generators": [
        {
--- a/biomes/frozen/frozen-mountain.json
+++ b/biomes/frozen/frozen-mountain.json
@@ -3,9 +3,9 @@
    "derivative": "SNOWY_TAIGA",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-mountain-middle",
-        "frozen/frozen-peak",
-        "frozen/frozen-mountain-cliffs"
+        "frozen/mountain-middle",
+        "frozen/peak",
+        "frozen/mountain-cliffs"
    ],
    "layers": [
        {
@@ -84,15 +84,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-mountains.json
+++ b/biomes/frozen/frozen-mountains.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA_MOUNTAINS",
    "vanillaDerivative": "SNOWY_MOUNTAINS",
    "children": [
-        "frozen/frozen-peak"
+        "frozen/peak"
    ],
    "layers": [
        {
@@ -55,15 +55,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-ocean.json
+++ b/biomes/frozen/frozen-ocean.json
--- a/biomes/frozen/frozen-peak.json
+++ b/biomes/frozen/frozen-peak.json
--- a/biomes/frozen/frozen-pine-hills.json
+++ b/biomes/frozen/frozen-pine-hills.json
@@ -61,15 +61,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-pine-plains.json
+++ b/biomes/frozen/frozen-pine-plains.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-pine-hills"
+        "frozen/pine-hills"
    ],
    "generators": [
        {
@@ -69,15 +69,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-pines.json
+++ b/biomes/frozen/frozen-pines.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA_MOUNTAINS",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-vander"
+        "frozen/vander"
    ],
    "layers": [
        {
@@ -78,15 +78,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-plains.json
+++ b/biomes/frozen/frozen-plains.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-hills"
+        "frozen/hills"
    ],
    "generators": [
        {
@@ -69,15 +69,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-redwood-forest.json
+++ b/biomes/frozen/frozen-redwood-forest.json
@@ -69,15 +69,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-river.json
+++ b/biomes/frozen/frozen-river.json
--- a/biomes/frozen/frozen-spruce-hills.json
+++ b/biomes/frozen/frozen-spruce-hills.json
@@ -61,15 +61,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-spruce-plains.json
+++ b/biomes/frozen/frozen-spruce-plains.json
@@ -3,7 +3,7 @@
    "derivative": "SNOWY_TAIGA",
    "vanillaDerivative": "SNOWY_TAIGA",
    "children": [
-        "frozen/frozen-spruce-hills"
+        "frozen/spruce-hills"
    ],
    "layers": [
        {
@@ -57,15 +57,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/frozen/frozen-vander.json
+++ b/biomes/frozen/frozen-vander.json
@@ -7,10 +7,10 @@
        "SNOWY_MOUNTAINS"
    ],
    "children": [
-        "frozen/frozen-peak",
-        "frozen/frozen-mountains",
-        "frozen/frozen-mountains",
-        "frozen/frozen-mountains"
+        "frozen/peak",
+        "frozen/mountains",
+        "frozen/mountains",
+        "frozen/mountains"
    ],
    "layers": [
        {
@@ -60,15 +60,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "igloo"
        },
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-snowy"
        }
    ],
--- a/biomes/hot/hot-beach-grass.json
+++ b/biomes/hot/hot-beach-grass.json
--- a/biomes/hot/hot-beach.json
+++ b/biomes/hot/hot-beach.json
--- a/biomes/hot/hot-desert-dunes-red.json
+++ b/biomes/hot/hot-desert-dunes-red.json
@@ -41,15 +41,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-desert-dunes.json
+++ b/biomes/hot/hot-desert-dunes.json
@@ -41,15 +41,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-desert-red.json
+++ b/biomes/hot/hot-desert-red.json
@@ -31,15 +31,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-desert.json
+++ b/biomes/hot/hot-desert.json
@@ -3,7 +3,7 @@
    "derivative": "DESERT",
    "vanillaDerivative": "DESERT",
    "children": [
-        "hot/hot-oasis"
+        "hot/oasis"
    ],
    "generators": [
        {
@@ -43,15 +43,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-mountain-cliffs.json
+++ b/biomes/hot/hot-mountain-cliffs.json
@@ -73,15 +73,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-mountain-middle.json
+++ b/biomes/hot/hot-mountain-middle.json
@@ -3,7 +3,7 @@
    "derivative": "DESERT",
    "vanillaDerivative": "DESERT",
    "children": [
-        "hot/hot-mountain-cliffs"
+        "hot/cliffs"
    ],
    "generators": [
        {
--- a/biomes/hot/hot-mountain-plains.json
+++ b/biomes/hot/hot-mountain-plains.json
@@ -31,15 +31,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-mountain.json
+++ b/biomes/hot/hot-mountain.json
@@ -3,7 +3,7 @@
    "derivative": "DESERT",
    "vanillaDerivative": "DESERT",
    "children": [
-        "hot/hot-mountain-middle"
+        "hot/middle"
    ],
    "generators": [
        {
@@ -14,15 +14,15 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 1000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-hot"
        },
        {
-            "rarity": 1500,
+            "rarity": 1900,
            "structure": "desert-pyramid"
        }
    ],
--- a/biomes/hot/hot-oasis.json
+++ b/biomes/hot/hot-oasis.json
--- a/biomes/hot/hot-ocean-cliffs.json
+++ b/biomes/hot/hot-ocean-cliffs.json
--- a/biomes/hot/hot-ocean.json
+++ b/biomes/hot/hot-ocean.json
@@ -3,10 +3,10 @@
    "derivative": "WARM_OCEAN",
    "vanillaDerivative": "WARM_OCEAN",
    "children": [
-        "hot/hot-desert",
-        "hot/hot-desert",
-        "hot/hot-river",
-        "hot/hot-ocean-cliffs"
+        "hot/desert",
+        "hot/desert",
+        "hot/river",
+        "hot/ocean-cliffs"
    ],
    "generators": [
        {
--- a/biomes/hot/hot-river.json
+++ b/biomes/hot/hot-river.json
--- a/biomes/hot/hot-sandy-cave.json
+++ b/biomes/hot/hot-sandy-cave.json
--- a/biomes/hot/hot-sandy-red-cave.json
+++ b/biomes/hot/hot-sandy-red-cave.json
--- a/biomes/mesa/mesa-beach.json
+++ b/biomes/mesa/mesa-beach.json
--- a/biomes/mesa/mesa-blue.json
+++ b/biomes/mesa/mesa-blue.json
--- a/biomes/mesa/mesa-cliffs.json
+++ b/biomes/mesa/mesa-cliffs.json
--- a/biomes/mesa/mesa-dark.json
+++ b/biomes/mesa/mesa-dark.json
@@ -3,10 +3,10 @@
    "derivative": "SHATTERED_SAVANNA",
    "vanillaDerivative": "ERODED_BADLANDS",
    "children": [
-        "mesa/mesa-cliffs",
-        "mesa/mesa-red",
-        "mesa/mesa-green",
-        "mesa/mesa-blue"
+        "mesa/cliffs",
+        "mesa/red",
+        "mesa/green",
+        "mesa/blue"
    ],
    "generators": [
        {
--- a/biomes/mesa/mesa-green.json
+++ b/biomes/mesa/mesa-green.json
--- a/biomes/mesa/mesa.json
+++ b/biomes/mesa/mesa.json
@@ -8,14 +8,14 @@
        "ERODED_BADLANDS"
    ],
    "children": [
-        "mesa/mesa-valleys",
-        "mesa/mesa-red",
-        "mesa/mesa-blue",
-        "mesa/mesa-dark",
-        "mesa/mesa-green",
-        "mesa/mesa-red",
-        "mesa/mesa-yellow",
-        "mesa/mesa-blue"
+        "mesa/valleys",
+        "mesa/red",
+        "mesa/blue",
+        "mesa/dark",
+        "mesa/green",
+        "mesa/red",
+        "mesa/yellow",
+        "mesa/blue"
    ],
    "generators": [
        {
--- a/biomes/mesa/mesa-plateau-dirt-high.json
+++ b/biomes/mesa/mesa-plateau-dirt-high.json
--- a/biomes/mesa/mesa-plateau-dirt.json
+++ b/biomes/mesa/mesa-plateau-dirt.json
--- a/biomes/mesa/mesa-plateau-high.json
+++ b/biomes/mesa/mesa-plateau-high.json
@@ -8,7 +8,7 @@
        "ERODED_BADLANDS"
    ],
    "children": [
-        "mesa/mesa-plateau-dirt-high"
+        "mesa/plateau-dirt-high"
    ],
    "generators": [
        {
--- a/biomes/mesa/mesa-plateau.json
+++ b/biomes/mesa/mesa-plateau.json
@@ -8,7 +8,7 @@
        "ERODED_BADLANDS"
    ],
    "children": [
-        "mesa/mesa-plateau-dirt"
+        "mesa/plateau-dirt"
    ],
    "generators": [
        {
--- a/biomes/mesa/mesa-red.json
+++ b/biomes/mesa/mesa-red.json
--- a/biomes/mesa/mesa-river.json
+++ b/biomes/mesa/mesa-river.json
--- a/biomes/mesa/mesa-valleys.json
+++ b/biomes/mesa/mesa-valleys.json
--- a/biomes/mesa/mesa-yellow.json
+++ b/biomes/mesa/mesa-yellow.json
@@ -3,7 +3,7 @@
    "derivative": "SHATTERED_SAVANNA",
    "vanillaDerivative": "BADLANDS",
    "children": [
-        "mesa/mesa-dark"
+        "mesa/dark"
    ],
    "generators": [
        {
--- a/biomes/mountain/mountain-beach.json
+++ b/biomes/mountain/mountain-beach.json
--- a/biomes/mountain/mountain-cliffs.json
+++ b/biomes/mountain/mountain-cliffs.json
--- a/biomes/mountain/mountain-forest-hills.json
+++ b/biomes/mountain/mountain-forest-hills.json
@@ -16,11 +16,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-forest.json
+++ b/biomes/mountain/mountain-forest.json
@@ -16,11 +16,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-hills.json
+++ b/biomes/mountain/mountain-hills.json
@@ -3,7 +3,7 @@
    "derivative": "TAIGA_MOUNTAINS",
    "vanillaDerivative": "TAIGA_MOUNTAINS",
    "children": [
-        "mountain/mountain-forest"
+        "mountain/forest"
    ],
    "generators": [
        {
@@ -14,11 +14,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-lake.json
+++ b/biomes/mountain/mountain-lake.json
--- a/biomes/mountain/mountain-main.json
+++ b/biomes/mountain/mountain-main.json
@@ -3,7 +3,7 @@
    "derivative": "PLAINS",
    "vanillaDerivative": "PLAINS",
    "children": [
-        "mountain/mountain-middle"
+        "mountain/middle"
    ],
    "generators": [
        {
@@ -19,11 +19,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-middle.json
+++ b/biomes/mountain/mountain-middle.json
@@ -3,7 +3,7 @@
    "derivative": "TAIGA_MOUNTAINS",
    "vanillaDerivative": "TAIGA_MOUNTAINS",
    "children": [
-        "mountain/mountain-cliffs"
+        "mountain/cliffs"
    ],
    "generators": [
        {
--- a/biomes/mountain/mountain.json
+++ b/biomes/mountain/mountain.json
@@ -3,7 +3,7 @@
    "derivative": "MOUNTAIN_EDGE",
    "vanillaDerivative": "MOUNTAIN_EDGE",
    "children": [
-        "mountain/mountain-middle"
+        "mountain/middle"
    ],
    "generators": [
        {
@@ -20,11 +20,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-plain-hills.json
+++ b/biomes/mountain/mountain-plain-hills.json
@@ -16,11 +16,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-plains.json
+++ b/biomes/mountain/mountain-plains.json
@@ -3,15 +3,15 @@
    "derivative": "TAIGA_MOUNTAINS",
    "vanillaDerivative": "TAIGA_MOUNTAINS",
    "children": [
-        "mountain/mountain-lake"
+        "mountain/lake"
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/mountain/mountain-river-soft.json
+++ b/biomes/mountain/mountain-river-soft.json
--- a/biomes/mountain/mountain-river.json
+++ b/biomes/mountain/mountain-river.json
--- a/biomes/mushroom/mushroom-beach.json
+++ b/biomes/mushroom/mushroom-beach.json
--- a/biomes/mushroom/mushroom-crimson-forest.json
+++ b/biomes/mushroom/mushroom-crimson-forest.json
--- a/biomes/mushroom/mushroom-forest-hills.json
+++ b/biomes/mushroom/mushroom-forest-hills.json
@@ -106,17 +106,6 @@
            ]
        }
    ],
-    "effects": [
-        {
-            "volume": 6.2,
-            "minPitch": 0.2,
-            "chance": 8,
-            "maxPitch": 0.3,
-            "sound": "AMBIENT_WARPED_FOREST_ADDITIONS",
-            "interval": 6000,
-            "soundDistance": 3
-        }
-    ],
    "entityInitialSpawns": [
        {
            "maxSpawns": 5,
--- a/biomes/mushroom/mushroom-forest.json
+++ b/biomes/mushroom/mushroom-forest.json
@@ -3,7 +3,7 @@
    "derivative": "MUSHROOM_FIELDS",
    "vanillaDerivative": "MUSHROOM_FIELDS",
    "children": [
-        "mushroom/mushroom-forest-hills"
+        "mushroom/forest-hills"
    ],

    "layers": [
@@ -110,17 +110,6 @@
            "generator": "plain"
        }
    ],
-    "effects": [
-        {
-            "volume": 6.2,
-            "minPitch": 0.2,
-            "chance": 8,
-            "maxPitch": 0.3,
-            "sound": "AMBIENT_WARPED_FOREST_ADDITIONS",
-            "interval": 6000,
-            "soundDistance": 3
-        }
-    ],
    "entityInitialSpawns": [
        {
            "maxSpawns": 5,
@@ -179,90 +168,7 @@
    ],
    "objects": [
        {
-            "name": "standard-surface-portals",
-            "chance": 0.00505,
-            "place": [
-                "ruined_portal/giant_portal_1",
-                "ruined_portal/giant_portal_2",
-                "ruined_portal/giant_portal_3",
-                "ruined_portal/portal_1",
-                "ruined_portal/portal_2",
-                "ruined_portal/portal_3",
-                "ruined_portal/portal_4",
-                "ruined_portal/portal_5",
-                "ruined_portal/portal_6",
-                "ruined_portal/portal_7",
-                "ruined_portal/portal_8",
-                "ruined_portal/portal_9",
-                "ruined_portal/portal_10"
-            ],
-            "edit": [
-                {
-                    "find": [
-                        {
-                            "block": "gold_block"
-                        }
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "air"
-                            }
-                        ]
-                    },
-                    "chance": 0.1
-                },
-                {
-                    "find": [
-                        {
-                            "block": "netherrack"
-                        }
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "magma_block"
-                            }
-                        ]
-                    },
-                    "chance": 0.07
-                },
-                {
-                    "find": [
-                        {
-                            "block": "obsidian"
-                        }
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "crying_obsidian"
-                            }
-                        ]
-                    },
-                    "chance": 0.15
-                },
-                {
-                    "find": [
-                        {
-                            "block": "lava"
-                        }
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "magma_block"
-                            }
-                        ]
-                    },
-                    "chance": 0.20
-                }
-            ],
-            "mode": "MIN_HEIGHT",
-            "carvingSupport": "SURFACE_ONLY"
-        },
-        {
-            "chance": 0.18,
+            "chance": 0.15,
            "density": 2,
            "rotation": {
                "yAxis": {
@@ -293,7 +199,7 @@
            }
        },
        {
-            "chance": 0.18,
+            "chance": 0.15,
            "density": 2,
            "edit": [
                {
@@ -340,7 +246,7 @@
            }
        },
        {
-            "chance": 0.8,
+            "chance": 0.6,
            "density": 2,
            "rotation": {
                "yAxis": {
@@ -418,7 +324,7 @@
            }
        },
        {
-            "chance": 0.5,
+            "chance": 0.4,
            "density": 2,
            "edit": [
                {
@@ -465,7 +371,7 @@
            }
        },
        {
-            "chance": 0.025,
+            "chance": 0.02,
            "density": 1,
            "edit": [
                {
@@ -506,7 +412,7 @@
            }
        },
        {
-            "chance": 0.1,
+            "chance": 0.05,
            "density": 1,
            "rotation": {
                "yAxis": {
--- a/biomes/mushroom/mushroom-lake.json
+++ b/biomes/mushroom/mushroom-lake.json
@@ -2,17 +2,6 @@
    "name": "Mushroom Lake",
    "derivative": "MUSHROOM_FIELDS",
    "vanillaDerivative": "MUSHROOM_FIELDS",
-    "effects": [
-        {
-            "volume": 6.2,
-            "minPitch": 0.2,
-            "chance": 8,
-            "maxPitch": 0.3,
-            "sound": "AMBIENT_WARPED_FOREST_ADDITIONS",
-            "interval": 6000,
-            "soundDistance": 3
-        }
-    ],
    "layers": [
        {
            "zoom": 0.3,
--- a/biomes/mushroom/mushroom-ocean.json
+++ b/biomes/mushroom/mushroom-ocean.json
--- a/biomes/mushroom/mushroom-plains.json
+++ b/biomes/mushroom/mushroom-plains.json
@@ -57,23 +57,19 @@
            "generator": "plain"
        }
    ],
-    "effects": [
+    "jigsawStructures": [
        {
-            "volume": 6.2,
-            "minPitch": 0.2,
-            "chance": 8,
-            "maxPitch": 0.3,
-            "sound": "AMBIENT_WARPED_FOREST_ADDITIONS",
-            "interval": 6000,
-            "soundDistance": 3
+            "rarity": 150,
+
+            "structure": "mush-huts"
        }
    ],
    "entityInitialSpawns": [
        {
-            "maxSpawns": 5,
+            "maxSpawns": 6,
            "minSpawns": 2,
            "entity": "mooshroom",
-            "rarity": 5
+            "rarity": 3
        }
    ],
    "decorators": [
--- a/biomes/mushroom/mushroom-warped-forest.json
+++ b/biomes/mushroom/mushroom-warped-forest.json
--- a/biomes/ocean/ocean-beach.json
+++ b/biomes/ocean/ocean-beach.json
--- a/biomes/ocean/ocean-deep.json
+++ b/biomes/ocean/ocean-deep.json
--- a/biomes/ocean/ocean-warm-bottom.json
+++ b/biomes/ocean/ocean-warm-bottom.json
--- a/biomes/ocean/ocean-warm.json
+++ b/biomes/ocean/ocean-warm.json
@@ -3,7 +3,7 @@
    "derivative": "WARM_OCEAN",
    "vanillaDerivative": "WARM_OCEAN",
    "children": [
-        "ocean/ocean-warm-bottom"
+        "ocean/warm-bottom"
    ],
    "generators": [
        {
--- a/biomes/savanna/savanna-acacia-denmyre.json
+++ b/biomes/savanna/savanna-acacia-denmyre.json
@@ -57,12 +57,12 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 2000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
            "structure": "village-savanna",
-            "rarity": 650
+            "rarity": 1500
        }
    ],
    "decorators": [
--- a/biomes/savanna/savanna-beach.json
+++ b/biomes/savanna/savanna-beach.json
--- a/biomes/savanna/savanna-cliff.json
+++ b/biomes/savanna/savanna-cliff.json
@@ -3,7 +3,7 @@
    "derivative": "SAVANNA",
    "vanillaDerivative": "SAVANNA",
    "children": [
-        "savanna/savanna-acacia-denmyre"
+        "savanna/acacia-denmyre"
    ],
    "generators": [
        {
@@ -14,12 +14,12 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 2000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
            "structure": "village-savanna",
-            "rarity": 650
+            "rarity": 1500
        }
    ],
    "layers": [
--- a/biomes/savanna/savanna-forest.json
+++ b/biomes/savanna/savanna-forest.json
@@ -66,12 +66,12 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 2000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
            "structure": "village-savanna",
-            "rarity": 650
+            "rarity": 1500
        }
    ],
    "biomeSkyScatter": [
--- a/biomes/savanna/savanna-plateau.json
+++ b/biomes/savanna/savanna-plateau.json
@@ -11,12 +11,12 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 2000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
            "structure": "village-savanna",
-            "rarity": 650
+            "rarity": 1500
        }
    ],
    "layers": [
--- a/biomes/savanna/savanna.json
+++ b/biomes/savanna/savanna.json
@@ -3,7 +3,7 @@
    "derivative": "SAVANNA",
    "vanillaDerivative": "SAVANNA",
    "children": [
-        "savanna/savanna-cliff"
+        "savanna/cliff"
    ],
    "generators": [
        {
@@ -19,12 +19,12 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 2000,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
            "structure": "village-savanna",
-            "rarity": 650
+            "rarity": 1500
        }
    ],
    "layers": [
--- a/biomes/swamp/swamp-beach.json
+++ b/biomes/swamp/swamp-beach.json
--- a/biomes/swamp/swamp-denmyre.json
+++ b/biomes/swamp/swamp-denmyre.json
@@ -57,11 +57,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/swamp/swamp-lake.json
+++ b/biomes/swamp/swamp-lake.json
@@ -3,7 +3,7 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "SWAMP",
    "children": [
-        "swamp/swamp-marsh"
+        "swamp/marsh"
    ],
    "generators": [
        {
--- a/biomes/swamp/swamp-marsh-rotten.json
+++ b/biomes/swamp/swamp-marsh-rotten.json
@@ -11,11 +11,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/swamp/swamp-marsh.json
+++ b/biomes/swamp/swamp-marsh.json
@@ -3,7 +3,7 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "SWAMP",
    "children": [
-        "swamp/swamp-marsh-rotten"
+        "swamp/marsh-rotten"
    ],
    "generators": [
        {
@@ -14,11 +14,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/swamp/swamp-murky-cavern-gleaming.json
+++ b/biomes/swamp/swamp-murky-cavern-gleaming.json
--- a/biomes/swamp/swamp-murky-cavern.json
+++ b/biomes/swamp/swamp-murky-cavern.json
@@ -3,7 +3,7 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "SWAMP",
    "children": [
-        "swamp/swamp-murky-cavern-gleaming"
+        "swamp/murky-cavern-gleaming"
    ],
    "layers": [
        {
--- a/biomes/swamp/swamp-ocean-tree.json
+++ b/biomes/swamp/swamp-ocean-tree.json
--- a/biomes/swamp/swamp-ocean.json
+++ b/biomes/swamp/swamp-ocean.json
--- a/biomes/swamp/swamp-roofed-forest.json
+++ b/biomes/swamp/swamp-roofed-forest.json
@@ -3,7 +3,7 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "DARK_FOREST",
    "children": [
-        "swamp/swamp-lake"
+        "swamp/lake"
    ],
    "generators": [
        {
@@ -62,11 +62,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/swamp/swamp-roofed-wayward.json
+++ b/biomes/swamp/swamp-roofed-wayward.json
@@ -3,7 +3,7 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "DARK_FOREST",
    "children": [
-        "swamp/swamp-lake"
+        "swamp/lake"
    ],

    "generators": [
@@ -63,11 +63,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/swamp/swamp-willow-forest.json
+++ b/biomes/swamp/swamp-willow-forest.json
@@ -3,8 +3,8 @@
    "derivative": "SWAMP",
    "vanillaDerivative": "DARK_FOREST",
    "children": [
-        "swamp/swamp-denmyre",
-        "swamp/swamp-marsh"
+        "swamp/denmyre",
+        "swamp/marsh"
    ],
    "generators": [
        {
@@ -63,11 +63,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1000,
            "structure": "village-tundra"
        }
    ],
--- a/biomes/temperate/temperate-beach.json
+++ b/biomes/temperate/temperate-beach.json
--- a/biomes/temperate/temperate-birch-denmyre.json
+++ b/biomes/temperate/temperate-birch-denmyre.json
@@ -57,11 +57,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-temperate"
        }
    ],
--- a/biomes/temperate/temperate-birch-forest.json
+++ b/biomes/temperate/temperate-birch-forest.json
@@ -3,7 +3,7 @@
    "derivative": "PLAINS",
    "vanillaDerivative": "BIRCH_FOREST",
    "children": [
-        "temperate/temperate-birch-denmyre"
+        "temperate/birch-denmyre"
    ],

    "generators": [
@@ -15,11 +15,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-temperate"
        }
    ],
--- a/biomes/temperate/temperate-bonsai.json
+++ b/biomes/temperate/temperate-bonsai.json
@@ -3,7 +3,7 @@
    "derivative": "PLAINS",
    "vanillaDerivative": "PLAINS",
    "children": [
-        "temperate/temperate-plain-hills"
+        "temperate/plain-hills"
    ],
    "generators": [
        {
--- a/biomes/temperate/temperate-cracked-cavern.json
+++ b/biomes/temperate/temperate-cracked-cavern.json
@@ -3,7 +3,7 @@
    "derivative": "PLAINS",
    "vanillaDerivative": "THE_VOID",
    "children": [
-        "temperate/temperate-lit-cavern"
+        "temperate/lit-cavern"
    ],
    "generators": [
        {
--- a/biomes/temperate/temperate-flower-forest.json
+++ b/biomes/temperate/temperate-flower-forest.json
--- a/biomes/temperate/temperate-highlands.json
+++ b/biomes/temperate/temperate-highlands.json
@@ -11,11 +11,11 @@
    ],
    "jigsawStructures": [
        {
-            "rarity": 750,
+            "rarity": 1700,
            "structure": "pillager"
        },
        {
-            "rarity": 500,
+            "rarity": 1500,
            "structure": "village-temperate"
        }
    ],
--- a/biomes/temperate/temperate-island.json
+++ b/biomes/temperate/temperate-island.json
@@ -3,7 +3,7 @@
    "derivative": "PLAINS",
    "vanillaDerivative": "PLAINS",
    "children": [
-        "temperate/temperate-wilds"
+        "temperate/wilds"
    ],

    "generators": [
--- a/biomes/temperate/temperate-lit-cavern.json
+++ b/biomes/temperate/temperate-lit-cavern.json
--- a/Show More
+++ b/Show More