From b89aa8640bc055410e5bbf4e4ed18205c7f65475 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 28 Jul 2021 17:45:16 -0700 Subject: [PATCH 1/2] Changing Sakura Disper --- biomes/temperate/birch-thin.json | 2 +- biomes/temperate/combo-forest.json | 2 +- biomes/temperate/flower-forest.json | 2 +- biomes/temperate/longtree-forest.json | 2 +- biomes/temperate/lush-plains-red.json | 2 +- biomes/temperate/lush-plains-yellow.json | 2 +- biomes/temperate/lush-plains.json | 2 +- biomes/temperate/oak-denmyre.json | 2 +- biomes/temperate/sakura-pink-child.json | 264 ----------------------- biomes/temperate/sakura-pink-forest.json | 19 +- 10 files changed, 18 insertions(+), 281 deletions(-) delete mode 100644 biomes/temperate/sakura-pink-child.json diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index 75a442c2..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, diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 052e4ef6..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": [ { diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 588d18e0..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": 6, + "rarity": 3, "color": "#C4CF30", "vanillaDerivative": "FLOWER_FOREST", "generators": [{ diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 7e20f385..45165491 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": [{ diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 01848a3b..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, diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 0fbbf6dc..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, diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index 9b929a23..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", diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index a3a6f0d6..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", diff --git a/biomes/temperate/sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json deleted file mode 100644 index 68f96fc3..00000000 --- a/biomes/temperate/sakura-pink-child.json +++ /dev/null @@ -1,264 +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" - ] - }, - { - "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, - "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 b33bc773..3c566ec4 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, From 5e423b83d004fbbb3716026b7eea88c9524a28f1 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 28 Jul 2021 18:14:38 -0700 Subject: [PATCH 2/2] Coloring --- biomes/swamp/cambian-drift.json | 18 ++++-------------- biomes/temperate/longtree-forest.json | 6 ++++++ biomes/temperate/oak-forest.json | 19 ++++++++----------- biomes/temperate/sakura-pink-forest.json | 2 +- 4 files changed, 19 insertions(+), 26 deletions(-) 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/longtree-forest.json b/biomes/temperate/longtree-forest.json index 45165491..7dcad400 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -13,6 +13,12 @@ "interval": 550, "particleCount": 3 }], + "customDerivitives": [{ + "id": "longtree_forest", + "foliageColor": "#58AB24", + "grassColor": "#4AB71C", + "category": "forest" + }], "jigsawStructures": [ { "rarity": 1000, diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 7e3674b1..c709b436 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": "#48A620", + "category": "forest" + }], "rarity": 3, "jigsawStructures": [ { @@ -135,17 +141,7 @@ "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", @@ -157,6 +153,7 @@ "clutter/sbush3" ], "chance": 0.9, + "density": 2, "rotation": { "enabled": true, "yAxis": { diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json index 3c566ec4..8a3a5af7 100644 --- a/biomes/temperate/sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -214,7 +214,7 @@ "biomeStyle": {"style": "SIMPLEX"}, "decorators": [ { - "chance": 0.8, + "chance": 0.6, "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [