diff --git a/biomes/carving/CaveBiomes/Deepdark.json b/biomes/carving/CaveBiomes/Deepdark.json deleted file mode 100644 index db7a3b72..00000000 --- a/biomes/carving/CaveBiomes/Deepdark.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "DeepDark", - "layers": [{ - "style": {"style": "STATIC"}, - "maxHeight": 2, - "minHeight": 2, - "palette": [ - { - "block": "minecraft:deepslate", - "weight": 3 - } - ] - }] -} \ No newline at end of file diff --git a/biomes/carving/Deepdark/StandardDeepdark.json b/biomes/carving/deepdark/standard-deepdark.json similarity index 100% rename from biomes/carving/Deepdark/StandardDeepdark.json rename to biomes/carving/deepdark/standard-deepdark.json diff --git a/biomes/carving/CaveBiomes/Rocky.json b/biomes/carving/rocky-cavebiome.json similarity index 100% rename from biomes/carving/CaveBiomes/Rocky.json rename to biomes/carving/rocky-cavebiome.json diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json index e7fd9c60..82fd1434 100644 --- a/biomes/frozen/plains.json +++ b/biomes/frozen/plains.json @@ -22,7 +22,7 @@ }, { "structure": "pillager-outpost", - "rarity": 800 + "rarity": 1500 }, { "structure": "igloo", diff --git a/biomes/frozen/redwood-forest-extended.json b/biomes/frozen/redwood-forest-extended.json index 603c6925..32000c17 100644 --- a/biomes/frozen/redwood-forest-extended.json +++ b/biomes/frozen/redwood-forest-extended.json @@ -103,7 +103,7 @@ }, { "chance": 0.4, - "density": 2, + "density": 1, "edit": [ { "find": [{"block": "minecraft:birch_leaves"}], diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json index cbd3f5d9..71210862 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -104,7 +104,7 @@ }, { "chance": 0.4, - "density": 2, + "density": 1, "edit": [ { "find": [{"block": "minecraft:birch_leaves"}], diff --git a/biomes/hot/Small_Valley.json b/biomes/hot/small-valley.json similarity index 100% rename from biomes/hot/Small_Valley.json rename to biomes/hot/small-valley.json diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 023aa4e5..200a58ed 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -17,6 +17,10 @@ { "structure": "village-plains", "rarity": 1200 + }, + { + "structure": "ruins/ruin3", + "rarity": 1200 } ], "biomeStyle": {"style": "SIMPLEX"}, diff --git a/biomes/temperate/roughplains.json b/biomes/temperate/roughplains.json index 7c828179..1c1d00b6 100644 --- a/biomes/temperate/roughplains.json +++ b/biomes/temperate/roughplains.json @@ -75,7 +75,36 @@ } }] - }], + }, + { + "place": [ + "trees/mixed/tredwood1", + "trees/mixed/tredwood2", + "trees/mixed/tredwood3", + "trees/mixed/tredwood4", + "trees/mixed/tredwood5", + "trees/mixed/tredwood6", + "trees/mixed/tredwood7", + "trees/mixed/tredwood8", + "trees/mixed/tredwood9", + "trees/mixed/tredwood10" + ], + "slopeCondition":{ + "maximumSlope": 2 + }, + "carvingSupport": "SURFACE_ONLY", + "chance": 0.0025, + "mode": "MIN_HEIGHT", + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }}], + "decorators": [ { "chance": 0.2, diff --git a/biomes/temperate/tinybirch.json b/biomes/temperate/tinybirch.json index 095c4614..1367aa2c 100644 --- a/biomes/temperate/tinybirch.json +++ b/biomes/temperate/tinybirch.json @@ -29,6 +29,10 @@ ], "carvingSupport": "SURFACE_ONLY", + "translate":{ + "y": 1 + + }, "chance": 1, "mode": "CENTER_STILT", diff --git a/caves/Deepdark/Big_DeepdarkCave.json b/caves/Deepdark/big-deepdarkcave.json similarity index 89% rename from caves/Deepdark/Big_DeepdarkCave.json rename to caves/Deepdark/big-deepdarkcave.json index a071e9af..6521920c 100644 --- a/caves/Deepdark/Big_DeepdarkCave.json +++ b/caves/Deepdark/big-deepdarkcave.json @@ -4,11 +4,11 @@ "max": 400, "min": 15 }, - "customBiome": "carving/Deepdark/StandardDeepdark", + "customBiome": "carving/deepdark/standard-deepdark", "fork": { "caves": [{ "breakSurface": false, - "cave": "Deepdark/Small_DeepdarkCave", + "cave": "deepdark/small-deepdarkcave", "rarity": 10 }] }, diff --git a/caves/Deepdark/Small_DeepdarkCave.json b/caves/deepdark/small-deepdarkcave.json similarity index 95% rename from caves/Deepdark/Small_DeepdarkCave.json rename to caves/deepdark/small-deepdarkcave.json index 1d638fe0..deea1b4b 100644 --- a/caves/Deepdark/Small_DeepdarkCave.json +++ b/caves/deepdark/small-deepdarkcave.json @@ -4,7 +4,7 @@ "max": 400, "min": 15 }, - "customBiome": "carving/Deepdark/StandardDeepdark", + "customBiome": "carving/deepdark/standard-deepdark", "fork": { "caves": [{ "breakSurface": false, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 1149a052..5b1ef3be 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,7 +1,8 @@ { - "version": 3000, + "version": 30010, "name": "Overworld", "environment": "NORMAL", + "dimensionAngleDeg": 12, "fluidHeight": 75, "continentZoom": 1, "continentalStyle": { @@ -41,7 +42,7 @@ } } }, - "regionZoom": 18.15, + "regionZoom": 28.15, "regions": [ "frozen", "hot", @@ -84,7 +85,7 @@ }, { "breakSurface": false, - "cave": "Deepdark/Big_DeepdarkCave", + "cave": "deepdark/big_deepdarkcave", "rarity": 187, "caveStartHeight": { "max": 60, diff --git a/jigsaw-pieces/ruins/ruin3.json b/jigsaw-pieces/ruins/ruin3.json new file mode 100644 index 00000000..6c027f68 --- /dev/null +++ b/jigsaw-pieces/ruins/ruin3.json @@ -0,0 +1,30 @@ +{ + "object": "jigsaw/ruins/ruin3", + "placementOptions":{ + "carvingSupport": "SURFACE_ONLY", + "smartBore": true, + "mode": "PAINT", + "rotation": { + "enabled": true, + "xAxis": { + "enabled": false, + "min": 0, + "max": 0, + "interval": 0 + }, + "yAxis": { + "enabled": true, + "min": 0, + "max": 0, + "interval": 90 + }, + "zAxis": { + "enabled": false, + "min": 0, + "max": 0, + "interval": 0 + } + } + } + + } diff --git a/jigsaw-structures/ruins/ruin3.json b/jigsaw-structures/ruins/ruin3.json new file mode 100644 index 00000000..7be41898 --- /dev/null +++ b/jigsaw-structures/ruins/ruin3.json @@ -0,0 +1,4 @@ +{ + "maxDepth": 1, + "pieces": ["ruins/ruin3"] +} diff --git a/markers/guardian.json b/markers/guardian.json index ea3082d6..ee023307 100644 --- a/markers/guardian.json +++ b/markers/guardian.json @@ -1,4 +1,4 @@ { "removeOnChange": true, - "spawners": ["structure/Guardianv2"] + "spawners": ["structure/guardianv2"] } diff --git a/objects/jigsaw/ruins/ruin3.iob b/objects/jigsaw/ruins/ruin3.iob new file mode 100644 index 00000000..c8130c9b Binary files /dev/null and b/objects/jigsaw/ruins/ruin3.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index da8f9dab..c4a2ea7b 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -13,7 +13,7 @@ "frozen/vander" ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "jigsawStructures": [{ "structure": "ruined-portal", @@ -77,6 +77,7 @@ } ], "shoreBiomes": ["frozen/shore/beach"], + "seaBiomeZoom": 1, "seaBiomes": [ "frozen/sea/ocean", "frozen/sea/frozen-river-ice" diff --git a/regions/hot.json b/regions/hot.json index 11c3aa41..d77427f6 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -2,7 +2,7 @@ "name": "Hot", "color": "#D1CD44", "rarity": 4, - "seaBiomeZoom": 1.5, + "seaBiomeZoom": 3.5, "landBiomes": [ "hot/desert-dunes", "hot/small-valley", @@ -19,7 +19,7 @@ "mesa/mesa" ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "jigsawStructures": [ { diff --git a/regions/mushroom.json b/regions/mushroom.json index c63c8a04..94aaca16 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -10,7 +10,7 @@ "mushroom/warped-forest" ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "objects": [{ "heightmap": { diff --git a/regions/swamp.json b/regions/swamp.json index fd5d8505..1471cc92 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -55,7 +55,7 @@ } }], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "shoreBiomes": ["swamp/shore/beach"], "seaBiomes": [ diff --git a/regions/temperate.json b/regions/temperate.json index bb2d4009..4ecd9450 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -29,7 +29,7 @@ ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "jigsawStructures": [{ "structure": "ruined-portal", @@ -94,7 +94,7 @@ "temperate/shore/beach", "temperate/shore/oak-beach" ], - "seaBiomeZoom": 3, + "seaBiomeZoom": 6, "seaBiomes": [ "ocean/deep" ], diff --git a/regions/tropical.json b/regions/tropical.json index 7d0e2786..868977c0 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -16,7 +16,7 @@ "tropical/plains-hills" ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "jigsawStructures": [{ @@ -82,7 +82,7 @@ "tropical/beach", "tropical/beach-bamboo" ], - "seaBiomeZoom": 2, + "seaBiomeZoom": 4, "seaBiomes": [ "tropical/submerged-volcanic", "tropical/sea/ocean" diff --git a/regions/tundra.json b/regions/tundra.json index 1199290b..0a1f7096 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -24,7 +24,7 @@ "tundra/tinyspruce" ], "caveBiomes": [ - "carving/CaveBiomes/Rocky" + "carving/rocky-cavebiome" ], "jigsawStructures": [{ "structure": "ruined-portal", @@ -87,7 +87,7 @@ "tundra/shore/beach", "tundra/shore/beach-stone" ], - "seaBiomeZoom": 2, + "seaBiomeZoom": 4, "seaBiomes": ["mountain/sea/river"], "entitySpawners": [ "tundra/passive", diff --git a/spawners/structure/Guardianv2.json b/spawners/structure/guardianv2.jsog similarity index 100% rename from spawners/structure/Guardianv2.json rename to spawners/structure/guardianv2.jsog