From 090388f8b1b04f959e3fff052f5c5793b9f37240 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 27 Jul 2020 00:51:16 -0400 Subject: [PATCH 1/3] Slabb --- .../biomes/swamp-mountains.json | 24 +++++++++++++++++++ .../biomes/swamp-oak-denmyre.json | 17 +++++++++++++ iris.overworld.swamp/biomes/swamp-roofed.json | 24 +++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/iris.overworld.swamp/biomes/swamp-mountains.json b/iris.overworld.swamp/biomes/swamp-mountains.json index ec38d12b..826333f9 100644 --- a/iris.overworld.swamp/biomes/swamp-mountains.json +++ b/iris.overworld.swamp/biomes/swamp-mountains.json @@ -24,6 +24,30 @@ ] } ], + "slab": { + "dispersion": "WISPY", + "terrainZoom": 0.35, + "palette": [ + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:mossy_cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR" + ] + }, "objects": [ { "chance": 2.0, diff --git a/iris.overworld.swamp/biomes/swamp-oak-denmyre.json b/iris.overworld.swamp/biomes/swamp-oak-denmyre.json index ddd782e3..9d4fe978 100644 --- a/iris.overworld.swamp/biomes/swamp-oak-denmyre.json +++ b/iris.overworld.swamp/biomes/swamp-oak-denmyre.json @@ -36,6 +36,23 @@ ] } ], + "slab": { + "dispersion": "WISPY", + "terrainZoom": 0.35, + "palette": [ + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR" + ] + }, "decorators": [ { "zoom": 0.01, diff --git a/iris.overworld.swamp/biomes/swamp-roofed.json b/iris.overworld.swamp/biomes/swamp-roofed.json index d3238908..f2e1a5b4 100644 --- a/iris.overworld.swamp/biomes/swamp-roofed.json +++ b/iris.overworld.swamp/biomes/swamp-roofed.json @@ -33,6 +33,30 @@ ] } ], + "slab": { + "dispersion": "WISPY", + "terrainZoom": 0.35, + "palette": [ + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:mossy_cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR" + ] + }, "children": [ "tundra-mountains" ], From d4eaa44b2023cfe5f1457516f49ff1551ea293c9 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 27 Jul 2020 00:57:38 -0400 Subject: [PATCH 2/3] More slab --- iris.overworld.tundra/biomes/tundra-beach-stone.json | 2 ++ iris.overworld.tundra/biomes/tundra-taiga.json | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/iris.overworld.tundra/biomes/tundra-beach-stone.json b/iris.overworld.tundra/biomes/tundra-beach-stone.json index 3f1efa2a..3d07a03e 100644 --- a/iris.overworld.tundra/biomes/tundra-beach-stone.json +++ b/iris.overworld.tundra/biomes/tundra-beach-stone.json @@ -22,6 +22,8 @@ "terrainZoom": 0.5, "palette": [ "minecraft:stone_slab[type=bottom,waterlogged=false]", + "minecraft:andesite_slab[type=bottom,waterlogged=false]", + "AIR", "AIR" ] }, diff --git a/iris.overworld.tundra/biomes/tundra-taiga.json b/iris.overworld.tundra/biomes/tundra-taiga.json index 71a63e7a..df234c99 100644 --- a/iris.overworld.tundra/biomes/tundra-taiga.json +++ b/iris.overworld.tundra/biomes/tundra-taiga.json @@ -45,6 +45,16 @@ ] } ], + "slab": { + "dispersion": "WISPY", + "terrainZoom": 0.5, + "palette": [ + "minecraft:stone_slab[type=bottom,waterlogged=false]", + "minecraft:andesite_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR" + ] + }, "objects": [ { "chance": 0.05, From 1657052e3e14e0cc6fbbaa067b4685a1f0d6c239 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 27 Jul 2020 01:41:23 -0400 Subject: [PATCH 3/3] Denmotherfuckers --- .../biomes/swamp-mushroom.json | 74 +++++++++++++++++++ iris.overworld.swamp/biomes/swamp-roofed.json | 3 - iris.overworld.swamp/regions/swamp.json | 2 +- .../biomes/temperate-oak-denmyre.json | 4 - ...sephora.json => temperate-oak-forest.json} | 10 +-- .../regions/temperate.json | 2 +- 6 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 iris.overworld.swamp/biomes/swamp-mushroom.json rename iris.overworld.swamp/biomes/swamp-oak-denmyre.json => iris.overworld.temperate/biomes/temperate-oak-denmyre.json (99%) rename iris.overworld.temperate/biomes/{temperate-oak-sephora.json => temperate-oak-forest.json} (97%) diff --git a/iris.overworld.swamp/biomes/swamp-mushroom.json b/iris.overworld.swamp/biomes/swamp-mushroom.json new file mode 100644 index 00000000..44ee2108 --- /dev/null +++ b/iris.overworld.swamp/biomes/swamp-mushroom.json @@ -0,0 +1,74 @@ +{ + "name": "Mushroom Swamp", + "layers": [ + { + "terrainZoom": 0.5, + "dispersion": "WISPY", + "palette": [ + "MYCELIUM", + "MYCELIUM", + "MYCELIUM", + "MYCELIUM", + "GRAVEL", + "MYCELIUM", + "MYCELIUM", + "MYCELIUM" + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + "DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + } + ], + "slab": { + "dispersion": "WISPY", + "terrainZoom": 0.35, + "palette": [ + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:mossy_cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR", + "AIR" + ] + }, + "generators":[ + { + "generator": "plain", + "min": 4, + "max": 11 + }, + { + "generator": "wavy", + "min": 2, + "max": 7 + } + ], + "derivative": "MUSHROOM_FIELDS" +} \ No newline at end of file diff --git a/iris.overworld.swamp/biomes/swamp-roofed.json b/iris.overworld.swamp/biomes/swamp-roofed.json index f2e1a5b4..116184fc 100644 --- a/iris.overworld.swamp/biomes/swamp-roofed.json +++ b/iris.overworld.swamp/biomes/swamp-roofed.json @@ -57,9 +57,6 @@ "AIR" ] }, - "children": [ - "tundra-mountains" - ], "objects": [ { "chance": 1, diff --git a/iris.overworld.swamp/regions/swamp.json b/iris.overworld.swamp/regions/swamp.json index 48c988ed..a3495818 100644 --- a/iris.overworld.swamp/regions/swamp.json +++ b/iris.overworld.swamp/regions/swamp.json @@ -7,7 +7,7 @@ "landBiomes": [ "swamp-roofed", "swamp-mountains", - "swamp-oak-denmyre" + "swamp-mushroom" ], "seaBiomes": [ "swamp-ocean" diff --git a/iris.overworld.swamp/biomes/swamp-oak-denmyre.json b/iris.overworld.temperate/biomes/temperate-oak-denmyre.json similarity index 99% rename from iris.overworld.swamp/biomes/swamp-oak-denmyre.json rename to iris.overworld.temperate/biomes/temperate-oak-denmyre.json index 9d4fe978..77a9c226 100644 --- a/iris.overworld.swamp/biomes/swamp-oak-denmyre.json +++ b/iris.overworld.temperate/biomes/temperate-oak-denmyre.json @@ -113,8 +113,6 @@ "oak-medium/oak-denmyre-10", "oak-medium/oak-denmyre-11", "oak-medium/oak-denmyre-12" - - ], "translate": { "x": 0, @@ -146,8 +144,6 @@ "denmyre/oak-denmyre-clutter-8", "denmyre/oak-denmyre-clutter-9", "denmyre/oak-denmyre-clutter-10" - - ], "translate": { "x": 0, diff --git a/iris.overworld.temperate/biomes/temperate-oak-sephora.json b/iris.overworld.temperate/biomes/temperate-oak-forest.json similarity index 97% rename from iris.overworld.temperate/biomes/temperate-oak-sephora.json rename to iris.overworld.temperate/biomes/temperate-oak-forest.json index 3f2ed8b8..9f7259ef 100644 --- a/iris.overworld.temperate/biomes/temperate-oak-sephora.json +++ b/iris.overworld.temperate/biomes/temperate-oak-forest.json @@ -1,13 +1,10 @@ { - "name": "Oak Sephora", + "name": "Oak Forest", "layers": [ { "dispersion": "WISPY", "palette": [ "GRASS_BLOCK" - - - ] }, { @@ -34,6 +31,9 @@ ] } ], + "children": [ + "temperate-oak-denmyre" + ], "decorators": [ { "zoom": 0.1, @@ -71,7 +71,6 @@ "enabled": false }, "place": [ - "hazel-oak/hoak-3", "hazel-oak/hoak-4", "hazel-oak/hoak-5", @@ -101,7 +100,6 @@ "enabled": false }, "place": [ - "hazel-oak/s-hoak-3", "hazel-oak/s-hoak-4", "hazel-oak/s-hoak-5", diff --git a/iris.overworld.temperate/regions/temperate.json b/iris.overworld.temperate/regions/temperate.json index cc0d1adc..74d21122 100644 --- a/iris.overworld.temperate/regions/temperate.json +++ b/iris.overworld.temperate/regions/temperate.json @@ -8,7 +8,7 @@ "temperate-plains", "temperate-bamboo-forest", "temperate-birch-forest", - "temperate-oak-sephora", + "temperate-oak-forest", "temperate-highlands" ], "seaBiomes": [