diff --git a/overworld/biomes/hot-ocean-cliffs.json b/overworld/biomes/hot-ocean-cliffs.json index 326859fe..ebde102d 100644 --- a/overworld/biomes/hot-ocean-cliffs.json +++ b/overworld/biomes/hot-ocean-cliffs.json @@ -48,132 +48,30 @@ "objects":[ { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } + ], "slab": { "dispersion": "SCATTER", diff --git a/overworld/biomes/hot-ocean.json b/overworld/biomes/hot-ocean.json index aa16970b..0eac73fd 100644 --- a/overworld/biomes/hot-ocean.json +++ b/overworld/biomes/hot-ocean.json @@ -68,8 +68,8 @@ "z":0 } }, - { - "chance": 0.1, + { + "chance": 0.01, "density": 1, "underwater": true, "rotation": { @@ -82,116 +82,13 @@ "enabled": true }, "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "translate": { "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, + "y": -4, "z": 0 } } @@ -221,6 +118,81 @@ "children": [ "hot-ocean-cliffs" ], + "decorators": [ + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0009, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + ], "generators":[ { "generator": "plain", diff --git a/overworld/biomes/mushroom-ocean.json b/overworld/biomes/mushroom-ocean.json index c7ab64c5..2f573403 100644 --- a/overworld/biomes/mushroom-ocean.json +++ b/overworld/biomes/mushroom-ocean.json @@ -51,6 +51,119 @@ "partOf": "SEA_SURFACE", "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "wall": @@ -77,66 +190,31 @@ ] }, "objects":[ - { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { "chance": 0.1, "density": 1, @@ -167,7 +245,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -201,7 +279,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } diff --git a/overworld/biomes/rocky-ocean.json b/overworld/biomes/rocky-ocean.json index abd2e4ad..293f1605 100644 --- a/overworld/biomes/rocky-ocean.json +++ b/overworld/biomes/rocky-ocean.json @@ -34,100 +34,30 @@ } ], "objects":[ - { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, { "chance": 0.1, "density": 1, @@ -158,7 +88,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } @@ -181,6 +111,123 @@ "AIR" ] }, + "decorators": [ + { + + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + + ], "generators":[ { "generator": "plain", diff --git a/overworld/biomes/swamp-ocean.json b/overworld/biomes/swamp-ocean.json index d332e5bc..bb90c24a 100644 --- a/overworld/biomes/swamp-ocean.json +++ b/overworld/biomes/swamp-ocean.json @@ -55,7 +55,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -89,78 +89,34 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.05, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } ], "decorators":[ { @@ -181,6 +137,119 @@ "partOf": "SEA_SURFACE", "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "wall": diff --git a/overworld/biomes/temperate-ocean.json b/overworld/biomes/temperate-ocean.json index c0cc9280..402a26ee 100644 --- a/overworld/biomes/temperate-ocean.json +++ b/overworld/biomes/temperate-ocean.json @@ -55,44 +55,11 @@ ], "translate": { "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, + "y": -3, "z": 0 } }, + { "chance": 0.1, "density": 1, @@ -123,44 +90,35 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.01, + "underwater": true, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } + ], "generators":[ { @@ -172,12 +130,116 @@ "decorators":[ { "zoom": 20, - "chance": 0.2, + "chance": 0.07, "palette": [ "SEAGRASS" ], - "dispersion": "WISPY", - "variance": "WISPY" + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "slab": { diff --git a/overworld/biomes/tropical-coral-ocean-cliffs.json b/overworld/biomes/tropical-coral-ocean-cliffs.json index bb399d8c..ced1ce1f 100644 --- a/overworld/biomes/tropical-coral-ocean-cliffs.json +++ b/overworld/biomes/tropical-coral-ocean-cliffs.json @@ -81,7 +81,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -115,7 +115,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -149,7 +149,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -183,13 +183,37 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } ], "childShrinkFactor": 1.1, "decorators":[ + { + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, { "zoom": 1, "chance": 0.05, diff --git a/overworld/biomes/tropical-coral-ocean.json b/overworld/biomes/tropical-coral-ocean.json index 488199f9..84a46e96 100644 --- a/overworld/biomes/tropical-coral-ocean.json +++ b/overworld/biomes/tropical-coral-ocean.json @@ -61,7 +61,7 @@ "objects":[ { - "chance": 0.1, + "chance": 0.2, "density": 1, "underwater": true, "rotation": { @@ -86,7 +86,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -120,7 +120,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -154,7 +154,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -192,7 +192,7 @@ "decorators":[ { "zoom": 1, - "chance": 0.05, + "chance": 0.1, "stackMin": 1, "stackMax": 3, "palette": [ diff --git a/overworld/biomes/tropical-ocean.json b/overworld/biomes/tropical-ocean.json index 03018a47..9c123165 100644 --- a/overworld/biomes/tropical-ocean.json +++ b/overworld/biomes/tropical-ocean.json @@ -33,6 +33,30 @@ } ], "objects": [ + { + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, { "chance": 0.1, "density": 1, @@ -54,7 +78,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -88,7 +112,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -122,7 +146,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -156,7 +180,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } diff --git a/overworld/biomes/tundra-ocean.json b/overworld/biomes/tundra-ocean.json index 3d9e581b..c57fe002 100644 --- a/overworld/biomes/tundra-ocean.json +++ b/overworld/biomes/tundra-ocean.json @@ -35,132 +35,29 @@ "objects":[ { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.05, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + } ], "children": [ "rocky-ocean" @@ -193,6 +90,110 @@ ], "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "generators":[ diff --git a/overworld/objects/ships/ship-1.iob b/overworld/objects/ships/ship-1.iob new file mode 100644 index 00000000..c3ca45a7 Binary files /dev/null and b/overworld/objects/ships/ship-1.iob differ diff --git a/overworld/objects/ships/ship-2.iob b/overworld/objects/ships/ship-2.iob new file mode 100644 index 00000000..91457d6b Binary files /dev/null and b/overworld/objects/ships/ship-2.iob differ diff --git a/overworld/objects/ships/usd-ship-1.iob b/overworld/objects/ships/usd-ship-1.iob new file mode 100644 index 00000000..60621872 Binary files /dev/null and b/overworld/objects/ships/usd-ship-1.iob differ diff --git a/overworld/objects/ships/usd-ship-2.iob b/overworld/objects/ships/usd-ship-2.iob new file mode 100644 index 00000000..e9962267 Binary files /dev/null and b/overworld/objects/ships/usd-ship-2.iob differ diff --git a/overworld/overworld.code-workspace b/overworld/overworld.code-workspace index cbacc978..5fd694fe 100644 --- a/overworld/overworld.code-workspace +++ b/overworld/overworld.code-workspace @@ -1465,6 +1465,7 @@ "ENTITY_PARROT_IMITATE_MAGMA_CUBE", "ENTITY_PARROT_IMITATE_PHANTOM", "ENTITY_PARROT_IMITATE_PIGLIN", + "ENTITY_PARROT_IMITATE_PIGLIN_BRUTE", "ENTITY_PARROT_IMITATE_PILLAGER", "ENTITY_PARROT_IMITATE_RAVAGER", "ENTITY_PARROT_IMITATE_SHULKER", @@ -1491,6 +1492,12 @@ "ENTITY_PIGLIN_ADMIRING_ITEM", "ENTITY_PIGLIN_AMBIENT", "ENTITY_PIGLIN_ANGRY", + "ENTITY_PIGLIN_BRUTE_AMBIENT", + "ENTITY_PIGLIN_BRUTE_ANGRY", + "ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED", + "ENTITY_PIGLIN_BRUTE_DEATH", + "ENTITY_PIGLIN_BRUTE_HURT", + "ENTITY_PIGLIN_BRUTE_STEP", "ENTITY_PIGLIN_CELEBRATE", "ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED", "ENTITY_PIGLIN_DEATH", @@ -3331,6 +3338,7 @@ "ENTITY_PARROT_IMITATE_MAGMA_CUBE", "ENTITY_PARROT_IMITATE_PHANTOM", "ENTITY_PARROT_IMITATE_PIGLIN", + "ENTITY_PARROT_IMITATE_PIGLIN_BRUTE", "ENTITY_PARROT_IMITATE_PILLAGER", "ENTITY_PARROT_IMITATE_RAVAGER", "ENTITY_PARROT_IMITATE_SHULKER", @@ -3357,6 +3365,12 @@ "ENTITY_PIGLIN_ADMIRING_ITEM", "ENTITY_PIGLIN_AMBIENT", "ENTITY_PIGLIN_ANGRY", + "ENTITY_PIGLIN_BRUTE_AMBIENT", + "ENTITY_PIGLIN_BRUTE_ANGRY", + "ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED", + "ENTITY_PIGLIN_BRUTE_DEATH", + "ENTITY_PIGLIN_BRUTE_HURT", + "ENTITY_PIGLIN_BRUTE_STEP", "ENTITY_PIGLIN_CELEBRATE", "ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED", "ENTITY_PIGLIN_DEATH",