diff --git a/biomes/cursed/beach/cursed-beach.json b/biomes/cursed/beach/cursed-beach.json index 4fc24088..2cde1abd 100644 --- a/biomes/cursed/beach/cursed-beach.json +++ b/biomes/cursed/beach/cursed-beach.json @@ -52,17 +52,16 @@ "objects": [{ "place": [ - "trees/darkoak/medgeneric1", - "trees/darkoak/medgeneric2", - "trees/darkoak/medgeneric3", - "trees/darkoak/medgeneric4", - "trees/darkoak/medgeneric5", - "trees/darkoak/medgeneric6", - "trees/darkoak/medgeneric7", - "trees/darkoak/medgeneric8", - "trees/darkoak/medgeneric9" - - + "trees/mixed/dotree1", + "trees/mixed/dotree2", + "trees/mixed/dotree3", + "trees/mixed/dotree4", + "trees/mixed/dotree5", + "trees/mixed/dotree6", + "trees/mixed/dotree7", + "trees/mixed/dotree8", + "trees/mixed/dotree9", + "trees/mixed/dotree10" ], "edit": [ @@ -78,7 +77,8 @@ ], "carvingSupport": "SURFACE_ONLY", - "chance": 0.25, + "chance": 0.85, + "density": 1, "mode": "MIN_HEIGHT", "rotation": { "yAxis": { diff --git a/biomes/cursed/cursed-forest-tall.json b/biomes/cursed/cursed-forest-tall.json new file mode 100644 index 00000000..de844a93 --- /dev/null +++ b/biomes/cursed/cursed-forest-tall.json @@ -0,0 +1,143 @@ +{ + "name": "Cursed tall forest", + "derivative": "DEEP_DARK", + "vanillaDerivative": "DEEP_DARK", + "color": "#404040", + "entitySpawners": [ + "corrupted/cursed-forest" + ], + "jigsawStructures": [ + { + "structure": "woodland-mansion", + "rarity": 1200 + } + ], + "customDerivitives": [ + { + "category": "plains", + "id": "cursedforest", + "ambientParticle":{ + "particle": "ASH", + "rarity": 3 + }, + "skyColor": "#111111", + "fogColor": "#111111", + "waterColor": "#660000", + "waterFogColor": "#660000", + "downfallType": "rain", + "grassColor": "#222222", + "foliageColor": "#444444" + } + ], + + "effects": [ + { + "sound": "MUSIC_NETHER_SOUL_SAND_VALLEY", + "soundDistance": 12, + "volume": 3.6, + "chance": 1, + "interval": 140000 + + }, + { + "sound": "ENTITY_GHAST_SCREAM", + "soundDistance": 12, + "volume": 6.6, + "chance": 1, + "interval": 140000 + + } + ], + + "generators": [{ + "generator": "mountain", + "max": 37, + "min": 20 + }], + + "layers": [ + { + "palette": [{"block": "minecraft:grass_block"}], + "maxHeight": 1, + "slopeCondition": {"maximumSlope": 4} + }, + { + "palette": [{"block": "minecraft:deepslate"}], + "maxHeight": 12 + }], + "wall": {"palette": [ + {"block": "minecraft:deepslate"} + ]}, + + "objects": [{ + "place": [ + "trees/mixed/AmyLarge1", + "trees/mixed/AmyLarge2", + "trees/mixed/AmyLarge3", + "trees/mixed/AmyLarge4", + "trees/mixed/AmyLarge5", + "trees/mixed/AmyLarge6", + "trees/mixed/AmyLarge7", + "trees/mixed/AmyLarge8" + ], + + "carvingSupport": "SURFACE_ONLY", + "density": 1, + "chance": 0.25, + "mode": "FAST_STILT", + "rotation": { + "yAxis": { + "min": 0, + "max": 270, + "interval": 90, + "enabled": true + }, + "enabled": true + } + + }, + { + "place": [ + "clutter/arbusto1", + "clutter/arbusto2", + "clutter/arbusto3", + "clutter/arbusto4", + "clutter/arbusto5" + ], + + "carvingSupport": "SURFACE_ONLY", + "chance": 0.15, + "mode": "FAST_STILT", + "rotation": { + "yAxis": { + "min": 0, + "max": 270, + "interval": 90, + "enabled": true + }, + "enabled": true + } + + } + + + ], + "decorators": [ + { + "chance": 0.01, + "palette": [{"block": "minecraft:tall_grass"}] + }, + { + "chance": 0.5, + "palette": [{"block": "minecraft:grass"}] + }, + { + "chance": 0.025, + "palette": [{"block": "minecraft:cobweb"}] + }, + { + "chance": 0.015, + "palette": [{"block": "minecraft:wither_rose"}] + } + ] + } diff --git a/biomes/cursed/cursed-forest.json b/biomes/cursed/cursed-forest.json index acd89cdd..c0c561f4 100644 --- a/biomes/cursed/cursed-forest.json +++ b/biomes/cursed/cursed-forest.json @@ -100,6 +100,7 @@ "carvingSupport": "SURFACE_ONLY", "chance": 0.25, + "density": 1, "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { diff --git a/biomes/cursed/cursed-mountains.json b/biomes/cursed/cursed-mountains.json index 8a14a69d..f0b444d2 100644 --- a/biomes/cursed/cursed-mountains.json +++ b/biomes/cursed/cursed-mountains.json @@ -7,7 +7,8 @@ "corrupted/cursed-forest" ], "children": [ - "cursed/cursed-forest" + "cursed/cursed-forest", + "cursed/cursed-forest-tall" ], "childShrinkFactor": 1, "childStyle":{ diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index c9dd01c6..4773f8f7 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -16,7 +16,7 @@ }, { "structure": "pyramid-desert", - "rarity": 1500 + "rarity": 1750 } ], diff --git a/biomes/mesa/mesa.json b/biomes/mesa/mesa.json index 4b94029e..2fba56a4 100644 --- a/biomes/mesa/mesa.json +++ b/biomes/mesa/mesa.json @@ -9,6 +9,12 @@ "ERODED_BADLANDS", "ERODED_BADLANDS" ], + "jigsawStructures": [ + { + "structure": "village-savanna", + "rarity": 1200 + } + ], "children": [ "mesa/valleys", "mesa/dark", diff --git a/biomes/mesa/plateau-dirt.json b/biomes/mesa/plateau-dirt.json index 06b73755..0e9fd356 100644 --- a/biomes/mesa/plateau-dirt.json +++ b/biomes/mesa/plateau-dirt.json @@ -10,6 +10,12 @@ "max": 98, "generator": "cracked-cliffs" }], + "jigsawStructures": [ + { + "structure": "village-savanna", + "rarity": 1200 + } + ], "biomeStyle": {"style": "SIMPLEX"}, "layers": [ { diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index 409a63ab..a06ddbf1 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -12,6 +12,12 @@ "waterColor": "#33CB99", "downfallType": "none" }], + "jigsawStructures": [ + { + "structure": "village-savanna", + "rarity": 1200 + } + ], "generators": [{ "min": 4, "max": 7, diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json index ed80dc72..24fd4222 100644 --- a/biomes/savanna/forest.json +++ b/biomes/savanna/forest.json @@ -8,6 +8,12 @@ "SAVANNA", "DESERT" ], + "jigsawStructures": [ + { + "structure": "village-savanna", + "rarity": 1200 + } + ], "customDerivitives": [{ "category": "savanna", "id": "savanna_forest", diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index 1ad13821..5247b316 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -7,6 +7,16 @@ "children": [ "temperate/birch-thin", "temperate/birch-forest-extended" + ], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } ], "generators": [ { diff --git a/biomes/temperate/calmplains.json b/biomes/temperate/calmplains.json index 2c99281f..d47dc195 100644 --- a/biomes/temperate/calmplains.json +++ b/biomes/temperate/calmplains.json @@ -13,6 +13,16 @@ {"block": "minecraft:stone"}, {"block": "minecraft:cobblestone"} ]}, + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "objects": [{ "place": [ "trees/mixed/pollup1", diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 73eda531..f244d6ff 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -7,6 +7,16 @@ "children": [ "temperate/oak-denmyre", "temperate/combo-forest-extended" + ], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } ], "generators": [{ "min": 5, diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 40681e6b..f771f904 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -11,6 +11,16 @@ "grassColor": "#48A620", "category": "forest" }], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "children": ["temperate/flower-forest-extended"], "generators": [{ "min": 4, diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index 354ab2bc..d79e66f9 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -12,6 +12,16 @@ "downfallType": "rain", "grassColor": "#83BB6D" }], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "generators": [{ "min": 5, "max": 12, diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index 2f1095ec..55715677 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -9,6 +9,16 @@ "max": 12, "generator": "plain" }], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/temperate/oak-forest-flat.json b/biomes/temperate/oak-forest-flat.json index 35aa87bc..9493e54d 100644 --- a/biomes/temperate/oak-forest-flat.json +++ b/biomes/temperate/oak-forest-flat.json @@ -10,6 +10,16 @@ "grassColor": "#77A620", "category": "forest" }], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "carving":{ "caves": [ { diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 4caa8347..fec2a8b6 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -10,6 +10,7 @@ "grassColor": "#77A620", "category": "forest" }], + "children": ["temperate/oak-forest-extended"], "generators": [ { diff --git a/biomes/temperate/osaka-red-forest.json b/biomes/temperate/osaka-red-forest.json index 4eb8da04..6886d427 100644 --- a/biomes/temperate/osaka-red-forest.json +++ b/biomes/temperate/osaka-red-forest.json @@ -22,6 +22,16 @@ "grassColor": "#64A522", "category": "forest" } + ], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } ], "generators": [{ "min": 4, diff --git a/biomes/temperate/osaka-violet-forest.json b/biomes/temperate/osaka-violet-forest.json index 25316f76..e0a21e10 100644 --- a/biomes/temperate/osaka-violet-forest.json +++ b/biomes/temperate/osaka-violet-forest.json @@ -20,6 +20,16 @@ "grassColor": "#64A522", "category": "forest" } + ], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } ], "generators": [{ "min": 4, diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 9f5dbf98..9b8f00f5 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -16,7 +16,7 @@ }, { "structure": "village-plains", - "rarity": 1200 + "rarity": 800 }, { "structure": "ruins/ruin3", @@ -28,6 +28,7 @@ {"block": "minecraft:stone"}, {"block": "minecraft:andesite"} ]}, + "layers": [ {"palette": [{"block": "minecraft:grass_block"}]}, { diff --git a/biomes/temperate/sakura-forest.json b/biomes/temperate/sakura-forest.json index 6c317176..e9b4399e 100644 --- a/biomes/temperate/sakura-forest.json +++ b/biomes/temperate/sakura-forest.json @@ -5,6 +5,16 @@ "derivative": "FLOWER_FOREST", "vanillaDerivative": "FOREST", "biomeScatter": ["BIRCH_FOREST"], + "jigsawStructures": [ + { + "structure": "pillager-outpost", + "rarity": 800 + }, + { + "structure": "village-plains", + "rarity": 1200 + } + ], "customDerivitives": [ { diff --git a/biomes/temperate/stranged-plains.json b/biomes/temperate/stranged-plains.json index b0cead8d..82569b05 100644 --- a/biomes/temperate/stranged-plains.json +++ b/biomes/temperate/stranged-plains.json @@ -18,7 +18,7 @@ }, { "structure": "village-plains", - "rarity": 1200 + "rarity": 800 } ], "generators": [{ diff --git a/biomes/temperate/tinybirch.json b/biomes/temperate/tinybirch.json deleted file mode 100644 index 6e6d9fd8..00000000 --- a/biomes/temperate/tinybirch.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "name": "Tiny Birch", - "derivative": "BIRCH_FOREST", - "vanillaDerivative": "BIRCH_FOREST", - - "layers": [{ - "palette": [{"block": "minecraft:grass_block"}], - "maxHeight": 1, - "slopeCondition": {"maximumSlope": 4} - }], - "wall": {"palette": [ - {"block": "minecraft:andesite"}, - {"block": "minecraft:stone"}, - {"block": "minecraft:cobblestone"} - ]}, - "objects": [{ - "place": [ - "trees/birch/arid1", - "trees/birch/arid2", - "trees/birch/arid4", - "trees/birch/arid5", - "trees/birch/arid6", - "trees/birch/arid7" - - ], - "carvingSupport": "SURFACE_ONLY", - "translate":{ - "y": 1 - }, - "chance": 1, - "mode": "CENTER_STILT", - "stiltSettings":{"yMax": 4}, - - "rotation": { - "yAxis": { - "min": 0, - "max": 270, - "interval": 90, - "enabled": true - }, - "enabled": true - } - - } - - - ], - "decorators": [ - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.25, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - }, - "style": { - "style": "SIMPLEX", - "zoom": 0.2, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - {"block": "minecraft:dandelion"}, - {"block": "minecraft:poppy"}, - {"block": "minecraft:blue_orchid"}, - {"block": "minecraft:allium"}, - {"block": "minecraft:azure_bluet"}, - {"block": "minecraft:red_tulip"}, - {"block": "minecraft:orange_tulip"}, - {"block": "minecraft:white_tulip"}, - {"block": "minecraft:pink_tulip"}, - {"block": "minecraft:oxeye_daisy"}, - {"block": "minecraft:cornflower"}, - {"block": "minecraft:lily_of_the_valley"} - ] - }, - { - "chance": 0.01, - "palette": [{"block": "minecraft:tall_grass"}] - }, - { - "chance": 0.5, - "palette": [{"block": "minecraft:grass"}] - }, - { - "stackMin": 1, - "stackMax": 7, - "chance": 0.015, - "forcePlace": false, - "variance": {"style": "STATIC"}, - "palette": [ - { - "data": { - "stage": 0, - "age": 0, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 0, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 0, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "large" - }, - "block": "minecraft:bamboo" - } - ], - "style": {"style": "STATIC"} - } - ], - "generators": [{ - "generator": "mountain", - "max": 10, - "min": -15 - }] -} \ No newline at end of file diff --git a/biomes/temperate/tinyplains.json b/biomes/temperate/tinyplains.json deleted file mode 100644 index 172fc367..00000000 --- a/biomes/temperate/tinyplains.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "name": "Tiny Plains", - "derivative": "PLAINS", - "vanillaDerivative": "PLAINS", - "layers": [{ - "palette": [{"block": "minecraft:grass_block"}], - "maxHeight": 1, - "slopeCondition": {"maximumSlope": 4} - }], - "wall": {"palette": [ - {"block": "minecraft:andesite"}, - {"block": "minecraft:stone"}, - {"block": "minecraft:cobblestone"} - ]}, - "objects": [{ - "place": [ - "trees/oak/arid1", - "trees/oak/arid2", - "trees/oak/arid4", - "trees/oak/arid5", - "trees/oak/arid6", - "trees/oak/arid7" - - ], - "carvingSupport": "SURFACE_ONLY", - "chance": 1, - "mode": "CENTER_STILT", - "translate":{ - "y": 1 - }, - "stiltSettings":{"yMax": 4}, - - "rotation": { - "yAxis": { - "min": 0, - "max": 270, - "interval": 90, - "enabled": true - }, - "enabled": true - } - - } - - - ], - "decorators": [ - { - "chance": 0.2, - "variance": { - "style": "CELLULAR", - "zoom": 0.25, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - }, - "style": { - "style": "SIMPLEX", - "zoom": 0.2, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - {"block": "minecraft:dandelion"}, - {"block": "minecraft:poppy"}, - {"block": "minecraft:blue_orchid"}, - {"block": "minecraft:allium"}, - {"block": "minecraft:azure_bluet"}, - {"block": "minecraft:red_tulip"}, - {"block": "minecraft:orange_tulip"}, - {"block": "minecraft:white_tulip"}, - {"block": "minecraft:pink_tulip"}, - {"block": "minecraft:oxeye_daisy"}, - {"block": "minecraft:cornflower"}, - {"block": "minecraft:lily_of_the_valley"} - ] - }, - { - "chance": 0.01, - "palette": [{"block": "minecraft:tall_grass"}] - }, - { - "chance": 0.5, - "palette": [{"block": "minecraft:grass"}] - }, - { - "stackMin": 1, - "stackMax": 7, - "chance": 0.015, - "forcePlace": false, - "variance": {"style": "STATIC"}, - "palette": [ - { - "data": { - "stage": 0, - "age": 0, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "none" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 0, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "small" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 0, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 0, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 0, - "age": 1, - "leaves": "large" - }, - "block": "minecraft:bamboo" - }, - { - "data": { - "stage": 1, - "age": 1, - "leaves": "large" - }, - "block": "minecraft:bamboo" - } - ], - "style": {"style": "STATIC"} - } - ], - "generators": [{ - "generator": "mountain", - "max": 10, - "min": -15 - }] -} \ No newline at end of file diff --git a/biomes/tundra/tinyspruce.json b/biomes/tundra/tinyspruce.json deleted file mode 100644 index b3f32bc6..00000000 --- a/biomes/tundra/tinyspruce.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "Tiny Spruce", - - "derivative": "FOREST", - "vanillaDerivative": "FOREST", - "customDerivitives": [{ - "category": "forest", - "id": "tundra_iny_spruce", - "grassColor": "#7BA13C", - "waterColor": "#80B4C6", - "waterFogColor": "#80B4C6", - "fogColor": "#8091C6" - }], - "layers": [{ - "palette": [ {"block": "minecraft:grass_block"}], - "maxHeight": 1, - "slopeCondition": {"maximumSlope": 4} - }], - "wall": {"palette": [ - {"block": "minecraft:andesite"}, - {"block": "minecraft:stone"}, - {"block": "minecraft:cobblestone"} - ]}, - "objects": [ - { - "place": [ - "trees/spruce/aridgeneric1", - "trees/spruce/aridgeneric2", - "trees/spruce/aridgeneric3", - "trees/spruce/aridgeneric4", - "trees/spruce/aridgeneric5", - "trees/spruce/aridpine1", - "trees/spruce/aridpine2", - "trees/spruce/aridpine3", - "trees/spruce/aridpine4", - "trees/spruce/aridpine5" - - - ], - "carvingSupport": "SURFACE_ONLY", - "chance": 1, - "mode": "CENTER_STILT", - "stiltSettings":{"yMax": 4, "yRand": 1}, - "rotation": { - "yAxis": { - "min": 0, - "max": 270, - "interval": 90, - "enabled": true - }, - "enabled": true - } - } - - - ], - "decorators": [ - { - "chance": 0.05, - "variance": { - "style": "CELLULAR", - "zoom": 0.25, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - }, - "style": { - "style": "SIMPLEX", - "zoom": 0.2, - "fracture": { - "style": "STATIC", - "multiplier": 8 - } - }, - "palette": [ - {"block": "minecraft:dandelion"}, - {"block": "minecraft:poppy"}, - {"block": "minecraft:blue_orchid"}, - {"block": "minecraft:azure_bluet"}, - {"block": "minecraft:red_tulip"}, - {"block": "minecraft:orange_tulip"}, - {"block": "minecraft:white_tulip"}, - {"block": "minecraft:oxeye_daisy"}, - {"block": "minecraft:cornflower"}, - {"block": "minecraft:lily_of_the_valley"} - ] - }, - { - "chance": 0.1, - "palette": [{"block": "minecraft:fern"}] - }, - { - "chance": 0.02, - "palette": [{"block": "minecraft:large_fern"}] - } - ], - "generators": [{ - "generator": "mountain", - "max": 10, - "min": -15 - }] -} \ No newline at end of file diff --git a/dimensions/overworld.json b/dimensions/overworld.json index d5ff00f2..f65dbbe5 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -61,7 +61,8 @@ "temperate", "tropical", "swamp", - "tundra" + "tundra", + "prototype/cursed" ], "seaBiomeStyle": { @@ -240,7 +241,7 @@ { "minHeight": 1, "maxPerChunk": 128, - "maxHeight": 33, + "maxHeight": 64, "minPerChunk": 128, "minSize": 8, "maxSize": 4, diff --git a/entities/standard/passive/camel.json b/entities/standard/passive/camel.json new file mode 100644 index 00000000..edd88b77 --- /dev/null +++ b/entities/standard/passive/camel.json @@ -0,0 +1 @@ +{"type": "CAMEL"} \ No newline at end of file diff --git a/jigsaw-pieces/trail-ruins/trail-ruins1.json b/jigsaw-pieces/trail-ruins/trail-ruins1.json new file mode 100644 index 00000000..c57389c2 --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins1.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin1", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins2.json b/jigsaw-pieces/trail-ruins/trail-ruins2.json new file mode 100644 index 00000000..e7173b3a --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins2.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin2", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins3.json b/jigsaw-pieces/trail-ruins/trail-ruins3.json new file mode 100644 index 00000000..e125bd29 --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins3.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin3", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins4.json b/jigsaw-pieces/trail-ruins/trail-ruins4.json new file mode 100644 index 00000000..982b0c73 --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins4.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin4", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins5.json b/jigsaw-pieces/trail-ruins/trail-ruins5.json new file mode 100644 index 00000000..e9b6d4ae --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins5.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin5", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins6.json b/jigsaw-pieces/trail-ruins/trail-ruins6.json new file mode 100644 index 00000000..7cde6508 --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins6.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin6", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/trail-ruins/trail-ruins7.json b/jigsaw-pieces/trail-ruins/trail-ruins7.json new file mode 100644 index 00000000..a4a4a273 --- /dev/null +++ b/jigsaw-pieces/trail-ruins/trail-ruins7.json @@ -0,0 +1,20 @@ +{ + "object": "jigsaw/trail-ruins/trail-ruin7", + "placementOptions": { + "translate":{ + "y": -16 + }, + "mode": "PAINT", + "carvingSupport": "SURFACE_ONLY", + "onwater": false, + "rotation":{ + "yAxis":{ + "max": 270, + "min": 0, + "enabled": true + }, + "enabled": true + } + + } +} diff --git a/jigsaw-pieces/woodland-mansion/woodland-mansion.json b/jigsaw-pieces/woodland-mansion/woodland-mansion.json index ba69ddf3..8fd67da3 100644 --- a/jigsaw-pieces/woodland-mansion/woodland-mansion.json +++ b/jigsaw-pieces/woodland-mansion/woodland-mansion.json @@ -25,6 +25,11 @@ "interval": 0 } }, + "clamp":{ + "maximumHeight": 110, + "minimumHeight": 64 + + }, "mode": "MIN_HEIGHT", "edit": [{ "find": [{"block": "minecraft:glass"}], diff --git a/jigsaw-structures/trail-ruins.json b/jigsaw-structures/trail-ruins.json new file mode 100644 index 00000000..1d94325a --- /dev/null +++ b/jigsaw-structures/trail-ruins.json @@ -0,0 +1,10 @@ +{ + "pieces": [ + "trail-ruins/trail-ruins1", + "trail-ruins/trail-ruins2", + "trail-ruins/trail-ruins3", + "trail-ruins/trail-ruins4", + "trail-ruins/trail-ruins5", + "trail-ruins/trail-ruins6" + ] +} diff --git a/objects/jigsaw/trail-ruins/trail-ruin1.iob b/objects/jigsaw/trail-ruins/trail-ruin1.iob new file mode 100644 index 00000000..290e5922 Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin1.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin2.iob b/objects/jigsaw/trail-ruins/trail-ruin2.iob new file mode 100644 index 00000000..0a02dfd2 Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin2.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin3.iob b/objects/jigsaw/trail-ruins/trail-ruin3.iob new file mode 100644 index 00000000..6bf57ef2 Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin3.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin4.iob b/objects/jigsaw/trail-ruins/trail-ruin4.iob new file mode 100644 index 00000000..5c635842 Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin4.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin5.iob b/objects/jigsaw/trail-ruins/trail-ruin5.iob new file mode 100644 index 00000000..6fcf53da Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin5.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin6.iob b/objects/jigsaw/trail-ruins/trail-ruin6.iob new file mode 100644 index 00000000..56b6c3cc Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin6.iob differ diff --git a/objects/jigsaw/trail-ruins/trail-ruin7.iob b/objects/jigsaw/trail-ruins/trail-ruin7.iob new file mode 100644 index 00000000..5ce22c24 Binary files /dev/null and b/objects/jigsaw/trail-ruins/trail-ruin7.iob differ diff --git a/regions/hot.json b/regions/hot.json index 8fd1c520..79af0f54 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -22,6 +22,10 @@ "carving/rocky-cavebiome" ], "jigsawStructures": [ + { + "structure": "trail-ruins", + "rarity": 1000 + }, { "structure": "ruined-portal", "rarity": 1200 diff --git a/regions/temperate.json b/regions/temperate.json index 4e8dd831..31ee666d 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -20,14 +20,11 @@ "temperate/osaka-red-forest", "mountain/Cute_Cliffs", "mountain/Cute_Cliffs", - "temperate/tinyplains", - "temperate/tinyplains", "temperate/cherry-blossom-forest", "temperate/roughplains", "temperate/calmplains", "temperate/fancyplains", "temperate/shattered-plains", - "temperate/tinybirch", "temperate/sakura-forest", "temperate/oak-forest-flat", "temperate/croak" diff --git a/regions/tundra.json b/regions/tundra.json index 0a1f7096..b35e6049 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -19,9 +19,7 @@ "tundra/autumn", "mountain/mountain", "tundra/ether", - "tundra/magic-forest", - "tundra/tinyspruce", - "tundra/tinyspruce" + "tundra/magic-forest" ], "caveBiomes": [ "carving/rocky-cavebiome" diff --git a/spawners/hot/passive.json b/spawners/hot/passive.json index 0b7e5c57..8efabf4c 100644 --- a/spawners/hot/passive.json +++ b/spawners/hot/passive.json @@ -12,6 +12,12 @@ "energyMultiplier": 0.85, "weather": "NONE", "spawns": [ + { + "entity": "standard/passive/camel", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 8 + }, { "entity": "standard/passive/chicken", "maxSpawns": 4,