diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json index 3c3fc7ff..6d032b49 100644 --- a/biomes/cave/old-cavern.json +++ b/biomes/cave/old-cavern.json @@ -66,6 +66,13 @@ "stackMax": 5, "stackMin": 1 }, + { + "chance": 0.02, + "palette": [{"block": "andesite_wall"}], + "stackMax": 5, + "stackMin": 1, + "partOf": "CEILING" + }, { "forcePlace": true, "chance": 0.06, @@ -122,20 +129,23 @@ { "chance": 0.0013, "palette": [{"block": "lava"}], - "stackMax": 11, - "stackMin": 10 + "stackMax": 20, + "stackMin": 20, + "partOf": "CEILING" }, { "chance": 0.003, "palette": [{"block": "water"}], "stackMax": 11, - "stackMin": 10 + "stackMin": 10, + "partOf": "CEILING" }, { "chance": 0.005, "palette": [{"block": "stone"}], - "stackMax": 16, - "stackMin": 15 + "stackMax": 20, + "stackMin": 20, + "partOf": "CEILING" }, { "chance": 0.004, diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/oce-deep.json index a86a711b..80ced7ef 100644 --- a/biomes/ocean/oce-deep.json +++ b/biomes/ocean/oce-deep.json @@ -41,7 +41,8 @@ "chance": 0.09, "palette": [{"block": "kelp_plant"}], "stackMin": 2, - "stackMax": 12 + "stackMax": 12, + "partOf": "SEA_FLOOR" }, { "chance": 0.2, @@ -56,7 +57,8 @@ "topPalette": [{ "block": "tall_seagrass", "data": {"half": "upper"} - }] + }], + "partOf": "SEA_FLOOR" } ], "objects": [ @@ -65,12 +67,13 @@ "waterloggable": true, "chance": 0.008, "mode": "FAST_MIN_HEIGHT", + "bottom": true, "rotation": { "enabled": true, "yAxis": { "enabled": true, "interval": 90, - "min": -360, + "min": 0, "max": 360 } }, diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/ocean/oce-tem-ocean-deep.json index 6766c92b..546e786a 100644 --- a/biomes/ocean/oce-tem-ocean-deep.json +++ b/biomes/ocean/oce-tem-ocean-deep.json @@ -48,14 +48,16 @@ {"block": "soul_sand"}, {"block": "magma_block"} ], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.07, "variance": {"style": "STATIC"}, "zoom": 5, "palette": [{"block": "seagrass"}], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -66,7 +68,8 @@ "palette": [{"block": "kelp_plant"}], "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, - "stackMin": 2 + "stackMin": 2, + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -79,7 +82,8 @@ }, "block": "sea_pickle" }], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" } ], "objects": [ @@ -96,6 +100,7 @@ "enabled": true }, "underwater": true, + "bottom": true, "place": [ "ships/swreck-1", "ships/usd-ship-1", @@ -124,6 +129,7 @@ "enabled": true }, "underwater": true, + "bottom": true, "place": [ "ships/gall-1", "ships/gall-2", diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/ocean/oce-tem-ocean.json index fa50abea..8f513995 100644 --- a/biomes/ocean/oce-tem-ocean.json +++ b/biomes/ocean/oce-tem-ocean.json @@ -49,14 +49,16 @@ {"block": "soul_sand"}, {"block": "magma_block"} ], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.07, "variance": {"style": "STATIC"}, "zoom": 5, "palette": [{"block": "seagrass"}], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -67,7 +69,8 @@ "palette": [{"block": "kelp_plant"}], "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, - "stackMin": 2 + "stackMin": 2, + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -80,7 +83,8 @@ }, "block": "sea_pickle" }], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-tem-river.json b/biomes/ocean/oce-tem-river.json index 76ef62be..cd4f468a 100644 --- a/biomes/ocean/oce-tem-river.json +++ b/biomes/ocean/oce-tem-river.json @@ -53,14 +53,16 @@ {"block": "soul_sand"}, {"block": "magma_block"} ], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.07, "variance": {"style": "STATIC"}, "zoom": 5, "palette": [{"block": "seagrass"}], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -71,7 +73,8 @@ "palette": [{"block": "kelp_plant"}], "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, - "stackMin": 2 + "stackMin": 2, + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -84,7 +87,8 @@ }, "block": "sea_pickle" }], - "style": {"style": "STATIC"} + "style": {"style": "STATIC"}, + "partOf": "SEA_FLOOR" } ], "objects": [{ diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/oce-warm-bottom.json index d11cc99e..6b378c63 100644 --- a/biomes/ocean/oce-warm-bottom.json +++ b/biomes/ocean/oce-warm-bottom.json @@ -43,7 +43,8 @@ "chance": 0.02, "palette": [{"block": "kelp_plant"}], "stackMin": 2, - "stackMax": 6 + "stackMax": 6, + "partOf": "SEA_FLOOR" }, { "chance": 0.2, @@ -58,7 +59,8 @@ "topPalette": [{ "block": "tall_seagrass", "data": {"half": "upper"} - }] + }], + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/oce-warm.json index bc0b152f..495924d5 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/oce-warm.json @@ -37,7 +37,8 @@ "chance": 0.02, "palette": [{"block": "kelp_plant"}], "stackMin": 2, - "stackMax": 6 + "stackMax": 6, + "partOf": "SEA_FLOOR" }, { "chance": 0.05, @@ -52,7 +53,8 @@ "topPalette": [{ "block": "tall_seagrass", "data": {"half": "upper"} - }] + }], + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/tro-beach-charred.json index 31842cbf..b7ef7998 100644 --- a/biomes/tropical/tro-beach-charred.json +++ b/biomes/tropical/tro-beach-charred.json @@ -3,8 +3,8 @@ "derivative": "DESERT_LAKES", "vanillaDerivative": "BEACH", "generators": [{ - "min": -1, - "max": 1, + "min": -3, + "max": 3, "generator": "plain" }], "layers": [ diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/tro-beach.json index 45006b64..6595c641 100644 --- a/biomes/tropical/tro-beach.json +++ b/biomes/tropical/tro-beach.json @@ -3,8 +3,8 @@ "derivative": "JUNGLE", "vanillaDerivative": "JUNGLE", "generators": [{ - "min": -5, - "max": 5, + "min": -3, + "max": 3, "generator": "plain" }], "layers": [ diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index 3ec3cc67..01e5b447 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -3,9 +3,9 @@ "derivative": "JUNGLE", "vanillaDerivative": "PLAINS", "generators": [{ - "min": 22, - "max": 44, - "generator": "plain" + "min": 42, + "max": 64, + "generator": "mountain" }], "jigsawStructures": [ { diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index 079c5f7d..ce4a243d 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -6,13 +6,8 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 10 - }, - { - "generator": "plain", - "max": 80, - "min": 2 + "max": 190, + "min": 85 } ], "layers": [ diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index 8905c2d6..f1ddf645 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -3,8 +3,8 @@ "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE", "generators": [{ - "min": 50, - "max": 190, + "min": 55, + "max": 110, "generator": "mountain" }], "layers": [ diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index 8b1af576..a2590fd4 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -4,8 +4,8 @@ "vanillaDerivative": "JUNGLE_HILLS", "children": ["tropical/tro-mountain-middle"], "generators": [{ - "min": 25, - "max": 100, + "min": 75, + "max": 150, "generator": "mountain" }], "jigsawStructures": [ diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/tro-rainforest.json index 5ceba2b4..11979a1e 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -8,8 +8,8 @@ ], "generators": [{ "min": 20, - "max": 35, - "generator": "plain" + "max": 45, + "generator": "mountain" }], "layers": [ { diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/tro-volcanic-plains.json index bb64fcb7..0d79292c 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -4,9 +4,9 @@ "vanillaDerivative": "THE_VOID", "children": ["tropical/tro-volcanoes"], "generators": [{ - "min": 170, - "max": 192, - "generator": "plain" + "min": 120, + "max": 190, + "generator": "mountain" }], "layers": [ { diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json index 96b57fe7..f3245b5c 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -4,9 +4,9 @@ "vanillaDerivative": "JUNGLE", "children": ["tropical/tro-highlands"], "generators": [{ - "min": 4, - "max": 7, - "generator": "plain" + "min": 10, + "max": 20, + "generator": "mountain" }], "layers": [ {"palette": [{"block": "grass_block"}]}, diff --git a/generators/canyon-steep.json b/generators/canyon-steep.json index 3b578b03..68ea9100 100644 --- a/generators/canyon-steep.json +++ b/generators/canyon-steep.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 4 + "horizontalScale": 18 }, "seed": 530, "composite": [{ diff --git a/generators/cracked-cliffs.json b/generators/cracked-cliffs.json index f7ef6c95..07282552 100644 --- a/generators/cracked-cliffs.json +++ b/generators/cracked-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 4 + "horizontalScale": 28 }, "seed": 7246661, "composite": [{ diff --git a/generators/mountain.json b/generators/mountain.json index 69eab4d7..3a66da44 100644 --- a/generators/mountain.json +++ b/generators/mountain.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 45 + "horizontalScale": 41 }, "seed": 530530, "composite": [ diff --git a/generators/plain-cliffs.json b/generators/plain-cliffs.json index 28a732a2..8542e5ba 100644 --- a/generators/plain-cliffs.json +++ b/generators/plain-cliffs.json @@ -15,7 +15,7 @@ }], "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 39 + "horizontalScale": 49 }, "seed": 7246661, "cliffHeightMax": 80, diff --git a/generators/plain.json b/generators/plain.json index b8f71cac..8888f4aa 100644 --- a/generators/plain.json +++ b/generators/plain.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 33 + "horizontalScale": 63 }, "seed": 7246661, "composite": [{ diff --git a/generators/river.json b/generators/river.json index 16add63b..b5864c7e 100644 --- a/generators/river.json +++ b/generators/river.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 5 + "horizontalScale": 9 }, "exponent": 1.125, "seed": 2133, diff --git a/generators/small-cliffs.json b/generators/small-cliffs.json index d234d348..a3125302 100644 --- a/generators/small-cliffs.json +++ b/generators/small-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 4 + "horizontalScale": 18 }, "seed": 2343, "composite": [{ diff --git a/generators/vascular-cracked-cliffs.json b/generators/vascular-cracked-cliffs.json index 01b7a3b8..07dd375d 100644 --- a/generators/vascular-cracked-cliffs.json +++ b/generators/vascular-cracked-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 4 + "horizontalScale": 17 }, "seed": 7246661, "composite": [{ diff --git a/objects/bee/hive.iob b/objects/bee/hive.iob new file mode 100644 index 00000000..bb579862 Binary files /dev/null and b/objects/bee/hive.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index 7c042e99..e203dbd1 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -73,7 +73,7 @@ ], "biomeImplosionRatio": 0.25, "riverRarity": 1, - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "shoreHeightMin": 2.2, "shoreHeightMax": 4.2, "loot": { diff --git a/regions/hot.json b/regions/hot.json index 1dfeb6c5..e99d133d 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -78,7 +78,7 @@ "varience": 4 } ], - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "effects": [ { "potionTicksMin": 87, diff --git a/regions/mountain.json b/regions/mountain.json index 3e38e59e..7f9d04bb 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -24,6 +24,7 @@ } ], "biomeImplosionRatio": 0.25, + "landBiomeZoom": 1.85, "deposits": [ { "minHeight": 15, diff --git a/regions/mushroom.json b/regions/mushroom.json index c62cd2be..49bb3ad1 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -115,7 +115,7 @@ } }], "biomeImplosionRatio": 0.25, - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "effects": [ { "particleAltX": 1.0E-5, diff --git a/regions/ocean.json b/regions/ocean.json index 6ab256ec..85f9567f 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -51,6 +51,6 @@ "shoreRatio": 0.01, "shoreHeightMin": 0, "shoreHeightMax": 1, - "landBiomeZoom": 0.01, + "landBiomeZoom": 0.5, "shoreBiomeZoom": 0.5 } diff --git a/regions/savanna.json b/regions/savanna.json index a7b99116..be1bf3db 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -111,7 +111,7 @@ "varience": 4 } ], - "landBiomeZoom": 2, + "landBiomeZoom": 1.85, "effects": [ { "potionTicksMin": 87, diff --git a/regions/swamp.json b/regions/swamp.json index 7f14640d..0d66f9de 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -94,7 +94,7 @@ "y": 2 } }], - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "shoreHeightMin": 0.02, "shoreHeightMax": 1.2, "loot": { diff --git a/regions/tropical.json b/regions/tropical.json index 1a7826bd..e1d80912 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -51,7 +51,7 @@ "palette": [{"block": "emerald_ore"}], "varience": 2 }], - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, "loot": { diff --git a/regions/tundra.json b/regions/tundra.json index 92e4875b..4231237f 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -36,7 +36,7 @@ "varience": 2 }], "riverRarity": 1, - "landBiomeZoom": 1.25, + "landBiomeZoom": 1.85, "riverStyle": { "style": "VASCULAR", "zoom": 4.77,