diff --git a/README.md b/README.md index 47888dc3..a411abd6 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,16 @@ If you want to contribute as well, feel free to make a fork and pull requests. We sporadically review these requests so please contact us on Discord if you've made any. -# Overworld V2 1.17 +# Overworld V2 1.17+ Roadmap +- [ ] Fill regions with more content, swamp, cold, etc... +- [ ] Fix straight lines... - [x] Ore implementation for copper - [X] New implementation for andesite, gravel, granite, and deepslate for the infinite height in 1.17+ (need to objectify them) - [X] Fix implementation of objects in the REGIONS folder. They are not working, Clamp, and Bottom, are not working. - [X] Amythests - [ ] Pretty caves (with whatever new blocks they added! -- [-] Biomes that show off the new blocks +- [ ] Biomes that show off the new blocks * - [X] Implement all the new blocks - [X] Fix Despawns and rework Spawns diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json index 4d51a960..46438735 100644 --- a/biomes/frozen/pine-hills.json +++ b/biomes/frozen/pine-hills.json @@ -42,7 +42,7 @@ "grassColor": "#D0E1FF" }], "generators": [{ - "generator": "smooth-dunes", + "generator": "mountain", "max": 20, "min": 6 }], diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json index d0c3caa4..2e6efbdb 100644 --- a/biomes/frozen/pine-plains.json +++ b/biomes/frozen/pine-plains.json @@ -72,7 +72,7 @@ "chance": 1, "variance": { "style": "IRIS", - "zoom": 0.23 + "zoom": 0.29 }, "palette": [ { @@ -81,7 +81,16 @@ }, {"block": "air"} ] - }], + }, + { + "chance": 0.01, + "variance": {"style": "STATIC"}, + "zoom": 0.01, + "palette": [ + {"block": "cornflower"} + ], + "style": {"style": "STATIC"} + }], "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} @@ -111,7 +120,7 @@ "trees/spruce/pine8", "trees/spruce/pine9" ], - "chance": 0.09, + "chance": 0.2, "rotation": { "enabled": true, "yAxis": { diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json index 7612e922..d3ff12b4 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -23,7 +23,7 @@ "downfallType": "snow", "temperature": -3, "waterFogColor": "#216FC4", - "foliageColor": "#B8D0E1", + "foliageColor": "#6FA6CE", "grassColor": "#D0E1FF" }], "layers": [ @@ -107,34 +107,14 @@ { "chance": 0.4, "density": 2, - "edit": [ - { - "find": [{"block": "spruce_leaves"}], - "replace": { - "style": { - "style": "PERLIN", - "zoom": 0.2 - }, - "palette": [ - {"block": "oak_leaves"}, - {"block": "dark_oak_leaves"} - ] - } - }, - { - "find": [ - {"block": "birch_leaves"}, - {"block": "oak_leaves"} - ], - "replace": {"palette": [ - { - "weight": 4, - "block": "ice" - }, - {"block": "packed_ice"} - ]} - } - ], + "edit": [{ + "find": [{"block": "birch_leaves"}], + "replace": {"palette": [{"block": "oak_leaves", "data": {"persistent": true}}]} + }, + { + "find": [{"block": "spruce_leaves"}], + "replace": {"palette": [{"block": "dark_oak_leaves", "data": {"persistent": true}}]} + }], "snow": 1, "rotation": { "yAxis": { diff --git a/biomes/mesa/plateau-dirt.json b/biomes/mesa/plateau-dirt.json index 5e6dc539..598ec4d4 100644 --- a/biomes/mesa/plateau-dirt.json +++ b/biomes/mesa/plateau-dirt.json @@ -8,17 +8,7 @@ "generators": [ { "min": 33, - "max": 35, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, + "max": 41, "generator": "cracked-cliffs" } ], diff --git a/biomes/mesa/plateau-high.json b/biomes/mesa/plateau-high.json index cb90f812..430244f7 100644 --- a/biomes/mesa/plateau-high.json +++ b/biomes/mesa/plateau-high.json @@ -12,18 +12,8 @@ "children": ["mesa/plateau-dirt-high"], "generators": [ { - "min": 55, - "max": 45, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, + "min": 45, + "max": 58, "generator": "cracked-cliffs" } ], diff --git a/biomes/mesa/plateau.json b/biomes/mesa/plateau.json index 84f73c28..8e219bfb 100644 --- a/biomes/mesa/plateau.json +++ b/biomes/mesa/plateau.json @@ -12,18 +12,8 @@ "children": ["mesa/plateau-dirt"], "generators": [ { - "min": 35, - "max": 35, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, + "min": 34, + "max": 40, "generator": "cracked-cliffs" } ], diff --git a/biomes/ocean/deep.json b/biomes/ocean/deep.json index 5fa65e20..0686905b 100644 --- a/biomes/ocean/deep.json +++ b/biomes/ocean/deep.json @@ -134,5 +134,13 @@ "structures/shipupsidedownbackhalfdegraded" ] } + ], + "entityInitialSpawns": [ + { + "entity": "dolphin", + "maxSpawns": 5, + "minSpawns": 2, + "rarity": 100 + } ] } diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json index c9a1e5a7..ab2dd275 100644 --- a/biomes/swamp/cambian-drift.json +++ b/biomes/swamp/cambian-drift.json @@ -4,13 +4,13 @@ "rarity": 1, "color": "#489A20", "vanillaDerivative": "DARK_FOREST", - "children": ["swamp/sea/lake"], "generators": [{ - "min": -7, - "max": -3, - "generator": "plain" + "min": -3, + "max": 15, + "generator": "mountain" }], "customDerivitives": [{ + "category": "forest", "id": "swamp_cambian_drift", "waterColor": "#684D1A", "foliageColor": "2B4A00", @@ -55,16 +55,6 @@ ] } ], - "jigsawStructures": [ - { - "rarity": 1700, - "structure": "pillager_outpost" - }, - { - "rarity": 1000, - "structure": "village-tundra" - } - ], "decorators": [ { "chance": 0.03, diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index 5d15f060..bcc51a7a 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -159,6 +159,27 @@ "trees/birch/antioch5b", "trees/birch/antioch6b" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index a03fa277..600e8655 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -3,7 +3,7 @@ "derivative": "BIRCH_FOREST", "vanillaDerivative": "BIRCH_FOREST", "color": "#e3fa93", - "rarity": 4, + "rarity": 2, "generators": [{ "min": 5, "max": 15, @@ -130,6 +130,27 @@ "trees/birch/antioch5b", "trees/birch/antioch6b" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 50, diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 6661c525..8b01e466 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -8,7 +8,7 @@ "max": 12, "generator": "plain" }], - "rarity": 3, + "rarity": 2, "biomeZoom": 50, "layers": [ { @@ -288,6 +288,27 @@ "clutter/literalgarbage3", "clutter/literalgarbage4" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index c3e71a72..5b31b383 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -1,7 +1,7 @@ { "name": "Temperate Flower Forest", "derivative": "FLOWER_FOREST", - "rarity": 1, + "rarity": 3, "color": "#C4CF30", "vanillaDerivative": "FLOWER_FOREST", "generators": [{ @@ -371,27 +371,24 @@ }, { - "chance": 2.0E-7, - "mode": "MIN_HEIGHT", - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, + "chance": 0.008, + "mode": "PAINT", "place": [ - "void/void", - "void/void", - "void/void", - "trees/mixed/smoakog80" + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" ], - "translate": { - "x": 0, - "y": -5, - "z": 0 + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } } } ], diff --git a/biomes/temperate/highlands.json b/biomes/temperate/highlands.json index a0367bf7..459b922b 100644 --- a/biomes/temperate/highlands.json +++ b/biomes/temperate/highlands.json @@ -116,7 +116,7 @@ } ], "objects": [{ - "chance": 0.35, + "chance": 0.5, "density": 2, "rotation": { "yAxis": { diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 4512bf7b..03bd9e73 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -1,6 +1,6 @@ { "vanillaDerivative": "FOREST", - "rarity": 5, + "rarity": 3, "color": "#9B9F60", "name": "Long tree forest", "effects": [{ @@ -13,6 +13,12 @@ "interval": 550, "particleCount": 3 }], + "customDerivitives": [{ + "id": "longtree_forest", + "foliageColor": "#58AB24", + "grassColor": "#4AB71C", + "category": "forest" + }], "jigsawStructures": [ { "rarity": 1000, @@ -251,7 +257,7 @@ ], "objects": [ { - "chance": 0.7, + "chance": 0.5, "rotation": { "yAxis": { "min": 0, @@ -362,6 +368,27 @@ "y": -2, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "generators": [{ diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 2afe3801..3e2bb614 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -3,7 +3,7 @@ "derivative": "FLOWER_FOREST", "vanillaDerivative": "FLOWER_FOREST", "color": "#de3535", - "rarity": 5, + "rarity": 3, "generators": [{ "min": 4, "max": 7, @@ -190,7 +190,33 @@ "structures/landstone5", "clutter/statue-villager-plains" ] - + }, + { + "chance": 0.004, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6", + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 84445fa3..4a4d458b 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -3,7 +3,7 @@ "derivative": "FLOWER_FOREST", "vanillaDerivative": "FLOWER_FOREST", "color": "#d8e310", - "rarity": 5, + "rarity": 3, "generators": [{ "min": 4, "max": 7, @@ -190,7 +190,33 @@ "structures/landstone5", "clutter/statue-villager-plains" ] - + }, + { + "chance": 0.004, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6", + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index dc7e4ecd..2add643f 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -8,7 +8,7 @@ "max": 7, "generator": "plain" }], - "rarity": 3, + "rarity": 2, "biomeZoom": 30, "children": [ "temperate/lush-plains-yellow", @@ -218,7 +218,33 @@ "structures/landstone5", "clutter/statue-villager-plains" ] - + }, + { + "chance": 0.004, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6", + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index e1f91fd1..a93177ad 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -1,6 +1,6 @@ { "name": "Oak Denmyre", - "rarity": 6, + "rarity": 4, "color": "#C8FF00", "derivative": "FOREST", "vanillaDerivative": "FOREST", @@ -190,6 +190,27 @@ "max": 360 } } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 0f4c5d74..27314c2f 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -13,6 +13,12 @@ "max": 40, "min": 0 }], + "customDerivitives": [{ + "id": "oak_forest", + "foliageColor": "#64B233", + "grassColor": "#77A620", + "category": "forest" + }], "rarity": 3, "jigsawStructures": [ { @@ -125,16 +131,6 @@ "objects": [ { "place": [ - "clutter/boulder1", - "clutter/boulder2", - "clutter/boulder3", - "clutter/boulder4", - "clutter/boulder5", - "clutter/boulder6", - "clutter/boulder7", - "clutter/boulder8", - "clutter/boulder9", - "clutter/boulder10", "trees/oak/hoakgeneric1", "trees/oak/hoakgeneric2", "trees/oak/hoakgeneric3", @@ -145,19 +141,19 @@ "trees/oak/shoakgeneric3", "trees/oak/shoakgeneric4", "trees/oak/shoakgeneric4", - "trees/oak/toak1", - "trees/oak/toak2", - "trees/oak/toak3", - "trees/oak/toak4", - "trees/oak/toak5", - "trees/oak/toak6", - "trees/oak/toak7", - "trees/oak/toak8", - "trees/oak/toak9", - "trees/oak/toak10", - "trees/oak/toak11" + + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6", + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], - "chance": 0.3, + "chance": 0.9, + "density": 2, "rotation": { "enabled": true, "yAxis": { @@ -175,17 +171,18 @@ }, { "place": [ - "trees/oak/generic1", - "trees/oak/generic2", - "trees/oak/generic3", - "trees/oak/generic4", - "trees/oak/generic5", - "trees/oak/generic6", - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "clutter/boulder1", + "clutter/boulder2", + "clutter/boulder3", + "clutter/boulder4", + "clutter/boulder5", + "clutter/boulder6", + "clutter/boulder7", + "clutter/boulder8", + "clutter/boulder9", + "clutter/boulder10" ], - "chance": 0.6, + "chance": 0.01, "rotation": { "enabled": true, "yAxis": { @@ -197,7 +194,7 @@ } }, { - "chance": 2.0E-7, + "chance": 0.001, "mode": "MIN_HEIGHT", "rotation": { "yAxis": { @@ -209,9 +206,6 @@ "enabled": true }, "place": [ - "void/void", - "void/void", - "void/void", "trees/mixed/smoakog80" ], "translate": { @@ -219,6 +213,27 @@ "y": -5, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "entityInitialSpawns": [ diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 28a7a2c4..4fd1af6e 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -44,6 +44,26 @@ ] } ], + "features": [ + { + "rarity": 252, + "zone": { + "convergeToHeight": 64, + "interpolationRadius": 3, + "interpolator": "BILINEAR_STARCAST_6", + "blockRadius": 14, + "objectChance": 1, + "strength": 1, + "biomeStrengthThreshold": 0.18, + "customBiome": "temperate/flower-forest", + "fractureRadius": { + "style": "NOWHERE", + "zoom": 0.12, + "multiplier": 52 + } + } + } + ], "decorators": [ { "chance": 0.004, @@ -272,7 +292,13 @@ }, { "place": [ - "clutter/statue-villager-plains" + "clutter/statue-villager-plains", + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" ], "chance": 0.008, "mode": "MIN_HEIGHT", diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json index 7d25c80c..69724edc 100644 --- a/biomes/temperate/plateau.json +++ b/biomes/temperate/plateau.json @@ -15,17 +15,7 @@ { "min": 25, "max": 37, - "generator": "canyon-steep" - }, - { - "min": 2, - "max": 3, - "generator": "smooth-dunes" - }, - { - "min": 2, - "max": 6, - "generator": "plain" + "generator": "small-cliffs" } ], "jigsawStructures": [ diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json deleted file mode 100644 index 55d34b0a..00000000 --- a/biomes/temperate/sakura-pink-child.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "name": "Temperate Sakura Child Forest", - "rarity": 4, - "color": "#EE96F4", - "derivative": "FLOWER_FOREST", - "vanillaDerivative": "FOREST", - "customDerivitives": [{ - "id": "sakura_child_forest", - "foliageColor": "#AE42C9", - "waterColor": "#A5FFED", - "grassColor": "#83FF6C", - "category": "forest" - }], - "generators": [{ - "min": 4, - "max": 7, - "generator": "plain" - }], - "layers": [ - { - "style": {"style": "STATIC"}, - "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"} - ] - } - ], - "objects": [ - { - "chance": 0.1, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "edit": [{ - "find": [{"block": "oak_wood"}], - "replace": {"palette": [{"block": "stripped_birch_log"}]} - }], - "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" - ] - }, - { - "mode": "PAINT", - "chance": 0.00975, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/camp1", - "clutter/camp4", - "clutter/camp5", - "clutter/camp3" - ] - }, - { - "chance": 0.7, - "mode": "FAST_MIN_HEIGHT", - "density": 2, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "trees/sakura/genericsak1", - "trees/sakura/genericsak2", - "trees/sakura/genericsak3", - "trees/sakura/genericsak4", - "trees/sakura/genericsak5" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.002, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" - ] - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "edit": [{ - "find": [{"block": "oak_wood"}], - "replace": {"palette": [{"block": "stripped_birch_log"}]} - }], - "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" - ] - } - ], - "biomeZoom": 60, - "biomeStyle": {"style": "SIMPLEX"}, - "decorators": [ - { - "chance": 0.8, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [ - { - "weight": 1, - "block": "grass" - }, - {"block": "grass"}, - {"block": "grass"}, - { - "chance": 7, - "block": "grass" - } - ] - }, - { - "chance": 0.03, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{"block": "oak_leaves"}] - }, - { - "chance": 0.02, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{"block": "tall_grass"}] - }, - { - "chance": 0.06, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{"block": "allium"}] - }, - { - "chance": 0.03, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{"block": "cobblestone_slab"}] - } - ], - "wall": { - "style": {"style": "STATIC"}, - "palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "stone"} - ] - }, - "biomeScatter": ["FOREST"], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] -} diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json index 8fa52b2d..8a3a5af7 100644 --- a/biomes/temperate/sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -4,18 +4,19 @@ "rarity": 4, "color": "#DF4FE8", "vanillaDerivative": "FOREST", - "children": ["temperate/sakura-pink-child"], - "childStyle": { - "style": "IRIS", - "zoom": 0.3, - "multiplier": 4 - }, "customDerivitives": [{ "id": "sakura_pink", "foliageColor": "#FFADF0", "waterColor": "#A5FFED", "grassColor": "#A8FF98", "category": "forest" + }, + { + "id": "sakura_child_forest", + "foliageColor": "#AE42C9", + "waterColor": "#A5FFED", + "grassColor": "#83FF6C", + "category": "forest" }], "generators": [{ "min": 4, @@ -69,7 +70,7 @@ ], "objects": [ { - "chance": 0.1, + "chance": 0.2, "rotation": { "yAxis": { "min": 0, @@ -105,7 +106,7 @@ }, { "mode": "PAINT", - "chance": 0.00975, + "chance": 0.008, "rotation": { "yAxis": { "min": 0, @@ -149,7 +150,7 @@ } }, { - "chance": 0.002, + "chance": 0.003, "rotation": { "yAxis": { "min": 0, @@ -186,13 +187,34 @@ "clutter/literalgarbage3", "clutter/literalgarbage4" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 60, "biomeStyle": {"style": "SIMPLEX"}, "decorators": [ { - "chance": 0.8, + "chance": 0.6, "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [ diff --git a/biomes/temperate/wilds.json b/biomes/temperate/wilds.json index 25576dab..e74d2e2d 100644 --- a/biomes/temperate/wilds.json +++ b/biomes/temperate/wilds.json @@ -135,6 +135,27 @@ "clutter/camp1", "clutter/bincluster1" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "layers": [ diff --git a/biomes/tropical/bamboo-forest.json b/biomes/tropical/bamboo-forest.json index c4cacb67..5b447b12 100644 --- a/biomes/tropical/bamboo-forest.json +++ b/biomes/tropical/bamboo-forest.json @@ -171,6 +171,27 @@ "y": -2, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 10, diff --git a/biomes/tropical/mountain-extreme.json b/biomes/tropical/mountain-extreme.json index 8b9df0d0..ea63bb33 100644 --- a/biomes/tropical/mountain-extreme.json +++ b/biomes/tropical/mountain-extreme.json @@ -158,6 +158,33 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.004, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6", + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ] } diff --git a/biomes/tropical/mountain-middle.json b/biomes/tropical/mountain-middle.json index 83a1341c..eea59fca 100644 --- a/biomes/tropical/mountain-middle.json +++ b/biomes/tropical/mountain-middle.json @@ -141,6 +141,27 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ] } diff --git a/biomes/tropical/mountain-plains.json b/biomes/tropical/mountain-plains.json index 813714d0..fa241bfb 100644 --- a/biomes/tropical/mountain-plains.json +++ b/biomes/tropical/mountain-plains.json @@ -171,6 +171,27 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ] } diff --git a/biomes/tropical/mountain.json b/biomes/tropical/mountain.json index 9dd7eb3e..25b53c14 100644 --- a/biomes/tropical/mountain.json +++ b/biomes/tropical/mountain.json @@ -146,6 +146,27 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 30, diff --git a/biomes/tropical/plains-hills.json b/biomes/tropical/plains-hills.json index 3265c2f7..0bd3a5bf 100644 --- a/biomes/tropical/plains-hills.json +++ b/biomes/tropical/plains-hills.json @@ -147,6 +147,27 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ] } diff --git a/biomes/tropical/plains.json b/biomes/tropical/plains.json index 4a0b3c09..2152d7c3 100644 --- a/biomes/tropical/plains.json +++ b/biomes/tropical/plains.json @@ -145,6 +145,27 @@ } }, "translate": {"y": -2} + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ] } diff --git a/biomes/tropical/rainforest-hills.json b/biomes/tropical/rainforest-hills.json index cedfba1a..a528330a 100644 --- a/biomes/tropical/rainforest-hills.json +++ b/biomes/tropical/rainforest-hills.json @@ -242,6 +242,27 @@ "y": -11, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json index 0b625cf4..106026cf 100644 --- a/biomes/tropical/rainforest-island.json +++ b/biomes/tropical/rainforest-island.json @@ -237,6 +237,27 @@ "y": -12, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json index 4b421eeb..bdd21146 100644 --- a/biomes/tropical/rainforest-wicked-child.json +++ b/biomes/tropical/rainforest-wicked-child.json @@ -246,6 +246,27 @@ "y": -12, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json index 4a9e8f26..432d8d71 100644 --- a/biomes/tropical/rainforest-wicked.json +++ b/biomes/tropical/rainforest-wicked.json @@ -237,6 +237,27 @@ "y": -12, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json index 7759efae..801bd7a7 100644 --- a/biomes/tropical/rainforest.json +++ b/biomes/tropical/rainforest.json @@ -248,6 +248,27 @@ "y": -12, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/melons1", + "clutter/melons2", + "clutter/melons3", + "clutter/melons4", + "clutter/melons5", + "clutter/melons6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tropical/sea/ocean.json b/biomes/tropical/sea/ocean.json index 95757e08..f1f882bb 100644 --- a/biomes/tropical/sea/ocean.json +++ b/biomes/tropical/sea/ocean.json @@ -5,8 +5,7 @@ "vanillaDerivative": "WARM_OCEAN", "children": [ "tropical/sea/coral-ocean", - "tropical/sea/coral-ocean-cliffs", - "tropical/rainforest-island" + "tropical/sea/coral-ocean-cliffs" ], "generators": [{ "min": -38, diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index 7a2231fa..c99368da 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -467,6 +467,27 @@ } ], "mode": "VACUUM" + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "entityInitialSpawns": [ diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json index 6d4f0a92..0baa4701 100644 --- a/biomes/tundra/forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -246,6 +246,27 @@ "trees/spruce/pine11", "trees/spruce/pine12" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 30, diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index 04f43a09..cbfd7fda 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -60,6 +60,50 @@ ] } ], + "decorators": [ + { + "chance": 0.01, + "variance": {"style": "STATIC"}, + "zoom": 0.1, + "palette": [ + {"block": "white_tulip"}, + {"block": "blue_orchid"}, + {"block": "poppy"} + ], + "style": {"style": "STATIC"} + }, + { + "chance": 0.001, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [ + { + "data": {"age": 0}, + "block": "sweet_berry_bush" + }, + { + "data": {"age": 1}, + "block": "sweet_berry_bush" + }, + { + "data": {"age": 2}, + "block": "sweet_berry_bush" + }, + { + "data": {"age": 3}, + "block": "sweet_berry_bush" + } + ], + "style": {"style": "STATIC"} + }, + { + "chance": 0.2, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [{"block": "grass"}], + "style": {"style": "STATIC"} + } + ], "objects": [ { "place": [ @@ -140,54 +184,31 @@ "trees/spruce/pine11", "trees/spruce/pine12" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 30, "biomeStyle": {"style": "SIMPLEX"}, - "decorators": [ - { - "chance": 0.01, - "variance": {"style": "STATIC"}, - "zoom": 0.1, - "palette": [ - {"block": "white_tulip"}, - {"block": "blue_orchid"}, - {"block": "poppy"} - ], - "style": {"style": "STATIC"} - }, - { - "chance": 0.001, - "variance": {"style": "STATIC"}, - "zoom": 0.3, - "palette": [ - { - "data": {"age": 0}, - "block": "sweet_berry_bush" - }, - { - "data": {"age": 1}, - "block": "sweet_berry_bush" - }, - { - "data": {"age": 2}, - "block": "sweet_berry_bush" - }, - { - "data": {"age": 3}, - "block": "sweet_berry_bush" - } - ], - "style": {"style": "STATIC"} - }, - { - "chance": 0.2, - "variance": {"style": "STATIC"}, - "zoom": 0.3, - "palette": [{"block": "grass"}], - "style": {"style": "STATIC"} - } - ], "childShrinkFactor": 8, "wall": { "style": {"style": "STATIC"}, diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json index 5e4b2426..68e5324f 100644 --- a/biomes/tundra/mountains.json +++ b/biomes/tundra/mountains.json @@ -144,6 +144,27 @@ "trees/spruce/pine11", "trees/spruce/pine12" ] + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "biomeZoom": 30, diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index b6562a82..94512bb2 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -59,12 +59,11 @@ } ], "wall": { - "style": {"style": "FRACTAL_WATER"}, "palette": [ - {"block": "diorite"}, - {"block": "diorite"}, + {"block": "coarse_dirt"}, + {"block": "dirt"}, {"block": "stone"}, - {"block": "stone"} + {"block": "dirt"} ] }, "decorators": [ diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 5b119c26..635ff364 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -63,12 +63,11 @@ } ], "wall": { - "style": {"style": "FRACTAL_WATER"}, "palette": [ - {"block": "diorite"}, - {"block": "diorite"}, + {"block": "coarse_dirt"}, + {"block": "dirt"}, {"block": "stone"}, - {"block": "stone"} + {"block": "dirt"} ] }, "decorators": [ diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index 1c95628c..d0cd49ec 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -291,6 +291,27 @@ "clutter/stump6" ], "mode": "VACUUM" + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json index 04f5a397..ecd44353 100644 --- a/biomes/tundra/spruce-denmyre.json +++ b/biomes/tundra/spruce-denmyre.json @@ -236,6 +236,27 @@ "y": -1, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index 587564b4..70cd085b 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -273,6 +273,27 @@ "y": -1, "z": 0 } + }, + { + "chance": 0.008, + "mode": "PAINT", + "place": [ + "clutter/pumpkins1", + "clutter/pumpkins2", + "clutter/pumpkins3", + "clutter/pumpkins4", + "clutter/pumpkins5", + "clutter/pumpkins6" + ], + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "max": 360, + "min": 0, + "interval": 90 + } + } } ], "wall": { diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 9b832771..86437976 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,57 +1,80 @@ { - "version": 2001, + "version": 2002, "OVERWORLD-VERSION": 3.134, "name": "Overworld", "environment": "NORMAL", "fluidHeight": 63, "CONTINENTS": "Continent settings containing placement of the continents.", "continentZoom": 1, - "landChance": 0.69, - "biomeZoom": 7, "continentalStyle": { - "style": "CELLULAR_HEIGHT_IRIS_DOUBLE", - "zoom": 12.925, - "exponent": 10.1 + "style": "NOWHERE_CELLULAR", + + "zoom": 5 }, + "landChance": 0.69, + "biomeZoom": 4, "REGIONS": "Contains the list of regions and their placement style", - "regionZoom": 7.25, + "regionStyle": { + "style": "CELLULAR_IRIS_DOUBLE", + "fracture": { + "multiplier": 600, + "axialFracturing": true, + "style": "NOWHERE_CUBIC", + "zoom": 1.25, + "fracture": { + "style": "NOWHERE", + "axialFracturing": true, + "zoom": 0.1, + "multiplier": 24.8 + } + } + }, + "regionZoom": 6, "regions": [ "mushroom", "swamp", - "temperate", "hot", + "temperate", "tropical", "temperate", "frozen", "tundra" ], - "regionStyle": { - "style": "NOWHERE_CELLULAR", - "fracture": { - "style": "NOWHERE", - "zoom": 0.115, - "multiplier": 16 - }, - "zoom": 1 - }, "islandBiomeChanceStyle": { "style": "NOWHERE_CELLULAR", "zoom": 5 }, + "TREE SETTINGS": "This is where you can change tree inheritance from saplings.", + "treeSettings": { + "enabled": true, + "mode": "FIRST" + }, + "SEAS": "Sea settings (for the biomes that are oceans).", "seaZoom": 1.25, - "seaBiomeStyle": {"style": "NOWHERE_CELLULAR"}, + "seaBiomeStyle": {"style": "FRACTAL_FBM_IRIS"}, "LAND": "Land settings (for the biomes that are non-ocean).", "landZoom": 3.2, + "landBiomeStyle": { "style": "NOWHERE_CELLULAR", "fracture": { - "style": "NOWHERE", - "zoom": 0.03, - "multiplier": 12 - }, - "zoom": 3 + "multiplier": 725, + "axialFracturing": true, + "style": "NOWHERE_CUBIC", + "zoom": 1.18, + "fracture": { + "style": "NOWHERE", + "axialFracturing": true, + "zoom": 0.1141, + "multiplier": 44.8 + } + } }, + "shoreBiomeStyle": { + "style": "NOWHERE_CELLULAR" + }, + "LOOT": "Contains a list of loot tables that are attempted to be applied to all chests that spawn.", "lootTries": 32, "loot": {"tables": [ @@ -336,37 +359,5 @@ } ], "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, - "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, - "shoreBiomeStyle": { - "style": "CELLULAR", - "fracture": { - "multiplier": 18, - "maxFractureAccuracy": true, - "style": "FRACTAL_WATER", - "zoom": 0.255, - "fracture": { - "maxFractureAccuracy": true, - "style": "STATIC", - "multiplier": 4 - } - } - }, - "overlayNoise": [ - { - "min": 0, - "max": 6, - "generator": { - "style": "FRACTAL_WATER", - "zoom": 8 - } - }, - { - "min": 0, - "max": 6, - "generator": { - "style": "IRIS_DOUBLE", - "zoom": 1.1 - } - } - ] + "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"} } diff --git a/entities/dolphin.json b/entities/dolphin.json new file mode 100644 index 00000000..fa9e2066 --- /dev/null +++ b/entities/dolphin.json @@ -0,0 +1,3 @@ +{ + "type": "DOLPHIN" +} \ No newline at end of file diff --git a/entities/wanderingtrader.json b/entities/wanderingtrader.json index a8d924ff..7b61ede5 100644 --- a/entities/wanderingtrader.json +++ b/entities/wanderingtrader.json @@ -1,5 +1,5 @@ { - "type": "HORSE", + "type": "TRADER_LLAMA", "customName": "THE WANDERING HORSE", "passengers": [{ "type": "WANDERING_TRADER", diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index 156c42a8..b3f85708 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -43,15 +43,15 @@ ], "enchantments": [{ "enchantment": "SOUL_SPEED", - "maxLevel": 5, - "minLevel": 3 + "maxLevel": 3, + "minLevel": 2 }], "attributes": [ { "attribute": "GENERIC_MOVEMENT_SPEED", "operation": "ADD_NUMBER", - "maxAmount": 0.35, - "minAmount": 0.2, + "maxAmount": 0.2, + "minAmount": 0.1, "name": "SPUDD" }, { @@ -64,8 +64,8 @@ { "attribute": "GENERIC_MAX_HEALTH", "operation": "ADD_NUMBER", - "maxAmount": -7, - "minAmount": -5, + "maxAmount": -8, + "minAmount": -4, "name": "ATTAKK" }, { diff --git a/objects/clutter/melons1.iob b/objects/clutter/melons1.iob new file mode 100644 index 00000000..b5ff7dc5 Binary files /dev/null and b/objects/clutter/melons1.iob differ diff --git a/objects/clutter/melons2.iob b/objects/clutter/melons2.iob new file mode 100644 index 00000000..692e5ab9 Binary files /dev/null and b/objects/clutter/melons2.iob differ diff --git a/objects/clutter/melons3.iob b/objects/clutter/melons3.iob new file mode 100644 index 00000000..5755f65c Binary files /dev/null and b/objects/clutter/melons3.iob differ diff --git a/objects/clutter/melons4.iob b/objects/clutter/melons4.iob new file mode 100644 index 00000000..e23ad057 Binary files /dev/null and b/objects/clutter/melons4.iob differ diff --git a/objects/clutter/melons5.iob b/objects/clutter/melons5.iob new file mode 100644 index 00000000..c4c50e34 Binary files /dev/null and b/objects/clutter/melons5.iob differ diff --git a/objects/clutter/melons6.iob b/objects/clutter/melons6.iob new file mode 100644 index 00000000..23d5fc4c Binary files /dev/null and b/objects/clutter/melons6.iob differ diff --git a/objects/clutter/pumpkins1.iob b/objects/clutter/pumpkins1.iob new file mode 100644 index 00000000..b173bbe5 Binary files /dev/null and b/objects/clutter/pumpkins1.iob differ diff --git a/objects/clutter/pumpkins2.iob b/objects/clutter/pumpkins2.iob new file mode 100644 index 00000000..360d01a4 Binary files /dev/null and b/objects/clutter/pumpkins2.iob differ diff --git a/objects/clutter/pumpkins3.iob b/objects/clutter/pumpkins3.iob new file mode 100644 index 00000000..a2b6b8b8 Binary files /dev/null and b/objects/clutter/pumpkins3.iob differ diff --git a/objects/clutter/pumpkins4.iob b/objects/clutter/pumpkins4.iob new file mode 100644 index 00000000..e85fa7f7 Binary files /dev/null and b/objects/clutter/pumpkins4.iob differ diff --git a/objects/clutter/pumpkins5.iob b/objects/clutter/pumpkins5.iob new file mode 100644 index 00000000..d12b6ee3 Binary files /dev/null and b/objects/clutter/pumpkins5.iob differ diff --git a/objects/clutter/pumpkins6.iob b/objects/clutter/pumpkins6.iob new file mode 100644 index 00000000..7b9996a5 Binary files /dev/null and b/objects/clutter/pumpkins6.iob differ diff --git a/objects/trees/oak/truegeneric2.iob b/objects/trees/oak/truegeneric2.iob index cd18f74e..4259d36b 100644 Binary files a/objects/trees/oak/truegeneric2.iob and b/objects/trees/oak/truegeneric2.iob differ diff --git a/regions/hot.json b/regions/hot.json index 77ac666d..1ff8c166 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -268,5 +268,5 @@ ] }, "shoreHeightZoom": 1.14, - "rarity": 1 + "rarity": 2 } diff --git a/regions/mushroom.json b/regions/mushroom.json index 98493255..0e619623 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -151,5 +151,5 @@ ] }, "shoreHeightZoom": 1.14, - "rarity": 10 + "rarity": 7 } diff --git a/regions/swamp.json b/regions/swamp.json index 40253bc9..8b2624a2 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -153,5 +153,5 @@ {"block": "tall_grass"} ] }], - "rarity": 3 + "rarity": 4 } diff --git a/regions/temperate.json b/regions/temperate.json index 18b489b0..3733c885 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -10,7 +10,8 @@ "temperate/plains", "temperate/oak-forest", "temperate/birch-forest", - "temperate/lush-plains" + "temperate/lush-plains", + "temperate/flower-forest" ], "shoreBiomes": [ "temperate/shore/beach", @@ -74,6 +75,20 @@ "varience": 4 }], "objects": [ + { + "chance": 0, + "mode": "MIN_HEIGHT", + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE"]}], + "translate": {"y": 7}, + "place": [ + "trees/oak/truegeneric1", + "trees/oak/truegeneric2", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5" + ] + }, { "heightmap": { "seed": 1337, @@ -180,6 +195,5 @@ ] }, "shoreHeightZoom": 1.14, - "riverThickness": 0.025, - "rarity": 1 + "riverThickness": 0.025 } diff --git a/regions/tropical.json b/regions/tropical.json index 75d0f636..f7181650 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -223,5 +223,5 @@ } ], "shoreHeightZoom": 2.14, - "rarity": 4 + "rarity": 3 }