diff --git a/biomes/mushroom-beach.json b/biomes/mushroom-beach.json index 49426140..0038eaa5 100644 --- a/biomes/mushroom-beach.json +++ b/biomes/mushroom-beach.json @@ -1,6 +1,14 @@ { - "vanillaDerivative": "MUSHROOM_FIELD_SHORE", "name": "Mushroom Beach", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELD_SHORE", + "generators": [ + { + "min": -5, + "max": 1, + "generator": "plain" + } + ], "layers": [ { "minHeight": 3, @@ -25,7 +33,6 @@ } ], "objects": [ - { "name": "standard-surface-portals", "chance": 0.00505, @@ -110,15 +117,6 @@ "carvingSupport": "SURFACE_ONLY" } ], - "generators": [ - { - "min": -5, - "max": 1, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", - "rarity": 2, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-crimson-forest.json b/biomes/mushroom-crimson-forest.json index bd436489..4f4a9007 100644 --- a/biomes/mushroom-crimson-forest.json +++ b/biomes/mushroom-crimson-forest.json @@ -1,5 +1,57 @@ { + "name": "Crimson Mushroom Swamp", + "derivative": "CRIMSON_FOREST", "vanillaDerivative": "MUSHROOM_FIELDS", + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "crimson_nylium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 4, + "max": 39, + "generator": "plain-cliffs" + } + ], "decorators": [ { "chance": 0.009, @@ -418,58 +470,6 @@ } } ], - "name": "Crimson Mushroom Swamp", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "crimson_nylium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 4, - "max": 39, - "generator": "plain-cliffs" - } - ], - "derivative": "CRIMSON_FOREST", "wall": { "style": { "style": "STATIC" @@ -480,7 +480,6 @@ } ] }, - "rarity": 19, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-forest-hills.json b/biomes/mushroom-forest-hills.json index 1cb202b7..246773da 100644 --- a/biomes/mushroom-forest-hills.json +++ b/biomes/mushroom-forest-hills.json @@ -1,5 +1,111 @@ { + "name": "Mushroom Forest Hills", + "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", + "generators": [ + { + "min": 12, + "max": 46, + "generator": "plain" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "red_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "brown_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 4, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 3, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], "effects": [ { "volume": 6.2, @@ -337,112 +443,6 @@ } } ], - "name": "Mushroom Forest", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "red_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "brown_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 4, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 3, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 12, - "max": 46, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-forest.json b/biomes/mushroom-forest.json index 4af83fc3..de2c9b66 100644 --- a/biomes/mushroom-forest.json +++ b/biomes/mushroom-forest.json @@ -1,15 +1,9 @@ { + "name": "Mushroom Forest", + "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", - "effects": [ - { - "volume": 6.2, - "minPitch": 0.2, - "chance": 8, - "maxPitch": 0.3, - "sound": "AMBIENT_WARPED_FOREST_ADDITIONS", - "interval": 6000, - "soundDistance": 3 - } + "children": [ + "mushroom-forest-hills" ], "jigsawStructures": [ { @@ -25,6 +19,121 @@ "rarity": 1000 } ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 6.9 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "red_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": { + "minimumSlope": 4.6 + }, + "palette": [ + { + "block": "gravel" + }, + { + "block": "brown_mushroom_block", + "data": { + "down": true, + "up": true, + "north": true, + "south": true, + "east": true, + "west": true + } + } + ] + }, + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 4, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 3, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 6, + "max": 24, + "generator": "plain" + } + ], + "effects": [ + { + "volume": 6.2, + "minPitch": 0.2, + "chance": 8, + "maxPitch": 0.3, + "sound": "AMBIENT_WARPED_FOREST_ADDITIONS", + "interval": 6000, + "soundDistance": 3 + } + ], "entityInitialSpawns": [ { "maxSpawns": 5, @@ -33,9 +142,6 @@ "rarity": 5 } ], - "children": [ - "mushroom-forest-hills" - ], "decorators": [ { "chance": 0.009, @@ -438,112 +544,6 @@ } } ], - "name": "Mushroom Forest", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 6.9 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "red_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "slopeCondition": { - "minimumSlope": 4.6 - }, - "palette": [ - { - "block": "gravel" - }, - { - "block": "brown_mushroom_block", - "data": { - "down": true, - "up": true, - "north": true, - "south": true, - "east": true, - "west": true - } - } - ] - }, - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 4, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 3, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 24, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-lake.json b/biomes/mushroom-lake.json index 802bce1e..d897f943 100644 --- a/biomes/mushroom-lake.json +++ b/biomes/mushroom-lake.json @@ -1,4 +1,7 @@ { + "name": "Mushroom Lake", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELDS", "effects": [ { "volume": 6.2, @@ -10,6 +13,64 @@ "soundDistance": 3 } ], + "layers": [ + { + "zoom": 0.3, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 7, + "block": "mycelium" + }, + { + "block": "gravel" + }, + { + "weight": 9, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": -30, + "max": -10, + "generator": "river" + } + ], "entityInitialSpawns": [ { "maxSpawns": 5, @@ -18,7 +79,6 @@ "rarity": 5 } ], - "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.005, @@ -212,66 +272,6 @@ } } ], - "name": "Mushroom Plains", - "layers": [ - { - "zoom": 0.3, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 7, - "block": "mycelium" - }, - { - "block": "gravel" - }, - { - "weight": 9, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": -30, - "max": -10, - "generator": "river" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-ocean.json b/biomes/mushroom-ocean.json index 15dbb815..2b1d9c43 100644 --- a/biomes/mushroom-ocean.json +++ b/biomes/mushroom-ocean.json @@ -1,4 +1,61 @@ { + "name": "Mushroom Ocean", + "derivative": "OCEAN", + "vanillaDerivative": "OCEAN", + "layers": [ + { + "minHeight": 2, + "maxHeight": 3, + "style": { + "style": "STATIC" + }, + "zoom": 0.825, + "palette": [ + { + "block": "clay" + }, + { + "block": "stone" + }, + { + "block": "cobblestone" + }, + { + "block": "andesite" + }, + { + "block": "gravel" + } + ] + }, + { + "palette": [ + { + "block": "dirt" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "weight": 2, + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + } + ], + "generators": [ + { + "min": -51, + "max": -39, + "generator": "ocean" + } + ], "decorators": [ { "chance": 0.06, @@ -212,68 +269,11 @@ } } ], - "vanillaDerivative": "OCEAN", - "name": "Mushroom Ocean", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.825, - "palette": [ - { - "block": "clay" - }, - { - "block": "stone" - }, - { - "block": "cobblestone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -51, - "max": -39, - "generator": "ocean" - } - ], "loot": { "tables": [ "ocean-clutter" ] }, - "derivative": "OCEAN", "wall": { "style": { "style": "IRIS" diff --git a/biomes/mushroom-plains.json b/biomes/mushroom-plains.json index 6ea94e4a..c3a84e42 100644 --- a/biomes/mushroom-plains.json +++ b/biomes/mushroom-plains.json @@ -1,4 +1,62 @@ { + "name": "Mushroom Plains", + "derivative": "MUSHROOM_FIELDS", + "vanillaDerivative": "MUSHROOM_FIELDS", + "layers": [ + { + "zoom": 0.3, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "weight": 7, + "block": "mycelium" + }, + { + "weight": 9, + "block": "mycelium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "stone" + }, + { + "block": "andesite" + }, + { + "block": "stone" + } + ] + } + ], + "generators": [ + { + "min": 6, + "max": 14, + "generator": "plain" + } + ], "effects": [ { "volume": 6.2, @@ -18,7 +76,6 @@ "rarity": 5 } ], - "vanillaDerivative": "MUSHROOM_FIELDS", "decorators": [ { "chance": 0.005, @@ -212,63 +269,6 @@ } } ], - "name": "Mushroom Plains", - "layers": [ - { - "zoom": 0.3, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "weight": 7, - "block": "mycelium" - }, - { - "weight": 9, - "block": "mycelium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 14, - "generator": "plain" - } - ], - "derivative": "MUSHROOM_FIELDS", "wall": { "style": { "style": "STATIC" diff --git a/biomes/mushroom-warped-forest.json b/biomes/mushroom-warped-forest.json index e8bf5631..c4678aa3 100644 --- a/biomes/mushroom-warped-forest.json +++ b/biomes/mushroom-warped-forest.json @@ -1,5 +1,51 @@ { + "name": "Mushroom Warped Forest", + "derivative": "WARPED_FOREST", "vanillaDerivative": "MUSHROOM_FIELDS", + "generators": [ + { + "min": 6, + "max": 39, + "generator": "plain-cliffs" + } + ], + "layers": [ + { + "zoom": 0.5, + "style": { + "style": "IRIS" + }, + "palette": [ + { + "block": "warped_nylium" + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 45, + "maxHeight": 65, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "blackstone" + } + ] + } + ], "decorators": [ { "chance": 0.009, @@ -78,7 +124,6 @@ } ], "objects": [ - { "chance": 0.21, "density": 2, @@ -518,52 +563,6 @@ } } ], - "name": "Corrupted Mushroom Swamp", - "layers": [ - { - "zoom": 0.5, - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "warped_nylium" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 45, - "maxHeight": 65, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "blackstone" - } - ] - } - ], - "generators": [ - { - "min": 6, - "max": 39, - "generator": "plain-cliffs" - } - ], - "derivative": "WARPED_FOREST", "wall": { "style": { "style": "STATIC" @@ -574,7 +573,6 @@ } ] }, - "rarity": 19, "slab": { "style": { "style": "STATIC" diff --git a/biomes/ocean-beach.json b/biomes/ocean-beach.json index 9ca202d4..bf113479 100644 --- a/biomes/ocean-beach.json +++ b/biomes/ocean-beach.json @@ -1,5 +1,5 @@ { - "name": "ocean land", + "name": "Ocean Beach", "derivative": "PLAINS", "vanillaDerivative": "PLAINS", "generators": [ @@ -9,6 +9,44 @@ "min": -30 } ], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "palette": [ + { + "block": "grass_block" + } + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + { + "block": "dirt" + }, + { + "block": "coarse_dirt" + } + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + { + "block": "dirt" + }, + { + "block": "stone" + } + ] + } + ], "decorators": [ { "chance": 0.2, @@ -111,44 +149,6 @@ } } ], - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "palette": [ - { - "block": "grass_block" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "dirt" - }, - { - "block": "stone" - } - ] - } - ], "biomeZoom": 60, "biomeStyle": { "style": "IRIS" diff --git a/biomes/ocean-deep.json b/biomes/ocean-deep.json index 7a0ea4e8..91963891 100644 --- a/biomes/ocean-deep.json +++ b/biomes/ocean-deep.json @@ -1,5 +1,5 @@ { - "name": "Deep Ocean", + "name": "Ocean Deep", "derivative": "DEEP_OCEAN", "vanillaDerivative": "DEEP_OCEAN", "generators": [ diff --git a/biomes/ocean-warm-bottom.json b/biomes/ocean-warm-bottom.json index 2e03e5a3..b4cc6119 100644 --- a/biomes/ocean-warm-bottom.json +++ b/biomes/ocean-warm-bottom.json @@ -1,5 +1,5 @@ { - "name": "Warm Ocean", + "name": "Ocean Warm Bottom", "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "generators": [ diff --git a/biomes/ocean-warm.json b/biomes/ocean-warm.json index 86ce8ab8..cda67e9a 100644 --- a/biomes/ocean-warm.json +++ b/biomes/ocean-warm.json @@ -1,16 +1,10 @@ { - "name": "Warm Ocean Top", + "name": "Ocean Warm", "derivative": "WARM_OCEAN", "vanillaDerivative": "WARM_OCEAN", "children": [ "ocean-warm-bottom" ], - "childStyle": { - "style": "GLOB", - "zoom": 1, - "exponent": 1.3 - }, - "childShrinkFactor": 1.0, "generators": [ { "generator": "plain", @@ -52,6 +46,12 @@ ] } ], + "childStyle": { + "style": "GLOB", + "zoom": 1, + "exponent": 1.3 + }, + "childShrinkFactor": 1.0, "decorators": [ { "chance": 0.02, diff --git a/biomes/ocean.json b/biomes/ocean.json index a21fcc17..33b1fe04 100644 --- a/biomes/ocean.json +++ b/biomes/ocean.json @@ -2,21 +2,6 @@ "name": "Ocean", "derivative": "OCEAN", "vanillaDerivative": "OCEAN", - "childStyle": { - "style": "SIMPLEX", - "zoom": 2, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "multiplier": 50, - "fracture": { - "style": "CELLULAR", - "zoom": 0.3, - "multiplier": 25 - } - } - }, - "childShrinkFactor": 1.0, "generators": [ { "generator": "mountain", @@ -71,6 +56,21 @@ ] } ], + "childStyle": { + "style": "SIMPLEX", + "zoom": 2, + "fracture": { + "style": "SIMPLEX", + "zoom": 0.8, + "multiplier": 50, + "fracture": { + "style": "CELLULAR", + "zoom": 0.3, + "multiplier": 25 + } + } + }, + "childShrinkFactor": 1.0, "decorators": [ { "chance": 0.02,