diff --git a/core.trees/objects/big-dead-tree-for-dan.iob b/core.trees/objects/big-dead-tree-for-dan.iob deleted file mode 100644 index 55aca2ca..00000000 Binary files a/core.trees/objects/big-dead-tree-for-dan.iob and /dev/null differ diff --git a/core.trees/objects/dual-tree/infested-palm-1.iob b/core.trees/objects/dual-tree/infested-palm-1.iob new file mode 100644 index 00000000..6ab71873 Binary files /dev/null and b/core.trees/objects/dual-tree/infested-palm-1.iob differ diff --git a/core.trees/objects/dual-tree/infested-palm-2.iob b/core.trees/objects/dual-tree/infested-palm-2.iob new file mode 100644 index 00000000..e6ef7d6a Binary files /dev/null and b/core.trees/objects/dual-tree/infested-palm-2.iob differ diff --git a/core.trees/objects/dual-tree/infested-palm-3.iob b/core.trees/objects/dual-tree/infested-palm-3.iob new file mode 100644 index 00000000..f0db7a38 Binary files /dev/null and b/core.trees/objects/dual-tree/infested-palm-3.iob differ diff --git a/core.trees/objects/dual-tree/infested-palm-4.iob b/core.trees/objects/dual-tree/infested-palm-4.iob new file mode 100644 index 00000000..79478cb7 Binary files /dev/null and b/core.trees/objects/dual-tree/infested-palm-4.iob differ diff --git a/core.trees/objects/dual-tree/infested-palm-5.iob b/core.trees/objects/dual-tree/infested-palm-5.iob new file mode 100644 index 00000000..439ea8f9 Binary files /dev/null and b/core.trees/objects/dual-tree/infested-palm-5.iob differ diff --git a/core.trees/objects/dual-tree/sandy-jungle-1.iob b/core.trees/objects/dual-tree/sandy-jungle-1.iob new file mode 100644 index 00000000..fbe3459d Binary files /dev/null and b/core.trees/objects/dual-tree/sandy-jungle-1.iob differ diff --git a/core.trees/objects/dual-tree/sandy-jungle-2.iob b/core.trees/objects/dual-tree/sandy-jungle-2.iob new file mode 100644 index 00000000..e009f3a1 Binary files /dev/null and b/core.trees/objects/dual-tree/sandy-jungle-2.iob differ diff --git a/core.trees/objects/dual-tree/sandy-jungle-3.iob b/core.trees/objects/dual-tree/sandy-jungle-3.iob new file mode 100644 index 00000000..456d1ac2 Binary files /dev/null and b/core.trees/objects/dual-tree/sandy-jungle-3.iob differ diff --git a/core.trees/objects/dual-tree/sandy-jungle-4.iob b/core.trees/objects/dual-tree/sandy-jungle-4.iob new file mode 100644 index 00000000..16f5b18a Binary files /dev/null and b/core.trees/objects/dual-tree/sandy-jungle-4.iob differ diff --git a/core.trees/objects/willwo/willwo-1.iob b/core.trees/objects/willwo/willwo-1.iob new file mode 100644 index 00000000..1242db61 Binary files /dev/null and b/core.trees/objects/willwo/willwo-1.iob differ diff --git a/core.trees/objects/willwo/willwo-10.iob b/core.trees/objects/willwo/willwo-10.iob new file mode 100644 index 00000000..058eb218 Binary files /dev/null and b/core.trees/objects/willwo/willwo-10.iob differ diff --git a/core.trees/objects/willwo/willwo-11.iob b/core.trees/objects/willwo/willwo-11.iob new file mode 100644 index 00000000..8059b00a Binary files /dev/null and b/core.trees/objects/willwo/willwo-11.iob differ diff --git a/core.trees/objects/willwo/willwo-2.iob b/core.trees/objects/willwo/willwo-2.iob new file mode 100644 index 00000000..467bd0ef Binary files /dev/null and b/core.trees/objects/willwo/willwo-2.iob differ diff --git a/core.trees/objects/willwo/willwo-3.iob b/core.trees/objects/willwo/willwo-3.iob new file mode 100644 index 00000000..512525f2 Binary files /dev/null and b/core.trees/objects/willwo/willwo-3.iob differ diff --git a/core.trees/objects/willwo/willwo-4.iob b/core.trees/objects/willwo/willwo-4.iob new file mode 100644 index 00000000..06301366 Binary files /dev/null and b/core.trees/objects/willwo/willwo-4.iob differ diff --git a/core.trees/objects/willwo/willwo-5.iob b/core.trees/objects/willwo/willwo-5.iob new file mode 100644 index 00000000..722f6233 Binary files /dev/null and b/core.trees/objects/willwo/willwo-5.iob differ diff --git a/core.trees/objects/willwo/willwo-6.iob b/core.trees/objects/willwo/willwo-6.iob new file mode 100644 index 00000000..0d9e0b80 Binary files /dev/null and b/core.trees/objects/willwo/willwo-6.iob differ diff --git a/core.trees/objects/willwo/willwo-7.iob b/core.trees/objects/willwo/willwo-7.iob new file mode 100644 index 00000000..0f1865e7 Binary files /dev/null and b/core.trees/objects/willwo/willwo-7.iob differ diff --git a/core.trees/objects/willwo/willwo-8.iob b/core.trees/objects/willwo/willwo-8.iob new file mode 100644 index 00000000..0d9e0b80 Binary files /dev/null and b/core.trees/objects/willwo/willwo-8.iob differ diff --git a/core.trees/objects/willwo/willwo-9.iob b/core.trees/objects/willwo/willwo-9.iob new file mode 100644 index 00000000..17d16cf2 Binary files /dev/null and b/core.trees/objects/willwo/willwo-9.iob differ diff --git a/iris.overworld.swamp/biomes/swamp-willow-forest.json b/iris.overworld.swamp/biomes/swamp-willow-forest.json new file mode 100644 index 00000000..f10199d3 --- /dev/null +++ b/iris.overworld.swamp/biomes/swamp-willow-forest.json @@ -0,0 +1,404 @@ +{ + "name": "Roofed Swamp", + "layers": [ + { + "terrainZoom": 0.5, + "dispersion": "WISPY", + "palette": [ + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "COARSE_DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + "DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + } + ], + "slab": { + "dispersion": "SCATTER", + "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" + ] + }, + "wall": + { + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + }, + "objects": [ + { + "chance": 1, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": false + }, + "place": [ + { + "name": "Roofed Swamp", + "layers": [ + { + "terrainZoom": 0.5, + "dispersion": "WISPY", + "palette": [ + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "COARSE_DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + "DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + } + ], + "slab": { + "dispersion": "SCATTER", + "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" + ] + }, + "wall": + { + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + }, + "objects": [ + { + "chance": 1, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": false + }, + "place": [ + "willwo/willwo-1", + "willwo/willwo-2", + "willwo/willwo-3", + "willwo/willwo-5", + "willwo/willwo-6", + "willwo/willwo-7", + "willwo/willwo-8", + "willwo/willwo-9", + "willwo/willwo-10", + "willwo/willwo-11" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.135, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "boulder/boulder1", + "boulder/boulder2", + "boulder/boulder3", + "boulder/boulder4", + "boulder/boulder5", + "boulder/boulder6", + "boulder/boulder7", + "boulder/boulder8" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.075, + "density": 1, + "rotation": { + "enabled": false + }, + "place": [ + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.0001, + "density": 1, + "rotation": { + "enabled": false + }, + "place": [ + "stump/grave-1" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + } + ], + "children": [ + "swamp-dark-oak-denmyre" + ], + "decorators": [ + { + "zoom": 0.3, + "chance": 0.01, + "palette": [ + "DEAD_BUSH" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.0002, + "palette": [ + "CRIMSON_FUNGUS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.45, + "palette": ["GRASS"], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + ], + "generators":[ + { + "generator": "plain", + "min": 4, + "max": 11 + }, + { + "generator": "wavy", + "min": 2, + "max": 7 + } + ], + "derivative": "SWAMP" +} + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.1, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "boulder/boulder1", + "boulder/boulder2", + "boulder/boulder3", + "boulder/boulder4", + "boulder/boulder5", + "boulder/boulder6", + "boulder/boulder7", + "boulder/boulder8" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.075, + "density": 1, + "rotation": { + "enabled": false + }, + "place": [ + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.0001, + "density": 1, + "rotation": { + "enabled": false + }, + "place": [ + "stump/grave-1" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + } + ], + "children": [ + "swamp-dark-oak-denmyre" + ], + "decorators": [ + { + "zoom": 0.3, + "chance": 0.01, + "palette": [ + "DEAD_BUSH" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.0002, + "palette": [ + "CRIMSON_FUNGUS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.45, + "palette": ["GRASS"], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + ], + "generators":[ + { + "generator": "plain", + "min": 4, + "max": 11 + }, + { + "generator": "wavy", + "min": 2, + "max": 7 + } + ], + "derivative": "SWAMP" +} \ No newline at end of file diff --git a/iris.overworld/dimensions/overworld.json b/iris.overworld/dimensions/overworld.json index 52d2d2c3..58329a37 100644 --- a/iris.overworld/dimensions/overworld.json +++ b/iris.overworld/dimensions/overworld.json @@ -63,7 +63,7 @@ "deposits": [ { "minHeight": 19, - "maxHeight": 110, + "maxHeight": 150, "minSize": 22, "maxSize": 35, "minPerChunk": 4, @@ -76,7 +76,7 @@ }, { "minHeight": 45, - "maxHeight": 103, + "maxHeight": 140, "minSize": 19, "maxSize": 24, "minPerChunk": 4, @@ -88,7 +88,7 @@ }, { "minHeight": 25, - "maxHeight": 52, + "maxHeight": 95, "minSize": 19, "maxSize": 24, "minPerChunk": 4, @@ -100,7 +100,7 @@ }, { "minHeight": 35, - "maxHeight": 62, + "maxHeight": 100, "minSize": 19, "maxSize": 24, "minPerChunk": 4, @@ -112,7 +112,7 @@ }, { "minHeight": 45, - "maxHeight": 72, + "maxHeight": 115, "minSize": 19, "maxSize": 24, "minPerChunk": 4, @@ -136,7 +136,7 @@ }, { "minHeight": 4, - "maxHeight": 24, + "maxHeight": 40, "minSize": 5, "maxSize": 9, "minPerChunk": 4, @@ -148,7 +148,7 @@ }, { "minHeight": 3, - "maxHeight": 57, + "maxHeight": 67, "minSize": 1, "maxSize": 2, "minPerChunk": 1, @@ -160,7 +160,7 @@ }, { "minHeight": 3, - "maxHeight": 30, + "maxHeight": 45, "minSize": 3, "maxSize": 8, "minPerChunk": 0, @@ -184,7 +184,7 @@ }, { "minHeight": 1, - "maxHeight": 145, + "maxHeight": 175, "minSize": 9, "maxSize": 12, "minPerChunk": 6, @@ -198,7 +198,7 @@ "mutations":[ { "sideA": [ - "swamp-roofed", + "*swamp-roofed", "swamp-dark-oak-denmyre" ], "sideB": [ @@ -232,10 +232,81 @@ "dual-tree/corrupted-swamp-8", "dual-tree/corrupted-swamp-9", "dual-tree/corrupted-swamp-10" - ] } ] + }, + { + "sideA": [ + "tropical-beach", + "hot-beach" + ], + "sideB": [ + "swamp-mushroom", + "swamp-crimson-mushroom", + "swamp-warped-mushroom" + ], + "radius": 12, + "checks": 8, + "objects": [ + { + "chance": 0.4, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "dual-tree/infested-palm-1", + "dual-tree/infested-palm-2", + "dual-tree/infested-palm-3", + "dual-tree/infested-palm-4", + "dual-tree/infested-palm-5" + ] + } + ] + }, + { + "sideA": [ + "tropical-beach" + ], + "sideB": [ + "tropical-rainforest", + "tropical-bamboo-forest" + ], + "radius": 12, + "checks": 8, + "objects": [ + { + "chance": 0.4, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "dual-tree/sandy-jungle-1", + "dual-tree/sandy-jungle-2", + "dual-tree/sandy-jungle-3", + "dual-tree/sandy-jungle-4" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + } + ] } ] } \ No newline at end of file