diff --git a/biomes/frozen/frozen-beach.json b/biomes/frozen/frozen-beach.json index e292c3f3..893d8208 100644 --- a/biomes/frozen/frozen-beach.json +++ b/biomes/frozen/frozen-beach.json @@ -41,11 +41,7 @@ "generator": "plain" } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "seaLayers": [ { "minHeight": 1, @@ -69,7 +65,6 @@ } ], "objects": [ - { "chance": 0.001, "density": 3, diff --git a/biomes/frozen/frozen-hills.json b/biomes/frozen/frozen-hills.json index 589ce234..fc3f1427 100644 --- a/biomes/frozen/frozen-hills.json +++ b/biomes/frozen/frozen-hills.json @@ -69,12 +69,6 @@ "min": 6 } ], - "jigsawStructures": [ - { - "rarity": 1050, - "structure": "igloo" - } - ], "objects": [ { "chance": 0.1, diff --git a/biomes/frozen/frozen-ice-cavern.json b/biomes/frozen/frozen-ice-cavern.json index c82cb58d..3f33cb17 100644 --- a/biomes/frozen/frozen-ice-cavern.json +++ b/biomes/frozen/frozen-ice-cavern.json @@ -94,11 +94,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/biomes/frozen/frozen-mountain-cliffs.json b/biomes/frozen/frozen-mountain-cliffs.json index 50bf2f2e..276ac4f4 100644 --- a/biomes/frozen/frozen-mountain-cliffs.json +++ b/biomes/frozen/frozen-mountain-cliffs.json @@ -50,6 +50,7 @@ ] } ], + "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-mountain-middle.json b/biomes/frozen/frozen-mountain-middle.json index 87aa1205..4c6fda2e 100644 --- a/biomes/frozen/frozen-mountain-middle.json +++ b/biomes/frozen/frozen-mountain-middle.json @@ -126,6 +126,7 @@ ] } ], + "biomeScatter": [ "PLAINS", "FOREST" diff --git a/biomes/frozen/frozen-mountain.json b/biomes/frozen/frozen-mountain.json index e1f4d181..57ca1e15 100644 --- a/biomes/frozen/frozen-mountain.json +++ b/biomes/frozen/frozen-mountain.json @@ -82,6 +82,7 @@ ] } ], + "generators": [ { "min": 70, diff --git a/biomes/frozen/frozen-mountains.json b/biomes/frozen/frozen-mountains.json index 6dbfaa86..a60fd957 100644 --- a/biomes/frozen/frozen-mountains.json +++ b/biomes/frozen/frozen-mountains.json @@ -53,6 +53,7 @@ ] } ], + "generators": [ { "min": 3, diff --git a/biomes/frozen/frozen-ocean.json b/biomes/frozen/frozen-ocean.json index d2207d98..b71fdf89 100644 --- a/biomes/frozen/frozen-ocean.json +++ b/biomes/frozen/frozen-ocean.json @@ -226,10 +226,6 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] + } \ No newline at end of file diff --git a/biomes/frozen/frozen-peak.json b/biomes/frozen/frozen-peak.json index 1d66b783..30f8f614 100644 --- a/biomes/frozen/frozen-peak.json +++ b/biomes/frozen/frozen-peak.json @@ -117,6 +117,7 @@ ] } ], + "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-pine-hills.json b/biomes/frozen/frozen-pine-hills.json index 514fa5d7..e52ecd12 100644 --- a/biomes/frozen/frozen-pine-hills.json +++ b/biomes/frozen/frozen-pine-hills.json @@ -59,6 +59,7 @@ "min": 6 } ], + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pine-plains.json b/biomes/frozen/frozen-pine-plains.json index c5f35747..53d5ad3f 100644 --- a/biomes/frozen/frozen-pine-plains.json +++ b/biomes/frozen/frozen-pine-plains.json @@ -67,6 +67,7 @@ ] } ], + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pines.json b/biomes/frozen/frozen-pines.json index b3355b89..ace65db9 100644 --- a/biomes/frozen/frozen-pines.json +++ b/biomes/frozen/frozen-pines.json @@ -76,6 +76,7 @@ "generator": "mountain" } ], + "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen/frozen-plains.json b/biomes/frozen/frozen-plains.json index d1fa1398..3ed7c62b 100644 --- a/biomes/frozen/frozen-plains.json +++ b/biomes/frozen/frozen-plains.json @@ -67,6 +67,7 @@ ] } ], + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-redwood-forest.json b/biomes/frozen/frozen-redwood-forest.json index 7a685150..ebadf80a 100644 --- a/biomes/frozen/frozen-redwood-forest.json +++ b/biomes/frozen/frozen-redwood-forest.json @@ -246,6 +246,7 @@ ] } ], + "wall": { "style": { "style": "STATIC" diff --git a/biomes/frozen/frozen-river.json b/biomes/frozen/frozen-river.json index 8708ccf9..694cc471 100644 --- a/biomes/frozen/frozen-river.json +++ b/biomes/frozen/frozen-river.json @@ -48,6 +48,7 @@ ] } ], + "generators": [ { "generator": "plain", @@ -158,10 +159,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/frozen/frozen-spruce-hills.json b/biomes/frozen/frozen-spruce-hills.json index 7a972f45..f6d4e907 100644 --- a/biomes/frozen/frozen-spruce-hills.json +++ b/biomes/frozen/frozen-spruce-hills.json @@ -59,6 +59,7 @@ "min": 6 } ], + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-spruce-plains.json b/biomes/frozen/frozen-spruce-plains.json index e42bf929..6d677380 100644 --- a/biomes/frozen/frozen-spruce-plains.json +++ b/biomes/frozen/frozen-spruce-plains.json @@ -55,6 +55,7 @@ ] } ], + "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/frozen/frozen-vander.json b/biomes/frozen/frozen-vander.json index 4beecf53..8a42ac0d 100644 --- a/biomes/frozen/frozen-vander.json +++ b/biomes/frozen/frozen-vander.json @@ -95,6 +95,7 @@ ] } ], + "generators": [ { "min": 3, diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/hot-desert-dunes-red.json index 4e423863..3faa8aa6 100644 --- a/biomes/hot/hot-desert-dunes-red.json +++ b/biomes/hot/hot-desert-dunes-red.json @@ -2,12 +2,6 @@ "name": "Hot Desert Dunes Red", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "jigsawStructures": [ - { - "rarity": 1500, - "structure": "desert-pyramid" - } - ], "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/hot-desert-dunes.json index 91d42238..08dbeb65 100644 --- a/biomes/hot/hot-desert-dunes.json +++ b/biomes/hot/hot-desert-dunes.json @@ -2,12 +2,7 @@ "name": "Hot Desert Dunes", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "jigsawStructures": [ - { - "rarity": 1500, - "structure": "desert-pyramid" - } - ], + "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/hot/hot-desert.json b/biomes/hot/hot-desert.json index 678a24e8..3c4ecdcd 100644 --- a/biomes/hot/hot-desert.json +++ b/biomes/hot/hot-desert.json @@ -89,11 +89,7 @@ } } ], - "loot": { - "tables": [ - "cactus-clutter" - ] - }, + "decorators": [ { "verticalZoom": 5, diff --git a/biomes/hot/hot-ocean-cliffs.json b/biomes/hot/hot-ocean-cliffs.json index 1585e6a0..a500be49 100644 --- a/biomes/hot/hot-ocean-cliffs.json +++ b/biomes/hot/hot-ocean-cliffs.json @@ -200,11 +200,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/hot/hot-ocean.json b/biomes/hot/hot-ocean.json index 9fd57f63..2f336b3c 100644 --- a/biomes/hot/hot-ocean.json +++ b/biomes/hot/hot-ocean.json @@ -228,11 +228,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/hot/hot-river.json b/biomes/hot/hot-river.json index dc6d6a7c..2f13a403 100644 --- a/biomes/hot/hot-river.json +++ b/biomes/hot/hot-river.json @@ -43,10 +43,5 @@ } ] } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/hot/hot-sandy-cave.json b/biomes/hot/hot-sandy-cave.json index 54ae3b28..a4b586db 100644 --- a/biomes/hot/hot-sandy-cave.json +++ b/biomes/hot/hot-sandy-cave.json @@ -147,12 +147,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter", - "cactus-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/hot/hot-sandy-red-cave.json b/biomes/hot/hot-sandy-red-cave.json index 17e7c77d..e7deeb99 100644 --- a/biomes/hot/hot-sandy-red-cave.json +++ b/biomes/hot/hot-sandy-red-cave.json @@ -64,12 +64,6 @@ } } ], - "loot": { - "tables": [ - "cave-clutter", - "cactus-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mesa/mesa-valleys.json b/biomes/mesa/mesa-valleys.json index 840e0549..4d2086c3 100644 --- a/biomes/mesa/mesa-valleys.json +++ b/biomes/mesa/mesa-valleys.json @@ -2,12 +2,6 @@ "name": "Mesa Valley", "derivative": "SAVANNA", "vanillaDerivative": "BADLANDS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 5, diff --git a/biomes/mesa/mesa-yellow.json b/biomes/mesa/mesa-yellow.json index 7a894837..869caba4 100644 --- a/biomes/mesa/mesa-yellow.json +++ b/biomes/mesa/mesa-yellow.json @@ -5,12 +5,6 @@ "children": [ "mesa/mesa-dark" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 9, diff --git a/biomes/mountain/mountain-beach.json b/biomes/mountain/mountain-beach.json index 1a638dff..c32d9afb 100644 --- a/biomes/mountain/mountain-beach.json +++ b/biomes/mountain/mountain-beach.json @@ -67,10 +67,5 @@ "block": "air" } ] - }, - "loot": { - "tables": [ - "beach-clutter" - ] } } \ No newline at end of file diff --git a/biomes/mountain/mountain-hills.json b/biomes/mountain/mountain-hills.json index fc574155..b5c97ab0 100644 --- a/biomes/mountain/mountain-hills.json +++ b/biomes/mountain/mountain-hills.json @@ -12,16 +12,7 @@ "min": 5 } ], - "jigsawStructures": [ - { - "rarity":2300, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], + "layers": [ { "minHeight": 1, @@ -328,57 +319,6 @@ "y": -1, "z": 0 } - }, - { - "chance": 0.004, - "edit": [ - { - "find": [ - { - "block": "glass" - } - ], - "replace": { - "palette": [ - { - "block": "void_air" - } - ] - } - }, - { - "find": [ - { - "block": "blue_wool" - } - ], - "replace": { - "palette": [ - { - "block": "water" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "cave2", - "cave1" - ], - "translate": { - "x": 0, - "y": -66, - "z": 0 - } } ] } \ No newline at end of file diff --git a/biomes/mountain/mountain-plains.json b/biomes/mountain/mountain-plains.json index ada003f8..6a112892 100644 --- a/biomes/mountain/mountain-plains.json +++ b/biomes/mountain/mountain-plains.json @@ -5,16 +5,7 @@ "children": [ "mountain/mountain-lake" ], - "jigsawStructures": [ - { - "rarity": 2000, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], + "generators": [ { "generator": "plain", diff --git a/biomes/mountain/mountain-river-soft.json b/biomes/mountain/mountain-river-soft.json index a95e8b13..63f908a5 100644 --- a/biomes/mountain/mountain-river-soft.json +++ b/biomes/mountain/mountain-river-soft.json @@ -112,10 +112,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/mountain/mountain-river.json b/biomes/mountain/mountain-river.json index fb74d930..8960e745 100644 --- a/biomes/mountain/mountain-river.json +++ b/biomes/mountain/mountain-river.json @@ -112,10 +112,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/mushroom/mushroom-forest.json b/biomes/mushroom/mushroom-forest.json index 52099411..e585f420 100644 --- a/biomes/mushroom/mushroom-forest.json +++ b/biomes/mushroom/mushroom-forest.json @@ -5,20 +5,7 @@ "children": [ "mushroom/mushroom-forest-hills" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "structure": "village-temperate", - "rarity": 1000 - }, - { - "structure": "village-tundra", - "rarity": 1000 - } - ], + "layers": [ { "minHeight": 3, diff --git a/biomes/mushroom/mushroom-ocean.json b/biomes/mushroom/mushroom-ocean.json index 2b1d9c43..03a4cd7f 100644 --- a/biomes/mushroom/mushroom-ocean.json +++ b/biomes/mushroom/mushroom-ocean.json @@ -269,11 +269,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/ocean/ocean-deep.json b/biomes/ocean/ocean-deep.json index 91963891..d1d6bb7d 100644 --- a/biomes/ocean/ocean-deep.json +++ b/biomes/ocean/ocean-deep.json @@ -5,7 +5,7 @@ "generators": [ { "generator": "smooth-dunes", - "max": -25, + "max": -30, "min": -50 } ], @@ -95,20 +95,32 @@ ] } ], - "loot": { - "tables": [ - "ocean-clutter", - "global-treasure", - "cold-food", - "tropical-treasure" - ] - }, "objects": [ + { + "underwater": true, + "waterloggable": true, + "chance": 0.008, + "mode": "FAST_MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": -360, + "max": 360 + } + }, + "place": [ + "ships/gall-1", + "ships/gall-2", + "ships/gall-3" + ] + }, { "place": [ "ships/generic" ], - "chance": 0.01, + "chance": 0.001, "onwater": true, "translate": { "y": -1 @@ -118,7 +130,7 @@ { "underwater": true, "waterloggable": true, - "chance": 0.2, + "chance": 0.01, "mode": "FAST_MIN_HEIGHT", "rotation": { "enabled": true, @@ -151,17 +163,6 @@ "shipwreck/upsidedown-backhalf", "shipwreck/upsidedown-backhalf-degraded" ] - }, - { - "place": [ - "ships/generic" - ], - "chance": 0.005, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true } ] } \ No newline at end of file diff --git a/biomes/savanna/savanna-beach.json b/biomes/savanna/savanna-beach.json index a07491a1..b44b03fc 100644 --- a/biomes/savanna/savanna-beach.json +++ b/biomes/savanna/savanna-beach.json @@ -58,11 +58,7 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/savanna/savanna-forest.json b/biomes/savanna/savanna-forest.json index 29de5593..04e3ee7a 100644 --- a/biomes/savanna/savanna-forest.json +++ b/biomes/savanna/savanna-forest.json @@ -335,11 +335,7 @@ } ], "biomeZoom": 20, - "loot": { - "tables": [ - "cactus-clutter" - ] - }, + "biomeStyle": { "style": "IRIS" }, diff --git a/biomes/swamp/swamp-beach.json b/biomes/swamp/swamp-beach.json index 5c323a96..80faeb1c 100644 --- a/biomes/swamp/swamp-beach.json +++ b/biomes/swamp/swamp-beach.json @@ -204,10 +204,5 @@ "y": -3 } } - ], - "loot": { - "tables": [ - "beach-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/swamp/swamp-lake.json b/biomes/swamp/swamp-lake.json index 0c97d3f6..3e3301d8 100644 --- a/biomes/swamp/swamp-lake.json +++ b/biomes/swamp/swamp-lake.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-marsh" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": -8, diff --git a/biomes/swamp/swamp-marsh.json b/biomes/swamp/swamp-marsh.json index 5d6d7fe8..4c895282 100644 --- a/biomes/swamp/swamp-marsh.json +++ b/biomes/swamp/swamp-marsh.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-marsh-rotten" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": 6, diff --git a/biomes/swamp/swamp-murky-cavern-gleaming.json b/biomes/swamp/swamp-murky-cavern-gleaming.json index d1e99bc8..de19445a 100644 --- a/biomes/swamp/swamp-murky-cavern-gleaming.json +++ b/biomes/swamp/swamp-murky-cavern-gleaming.json @@ -326,11 +326,6 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp/swamp-murky-cavern.json b/biomes/swamp/swamp-murky-cavern.json index 30cfb17a..c9c2da4e 100644 --- a/biomes/swamp/swamp-murky-cavern.json +++ b/biomes/swamp/swamp-murky-cavern.json @@ -166,11 +166,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp/swamp-ocean-tree.json b/biomes/swamp/swamp-ocean-tree.json index 18c3e312..a7dcd2cd 100644 --- a/biomes/swamp/swamp-ocean-tree.json +++ b/biomes/swamp/swamp-ocean-tree.json @@ -219,7 +219,7 @@ } }, { - "mode": "STILT", + "mode": "FAST_MIN_HEIGHT", "place": [ "tree/jungle/1", "tree/jungle/2", @@ -307,11 +307,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/swamp/swamp-ocean.json b/biomes/swamp/swamp-ocean.json index 5b8fda51..75f0c916 100644 --- a/biomes/swamp/swamp-ocean.json +++ b/biomes/swamp/swamp-ocean.json @@ -219,11 +219,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/swamp/swamp-roofed-forest.json b/biomes/swamp/swamp-roofed-forest.json index 47d62374..13a36883 100644 --- a/biomes/swamp/swamp-roofed-forest.json +++ b/biomes/swamp/swamp-roofed-forest.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-lake" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": 4, diff --git a/biomes/swamp/swamp-roofed-wayward.json b/biomes/swamp/swamp-roofed-wayward.json index c9c63e60..9999a1a6 100644 --- a/biomes/swamp/swamp-roofed-wayward.json +++ b/biomes/swamp/swamp-roofed-wayward.json @@ -5,16 +5,7 @@ "children": [ "swamp/swamp-lake" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], + "generators": [ { "min": -7, diff --git a/biomes/temperate/temperate-beach.json b/biomes/temperate/temperate-beach.json index f78bc784..8725f1b6 100644 --- a/biomes/temperate/temperate-beach.json +++ b/biomes/temperate/temperate-beach.json @@ -134,11 +134,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-birch-denmyre.json b/biomes/temperate/temperate-birch-denmyre.json index c51ba8ce..e9cff28d 100644 --- a/biomes/temperate/temperate-birch-denmyre.json +++ b/biomes/temperate/temperate-birch-denmyre.json @@ -55,16 +55,6 @@ ] } ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "decorators": [ { "chance": 0.01, @@ -391,11 +381,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-birch-forest.json b/biomes/temperate/temperate-birch-forest.json index fdd4ad09..5a979598 100644 --- a/biomes/temperate/temperate-birch-forest.json +++ b/biomes/temperate/temperate-birch-forest.json @@ -5,16 +5,7 @@ "children": [ "temperate/temperate-birch-denmyre" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], + "generators": [ { "min": 4, @@ -305,11 +296,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-bonsai.json b/biomes/temperate/temperate-bonsai.json index 903c6d0d..580b22ed 100644 --- a/biomes/temperate/temperate-bonsai.json +++ b/biomes/temperate/temperate-bonsai.json @@ -5,16 +5,6 @@ "children": [ "temperate/temperate-plain-hills" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/temperate/temperate-cracked-cavern.json b/biomes/temperate/temperate-cracked-cavern.json index 396ae4f2..5a47d810 100644 --- a/biomes/temperate/temperate-cracked-cavern.json +++ b/biomes/temperate/temperate-cracked-cavern.json @@ -136,11 +136,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-flower-forest.json b/biomes/temperate/temperate-flower-forest.json index 3a4fb1b5..75bab842 100644 --- a/biomes/temperate/temperate-flower-forest.json +++ b/biomes/temperate/temperate-flower-forest.json @@ -705,11 +705,7 @@ }] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-highlands.json b/biomes/temperate/temperate-highlands.json index 8bc046bb..d3c30c1b 100644 --- a/biomes/temperate/temperate-highlands.json +++ b/biomes/temperate/temperate-highlands.json @@ -2,12 +2,6 @@ "name": "Temperate Highlands", "derivative": "FOREST", "vanillaDerivative": "PLAINS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 12, diff --git a/biomes/temperate/temperate-island.json b/biomes/temperate/temperate-island.json index 2ef98d0b..8d07d147 100644 --- a/biomes/temperate/temperate-island.json +++ b/biomes/temperate/temperate-island.json @@ -5,16 +5,7 @@ "children": [ "temperate/temperate-wilds" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], + "generators": [ { "min": 28, diff --git a/biomes/temperate/temperate-lit-cavern.json b/biomes/temperate/temperate-lit-cavern.json index bd7eb938..6e6587bd 100644 --- a/biomes/temperate/temperate-lit-cavern.json +++ b/biomes/temperate/temperate-lit-cavern.json @@ -130,11 +130,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-beach.json b/biomes/temperate/temperate-oak-beach.json index 56b786ff..ae7d922c 100644 --- a/biomes/temperate/temperate-oak-beach.json +++ b/biomes/temperate/temperate-oak-beach.json @@ -174,11 +174,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-denmyre.json b/biomes/temperate/temperate-oak-denmyre.json index 4fe05752..5df0aef5 100644 --- a/biomes/temperate/temperate-oak-denmyre.json +++ b/biomes/temperate/temperate-oak-denmyre.json @@ -2,16 +2,6 @@ "name": "Temperate Oak Denmyre", "derivative": "FOREST", "vanillaDerivative": "FOREST", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, @@ -401,11 +391,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-forest.json b/biomes/temperate/temperate-oak-forest.json index 9ad4bc01..ae7accd6 100644 --- a/biomes/temperate/temperate-oak-forest.json +++ b/biomes/temperate/temperate-oak-forest.json @@ -5,16 +5,6 @@ "children": [ "temperate/temperate-oak-denmyre" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, @@ -459,11 +449,6 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-ocean-deep.json b/biomes/temperate/temperate-ocean-deep.json index f9f3c672..385c319a 100644 --- a/biomes/temperate/temperate-ocean-deep.json +++ b/biomes/temperate/temperate-ocean-deep.json @@ -140,7 +140,7 @@ ], "objects": [ { - "chance": 0.01, + "chance": 0.001, "density": 1, "rotation": { "yAxis": { @@ -180,7 +180,7 @@ } }, { - "chance": 0.05, + "chance": 0.008, "density": 1, "rotation": { "yAxis": { @@ -196,15 +196,7 @@ "ships/gall-1", "ships/gall-2", "ships/gall-3" - ], - "clamp": { - "minimumHeight": 4 - }, - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + ] }, { "chance": 0.01, @@ -232,11 +224,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-ocean.json b/biomes/temperate/temperate-ocean.json index 7e0bdb9b..1216fb07 100644 --- a/biomes/temperate/temperate-ocean.json +++ b/biomes/temperate/temperate-ocean.json @@ -234,11 +234,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-plains.json b/biomes/temperate/temperate-plains.json index 4e1471a1..17e001e9 100644 --- a/biomes/temperate/temperate-plains.json +++ b/biomes/temperate/temperate-plains.json @@ -6,16 +6,6 @@ "temperate/temperate-plain-hills", "temperate/temperate-wilds" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, diff --git a/biomes/temperate/temperate-plateau.json b/biomes/temperate/temperate-plateau.json index aeb09ef5..15ca6666 100644 --- a/biomes/temperate/temperate-plateau.json +++ b/biomes/temperate/temperate-plateau.json @@ -437,11 +437,7 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-river.json b/biomes/temperate/temperate-river.json index 97758e09..d496ac2f 100644 --- a/biomes/temperate/temperate-river.json +++ b/biomes/temperate/temperate-river.json @@ -172,10 +172,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/temperate/temperate-wilds.json b/biomes/temperate/temperate-wilds.json index 4e5375a9..274c5fd0 100644 --- a/biomes/temperate/temperate-wilds.json +++ b/biomes/temperate/temperate-wilds.json @@ -5,12 +5,6 @@ "children": [ "temperate/temperate-highlands" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "decorators": [ { "chance": 0.22, diff --git a/biomes/tropical/tropical-beach-bamboo.json b/biomes/tropical/tropical-beach-bamboo.json index 1d10250c..bba358de 100644 --- a/biomes/tropical/tropical-beach-bamboo.json +++ b/biomes/tropical/tropical-beach-bamboo.json @@ -197,11 +197,6 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-beach-charred.json b/biomes/tropical/tropical-beach-charred.json index 591afc77..7dba4fd8 100644 --- a/biomes/tropical/tropical-beach-charred.json +++ b/biomes/tropical/tropical-beach-charred.json @@ -126,11 +126,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-beach.json b/biomes/tropical/tropical-beach.json index 3f6061d5..17ef6a65 100644 --- a/biomes/tropical/tropical-beach.json +++ b/biomes/tropical/tropical-beach.json @@ -155,11 +155,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-cavern-coral.json b/biomes/tropical/tropical-cavern-coral.json index ee08e206..40eeee1a 100644 --- a/biomes/tropical/tropical-cavern-coral.json +++ b/biomes/tropical/tropical-cavern-coral.json @@ -234,11 +234,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical/tropical-cavern.json b/biomes/tropical/tropical-cavern.json index 33a7e960..1591dcb7 100644 --- a/biomes/tropical/tropical-cavern.json +++ b/biomes/tropical/tropical-cavern.json @@ -143,11 +143,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical/tropical-coral-ocean-cliffs.json b/biomes/tropical/tropical-coral-ocean-cliffs.json index 2be62633..8cb5accf 100644 --- a/biomes/tropical/tropical-coral-ocean-cliffs.json +++ b/biomes/tropical/tropical-coral-ocean-cliffs.json @@ -1719,11 +1719,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-coral-ocean.json b/biomes/tropical/tropical-coral-ocean.json index 67923fa2..91310d9f 100644 --- a/biomes/tropical/tropical-coral-ocean.json +++ b/biomes/tropical/tropical-coral-ocean.json @@ -1692,11 +1692,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-highlands.json b/biomes/tropical/tropical-highlands.json index f025c8e5..b612a03c 100644 --- a/biomes/tropical/tropical-highlands.json +++ b/biomes/tropical/tropical-highlands.json @@ -2,12 +2,6 @@ "name": "Tropical Highlands", "derivative": "JUNGLE", "vanillaDerivative": "PLAINS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 22, diff --git a/biomes/tropical/tropical-island-beach.json b/biomes/tropical/tropical-island-beach.json index 72d30466..cba4a0c8 100644 --- a/biomes/tropical/tropical-island-beach.json +++ b/biomes/tropical/tropical-island-beach.json @@ -153,11 +153,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-ocean.json b/biomes/tropical/tropical-ocean.json index a8d02624..7d1aa7c5 100644 --- a/biomes/tropical/tropical-ocean.json +++ b/biomes/tropical/tropical-ocean.json @@ -353,11 +353,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-rainforest-wicked-village.json b/biomes/tropical/tropical-rainforest-wicked-village.json index 618fd6fb..8248811a 100644 --- a/biomes/tropical/tropical-rainforest-wicked-village.json +++ b/biomes/tropical/tropical-rainforest-wicked-village.json @@ -2,16 +2,6 @@ "name": "Tropical Rainforest Wicked Village", "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 50, - "structure": "village-temperate" - } - ], "generators": [ { "min": 3, diff --git a/biomes/tropical/tropical-river-steep.json b/biomes/tropical/tropical-river-steep.json index cc2b5257..838708e8 100644 --- a/biomes/tropical/tropical-river-steep.json +++ b/biomes/tropical/tropical-river-steep.json @@ -189,10 +189,5 @@ }, "waterloggable": true } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/tropical/tropical-submerged-volcanic.json b/biomes/tropical/tropical-submerged-volcanic.json index 3c743037..b7c8bdeb 100644 --- a/biomes/tropical/tropical-submerged-volcanic.json +++ b/biomes/tropical/tropical-submerged-volcanic.json @@ -90,11 +90,7 @@ "particleCount": 0 } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical/tropical-wilds.json b/biomes/tropical/tropical-wilds.json index b1681973..1cd02603 100644 --- a/biomes/tropical/tropical-wilds.json +++ b/biomes/tropical/tropical-wilds.json @@ -5,12 +5,6 @@ "children": [ "tropical/tropical-highlands" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 4, diff --git a/biomes/tundra/tundra-beach.json b/biomes/tundra/tundra-beach.json index 10419817..e54c141b 100644 --- a/biomes/tundra/tundra-beach.json +++ b/biomes/tundra/tundra-beach.json @@ -201,11 +201,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra/tundra-bonsai-forest.json b/biomes/tundra/tundra-bonsai-forest.json index a06b2275..a70a0a4f 100644 --- a/biomes/tundra/tundra-bonsai-forest.json +++ b/biomes/tundra/tundra-bonsai-forest.json @@ -6,16 +6,6 @@ "tundra/tundra-sequia-redwoods", "tundra/tundra-redwood-cliffs" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 17, diff --git a/biomes/tundra/tundra-cavern.json b/biomes/tundra/tundra-cavern.json index 309bf5e0..f68a4246 100644 --- a/biomes/tundra/tundra-cavern.json +++ b/biomes/tundra/tundra-cavern.json @@ -124,11 +124,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/biomes/tundra/tundra-lake.json b/biomes/tundra/tundra-lake.json index 7efdbb87..3fdd40e8 100644 --- a/biomes/tundra/tundra-lake.json +++ b/biomes/tundra/tundra-lake.json @@ -2,16 +2,6 @@ "name": "Tundra Lake", "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": -30, diff --git a/biomes/tundra/tundra-redwood-forest.json b/biomes/tundra/tundra-redwood-forest.json index 820909a5..f34b6db6 100644 --- a/biomes/tundra/tundra-redwood-forest.json +++ b/biomes/tundra/tundra-redwood-forest.json @@ -75,16 +75,7 @@ {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7} ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "wall": { "style": { "style": "FRACTAL_WATER" diff --git a/biomes/tundra/tundra-river-rocky.json b/biomes/tundra/tundra-river-rocky.json index 51545c30..a729e0d9 100644 --- a/biomes/tundra/tundra-river-rocky.json +++ b/biomes/tundra/tundra-river-rocky.json @@ -230,11 +230,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/tundra/tundra-river.json b/biomes/tundra/tundra-river.json index 43de040d..c5765898 100644 --- a/biomes/tundra/tundra-river.json +++ b/biomes/tundra/tundra-river.json @@ -191,11 +191,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/tundra/tundra-sequia-redwoods.json b/biomes/tundra/tundra-sequia-redwoods.json index aa443ae5..9e3f0bdd 100644 --- a/biomes/tundra/tundra-sequia-redwoods.json +++ b/biomes/tundra/tundra-sequia-redwoods.json @@ -2,16 +2,7 @@ "name": "Tundra Sequoia Redwoods", "derivative": "TAIGA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 17, diff --git a/biomes/tundra/tundra-spiked-cavern.json b/biomes/tundra/tundra-spiked-cavern.json index fb511014..6496a0b0 100644 --- a/biomes/tundra/tundra-spiked-cavern.json +++ b/biomes/tundra/tundra-spiked-cavern.json @@ -2,16 +2,6 @@ "name": "Tundra Spiked Cavern", "derivative": "FROZEN_OCEAN", "vanillaDerivative": "THE_VOID", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, @@ -196,11 +186,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/biomes/tundra/tundra-spruce-denmyre.json b/biomes/tundra/tundra-spruce-denmyre.json index d88918ae..84357eb2 100644 --- a/biomes/tundra/tundra-spruce-denmyre.json +++ b/biomes/tundra/tundra-spruce-denmyre.json @@ -2,16 +2,7 @@ "name": "Tundra Spruce Denmyre", "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 4, diff --git a/biomes/tundra/tundra-taiga.json b/biomes/tundra/tundra-taiga.json index f4cd288a..5fdf689f 100644 --- a/biomes/tundra/tundra-taiga.json +++ b/biomes/tundra/tundra-taiga.json @@ -2,16 +2,7 @@ "name": "Tundra Taiga", "derivative": "GIANT_TREE_TAIGA", "vanillaDerivative": "TAIGA", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 5, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 20fa55a6..d892f743 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -82,11 +82,86 @@ "deposits": [ { "minHeight": 19, - "maxPerChunk": 12, + "maxPerChunk": 4, "maxHeight": 150, - "minPerChunk": 4, - "minSize": 22, - "maxSize": 32, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [ + { + "block": "granite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [ + { + "block": "andesite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [ + { + "block": "diorite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [ + { + "block": "gravel" + } + + ], + "varience": 2 + }, + { + "minHeight": 0, + "maxPerChunk": 2, + "maxHeight": 13, + "minPerChunk": 0, + "minSize": 5, + "maxSize": 10, + "palette": [ + { + "block": "deepslate" + } + + ], + "varience": 2 + }, + { + "minHeight": 0, + "maxPerChunk": 4, + "maxHeight": 28, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "dirt" @@ -94,64 +169,9 @@ { "block": "coarse_dirt" } + ], - "varience": 4 - }, - { - "minHeight": 45, - "maxPerChunk": 12, - "maxHeight": 140, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "gravel" - } - ], - "varience": 4 - }, - { - "minHeight": 25, - "maxPerChunk": 12, - "maxHeight": 95, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "andesite" - } - ], - "varience": 4 - }, - { - "minHeight": 35, - "maxPerChunk": 12, - "maxHeight": 100, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "granite" - } - ], - "varience": 4 - }, - { - "minHeight": 45, - "maxPerChunk": 12, - "maxHeight": 115, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "diorite" - } - ], - "varience": 4 + "varience": 2 }, { "minHeight": 2, @@ -228,11 +248,11 @@ }, { "minHeight": 1, - "maxPerChunk": 12, + "maxPerChunk": 10, "maxHeight": 64, - "minPerChunk": 4, + "minPerChunk": 8, "minSize": 4, - "maxSize": 8, + "maxSize": 9, "palette": [ { "block": "copper_ore" @@ -254,32 +274,9 @@ ], "varience": 9 } + ], - "rockPalette": { - "palette": [ - { - "weight": 10, - "block": "stone" - }, - { - "block": "granite" - }, - { - "block": "andesite" - }, - { - "block": "deepslate" - } - ], - "style": { - "style": "IRIS_THICK", - "zoom": 1.26, - "fracture": { - "style": "STATIC", - "multiplier": 3 - } - } - }, + "CAVES": "All settings in regards to caves. Contains a toggle and the cave carve layers.", "caves": true, diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index 73d4b0b5..2c657717 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -1,26 +1,23 @@ { "name": "Beach Clutter", - "rarity": 2, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { "type": "sugar_cane", "maxAmount": 12, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "fishing_rod", "maxAmount": 1, - "rarity": 11, "minDurability": 0.5, "slotTypes": "STORAGE" }, { "type": "sugar", "maxAmount": 3, - "rarity": 4, "slotTypes": "STORAGE" } ] diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index ca58cb4b..0f8fd608 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -1,19 +1,17 @@ { "name": "Cactus Clutter", - "rarity": 5, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 1, "minPicked": 1, "loot": [ { "type": "cactus", "maxAmount": 3, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "green_dye", "maxAmount": 6, - "rarity": 3, "slotTypes": "STORAGE" } ] diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 71c8aaaf..2a60129b 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -1,25 +1,32 @@ { "name": "Cave Clutter", - "rarity": 2, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { "type": "torch", "maxAmount": 7, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "cobblestone", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "lantern", "maxAmount": 1, - "rarity": 9, + "slotTypes": "STORAGE" + }, + { + "type": "cobbled_deepslate", + "maxAmount": 16, + "slotTypes": "STORAGE" + }, + { + "type": "deepslate", + "maxAmount": 10, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-food.json b/loot/cold-food.json index ab4d0a47..70645d89 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -1,37 +1,32 @@ { "name": "Cold Food", - "rarity": 2, - "maxPicked": 4, - "minPicked": 1, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 7, - "rarity": 1, "slotTypes": "STORAGE" }, { "type": "wheat_seeds", "maxAmount": 7, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "poisonous_potato", "maxAmount": 1, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "sweet_berries", "maxAmount": 4, - "rarity": 1, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index a162f258..8af1be2b 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -1,44 +1,39 @@ { "name": "Cold Treasure", "rarity": 1, - "maxPicked": 3, - "minPicked": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "iron_nugget", "maxAmount": 12, "minAmount": 3, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "iron_ingot", "maxAmount": 5, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "emerald", "maxamount": 5, - "rarity": 6, "slottypes": "STORAGE" }, { "type": "emerald_block", "maxamount": 1, - "rarity": 14, "slottypes": "STORAGE" }, { "type": "iron_block", "maxamount": 3, - "rarity": 11, "slottypes": "STORAGE" }, { "type": "leather_leggings", "maxAmount": 1, - "rarity": 97, + "rarity": 10, "minDurability": 0.93, "maxDurability": 1, "displayName": "Lucky Pyro Pants", diff --git a/loot/forest-food.json b/loot/forest-food.json index db251962..9303bb50 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -1,50 +1,44 @@ { "name": "Forest Food", - "rarity": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "apple", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "oak_sapling", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "spruce_sapling", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "dark_oak_sapling", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "oak_planks", "maxAmount": 19, - "rarity": 3, "slotTypes": "STORAGE" },{ "type": "chest", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" },{ "type": "stone_axe", "maxAmount": 2, - "rarity": 3, "slotTypes": "STORAGE" },{ - "type": "grass_path", + "type": "dirt_path", "maxAmount": 8, - "rarity": 3, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index 08309522..9eb60690 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -1,35 +1,28 @@ { "name": "Frozen Clutter", - "rarity": 6, + "maxPicked": 2, + "minPicked": 1, + "rarity": 1, "loot": [ { "type": "blackstone", "maxAmount": 12, - "rarity": 7, "slotTypes": "STORAGE" }, { "type": "stone_bricks", "maxAmount": 12, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "zombie_head", + "rarity": 3, "maxAmount": 1, - "rarity": 20, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 6, - "rarity": 5, - "slotTypes": "STORAGE" - }, - { - "type": "zombie_head", - "maxAmount": 1, - "rarity": 20, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-food.json b/loot/frozen-food.json index ff547128..5ca1141f 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -1,48 +1,42 @@ { "name": "Frozen Food", - "rarity": 2, + "rarity": 1, "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "spider_eye", "maxAmount": 1, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "beetroot_soup", "maxAmount": 1, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "cookie", "maxAmount": 4, - "rarity": 7, "slotTypes": "STORAGE" }, { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "pumpkin_pie", "maxAmount": 1, - "rarity": 8, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 11, - "rarity": 1, "slotTypes": "STORAGE" }, { "type": "baked_potato", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 9ab9bab4..ee624739 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -1,61 +1,52 @@ { "name": "Global Clutter", - "rarity": 4, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { "type": "stone", "maxAmount": 12, - "rarity": 12, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 7, - "rarity": 7, "slotTypes": "STORAGE" }, { "type": "flint", "maxAmount": 3, - "rarity": 14, "slotTypes": "STORAGE" }, { "type": "leather", "maxAmount": 4, - "rarity": 10, "slotTypes": "STORAGE" }, { "type": "book", "maxAmount": 2, - "rarity": 17, "slotTypes": "STORAGE" }, { "type": "ladder", "maxAmount": 12, - "rarity": 10, "slotTypes": "STORAGE" }, { "type": "stone_axe", "maxAmount": 1, - "rarity": 10, "slotTypes": "STORAGE" }, { "type": "stone_pickaxe", "maxAmount": 1, - "rarity": 10, "slotTypes": "STORAGE" }, { "type": "stone_sword", "maxAmount": 1, - "rarity": 10, "slotTypes": "STORAGE" } ] diff --git a/loot/global-tools.json b/loot/global-tools.json index c12d42f6..8c267521 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -1,13 +1,12 @@ { "name": "Global Tools", - "rarity": 3, + "rarity": 2, "maxPicked": 2, "minPicked": 0, "loot": [ { "type": "wooden_pickaxe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -15,7 +14,6 @@ { "type": "flint_and_steel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -23,7 +21,6 @@ ,{ "type": "shears", "maxamount": 1, - "rarity": 7, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -31,7 +28,6 @@ { "type": "bow", "maxamount": 1, - "rarity": 8, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -39,13 +35,11 @@ { "type": "arrow", "maxamount": 21, - "rarity": 8, "slottypes": "STORAGE" }, { "type": "stone_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -53,7 +47,6 @@ { "type": "iron_pickaxe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -61,7 +54,6 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 30, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -69,7 +61,6 @@ { "type": "golden_pickaxe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -77,7 +68,6 @@ { "type": "wooden_sword", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -85,7 +75,6 @@ { "type": "stone_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -93,7 +82,6 @@ { "type": "iron_sword", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -101,7 +89,6 @@ { "type": "diamond_sword", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -109,7 +96,6 @@ { "type": "golden_sword", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -117,7 +103,6 @@ { "type": "wooden_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -125,7 +110,6 @@ { "type": "stone_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -133,7 +117,6 @@ { "type": "iron_axe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -141,7 +124,6 @@ { "type": "diamond_axe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -149,7 +131,6 @@ { "type": "golden_axe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -157,7 +138,6 @@ { "type": "wooden_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -165,7 +145,6 @@ { "type": "stone_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -173,7 +152,6 @@ { "type": "iron_hoe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -181,7 +159,6 @@ { "type": "diamond_hoe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -189,7 +166,6 @@ { "type": "golden_hoe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -197,7 +173,6 @@ { "type": "wooden_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -205,7 +180,6 @@ { "type": "stone_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -213,7 +187,6 @@ { "type": "iron_shovel", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -221,7 +194,6 @@ { "type": "diamond_shovel", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -229,7 +201,6 @@ { "type": "golden_shovel", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" diff --git a/loot/global-treasure.json b/loot/global-treasure.json index c8f18fb9..b582d47d 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -1,56 +1,48 @@ { "name": "Global Treasure", - "rarity": 2, + "rarity": 1, "maxPicked": 2, "minPicked": 1, "loot": [ { "type": "diamond", "maxamount": 2, - "rarity": 6, "slottypes": "STORAGE" }, { "type": "ender_pearl", "maxamount": 3, - "rarity": 9, "slottypes": "STORAGE" }, { "type": "name_tag", "maxamount": 1, - "rarity": 10, "slottypes": "STORAGE" }, { "type": "obsidian", "maxamount": 1, - "rarity": 3, "slottypes": "STORAGE" }, { "type": "iron_ingot", "maxamount": 5, - "rarity": 3, "slottypes": "STORAGE" }, { "type": "iron_nugget", "maxamount": 7, - "rarity": 1, "slottypes": "STORAGE" }, { "type": "gold_nugget", "maxamount": 6, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "redstone", "maxamount": 11, "minAmount": 4, - "rarity": 4, "slottypes": "STORAGE" } ] diff --git a/loot/hot-food.json b/loot/hot-food.json index d939921b..cb42379f 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -1,18 +1,17 @@ { "name": "Hot Food", - "rarity": 2, - "minPicked": 1, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "rotten_flesh", "maxAmount": 3, - "rarity": 1, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 6, - "rarity": 3, "slotTypes": "STORAGE" } ] diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index 01bfef59..1227d34f 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -2,36 +2,31 @@ "name": "Hot Treasure", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "lapis_lazuli", "maxAmount": 12, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "gold_ingot", "maxAmount": 5, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "gold_nugget", "maxAmount": 8, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "blaze_powder", "maxAmount": 1, - "rarity": 38, "slotTypes": "STORAGE" }, { "type": "golden_boots", "maxAmount": 1, - "rarity": 85, "minDurability": 0.93, "maxDurability": 1, "displayName": "Golden Dashers", diff --git a/loot/mushroom-clutter.json b/loot/mushroom-clutter.json index a9fba882..87bbadd3 100644 --- a/loot/mushroom-clutter.json +++ b/loot/mushroom-clutter.json @@ -1,30 +1,27 @@ { "name": "Mushroom Clutter", - "rarity": 4, - "maxPicked": 3, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "red_mushroom", "maxAmount": 5, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 5, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "warped_fungus", "maxAmount": 3, - "rarity": 21, "slotTypes": "STORAGE" }, { "type": "crimson_fungus", "maxAmount": 3, - "rarity": 21, "slotTypes": "STORAGE" } ] diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 49ef8541..94139a98 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -1,24 +1,22 @@ { "name": "Mushroom Food", - "rarity": 2, - "maxPicked": 3, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "spider_eye", "maxAmount": 3, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "beetroot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "mushroom_stew", "maxAmount": 1, - "rarity": 7, "slotTypes": "STORAGE" } ] diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index a286c2b4..9a7e93d8 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -1,43 +1,37 @@ { "name": "Ocean Clutter", - "rarity": 3, - "maxPicked": 5, - "minPicked": 3, + "rarity": 1, + "maxPicked": 3, + "minPicked": 1, "loot": [ { "type": "wet_sponge", "maxAmount": 5, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "sponge", "maxAmount": 2, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "kelp", "maxAmount": 27, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "fishing_rod", "maxAmount": 1, - "rarity": 11, "slotTypes": "STORAGE" }, { "type": "pufferfish", "maxAmount": 2, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "turtle_helmet", "maxAmount": 1, - "rarity": 36, "enchantments": [ { "enchantment": "OXYGEN", @@ -104,7 +98,7 @@ { "type": "trident", "maxAmount": 1, - "rarity": 36, + "rarity": 2, "enchantments": [ { "enchantment": "CHANNELING", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index cca0e1ee..74bfc7f3 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -1,24 +1,22 @@ { "name": "Snow Clutter", - "rarity": 3, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { "type": "snowball", "maxAmount": 9, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "packed_ice", "maxAmount": 3, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "blue_ice", "maxAmount": 2, - "rarity": 9, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-clutter.json b/loot/swamp-clutter.json index b085bbf8..846ed3e8 100644 --- a/loot/swamp-clutter.json +++ b/loot/swamp-clutter.json @@ -1,48 +1,42 @@ { "name": "Swamp Clutter", - "rarity": 4, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "string", "maxAmount": 5, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "red_mushroom", "maxAmount": 2, - "rarity": 14, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 2, - "rarity": 14, "slotTypes": "STORAGE" }, { "type": "cobweb", "maxAmount": 2, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "dark_prismarine", "maxAmount": 2, - "rarity": 10, "slotTypes": "STORAGE" }, { "type": "diamond", "maxAmount": 2, - "rarity": 14, "slotTypes": "STORAGE" }, { "type": "coal", "maxAmount": 16, - "rarity": 3, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 9f72bb82..4d08b17e 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -1,30 +1,27 @@ { "name": "Swamp Food", - "rarity": 2, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "spider_eye", "maxAmount": 3, - "rarity": 6, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "beetroot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "poisonous_potato", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/temperate-clutter.json b/loot/temperate-clutter.json index c2b90c99..f1518ccd 100644 --- a/loot/temperate-clutter.json +++ b/loot/temperate-clutter.json @@ -1,24 +1,22 @@ { "name": "Temperate Clutter", - "rarity": 4, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "oak_planks", "maxAmount": 3, - "rarity": 6, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 4, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "oak_wood", "maxAmount": 3, - "rarity": 12, "slotTypes": "STORAGE" } diff --git a/loot/temperate-food.json b/loot/temperate-food.json index 35151a60..b8ebf434 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -1,30 +1,27 @@ { "name": "Temperate Food", - "rarity": 2, - "minPicked": 1, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "bread", "maxAmount": 2, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 7, - "rarity": 1, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 3, "slotTypes": "STORAGE" }, { "type": "wheat_seeds", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/tropical-food.json b/loot/tropical-food.json index 5888cf46..25bef202 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -1,30 +1,27 @@ { "name": "Tropical Food", - "rarity": 2, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "melon_slice", "maxAmount": 9, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cookie", "maxAmount": 3, - "rarity": 5, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 3, - "rarity": 1, "slotTypes": "STORAGE" }, { "type": "cocoa_beans", "maxAmount": 3, - "rarity": 1, "slotTypes": "STORAGE" } ] diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index af36eab4..d9e0760d 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -1,13 +1,12 @@ { "name": "Tropical Treasure", - "rarity": 5, - "maxPicked": 3, - "minPicked": 1, + "rarity": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "wooden_pickaxe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -15,7 +14,6 @@ { "type": "flint_and_steel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -23,7 +21,6 @@ ,{ "type": "shears", "maxamount": 1, - "rarity": 7, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -31,7 +28,6 @@ { "type": "bow", "maxamount": 1, - "rarity": 8, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -39,13 +35,11 @@ { "type": "arrow", "maxamount": 21, - "rarity": 8, "slottypes": "STORAGE" }, { "type": "stone_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -53,7 +47,6 @@ { "type": "iron_pickaxe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -61,7 +54,6 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -69,7 +61,6 @@ { "type": "golden_pickaxe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -77,7 +68,6 @@ { "type": "wooden_sword", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -85,7 +75,6 @@ { "type": "stone_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -93,7 +82,6 @@ { "type": "iron_sword", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -101,7 +89,6 @@ { "type": "diamond_sword", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -109,7 +96,6 @@ { "type": "golden_sword", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -117,7 +103,6 @@ { "type": "wooden_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -125,7 +110,6 @@ { "type": "stone_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -133,7 +117,6 @@ { "type": "iron_axe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -141,7 +124,6 @@ { "type": "diamond_axe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -149,7 +131,6 @@ { "type": "golden_axe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -157,7 +138,6 @@ { "type": "wooden_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -165,7 +145,6 @@ { "type": "stone_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -173,7 +152,6 @@ { "type": "iron_hoe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -181,7 +159,6 @@ { "type": "diamond_hoe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -189,7 +166,6 @@ { "type": "golden_hoe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -197,7 +173,6 @@ { "type": "wooden_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -205,7 +180,6 @@ { "type": "stone_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -213,7 +187,6 @@ { "type": "iron_shovel", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -221,7 +194,6 @@ { "type": "diamond_shovel", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -229,7 +201,6 @@ { "type": "golden_shovel", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" diff --git a/objects/amethyst/ame1.iob b/objects/amethyst/ame1.iob new file mode 100644 index 00000000..3dbb6f55 Binary files /dev/null and b/objects/amethyst/ame1.iob differ diff --git a/objects/amethyst/ame2.iob b/objects/amethyst/ame2.iob new file mode 100644 index 00000000..8d73f5f9 Binary files /dev/null and b/objects/amethyst/ame2.iob differ diff --git a/objects/amethyst/ame3.iob b/objects/amethyst/ame3.iob new file mode 100644 index 00000000..d05c4e2d Binary files /dev/null and b/objects/amethyst/ame3.iob differ diff --git a/objects/amethyst/ame4.iob b/objects/amethyst/ame4.iob new file mode 100644 index 00000000..f598a0be Binary files /dev/null and b/objects/amethyst/ame4.iob differ diff --git a/objects/amethyst/ame5.iob b/objects/amethyst/ame5.iob new file mode 100644 index 00000000..40cc688a Binary files /dev/null and b/objects/amethyst/ame5.iob differ diff --git a/objects/amethyst/ame6.iob b/objects/amethyst/ame6.iob new file mode 100644 index 00000000..3ca7aa51 Binary files /dev/null and b/objects/amethyst/ame6.iob differ diff --git a/objects/deepslate/ds1.iob b/objects/deepslate/ds1.iob new file mode 100644 index 00000000..d960031a Binary files /dev/null and b/objects/deepslate/ds1.iob differ diff --git a/objects/deepslate/ds2.iob b/objects/deepslate/ds2.iob new file mode 100644 index 00000000..9df90fb8 Binary files /dev/null and b/objects/deepslate/ds2.iob differ diff --git a/objects/deepslate/ds3.iob b/objects/deepslate/ds3.iob new file mode 100644 index 00000000..4bd3db29 Binary files /dev/null and b/objects/deepslate/ds3.iob differ diff --git a/objects/BarcoPirataGriffer.iob b/objects/zzz/BarcoPirataGriffer.iob similarity index 100% rename from objects/BarcoPirataGriffer.iob rename to objects/zzz/BarcoPirataGriffer.iob diff --git a/objects/FT_1.iob b/objects/zzz/FT_1.iob similarity index 100% rename from objects/FT_1.iob rename to objects/zzz/FT_1.iob diff --git a/objects/cave1.iob b/objects/zzz/cave1.iob similarity index 100% rename from objects/cave1.iob rename to objects/zzz/cave1.iob diff --git a/objects/cave2.iob b/objects/zzz/cave2.iob similarity index 100% rename from objects/cave2.iob rename to objects/zzz/cave2.iob diff --git a/objects/grass.iob b/objects/zzz/grass.iob similarity index 100% rename from objects/grass.iob rename to objects/zzz/grass.iob diff --git a/objects/grid.iob b/objects/zzz/grid.iob similarity index 100% rename from objects/grid.iob rename to objects/zzz/grid.iob diff --git a/objects/mansion_roof.iob b/objects/zzz/mansion_roof.iob similarity index 100% rename from objects/mansion_roof.iob rename to objects/zzz/mansion_roof.iob diff --git a/objects/mansion_vanilla_1.iob b/objects/zzz/mansion_vanilla_1.iob similarity index 100% rename from objects/mansion_vanilla_1.iob rename to objects/zzz/mansion_vanilla_1.iob diff --git a/objects/mansion_vanilla_2.iob b/objects/zzz/mansion_vanilla_2.iob similarity index 100% rename from objects/mansion_vanilla_2.iob rename to objects/zzz/mansion_vanilla_2.iob diff --git a/objects/mansion_vanilla_3.iob b/objects/zzz/mansion_vanilla_3.iob similarity index 100% rename from objects/mansion_vanilla_3.iob rename to objects/zzz/mansion_vanilla_3.iob diff --git a/regions/frozen.json b/regions/frozen.json index b20fd067..806e1495 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -23,15 +23,6 @@ "riverBiomes": [ "frozen/frozen-river" ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], "spotBiomes": [ { "biome": "frozen/frozen-ocean", @@ -79,14 +70,113 @@ "shoreHeightMin": 2.2, "shoreHeightMax": 4.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "frozen-clutter", "frozen-food", "snow-clutter", - "cold-treasure", - "frozen-clutter" + "cold-food", + "cold-treasure" ] }, + "jigsawStructures": [ + { + "rarity": 1000, + "structure": "igloo" + }, + { + "rarity": 1000, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-snowy" + } + ], "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + }, { "name": "standard-surface-portals", "chance": 0.001, @@ -170,6 +260,7 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" } + ], "shoreHeightZoom": 1.14, "riverThickness": 0.006, diff --git a/regions/hot.json b/regions/hot.json index b99cb495..e7525d54 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -14,7 +14,8 @@ "hot/hot-ocean" ], "caveBiomes": [ - "hot/hot-sandy-cave" + "hot/hot-sandy-cave", + "hot/hot-sandy-red-cave" ], "riverStyle": { "style": "VASCULAR", @@ -27,12 +28,16 @@ }, "jigsawStructures": [ { - "rarity": 2000, + "rarity": 1000, "structure": "pillager" }, { - "rarity": 1050, + "rarity": 500, "structure": "village-hot" + }, + { + "rarity": 1500, + "structure": "desert-pyramid" } ], "biomeImplosionRatio": 0.25, @@ -153,6 +158,85 @@ } ], "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + }, { "name": "standard-surface-portals", "chance": 0.001, @@ -240,10 +324,15 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", "hot-food", "hot-treasure", - "global-tools" + "cactus-clutter" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/mesa.json b/regions/mesa.json index a8738c9c..baa09fbb 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -20,15 +20,6 @@ "riverBiomes": [ "mesa/mesa-river" ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], "spotBiomes": [ { "biome": "hot/hot-ocean", @@ -48,6 +39,87 @@ "zoom": 5 } }, + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "deposits": [ { "minHeight": 8, @@ -64,6 +136,17 @@ "varience": 4 } ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "hot-treasure", + "hot-food" + ] + }, "riverRarity": 1, "landBiomeZoom": 1.5, "shoreHeightMin": 4, diff --git a/regions/mountain.json b/regions/mountain.json index d858eb89..98b6bdf3 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -23,20 +23,15 @@ "riverBiomes": [ "mountain/mountain-river" ], - "structures": [ + + "jigsawStructures": [ { - "tileset": "murky-stronghold", - "height": 26, - "rarity": 10, - "ratio": 0.9, - "zoom": 0.5 + "rarity": 750, + "structure": "pillager" }, { - "tileset": "ruins", - "rarity": 25, - "shuffle": 22, - "ratio": 0.9, - "zoom": 0.5 + "rarity": 500, + "structure": "village-tundra" } ], "biomeImplosionRatio": 0.25, @@ -59,6 +54,87 @@ "varience": 4 } ], + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "riverRarity": 200, "landBiomeZoom": 1.9, "lakes": false, @@ -76,6 +152,17 @@ "zoom": 1 } }, + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "cold-food", + "cold-treasure" + ] + }, "shoreHeightMin": 2.2, "shoreHeightMax": 1.2, "shoreHeightZoom": 1.14, diff --git a/regions/mushroom.json b/regions/mushroom.json index c0bf6875..21769dcb 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -64,6 +64,87 @@ "rarity": 31 } ], + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "biomeImplosionRatio": 0.25, "landBiomeZoom": 1.25, "effects": [ @@ -82,10 +163,15 @@ ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, - "loot": { +"loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "mushroom-food", - "mushroom-clutter" + "global-clutter", + "global-tools", + "global-treasure", + "mushroom-clutter", + "mushroom-food" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/ocean.json b/regions/ocean.json index 2594cef6..749135ee 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -23,7 +23,76 @@ "riverBiomes": [ "ocean/ocean" ], + "objects": [ + { + "chance": 1, + "bottom": true, + "translate": {"yRandom": 8, "y": 4}, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + + }, + { + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "biomeImplosionRatio": 0.7, + "loot": { + "tables": [ + "beach-clutter", + "global-treasure", + "ocean-clutter", + "tropical-treasure" + ] + }, "rarity": 2, "effects": [ { diff --git a/regions/savanna.json b/regions/savanna.json index f7207ae6..c4bd6626 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -37,6 +37,87 @@ } ], "biomeImplosionRatio": 0.25, + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "deposits": [ { "minHeight": 25, @@ -120,9 +201,15 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "hot-treasure", "hot-food", - "hot-treasure" + "cactus-clutter" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/swamp.json b/regions/swamp.json index d8e8efc8..23fa0f0c 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -27,6 +27,16 @@ "zoom": 5 } }, + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + } + ], "biomeImplosionRatio": 0.26, "deposits": [ { @@ -44,13 +54,99 @@ "varience": 4 } ], + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, "shoreHeightMax": 1.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "swamp-food", - "swamp-clutter" + "global-clutter", + "global-tools", + "global-treasure", + "swamp-clutter", + "swamp-food" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/temperate.json b/regions/temperate.json index eefa747d..ee9bc0e4 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -18,7 +18,8 @@ "temperate/temperate-oak-beach" ], "seaBiomes":[ - "temperate/temperate-river" + "temperate/temperate-river", + "ocean/ocean-deep" ], "caveBiomes":[ "temperate/temperate-old-cavern", @@ -37,6 +38,16 @@ "rarity":119 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-temperate" + } + ], "biomeImplosionRatio":0.25, "deposits":[ { @@ -58,6 +69,85 @@ } ], "objects":[ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + }, { "name":"standard-surface-portals", "chance":0.001, @@ -151,10 +241,16 @@ }, "shoreHeightMin":1, "shoreHeightMax":5.2, - "loot":{ - "tables":[ + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "temperate-clutter", "temperate-food", - "global-tools" + "forest-food" ] }, "shoreHeightZoom":1.14, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 20e05223..6c99e115 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -20,24 +20,110 @@ "tropical/tropical-river-steep", "tropical/tropical-river-soft" ], - "structures": [ + "jigsawStructures": [ { - "tileset": "murky-stronghold", - "height": 26, - "rarity": 10, - "ratio": 0.9, - "zoom": 0.5 + "rarity": 750, + "structure": "pillager" }, { - - "tileset": "ruins", - "rarity": 25, - "shuffle": 22, - "ratio": 0.9, - "zoom": 0.5 + "rarity": 500, + "structure": "village-temperate" } ], "biomeImplosionRatio": 0.25, + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "tropical-treasure", + "tropical-food", + "forest-food" + ] + }, "deposits": [ { "minHeight": 15, diff --git a/regions/tropical.json b/regions/tropical.json index 04f992ce..9b783a22 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -33,6 +33,7 @@ "zoom": 5 } }, + "spotBiomes": [ { "as": "SEA", @@ -51,6 +52,14 @@ } ], "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + }, { "rarity": 650, "structure": "jungle-pyramid" @@ -76,11 +85,97 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "global-tools" + "global-clutter", + "global-tools", + "global-treasure", + "tropical-treasure", + "tropical-food", + "forest-food" ] }, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + }, { "name": "standard-surface-portals", "chance": 0.001, diff --git a/regions/tundra.json b/regions/tundra.json index 9803deee..c9b6c105 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -43,6 +43,16 @@ "varience": 2 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + } + ], "riverRarity": 1, "landBiomeZoom": 1.25, "riverStyle": { @@ -57,11 +67,97 @@ "shoreHeightMin": 2.2, "shoreHeightMax": 5.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "cold-food", - "cold-treasure" + "global-clutter", + "global-tools", + "global-treasure", + "cold-treasure", + "cold-food" ] }, + "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 5 + }, + "offsetY": 7 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 12 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [ + { + "find": [ + { + "block": "glass" + } + ], + "replace": { + "palette": [ + { + "block": "void_air" + } + ] + } + } + ], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": {"yRandom": 15, "y": 10} + + } + ], "shoreHeightZoom": 1.14, "riverThickness": 0.025, "rarity": 4