From 3ccc523da9dec1fffa30234fb79f123a108cf137 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 22 Jan 2020 14:31:04 -0500 Subject: [PATCH] f --- biomes/beach.json | 13 +---------- biomes/{deep_ocean.json => channel.json} | 10 ++++---- biomes/desert.json | 2 +- biomes/desert_red.json | 2 +- biomes/forest.json | 2 +- biomes/forest_birch.json | 2 +- biomes/forest_birch_hills.json | 2 -- biomes/forest_dark.json | 2 +- biomes/forest_haunted.json | 2 +- biomes/forest_hills.json | 2 -- biomes/forest_mountains.json | 4 ---- biomes/frozen_beach.json | 17 -------------- biomes/frozen_ocean.json | 26 --------------------- biomes/ice_forest.json | 2 +- biomes/ice_mountains.json | 6 +---- biomes/ice_plains.json | 1 - biomes/ice_plains_mushrooms.json | 1 - biomes/jungle_hills.json | 2 -- biomes/lake.json | 18 ++++++++++++++ biomes/{cold_beach.json => lake_shore.json} | 6 ++--- biomes/mesa.json | 2 +- biomes/mesa_blue.json | 4 ---- biomes/mesa_green.json | 4 ---- biomes/mesa_mountains.json | 7 +----- biomes/mountains.json | 6 +---- biomes/ocean.json | 3 ++- biomes/plains.json | 3 +-- biomes/redwood_forest_hills.json | 2 -- biomes/savanna_hills.json | 2 -- biomes/taiga.json | 2 +- biomes/taiga_cold.json | 2 +- biomes/taiga_cold_hills.json | 2 -- biomes/temperate_beach.json | 16 ------------- biomes/tourmaline.json | 2 +- biomes/volcanic.json | 2 -- dimensions/overworld.json | 10 ++++---- regions/anomaly.json | 9 ++++--- regions/cold.json | 9 ++++--- regions/hot.json | 7 ++++-- regions/snowy.json | 8 ++++--- regions/temperate.json | 9 ++++--- regions/tropical.json | 7 ++++-- 42 files changed, 81 insertions(+), 159 deletions(-) rename biomes/{deep_ocean.json => channel.json} (73%) delete mode 100644 biomes/frozen_beach.json delete mode 100644 biomes/frozen_ocean.json create mode 100644 biomes/lake.json rename biomes/{cold_beach.json => lake_shore.json} (69%) delete mode 100644 biomes/temperate_beach.json diff --git a/biomes/beach.json b/biomes/beach.json index 61b3036c..67eb95cd 100644 --- a/biomes/beach.json +++ b/biomes/beach.json @@ -2,7 +2,7 @@ "name": "Beach", "derivative": "BEACHES", "type": "FRONT", - "height": 0, + "genHeight": 0, "surface": [ "SAND" ], @@ -12,16 +12,5 @@ "SAND", "CLAY", "GRAVEL" - ], - "rock": [ - "SANDSTONE" - ], - "scatter":[ - "DEAD_BUSH=0.008" - ], - "objects": [ - "tree/palm/medium=0.5", - "tree/palm/small=0.4" - ] } \ No newline at end of file diff --git a/biomes/deep_ocean.json b/biomes/channel.json similarity index 73% rename from biomes/deep_ocean.json rename to biomes/channel.json index 48b04855..65171c46 100644 --- a/biomes/deep_ocean.json +++ b/biomes/channel.json @@ -1,16 +1,16 @@ { - "name": "Deep Ocean", - "derivative": "DEEP_OCEAN", + "name": "Channel", + "derivative": "OCEAN", "type": "FLUID", - "height": -0.1, + "genHeight": -0.25, + "genAmp": 0, "surface": [ - "SAND", - "SAND", "SAND", "SAND", "CLAY", "GRAVEL" ], + "surfaceScale": 0.7, "surfaceType": "simplex", "subSurface": [ "SAND", diff --git a/biomes/desert.json b/biomes/desert.json index b3050bad..1fb4da5f 100644 --- a/biomes/desert.json +++ b/biomes/desert.json @@ -3,7 +3,7 @@ "derivative": "DESERT", "type": "LAND", "region": "hot", - "height": 0, + "genHeight": 0, "surface": [ "SAND" ], diff --git a/biomes/desert_red.json b/biomes/desert_red.json index ee19cbb9..732ea91b 100644 --- a/biomes/desert_red.json +++ b/biomes/desert_red.json @@ -4,7 +4,7 @@ "type": "LAND", "parent": "Desert", "region": "hot", - "height": 0, + "genHeight": 0, "rarity": 1.5, "surface": [ "SAND:1" diff --git a/biomes/forest.json b/biomes/forest.json index 0a3b8f88..9cd4300e 100644 --- a/biomes/forest.json +++ b/biomes/forest.json @@ -3,7 +3,7 @@ "derivative": "FOREST", "type": "LAND", "region": "temperate", - "height": 0, + "genHeight": 0, "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13" diff --git a/biomes/forest_birch.json b/biomes/forest_birch.json index d4c94c29..3ec060e5 100644 --- a/biomes/forest_birch.json +++ b/biomes/forest_birch.json @@ -4,7 +4,7 @@ "parent": "Forest", "type": "LAND", "region": "temperate", - "height": 0, + "genHeight": 0, "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13" diff --git a/biomes/forest_birch_hills.json b/biomes/forest_birch_hills.json index eb3ec4f3..4ce14b39 100644 --- a/biomes/forest_birch_hills.json +++ b/biomes/forest_birch_hills.json @@ -5,8 +5,6 @@ "region": "temperate", "parent": "Birch Forest", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13" diff --git a/biomes/forest_dark.json b/biomes/forest_dark.json index d61997c2..4bc7aa4e 100644 --- a/biomes/forest_dark.json +++ b/biomes/forest_dark.json @@ -4,7 +4,7 @@ "type": "LAND", "parent": "Forest", "region": "temperate", - "height": 0, + "genHeight": 0, "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13" diff --git a/biomes/forest_haunted.json b/biomes/forest_haunted.json index 0c0911eb..44224754 100644 --- a/biomes/forest_haunted.json +++ b/biomes/forest_haunted.json @@ -4,7 +4,7 @@ "type": "LAND", "region": "temperate", "parent": "Dark Forest", - "height": 0, + "genHeight": 0, "rarity": 6.5, "surface": [ "GRASS", diff --git a/biomes/forest_hills.json b/biomes/forest_hills.json index adfcd3a2..78b2cb3c 100644 --- a/biomes/forest_hills.json +++ b/biomes/forest_hills.json @@ -5,8 +5,6 @@ "parent": "Forest", "region": "temperate", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "scatter":[ "LONG_GRASS:1=0.23", "LONG_GRASS:2=0.13" diff --git a/biomes/forest_mountains.json b/biomes/forest_mountains.json index 779d8089..bcd05fba 100644 --- a/biomes/forest_mountains.json +++ b/biomes/forest_mountains.json @@ -5,10 +5,6 @@ "parent": "Forest & Mountains", "region": "temperate", "genHeight": 0, - "genAmplifier": 0.85, - "genScale": 0.685, - "genSwirl": 2.44, - "genSwirlScale": 12.5, "cliffScale": 0.75, "cliffChance": 0.412, "cliffs": true, diff --git a/biomes/frozen_beach.json b/biomes/frozen_beach.json deleted file mode 100644 index 91253cd4..00000000 --- a/biomes/frozen_beach.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Frozen Beach", - "derivative": "COLD_BEACH", - "type": "FRONT", - "height": 0, - "snow": 0.5, - "surface": [ - "PACKED_ICE" - ], - "subSurface": [ - "SAND", - "SAND", - "SAND", - "CLAY", - "GRAVEL" - ] -} \ No newline at end of file diff --git a/biomes/frozen_ocean.json b/biomes/frozen_ocean.json deleted file mode 100644 index a8152e92..00000000 --- a/biomes/frozen_ocean.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "Frozen Ocean", - "derivative": "FROZEN_OCEAN", - "type": "FLUID", - "height": -0.03, - "surface": [ - "SAND", - "SAND", - "SAND", - "SAND", - "CLAY", - "GRAVEL" - ], - "surfaceType": "simplex", - "subSurface": [ - "SAND", - "SAND", - "SAND", - "CLAY", - "GRAVEL" - ], - "subSurfaceType": "simplex", - "rock": [ - "SANDSTONE" - ] -} \ No newline at end of file diff --git a/biomes/ice_forest.json b/biomes/ice_forest.json index 534bcf2e..51e1213e 100644 --- a/biomes/ice_forest.json +++ b/biomes/ice_forest.json @@ -4,7 +4,7 @@ "type": "LAND", "parent": "Ice Plains", "region": "snowy", - "height": 0, + "genHeight": 0, "rarity": 1.325, "surface": [ "SNOW_BLOCK" diff --git a/biomes/ice_mountains.json b/biomes/ice_mountains.json index 0b5b9efe..bca9caf7 100644 --- a/biomes/ice_mountains.json +++ b/biomes/ice_mountains.json @@ -4,12 +4,8 @@ "type": "LAND", "parent": "Mountains & Ice Forest", "region": "snowy", - "genHeight": 0.0255, + "genHeight": 0, "rarity": 1.5, - "genAmplifier": 1.35, - "genScale": 1, - "genSwirl": 8.44, - "genSwirlScale": 0.5, "cliffScale": 1.29, "cliffChance": 0.52, "cliffs": true, diff --git a/biomes/ice_plains.json b/biomes/ice_plains.json index 1b4502bd..f30f98fb 100644 --- a/biomes/ice_plains.json +++ b/biomes/ice_plains.json @@ -5,7 +5,6 @@ "region": "snowy", "genHeight": 0, "rarity": 1.25, - "genAmplifier": 0.1, "snow": 0.74, "surface": [ "SNOW_BLOCK" diff --git a/biomes/ice_plains_mushrooms.json b/biomes/ice_plains_mushrooms.json index aa833f73..e10a085e 100644 --- a/biomes/ice_plains_mushrooms.json +++ b/biomes/ice_plains_mushrooms.json @@ -5,7 +5,6 @@ "region": "snowy", "genHeight": 0, "rarity": 2, - "genAmplifier": 0.1, "snow": 0.74, "parent": "Ice Plains", "surface": [ diff --git a/biomes/jungle_hills.json b/biomes/jungle_hills.json index 3dfc77d9..a933046d 100644 --- a/biomes/jungle_hills.json +++ b/biomes/jungle_hills.json @@ -5,8 +5,6 @@ "parent": "Jungle", "region": "tropical", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "scatter":[ "LONG_GRASS:1=0.33", "LONG_GRASS:2=0.02" diff --git a/biomes/lake.json b/biomes/lake.json new file mode 100644 index 00000000..850c0f05 --- /dev/null +++ b/biomes/lake.json @@ -0,0 +1,18 @@ +{ + "name": "Lake", + "derivative": "OCEAN", + "type": "FLUID", + "genHeight": -0.2, + "genAmp": 0, + "surface": [ + "SAND" + ], + "subSurface": [ + "SAND", + "SAND", + "SAND", + "CLAY", + "GRAVEL" + ], + "subSurfaceType": "simplex" +} \ No newline at end of file diff --git a/biomes/cold_beach.json b/biomes/lake_shore.json similarity index 69% rename from biomes/cold_beach.json rename to biomes/lake_shore.json index 3cd7e4ad..f76cbe1d 100644 --- a/biomes/cold_beach.json +++ b/biomes/lake_shore.json @@ -1,8 +1,8 @@ { - "name": "Cold Beach", - "derivative": "COLD_BEACH", + "name": "Lake Shore", + "derivative": "BEACHES", "type": "FRONT", - "height": 0, + "genHeight": 0, "surface": [ "SAND" ], diff --git a/biomes/mesa.json b/biomes/mesa.json index 6384a3b1..4cb176d6 100644 --- a/biomes/mesa.json +++ b/biomes/mesa.json @@ -3,7 +3,7 @@ "derivative": "Mesa", "type": "LAND", "parent": "Desert", - "height": 0, + "genHeight": 0, "region": "hot", "surface": [ "HARD_CLAY", diff --git a/biomes/mesa_blue.json b/biomes/mesa_blue.json index dd0dec75..9fc16952 100644 --- a/biomes/mesa_blue.json +++ b/biomes/mesa_blue.json @@ -5,10 +5,6 @@ "parent": "Mesa", "region": "hot", "genHeight": 0, - "genAmplifier": 0.22, - "genScale": 0.685, - "genSwirl": 2.44, - "genSwirlScale": 12.5, "surface": [ "STAINED_CLAY:9", "STAINED_CLAY:3", diff --git a/biomes/mesa_green.json b/biomes/mesa_green.json index 363183da..e3953b08 100644 --- a/biomes/mesa_green.json +++ b/biomes/mesa_green.json @@ -4,10 +4,6 @@ "type": "LAND", "parent": "Mesa", "genHeight": 0, - "genAmplifier": 0.12, - "genScale": 1.285, - "genSwirl": 6.44, - "genSwirlScale": 5.5, "region": "hot", "surface": [ "STAINED_CLAY:4", diff --git a/biomes/mesa_mountains.json b/biomes/mesa_mountains.json index 7059910b..4b5efa83 100644 --- a/biomes/mesa_mountains.json +++ b/biomes/mesa_mountains.json @@ -3,14 +3,9 @@ "derivative": "Mesa", "type": "LAND", "parent": "Mesa & Mountains", - "height": 0, "region": "hot", "cliffs": true, - "genHeight": 0.02, - "genAmplifier": 1.30, - "genScale": 0.9, - "genSwirl": 3.44, - "genSwirlScale": 12.5, + "genHeight": 0, "cliffScale": 0.89, "cliffChance": 0.62, "surface": [ diff --git a/biomes/mountains.json b/biomes/mountains.json index b5d83ca9..040185f3 100644 --- a/biomes/mountains.json +++ b/biomes/mountains.json @@ -4,11 +4,7 @@ "type": "LAND", "region": "cold", "parent": "Plains", - "genHeight": 0.02, - "genAmplifier": 1.412, - "genScale": 0.54, - "genSwirl": 1.44, - "genSwirlScale": 12.5, + "genHeight": 0, "cliffScale": 1.19, "cliffChance": 0.37, "cliffs": true, diff --git a/biomes/ocean.json b/biomes/ocean.json index 3077835d..78a1033a 100644 --- a/biomes/ocean.json +++ b/biomes/ocean.json @@ -2,7 +2,8 @@ "name": "Ocean", "derivative": "OCEAN", "type": "FLUID", - "height": -0.03, + "genHeight": -0.25, + "genAmp": 0, "surface": [ "SAND", "SAND", diff --git a/biomes/plains.json b/biomes/plains.json index b5860e0d..81607631 100644 --- a/biomes/plains.json +++ b/biomes/plains.json @@ -3,8 +3,7 @@ "derivative": "PLAINS", "type": "LAND", "region": "temperate", - "height": 0, - "genAmplifier": 0.02, + "genHeight": 0, "scatter":[ "LONG_GRASS:1=0.37", "LONG_GRASS:2=0.09" diff --git a/biomes/redwood_forest_hills.json b/biomes/redwood_forest_hills.json index ff906967..562f9854 100644 --- a/biomes/redwood_forest_hills.json +++ b/biomes/redwood_forest_hills.json @@ -5,8 +5,6 @@ "parent": "Cold Taiga Hills", "region": "cold", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "surface": [ "DIRT", "DIRT:1", diff --git a/biomes/savanna_hills.json b/biomes/savanna_hills.json index e0b8c52d..474d2580 100644 --- a/biomes/savanna_hills.json +++ b/biomes/savanna_hills.json @@ -5,8 +5,6 @@ "region": "hot", "parent": "Savanna", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "scatter":[ "LONG_GRASS:1=0.18" ], diff --git a/biomes/taiga.json b/biomes/taiga.json index 74e9eb60..b93bbcce 100644 --- a/biomes/taiga.json +++ b/biomes/taiga.json @@ -3,7 +3,7 @@ "derivative": "TAIGA", "type": "LAND", "region": "cold", - "height": 0, + "genHeight": 0, "scatter":[ "LONG_GRASS:2=0.07" ], diff --git a/biomes/taiga_cold.json b/biomes/taiga_cold.json index dbb76bbc..b9e535ff 100644 --- a/biomes/taiga_cold.json +++ b/biomes/taiga_cold.json @@ -4,7 +4,7 @@ "type": "LAND", "region": "cold", "parent": "Taiga", - "height": 0, + "genHeight": 0, "scatter":[ "LONG_GRASS:2=0.04" ], diff --git a/biomes/taiga_cold_hills.json b/biomes/taiga_cold_hills.json index 030fea1a..2f1f434b 100644 --- a/biomes/taiga_cold_hills.json +++ b/biomes/taiga_cold_hills.json @@ -5,8 +5,6 @@ "parent": "Cold Taiga", "region": "cold", "genHeight": 0, - "genAmplifier": 0.26, - "genScale": 1.25, "scatter":[ "LONG_GRASS:2=0.04" ], diff --git a/biomes/temperate_beach.json b/biomes/temperate_beach.json deleted file mode 100644 index 4153b3f5..00000000 --- a/biomes/temperate_beach.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Temperate Beach", - "derivative": "STONE_BEACH", - "type": "FRONT", - "height": 0, - "surface": [ - "SAND" - ], - "subSurface": [ - "SAND", - "SAND", - "SAND", - "CLAY", - "GRAVEL" - ] -} \ No newline at end of file diff --git a/biomes/tourmaline.json b/biomes/tourmaline.json index d210b6cb..3148d806 100644 --- a/biomes/tourmaline.json +++ b/biomes/tourmaline.json @@ -3,7 +3,7 @@ "region": "anomaly", "derivative": "MUTATED_PLAINS", "type": "LAND", - "height": 0, + "genHeight": 0, "parent": "Mushroom Island", "rarity": 4.95, "surface": [ diff --git a/biomes/volcanic.json b/biomes/volcanic.json index 5b87b727..f58be490 100644 --- a/biomes/volcanic.json +++ b/biomes/volcanic.json @@ -4,8 +4,6 @@ "type": "LAND", "parent": "Jungle Hills", "genHeight": 0, - "genAmplifier": 1.15, - "genScale": 2.15, "rarity": 3.5, "region": "tropical", "cliffScale": 0.76, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 2473e107..7e47f832 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -3,11 +3,11 @@ "environment": "normal", "biomes": [ "ocean", - "deep_ocean", - "frozen_ocean", + "lake", + "lake_shore", "beach", - "cold_beach", - "temperate_beach", + "channel", + "desert", "desert_red", "desert_hills", @@ -40,8 +40,6 @@ "redwood_forest", "redwood_forest_hills", "ice_plains_mushrooms", - "frozen_beach", - "beach", "sakura", "tourmaline" ] diff --git a/regions/anomaly.json b/regions/anomaly.json index 7e37c7ec..bc0ee95e 100644 --- a/regions/anomaly.json +++ b/regions/anomaly.json @@ -1,5 +1,8 @@ { - "rarity": 1, - "beach": "temperate_beach", - "name": "Anomaly" + "name": "Anomaly", + "beach": "beach", + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file diff --git a/regions/cold.json b/regions/cold.json index bfd4381a..8eeaab45 100644 --- a/regions/cold.json +++ b/regions/cold.json @@ -1,5 +1,8 @@ { - "rarity": 1, - "beach": "cold_beach", - "name": "Cold" + "name": "Cold", + "beach": "beach", + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file diff --git a/regions/hot.json b/regions/hot.json index f78cc027..e6cac6c3 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -1,5 +1,8 @@ { - "rarity": 1, + "name": "Hot", "beach": "beach", - "name": "hot" + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file diff --git a/regions/snowy.json b/regions/snowy.json index 99d47f33..60fbf02e 100644 --- a/regions/snowy.json +++ b/regions/snowy.json @@ -1,6 +1,8 @@ { - "rarity": 1, - "beach": "frozen_beach", "name": "Snowy", - "frozen": true + "beach": "beach", + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file diff --git a/regions/temperate.json b/regions/temperate.json index d2742ebe..01dee6af 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -1,5 +1,8 @@ { - "rarity": 1, - "beach": "temperate_beach", - "name": "Temperate" + "name": "Temperate", + "beach": "beach", + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file diff --git a/regions/tropical.json b/regions/tropical.json index 7ef12dfe..91d9460a 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -1,5 +1,8 @@ { - "rarity": 1, + "name": "Tropical", "beach": "beach", - "name": "Tropical" + "ocean": "ocean", + "lake": "lake", + "lakeBeach": "beach", + "channel": "channel" } \ No newline at end of file