diff --git a/biomes/frozen-beach.json b/biomes/frozen-beach.json index 8eb411c9..558fce27 100644 --- a/biomes/frozen-beach.json +++ b/biomes/frozen-beach.json @@ -1,5 +1,39 @@ { + "name": "Frozen Beach", + "derivative": "SNOWY_BEACH", "vanillaDerivative": "SNOWY_BEACH", + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "palette": [ + { + "block": "dirt" + } + ] + } + ], + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], + "loot": { + "tables": [ + "beach-clutter" + ] + }, "seaLayers": [ { "minHeight": 1, @@ -134,40 +168,6 @@ } } ], - "name": "Frozen Beach", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, - "derivative": "SNOWY_BEACH", "slab": { "style": { "style": "STATIC" diff --git a/biomes/frozen-hills.json b/biomes/frozen-hills.json index 7ced4741..5cd06b7c 100644 --- a/biomes/frozen-hills.json +++ b/biomes/frozen-hills.json @@ -2,7 +2,44 @@ "name": "Frozen Hills", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", - "rarity": 3, + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "generators": [ { "generator": "plain", @@ -136,44 +173,6 @@ ] } ], - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], "wall": { "palette": [ { diff --git a/biomes/frozen-ice-cavern.json b/biomes/frozen-ice-cavern.json index aeb6de11..c82cb58d 100644 --- a/biomes/frozen-ice-cavern.json +++ b/biomes/frozen-ice-cavern.json @@ -1,45 +1,7 @@ { - "entitySpawnOverrides": [ - { - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - } - ], - "decorators": [ - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "cornflower" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "blackstone_wall" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "name": "Frozen Cavern", + "name": "Frozen Ice Cavern", + "derivative": "FROZEN_OCEAN", + "vanillaDerivative": "FROZEN_OCEAN", "layers": [ { "minHeight": 1, @@ -92,12 +54,51 @@ "generator": "plain" } ], + "entitySpawnOverrides": [ + { + "trigger": "SKELETON", + "entity": "shroud", + "cancelSourceSpawn": true, + "rarity": 12 + } + ], + "decorators": [ + { + "chance": 0.01, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "cornflower" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.001, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "blackstone_wall" + } + ], + "style": { + "style": "STATIC" + } + } + ], "loot": { "tables": [ "cave-clutter" ] }, - "derivative": "FROZEN_OCEAN", "slab": { "style": { "style": "IRIS" diff --git a/biomes/frozen-mountain-cliffs.json b/biomes/frozen-mountain-cliffs.json index 868dd169..1c6f36e8 100644 --- a/biomes/frozen-mountain-cliffs.json +++ b/biomes/frozen-mountain-cliffs.json @@ -1,5 +1,60 @@ { + "name": "Frozen Mountain Cliffs", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", + "children": [ + "frozen-peak", + "frozen-mountains", + "frozen-vander" + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "packed_ice" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "andesite" + }, + { + "weight": 2, + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 14, + "max": 65, + "generator": "plain-cliffs" + } + ], + "biomeScatter": [ + "ICE_SPIKES", + "FROZEN_OCEAN", + "FROZEN_RIVER" + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -138,7 +193,6 @@ } ], "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -191,55 +245,6 @@ "rarity": 6 } ], - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" - ], - "name": "Frozen Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "andesite" - }, - { - "weight": 2, - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 14, - "max": 65, - "generator": "plain-cliffs" - } - ], "childShrinkFactor": 20, "wall": { "style": { @@ -250,11 +255,5 @@ "block": "packed_ice" } ] - }, - "biomeScatter": [ - "SNOWY_TAIGA_MOUNTAINS", - "TAIGA_HILLS", - "MOUNTAINS", - "ICE_SPIKES" - ] + } } \ No newline at end of file diff --git a/biomes/frozen-mountain-middle.json b/biomes/frozen-mountain-middle.json index 62868d91..ae61cace 100644 --- a/biomes/frozen-mountain-middle.json +++ b/biomes/frozen-mountain-middle.json @@ -1,31 +1,10 @@ { - "name": "Frozen Mountain", + "name": "Frozen Mountain Middle", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", - "biomeScatter": [ - "PLAINS", - "FOREST" - ], "children": [ "frozen-mountain-cliffs" ], - "childStyle": { - "style": "STATIC", - "exponent": 0.625, - "zoom": 1, - "fracture": { - "style": "VIGOCTAVE_SIMPLEX", - "multiplier": 4, - "zoom": 0.9 - } - }, - "biomeStyle": { - "style": "SIMPLEX" - }, - "biomeZoom": 0.4, - "biomeSkyScatter": [ - "MOUNTAINS" - ], "generators": [ { "generator": "mountain", @@ -112,6 +91,27 @@ ] } ], + "biomeScatter": [ + "PLAINS", + "FOREST" + ], + "childStyle": { + "style": "STATIC", + "exponent": 0.625, + "zoom": 1, + "fracture": { + "style": "VIGOCTAVE_SIMPLEX", + "multiplier": 4, + "zoom": 0.9 + } + }, + "biomeStyle": { + "style": "SIMPLEX" + }, + "biomeZoom": 0.4, + "biomeSkyScatter": [ + "MOUNTAINS" + ], "wall": { "palette": [ { diff --git a/biomes/frozen-mountain.json b/biomes/frozen-mountain.json index 6b7f29fc..c399f5a5 100644 --- a/biomes/frozen-mountain.json +++ b/biomes/frozen-mountain.json @@ -1,31 +1,12 @@ { - "name": "Frozen mountains", + "name": "Frozen Mountains", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", - "biomeZoom": 30, - "biomeStyle": { - "style": "IRIS", - "zoom": 0.7, - "exponent": 4 - }, "children": [ "frozen-mountain-middle", "frozen-peak", "frozen-mountain-cliffs" ], - "biomeScatter": [ - "PLAINS", - "TAIGA_HILLS", - "MOUNTAINS" - ], - "rarity": 30, - "generators": [ - { - "min": 70, - "max": 140, - "generator": "plain" - } - ], "layers": [ { "minHeight": 1, @@ -89,6 +70,24 @@ ] } ], + "generators": [ + { + "min": 70, + "max": 140, + "generator": "plain" + } + ], + "biomeZoom": 30, + "biomeStyle": { + "style": "IRIS", + "zoom": 0.7, + "exponent": 4 + }, + "biomeScatter": [ + "PLAINS", + "TAIGA_HILLS", + "MOUNTAINS" + ], "wall": { "palette": [ { diff --git a/biomes/frozen-mountains.json b/biomes/frozen-mountains.json index 02b74a65..1c0ea1c1 100644 --- a/biomes/frozen-mountains.json +++ b/biomes/frozen-mountains.json @@ -1,5 +1,60 @@ { + "name": "Frozen Mountains", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", + "children": [ + "frozen-peak", + "frozen-mountains", + "frozen-vander" + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "packed_ice" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "andesite" + }, + { + "weight": 2, + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 3, + "max": 16, + "generator": "plain" + }, + { + "min": 7, + "max": 48, + "generator": "mountain" + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -139,7 +194,6 @@ } ], "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -178,60 +232,6 @@ ] } ], - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" - ], - "name": "Frozen Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "andesite" - }, - { - "weight": 2, - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 7, - "max": 48, - "generator": "mountain" - } - ], "childShrinkFactor": 20, "wall": { "style": { diff --git a/biomes/frozen-ocean.json b/biomes/frozen-ocean.json index f903db8b..c836637d 100644 --- a/biomes/frozen-ocean.json +++ b/biomes/frozen-ocean.json @@ -1,5 +1,51 @@ { + "name": "Frozen Ocean", + "derivative": "FROZEN_OCEAN", "vanillaDerivative": "FROZEN_OCEAN", + "layers": [ + { + "palette": [ + { + "block": "dirt" + }, + { + "block": "gravel" + }, + { + "block": "stone" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "weight": 5, + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "gravel" + }, + { + "block": "dirt" + } + ] + } + ], + "generators": [ + { + "min": -12, + "max": -7, + "generator": "plain" + } + ], "seaLayers": [ { "minHeight": 3, @@ -146,55 +192,9 @@ } } ], - "name": "Frozen Ocean", - "layers": [ - { - "palette": [ - { - "block": "dirt" - }, - { - "block": "gravel" - }, - { - "block": "stone" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "weight": 5, - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "gravel" - }, - { - "block": "dirt" - } - ] - } - ], - "generators": [ - { - "min": -12, - "max": -7, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "FROZEN_OCEAN" + } } \ No newline at end of file diff --git a/biomes/frozen-peak.json b/biomes/frozen-peak.json index 8671e447..a1010146 100644 --- a/biomes/frozen-peak.json +++ b/biomes/frozen-peak.json @@ -1,82 +1,7 @@ { + "name": "Frozen Peak", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_TAIGA_MOUNTAINS", - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], - "objects": [ - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/sp-1", - "ice-spikes/sp-2", - "ice-spikes/sp-3", - "ice-spikes/sp-4", - "ice-spikes/sp-5", - "ice-spikes/tp-1", - "ice-spikes/tp-2", - "ice-spikes/tp-3", - "ice-spikes/tp-4" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ice-spec-1", - "ice-spikes/ice-spec-2", - "ice-spikes/ice-spec-3", - "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "name": "Frozen Peaks", "layers": [ { "minHeight": 2, @@ -213,8 +138,83 @@ "generator": "mountain" } ], + "biomeSkyScatter": [ + "SNOWY_TAIGA", + "SNOWY_MOUNTAINS" + ], + "objects": [ + { + "chance": 0.05, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "chance": 0.05, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -223,6 +223,5 @@ "TAIGA_HILLS", "MOUNTAINS", "ICE_SPIKES" - ], - "rarity": 3 + ] } \ No newline at end of file diff --git a/biomes/frozen-pine-hills.json b/biomes/frozen-pine-hills.json index 89acd561..180cedc2 100644 --- a/biomes/frozen-pine-hills.json +++ b/biomes/frozen-pine-hills.json @@ -1,14 +1,7 @@ { - "name": "Pine hills", + "name": "Frozen Pine Hills", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", - "generators": [ - { - "generator": "smooth-dunes", - "max": 20, - "min": 6 - } - ], "layers": [ { "minHeight": 3, @@ -47,6 +40,13 @@ ] } ], + "generators": [ + { + "generator": "smooth-dunes", + "max": 20, + "min": 6 + } + ], "decorators": [ { "chance": 1, diff --git a/biomes/frozen-pine-plains.json b/biomes/frozen-pine-plains.json index ac0a1d51..f90c47d3 100644 --- a/biomes/frozen-pine-plains.json +++ b/biomes/frozen-pine-plains.json @@ -1,5 +1,5 @@ { - "name": "Pine plains", + "name": "Frozen Pine Plains", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ diff --git a/biomes/frozen-pines.json b/biomes/frozen-pines.json index 7e3f5f08..0fad4545 100644 --- a/biomes/frozen-pines.json +++ b/biomes/frozen-pines.json @@ -1,5 +1,60 @@ { + "name": "Frozen Pines", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_TAIGA", + "children": [ + "frozen-vander" + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "packed_ice" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 3, + "max": 16, + "generator": "plain" + }, + { + "min": 13, + "max": 48, + "generator": "mountain" + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" @@ -118,7 +173,6 @@ } ], "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -157,9 +211,6 @@ ] } ], - "children": [ - "frozen-vander" - ], "entityInitialSpawns": [ { "entity": "sheep", @@ -174,57 +225,6 @@ "rarity": 6 } ], - "name": "Frozen Pines", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 48, - "generator": "mountain" - } - ], "childShrinkFactor": 20, "wall": { "style": { diff --git a/biomes/frozen-plains.json b/biomes/frozen-plains.json index 1d0f4c8d..5a503e59 100644 --- a/biomes/frozen-plains.json +++ b/biomes/frozen-plains.json @@ -2,6 +2,59 @@ "name": "Frozen Plains", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", + "children": [ + "frozen-hills" + ], + "generators": [ + { + "min": 4, + "max": 6, + "generator": "mountain" + }, + { + "min": 3, + "max": 5, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 1, @@ -37,9 +90,6 @@ ] } ], - "children": [ - "frozen-hills" - ], "objects": [ { @@ -263,56 +313,6 @@ } } ], - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" - } - ], "wall": { "palette": [ { diff --git a/biomes/frozen-redwood-forest.json b/biomes/frozen-redwood-forest.json index 83480eeb..973e35ad 100644 --- a/biomes/frozen-redwood-forest.json +++ b/biomes/frozen-redwood-forest.json @@ -1,11 +1,62 @@ { + "name": "Frozen Redwood Forest", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_TAIGA", + "generators": [ + { + "min": 3, + "max": 16, + "generator": "plain" + }, + { + "min": 13, + "max": 48, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "packed_ice" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], "objects": [ - { "chance": 0.02, "density": 3, @@ -146,7 +197,6 @@ } ], "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, @@ -185,58 +235,6 @@ ] } ], - "name": "Frozen Redwoods", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 48, - "generator": "mountain" - } - ], - "childShrinkFactor": 20, "wall": { "style": { "style": "STATIC" @@ -258,6 +256,5 @@ "TAIGA_HILLS", "MOUNTAINS", "ICE_SPIKES" - ], - "rarity": 190 + ] } \ No newline at end of file diff --git a/biomes/frozen-river.json b/biomes/frozen-river.json index c222b338..8708ccf9 100644 --- a/biomes/frozen-river.json +++ b/biomes/frozen-river.json @@ -1,5 +1,60 @@ { + "name": "Frozen River", + "derivative": "DEEP_FROZEN_OCEAN", "vanillaDerivative": "FROZEN_RIVER", + "layers": [ + { + "palette": [ + { + "block": "dirt" + }, + { + "block": "gravel" + }, + { + "block": "stone" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + } + ], + "generators": [ + { + "generator": "plain", + "max": -10, + "min": -19 + } + ], "seaLayers": [ { "minHeight": 3, @@ -104,64 +159,9 @@ } } ], - "name": "Frozen River", - "layers": [ - { - "palette": [ - { - "block": "dirt" - }, - { - "block": "gravel" - }, - { - "block": "stone" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - } - ], - "generators": [ - { - "generator": "plain", - "max": -10, - "min": -19 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "DEEP_FROZEN_OCEAN" + } } \ No newline at end of file diff --git a/biomes/frozen-spruce-hills.json b/biomes/frozen-spruce-hills.json index 52eab118..a401bb1b 100644 --- a/biomes/frozen-spruce-hills.json +++ b/biomes/frozen-spruce-hills.json @@ -1,14 +1,7 @@ { - "name": "Spruce hills", + "name": "Frozen Spruce Hills", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", - "generators": [ - { - "generator": "smooth-dunes", - "max": 20, - "min": 6 - } - ], "layers": [ { "minHeight": 3, @@ -47,6 +40,13 @@ ] } ], + "generators": [ + { + "generator": "smooth-dunes", + "max": 20, + "min": 6 + } + ], "decorators": [ { "chance": 1, diff --git a/biomes/frozen-spruce-plains.json b/biomes/frozen-spruce-plains.json index 5b0a82f8..069cd0ae 100644 --- a/biomes/frozen-spruce-plains.json +++ b/biomes/frozen-spruce-plains.json @@ -1,17 +1,10 @@ { - "name": "Spruce plains", + "name": "Frozen Spruce Plains", "derivative": "SNOWY_TAIGA", "vanillaDerivative": "SNOWY_TAIGA", "children": [ "frozen-spruce-hills" ], - "generators": [ - { - "generator": "smooth-dunes", - "max": 6, - "min": 3 - } - ], "layers": [ { "minHeight": 3, @@ -50,6 +43,13 @@ ] } ], + "generators": [ + { + "generator": "smooth-dunes", + "max": 6, + "min": 3 + } + ], "decorators": [ { "chance": 1, diff --git a/biomes/frozen-vander.json b/biomes/frozen-vander.json index 897ca4f4..e9849495 100644 --- a/biomes/frozen-vander.json +++ b/biomes/frozen-vander.json @@ -1,9 +1,125 @@ { + "name": "Frozen Vander", + "derivative": "SNOWY_TAIGA_MOUNTAINS", "vanillaDerivative": "SNOWY_MOUNTAINS", "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], + "children": [ + "frozen-peak", + "frozen-mountains", + "frozen-mountains", + "frozen-mountains" + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "IRIS", + "zoom": 0.7 + }, + "zoom": 0.6, + "palette": [ + { + "data": { + "layers": 1 + }, + "block": "snow" + }, + { + "data": { + "layers": 2 + }, + "block": "snow" + }, + { + "data": { + "layers": 3 + }, + "block": "snow" + }, + { + "data": { + "layers": 4 + }, + "block": "snow" + }, + { + "data": { + "layers": 5 + }, + "block": "snow" + }, + { + "data": { + "layers": 6 + }, + "block": "snow" + }, + { + "data": { + "layers": 7 + }, + "block": "snow" + }, + { + "data": { + "layers": 8 + }, + "block": "snow" + } + ] + }, + { + "maxHeight": 3, + "palette": [ + { + "block": "snow_block" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "packed_ice" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 3, + "max": 16, + "generator": "plain" + }, + { + "min": 13, + "max": 44, + "generator": "mountain" + } + ], "objects": [ { "chance": 0.03, @@ -183,125 +299,9 @@ } ], "biomeZoom": 50, - "derivative": "SNOWY_TAIGA_MOUNTAINS", "biomeStyle": { "style": "IRIS" }, - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-mountains", - "frozen-mountains" - ], - "name": "Frozen Vander", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "IRIS", - "zoom": 0.7 - }, - "zoom": 0.6, - "palette": [ - { - "data": { - "layers": 1 - }, - "block": "snow" - }, - { - "data": { - "layers": 2 - }, - "block": "snow" - }, - { - "data": { - "layers": 3 - }, - "block": "snow" - }, - { - "data": { - "layers": 4 - }, - "block": "snow" - }, - { - "data": { - "layers": 5 - }, - "block": "snow" - }, - { - "data": { - "layers": 6 - }, - "block": "snow" - }, - { - "data": { - "layers": 7 - }, - "block": "snow" - }, - { - "data": { - "layers": 8 - }, - "block": "snow" - } - ] - }, - { - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 44, - "generator": "mountain" - } - ], "childShrinkFactor": 20, "wall": { "style": { diff --git a/biomes/hot-beach-grass.json b/biomes/hot-beach-grass.json index a594d126..41fbd6ef 100644 --- a/biomes/hot-beach-grass.json +++ b/biomes/hot-beach-grass.json @@ -1,9 +1,10 @@ { + "name": "Hot Beach Grass", + "derivative": "FOREST", "vanillaDerivative": "DESERT_LAKES", "children": [ "ocean" ], - "name": "Hot Beach", "layers": [ { "minHeight": 1, @@ -102,7 +103,6 @@ ] } ], - "derivative": "FOREST", "wall": { "style": { "style": "STATIC" diff --git a/biomes/hot-beach.json b/biomes/hot-beach.json index 2c031775..6f91ea0b 100644 --- a/biomes/hot-beach.json +++ b/biomes/hot-beach.json @@ -1,9 +1,10 @@ { + "name": "Hot Beach", + "derivative": "WARM_OCEAN", "vanillaDerivative": "DESERT_LAKES", "children": [ "ocean" ], - "name": "Hot Beach", "layers": [ { "minHeight": 3, @@ -86,7 +87,6 @@ "stackMin": 1 } ], - "derivative": "WARM_OCEAN", "wall": { "style": { "style": "STATIC" diff --git a/biomes/hot-desert-dunes-red.json b/biomes/hot-desert-dunes-red.json index 1881b953..4e423863 100644 --- a/biomes/hot-desert-dunes-red.json +++ b/biomes/hot-desert-dunes-red.json @@ -1,7 +1,13 @@ { + "name": "Hot Desert Dunes Red", "derivative": "DESERT", - "name": "Desert dunes", "vanillaDerivative": "DESERT", + "jigsawStructures": [ + { + "rarity": 1500, + "structure": "desert-pyramid" + } + ], "generators": [ { "generator": "smooth-dunes", @@ -9,48 +15,6 @@ "min": 10 } ], - "jigsawStructures": [ - { - "rarity": 1650, - "structure": "desert-pyramid" - } - ], - "objects": [ - - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.0000001, - "mode": "STILT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "pryamid/pyramid-extreme", - "void/void", - "void/void", - "void/void" - ], - "translate": { - "x": 0, - "y": -14, - "z": 0 - } - } - ], "layers": [ { "minHeight": 5, @@ -81,6 +45,42 @@ ] } ], + "objects": [ + + { + "chance": 0.001, + "density": 3, + "place": [ + "clutter/desert-post1", + "clutter/desert-post2", + "clutter/desert-post3" + ] + }, + { + "chance": 0.000001, + "mode": "STILT", + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "pyramid/pyramid-extreme", + "void/void", + "void/void", + "void/void" + ], + "translate": { + "x": 0, + "y": -14, + "z": 0 + } + } + ], "decorators": [ { "verticalZoom": 5, diff --git a/biomes/hot-desert-dunes.json b/biomes/hot-desert-dunes.json index a7c90f45..91d42238 100644 --- a/biomes/hot-desert-dunes.json +++ b/biomes/hot-desert-dunes.json @@ -1,7 +1,13 @@ { + "name": "Hot Desert Dunes", "derivative": "DESERT", - "name": "Desert dunes", "vanillaDerivative": "DESERT", + "jigsawStructures": [ + { + "rarity": 1500, + "structure": "desert-pyramid" + } + ], "generators": [ { "generator": "smooth-dunes", @@ -9,48 +15,6 @@ "min": 10 } ], - "jigsawStructures": [ - { - "rarity": 1650, - "structure": "desert-pyramid" - } - ], - "objects": [ - - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.0000001, - "mode": "STILT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "pryamid/pyramid-extreme", - "void/void", - "void/void", - "void/void" - ], - "translate": { - "x": 0, - "y": -14, - "z": 0 - } - } - ], "layers": [ { "minHeight": 5, @@ -81,6 +45,42 @@ ] } ], + "objects": [ + + { + "chance": 0.001, + "density": 3, + "place": [ + "clutter/desert-post1", + "clutter/desert-post2", + "clutter/desert-post3" + ] + }, + { + "chance": 0.001, + "mode": "STILT", + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "pyramid/pyramid-extreme", + "void/void", + "void/void", + "void/void" + ], + "translate": { + "x": 0, + "y": -19, + "z": 0 + } + } + ], "decorators": [ { "verticalZoom": 5, diff --git a/biomes/hot-desert-red.json b/biomes/hot-desert-red.json index 2a426df2..b1a5d588 100644 --- a/biomes/hot-desert-red.json +++ b/biomes/hot-desert-red.json @@ -1,5 +1,5 @@ { - "name": "Red Desert", + "name": "Hot Desert Red", "derivative": "DESERT", "vanillaDerivative": "DESERT", "generators": [ diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index cb398164..f21c237a 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -1,7 +1,10 @@ { - "name": "Desert Hills", + "name": "Hot Desert", "derivative": "DESERT", "vanillaDerivative": "DESERT", + "children": [ + "hot-oasis" + ], "generators": [ { "generator": "smooth-dunes", @@ -9,8 +12,34 @@ "min": -8 } ], - "children": [ - "hot-oasis" + "layers": [ + { + "minHeight": 3, + "maxHeight": 10, + "slopeCondition": { + "minimumSlope": 4.5, + "maximumSlope": 20 + }, + "palette": [ + { + "block": "terracotta" + } + ] + }, + { + "minHeight": 5, + "maxHeight": 5, + "style": { + "style": "FRACTAL_WATER" + }, + "zoom": 0.7, + "palette": [ + { + "weight": 1, + "block": "sand" + } + ] + } ], "entityInitialSpawns": [ { @@ -60,35 +89,6 @@ } } ], - "layers": [ - { - "minHeight": 3, - "maxHeight": 10, - "slopeCondition": { - "minimumSlope": 4.5, - "maximumSlope": 20 - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 5, - "maxHeight": 5, - "style": { - "style": "FRACTAL_WATER" - }, - "zoom": 0.7, - "palette": [ - { - "weight": 1, - "block": "sand" - } - ] - } - ], "loot": { "tables": [ "cactus-clutter" diff --git a/biomes/hot-mountain-cliffs.json b/biomes/hot-mountain-cliffs.json index 9471e6e0..effc6e4f 100644 --- a/biomes/hot-mountain-cliffs.json +++ b/biomes/hot-mountain-cliffs.json @@ -1,6 +1,19 @@ { + "name": "Hot Mountain Cliffs", + "derivative": "DESERT", "vanillaDerivative": "DESERT", - "name": "Extreme mountains cliffs", + "generators": [ + { + "min": 11, + "max": 32, + "generator": "plain" + }, + { + "min": 12, + "max": 62, + "generator": "cracked-cliffs" + } + ], "layers": [ { "minHeight": 1, @@ -58,20 +71,7 @@ ] } ], - "generators": [ - { - "min": 11, - "max": 32, - "generator": "plain" - }, - { - "min": 12, - "max": 62, - "generator": "cracked-cliffs" - } - ], "biomeZoom": 30, - "derivative": "DESERT", "biomeStyle": { "style": "IRIS" }, @@ -84,6 +84,5 @@ "block": "gray_terracotta" } ] - }, - "rarity": 39 + } } \ No newline at end of file diff --git a/biomes/hot-mountain-middle.json b/biomes/hot-mountain-middle.json index 178c302a..ad1ead5b 100644 --- a/biomes/hot-mountain-middle.json +++ b/biomes/hot-mountain-middle.json @@ -1,24 +1,10 @@ { - "name": "Middle Mountain", + "name": "Hot Mountain Middle", "derivative": "DESERT", "vanillaDerivative": "DESERT", "children": [ "hot-mountain-cliffs" ], - "childStyle": { - "style": "STATIC", - "exponent": 0.625, - "zoom": 1, - "fracture": { - "style": "VIGOCTAVE_SIMPLEX", - "multiplier": 4, - "zoom": 0.9 - } - }, - "biomeStyle": { - "style": "SIMPLEX" - }, - "biomeZoom": 0.4, "generators": [ { "generator": "mountain", @@ -88,6 +74,20 @@ ] } ], + "childStyle": { + "style": "STATIC", + "exponent": 0.625, + "zoom": 1, + "fracture": { + "style": "VIGOCTAVE_SIMPLEX", + "multiplier": 4, + "zoom": 0.9 + } + }, + "biomeStyle": { + "style": "SIMPLEX" + }, + "biomeZoom": 0.4, "wall": { "style": { "style": "STATIC" diff --git a/biomes/hot-mountain-plains.json b/biomes/hot-mountain-plains.json index 0a6d22f7..8ad878ba 100644 --- a/biomes/hot-mountain-plains.json +++ b/biomes/hot-mountain-plains.json @@ -1,5 +1,5 @@ { - "name": " Mountains Plains", + "name": "Hot Mountain Plains", "derivative": "DESERT", "vanillaDerivative": "DESERT", "generators": [ diff --git a/biomes/hot-mountain.json b/biomes/hot-mountain.json index 2b1c30b5..912b0840 100644 --- a/biomes/hot-mountain.json +++ b/biomes/hot-mountain.json @@ -1,17 +1,10 @@ { - "name": "Extreme mountains", + "name": "Hot Mountains", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "biomeZoom": 30, - "biomeStyle": { - "style": "IRIS", - "zoom": 0.7, - "exponent": 4 - }, "children": [ "hot-mountain-middle" ], - "rarity": 7, "generators": [ { "min": 90, @@ -76,6 +69,12 @@ ] } ], + "biomeZoom": 30, + "biomeStyle": { + "style": "IRIS", + "zoom": 0.7, + "exponent": 4 + }, "wall": { "style": { "style": "STATIC" diff --git a/biomes/hot-oasis.json b/biomes/hot-oasis.json index 8583a71d..9c72a670 100644 --- a/biomes/hot-oasis.json +++ b/biomes/hot-oasis.json @@ -1,5 +1,5 @@ { - "name": "Oasis", + "name": "Hot Oasis", "derivative": "DESERT", "vanillaDerivative": "DESERT", "generators": [ @@ -71,6 +71,5 @@ } ] } - ], - "rarity": 10 + ] } \ No newline at end of file diff --git a/biomes/hot-ocean-cliffs.json b/biomes/hot-ocean-cliffs.json index adcabe34..1585e6a0 100644 --- a/biomes/hot-ocean-cliffs.json +++ b/biomes/hot-ocean-cliffs.json @@ -1,5 +1,67 @@ { + "name": "Hot Ocean Cliffs", + "derivative": "OCEAN", "vanillaDerivative": "OCEAN", + "generators": [ + { + "min": -31, + "max": -7, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0009, @@ -138,73 +200,11 @@ } } ], - "name": "Shattered Hot Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -31, - "max": -7, - "generator": "plain-cliffs" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "OCEAN", "wall": { "style": { "style": "IRIS" @@ -233,7 +233,6 @@ } ] }, - "rarity": 4, "slab": { "style": { "style": "STATIC" diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index 254f5908..b35c413c 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -1,4 +1,6 @@ { + "name": "Hot Ocean", + "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "children": [ "hot-desert", @@ -6,6 +8,67 @@ "hot-river", "hot-ocean-cliffs" ], + "generators": [ + { + "min": 11, + "max": 7, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.825, + "palette": [ + { + "block": "sand" + }, + { + "block": "clay" + }, + { + "block": "sand" + }, + { + "block": "gravel" + }, + { + "block": "sand" + }, + { + "block": "dirt" + }, + { + "weight": 2, + "block": "sand" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], "decorators": [ { "chance": 0.0009, @@ -165,74 +228,11 @@ } } ], - "name": "Hot Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.825, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": 11, - "max": 7, - "generator": "plain" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "WARM_OCEAN", "wall": { "style": { "style": "IRIS" diff --git a/biomes/hot-river.json b/biomes/hot-river.json index 31237f8c..dc6d6a7c 100644 --- a/biomes/hot-river.json +++ b/biomes/hot-river.json @@ -1,6 +1,14 @@ { - "vanillaDerivative": "DESERT_LAKES", "name": "Hot river", + "vanillaDerivative": "DESERT_LAKES", + "derivative": "DESERT_LAKES", + "generators": [ + { + "generator": "plain", + "max": -5, + "min": -15 + } + ], "layers": [ { "style": { @@ -36,17 +44,9 @@ ] } ], - "generators": [ - { - "generator": "plain", - "max": -5, - "min": -15 - } - ], "loot": { "tables": [ "ocean-clutter" ] - }, - "derivative": "DESERT_LAKES" + } } \ No newline at end of file diff --git a/biomes/hot-sandy-cave.json b/biomes/hot-sandy-cave.json index 7a5b3769..54ae3b28 100644 --- a/biomes/hot-sandy-cave.json +++ b/biomes/hot-sandy-cave.json @@ -1,4 +1,25 @@ { + "name": "Hot Sandy Cave", + "derivative": "DESERT", + "vanillaDerivative": "DESERT", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "palette": [ + { + "block": "smooth_sandstone" + } + ] + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -126,32 +147,12 @@ } } ], - "name": "Sandstone Caverns", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "palette": [ - { - "block": "smooth_sandstone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter", "cactus-clutter" ] }, - "derivative": "DESERT", "slab": { "style": { "style": "STATIC" diff --git a/biomes/hot-sandy-red-cave.json b/biomes/hot-sandy-red-cave.json index 4d51697c..17e7c77d 100644 --- a/biomes/hot-sandy-red-cave.json +++ b/biomes/hot-sandy-red-cave.json @@ -1,4 +1,25 @@ { + "name": "Hot Sandy Red Cave", + "derivative": "DESERT", + "vanillaDerivative": "DESERT", + "generators": [ + { + "min": 4, + "max": 6, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 2, + "palette": [ + { + "block": "terracotta" + } + ] + } + ], "entitySpawnOverrides": [ { "trigger": "SKELETON", @@ -43,32 +64,12 @@ } } ], - "name": "Red Sandstone Cavern", - "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "palette": [ - { - "block": "terracotta" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 6, - "generator": "plain" - } - ], "loot": { "tables": [ "cave-clutter", "cactus-clutter" ] }, - "derivative": "DESERT", "slab": { "style": { "style": "STATIC" diff --git a/biomes/hot-mesa-beach.json b/biomes/mesa-beach.json similarity index 100% rename from biomes/hot-mesa-beach.json rename to biomes/mesa-beach.json index 5b6b8314..b2a91f46 100644 --- a/biomes/hot-mesa-beach.json +++ b/biomes/mesa-beach.json @@ -1,9 +1,17 @@ { + "name": "Mesa beach", + "derivative": "DESERT_LAKES", "vanillaDerivative": "DESERT_LAKES", "children": [ "ocean" ], - "name": "Mesa beach", + "generators": [ + { + "min": 0, + "max": 1, + "generator": "plain" + } + ], "layers": [ { "minHeight": 3, @@ -24,14 +32,6 @@ ] } ], - "generators": [ - { - "min": 0, - "max": 1, - "generator": "plain" - } - ], - "derivative": "DESERT_LAKES", "wall": { "style": { "style": "STATIC" diff --git a/biomes/hot-mesa-blue.json b/biomes/mesa-blue.json similarity index 99% rename from biomes/hot-mesa-blue.json rename to biomes/mesa-blue.json index 5b8af1fd..c270f4a6 100644 --- a/biomes/hot-mesa-blue.json +++ b/biomes/mesa-blue.json @@ -1,4 +1,69 @@ { + "name": "Mesa Blue", + "derivative": "SHATTERED_SAVANNA", + "vanillaDerivative": "BADLANDS", + "generators": [ + { + "min": 4, + "max": 26, + "generator": "plain-cliffs" + }, + { + "min": 12, + "max": 38, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "cyan_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "blue_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "light_blue_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "magenta_terracotta" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -144,71 +209,6 @@ "rarity": 6 } ], - "name": "Midnight Mesa", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "cyan_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "blue_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "light_blue_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "magenta_terracotta" - } - ] - } - ], - "vanillaDerivative": "BADLANDS", - "generators": [ - { - "min": 4, - "max": 26, - "generator": "plain-cliffs" - }, - { - "min": 12, - "max": 38, - "generator": "mountain" - } - ], - "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { "style": { @@ -228,6 +228,5 @@ "block": "cyan_terracotta" } ] - }, - "rarity": 16 + } } \ No newline at end of file diff --git a/biomes/hot-mesa-cliffs.json b/biomes/mesa-cliffs.json similarity index 97% rename from biomes/hot-mesa-cliffs.json rename to biomes/mesa-cliffs.json index 1f4ad96c..340c0b06 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/mesa-cliffs.json @@ -1,68 +1,24 @@ { + "name": "Mesa Cliffs", + "derivative": "SHATTERED_SAVANNA_PLATEAU", "vanillaDerivative": "BADLANDS_PLATEAU", - "children": [ - "hot-mesa-cliffs" - ], - "decorators": [ + "generators": [ { - "chance": 0.009, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "stone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "stone_button" - } - ], - "style": { - "style": "STATIC" - } + "min": 1, + "max": 6, + "generator": "plain" }, { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 + "min": 9, + "max": 30, + "generator": "mountain" }, { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 + "min": 15, + "max": 60, + "generator": "plain-cliffs" } ], - "name": "Shattered Mesa", "layers": [ { "minHeight": 1, @@ -137,24 +93,65 @@ ] } ], - "generators": [ + "decorators": [ { - "min": 1, - "max": 6, - "generator": "plain" + "chance": 0.009, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "data": { + "face": "floor", + "powered": false, + "facing": "east" + }, + "block": "stone_button" + }, + { + "data": { + "face": "floor", + "powered": false, + "facing": "south" + }, + "block": "stone_button" + } + ], + "style": { + "style": "STATIC" + } }, { - "min": 9, - "max": 30, - "generator": "mountain" - }, - { - "min": 15, - "max": 60, - "generator": "plain-cliffs" + "chance": 0.01, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "dead_bush" + } + ], + "style": { + "style": "STATIC" + } + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 } ], - "derivative": "SHATTERED_SAVANNA_PLATEAU", "lockLayers": true, "wall": { "style": { @@ -172,6 +169,5 @@ "block": "black_terracotta" } ] - }, - "rarity": 8 + } } \ No newline at end of file diff --git a/biomes/hot-mesa-dark.json b/biomes/mesa-dark.json similarity index 97% rename from biomes/hot-mesa-dark.json rename to biomes/mesa-dark.json index 1363f39d..49ae036a 100644 --- a/biomes/hot-mesa-dark.json +++ b/biomes/mesa-dark.json @@ -1,4 +1,99 @@ { + "name": "Mesa Dark", + "derivative": "SHATTERED_SAVANNA", + "vanillaDerivative": "ERODED_BADLANDS", + "children": [ + "mesa-cliffs", + "mesa-red", + "mesa-green", + "mesa-blue" + ], + "generators": [ + { + "min": 9, + "max": 16, + "generator": "plain-cliffs" + }, + { + "min": 11, + "max": 33, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "brown_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "gray_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "black_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "gray_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "brown_terracotta" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -145,101 +240,6 @@ } ], "childShrinkFactor": 0.35, - "children": [ - "hot-mesa-cliffs", - "hot-mesa-red", - "hot-mesa-green", - "hot-mesa-blue" - ], - "name": "Mesa", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "gray_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "black_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "gray_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "generators": [ - { - "min": 9, - "max": 16, - "generator": "plain-cliffs" - }, - { - "min": 11, - "max": 33, - "generator": "mountain" - } - ], - "vanillaDerivative": "ERODED_BADLANDS", - "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { "style": { @@ -256,6 +256,5 @@ "block": "black_terracotta" } ] - }, - "rarity": 15 + } } \ No newline at end of file diff --git a/biomes/hot-mesa-green.json b/biomes/mesa-green.json similarity index 99% rename from biomes/hot-mesa-green.json rename to biomes/mesa-green.json index 400561ad..cbdebb9a 100644 --- a/biomes/hot-mesa-green.json +++ b/biomes/mesa-green.json @@ -1,4 +1,70 @@ { + + "name": "Mesa Green", + "vanillaDerivative": "BADLANDS", + "derivative": "SHATTERED_SAVANNA", + "generators": [ + { + "min": 9, + "max": 16, + "generator": "plain-cliffs" + }, + { + "min": 25, + "max": 28, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "lime_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "green_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "brown_terracotta" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -144,71 +210,6 @@ "rarity": 6 } ], - "name": "Earthbound Mesa", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "lime_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "green_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "vanillaDerivative": "BADLANDS", - "generators": [ - { - "min": 9, - "max": 16, - "generator": "plain-cliffs" - }, - { - "min": 25, - "max": 28, - "generator": "mountain" - } - ], - "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { "style": { @@ -228,6 +229,5 @@ "block": "brown_terracotta" } ] - }, - "rarity": 14 + } } \ No newline at end of file diff --git a/biomes/hot-mesa-plateau-dirt-high.json b/biomes/mesa-plateau-dirt-high.json similarity index 98% rename from biomes/hot-mesa-plateau-dirt-high.json rename to biomes/mesa-plateau-dirt-high.json index 40def21c..dfbca316 100644 --- a/biomes/hot-mesa-plateau-dirt-high.json +++ b/biomes/mesa-plateau-dirt-high.json @@ -1,11 +1,10 @@ { - "name": "Mesa Plateau dirt high", + "name": "Mesa Plateau Dirt high", "derivative": "BADLANDS", "vanillaDerivative": "BADLANDS", "biomeScatter": [ "BADLANDS" ], - "generators": [ { "min": 55, @@ -23,7 +22,6 @@ "generator": "cracked-cliffs" } ], - "lockLayers": true, "layers": [ { "minHeight": 5, @@ -195,6 +193,7 @@ ] } ], + "lockLayers": true, "decorators": [ { "chance": 0.05, @@ -248,6 +247,5 @@ } ] } - ], - "rarity": 3 + ] } \ No newline at end of file diff --git a/biomes/hot-mesa-plateau-dirt.json b/biomes/mesa-plateau-dirt.json similarity index 99% rename from biomes/hot-mesa-plateau-dirt.json rename to biomes/mesa-plateau-dirt.json index edc6b8df..01aab163 100644 --- a/biomes/hot-mesa-plateau-dirt.json +++ b/biomes/mesa-plateau-dirt.json @@ -1,11 +1,10 @@ { - "name": "Mesa Plateau dirt", + "name": "Mesa Plateau Dirt", "derivative": "BADLANDS", "vanillaDerivative": "BADLANDS", "biomeScatter": [ "BADLANDS" ], - "generators": [ { "min": 33, @@ -23,7 +22,6 @@ "generator": "cracked-cliffs" } ], - "lockLayers": true, "layers": [ { "minHeight": 5, @@ -205,6 +203,7 @@ ] } ], + "lockLayers": true, "biomeStyle": { "style": "IRIS" }, @@ -274,6 +273,5 @@ } ] } - ], - "rarity": 3 + ] } \ No newline at end of file diff --git a/biomes/hot-mesa-plateau-high.json b/biomes/mesa-plateau-high.json similarity index 98% rename from biomes/hot-mesa-plateau-high.json rename to biomes/mesa-plateau-high.json index 94cc9213..40dfc08c 100644 --- a/biomes/hot-mesa-plateau-high.json +++ b/biomes/mesa-plateau-high.json @@ -1,5 +1,5 @@ { - "name": "Mesa Plateau high", + "name": "Mesa Plateau High", "derivative": "BADLANDS", "vanillaDerivative": "BADLANDS", "biomeScatter": [ @@ -8,7 +8,7 @@ "ERODED_BADLANDS" ], "children": [ - "hot-mesa-plateau-dirt-high" + "mesa-plateau-dirt-high" ], "generators": [ { @@ -27,7 +27,6 @@ "generator": "cracked-cliffs" } ], - "lockLayers": true, "layers": [ { "minHeight": 5, @@ -202,6 +201,7 @@ ] } ], + "lockLayers": true, "decorators": [ { "chance": 0.05, @@ -234,6 +234,5 @@ } } } - ], - "rarity": 1 + ] } diff --git a/biomes/hot-mesa-plateau.json b/biomes/mesa-plateau.json similarity index 99% rename from biomes/hot-mesa-plateau.json rename to biomes/mesa-plateau.json index 4d665b56..62d6634a 100644 --- a/biomes/hot-mesa-plateau.json +++ b/biomes/mesa-plateau.json @@ -8,7 +8,7 @@ "ERODED_BADLANDS" ], "children": [ - "hot-mesa-plateau-dirt" + "mesa-plateau-dirt" ], "generators": [ { @@ -27,7 +27,6 @@ "generator": "cracked-cliffs" } ], - "lockLayers": true, "layers": [ { "minHeight": 5, @@ -202,6 +201,7 @@ ] } ], + "lockLayers": true, "decorators": [ { "chance": 0.05, diff --git a/biomes/hot-mesa-red.json b/biomes/mesa-red.json similarity index 99% rename from biomes/hot-mesa-red.json rename to biomes/mesa-red.json index 38dbfabb..acc83a57 100644 --- a/biomes/hot-mesa-red.json +++ b/biomes/mesa-red.json @@ -1,4 +1,81 @@ { + "name": "Mesa Red", + "vanillaDerivative": "BADLANDS", + "derivative": "SHATTERED_SAVANNA", + "generators": [ + { + "min": 2, + "max": 21, + "generator": "plain-cliffs" + }, + { + "min": 12, + "max": 33, + "generator": "mountain" + } + ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "pink_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "red_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "light_gray_terracotta" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 1, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "brown_terracotta" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -144,83 +221,6 @@ "rarity": 6 } ], - "name": "Bloody Mesa", - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "pink_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "red_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "light_gray_terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "generators": [ - { - "min": 2, - "max": 21, - "generator": "plain-cliffs" - }, - { - "min": 12, - "max": 33, - "generator": "mountain" - } - ], - "vanillaDerivative": "BADLANDS", - "derivative": "SHATTERED_SAVANNA", "lockLayers": true, "wall": { "style": { @@ -259,6 +259,5 @@ ], "varience": 3 } - ], - "rarity": 15 + ] } \ No newline at end of file diff --git a/biomes/hot-mesa-river.json b/biomes/mesa-river.json similarity index 95% rename from biomes/hot-mesa-river.json rename to biomes/mesa-river.json index 53528c67..eae83c16 100644 --- a/biomes/hot-mesa-river.json +++ b/biomes/mesa-river.json @@ -1,14 +1,12 @@ { + "name": "Mesa River", "vanillaDerivative": "DESERT_LAKES", - "name": "Mesa river", - "decorators": [ + "derivative": "DESERT_LAKES", + "generators": [ { - "chance": 0.2, - "palette": [ - { - "block": "seagrass" - } - ] + "generator": "plain", + "max": -4, + "min": -15 } ], "layers": [ @@ -55,12 +53,14 @@ ] } ], - "generators": [ + "decorators": [ { - "generator": "plain", - "max": -4, - "min": -15 + "chance": 0.2, + "palette": [ + { + "block": "seagrass" + } + ] } - ], - "derivative": "DESERT_LAKES" + ] } \ No newline at end of file diff --git a/biomes/hot-mesa-valleys.json b/biomes/mesa-valleys.json similarity index 99% rename from biomes/hot-mesa-valleys.json rename to biomes/mesa-valleys.json index 9cdee0da..48864979 100644 --- a/biomes/hot-mesa-valleys.json +++ b/biomes/mesa-valleys.json @@ -1,7 +1,13 @@ { - "name": "Mesa valley", + "name": "Mesa Valley", "derivative": "SAVANNA", "vanillaDerivative": "BADLANDS", + "jigsawStructures": [ + { + "rarity": 1000, + "structure": "pillager" + } + ], "generators": [ { "min": 5, @@ -9,38 +15,7 @@ "generator": "smooth-dunes" } ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "pig", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "chicken", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - }, - { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 7 - } - ], + "layers": [ { "minHeight": 1, @@ -180,6 +155,32 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.2, diff --git a/biomes/hot-mesa-yellow.json b/biomes/mesa-yellow.json similarity index 97% rename from biomes/hot-mesa-yellow.json rename to biomes/mesa-yellow.json index 81b3ef37..e719e208 100644 --- a/biomes/hot-mesa-yellow.json +++ b/biomes/mesa-yellow.json @@ -48,10 +48,6 @@ { "rarity": 1000, "structure": "pillager" - }, - { - "structure": "village-hot", - "rarity": 350 } ], "entityInitialSpawns": [ @@ -69,7 +65,7 @@ } ], "children": [ - "hot-mesa-dark" + "mesa-dark" ], "objects": [ diff --git a/biomes/hot-mesa.json b/biomes/mesa.json similarity index 96% rename from biomes/hot-mesa.json rename to biomes/mesa.json index 045fd14f..d6ad9583 100644 --- a/biomes/hot-mesa.json +++ b/biomes/mesa.json @@ -8,15 +8,14 @@ "ERODED_BADLANDS" ], "children": [ - "hot-mesa-valleys", - "hot-mesa-red", - "hot-mesa-blue", - "hot-mesa-dark", - "hot-mesa-green", - "hot-mesa-red", - "hot-mesa-yellow", - "hot-mesa-blue" - + "mesa-valleys", + "mesa-red", + "mesa-blue", + "mesa-dark", + "mesa-green", + "mesa-red", + "mesa-yellow", + "mesa-blue" ], "childStyle": { "style": "GLOB", diff --git a/biomes/hot-acacia-denmyre.json b/biomes/savanna-acacia-denmyre.json similarity index 100% rename from biomes/hot-acacia-denmyre.json rename to biomes/savanna-acacia-denmyre.json diff --git a/biomes/hot-savanna-beach-grass.json b/biomes/savanna-beach-grass.json similarity index 100% rename from biomes/hot-savanna-beach-grass.json rename to biomes/savanna-beach-grass.json diff --git a/biomes/hot-savanna-cliff.json b/biomes/savanna-cliff.json similarity index 99% rename from biomes/hot-savanna-cliff.json rename to biomes/savanna-cliff.json index deed1b59..d2ce664b 100644 --- a/biomes/hot-savanna-cliff.json +++ b/biomes/savanna-cliff.json @@ -82,7 +82,7 @@ } ], "children": [ - "hot-acacia-denmyre" + "savanna-acacia-denmyre" ], "objects": [ { diff --git a/biomes/hot-dry-forest.json b/biomes/savanna-forest.json similarity index 99% rename from biomes/hot-dry-forest.json rename to biomes/savanna-forest.json index 80458731..95b71b56 100644 --- a/biomes/hot-dry-forest.json +++ b/biomes/savanna-forest.json @@ -271,7 +271,7 @@ "rarity": 6 } ], - "name": "Dry Forest", + "name": "Savanna Forest", "layers": [ { "style": { @@ -365,4 +365,4 @@ "DESERT" ], "rarity": 6 -} \ No newline at end of file +} diff --git a/biomes/hot-savanna-plateau.json b/biomes/savanna-plateau.json similarity index 100% rename from biomes/hot-savanna-plateau.json rename to biomes/savanna-plateau.json diff --git a/biomes/hot-savanna.json b/biomes/savanna.json similarity index 99% rename from biomes/hot-savanna.json rename to biomes/savanna.json index c2967ea0..c315505f 100644 --- a/biomes/hot-savanna.json +++ b/biomes/savanna.json @@ -82,10 +82,9 @@ } ], "children": [ - "hot-savanna-cliff" + "savanna-cliff" ], "objects": [ - { "chance": 0.00175, "rotation": { diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index 0524cc31..55632f7e 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -156,11 +156,12 @@ ], "translate": { "x": 0, - "y": -6, + "y": 4, "z": 0 } }, { + "mode": "STILT", "place": [ "tree/jungle/1", "tree/jungle/2", diff --git a/biomes/temperate-birch-forest.json b/biomes/temperate-birch-forest.json index 9d3cece3..3fa695be 100644 --- a/biomes/temperate-birch-forest.json +++ b/biomes/temperate-birch-forest.json @@ -34,6 +34,12 @@ "maxSpawns": 1, "minSpawns": 1, "rarity": 7 + }, + { + "entity": "bee", + "maxSpawns": 5, + "minSpawns": 1, + "rarity": 2 } ], "objects": [ diff --git a/biomes/temperate-flower-forest.json b/biomes/temperate-flower-forest.json index 2683123a..2b5b29a4 100644 --- a/biomes/temperate-flower-forest.json +++ b/biomes/temperate-flower-forest.json @@ -418,9 +418,10 @@ "place": [ "sm-tree/oakw-oakl" ], + "mode": "MIN_HEIGHT", "translate": { "x": 0, - "y": -3, + "y": -4, "z": 0 } } diff --git a/biomes/temperate-highlands.json b/biomes/temperate-highlands.json index 2deab915..acb1349f 100644 --- a/biomes/temperate-highlands.json +++ b/biomes/temperate-highlands.json @@ -212,13 +212,13 @@ ], "generators": [ { - "min": 22, - "max": 44, + "min": 12, + "max": 24, "generator": "plain" } ], "biomeZoom": 9, - "derivative": "JUNGLE", + "derivative": "FOREST", "biomeStyle": { "style": "IRIS" }, @@ -239,4 +239,4 @@ ] }, "rarity": 4 -} \ No newline at end of file +} diff --git a/biomes/temperate-longtree-forest.json b/biomes/temperate-longtree-forest.json index 43f94c4d..6c8c0fa0 100644 --- a/biomes/temperate-longtree-forest.json +++ b/biomes/temperate-longtree-forest.json @@ -23,7 +23,7 @@ "structure":"village-temperate" } ], - "derivative":"BAMBOO_JUNGLE_HILLS", + "derivative":"FOREST", "layers":[ { "style":{ diff --git a/biomes/temperate-oak-beach.json b/biomes/temperate-oak-beach.json index 161089c8..ed05d283 100644 --- a/biomes/temperate-oak-beach.json +++ b/biomes/temperate-oak-beach.json @@ -76,56 +76,6 @@ "y": 0, "z": 0 } - }, - { - "chance": 0.0015, - "edit": [ - { - "find": [ - { - "block": "white_wool" - } - ], - "replace": { - "palette": [ - { - "block": "oak_wood" - } - ] - } - }, - { - "find": [ - { - "block": "black_wool" - } - ], - "replace": { - "palette": [ - { - "block": "oak_wood" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "sm-tree/oakw-oakl" - ], - "translate": { - "x": 0, - "y": -3, - "z": 0 - } } ], "biomeZoom": 60, diff --git a/biomes/temperate-oak-forest.json b/biomes/temperate-oak-forest.json index 6ff90548..da465e18 100644 --- a/biomes/temperate-oak-forest.json +++ b/biomes/temperate-oak-forest.json @@ -281,12 +281,13 @@ }, "enabled": true }, + "mode": "MIN_HEIGHT", "place": [ "sm-tree/oakw-oakl" ], "translate": { "x": 0, - "y": -3, + "y": -4, "z": 0 } } diff --git a/biomes/temperate-plains.json b/biomes/temperate-plains.json index 782365ce..741fb00a 100644 --- a/biomes/temperate-plains.json +++ b/biomes/temperate-plains.json @@ -4,7 +4,7 @@ "vanillaDerivative": "PLAINS", "children": [ "temperate-plain-hills", - "temperate-wilds" + "temperate-wilds" ], "jigsawStructures": [ { @@ -351,7 +351,7 @@ }, { "mode": "PAINT", - "chance": 0.02, + "chance": 0.002, "rotation": { "yAxis": { "min": 0, @@ -414,6 +414,7 @@ }, "enabled": true }, + "mode": "MIN_HEIGHT", "place": [ "void/void", "void/void", diff --git a/biomes/temperate-wilds.json b/biomes/temperate-wilds.json index d2e47ac4..a240711b 100644 --- a/biomes/temperate-wilds.json +++ b/biomes/temperate-wilds.json @@ -1,5 +1,5 @@ { - "vanillaDerivative": "JUNGLE", + "vanillaDerivative": "PLAINS", "children": [ "temperate-highlands" ], @@ -264,7 +264,7 @@ } ], "biomeZoom": 40, - "derivative": "JUNGLE", + "derivative": "PLAINS", "biomeStyle": { "style": "IRIS" }, @@ -283,8 +283,5 @@ "block": "stone" } ] - }, - "biomeScatter": [ - "JUNGLE" - ] -} \ No newline at end of file + } +} diff --git a/biomes/tropical-highlands.json b/biomes/tropical-highlands.json new file mode 100644 index 00000000..b3663a25 --- /dev/null +++ b/biomes/tropical-highlands.json @@ -0,0 +1,242 @@ +{ + "vanillaDerivative": "PLAINS", + "jigsawStructures": [ + { + "rarity": 1000, + "structure": "pillager" + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], + "decorators": [ + { + "chance": 0.003, + "variance": { + "style": "STATIC" + }, + "zoom": 0.02, + "palette": [ + { + "block": "wither_rose" + }, + { + "block": "oxeye_daisy" + }, + { + "block": "pink_tulip" + }, + { + "block": "lily_of_the_valley" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.02, + "variance": { + "style": "STATIC" + }, + "zoom": 0.1, + "palette": [ + { + "block": "sunflower" + }, + { + "block": "dandelion" + }, + { + "block": "poppy" + }, + { + "block": "rose_bush" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.122, + "variance": { + "style": "STATIC" + }, + "zoom": 0.2, + "palette": [ + { + "block": "large_fern" + }, + { + "block": "tall_grass" + } + ], + "style": { + "style": "STATIC" + } + }, + { + "chance": 0.142, + "variance": { + "style": "STATIC" + }, + "zoom": 0.3, + "palette": [ + { + "block": "grass" + }, + { + "block": "fern" + } + ], + "style": { + "style": "STATIC" + } + } + ], + "objects": [ + + { + "chance": 0.35, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5", + "clutter/birch-clutt-1", + "clutter/birch-clutt-2", + "clutter/birch-clutt-3", + "clutter/birch-clutt-4", + "clutter/birch-clutt-5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "name": "Tropical Highlands", + "layers": [ + { + "style": { + "style": "STATIC" + }, + "zoom": 0.256, + "palette": [ + { + "weight": 3, + "block": "grass_block" + }, + { + "block": "podzol" + }, + { + "weight": 4, + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 22, + "max": 44, + "generator": "plain" + } + ], + "biomeZoom": 9, + "derivative": "JUNGLE", + "biomeStyle": { + "style": "IRIS" + }, + "wall": { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + }, + "rarity": 4 +} diff --git a/biomes/tropical-wilds.json b/biomes/tropical-wilds.json new file mode 100644 index 00000000..8b2700b5 --- /dev/null +++ b/biomes/tropical-wilds.json @@ -0,0 +1,290 @@ +{ + "vanillaDerivative": "JUNGLE", + "children": [ + "tropical-highlands" + ], + "jigsawStructures": [ + { + "rarity": 1000, + "structure": "pillager" + } + ], + "decorators": [ + { + "chance": 0.22, + "palette": [ + { + "block": "tall_grass" + } + ] + }, + { + "chance": 0.42, + "palette": [ + { + "block": "grass" + }, + { + "block": "fern" + } + ] + }, + { + "chance": 0.003, + "palette": [ + { + "block": "oxeye_daisy" + }, + { + "block": "pink_tulip" + }, + { + "block": "lily_of_the_valley" + } + ] + }, + { + "chance": 0.02, + "palette": [ + { + "block": "dandelion" + }, + { + "block": "poppy" + }, + { + "block": "rose_bush" + } + ] + }, + { + "chance": 0.01, + "variance": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "data": { + "age": 7 + }, + "block": "potatoes" + } + ], + "style": { + "style": "IRIS" + } + }, + { + "chance": 0.01, + "variance": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "data": { + "age": 7 + }, + "block": "carrots" + } + ], + "style": { + "style": "IRIS" + } + }, + { + "chance": 0.01, + "variance": { + "style": "IRIS" + }, + "zoom": 0.5, + "palette": [ + { + "data": { + "age": 7 + }, + "block": "beetroots" + } + ], + "style": { + "style": "IRIS" + } + } + ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], + "effects": [ + { + "interval": 250, + "chance": 5, + "particleEffect": "TOTEM", + "particleOffset": 2, + "particleAltY": 0.2, + "particleCount": 5 + } + ], + "objects": [ + + { + "chance": 0.125, + "place": [ + "shrub/shrub1", + "shrub/shrub2", + "shrub/shrub3" + ], + "translate": { + "y": -1 + } + }, + { + "chance": 0.001, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.001, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "camp/camp", + "camp/barrel-bin" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "name": "Tropical Wilds", + "layers": [ + { + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 4, + "max": 7, + "generator": "plain" + } + ], + "biomeZoom": 40, + "derivative": "JUNGLE", + "biomeStyle": { + "style": "IRIS" + }, + "wall": { + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + }, + "biomeScatter": [ + "JUNGLE" + ] +} diff --git a/entities/iron_golem.json b/entities/iron_golem.json index 9d81e329..99caae3f 100644 --- a/entities/iron_golem.json +++ b/entities/iron_golem.json @@ -1,4 +1,8 @@ { "type": "IRON_GOLEM", + "mainHand": { + "type": "iron_sword", + "lore": ["How the hell did you get this?"] + }, "aware": true } \ No newline at end of file diff --git a/generators/canyon-steep.json b/generators/canyon-steep.json index b6697e31..726650b5 100644 --- a/generators/canyon-steep.json +++ b/generators/canyon-steep.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_6", - "horizontalScale": 3 + "horizontalScale": 4 }, "seed": 530, "composite": [ diff --git a/jigsaw-pieces/pillager_outpost/feature_cage1.json b/jigsaw-pieces/pillager_outpost/feature_cage1.json index 8070855e..90595ac6 100644 --- a/jigsaw-pieces/pillager_outpost/feature_cage1.json +++ b/jigsaw-pieces/pillager_outpost/feature_cage1.json @@ -28,21 +28,6 @@ }, "direction": "SOUTH_POSITIVE_Z" }, - { - "targetName": "minecraft:feature", - "innerConnector": true, - "entityCount": 1, - "spawnEntity": "iron_golem", - "rotateConnector": false, - "name": "minecraft:feature", - "pools": ["empty"], - "position": { - "x": 1, - "y": -3, - "z": 0 - }, - "direction": "UP_POSITIVE_Y" - }, { "targetName": "minecraft:feature", "innerConnector": false, @@ -70,6 +55,21 @@ "z": 3 }, "direction": "SOUTH_POSITIVE_Z" + }, + { + "targetName": "*", + "innerConnector": false, + "entityCount": 1, + "rotateConnector": false, + "spawnEntity": "iron_golem", + "name": "", + "pools": [], + "position": { + "x": 0, + "y": -2, + "z": 0 + }, + "direction": "UP_POSITIVE_Y" } ], "placementOptions": { diff --git a/jigsaw-pieces/pillager_outpost/feature_cage2.json b/jigsaw-pieces/pillager_outpost/feature_cage2.json index b2b5f9fb..b1b01612 100644 --- a/jigsaw-pieces/pillager_outpost/feature_cage2.json +++ b/jigsaw-pieces/pillager_outpost/feature_cage2.json @@ -42,25 +42,10 @@ }, "direction": "SOUTH_POSITIVE_Z" }, - { - "targetName": "minecraft:feature", - "innerConnector": false, - "entityCount": 1, - "rotateConnector": false, - "name": "minecraft:feature", - "pools": ["empty"], - "position": { - "x": 3, - "y": -2, - "z": 3 - }, - "direction": "SOUTH_POSITIVE_Z" - }, { "targetName": "*", "innerConnector": true, "entityCount": 1, - "spawnEntity": "iron_golem", "rotateConnector": false, "name": "", "pools": [], @@ -70,6 +55,21 @@ "z": 0 }, "direction": "UP_POSITIVE_Y" + }, + { + "targetName": "*", + "innerConnector": false, + "entityCount": 1, + "rotateConnector": false, + "spawnEntity": "iron_golem", + "name": "", + "pools": [], + "position": { + "x": 0, + "y": -2, + "z": 0 + }, + "direction": "UP_POSITIVE_Y" } ], "placementOptions": { diff --git a/jigsaw-pieces/pryramid-desert.json b/jigsaw-pieces/pyramid-desert.json similarity index 98% rename from jigsaw-pieces/pryramid-desert.json rename to jigsaw-pieces/pyramid-desert.json index b16a976a..6cca1c00 100644 --- a/jigsaw-pieces/pryramid-desert.json +++ b/jigsaw-pieces/pyramid-desert.json @@ -50,7 +50,7 @@ "translate": { "yRandom": 0, "x": 0, - "y": -22, + "y": -18, "z": 0 }, "mode": "FAST_MAX_HEIGHT", diff --git a/jigsaw-structures/desert-pyramid.json b/jigsaw-structures/desert-pyramid.json index 752f678f..8bff89e3 100644 --- a/jigsaw-structures/desert-pyramid.json +++ b/jigsaw-structures/desert-pyramid.json @@ -1,6 +1,6 @@ { "maxDepth": 1, "pieces": [ - "pryramid-desert" + "pyramid-desert" ] } diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index b55dc928..73d4b0b5 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -1,6 +1,8 @@ { "name": "Beach Clutter", "rarity": 2, + "maxPicked": 4, + "minPicked": 1, "loot": [ { "type": "sugar_cane", diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index cc91321f..ca58cb4b 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -1,6 +1,8 @@ { "name": "Cactus Clutter", "rarity": 5, + "maxPicked": 4, + "minPicked": 1, "loot": [ { "type": "cactus", diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 4fa46dd1..71c8aaaf 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -1,6 +1,8 @@ { "name": "Cave Clutter", "rarity": 2, + "maxPicked": 4, + "minPicked": 1, "loot": [ { "type": "torch", diff --git a/loot/cold-food.json b/loot/cold-food.json index 3f339d1f..ab4d0a47 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -1,6 +1,8 @@ { "name": "Cold Food", "rarity": 2, + "maxPicked": 4, + "minPicked": 1, "loot": [ { "type": "rabbit_stew", diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index 50661f0a..a162f258 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -1,11 +1,13 @@ { "name": "Cold Treasure", "rarity": 1, - "minPicked": 0, + "maxPicked": 3, + "minPicked": 1, "loot": [ { "type": "iron_nugget", "maxAmount": 12, + "minAmount": 3, "rarity": 3, "slotTypes": "STORAGE" }, @@ -23,7 +25,7 @@ }, { "type": "emerald_block", - "maxamount": 2, + "maxamount": 1, "rarity": 14, "slottypes": "STORAGE" }, @@ -71,6 +73,13 @@ "maxAmount": 4, "minAmount": 2, "name": "RRM" + }, + { + "attribute": "GENERIC_MAX_HEALTH", + "operation": "ADD_NUMBER", + "maxAmount": 4, + "minAmount": 2, + "name": "RRM" } ], "itemFlags": [ diff --git a/loot/forest-food.json b/loot/forest-food.json index 9de24c7e..db251962 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -7,6 +7,45 @@ "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", + "maxAmount": 8, + "rarity": 3, + "slotTypes": "STORAGE" } ] } \ No newline at end of file diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index add4b3a4..08309522 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -7,6 +7,30 @@ "maxAmount": 12, "rarity": 7, "slotTypes": "STORAGE" + }, + { + "type": "stone_bricks", + "maxAmount": 12, + "rarity": 3, + "slotTypes": "STORAGE" + }, + { + "type": "zombie_head", + "maxAmount": 1, + "rarity": 20, + "slotTypes": "STORAGE" + }, + { + "type": "wheat", + "maxAmount": 6, + "rarity": 5, + "slotTypes": "STORAGE" + }, + { + "type": "zombie_head", + "maxAmount": 1, + "rarity": 20, + "slotTypes": "STORAGE" } ] } \ No newline at end of file diff --git a/loot/frozen-food.json b/loot/frozen-food.json index 6c10a35e..ff547128 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -1,6 +1,7 @@ { "name": "Frozen Food", "rarity": 2, + "maxPicked": 2, "loot": [ { "type": "spider_eye", diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 59290684..1b0a8de6 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -1,7 +1,7 @@ { "name": "Global Clutter", "rarity": 4, - "maxPicked": 3, + "maxPicked": 4, "minPicked": 2, "loot": [ { @@ -25,7 +25,7 @@ { "type": "leather", "maxAmount": 4, - "rarity": 24, + "rarity": 10, "slotTypes": "STORAGE" }, { @@ -37,7 +37,25 @@ { "type": "ladder", "maxAmount": 12, - "rarity": 41, + "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 74cc1206..f93a1cf3 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -1,7 +1,7 @@ { "name": "Global Tools", - "rarity": 1, - "maxPicked": 3, + "rarity": 3, + "maxPicked": 1, "minPicked": 0, "loot": [ { @@ -61,7 +61,7 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 12, + "rarity": 30, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" diff --git a/loot/global-treasure.json b/loot/global-treasure.json index b0f890ea..e763e4a7 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -1,8 +1,8 @@ { "name": "Global Treasure", - "rarity": 1, - "maxPicked": 4, - "minPicked": 1, + "rarity": 2, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "diamond", diff --git a/loot/hot-food.json b/loot/hot-food.json index 56c50183..d939921b 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -1,6 +1,7 @@ { "name": "Hot Food", "rarity": 2, + "minPicked": 1, "loot": [ { "type": "rotten_flesh", diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index cfe425f5..01bfef59 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -1,7 +1,8 @@ { "name": "Hot Treasure", "rarity": 1, - "minPicked": 0, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "lapis_lazuli", diff --git a/loot/mushroom-clutter.json b/loot/mushroom-clutter.json index 2e61de1c..a9fba882 100644 --- a/loot/mushroom-clutter.json +++ b/loot/mushroom-clutter.json @@ -1,6 +1,7 @@ { "name": "Mushroom Clutter", "rarity": 4, + "maxPicked": 3, "loot": [ { "type": "red_mushroom", diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 1793c33a..49ef8541 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -1,6 +1,7 @@ { "name": "Mushroom Food", "rarity": 2, + "maxPicked": 3, "loot": [ { "type": "spider_eye", diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index c629f556..a286c2b4 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -1,6 +1,8 @@ { "name": "Ocean Clutter", "rarity": 3, + "maxPicked": 5, + "minPicked": 3, "loot": [ { "type": "wet_sponge", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index cd8e6d4f..cca0e1ee 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -1,6 +1,7 @@ { "name": "Snow Clutter", "rarity": 3, + "minPicked": 1, "loot": [ { "type": "snowball", diff --git a/loot/swamp-clutter.json b/loot/swamp-clutter.json index 40b44f5f..b085bbf8 100644 --- a/loot/swamp-clutter.json +++ b/loot/swamp-clutter.json @@ -1,6 +1,7 @@ { "name": "Swamp Clutter", "rarity": 4, + "minPicked": 2, "loot": [ { "type": "string", @@ -19,6 +20,30 @@ "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" } ] } \ No newline at end of file diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 3fa2f90d..9f72bb82 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -1,6 +1,7 @@ { "name": "Swamp Food", "rarity": 2, + "minPicked": 2, "loot": [ { "type": "spider_eye", @@ -19,6 +20,12 @@ "maxAmount": 5, "rarity": 2, "slotTypes": "STORAGE" + }, + { + "type": "poisonous_potato", + "maxAmount": 5, + "rarity": 2, + "slotTypes": "STORAGE" } ] } \ No newline at end of file diff --git a/loot/temperate-clutter.json b/loot/temperate-clutter.json index 4bbaa975..c2b90c99 100644 --- a/loot/temperate-clutter.json +++ b/loot/temperate-clutter.json @@ -1,6 +1,7 @@ { "name": "Temperate Clutter", "rarity": 4, + "minPicked": 2, "loot": [ { "type": "oak_planks", @@ -19,12 +20,7 @@ "maxAmount": 3, "rarity": 12, "slotTypes": "STORAGE" - }, - { - "type": "diamond", - "maxAmount": 3, - "rarity": 72, - "slotTypes": "STORAGE" } + ] } \ No newline at end of file diff --git a/loot/temperate-food.json b/loot/temperate-food.json index 38549a6a..35151a60 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -1,6 +1,7 @@ { "name": "Temperate Food", "rarity": 2, + "minPicked": 1, "loot": [ { "type": "bread", diff --git a/loot/tropical-food.json b/loot/tropical-food.json index af7c7870..5888cf46 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -1,6 +1,7 @@ { "name": "Tropical Food", "rarity": 2, + "minPicked": 2, "loot": [ { "type": "melon_slice", @@ -19,6 +20,12 @@ "maxAmount": 3, "rarity": 1, "slotTypes": "STORAGE" + }, + { + "type": "cocoa_beans", + "maxAmount": 3, + "rarity": 1, + "slotTypes": "STORAGE" } ] } \ No newline at end of file diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index e967f043..af36eab4 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -1,8 +1,8 @@ { "name": "Tropical Treasure", "rarity": 5, - "maxPicked": 1, - "minPicked": 0, + "maxPicked": 3, + "minPicked": 1, "loot": [ { "type": "wooden_pickaxe", diff --git a/objects/pryamid/pyramid-extreme.iob b/objects/pyramid/pyramid-extreme.iob similarity index 100% rename from objects/pryamid/pyramid-extreme.iob rename to objects/pyramid/pyramid-extreme.iob diff --git a/objects/pyramid/pyramid1.iob b/objects/pyramid/pyramid1.iob index 99de337f..958d3f57 100644 Binary files a/objects/pyramid/pyramid1.iob and b/objects/pyramid/pyramid1.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index 2d98c871..68ef0f1e 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -1,4 +1,25 @@ { + "name": "Frozen", + "landBiomes": [ + "frozen-plains", + "frozen-pines", + "frozen-plains", + "frozen-mountain", + "frozen-redwood-forest", + "frozen-hills", + "frozen-pine-plains", + "frozen-spruce-plains" + ], + "shoreBiomes": [ + "frozen-beach" + ], + "seaBiomes": [ + "frozen-river" + ], + "caveBiomes": [ + "frozen-ice-cavern", + "temperate-cracked-cavern" + ], "riverBiomes": [ "frozen-river" ], @@ -27,20 +48,6 @@ "rarity": 10 } ], - "landBiomes": [ - "frozen-plains", - "frozen-pines", - "frozen-plains", - "frozen-mountain", - "frozen-redwood-forest", - "frozen-hills", - "frozen-pine-plains", - "frozen-spruce-plains" - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "frozen-river" - ], "riverStyle": { "style": "VASCULAR", "zoom": 4.77, @@ -66,17 +73,10 @@ "varience": 4 } ], + "biomeImplosionRatio": 0.25, "riverRarity": 1, - "caveBiomes": [ - "frozen-ice-cavern", - "temperate-cracked-cavern" - ], "landBiomeZoom": 1.25, "shoreHeightMin": 2.2, - "shoreBiomes": [ - "frozen-beach" - ], - "name": "Frozen", "shoreHeightMax": 4.2, "loot": { "tables": [ diff --git a/regions/hot.json b/regions/hot.json index 3c58e4f6..cfde78f0 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -1,39 +1,20 @@ { - "blockDrops": [ - { - "drops": [ - { - "minAmount": 1, - "type": "acacia_planks", - "maxAmount": 3 - }, - { - "type": "stripped_acacia_log", - "rarity": 12 - }, - { - "minAmount": 3, - "type": "stick", - "maxAmount": 5, - "rarity": 7 - } - ], - "blocks": [ - { - "block": "acacia_wood" - }, - { - "block": "acacia_log" - }, - { - "block": "stripped_acacia_wood" - }, - { - "block": "stripped_acacia_log" - } - ], - "replaceVanillaDrops": true - } + "name": "Hot", + "landBiomes": [ + "hot-desert-red", + "hot-desert-dunes-red", + "hot-desert-dunes", + "hot-desert" + ], + "shoreBiomes": [ + "hot-beach-grass", + "hot-beach" + ], + "seaBiomes": [ + "hot-ocean" + ], + "caveBiomes": [ + "hot-sandy-cave" ], "riverStyle": { "style": "VASCULAR", @@ -54,16 +35,7 @@ "structure": "village-hot" } ], - "landBiomes": [ - "hot-desert-red", - "hot-desert-dunes-red", - "hot-desert-dunes", - "hot-desert" - ], "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-ocean" - ], "deposits": [ { "minHeight": 25, @@ -123,9 +95,6 @@ "varience": 4 } ], - "caveBiomes": [ - "hot-sandy-cave" - ], "landBiomeZoom": 1.25, "effects": [ { @@ -147,7 +116,43 @@ "particleCount": 0 } ], - "objects": [ + "blockDrops": [ + { + "drops": [ + { + "minAmount": 1, + "type": "acacia_planks", + "maxAmount": 3 + }, + { + "type": "stripped_acacia_log", + "rarity": 12 + }, + { + "minAmount": 3, + "type": "stick", + "maxAmount": 5, + "rarity": 7 + } + ], + "blocks": [ + { + "block": "acacia_wood" + }, + { + "block": "acacia_log" + }, + { + "block": "stripped_acacia_wood" + }, + { + "block": "stripped_acacia_log" + } + ], + "replaceVanillaDrops": true + } + ], + "objects": [ { "name": "standard-surface-portals", "chance": 0.001, @@ -232,17 +237,12 @@ "carvingSupport": "SURFACE_ONLY" } ], - "shoreHeightMin": 3.2, - "shoreBiomes": [ - "hot-beach-grass", - "hot-beach" - ], - "name": "Hot", "shoreHeightMax": 6.2, "loot": { "tables": [ "hot-food", + "hot-treasure", "global-tools" ] }, diff --git a/regions/mesa.json b/regions/mesa.json index 846e14c7..859a1a38 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -1,6 +1,24 @@ { + "name": "Mesa", + "landBiomes": [ + "mesa-plateau", + "mesa-valleys", + "mesa-plateau-high", + "mesa-valleys", + "mesa", + "mesa-cliffs" + ], + "shoreBiomes": [ + "mesa-beach" + ], + "seaBiomes": [ + "mesa-river" + ], + "caveBiomes": [ + "temperate-old-cavern" + ], "riverBiomes": [ - "hot-mesa-river" + "mesa-river" ], "structures": [ { @@ -31,9 +49,6 @@ "temperate-old-cavern" ], "biomeImplosionRatio": 0.75, - "seaBiomes": [ - "hot-mesa-river" - ], "riverStyle": { "style": "VASCULAR", "zoom": 4.77, @@ -62,10 +77,6 @@ "riverRarity": 1, "landBiomeZoom": 1.5, "shoreHeightMin": 4, - "shoreBiomes": [ - "hot-mesa-beach" - ], - "name": "Mesa", "shoreHeightMax": 6, "shoreHeightZoom": 1.14, "riverThickness": 0.006, diff --git a/regions/mountain.json b/regions/mountain.json index fcab7695..68fcf679 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -1,4 +1,25 @@ { + "name": "Mountains", + "landBiomes": [ + "mountain", + "mountain-hills", + "mountain-forest-hills", + "mountain-forest", + "mountain-plains", + "mountain-cliffs", + "mountain" + ], + "shoreBiomes": [ + "mountain-beach" + ], + "seaBiomes": [ + "mountain-river-soft" + ], + "caveBiomes": [ + "temperate-old-cavern", + "temperate-cracked-cavern", + "tundra-cavern" + ], "riverBiomes": [ "mountain-river" ], @@ -18,19 +39,7 @@ "zoom": 0.5 } ], - "landBiomes": [ - "mountain", - "mountain-hills", - "mountain-forest-hills", - "mountain-forest", - "mountain-plains", - "mountain-cliffs", - "mountain" - ], "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "mountain-river-soft" - ], "deposits": [ { "minHeight": 15, @@ -51,11 +60,6 @@ } ], "riverRarity": 200, - "caveBiomes": [ - "temperate-old-cavern", - "temperate-cracked-cavern", - "tundra-cavern" - ], "landBiomeZoom": 1.9, "lakes": false, "lakeBiomeZoom": 4, @@ -73,10 +77,6 @@ } }, "shoreHeightMin": 2.2, - "shoreBiomes": [ - "mountain-beach" - ], - "name": "Mountains", "shoreHeightMax": 1.2, "shoreHeightZoom": 1.14, "riverThickness": 0.5, diff --git a/regions/mushroom.json b/regions/mushroom.json index 9cdf1e48..560ee87e 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -1,4 +1,16 @@ { + "name": "Mushroom", + "landBiomes": [ + "mushroom-forest", + "mushroom-forest-hills", + "mushroom-plains" + ], + "shoreBiomes": [ + "mushroom-beach" + ], + "seaBiomes": [ + "mushroom-ocean" + ], "blockDrops": [ { "drops": [ @@ -52,15 +64,7 @@ "rarity": 31 } ], - "landBiomes": [ - "mushroom-forest", - "mushroom-forest-hills", - "mushroom-plains" - ], "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "mushroom-ocean" - ], "landBiomeZoom": 1.25, "effects": [ { @@ -77,10 +81,6 @@ } ], "shoreHeightMin": 3.2, - "shoreBiomes": [ - "mushroom-beach" - ], - "name": "Mushroom", "shoreHeightMax": 6.2, "loot": { "tables": [ diff --git a/regions/ocean.json b/regions/ocean.json index 701350da..03607782 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -3,13 +3,12 @@ "landBiomes": [ "ocean-beach" ], - "seaBiomes": [ - "ocean" - ], - "biomeImplosionRatio": 0.7, "shoreBiomes": [ "temperate-beach" ], + "seaBiomes": [ + "ocean" + ], "caveBiomes": [ "tundra-spiked-cavern", "tropical-cavern", @@ -19,6 +18,10 @@ "temperate-old-cavern", "temperate-cracked-cavern" ], + "riverBiomes": [ + "ocean" + ], + "biomeImplosionRatio": 0.7, "rarity": 2, "effects": [ { @@ -47,8 +50,5 @@ "shoreHeightMin": 0, "shoreHeightMax": 1, "landBiomeZoom": 0.01, - "shoreBiomeZoom": 0.5, - "riverBiomes": [ - "ocean" - ] + "shoreBiomeZoom": 0.5 } \ No newline at end of file diff --git a/regions/savanna.json b/regions/savanna.json index 25f15003..b97167be 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -1,39 +1,23 @@ { - "blockDrops": [ - { - "drops": [ - { - "minAmount": 1, - "type": "acacia_planks", - "maxAmount": 3 - }, - { - "type": "stripped_acacia_log", - "rarity": 12 - }, - { - "minAmount": 3, - "type": "stick", - "maxAmount": 5, - "rarity": 7 - } - ], - "blocks": [ - { - "block": "acacia_wood" - }, - { - "block": "acacia_log" - }, - { - "block": "stripped_acacia_wood" - }, - { - "block": "stripped_acacia_log" - } - ], - "replaceVanillaDrops": true - } + "name": "Savanna", + "landBiomes": [ + "savanna", + "savanna-forest", + "savanna", + "savanna", + "savanna-forest", + "savanna", + "savanna-plateau", + "savanna-acacia-denmyre" + ], + "shoreBiomes": [ + "savanna-beach-grass" + ], + "seaBiomes": [ + "temperate-river" + ], + "caveBiomes": [ + "temperate-old-cavern" ], "riverStyle": { "style": "VASCULAR", @@ -54,21 +38,7 @@ "rarity": 650 } ], - "landBiomes": [ - "hot-savanna", - "hot-dry-forest", - "hot-savanna", - "hot-savanna", - "hot-dry-forest", - "hot-savanna", - "hot-mountain", - "hot-savanna-plateau", - "hot-acacia-denmyre" - ], "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "temperate-river" - ], "deposits": [ { "minHeight": 25, @@ -128,9 +98,6 @@ "varience": 4 } ], - "caveBiomes": [ - "temperate-old-cavern" - ], "landBiomeZoom": 1.25, "effects": [ { @@ -153,10 +120,6 @@ } ], "shoreHeightMin": 3.2, - "shoreBiomes": [ - "hot-savanna-beach-grass" - ], - "name": "Savanna", "shoreHeightMax": 6.2, "loot": { "tables": [ @@ -165,5 +128,41 @@ ] }, "shoreHeightZoom": 1.14, + "blockDrops": [ + { + "drops": [ + { + "minAmount": 1, + "type": "acacia_planks", + "maxAmount": 3 + }, + { + "type": "stripped_acacia_log", + "rarity": 12 + }, + { + "minAmount": 3, + "type": "stick", + "maxAmount": 5, + "rarity": 7 + } + ], + "blocks": [ + { + "block": "acacia_wood" + }, + { + "block": "acacia_log" + }, + { + "block": "stripped_acacia_wood" + }, + { + "block": "stripped_acacia_log" + } + ], + "replaceVanillaDrops": true + } + ], "rarity": 6 } \ No newline at end of file diff --git a/regions/swamp.json b/regions/swamp.json index 1db22832..062621e7 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -1,4 +1,59 @@ { + "name": "Swamp", + "landBiomes": [ + "swamp-roofed-forest", + "swamp-willow-forest", + "swamp-lake", + "swamp-roofed-wayward", + "swamp-marsh" + ], + "shoreBiomes": [ + "swamp-beach" + ], + "seaBiomes": [ + "swamp-ocean", + "swamp-ocean-tree" + ], + "caveBiomes": [ + "swamp-murky-cavern", + "swamp-murky-cavern-gleaming" + ], + "riverStyle": { + "style": "VASCULAR", + "zoom": 4.77, + "fracture": { + "multiplier": 240, + "style": "IRIS", + "zoom": 5 + } + }, + "biomeImplosionRatio": 0.26, + "deposits": [ + { + "minHeight": 35, + "maxPerChunk": 3, + "maxHeight": 70, + "minPerChunk": 1, + "minSize": 4, + "maxSize": 9, + "palette": [ + { + "block": "coal_ore" + } + ], + "varience": 4 + } + ], + "landBiomeZoom": 1.25, + "shoreHeightMin": 0.02, + "shoreHeightMax": 1.2, + "loot": { + "tables": [ + "swamp-food", + "swamp-clutter" + ] + }, + "shoreHeightZoom": 1.14, "blockDrops": [ { "drops": [ @@ -23,60 +78,5 @@ ] } ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, - "landBiomes": [ - "swamp-roofed-forest", - "swamp-willow-forest", - "swamp-lake", - "swamp-roofed-wayward", - "swamp-marsh" - ], - "biomeImplosionRatio": 0.26, - "seaBiomes": [ - "swamp-ocean", - "swamp-ocean-tree" - ], - "deposits": [ - { - "minHeight": 35, - "maxPerChunk": 3, - "maxHeight": 70, - "minPerChunk": 1, - "minSize": 4, - "maxSize": 9, - "palette": [ - { - "block": "coal_ore" - } - ], - "varience": 4 - } - ], - "caveBiomes": [ - "swamp-murky-cavern", - "swamp-murky-cavern-gleaming" - ], - "landBiomeZoom": 1.25, - "shoreHeightMin": 0.02, - "shoreBiomes": [ - "swamp-beach" - ], - "name": "Swamp", - "shoreHeightMax": 1.2, - "loot": { - "tables": [ - "swamp-food", - "swamp-clutter" - ] - }, - "shoreHeightZoom": 1.14, "rarity": 40 } diff --git a/regions/temperate.json b/regions/temperate.json index 153b57ff..af0fd172 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -1,55 +1,67 @@ { - "riverBiomes": [ - "temperate-river" - ], - "spotBiomes": [ - { - "as": "LAND", - "biome": "temperate-island", - "scale": 1.65, - "type": "SEA", - "rarity": 119 - } - ], - "landBiomes": [ - "temperate-plateau", - "temperate-flower-forest", - "temperate-longtree-forest", - "temperate-oak", + "name":"Temperate", + "landBiomes":[ + "temperate-plateau", + "temperate-flower-forest", + "temperate-longtree-forest", + "temperate-oak", "temperate-plains", "temperate-oak-forest", - "temperate-plains", - "temperate-birch-forest" - + "temperate-wilds", + "temperate-birch-forest" ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ + "shoreBiomes":[ + "temperate-oak-beach", + "temperate-oak-beach", + "temperate-oak-beach", + "temperate-beach", + "temperate-oak-beach" + ], + "seaBiomes":[ "temperate-river" ], - "deposits": [ + "caveBiomes":[ + "temperate-old-cavern", + "temperate-cracked-cavern", + "temperate-lit-cavern" + ], + "riverBiomes":[ + "temperate-river" + ], + "spotBiomes":[ { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 122, - "minPerChunk": 0, - "minSize": 4, - "maxSize": 12, - "palette": [ - { - "block": "iron_ore" - }, - { - "block": "coal_ore" - } - ], - "varience": 4 + "as":"LAND", + "biome":"temperate-island", + "scale":1.65, + "type":"SEA", + "rarity":119 } ], - "objects": [ + "biomeImplosionRatio":0.25, + "deposits":[ { - "name": "standard-surface-portals", - "chance": 0.001, - "place": [ + "minHeight":15, + "maxPerChunk":2, + "maxHeight":122, + "minPerChunk":0, + "minSize":4, + "maxSize":12, + "palette":[ + { + "block":"iron_ore" + }, + { + "block":"coal_ore" + } + ], + "varience":4 + } + ], + "objects":[ + { + "name":"standard-surface-portals", + "chance":0.001, + "place":[ "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -64,101 +76,88 @@ "ruined_portal/portal_9", "ruined_portal/portal_10" ], - "edit": [ + "edit":[ { - "find": [ + "find":[ { - "block": "gold_block" + "block":"gold_block" } ], - "replace": { - "palette": [ + "replace":{ + "palette":[ { - "block": "air" + "block":"air" } ] }, - "chance": 0.1 + "chance":0.1 }, { - "find": [ + "find":[ { - "block": "netherrack" + "block":"netherrack" } ], - "replace": { - "palette": [ + "replace":{ + "palette":[ { - "block": "magma_block" + "block":"magma_block" } ] }, - "chance": 0.07 + "chance":0.07 }, { - "find": [ + "find":[ { - "block": "obsidian" + "block":"obsidian" } ], - "replace": { - "palette": [ + "replace":{ + "palette":[ { - "block": "crying_obsidian" + "block":"crying_obsidian" } ] }, - "chance": 0.15 + "chance":0.15 }, { - "find": [ + "find":[ { - "block": "lava" + "block":"lava" } ], - "replace": { - "palette": [ + "replace":{ + "palette":[ { - "block": "magma_block" + "block":"magma_block" } ] }, - "chance": 0.20 + "chance":0.20 } ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" + "mode":"VACUUM", + "carvingSupport":"SURFACE_ONLY" } ], - "riverRarity": 1, - "caveBiomes": [ - "temperate-old-cavern", - "temperate-cracked-cavern", - "temperate-lit-cavern" - ], - "landBiomeZoom": 2.8, - "riverStyle": { - "style": "GLOB_IRIS_DOUBLE", - "zoom": 4.925, - "exponent": 3.1 + "riverRarity":1, + "landBiomeZoom":2.8, + "riverStyle":{ + "style":"GLOB_IRIS_DOUBLE", + "zoom":4.925, + "exponent":3.1 }, - "shoreHeightMin": 1, - "shoreBiomes": [ - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-oak-beach", - "temperate-beach", - "temperate-oak-beach" - ], - "name": "Temperate", - "shoreHeightMax": 5.2, - "loot": { - "tables": [ + "shoreHeightMin":1, + "shoreHeightMax":5.2, + "loot":{ + "tables":[ "temperate-food", - "global-tools" + "global-tools" ] }, - "shoreHeightZoom": 1.14, - "riverThickness": 0.025, - "rarity": 4 + "shoreHeightZoom":1.14, + "riverThickness":0.025, + "rarity":4 } diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 0679d6fd..d54818ee 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -1,4 +1,21 @@ { + "name": "Tropical mountain", + "landBiomes": [ + "tropical-plains", + "tropical-mountain", + "tropical-wilds", + "tropical-plains", + "tropical-mountain-extreme", + "tropical-wilds", + "tropical-plains-hills" + ], + "shoreBiomes": [ + "tropical-beach" + ], + "seaBiomes": [ + "tropical-river-steep", + "tropical-river-soft" + ], "riverBiomes": [ "tropical-river-steep", "tropical-river-soft" @@ -20,20 +37,7 @@ "zoom": 0.5 } ], - "landBiomes": [ - "tropical-plains", - "tropical-mountain", - "temperate-wilds", - "tropical-plains", - "tropical-mountain-extreme", - "temperate-wilds", - "tropical-plains-hills" - ], "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "tropical-river-steep", - "tropical-river-soft" - ], "deposits": [ { "minHeight": 15, @@ -68,12 +72,8 @@ } }, "shoreHeightMin": 2.2, - "shoreBiomes": [ - "tropical-beach" - ], - "name": "Tropical mountain", "shoreHeightMax": 1.2, "shoreHeightZoom": 1.14, "riverThickness": 0.025, "rarity": 4 -} \ No newline at end of file +} diff --git a/regions/tropical.json b/regions/tropical.json index 77416669..493b9b66 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -1,4 +1,39 @@ { + "name": "Tropical", + "landBiomes": [ + "tropical-rainforest", + "tropical-plains", + "tropical-bamboo-forest", + "tropical-plains", + "tropical-rainforest-wicked", + "tropical-wilds", + "tropical-volcanic-plains" + ], + "shoreBiomes": [ + "tropical-island-beach", + "tropical-beach", + "tropical-beach-charred", + "tropical-beach-bamboo" + ], + "seaBiomes": [ + "tropical-ocean", + "tropical-river-soft" + ], + "caveBiomes": [ + "tropical-cavern", + "tropical-cavern-coral", + "tropical-cavern-root" + ], + "biomeImplosionRatio": 0.25, + "riverStyle": { + "style": "VASCULAR", + "zoom": 4.77, + "fracture": { + "multiplier": 240, + "style": "IRIS", + "zoom": 5 + } + }, "spotBiomes": [ { "as": "SEA", @@ -22,29 +57,6 @@ "structure": "jungle-pyramid" } ], - "landBiomes": [ - "tropical-rainforest", - "tropical-plains", - "tropical-bamboo-forest", - "tropical-plains", - "tropical-rainforest-wicked", - "temperate-wilds", - "tropical-volcanic-plains" - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "tropical-ocean", - "tropical-river-soft" - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, "deposits": [ { "minHeight": 25, @@ -61,20 +73,8 @@ "varience": 2 } ], - "caveBiomes": [ - "tropical-cavern", - "tropical-cavern-coral", - "tropical-cavern-root" - ], "landBiomeZoom": 1.25, "shoreHeightMin": 3.2, - "shoreBiomes": [ - "tropical-island-beach", - "tropical-beach", - "tropical-beach-charred", - "tropical-beach-bamboo" - ], - "name": "Tropical", "shoreHeightMax": 9.2, "loot": { "tables": [ @@ -168,4 +168,4 @@ ], "shoreHeightZoom": 2.14, "rarity": 4 -} \ No newline at end of file +} diff --git a/regions/tundra.json b/regions/tundra.json index b67347c5..40a33cd1 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -1,7 +1,5 @@ { - "riverBiomes": [ - "tundra-river" - ], + "name": "Tundra", "landBiomes": [ "tundra-taiga", "tundra-redwoods-forest", @@ -14,10 +12,21 @@ "tundra-mountains-cliffs", "mountain-forest" ], - "biomeImplosionRatio": 0.25, + "shoreBiomes": [ + "tundra-beach", + "tundra-beach-stone" + ], "seaBiomes": [ "tundra-river" ], + "caveBiomes": [ + "tundra-cavern", + "tundra-spiked-cavern" + ], + "riverBiomes": [ + "tundra-river" + ], + "biomeImplosionRatio": 0.25, "deposits": [ { "minHeight": 15, @@ -35,10 +44,6 @@ } ], "riverRarity": 1, - "caveBiomes": [ - "tundra-cavern", - "tundra-spiked-cavern" - ], "landBiomeZoom": 1.25, "riverStyle": { "style": "VASCULAR", @@ -50,11 +55,6 @@ } }, "shoreHeightMin": 2.2, - "shoreBiomes": [ - "tundra-beach", - "tundra-beach-stone" - ], - "name": "Tundra", "shoreHeightMax": 5.2, "loot": { "tables": [