From 951ed20136f58de43f48a5ea53c36e13db33ac8a Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 23 Jul 2021 21:49:23 -0700 Subject: [PATCH] Object Reduction in Lush, and Meadow --- biomes/temperate/birch-forest.json | 32 ---- biomes/temperate/birch-thin.json | 32 ---- biomes/temperate/lush-plains-red.json | 196 +++-------------------- biomes/temperate/lush-plains-yellow.json | 196 +++-------------------- biomes/temperate/lush-plains.json | 166 +++---------------- biomes/temperate/meadows.json | 191 +++------------------- 6 files changed, 95 insertions(+), 718 deletions(-) diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index 7961dee0..050c995d 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -67,38 +67,6 @@ ] } ], - "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 - }, - { - "entity": "bee", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 70 - } - ], "objects": [ { "mode": "PAINT", diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index b64681c0..eb90e83d 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -57,38 +57,6 @@ ] } ], - "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 - }, - { - "entity": "bee", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - } - ], "objects": [ { "mode": "PAINT", diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 709bfb5b..fd23d0af 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -1,7 +1,7 @@ { "name": "Lush Plains Red", - "derivative": "FOREST", - "vanillaDerivative": "FOREST", + "derivative": "FLOWER_FOREST", + "vanillaDerivative": "FLOWER_FOREST", "color": "#de3535", "rarity": 5, "generators": [{ @@ -87,7 +87,7 @@ "objects": [ { "mode": "VACUUM", - "chance": 0.00975, + "chance": 0.009, "rotation": { "yAxis": { "min": 0, @@ -101,54 +101,10 @@ "clutter/camp1", "clutter/camp3", "clutter/camp4", - "clutter/camp5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "VACUUM", - "chance": 0.00675, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["clutter/camp2"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.002, - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["structures/cave2"], - "translate": { - "x": 0, - "y": -57, - "z": 0 - } + "clutter/camp5", + "clutter/camp2" + ] + }, { "chance": 0.01, @@ -178,13 +134,15 @@ "trees/oak/shoakgeneric8", "trees/oak/shoakgeneric9", "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "trees/oak/shoakgeneric2", + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ] + }, { "chance": 1.0E-4, @@ -198,15 +156,11 @@ }, "enabled": true }, - "place": ["structures/ruin1"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "place": ["structures/ruin1"] + }, { - "chance": 0.005, + "chance": 0.004, "rotation": { "yAxis": { "min": 0, @@ -223,120 +177,20 @@ "clutter/obelisk4", "clutter/obelisk5", "clutter/obelisk6", - "clutter/obelisk7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "PAINT", - "chance": 0.002, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ + "clutter/obelisk7", "clutter/genericpeak1", "clutter/genericpeak2", "clutter/genericpeak3", "clutter/genericpeak5", - "clutter/genericpeak6" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "place": [ - "trees/oak/generic1", - "trees/oak/generic2", - "trees/oak/generic3", - "trees/oak/generic4", - "trees/oak/generic5", - "trees/oak/generic6" - ], - "chance": 0.07, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ - "structures/landstone1", + "clutter/genericpeak6", + "structures/landstone1", "structures/landstone2", "structures/landstone3", "structures/landstone4", - "structures/landstone5" - ], - "chance": 0.02, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ + "structures/landstone5", "clutter/statue-villager-plains" - ], - "chance": 0.008, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - } - ], - "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 + ] + } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 5a41c7c6..a81754fe 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -1,7 +1,7 @@ { "name": "Lush Plains Yellow", - "derivative": "FOREST", - "vanillaDerivative": "FOREST", + "derivative": "FLOWER_FOREST", + "vanillaDerivative": "FLOWER_FOREST", "color": "#d8e310", "rarity": 5, "generators": [{ @@ -87,7 +87,7 @@ "objects": [ { "mode": "VACUUM", - "chance": 0.00975, + "chance": 0.009, "rotation": { "yAxis": { "min": 0, @@ -101,54 +101,10 @@ "clutter/camp1", "clutter/camp3", "clutter/camp4", - "clutter/camp5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "VACUUM", - "chance": 0.00675, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["clutter/camp2"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.002, - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["structures/cave2"], - "translate": { - "x": 0, - "y": -57, - "z": 0 - } + "clutter/camp5", + "clutter/camp2" + ] + }, { "chance": 0.01, @@ -178,13 +134,15 @@ "trees/oak/shoakgeneric8", "trees/oak/shoakgeneric9", "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "trees/oak/shoakgeneric2", + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ] + }, { "chance": 1.0E-4, @@ -198,15 +156,11 @@ }, "enabled": true }, - "place": ["structures/ruin1"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "place": ["structures/ruin1"] + }, { - "chance": 0.005, + "chance": 0.004, "rotation": { "yAxis": { "min": 0, @@ -223,120 +177,20 @@ "clutter/obelisk4", "clutter/obelisk5", "clutter/obelisk6", - "clutter/obelisk7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "PAINT", - "chance": 0.002, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ + "clutter/obelisk7", "clutter/genericpeak1", "clutter/genericpeak2", "clutter/genericpeak3", "clutter/genericpeak5", - "clutter/genericpeak6" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "place": [ - "trees/oak/generic1", - "trees/oak/generic2", - "trees/oak/generic3", - "trees/oak/generic4", - "trees/oak/generic5", - "trees/oak/generic6" - ], - "chance": 0.07, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ - "structures/landstone1", + "clutter/genericpeak6", + "structures/landstone1", "structures/landstone2", "structures/landstone3", "structures/landstone4", - "structures/landstone5" - ], - "chance": 0.02, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ + "structures/landstone5", "clutter/statue-villager-plains" - ], - "chance": 0.008, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - } - ], - "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 + ] + } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index aa74c81e..626f83c5 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -1,7 +1,7 @@ { "name": "Lush Plains", - "derivative": "JUNGLE_EDGE", - "vanillaDerivative": "JUNGLE_EDGE", + "derivative": "FLOWER_FOREST", + "vanillaDerivative": "FLOWER_FOREST", "color": "#68de35", "generators": [{ "min": 4, @@ -55,7 +55,7 @@ ], "decorators": [ { - "chance": 0.06, + "chance": 0.05, "variance": { "style": "STATIC" }, @@ -97,7 +97,7 @@ ] }, { - "chance": 0.08, + "chance": 0.05, "palette": [ { "block": "oak_leaves", @@ -115,7 +115,7 @@ "objects": [ { "mode": "VACUUM", - "chance": 0.00975, + "chance": 0.009, "rotation": { "yAxis": { "min": 0, @@ -129,47 +129,11 @@ "clutter/camp1", "clutter/camp3", "clutter/camp4", - "clutter/camp5" + "clutter/camp5", + "clutter/camp2" ] }, - { - "mode": "VACUUM", - "chance": 0.00675, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["clutter/camp2"] - - }, - { - "chance": 0.002, - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["structures/cave2"], - "translate": { - "x": 0, - "y": -57, - "z": 0 - } - }, { "chance": 0.01, "rotation": { @@ -198,7 +162,13 @@ "trees/oak/shoakgeneric8", "trees/oak/shoakgeneric9", "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "trees/oak/shoakgeneric2", + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" ] }, @@ -218,7 +188,7 @@ }, { - "chance": 0.005, + "chance": 0.004, "rotation": { "yAxis": { "min": 0, @@ -235,116 +205,20 @@ "clutter/obelisk4", "clutter/obelisk5", "clutter/obelisk6", - "clutter/obelisk7" - ] - - }, - { - "mode": "PAINT", - "chance": 0.002, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ + "clutter/obelisk7", "clutter/genericpeak1", "clutter/genericpeak2", "clutter/genericpeak3", "clutter/genericpeak5", - "clutter/genericpeak6" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "place": [ - "trees/oak/generic1", - "trees/oak/generic2", - "trees/oak/generic3", - "trees/oak/generic4", - "trees/oak/generic5", - "trees/oak/generic6" - ], - "chance": 0.07, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ + "clutter/genericpeak6", "structures/landstone1", "structures/landstone2", "structures/landstone3", "structures/landstone4", - "structures/landstone5" - ], - "chance": 0.02, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ + "structures/landstone5", "clutter/statue-villager-plains" - ], - "chance": 0.008, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - } - ], - "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 + ] + } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index fd1bb5ed..db2a6680 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -107,7 +107,7 @@ "objects": [ { "mode": "VACUUM", - "chance": 0.00975, + "chance": 0.009, "rotation": { "yAxis": { "min": 0, @@ -121,54 +121,10 @@ "clutter/camp1", "clutter/camp3", "clutter/camp4", - "clutter/camp5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "VACUUM", - "chance": 0.00675, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["clutter/camp2"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.002, - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["structures/cave2"], - "translate": { - "x": 0, - "y": -57, - "z": 0 - } + "clutter/camp5", + "clutter/camp2" + ] + }, { "chance": 0.01, @@ -198,13 +154,15 @@ "trees/oak/shoakgeneric8", "trees/oak/shoakgeneric9", "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "trees/oak/shoakgeneric2", + "trees/oak/generic1", + "trees/oak/generic2", + "trees/oak/generic3", + "trees/oak/generic4", + "trees/oak/generic5", + "trees/oak/generic6" + ] + }, { "chance": 1.0E-4, @@ -218,15 +176,11 @@ }, "enabled": true }, - "place": ["structures/ruin1"], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + "place": ["structures/ruin1"] + }, { - "chance": 0.005, + "chance": 0.004, "rotation": { "yAxis": { "min": 0, @@ -243,115 +197,20 @@ "clutter/obelisk4", "clutter/obelisk5", "clutter/obelisk6", - "clutter/obelisk7" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "mode": "PAINT", - "chance": 0.002, - "rotation": { - "yAxis": { - "min": 0, - "max": 360, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ + "clutter/obelisk7", "clutter/genericpeak1", "clutter/genericpeak2", "clutter/genericpeak3", "clutter/genericpeak5", - "clutter/genericpeak6" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "place": [ - "trees/oak/generic1", - "trees/oak/generic2", - "trees/oak/generic3", - "trees/oak/generic4", - "trees/oak/generic5", - "trees/oak/generic6" - ], - "chance": 0.02, - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ + "clutter/genericpeak6", + "structures/landstone1", + "structures/landstone2", + "structures/landstone3", + "structures/landstone4", + "structures/landstone5", "clutter/statue-villager-plains" - ], - "chance": 0.008, - "mode": "MIN_HEIGHT", - "rotation": { - "enabled": true, - "yAxis": { - "enabled": true, - "interval": 90, - "min": 0, - "max": 360 - } - } - }, - { - "place": [ - "structures/ruins-greek-temple" - ], - "chance": 0.0005, - "mode": "VACUUM", - "translate": { - "y": -5 - }, - "rotation": { - "enabled": true, - "yAxis": { - "interval": 90, - "min": 0, - "max": 360, - "enabled": true - } - }, - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "chest", - "weight": 1 - }, - { - "block": "dirt", - "weight": 5 - } - ] - }, - "chance": 1 - } ] + } ], "entityInitialSpawns": [