diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/fzn-mountain-cliffs.json index 24f5457f..20fcba92 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -1,7 +1,7 @@ { "name": "Frozen Mountain Cliffs", "derivative": "SNOWY_MOUNTAINS", - "rarity": 1, + "rarity": 3, "vanillaDerivative": "SNOWY_MOUNTAINS", "color": "#447AFF", "layers": [ diff --git a/biomes/hot/hot-mountain-cliffs.json b/biomes/hot/hot-mountain-cliffs.json index a8f2cd62..d214b3e5 100644 --- a/biomes/hot/hot-mountain-cliffs.json +++ b/biomes/hot/hot-mountain-cliffs.json @@ -1,7 +1,7 @@ { "name": "Hot Mountain Cliffs", "derivative": "DESERT", - "rarity": 1, + "rarity": 3, "color": "#FFDA41", "vanillaDerivative": "DESERT", "generators": [ diff --git a/biomes/mountain/mtn-cliffs.json b/biomes/mountain/mtn-cliffs.json index 45ce0ada..01eb29b8 100644 --- a/biomes/mountain/mtn-cliffs.json +++ b/biomes/mountain/mtn-cliffs.json @@ -1,6 +1,6 @@ { "name": "Mountain Cliffs", - "rarity": 1, + "rarity": 3, "color": "#355580", "vanillaDerivative": "TAIGA_MOUNTAINS", "derivative": "TAIGA_MOUNTAINS", diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/mus-crimson-forest.json index 01a571b8..295b5a96 100644 --- a/biomes/mushroom/mus-crimson-forest.json +++ b/biomes/mushroom/mus-crimson-forest.json @@ -1,7 +1,7 @@ { "name": "Crimson Mushroom Swamp", "derivative": "CRIMSON_FOREST", - "rarity": 1, + "rarity": 3, "color": "#EEA7AA", "vanillaDerivative": "MUSHROOM_FIELDS", "layers": [ diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/mus-warped-forest.json index 42f8bf84..3d99dd00 100644 --- a/biomes/mushroom/mus-warped-forest.json +++ b/biomes/mushroom/mus-warped-forest.json @@ -1,6 +1,6 @@ { "name": "Mushroom Warped Forest", - "rarity": 1, + "rarity": 3, "color": "#7870AB", "derivative": "WARPED_FOREST", "vanillaDerivative": "MUSHROOM_FIELDS", diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/tem-flower-forest.json index 25e7f3bd..81e01316 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -191,7 +191,7 @@ }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{"block": "oak_leaves"}]} + "replace": {"palette": [{"block": "oak_leaves", "data": {"persistent": true}}]} } ], "place": [ diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/tem-longtree-forest.json index ddcbfb0c..5d8c7044 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/tem-longtree-forest.json @@ -370,41 +370,7 @@ } }, { - "chance": 1.0E-6, - "density": 1, - "edit": [{ - "find": [{"block": "barrier"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "sakura/corazoncaido" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.3, + "chance": 0.55, "rotation": { "yAxis": { "min": 0, @@ -449,34 +415,6 @@ "y": -3, "z": 0 } - }, - { - "chance": 1.0E-5, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "void/void", - "sakura/corazoncristal" - ], - "translate": { - "x": 0, - "y": 55, - "z": 0 - } } ], "generators": [{ diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/tem-plateau.json index 955d9589..e4fc560a 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -213,7 +213,7 @@ }, { "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{"block": "oak_leaves"}]} + "replace": {"palette": [{"block": "oak_leaves", "data": {"persistent": true}}]} } ], "place": [ diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/tem-sakura-pink-child.json index 3e349f78..10492365 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -6,9 +6,9 @@ "vanillaDerivative": "FOREST", "customDerivitives": [{ "id": "temsakurapinkchild", - "foliageColor": "#E88DFF", + "foliageColor": "#AE42C9", "waterColor": "#A5FFED", - "grassColor": "#A8FF98", + "grassColor": "#83FF6C", "category": "forest" }], "generators": [{ @@ -166,7 +166,7 @@ ], "translate": { "x": 0, - "y": -32, + "y": -1, "z": 0 } }, @@ -262,29 +262,11 @@ "palette": [{"block": "tall_grass"}] }, { - "chance": 0.03, + "chance": 0.06, "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "allium"}] }, - { - "chance": 0.05, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{ - "chance": 3, - "block": "red_mushroom" - }] - }, - { - "chance": 0.05, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{ - "chance": 3, - "block": "poppy" - }] - }, { "chance": 0.03, "variance": {"style": "STATIC"}, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/tem-sakura-pink-forest.json index 2eaef364..cfe4468e 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -263,29 +263,11 @@ "palette": [{"block": "tall_grass"}] }, { - "chance": 0.03, + "chance": 0.06, "variance": {"style": "STATIC"}, "zoom": 0.2, "palette": [{"block": "allium"}] }, - { - "chance": 0.05, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{ - "chance": 3, - "block": "red_mushroom" - }] - }, - { - "chance": 0.05, - "variance": {"style": "STATIC"}, - "zoom": 0.2, - "palette": [{ - "chance": 3, - "block": "poppy" - }] - }, { "chance": 0.03, "variance": {"style": "STATIC"}, diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index 8fcd2542..189c8ad6 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -13,7 +13,7 @@ "id": "pemstrangeplains", "foliageColor": "#65A528", "waterColor": "#2873A5", - "grassColor": "#A4C646", + "grassColor": "#B8D92B", "category": "forest" }], "generators": [{ diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index fd1e2854..4c066c52 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohighlands", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#41A726", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index d5b5c2ae..5ace1524 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "tromtnextreme", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#5CCA52", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index 2d4b34a1..be0959f5 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -19,7 +19,7 @@ ], "customDerivitives": [{ "id": "tromtnmiddle", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#1E7307", "waterColor": "#3AB2A2", "fogColor": "#6DCA87", diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index aedfa737..94c6bbcf 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "tromtnplains", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index b9c888f1..ffd1b666 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "tromountain", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index 993a6f60..c96ae9ea 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/tro-plains-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "troplainshills", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#1E7307", "category": "jungle", "waterColor": "#3AB2A2", @@ -83,6 +83,37 @@ } ], "objects": [ + { + "chance": 0.4, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" + ], + "translate": { + "x": 0, + "y": -5, + "z": 0 + } + }, { "mode": "PAINT", "place": [ diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/tro-plains.json index 3345783f..b36ceba0 100644 --- a/biomes/tropical/tro-plains.json +++ b/biomes/tropical/tro-plains.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "troplain", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", @@ -88,6 +88,30 @@ } ], "objects": [ + { + "chance": 0.4, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5" + ], + "translate": { + "x": 0, + "y": -5, + "z": 0 + } + }, { "mode": "PAINT", "place": [ diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index 95c27211..bc766bab 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohills", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", @@ -191,6 +191,37 @@ "z": 0 } }, + { + "chance": 0.4, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" + ], + "translate": { + "x": 0, + "y": -5, + "z": 0 + } + }, { "chance": 0.4, "rotation": { diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/tro-rainforest-island.json index 68ef7400..4fa3df1c 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/tro-rainforest-island.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "troisle", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#2DAF09", "category": "jungle", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/tro-rainforest.json index 2d7fcca9..874361c1 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -15,7 +15,7 @@ }], "customDerivitives": [{ "id": "trorainforest", - "foliageColor": "#1B8D09", + "foliageColor": "#40C42B", "grassColor": "#2DAF09", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/tun-forest-cliffs.json index 9579444d..fe9ad151 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/tun-forest-cliffs.json @@ -1,7 +1,7 @@ { "name": "Tundra Forest Cliffs", "derivative": "MOUNTAINS", - "rarity": 1, + "rarity": 3, "color": "#3E8F7A", "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 647bc1ae..92959531 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -1,7 +1,7 @@ { "name": "Tundra Redwood Cliffs", "derivative": "TAIGA", - "rarity": 1, + "rarity": 3, "color": "#5DA899", "vanillaDerivative": "DARK_FOREST", "generators": [ diff --git a/regions/frozen.json b/regions/frozen.json index 9b95639d..e8a2c3c5 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -23,10 +23,10 @@ }], "spotBiomes": [{ "biome": "frozen/fzn-vander", - "scale": 5, + "scale": 25, "type": "LAND", "shuffle": 328, - "rarity": 5 + "rarity": 3 }], "riverStyle": { "style": "VASCULAR", diff --git a/regions/hot.json b/regions/hot.json index 9abec156..cde3b086 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -29,7 +29,7 @@ "scale": 5, "type": "SEA", "shuffle": 328, - "rarity": 36 + "rarity": 15 }], "jigsawStructures": [{ "structure": "murky_stronghold", diff --git a/regions/mesa.json b/regions/mesa.json index 40d20ab1..f0db7d44 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -22,10 +22,10 @@ "riverBiomes": ["ocean/oce-hot-river"], "spotBiomes": [{ "biome": "ocean/oce-hot-ocean", - "scale": 5, + "scale": 25, "type": "SEA", "shuffle": 328, - "rarity": 36 + "rarity": 15 }], "biomeImplosionRatio": 0.75, "riverStyle": { diff --git a/regions/mushroom.json b/regions/mushroom.json index 44926074..08e047a9 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -3,7 +3,9 @@ "landBiomes": [ "mushroom/mus-forest", "mushroom/mus-forest-hills", - "mushroom/mus-plains" + "mushroom/mus-plains", + "mushroom/mus-crimson-forest", + "mushroom/mus-warped-forest" ], "shoreBiomes": ["mushroom/mus-beach"], "jigsawStructures": [{ @@ -43,22 +45,6 @@ "zoom": 5 } }, - "spotBiomes": [ - { - "biome": "mushroom/mus-crimson-forest", - "scale": 0.78, - "type": "LAND", - "shuffle": 44, - "rarity": 52 - }, - { - "biome": "mushroom/mus-warped-forest", - "scale": 0.77, - "type": "LAND", - "shuffle": 44, - "rarity": 31 - } - ], "deposits": [{ "minHeight": 15, "maxPerChunk": 6,