From a7e6f422b839ef3992c0cc1d151dbc691e867183 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 26 Jan 2020 23:17:38 -0500 Subject: [PATCH] Forests --- biomes/desert.json | 2 +- biomes/desert_hills.json | 2 +- biomes/desert_midnight.json | 4 +-- biomes/desert_red.json | 2 +- biomes/forest.json | 3 +- biomes/forest_birch.json | 18 ++++++++--- biomes/forest_birch_hills.json | 16 +++++++++- biomes/forest_dark.json | 4 ++- biomes/forest_hills.json | 10 ++---- biomes/forest_mountains.json | 3 +- biomes/frozen_deep_ocean.json | 32 +++++++++++++++++++ biomes/ice_forest.json | 2 +- biomes/ice_mountains.json | 4 +-- biomes/ice_plains.json | 1 + biomes/ice_plains_mushrooms.json | 4 +-- biomes/jungle.json | 7 ++-- biomes/jungle_hills.json | 4 +-- biomes/mesa_mountains.json | 4 +-- ...shroom_island.json => mushroom_lands.json} | 2 +- biomes/mushroom_mountains.json | 25 +++++++++++++++ biomes/oily_beach.json | 23 +++++++++++++ biomes/oily_channel.json | 20 ++++++++++++ biomes/oily_deep_ocean.json | 20 ++++++++++++ biomes/oily_ocean.json | 20 ++++++++++++ biomes/plains.json | 18 ++++++++++- biomes/tourmaline.json | 4 +-- dimensions/overworld.json | 8 ++++- regions/hot.json | 8 ++--- regions/snowy.json | 2 +- 29 files changed, 229 insertions(+), 43 deletions(-) create mode 100644 biomes/frozen_deep_ocean.json rename biomes/{mushroom_island.json => mushroom_lands.json} (91%) create mode 100644 biomes/mushroom_mountains.json create mode 100644 biomes/oily_beach.json create mode 100644 biomes/oily_channel.json create mode 100644 biomes/oily_deep_ocean.json create mode 100644 biomes/oily_ocean.json diff --git a/biomes/desert.json b/biomes/desert.json index 169ab150..5c930baf 100644 --- a/biomes/desert.json +++ b/biomes/desert.json @@ -14,7 +14,7 @@ "SANDSTONE" ], "scatter":[ - "DEAD_BUSH=0.08", + "DEAD_BUSH=0.28", "STONE_BUTTON:5=0.16" ], "objects": [ diff --git a/biomes/desert_hills.json b/biomes/desert_hills.json index 62a3f45c..9e0e6715 100644 --- a/biomes/desert_hills.json +++ b/biomes/desert_hills.json @@ -20,7 +20,7 @@ "SANDSTONE" ], "scatter":[ - "DEAD_BUSH=0.005", + "DEAD_BUSH=0.18", "STONE_BUTTON:5=0.16" ], "objects": [ diff --git a/biomes/desert_midnight.json b/biomes/desert_midnight.json index 46f21d58..84aec69c 100644 --- a/biomes/desert_midnight.json +++ b/biomes/desert_midnight.json @@ -2,10 +2,10 @@ "name": "Midnight Desert", "derivative": "MUTATED_DESERT", "type": "LAND", - "parent": "Desert", + "parent": "Desert Red", "region": "hot", "genHeight": 0, - "rarity": 15, + "rarity": 175, "surfaceType": "simplex", "subSurfaceType": "simplex", "rockType": "simplex", diff --git a/biomes/desert_red.json b/biomes/desert_red.json index 2ff68a56..3d6adbcf 100644 --- a/biomes/desert_red.json +++ b/biomes/desert_red.json @@ -16,7 +16,7 @@ "RED_SANDSTONE" ], "scatter":[ - "DEAD_BUSH=0.008", + "DEAD_BUSH=0.18", "STONE_BUTTON:5=0.16" ], "objects": [ diff --git a/biomes/forest.json b/biomes/forest.json index 70304a40..f3164f51 100644 --- a/biomes/forest.json +++ b/biomes/forest.json @@ -13,7 +13,8 @@ "RED_ROSE=0.06", "YELLOW_FLOWER=0.12", "RED_ROSE:4=0.07", - "RED_ROSE:5=0.07" + "RED_ROSE:5=0.07", + "DOUBLE_PLANT:2=0.25" ], "objects": [ "tree/oak/medium=1.5", diff --git a/biomes/forest_birch.json b/biomes/forest_birch.json index 1fd9e608..d3ae6087 100644 --- a/biomes/forest_birch.json +++ b/biomes/forest_birch.json @@ -8,10 +8,20 @@ "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13", - "RED_ROSE:4=0.07", - "RED_ROSE:5=0.08", - "RED_ROSE=0.12", - "YELLOW_FLOWER=0.11" + "YELLOW_FLOWER=0.2", + "RED_ROSE=0.25", + "RED_ROSE:1=0.25", + "RED_ROSE:2=0.25", + "RED_ROSE:3=0.25", + "RED_ROSE:4=0.25", + "RED_ROSE:5=0.25", + "RED_ROSE:6=0.25", + "RED_ROSE:7=0.25", + "RED_ROSE:8=0.25", + "DOUBLE_PLANT:0=0.2", + "DOUBLE_PLANT:1=0.2", + "DOUBLE_PLANT:4=0.2", + "DOUBLE_PLANT:5=0.2" ], "objects": [ "tree/birch/large=0.2", diff --git a/biomes/forest_birch_hills.json b/biomes/forest_birch_hills.json index fc6128d3..dae14ce7 100644 --- a/biomes/forest_birch_hills.json +++ b/biomes/forest_birch_hills.json @@ -12,7 +12,21 @@ "genSwirlScale": 10, "scatter":[ "LONG_GRASS:1=0.23", - "LONG_GRASS:2=0.13" + "LONG_GRASS:2=0.13", + "YELLOW_FLOWER=0.2", + "RED_ROSE=0.25", + "RED_ROSE:1=0.25", + "RED_ROSE:2=0.25", + "RED_ROSE:3=0.25", + "RED_ROSE:4=0.25", + "RED_ROSE:5=0.25", + "RED_ROSE:6=0.25", + "RED_ROSE:7=0.25", + "RED_ROSE:8=0.25", + "DOUBLE_PLANT:0=0.2", + "DOUBLE_PLANT:1=0.2", + "DOUBLE_PLANT:4=0.2", + "DOUBLE_PLANT:5=0.2" ], "objects": [ "tree/birch/large=0.2", diff --git a/biomes/forest_dark.json b/biomes/forest_dark.json index 4bc7aa4e..06daf1b9 100644 --- a/biomes/forest_dark.json +++ b/biomes/forest_dark.json @@ -7,7 +7,9 @@ "genHeight": 0, "scatter":[ "LONG_GRASS:1=0.23", - "LONG_GRASS:2=0.13" + "DOUBLE_PLANT:2=0.15", + "BROWN_MUSHROOM=0.3", + "RED_MUSHROOM=0.45" ], "objects":[ "tree/darkoak/small=0.2", diff --git a/biomes/forest_hills.json b/biomes/forest_hills.json index 32ab480d..bb8d4b97 100644 --- a/biomes/forest_hills.json +++ b/biomes/forest_hills.json @@ -12,14 +12,8 @@ "genSwirlScale": 10, "lush": 0.34, "scatter": [ - "LONG_GRASS:1=0.23", - "LONG_GRASS:2=0.13", - "RED_ROSE:2=0.05", - "RED_ROSE:1=0.07", - "RED_ROSE=0.06", - "YELLOW_FLOWER=0.12", - "RED_ROSE:4=0.07", - "RED_ROSE:5=0.07" + "LONG_GRASS:1=0.33", + "LONG_GRASS:2=0.13" ], "objects": [ "tree/oak/medium=1.1", diff --git a/biomes/forest_mountains.json b/biomes/forest_mountains.json index de835376..61009ad8 100644 --- a/biomes/forest_mountains.json +++ b/biomes/forest_mountains.json @@ -17,7 +17,8 @@ "RED_ROSE=0.06", "YELLOW_FLOWER=0.12", "RED_ROSE:4=0.07", - "RED_ROSE:5=0.07" + "RED_ROSE:5=0.07", + "DOUBLE_PLANT:2=0.15" ], "objects": [ "tree/oak/medium=0.9", diff --git a/biomes/frozen_deep_ocean.json b/biomes/frozen_deep_ocean.json new file mode 100644 index 00000000..1ec20e29 --- /dev/null +++ b/biomes/frozen_deep_ocean.json @@ -0,0 +1,32 @@ +{ + "name": "Frozen Deep Ocean", + "derivative": "FROZEN_OCEAN", + "type": "FLUID", + "fluid": "ICE", + "genHeight": -0.65, + "genAmp": 0, + "surface": [ + "PACKED_ICE", + "ICE", + "ICE", + "ICE", + "CLAY", + "GRAVEL" + ], + "surfaceType": "simplex", + "subSurface": [ + "SAND", + "SAND", + "SAND", + "CLAY", + "GRAVEL" + ], + "subSurfaceType": "simplex", + "rock": [ + "SANDSTONE" + ], + "objects":[ + "spire/small=0.11", + "spire/medium=0.055" + ] +} \ No newline at end of file diff --git a/biomes/ice_forest.json b/biomes/ice_forest.json index 51e1213e..1eceb52e 100644 --- a/biomes/ice_forest.json +++ b/biomes/ice_forest.json @@ -5,7 +5,7 @@ "parent": "Ice Plains", "region": "snowy", "genHeight": 0, - "rarity": 1.325, + "rarity": 1.625, "surface": [ "SNOW_BLOCK" ], diff --git a/biomes/ice_mountains.json b/biomes/ice_mountains.json index 6bef9fff..ee270dbc 100644 --- a/biomes/ice_mountains.json +++ b/biomes/ice_mountains.json @@ -2,12 +2,12 @@ "name": "Ice Mountains", "derivative": "ICE_MOUNTAINS", "type": "LAND", - "parent": "Mountains & Ice Forest", + "parent": "Ice Forest", "region": "snowy", "genHeight": 0, "genScale": 0.7, "genAmplifier": 2.05, - "rarity": 1.5, + "rarity": 3.5, "cliffScale": 1.29, "cliffChance": 0.52, "cliffs": true, diff --git a/biomes/ice_plains.json b/biomes/ice_plains.json index d4d31351..703dbff1 100644 --- a/biomes/ice_plains.json +++ b/biomes/ice_plains.json @@ -3,6 +3,7 @@ "derivative": "ICE_FLATS", "type": "LAND", "region": "snowy", + "parent": "Cold Taiga", "genHeight": 0, "rarity": 1.25, "snow": 0.74, diff --git a/biomes/ice_plains_mushrooms.json b/biomes/ice_plains_mushrooms.json index 1d522be0..506a2ce7 100644 --- a/biomes/ice_plains_mushrooms.json +++ b/biomes/ice_plains_mushrooms.json @@ -5,8 +5,8 @@ "region": "snowy", "genHeight": 0, "rarity": 6, - "snow": 1.25, - "parent": "Ice Plains", + "snow": 15, + "parent": "Ice Mountains", "surface": [ "SNOW_BLOCK" ], diff --git a/biomes/jungle.json b/biomes/jungle.json index 6fed87f7..15099843 100644 --- a/biomes/jungle.json +++ b/biomes/jungle.json @@ -2,14 +2,15 @@ "name": "Jungle", "derivative": "JUNGLE", "type": "LAND", - "parent": "Desert & Forest", + "parent": "Desert", "region": "tropical", "genHeight": 0, + "rarity": 1.2, "lush": 8.5, "scatter":[ "WOOD_BUTTON:5=0.13", - "LONG_GRASS:1=0.58", - "LONG_GRASS:2=0.13", + "LONG_GRASS:1=0.38", + "DOUBLE_PLANT:2=0.35", "RED_ROSE:5=0.12" ], "objects": [ diff --git a/biomes/jungle_hills.json b/biomes/jungle_hills.json index 14278010..ca95b592 100644 --- a/biomes/jungle_hills.json +++ b/biomes/jungle_hills.json @@ -13,8 +13,8 @@ "genSwirlScale": 10, "scatter":[ "WOOD_BUTTON:5=0.13", - "LONG_GRASS:1=0.33", - "LONG_GRASS:2=0.12", + "LONG_GRASS:1=0.48", + "DOUBLE_PLANT:2=0.35", "RED_ROSE:5=0.12" ], "objects": [ diff --git a/biomes/mesa_mountains.json b/biomes/mesa_mountains.json index 9d31d742..8f60ce66 100644 --- a/biomes/mesa_mountains.json +++ b/biomes/mesa_mountains.json @@ -6,9 +6,9 @@ "region": "hot", "cliffs": true, "genHeight": 0, - "rarity": 1.33, + "rarity": 2.83, "genScale": 1.6, - "genAmplifier": 1.15, + "genAmplifier": 1.75, "cliffScale": 0.89, "cliffChance": 0.62, "scatter": [ diff --git a/biomes/mushroom_island.json b/biomes/mushroom_lands.json similarity index 91% rename from biomes/mushroom_island.json rename to biomes/mushroom_lands.json index a5de4d99..3543f17d 100644 --- a/biomes/mushroom_island.json +++ b/biomes/mushroom_lands.json @@ -1,5 +1,5 @@ { - "name": "Mushroom Island", + "name": "Mushroom Lands", "derivative": "MUSHROOM_ISLAND", "type": "LAND", "region": "anomaly", diff --git a/biomes/mushroom_mountains.json b/biomes/mushroom_mountains.json new file mode 100644 index 00000000..08d414e4 --- /dev/null +++ b/biomes/mushroom_mountains.json @@ -0,0 +1,25 @@ +{ + "name": "Mushroom Mountains", + "derivative": "MUSHROOM_ISLAND", + "type": "LAND", + "region": "anomaly", + "parent": "Mushroom Lands", + "genHeight": 0, + "rarity": 12, + "dirtDepth": 0, + "genScale": 0.9, + "genSwirl": 3.5, + "genAmplifier": 2.1, + "cliffScale": 1.39, + "cliffChance": 0.47, + "cliffs": true, + "surface": [ + "MYCEL" + ], + "objects":[ + "mushroom/red=0.23", + "mushroom/black=0.23", + "mushroom/purple=0.23", + "mushroom/greay=0.23" + ] +} \ No newline at end of file diff --git a/biomes/oily_beach.json b/biomes/oily_beach.json new file mode 100644 index 00000000..79103651 --- /dev/null +++ b/biomes/oily_beach.json @@ -0,0 +1,23 @@ +{ + "name": "Oily Beach", + "derivative": "STONE_BEACH", + "type": "FRONT", + "genHeight": 0, + "surfaceType": "simplex", + "surface": [ + "CONCRETE_POWDER:12", + "CONCRETE_POWDER:12", + "CONCRETE_POWDER:12", + "CONCRETE_POWDER:1" + ], + "subSurface": [ + "SAND", + "SAND", + "SAND", + "CLAY", + "GRAVEL" + ], + "scatter":[ + "STONE_BUTTON:5=0.13" + ] +} \ No newline at end of file diff --git a/biomes/oily_channel.json b/biomes/oily_channel.json new file mode 100644 index 00000000..51c906fd --- /dev/null +++ b/biomes/oily_channel.json @@ -0,0 +1,20 @@ +{ + "name": "Oily Channel", + "derivative": "SWAMPLAND", + "type": "FLUID", + "genHeight": -0.2, + "genAmp": 0, + "surface": [ + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:1" + ], + "subSurface": [ + "STONE", + "GRAVEL" + ], + "subSurfaceType": "simplex", + "surfaceType": "simplex" +} \ No newline at end of file diff --git a/biomes/oily_deep_ocean.json b/biomes/oily_deep_ocean.json new file mode 100644 index 00000000..3ab11f4c --- /dev/null +++ b/biomes/oily_deep_ocean.json @@ -0,0 +1,20 @@ +{ + "name": "Oily Deep Ocean", + "derivative": "SWAMPLAND", + "type": "FLUID", + "genHeight": -0.62, + "genAmp": 0, + "surface": [ + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:1" + ], + "subSurface": [ + "STONE", + "GRAVEL" + ], + "subSurfaceType": "simplex", + "surfaceType": "simplex" +} \ No newline at end of file diff --git a/biomes/oily_ocean.json b/biomes/oily_ocean.json new file mode 100644 index 00000000..cfcee61f --- /dev/null +++ b/biomes/oily_ocean.json @@ -0,0 +1,20 @@ +{ + "name": "Oily Ocean", + "derivative": "SWAMPLAND", + "type": "FLUID", + "genHeight": -0.2, + "genAmp": 0, + "surface": [ + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:12", + "CONCRETE:1" + ], + "subSurface": [ + "STONE", + "GRAVEL" + ], + "subSurfaceType": "simplex", + "surfaceType": "simplex" +} \ No newline at end of file diff --git a/biomes/plains.json b/biomes/plains.json index 9014e7c1..de781652 100644 --- a/biomes/plains.json +++ b/biomes/plains.json @@ -7,7 +7,23 @@ "scatter":[ "LONG_GRASS:1=0.37", "LONG_GRASS:2=0.09", - "STONE_BUTTON:5=0.14" + "DOUBLE_PLANT:2=0.25", + "DOUBLE_PLANT:3=0.15", + "STONE_BUTTON:5=0.14", + "YELLOW_FLOWER=0.1", + "RED_ROSE=0.1", + "RED_ROSE:1=0.1", + "RED_ROSE:2=0.1", + "RED_ROSE:3=0.1", + "RED_ROSE:4=0.1", + "RED_ROSE:5=0.1", + "RED_ROSE:6=0.1", + "RED_ROSE:7=0.1", + "RED_ROSE:8=0.1", + "DOUBLE_PLANT:0=0.1", + "DOUBLE_PLANT:1=0.1", + "DOUBLE_PLANT:4=0.1", + "DOUBLE_PLANT:5=0.1" ], "objects": [ "shack/worn=0.01" diff --git a/biomes/tourmaline.json b/biomes/tourmaline.json index 3148d806..bf5da29d 100644 --- a/biomes/tourmaline.json +++ b/biomes/tourmaline.json @@ -4,8 +4,8 @@ "derivative": "MUTATED_PLAINS", "type": "LAND", "genHeight": 0, - "parent": "Mushroom Island", - "rarity": 4.95, + "parent": "Mushroom Mountains", + "rarity": 113, "surface": [ "CONCRETE:15", "OBSIDIAN", diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 43d69bbf..1bf030dd 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -9,6 +9,7 @@ "beach", "channel", + "frozen_deep_ocean", "frozen_ocean", "frozen_lake", "frozen_shore", @@ -17,6 +18,10 @@ "oily_shore", "oily_lake", + "oily_ocean", + "oily_deep_ocean", + "oily_channel", + "oily_beach", "magma_shore", "magma_lake", @@ -50,7 +55,8 @@ "forest_dark", "taiga", "taiga_cold", - "mushroom_island", + "mushroom_lands", + "mushroom_mountains", "taiga_cold_hills", "mountains", "ice_plains", diff --git a/regions/hot.json b/regions/hot.json index 34aeb6c1..39fba512 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -1,9 +1,9 @@ { "name": "Hot", - "beach": "beach", - "ocean": "ocean", - "deepOcean": "deep_ocean", + "beach": "oily_beach", + "ocean": "oily_ocean", + "deepOcean": "oily_deep_ocean", "lake": "oily_lake", "shore": "oily_shore", - "channel": "channel" + "channel": "oily_channel" } \ No newline at end of file diff --git a/regions/snowy.json b/regions/snowy.json index 381f45d8..b553eede 100644 --- a/regions/snowy.json +++ b/regions/snowy.json @@ -2,7 +2,7 @@ "name": "Snowy", "beach": "frozen_beach", "ocean": "frozen_ocean", - "deepOcean": "deep_ocean", + "deepOcean": "frozen_deep_ocean", "lake": "frozen_lake", "shore": "frozen_shore", "channel": "frozen_channel"