diff --git a/biomes/carving/calcite.json b/biomes/carving/calcite.json index 57f27a29..26343ec1 100644 --- a/biomes/carving/calcite.json +++ b/biomes/carving/calcite.json @@ -18,7 +18,7 @@ ] }], "decorators": [{ - "chance": 0.05, + "chance": 0.001, "style": {"style": "STATIC"}, "topPalette": [{"block": "minecraft:andesite"}], "stackMax": 5, diff --git a/biomes/carving/deep.json b/biomes/carving/deep.json new file mode 100644 index 00000000..c67dabfa --- /dev/null +++ b/biomes/carving/deep.json @@ -0,0 +1,31 @@ +{ + "name": "Deepened cave", + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + {"block": "minecraft:stone"} + ] + }, + "layers": [{ + "style": {"style": "STATIC"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"} + ] + }], + "caveCeilingLayers": [{ + "style": {"style": "STATIC"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"} + ] + }] +} diff --git a/biomes/carving/deepravine.json b/biomes/carving/deepravine.json new file mode 100644 index 00000000..ab9a029e --- /dev/null +++ b/biomes/carving/deepravine.json @@ -0,0 +1,64 @@ +{ + "name": "Deepened Ravine", + "wall": { + "style": {"style": "IRIS"}, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + {"block": "minecraft:stone"} + ] + }, + "layers": [{ + "style": {"style": "STATIC"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + { + "block": "minecraft:andesite", + "weight": 3 + } + ] + }], + "caveCeilingLayers": [{ + "maxHeight": 1, + "minHeight": 1, + "style": {"style": "STATIC"}, + "palette": [ + { + "block": "minecraft:shroomlight", + "weight": 1 + }, + { + "block": "minecraft:stone", + "weight": 20 + } + ] + }], + "childStyle": { + "style": "STATIC", + "zoom": 2 + }, + "decorators": [ + { + "partOf": "CEILING", + "chance": 0.03, + "palette": [{"block": "minecraft:hanging_roots"}] + }, + { + "partOf": "CEILING", + "chance": 0.05, + "scaleStack": true, + "stackMin": 20, + "stackMax": 70, + "absoluteMaxStack": 10, + "heightVariance": {"style": "STATIC"}, + "palette": [{"block": "minecraft:stone"}] + } + ] +} diff --git a/biomes/carving/drip-lite.json b/biomes/carving/drip-lite.json index e667a389..3e98fb4e 100644 --- a/biomes/carving/drip-lite.json +++ b/biomes/carving/drip-lite.json @@ -7,9 +7,19 @@ "palette": [{"block": "minecraft:dripstone_block"}] }], "caveCeilingLayers": [{ + "style": {"style": "IRIS"}, "maxHeight": 2, "minHeight": 2, - "palette": [{"block": "minecraft:dripstone_block"}] + "palette": [ + { + "block": "minecraft:dripstone_block", + "weight": 15 + }, + { + "block": "minecraft:shroomlight", + "weight": 1 + } + ] }], "decorators": [ { @@ -25,7 +35,7 @@ }, { "partOf": "CEILING", - "chance": 0.08, + "chance": 0.03, "absoluteMaxStack": 4, "scaleStack": true, "stackMin": 5, diff --git a/biomes/carving/drip.json b/biomes/carving/drip.json index 385a0a1b..f4d8a45d 100644 --- a/biomes/carving/drip.json +++ b/biomes/carving/drip.json @@ -26,8 +26,18 @@ }], "caveCeilingLayers": [{ "maxHeight": 2, + "style": {"style": "STATIC"}, "minHeight": 2, - "palette": [{"block": "minecraft:dripstone_block"}] + "palette": [ + { + "block": "minecraft:dripstone_block", + "weight": 20 + }, + { + "block": "minecraft:shroomlight", + "weight": 1 + } + ] }], "decorators": [ { diff --git a/biomes/carving/jungle.json b/biomes/carving/jungle.json index 3974b62d..6e25ccfe 100644 --- a/biomes/carving/jungle.json +++ b/biomes/carving/jungle.json @@ -24,7 +24,7 @@ }], "decorators": [ { - "chance": 0.05, + "chance": 5.0E-4, "scaleStack": true, "stackMin": 1, "stackMax": 5, @@ -33,7 +33,7 @@ "palette": [{"block": "minecraft:big_dripleaf"}] }, { - "chance": 0.05, + "chance": 0.001, "partOf": "CEILING", "scaleStack": true, "stackMin": 5, @@ -43,15 +43,24 @@ "palette": [{"block": "minecraft:cave_vines"}] }, { - "chance": 0.8, + "chance": 0.4, "style": {"style": "STATIC"}, "palette": [ - {"block": "minecraft:jungle_sapling"}, - {"block": "minecraft:tall_grass"}, - {"block": "minecraft:fern"}, + { + "block": "minecraft:jungle_sapling", + "weight": 10 + }, + { + "block": "minecraft:tall_grass", + "weight": 10 + }, + { + "block": "minecraft:fern", + "weight": 10 + }, { "block": "minecraft:grass", - "weight": 10 + "weight": 100 }, {"block": "minecraft:azalea"}, {"block": "minecraft:flowering_azalea"}, diff --git a/biomes/carving/mountain-caves.json b/biomes/carving/mountain-caves.json new file mode 100644 index 00000000..bab6d316 --- /dev/null +++ b/biomes/carving/mountain-caves.json @@ -0,0 +1,44 @@ +{ + "name": "M cave", + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + {"block": "minecraft:cobblestone"}, + {"block": "minecraft:stone"} + ] + }, + "layers": [{ + "style": {"style": "STATIC"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + { + "block": "minecraft:andesite", + "weight": 3 + } + ] + }], + "caveCeilingLayers": [{ + "style": {"style": "STATIC"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + { + "block": "minecraft:stone", + "weight": 3 + }, + { + "block": "minecraft:andesite", + "weight": 3 + } + ] + }] +} diff --git a/biomes/carving/red-sandstone.json b/biomes/carving/red-sandstone.json index 9e3f300e..65898482 100644 --- a/biomes/carving/red-sandstone.json +++ b/biomes/carving/red-sandstone.json @@ -1,38 +1,20 @@ { "name": "Red Sandstone Cavern", - "wall": {"palette": [ - {"block": "minecraft:red_sandstone"} - ]}, + "wall": {"palette": [{"block": "minecraft:red_sandstone"}]}, "layers": [{ "maxHeight": 2, "minHeight": 2, - "palette": [ - { - "block": "minecraft:smooth_red_sandstone", - "weight": 8 - } - ] + "palette": [{ + "block": "minecraft:smooth_red_sandstone", + "weight": 8 + }] }], "caveCeilingLayers": [{ "maxHeight": 2, "minHeight": 2, - "palette": [ - { - "block": "minecraft:smooth_red_sandstone", - "weight": 8 - } - ] - }], - "decorators": [ - { - "chance": 0.03, - "stackMin": 1, - "stackMax": 3, - "palette": [{"block": "minecraft:cactus"}] - }, - { - "chance": 0.01, - "palette": [{"block": "minecraft:dead_bush"}] - } - ] + "palette": [{ + "block": "minecraft:smooth_red_sandstone", + "weight": 8 + }] + }] } diff --git a/biomes/carving/rocky.json b/biomes/carving/rocky.json index 4a497054..b6fd3296 100644 --- a/biomes/carving/rocky.json +++ b/biomes/carving/rocky.json @@ -49,7 +49,7 @@ "scaleStack": true, "stackMin": 10, "stackMax": 90, - "absoluteMaxStack": 15, + "absoluteMaxStack": 5, "palette": [ {"block": "minecraft:stone"}, {"block": "minecraft:andesite"} diff --git a/biomes/carving/sandstone.json b/biomes/carving/sandstone.json index f93f9b61..9e611467 100644 --- a/biomes/carving/sandstone.json +++ b/biomes/carving/sandstone.json @@ -2,40 +2,22 @@ "name": "Red Sandstone Cavern", "wall": { "style": {"style": "VASCULAR"}, - "palette": [ - {"block": "minecraft:sandstone"} - ] + "palette": [{"block": "minecraft:sandstone"}] }, "layers": [{ "maxHeight": 2, "minHeight": 2, - "palette": [ - { - "block": "minecraft:smooth_sandstone", - "weight": 8 - } - ] + "palette": [{ + "block": "minecraft:smooth_sandstone", + "weight": 8 + }] }], "caveCeilingLayers": [{ "maxHeight": 2, "minHeight": 2, - "palette": [ - { - "block": "minecraft:smooth_sandstone", - "weight": 8 - } - ] - }], - "decorators": [ - { - "chance": 0.03, - "stackMin": 1, - "stackMax": 3, - "palette": [{"block": "minecraft:cactus"}] - }, - { - "chance": 0.02, - "palette": [{"block": "minecraft:dead_bush"}] - } - ] + "palette": [{ + "block": "minecraft:smooth_sandstone", + "weight": 8 + }] + }] } diff --git a/biomes/carving/swamp.json b/biomes/carving/swamp.json index 022c5ec4..14fef0ff 100644 --- a/biomes/carving/swamp.json +++ b/biomes/carving/swamp.json @@ -27,7 +27,7 @@ }], "decorators": [ { - "chance": 0.3, + "chance": 0.15, "style": {"style": "STATIC"}, "palette": [ {"block": "minecraft:grass"}, @@ -35,12 +35,11 @@ ] }, { - "chance": 0.08, + "chance": 0.04, "style": {"style": "STATIC"}, "palette": [ {"block": "minecraft:brown_mushroom"}, - {"block": "minecraft:red_mushroom"}, - {"block": "minecraft:crimson_fungus"} + {"block": "minecraft:red_mushroom"} ] } ] diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index bfd45ce0..2d373224 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -78,7 +78,7 @@ }, { "chance": 0.0014, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 4c27ced1..7c7740b9 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -55,7 +55,7 @@ }, { "chance": 0.0018, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/mesa/blue.json b/biomes/mesa/blue.json index 8bb75acb..4998ef63 100644 --- a/biomes/mesa/blue.json +++ b/biomes/mesa/blue.json @@ -117,7 +117,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "lockLayers": true, diff --git a/biomes/mesa/dark.json b/biomes/mesa/dark.json index e0894234..2dd0711d 100644 --- a/biomes/mesa/dark.json +++ b/biomes/mesa/dark.json @@ -135,7 +135,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "childShrinkFactor": 0.35, diff --git a/biomes/mesa/green.json b/biomes/mesa/green.json index 585fb995..0a6813ac 100644 --- a/biomes/mesa/green.json +++ b/biomes/mesa/green.json @@ -117,7 +117,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "lockLayers": true, diff --git a/biomes/mesa/red.json b/biomes/mesa/red.json index ac2f6c29..91db5d17 100644 --- a/biomes/mesa/red.json +++ b/biomes/mesa/red.json @@ -123,7 +123,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "lockLayers": true, diff --git a/biomes/mountain/hills.json b/biomes/mountain/hills.json index 7ea202b8..6f556c2c 100644 --- a/biomes/mountain/hills.json +++ b/biomes/mountain/hills.json @@ -143,7 +143,7 @@ }, { "chance": 1.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/mountain/plains.json b/biomes/mountain/plains.json index 3705ab0b..210ec4fe 100644 --- a/biomes/mountain/plains.json +++ b/biomes/mountain/plains.json @@ -166,7 +166,7 @@ }, { "chance": 3.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/mushroom/crimson-forest.json b/biomes/mushroom/crimson-forest.json index 08576e5c..80d3eef4 100644 --- a/biomes/mushroom/crimson-forest.json +++ b/biomes/mushroom/crimson-forest.json @@ -118,7 +118,7 @@ "trees/mushroom/mushclut9", "trees/mushroom/mushclut10" ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "translate": { "x": 0, "y": -1, diff --git a/biomes/mushroom/shore/beach.json b/biomes/mushroom/shore/beach.json index 7b079843..bf9615c5 100644 --- a/biomes/mushroom/shore/beach.json +++ b/biomes/mushroom/shore/beach.json @@ -74,7 +74,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "slab": { diff --git a/biomes/ocean/ocean.json b/biomes/ocean/ocean.json index 35d3ce3d..e53be1ee 100644 --- a/biomes/ocean/ocean.json +++ b/biomes/ocean/ocean.json @@ -148,7 +148,7 @@ "structures/oruins3" ], "chance": 0.008, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "underwater": true, "waterloggable": true } diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json index 108dca38..efe3d06c 100644 --- a/biomes/swamp/cambian-drift.json +++ b/biomes/swamp/cambian-drift.json @@ -240,7 +240,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.3, diff --git a/biomes/swamp/roofed-forest.json b/biomes/swamp/roofed-forest.json index 5fd99dc4..c6ef9bfe 100644 --- a/biomes/swamp/roofed-forest.json +++ b/biomes/swamp/roofed-forest.json @@ -298,7 +298,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.3, diff --git a/biomes/swamp/roofed-wayward.json b/biomes/swamp/roofed-wayward.json index 0eef688f..0c9379aa 100644 --- a/biomes/swamp/roofed-wayward.json +++ b/biomes/swamp/roofed-wayward.json @@ -274,7 +274,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.3, diff --git a/biomes/swamp/sea/ocean-tree.json b/biomes/swamp/sea/ocean-tree.json index e462758c..173629b8 100644 --- a/biomes/swamp/sea/ocean-tree.json +++ b/biomes/swamp/sea/ocean-tree.json @@ -142,7 +142,7 @@ } }, { - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "place": [ "trees/jungle/lgeneric1", "trees/jungle/lgeneric2", diff --git a/biomes/swamp/willow-forest.json b/biomes/swamp/willow-forest.json index 97154a55..48d5ed71 100644 --- a/biomes/swamp/willow-forest.json +++ b/biomes/swamp/willow-forest.json @@ -192,7 +192,7 @@ "trees/darkoak/willowgeneric1", "trees/darkoak/willowgeneric2" ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "translate": { "x": 24, "y": -3, @@ -300,7 +300,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 5.0E-5, diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 537ad6a2..4bf070e0 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -86,7 +86,7 @@ ], "objects": [ { - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "chance": 0.009, "rotation": { "yAxis": { @@ -144,7 +144,7 @@ }, { "chance": 1.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index a44ab1d5..87d40fa3 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -86,7 +86,7 @@ ], "objects": [ { - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "chance": 0.009, "rotation": { "yAxis": { @@ -144,7 +144,7 @@ }, { "chance": 1.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index cf2bbf4c..fe7fdb4d 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -106,7 +106,7 @@ ], "objects": [ { - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "chance": 0.009, "rotation": { "yAxis": { @@ -164,7 +164,7 @@ }, { "chance": 1.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index d147694c..58a69b12 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -100,7 +100,7 @@ ], "objects": [ { - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "chance": 0.009, "rotation": { "yAxis": { @@ -158,7 +158,7 @@ }, { "chance": 1.0E-4, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json index 574d7a23..4451d0e9 100644 --- a/biomes/temperate/plateau.json +++ b/biomes/temperate/plateau.json @@ -94,7 +94,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }, { diff --git a/biomes/temperate/reaching-forest.json b/biomes/temperate/reaching-forest.json new file mode 100644 index 00000000..37a9faf6 --- /dev/null +++ b/biomes/temperate/reaching-forest.json @@ -0,0 +1,190 @@ +{ + "name": "Tundra Magic Forest", + "derivative": "MOUNTAINS", + "color": "#164598", + "rarity": 7, + "vanillaDerivative": "TAIGA_MOUNTAINS", + "generators": [{ + "generator": "smooth-dunes", + "max": 14, + "min": 8 + }], + "customDerivitives": [{ + "grassColor": "#4E83CF", + "foliageColor": "#2F99DC", + "id": "tunmagforest", + "waterColor": "#5C3BEF", + "waterFogColor": "#7A768F", + "category": "forest", + "fogColor": "#686090" + }], + "jigsawStructures": [ + { + "rarity": 1700, + "structure": "pillager_outpost" + }, + { + "rarity": 1000, + "structure": "village-tundra" + } + ], + "layers": [ + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": {"minimumSlope": 6.9}, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"}, + {"block": "minecraft:gravel"} + ] + }, + { + "minHeight": 3, + "maxHeight": 5, + "slopeCondition": {"minimumSlope": 5.3}, + "palette": [ + {"block": "minecraft:dirt"}, + {"block": "minecraft:coarse_dirt"}, + {"block": "minecraft:gravel"} + ] + }, + {"palette": [{"block": "minecraft:grass_block"}]}, + { + "minHeight": 6, + "maxHeight": 18, + "style": {"style": "STATIC"}, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"}, + {"block": "minecraft:stone"} + ] + } + ], + "objects": [ + { + "place": [ + "clutter/gravelsplotch1", + "clutter/gravelsplotch2", + "clutter/gravelsplotch3", + "clutter/gravelsplotch4" + ], + "chance": 0.35, + "mode": "PAINT" + }, + { + "chance": 0.8, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "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" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.01, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "clutter/obelisk1", + "clutter/obelisk2", + "clutter/obelisk3", + "clutter/obelisk4", + "clutter/obelisk5", + "clutter/obelisk6", + "clutter/obelisk7" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } + ], + "biomeZoom": 30, + "biomeStyle": {"style": "SIMPLEX"}, + "decorators": [ + { + "chance": 0.01, + "variance": {"style": "STATIC"}, + "zoom": 0.1, + "palette": [ + {"block": "minecraft:white_tulip"}, + {"block": "minecraft:blue_orchid"}, + {"block": "minecraft:poppy"} + ], + "style": {"style": "STATIC"} + }, + { + "chance": 0.001, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [ + { + "data": {"age": 0}, + "block": "minecraft:sweet_berry_bush" + }, + { + "data": {"age": 1}, + "block": "minecraft:sweet_berry_bush" + }, + { + "data": {"age": 2}, + "block": "minecraft:sweet_berry_bush" + }, + { + "data": {"age": 3}, + "block": "minecraft:sweet_berry_bush" + } + ], + "style": {"style": "STATIC"} + }, + { + "chance": 0.2, + "variance": {"style": "STATIC"}, + "zoom": 0.3, + "palette": [{"block": "minecraft:grass"}], + "style": {"style": "STATIC"} + } + ], + "childShrinkFactor": 8, + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"}, + {"block": "minecraft:stone"} + ] + }, + "biomeScatter": [ + "TAIGA_HILLS", + "MOUNTAINS" + ] +} diff --git a/biomes/tropical/island-beach.json b/biomes/tropical/island-beach.json index da754af5..79bc983c 100644 --- a/biomes/tropical/island-beach.json +++ b/biomes/tropical/island-beach.json @@ -84,7 +84,7 @@ }, "enabled": true }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "place": [ "trees/jungle/palm1", "trees/jungle/palm2", diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index 3a05a500..bf84b7b4 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -466,7 +466,7 @@ "replace": {"palette": [{"block": "minecraft:spruce_wood"}]} } ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.008, diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json index 6d852180..a3ac5dae 100644 --- a/biomes/tundra/bonsai-forest.json +++ b/biomes/tundra/bonsai-forest.json @@ -325,7 +325,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" } ], "wall": { diff --git a/biomes/tundra/ether.json b/biomes/tundra/ether.json index 79cf3605..27bf44bd 100644 --- a/biomes/tundra/ether.json +++ b/biomes/tundra/ether.json @@ -79,7 +79,7 @@ "structures/woodhand3" ], "chance": 0.07, - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.8, diff --git a/biomes/tundra/frosted-peaks.json b/biomes/tundra/frosted-peaks.json new file mode 100644 index 00000000..8f1f6e8c --- /dev/null +++ b/biomes/tundra/frosted-peaks.json @@ -0,0 +1,154 @@ +{ + "name": "Frosted Peaks", + "derivative": "TAIGA_MOUNTAINS", + "vanillaDerivative": "TAIGA_MOUNTAINS", + "customDerivitives": [{ + "id": "frosted-peaks", + "grassColor": "#80ab69", + "category": "extreme_hills" + }], + "biomeZoom": 0.73, + "rarity": 5, + "generators": [{ + "generator": "mountain", + "max": 200, + "min": 90 + }], + "layers": [ + { + "minHeight": 1, + "maxHeight": 1, + "slopeCondition": { + "minimumSlope": 0.1, + "maximumSlope": 1.65 + }, + "palette": [{"block": "minecraft:snow_block"}] + }, + { + "minHeight": 2, + "maxHeight": 4, + "style": { + "style": "FRACTAL_WATER", + "fracture": { + "style": "STATIC", + "multiplier": 15 + } + }, + "zoom": 0.4, + "slopeCondition": { + "minimumSlope": 3.95, + "maximumSlope": 6 + }, + "palette": [ + { + "block": "minecraft:diorite", + "weight": 4 + }, + { + "block": "minecraft:stone", + "weight": 10 + } + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "style": {"style": "STATIC"}, + "slopeCondition": {"minimumSlope": 2.5}, + "palette": [ + { + "block": "minecraft:smooth_basalt", + "weight": 3 + }, + { + "block": "minecraft:stone", + "weight": 5 + }, + { + "block": "minecraft:gray_concrete_powder", + "weight": 3 + }, + { + "block": "minecraft:gravel", + "weight": 3 + } + ] + }, + { + "minHeight": 2, + "maxHeight": 18, + "style": {"style": "STATIC"}, + "palette": [ + { + "block": "minecraft:stone", + "weight": 2 + }, + { + "block": "minecraft:andesite", + "weight": 1 + } + ] + } + ], + "slab": { + "style": {"style": "STATIC"}, + "slopeCondition": {"minimumSlope": 2.3}, + "palette": [ + { + "data": { + "waterlogged": false, + "type": "bottom" + }, + "block": "minecraft:stone_slab" + }, + { + "data": { + "waterlogged": false, + "type": "bottom" + }, + "block": "minecraft:cobblestone_slab" + }, + { + "weight": 6, + "block": "minecraft:air" + } + ] + }, + "carving": {"caves": [{ + "breakSurface": true, + "cave": "rocky/tubes", + "rarity": 11, + "caveStartHeight": { + "max": 180, + "min": 80, + "style": {"style": "STATIC"} + } + }]}, + "decorators": [ + { + "chance": 0.01, + "palette": [{"block": "minecraft:tall_grass"}] + }, + { + "chance": 0.5, + "palette": [{"block": "minecraft:grass"}] + }, + { + "chance": 0.15, + "palette": [{"block": "minecraft:fern"}] + }, + { + "chance": 0.15, + "palette": [{"block": "minecraft:fern"}] + } + ], + "wall": { + "style": {"style": "STATIC"}, + "palette": [ + {"block": "minecraft:stone"}, + {"block": "minecraft:andesite"}, + {"block": "minecraft:gravel"}, + {"block": "minecraft:basalt"} + ] + } +} diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json index b1cf01a1..f3d19202 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -231,7 +231,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.125, diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index f75b8e1c..c2492289 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -407,7 +407,7 @@ "replace": {"palette": [{"block": "minecraft:spruce_wood"}]} } ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" } ] } diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 1dc47cb4..a7094f08 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -368,7 +368,7 @@ "replace": {"palette": [{"block": "minecraft:spruce_wood"}]} } ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" } ] } diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index 1811474e..c8ac809f 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -291,7 +291,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM" + "mode": "FAST_MIN_HEIGHT" }, { "chance": 0.008, diff --git a/biomes/tundra/shore/beach-stone.json b/biomes/tundra/shore/beach-stone.json index 0e62244f..8c62105c 100644 --- a/biomes/tundra/shore/beach-stone.json +++ b/biomes/tundra/shore/beach-stone.json @@ -66,7 +66,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "slab": { diff --git a/biomes/tundra/shore/beach.json b/biomes/tundra/shore/beach.json index c41ba2e0..78726703 100644 --- a/biomes/tundra/shore/beach.json +++ b/biomes/tundra/shore/beach.json @@ -125,7 +125,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }], "slab": { diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index a3559cef..b6410453 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -268,7 +268,7 @@ "clutter/stump5", "clutter/stump6" ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "translate": { "x": 0, "y": -1, diff --git a/biomes/util/ruined_portals.json b/biomes/util/ruined_portals.json index bb8bc798..f39c69ee 100644 --- a/biomes/util/ruined_portals.json +++ b/biomes/util/ruined_portals.json @@ -53,13 +53,13 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "CARVING_ONLY" }, { "name": "standard-underground", "chance": 0.2, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "place": [ "clutter/swordnp2", "clutter/swordnp1", diff --git a/caves/deep/elongated.json b/caves/deep/elongated.json new file mode 100644 index 00000000..be311df9 --- /dev/null +++ b/caves/deep/elongated.json @@ -0,0 +1,72 @@ +{ + "fill": {"block": "minecraft:cave_air"}, + "verticalRange": { + "max": 50, + "min": 10 + }, + "customBiome": "carving/deepravine", + "fork": { + "ravines": [{ + "breakSurface": false, + "rarity": 13, + "ravine": "deep/main" + }], + "caves": [ + { + "breakSurface": false, + "cave": "calcite/main", + "rarity": 25 + }, + { + "breakSurface": false, + "cave": "drip/main", + "rarity": 30 + }, + { + "breakSurface": false, + "cave": "amethyst/small", + "rarity": 35 + }, + { + "breakSurface": false, + "cave": "volcanic/small", + "rarity": 20 + } + ] + }, + "worm": { + "girth": { + "max": 7, + "min": 3, + "style": { + "style": "SIMPLEX", + "zoom": 0.5 + } + }, + "maxDistance": 230, + "yStyle": { + "min": -2, + "max": 1, + "generator": { + "zoom": 3, + "style": "PERLIN" + } + }, + "xStyle": { + "min": -9, + "max": 9, + "generator": { + "zoom": 0.6, + "style": "IRIS" + } + }, + "zStyle": { + "min": -9, + "max": 9, + "generator": { + "zoom": 0.6, + "style": "IRIS" + } + } + } +} diff --git a/caves/rocky/tubes.json b/caves/rocky/tubes.json new file mode 100644 index 00000000..fcb2b21e --- /dev/null +++ b/caves/rocky/tubes.json @@ -0,0 +1,69 @@ +{ + "fill": {"block": "minecraft:cave_air"}, + "verticalRange": { + "max": 220, + "min": 30 + }, + "customBiome": "carving/mountain-caves", + "fork": { + "ravines": [{ + "breakSurface": false, + "rarity": 100, + "ravine": "deep/main" + }], + "caves": [ + { + "breakSurface": false, + "cave": "calcite/main", + "rarity": 105 + }, + { + "breakSurface": false, + "cave": "drip/main", + "rarity": 120 + }, + { + "breakSurface": false, + "cave": "amethyst/small", + "rarity": 125 + }, + { + "breakSurface": false, + "cave": "volcanic/small", + "rarity": 140 + } + ] + }, + "worm": { + "girth": { + "max": 7, + "min": 2, + "style": {"style": "STATIC"} + }, + "maxDistance": 150, + "yStyle": { + "min": -3, + "max": 2, + "generator": { + "zoom": 3, + "style": "PERLIN" + } + }, + "xStyle": { + "min": -12, + "max": 12, + "generator": { + "zoom": 2, + "style": "IRIS_DOUBLE" + } + }, + "zStyle": { + "min": -12, + "max": 12, + "generator": { + "zoom": 2, + "style": "IRIS_DOUBLE" + } + } + } +} diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 710f197a..129f1691 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,5 +1,5 @@ { - "version": 2010, + "version": 2011, "name": "Overworld", "environment": "NORMAL", "fluidHeight": 63, @@ -30,22 +30,33 @@ "swamp", "hot", "temperate", - "tropical", - "temperate", + "tundra", "frozen", - "tundra" + "tropical", + "temperate" ], - "carving": { - "caves": [{ - "breakSurface": true, - "cave": "deep/main", - "rarity": 28, - "caveStartHeight": { - "max": 35, - "min": 12, - "style": {"style": "STATIC"} + "carving": {"caves": [ + { + "breakSurface": true, + "cave": "deep/main", + "rarity": 28, + "caveStartHeight": { + "max": 35, + "min": 12, + "style": {"style": "STATIC"} + } + }, + { + "breakSurface": false, + "cave": "deep/elongated", + "rarity": 27, + "caveStartHeight": { + "max": 45, + "min": 3, + "style": {"style": "STATIC"} + } } - }]}, + ]}, "islandBiomeChanceStyle": { "style": "NOWHERE_CELLULAR", "axialFracturing": true, @@ -239,6 +250,7 @@ "coordFractureDistance": 926, "coordFractureZoom": 0.15, "preventLeafDecay": true, + "noiseModificationFromFeatures": false, "postProcessCaves": true, "postProcessing": true, "useMantle": true, diff --git a/entities/standard/passive/golem.json b/entities/standard/passive/golem.json new file mode 100644 index 00000000..5c720d3f --- /dev/null +++ b/entities/standard/passive/golem.json @@ -0,0 +1 @@ +{"type": "IRON_GOLEM"} diff --git a/generators/cracked-cliffs.json b/generators/cracked-cliffs.json index 5a82d125..02953fdf 100644 --- a/generators/cracked-cliffs.json +++ b/generators/cracked-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 15 + "horizontalScale": 16 }, "seed": 7246661, "composite": [{ diff --git a/generators/highplains.json b/generators/highplains.json index d84274fa..fcc165b7 100644 --- a/generators/highplains.json +++ b/generators/highplains.json @@ -1,7 +1,7 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_3", - "horizontalScale": 50 + "function": "BILINEAR_STARCAST_9", + "horizontalScale": 60 }, "seed": 377394, "composite": [{ diff --git a/generators/mountain.json b/generators/mountain.json index 985fc840..564cf2b2 100644 --- a/generators/mountain.json +++ b/generators/mountain.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 35 + "horizontalScale": 50 }, "seed": 530530, "composite": [ diff --git a/generators/ocean.json b/generators/ocean.json index 947b2412..756169a5 100644 --- a/generators/ocean.json +++ b/generators/ocean.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 65 + "horizontalScale": 60 }, "seed": 9246661, "composite": [{ diff --git a/generators/plain-cliffs.json b/generators/plain-cliffs.json index 06212055..0f8fdd6e 100644 --- a/generators/plain-cliffs.json +++ b/generators/plain-cliffs.json @@ -15,7 +15,7 @@ }], "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 49 + "horizontalScale": 60 }, "seed": 7246661, "cliffHeightMax": 80, diff --git a/generators/plain.json b/generators/plain.json index 3659febf..65ff4eee 100644 --- a/generators/plain.json +++ b/generators/plain.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 63 + "horizontalScale": 60 }, "seed": 7246661, "composite": [{ diff --git a/generators/rare-hills.json b/generators/rare-hills.json index 1c462c17..d2b0b8ef 100644 --- a/generators/rare-hills.json +++ b/generators/rare-hills.json @@ -1,7 +1,7 @@ { "interpolator": { - "function": "BILINEAR_STARCAST_6", - "horizontalScale": 8 + "function": "BILINEAR_STARCAST_9", + "horizontalScale": 9 }, "seed": 377394, "composite": [{ diff --git a/generators/small-cliffs.json b/generators/small-cliffs.json index 6af8f52b..d4f8d33f 100644 --- a/generators/small-cliffs.json +++ b/generators/small-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 18 + "horizontalScale": 16 }, "seed": 2343, "composite": [{ diff --git a/generators/smooth-dunes.json b/generators/smooth-dunes.json index 2bb6d276..7fb694b3 100644 --- a/generators/smooth-dunes.json +++ b/generators/smooth-dunes.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 45 + "horizontalScale": 50 }, "seed": 133434, "composite": [ diff --git a/generators/vascular-cracked-cliffs.json b/generators/vascular-cracked-cliffs.json index 3ef0ee44..3743f4c2 100644 --- a/generators/vascular-cracked-cliffs.json +++ b/generators/vascular-cracked-cliffs.json @@ -1,7 +1,7 @@ { "interpolator": { "function": "BILINEAR_STARCAST_9", - "horizontalScale": 17 + "horizontalScale": 16 }, "seed": 7246661, "composite": [{ diff --git a/jigsaw-pieces/houses/jap/j1.json b/jigsaw-pieces/houses/jap/j1.json index d49005f1..67213f34 100644 --- a/jigsaw-pieces/houses/jap/j1.json +++ b/jigsaw-pieces/houses/jap/j1.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j10.json b/jigsaw-pieces/houses/jap/j10.json index 2ea6bd7b..7224c9af 100644 --- a/jigsaw-pieces/houses/jap/j10.json +++ b/jigsaw-pieces/houses/jap/j10.json @@ -74,7 +74,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j2.json b/jigsaw-pieces/houses/jap/j2.json index 6e29175d..598e1c49 100644 --- a/jigsaw-pieces/houses/jap/j2.json +++ b/jigsaw-pieces/houses/jap/j2.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j3.json b/jigsaw-pieces/houses/jap/j3.json index 1b6a0276..1c59a311 100644 --- a/jigsaw-pieces/houses/jap/j3.json +++ b/jigsaw-pieces/houses/jap/j3.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j4.json b/jigsaw-pieces/houses/jap/j4.json index 9f5784dc..280bb7f8 100644 --- a/jigsaw-pieces/houses/jap/j4.json +++ b/jigsaw-pieces/houses/jap/j4.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j5.json b/jigsaw-pieces/houses/jap/j5.json index e08b5fd9..ef8abad4 100644 --- a/jigsaw-pieces/houses/jap/j5.json +++ b/jigsaw-pieces/houses/jap/j5.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j6.json b/jigsaw-pieces/houses/jap/j6.json index e649e9e4..553027d2 100644 --- a/jigsaw-pieces/houses/jap/j6.json +++ b/jigsaw-pieces/houses/jap/j6.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j7.json b/jigsaw-pieces/houses/jap/j7.json index 72e408c2..cfd8c985 100644 --- a/jigsaw-pieces/houses/jap/j7.json +++ b/jigsaw-pieces/houses/jap/j7.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j8.json b/jigsaw-pieces/houses/jap/j8.json index e24ae745..445f5ed6 100644 --- a/jigsaw-pieces/houses/jap/j8.json +++ b/jigsaw-pieces/houses/jap/j8.json @@ -89,7 +89,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/houses/jap/j9.json b/jigsaw-pieces/houses/jap/j9.json index b0dfb321..97b84476 100644 --- a/jigsaw-pieces/houses/jap/j9.json +++ b/jigsaw-pieces/houses/jap/j9.json @@ -57,7 +57,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json index a543016f..654250ba 100644 --- a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json +++ b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json @@ -1,6 +1,21 @@ { "connectors": [], "placementOptions": { + "markers": [ + { + "emptyAbove": true, + "mark": [ + { + "block": "minecraft:cobblestone" + }, + { + "block": "minecraft:mossy_cobblestone" + } + ], + "marker": "dank", + "maximumMarkers": 9 + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mansion/1x1/1/a1.json b/jigsaw-pieces/mansion/1x1/1/a1.json index 6cca7c20..8d00c82a 100644 --- a/jigsaw-pieces/mansion/1x1/1/a1.json +++ b/jigsaw-pieces/mansion/1x1/1/a1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/a2.json b/jigsaw-pieces/mansion/1x1/1/a2.json index 87af8740..b1767be7 100644 --- a/jigsaw-pieces/mansion/1x1/1/a2.json +++ b/jigsaw-pieces/mansion/1x1/1/a2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/a3.json b/jigsaw-pieces/mansion/1x1/1/a3.json index 2291a1ea..7a0e9708 100644 --- a/jigsaw-pieces/mansion/1x1/1/a3.json +++ b/jigsaw-pieces/mansion/1x1/1/a3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/a4.json b/jigsaw-pieces/mansion/1x1/1/a4.json index 59bb787a..a54b5bbd 100644 --- a/jigsaw-pieces/mansion/1x1/1/a4.json +++ b/jigsaw-pieces/mansion/1x1/1/a4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/a5.json b/jigsaw-pieces/mansion/1x1/1/a5.json index 5c047e49..9513fe44 100644 --- a/jigsaw-pieces/mansion/1x1/1/a5.json +++ b/jigsaw-pieces/mansion/1x1/1/a5.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/as1.json b/jigsaw-pieces/mansion/1x1/1/as1.json index 02566b2a..54ad56b2 100644 --- a/jigsaw-pieces/mansion/1x1/1/as1.json +++ b/jigsaw-pieces/mansion/1x1/1/as1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/as2.json b/jigsaw-pieces/mansion/1x1/1/as2.json index 0947c5c2..4dbec5b1 100644 --- a/jigsaw-pieces/mansion/1x1/1/as2.json +++ b/jigsaw-pieces/mansion/1x1/1/as2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/as3.json b/jigsaw-pieces/mansion/1x1/1/as3.json index 89161d7c..56cd90c2 100644 --- a/jigsaw-pieces/mansion/1x1/1/as3.json +++ b/jigsaw-pieces/mansion/1x1/1/as3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/1/as4.json b/jigsaw-pieces/mansion/1x1/1/as4.json index 5d89e91f..0582b902 100644 --- a/jigsaw-pieces/mansion/1x1/1/as4.json +++ b/jigsaw-pieces/mansion/1x1/1/as4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/2/b1.json b/jigsaw-pieces/mansion/1x1/2/b1.json index 71760179..b7056764 100644 --- a/jigsaw-pieces/mansion/1x1/2/b1.json +++ b/jigsaw-pieces/mansion/1x1/2/b1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/2/b2.json b/jigsaw-pieces/mansion/1x1/2/b2.json index ef21096c..02ece56c 100644 --- a/jigsaw-pieces/mansion/1x1/2/b2.json +++ b/jigsaw-pieces/mansion/1x1/2/b2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/2/b3.json b/jigsaw-pieces/mansion/1x1/2/b3.json index af0a8296..47fc0ae1 100644 --- a/jigsaw-pieces/mansion/1x1/2/b3.json +++ b/jigsaw-pieces/mansion/1x1/2/b3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/2/b4.json b/jigsaw-pieces/mansion/1x1/2/b4.json index 9d4f5ee9..2a0ce301 100644 --- a/jigsaw-pieces/mansion/1x1/2/b4.json +++ b/jigsaw-pieces/mansion/1x1/2/b4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x1/2/b5.json b/jigsaw-pieces/mansion/1x1/2/b5.json index 01a6a809..a9799b1c 100644 --- a/jigsaw-pieces/mansion/1x1/2/b5.json +++ b/jigsaw-pieces/mansion/1x1/2/b5.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a1.json b/jigsaw-pieces/mansion/1x2/1/a1.json index 72137968..2ab46412 100644 --- a/jigsaw-pieces/mansion/1x2/1/a1.json +++ b/jigsaw-pieces/mansion/1x2/1/a1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a2.json b/jigsaw-pieces/mansion/1x2/1/a2.json index b696806c..37858a93 100644 --- a/jigsaw-pieces/mansion/1x2/1/a2.json +++ b/jigsaw-pieces/mansion/1x2/1/a2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a3.json b/jigsaw-pieces/mansion/1x2/1/a3.json index e0d33ff3..fd733415 100644 --- a/jigsaw-pieces/mansion/1x2/1/a3.json +++ b/jigsaw-pieces/mansion/1x2/1/a3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a4.json b/jigsaw-pieces/mansion/1x2/1/a4.json index 024f84c3..ac413dbd 100644 --- a/jigsaw-pieces/mansion/1x2/1/a4.json +++ b/jigsaw-pieces/mansion/1x2/1/a4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a5.json b/jigsaw-pieces/mansion/1x2/1/a5.json index 088d0070..6aeb1980 100644 --- a/jigsaw-pieces/mansion/1x2/1/a5.json +++ b/jigsaw-pieces/mansion/1x2/1/a5.json @@ -81,8 +81,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a6.json b/jigsaw-pieces/mansion/1x2/1/a6.json index d3991d57..f91b6726 100644 --- a/jigsaw-pieces/mansion/1x2/1/a6.json +++ b/jigsaw-pieces/mansion/1x2/1/a6.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a7.json b/jigsaw-pieces/mansion/1x2/1/a7.json index 40794a3c..94b2b893 100644 --- a/jigsaw-pieces/mansion/1x2/1/a7.json +++ b/jigsaw-pieces/mansion/1x2/1/a7.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a8.json b/jigsaw-pieces/mansion/1x2/1/a8.json index d6c9d5ef..56b637eb 100644 --- a/jigsaw-pieces/mansion/1x2/1/a8.json +++ b/jigsaw-pieces/mansion/1x2/1/a8.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/a9.json b/jigsaw-pieces/mansion/1x2/1/a9.json index 0f18ca51..0b8aee9d 100644 --- a/jigsaw-pieces/mansion/1x2/1/a9.json +++ b/jigsaw-pieces/mansion/1x2/1/a9.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/b1.json b/jigsaw-pieces/mansion/1x2/1/b1.json index a3bb7c31..a69c9656 100644 --- a/jigsaw-pieces/mansion/1x2/1/b1.json +++ b/jigsaw-pieces/mansion/1x2/1/b1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/b2.json b/jigsaw-pieces/mansion/1x2/1/b2.json index 21d01049..871df78e 100644 --- a/jigsaw-pieces/mansion/1x2/1/b2.json +++ b/jigsaw-pieces/mansion/1x2/1/b2.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/b3.json b/jigsaw-pieces/mansion/1x2/1/b3.json index dc260e16..eb2dc0ba 100644 --- a/jigsaw-pieces/mansion/1x2/1/b3.json +++ b/jigsaw-pieces/mansion/1x2/1/b3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/b4.json b/jigsaw-pieces/mansion/1x2/1/b4.json index 5deaac38..2f61540e 100644 --- a/jigsaw-pieces/mansion/1x2/1/b4.json +++ b/jigsaw-pieces/mansion/1x2/1/b4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/b5.json b/jigsaw-pieces/mansion/1x2/1/b5.json index 3bbe7ffe..28d66ae4 100644 --- a/jigsaw-pieces/mansion/1x2/1/b5.json +++ b/jigsaw-pieces/mansion/1x2/1/b5.json @@ -81,8 +81,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/c1.json b/jigsaw-pieces/mansion/1x2/1/c1.json index b2739722..f5fab8ae 100644 --- a/jigsaw-pieces/mansion/1x2/1/c1.json +++ b/jigsaw-pieces/mansion/1x2/1/c1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/c2.json b/jigsaw-pieces/mansion/1x2/1/c2.json index 07cbd049..07945aed 100644 --- a/jigsaw-pieces/mansion/1x2/1/c2.json +++ b/jigsaw-pieces/mansion/1x2/1/c2.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/c3.json b/jigsaw-pieces/mansion/1x2/1/c3.json index fb8393a4..464ca972 100644 --- a/jigsaw-pieces/mansion/1x2/1/c3.json +++ b/jigsaw-pieces/mansion/1x2/1/c3.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/1/c4.json b/jigsaw-pieces/mansion/1x2/1/c4.json index 752620ee..ba4be3d3 100644 --- a/jigsaw-pieces/mansion/1x2/1/c4.json +++ b/jigsaw-pieces/mansion/1x2/1/c4.json @@ -81,8 +81,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/d1.json b/jigsaw-pieces/mansion/1x2/2/d1.json index 54271f4c..a9bd7295 100644 --- a/jigsaw-pieces/mansion/1x2/2/d1.json +++ b/jigsaw-pieces/mansion/1x2/2/d1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/d2.json b/jigsaw-pieces/mansion/1x2/2/d2.json index 8cc8da9c..71319d63 100644 --- a/jigsaw-pieces/mansion/1x2/2/d2.json +++ b/jigsaw-pieces/mansion/1x2/2/d2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/d3.json b/jigsaw-pieces/mansion/1x2/2/d3.json index 1f59ed8c..03ca2b1f 100644 --- a/jigsaw-pieces/mansion/1x2/2/d3.json +++ b/jigsaw-pieces/mansion/1x2/2/d3.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/d4.json b/jigsaw-pieces/mansion/1x2/2/d4.json index 866bfd77..a47968ae 100644 --- a/jigsaw-pieces/mansion/1x2/2/d4.json +++ b/jigsaw-pieces/mansion/1x2/2/d4.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/d5.json b/jigsaw-pieces/mansion/1x2/2/d5.json index 19b8ad25..62baf593 100644 --- a/jigsaw-pieces/mansion/1x2/2/d5.json +++ b/jigsaw-pieces/mansion/1x2/2/d5.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/s1.json b/jigsaw-pieces/mansion/1x2/2/s1.json index 439402dc..281220aa 100644 --- a/jigsaw-pieces/mansion/1x2/2/s1.json +++ b/jigsaw-pieces/mansion/1x2/2/s1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/s2.json b/jigsaw-pieces/mansion/1x2/2/s2.json index c2deac68..b93c361c 100644 --- a/jigsaw-pieces/mansion/1x2/2/s2.json +++ b/jigsaw-pieces/mansion/1x2/2/s2.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/1x2/2/se1.json b/jigsaw-pieces/mansion/1x2/2/se1.json index 98c4d2b2..802be11e 100644 --- a/jigsaw-pieces/mansion/1x2/2/se1.json +++ b/jigsaw-pieces/mansion/1x2/2/se1.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/1/a1.json b/jigsaw-pieces/mansion/2x2/1/a1.json index e3cd0bc5..825b256f 100644 --- a/jigsaw-pieces/mansion/2x2/1/a1.json +++ b/jigsaw-pieces/mansion/2x2/1/a1.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/1/a2.json b/jigsaw-pieces/mansion/2x2/1/a2.json index 9ff30a89..04117ad0 100644 --- a/jigsaw-pieces/mansion/2x2/1/a2.json +++ b/jigsaw-pieces/mansion/2x2/1/a2.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/1/a3.json b/jigsaw-pieces/mansion/2x2/1/a3.json index 2e21f8f5..5d6b0dca 100644 --- a/jigsaw-pieces/mansion/2x2/1/a3.json +++ b/jigsaw-pieces/mansion/2x2/1/a3.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/1/a4.json b/jigsaw-pieces/mansion/2x2/1/a4.json index 41080b32..93fdc2d9 100644 --- a/jigsaw-pieces/mansion/2x2/1/a4.json +++ b/jigsaw-pieces/mansion/2x2/1/a4.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/b1.json b/jigsaw-pieces/mansion/2x2/2/b1.json index c5171931..d4864471 100644 --- a/jigsaw-pieces/mansion/2x2/2/b1.json +++ b/jigsaw-pieces/mansion/2x2/2/b1.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/b2.json b/jigsaw-pieces/mansion/2x2/2/b2.json index 9f154d9b..70118d88 100644 --- a/jigsaw-pieces/mansion/2x2/2/b2.json +++ b/jigsaw-pieces/mansion/2x2/2/b2.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/b3.json b/jigsaw-pieces/mansion/2x2/2/b3.json index 0f74f3c8..6593493b 100644 --- a/jigsaw-pieces/mansion/2x2/2/b3.json +++ b/jigsaw-pieces/mansion/2x2/2/b3.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/b4.json b/jigsaw-pieces/mansion/2x2/2/b4.json index 9e497510..09318a7a 100644 --- a/jigsaw-pieces/mansion/2x2/2/b4.json +++ b/jigsaw-pieces/mansion/2x2/2/b4.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/b5.json b/jigsaw-pieces/mansion/2x2/2/b5.json index d3b883a3..7d28c6d8 100644 --- a/jigsaw-pieces/mansion/2x2/2/b5.json +++ b/jigsaw-pieces/mansion/2x2/2/b5.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/2x2/2/s1.json b/jigsaw-pieces/mansion/2x2/2/s1.json index ff3ad72e..0cc664e0 100644 --- a/jigsaw-pieces/mansion/2x2/2/s1.json +++ b/jigsaw-pieces/mansion/2x2/2/s1.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/path/path_1.json b/jigsaw-pieces/mansion/path/path_1.json index 74058e36..2eccde20 100644 --- a/jigsaw-pieces/mansion/path/path_1.json +++ b/jigsaw-pieces/mansion/path/path_1.json @@ -351,8 +351,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/path/path_2.json b/jigsaw-pieces/mansion/path/path_2.json index 37d96871..98cf65be 100644 --- a/jigsaw-pieces/mansion/path/path_2.json +++ b/jigsaw-pieces/mansion/path/path_2.json @@ -246,8 +246,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/path_2/path_1.json b/jigsaw-pieces/mansion/path_2/path_1.json index e18ba677..0ea6e956 100644 --- a/jigsaw-pieces/mansion/path_2/path_1.json +++ b/jigsaw-pieces/mansion/path_2/path_1.json @@ -366,8 +366,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/path_2/path_2.json b/jigsaw-pieces/mansion/path_2/path_2.json index 7660cf3c..c3126720 100644 --- a/jigsaw-pieces/mansion/path_2/path_2.json +++ b/jigsaw-pieces/mansion/path_2/path_2.json @@ -261,8 +261,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/stairs/stairs_left.json b/jigsaw-pieces/mansion/stairs/stairs_left.json index 11d445b5..97787d87 100644 --- a/jigsaw-pieces/mansion/stairs/stairs_left.json +++ b/jigsaw-pieces/mansion/stairs/stairs_left.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mansion/stairs/stairs_straight.json b/jigsaw-pieces/mansion/stairs/stairs_straight.json index 47997312..b201510a 100644 --- a/jigsaw-pieces/mansion/stairs/stairs_straight.json +++ b/jigsaw-pieces/mansion/stairs/stairs_straight.json @@ -66,8 +66,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 9b5614f8..4aac4391 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index 7adace4f..ad405667 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index 851619ec..11c31a69 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index 529b59dd..72cbec61 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index 96476f65..d6e972cc 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index 0110652c..345de112 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index 88eb5ae7..fef7e974 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -2,7 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", "entityCount": 1, "rotateConnector": false, "name": "", diff --git a/jigsaw-pieces/pillager_outpost/feature_plate.json b/jigsaw-pieces/pillager_outpost/feature_plate.json index 00cd2eb7..1257775d 100644 --- a/jigsaw-pieces/pillager_outpost/feature_plate.json +++ b/jigsaw-pieces/pillager_outpost/feature_plate.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/pillager_outpost/pillager.json b/jigsaw-pieces/pillager_outpost/pillager.json index f7b5eaad..f71bcb8b 100644 --- a/jigsaw-pieces/pillager_outpost/pillager.json +++ b/jigsaw-pieces/pillager_outpost/pillager.json @@ -8,7 +8,6 @@ }, "direction": "DOWN_NEGATIVE_Y", "entityCount": 50, - "spawnEntity": "pillager", "rotateConnector": false, "innerConnector": true }], diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json index f1ef623d..a793bd59 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json @@ -67,7 +67,6 @@ "rotateConnector": false, "innerConnector": false, "pools": [], - "spawnEntity": "", "keepEntity": false, "entityCount": 1, "position": { diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json index f3c9e228..878e1071 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json @@ -61,7 +61,6 @@ "innerConnector": false, "entityCount": 1, "rotateConnector": false, - "spawnEntity": "", "name": "", "pools": [], "position": { @@ -112,7 +111,7 @@ "y": 1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/pillager_outpost/watchtower.json b/jigsaw-pieces/pillager_outpost/watchtower.json index fc515bcc..fa8788eb 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower.json +++ b/jigsaw-pieces/pillager_outpost/watchtower.json @@ -115,7 +115,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -130,7 +129,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -145,7 +143,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -160,7 +157,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -175,7 +171,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -190,7 +185,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -205,7 +199,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -220,7 +213,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -235,7 +227,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -250,7 +241,6 @@ { "targetName": "pillager_outpost/pillager", "innerConnector": true, - "spawnEntity": "pillager", "entityCount": 1, "rotateConnector": false, "name": "", @@ -303,7 +293,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json index 844aa681..babfb832 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json +++ b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json @@ -232,7 +232,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/pyramid-desert.json b/jigsaw-pieces/pyramid-desert.json index 4ed37d10..069939d8 100644 --- a/jigsaw-pieces/pyramid-desert.json +++ b/jigsaw-pieces/pyramid-desert.json @@ -1,6 +1,27 @@ { "connectors": [], "placementOptions": { + "markers": [ + { + "emptyAbove": true, + "mark": [ + { + "block": "minecraft:sandstone" + }, + { + "block": "minecraft:cut_sandstone" + }, + { + "block": "minecraft:cut_red_sandstone" + }, + { + "block": "minecraft:red_sandstone" + } + ], + "marker": "dank", + "maximumMarkers": 9 + } + ], "overStilt": 0, "chance": 1, "meld": false, @@ -34,8 +55,8 @@ "enabled": true }, "boreExtendMaxY": 0, - "smartBore": true, "waterloggable": false, + "smartBore": true, "bore": false, "translate": { "yRandom": 0, diff --git a/jigsaw-pieces/stronghold/portal/main.json b/jigsaw-pieces/stronghold/portal/main.json index 93184d0c..959d8fd8 100644 --- a/jigsaw-pieces/stronghold/portal/main.json +++ b/jigsaw-pieces/stronghold/portal/main.json @@ -49,8 +49,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/stronghold/portal/top.json b/jigsaw-pieces/stronghold/portal/top.json index 945b0cfd..6e6143d6 100644 --- a/jigsaw-pieces/stronghold/portal/top.json +++ b/jigsaw-pieces/stronghold/portal/top.json @@ -231,8 +231,8 @@ "overStilt": 0, "boreExtendMaxY": 0, "boreExtendMinY": 0, - "vacuumInterpolationRadius": 16, - "vacuumInterpolationMethod": "BILINEAR_STARCAST_9", + "FAST_MIN_HEIGHTInterpolationRadius": 16, + "FAST_MIN_HEIGHTInterpolationMethod": "BILINEAR_STARCAST_9", "underwater": false, "carvingSupport": "SURFACE_ONLY", "smartBore": false, diff --git a/jigsaw-pieces/village/desert/desert_lamp_1.json b/jigsaw-pieces/village/desert/desert_lamp_1.json index 73e55d8a..bc055e87 100644 --- a/jigsaw-pieces/village/desert/desert_lamp_1.json +++ b/jigsaw-pieces/village/desert/desert_lamp_1.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json b/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json index 466085a0..c3b1664d 100644 --- a/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json b/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json index e66978c8..d3ddc200 100644 --- a/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_armorer_1.json b/jigsaw-pieces/village/desert/houses/desert_armorer_1.json index 4750a672..fcbc662f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_armorer_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_armorer_1.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json b/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json index 8d83fad5..e4155e09 100644 --- a/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json index af930068..93a7327b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -66,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_farm_1.json b/jigsaw-pieces/village/desert/houses/desert_farm_1.json index 968ec459..0844f15f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_farm_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_farm_1.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_farm_2.json b/jigsaw-pieces/village/desert/houses/desert_farm_2.json index 13ffcad9..c50bb5ff 100644 --- a/jigsaw-pieces/village/desert/houses/desert_farm_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_farm_2.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json index f3a7f227..2c56913e 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json index f875a421..5f2107c3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json b/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json index 16a1c69a..c9c11894 100644 --- a/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json @@ -51,7 +51,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_library_1.json b/jigsaw-pieces/village/desert/houses/desert_library_1.json index d8ac954f..676378c8 100644 --- a/jigsaw-pieces/village/desert/houses/desert_library_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_library_1.json @@ -66,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_mason_1.json b/jigsaw-pieces/village/desert/houses/desert_mason_1.json index 24a0c199..447b6809 100644 --- a/jigsaw-pieces/village/desert/houses/desert_mason_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_mason_1.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json index 509f1668..18ebaba3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -20,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -81,7 +79,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json index 178d036f..169d05a3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -4, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 2, "y": -2, @@ -81,7 +79,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json b/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json index 3848812e..9bb57e6c 100644 --- a/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json @@ -66,7 +66,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json index d5d1c133..20fefa5d 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json index 28cee59a..da04ac0b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -3, @@ -80,7 +79,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json index 0159ddd5..be0e7102 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json index 81e57049..7ab7d994 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 1, "y": -2, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json index a357fd3d..009986f1 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 1, "y": -3, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json index e39aea3b..0b441cb4 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -9, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json index d8d8e183..76cc326a 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 1, "y": -2, @@ -67,7 +66,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json index 59bce1c3..05049c54 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -64,10 +63,10 @@ "translate": { "yRandom": 0, "x": 0, - "y": -2, + "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_tannery_1.json b/jigsaw-pieces/village/desert/houses/desert_tannery_1.json index 4169333e..514a7c8b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tannery_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tannery_1.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_temple_1.json b/jigsaw-pieces/village/desert/houses/desert_temple_1.json index 848661c8..30bdc9c8 100644 --- a/jigsaw-pieces/village/desert/houses/desert_temple_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_temple_1.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_temple_2.json b/jigsaw-pieces/village/desert/houses/desert_temple_2.json index c3ee1b54..4ccf4416 100644 --- a/jigsaw-pieces/village/desert/houses/desert_temple_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_temple_2.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json index 8c596094..3a5b059e 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json index 5dba6a0f..90f93313 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -51,7 +51,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index ba84c66d..470d70cd 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -69,6 +68,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index d8251275..a42871e8 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -56,6 +55,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/crossroad_01.json b/jigsaw-pieces/village/desert/streets/crossroad_01.json index d21759e7..8c5e49c8 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -173,6 +172,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/crossroad_02.json b/jigsaw-pieces/village/desert/streets/crossroad_02.json index 778b8cf0..bcaff21c 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +107,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/crossroad_03.json b/jigsaw-pieces/village/desert/streets/crossroad_03.json index bc34e0fd..ed2d77b6 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -69,6 +68,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/square_01.json b/jigsaw-pieces/village/desert/streets/square_01.json index 3c632a0f..044810ab 100644 --- a/jigsaw-pieces/village/desert/streets/square_01.json +++ b/jigsaw-pieces/village/desert/streets/square_01.json @@ -262,6 +262,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/square_02.json b/jigsaw-pieces/village/desert/streets/square_02.json index e195a008..65438191 100644 --- a/jigsaw-pieces/village/desert/streets/square_02.json +++ b/jigsaw-pieces/village/desert/streets/square_02.json @@ -80,6 +80,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/straight_01.json b/jigsaw-pieces/village/desert/streets/straight_01.json index ad9bab0d..50b05b3e 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +107,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/straight_02.json b/jigsaw-pieces/village/desert/streets/straight_02.json index 62f41505..b4f5c262 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +107,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/straight_03.json b/jigsaw-pieces/village/desert/streets/straight_03.json index fb17b3df..febc9539 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -43,6 +42,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/turn_01.json b/jigsaw-pieces/village/desert/streets/turn_01.json index 39cd0236..3a3f8246 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -3,7 +3,6 @@ { "targetName": "village/desert/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -56,6 +55,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json index c8a81b40..4bfcfc16 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 3, "y": -3, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 7, "y": -3, @@ -47,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 7, "y": -3, @@ -174,7 +171,7 @@ } ], "placementOptions": { - "overStilt": 0, + "overStilt": 1, "chance": 1, "meld": false, "density": 1, @@ -212,7 +209,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json index ad63b01f..09a67d66 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -5, "y": -3, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -3, @@ -73,7 +71,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 4, "y": -3, @@ -135,7 +132,7 @@ } ], "placementOptions": { - "overStilt": 0, + "overStilt": 1, "chance": 1, "meld": false, "density": 1, @@ -173,7 +170,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json index 5be0252b..8ddcf337 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json @@ -32,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -3, @@ -59,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -3, @@ -73,7 +71,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 1, "y": -3, @@ -161,7 +158,7 @@ } ], "placementOptions": { - "overStilt": 0, + "overStilt": 1, "chance": 1, "meld": false, "density": 1, @@ -199,7 +196,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index 9c0d781c..990d2f7c 100644 --- a/jigsaw-pieces/village/desert/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/villagers/unemployed.json @@ -10,7 +10,6 @@ "y": -1, "z": 0 }, - "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, diff --git a/jigsaw-pieces/village/plains/houses/plains_accessory_1.json b/jigsaw-pieces/village/plains/houses/plains_accessory_1.json index 19544597..b7682a42 100644 --- a/jigsaw-pieces/village/plains/houses/plains_accessory_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_accessory_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json index c3fe2566..23d41166 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json @@ -5,7 +5,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "sheep", "position": { "x": 0, "y": -4, @@ -18,7 +17,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "sheep", "position": { "x": 1, "y": -4, @@ -41,6 +39,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +86,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json index 32fa4dba..2cbacdd0 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json @@ -5,7 +5,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "cow", "position": { "x": -1, "y": -3, @@ -18,7 +17,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "cow", "position": { "x": 1, "y": -3, @@ -54,6 +52,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +99,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json index 91adfa14..1520fc60 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json @@ -31,7 +31,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "pig", "position": { "x": -2, "y": -3, @@ -57,7 +56,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "pig", "position": { "x": 0, "y": -3, @@ -83,7 +81,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "spawnEntity": "pig", "position": { "x": 1, "y": -3, @@ -106,6 +103,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -144,7 +150,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json index 23a8da11..3dfc7290 100644 --- a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json index 0c045c63..d07b7dde 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -5, @@ -20,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -5, @@ -47,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -1, @@ -61,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -1, @@ -71,6 +67,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -109,7 +114,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json index d295f9f8..928c0d90 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json @@ -28,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +75,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json index 8c73010c..5dfcfa59 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json @@ -80,6 +80,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -118,7 +127,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json index 8809bc9a..b9a13322 100644 --- a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json index b4b89bef..0212a3a2 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": -2, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json index 59a2561e..19f1ce07 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json @@ -28,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +75,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json b/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json index 11648b22..cc004331 100644 --- a/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_library_1.json b/jigsaw-pieces/village/plains/houses/plains_library_1.json index 00ca30c4..c3f2d825 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_library_2.json b/jigsaw-pieces/village/plains/houses/plains_library_2.json index b52beb32..4f3783ca 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_2.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json index b4461438..392a78f7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json index e779d907..d1f08da3 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -32,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -3, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -56,6 +54,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -94,7 +101,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json index a341136b..0389f0f2 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -43,6 +41,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +88,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json b/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json index 83e7bbb6..c174d70f 100644 --- a/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json @@ -67,6 +67,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -105,7 +114,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json b/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json index 8d033a46..fda92bb9 100644 --- a/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json @@ -54,6 +54,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +101,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json index 03163b0c..9ed8b117 100644 --- a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json @@ -54,6 +54,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +101,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json index 1ef3e0d7..60aaf63c 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json index 6bb2476e..50287b5e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json index 63f4a60a..80c23d5b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json index 84551634..9e699c6e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json index 0c394812..1ae1a93d 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json index d5cdd602..4da9ca8f 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -58,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -4, @@ -68,6 +67,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -106,7 +114,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json index 5d922568..29eeadd3 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json index e9e2ddcc..fda8822a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json index 7b635b2b..cb6807b0 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -2, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +75,7 @@ "y": -2, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_stable_1.json b/jigsaw-pieces/village/plains/houses/plains_stable_1.json index d0dc7fe7..1bfbbfcb 100644 --- a/jigsaw-pieces/village/plains/houses/plains_stable_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_stable_1.json @@ -106,6 +106,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -144,7 +153,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_stable_2.json b/jigsaw-pieces/village/plains/houses/plains_stable_2.json index 1f52be41..dd7985b1 100644 --- a/jigsaw-pieces/village/plains/houses/plains_stable_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_stable_2.json @@ -67,6 +67,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -105,7 +114,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_tannery_1.json b/jigsaw-pieces/village/plains/houses/plains_tannery_1.json index 6000f630..d20ee768 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tannery_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tannery_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_3.json b/jigsaw-pieces/village/plains/houses/plains_temple_3.json index 30f0e8db..96d9a741 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_3.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_4.json b/jigsaw-pieces/village/plains/houses/plains_temple_4.json index fa751405..3d5f1191 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_4.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json index d39f79f4..ed43eade 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json index 4520062f..184d8330 100644 --- a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +60,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index 1038709b..cd281bdb 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index 3f305cb7..df9a9388 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 71b62c06..fe050440 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index b7e449e9..15eac696 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index bcf61586..aa3986d3 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index fd3f71be..2686a044 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index ec518b4e..3bc4e3d8 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index b521e7ce..ed6765a0 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 6ecc4f8f..dc38e020 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index fddad95f..3652dc22 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -3,7 +3,6 @@ { "targetName": "village/plains/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json index 17180857..095d2e25 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -32,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -2, @@ -59,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 3, "y": -2, @@ -73,7 +71,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 3, "y": -2, @@ -135,6 +132,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -173,7 +179,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json index 04ea90e1..d68f619d 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -3, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -3, @@ -147,6 +145,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -185,7 +192,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json index c9e80eda..0363f3b7 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -3, "y": -2, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -2, @@ -60,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -2, @@ -148,6 +145,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -186,7 +192,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json index 83afb72c..cabd22db 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -4, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -3, "y": -4, @@ -108,6 +106,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:oak_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -146,7 +153,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index 7d922ce1..65ed3be8 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -10,7 +10,6 @@ "y": -1, "z": 0 }, - "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json index 8727d91f..9d59d1a3 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json index 56aca500..027d6b79 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json @@ -80,6 +80,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -118,7 +129,7 @@ "y": -1, "z": 0 }, - "mode": "PAINT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json index 10826f9a..6d7e70da 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "PAINT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json b/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json index b79fbb6d..df28affd 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json index 54777354..094eae51 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json index e3df9b4d..e3f0d81e 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json b/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json index 484f532a..f1bafbdc 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json b/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json index 0e67d2ae..3f87708c 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json @@ -54,6 +54,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +103,7 @@ "y": -2, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json index 490c87af..fa477184 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json @@ -13,6 +13,17 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json index 184faf12..af9f9cd3 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json @@ -13,6 +13,17 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json index b64ede7f..383ff107 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_library_1.json b/jigsaw-pieces/village/savanna/houses/savanna_library_1.json index 496d0ea6..f494265c 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_library_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_library_1.json @@ -13,6 +13,17 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json b/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json index 17c8df9e..d660f28d 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json index 0697b5b4..d884af58 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json @@ -54,6 +54,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +103,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json index 15ce0cc0..8c2e5551 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json @@ -54,6 +54,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +103,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json b/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json index bc697d95..1ec4f5c8 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json b/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json index 13cd545b..3313e279 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json @@ -13,6 +13,17 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json index 28ec2c57..9cb6d3b5 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json index 4737a2e3..db51825c 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json index a44164dd..919a0443 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json index a32a68d6..15f90e9a 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json index ed444a25..185dd3d6 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json index 276a10b1..0efd611d 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json index 9291ea2e..50d17bdc 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json index 724cf7f1..34cea284 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -2, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json b/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json index 6b677c83..1f4eb3f2 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json @@ -13,6 +13,17 @@ "direction": "EAST_POSITIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json b/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json index 17787518..0be6fc76 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json b/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json index 78886361..cd295b20 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json b/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json index 9021eb24..ad39a160 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json index f162cc9f..e34f9e04 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json @@ -13,6 +13,17 @@ "direction": "EAST_POSITIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json index 0494d6e6..c8ae92e3 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:yellow_terracotta"}, + {"block": "minecraft:orange_terracotta"}, + {"block": "minecraft:acacia_planks"}, + {"block": "minecraft:stripped_acacia_log"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index 33208b7a..58296114 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 089c9df7..9050fc14 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index cf2a6ffb..42dd86cf 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index a09cb3de..9c209361 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index 8006ebf9..91cab370 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index 7a5075df..09bb32b6 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index da6833f4..4dd0f2f9 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index be5c42b2..6a023218 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index f2cb511d..28809a64 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index dd0792b4..10a45d00 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 81d89505..c6213f2d 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 91578d90..58fc6128 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 7f3f0f5e..1cf976dc 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -3,7 +3,6 @@ { "targetName": "village/savanna/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index e1597c69..6eb60d2d 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -10,7 +10,6 @@ "y": -1, "z": 0 }, - "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json index feb03f3d..93759e7f 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json @@ -28,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +76,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json index 58031fd1..36f7ffe7 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json @@ -41,6 +41,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +89,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json index 071c9230..ac45fc25 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json index cda51775..1ea57e00 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json @@ -13,6 +13,16 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json index 645932e9..7adc4e97 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json @@ -28,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +76,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json index ce546aca..c0add50a 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json @@ -28,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +76,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json index 92e2a753..0a7fc861 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json b/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json index 1f59b697..f1eb8aa3 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json b/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json index cbc13ac0..877112ed 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json b/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json index 84ff96d5..4bad701a 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json @@ -13,6 +13,16 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": -2, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json index 527c651c..56eaa764 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_library_1.json b/jigsaw-pieces/village/snowy/houses/snowy_library_1.json index 6a0abda5..b276e391 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_library_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_library_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json index e3c88824..06abb81b 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json @@ -13,6 +13,16 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json index eab5154d..9a1ad0dd 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json index 6c455734..50b861ed 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -20,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -43,6 +41,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +89,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json index 5e2b705a..fa7067fe 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -4, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 2, "y": -4, @@ -43,6 +41,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +89,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json index 2f66b275..7c648141 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -20,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -43,6 +41,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +89,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json index 4287e1de..ef1da92a 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json @@ -28,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +76,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json index 7f38cc83..d51fbbf3 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json index 009c663c..36cb2e35 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -4, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json index ffe8258b..9dd10a90 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json index fe889334..5d823fd7 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json index ed8052c9..5a8f4743 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -2, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json index 416ab283..c87fed8c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -4, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json index 8668389d..ea06fb0d 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -3, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json index c3026650..ce008470 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -2, @@ -29,6 +28,16 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +76,7 @@ "y": -2, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json b/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json index f32d5046..3d87bf2c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json b/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json index c765d0a7..4b0e6ada 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json b/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json index 04884b98..7a7599dc 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": 0, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json b/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json index ae079acd..b6b6a23e 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json @@ -13,6 +13,16 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:diorite"}, + {"block": "minecraft:grass_block"}, + {"block": "minecraft:spruce_planks"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +61,7 @@ "y": -1, "z": 0 }, - "mode": "FAST_MAX_HEIGHT", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index 6c05953a..ac1197d1 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -134,6 +133,15 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:sand"}, + {"block": "minecraft:sandstone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_02.json b/jigsaw-pieces/village/snowy/streets/corner_02.json index dd9563e7..e807cd13 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index 2396efb5..227c907b 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 5a248144..bb656c4f 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index 155194da..c5eccb5e 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 83030311..21b6290a 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index c8d4105f..5e713c5a 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index bc7181a5..7b6bc290 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index 67f75c3b..da08b3ed 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index c7d59299..2b9cda7a 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -3,7 +3,6 @@ { "targetName": "village/snowy/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json index 744d825b..25ffd14f 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -5, "y": -4, @@ -85,7 +84,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 2, "y": -4, diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json index e9524102..cc048eb8 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -2, @@ -59,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -2, diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json index 58f636da..d80884fb 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json @@ -32,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -3, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -3, diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index 0be358f3..8de179cb 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -10,7 +10,6 @@ "y": -1, "z": 0 }, - "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json b/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json index efb874d0..245c52a5 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json index 58b8b27b..78bbb1b2 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json index dbe1009f..ba5dc613 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json index febd48d9..a9810fc4 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json index b4dee98a..020346be 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json index 44dcee75..131acc48 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json @@ -67,6 +67,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -105,7 +116,7 @@ "y": -2, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json index 8394d197..efda98f9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json index ba63203a..8186a127 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json index 01687027..be9a0d73 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json index 96a4924d..2e37b541 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json @@ -54,6 +54,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -92,7 +103,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json index 81ac063e..71abf15a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json index 2608f554..db6a28f9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": 0, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": 0, @@ -43,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json index 2a920d6c..f5251297 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -5, @@ -33,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -1, @@ -43,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +90,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json index 1b1fa342..a578d16c 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -32,7 +32,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -69,6 +67,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -107,7 +116,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json index d5913af9..c86a8489 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -3, @@ -20,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 2, "y": -3, @@ -43,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -81,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json index 4f7efc72..f7a5c215 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json index 94753d20..97ce46da 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": -1, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json index 573b88be..33f35b23 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -3, @@ -29,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json index b41e5b1b..35a4ddbe 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json index 4a39bbfb..7ea34218 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json index b6ff9e07..54a1165f 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -1, "y": -3, @@ -42,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -80,7 +90,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json index 468c7946..3bc874c5 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -29,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -67,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json index c00cac47..bc395d59 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json @@ -13,6 +13,17 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json index 21ac9035..972caa78 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json @@ -13,6 +13,17 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json index 89c5848c..473a72b4 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json @@ -41,6 +41,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -79,7 +90,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json index 36bee9e9..49f971ab 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json @@ -13,6 +13,17 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -51,7 +62,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json index 55d73a64..34b551a4 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json @@ -28,6 +28,17 @@ } ], "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [ + {"block": "minecraft:grass_block"}, + {"block": "minecraft:stripped_spruce_log"}, + {"block": "minecraft:spruce_planks"}, + {"block": "minecraft:cobblestone"} + ], + "marker": "villager" + }], "overStilt": 0, "chance": 1, "meld": false, @@ -66,7 +77,7 @@ "y": 0, "z": 0 }, - "mode": "VACUUM", + "mode": "STILT", "carvingSupport": "SURFACE_ONLY", "snow": 0, "underwater": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index 7c8a7157..a8acfebe 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -126,7 +125,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index 4fd02121..3b661636 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -87,7 +86,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index 5ce0f70d..2043d03c 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -48,7 +47,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_01.json b/jigsaw-pieces/village/taiga/streets/crossroad_01.json index a876cf66..fab792f3 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_01.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_01.json @@ -176,7 +176,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_02.json b/jigsaw-pieces/village/taiga/streets/crossroad_02.json index cf91d8d8..532d139d 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_02.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_02.json @@ -124,7 +124,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_03.json b/jigsaw-pieces/village/taiga/streets/crossroad_03.json index cec83302..d0d04e51 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_03.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_03.json @@ -98,7 +98,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_04.json b/jigsaw-pieces/village/taiga/streets/crossroad_04.json index 30918fd9..86397354 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_04.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_04.json @@ -59,7 +59,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_05.json b/jigsaw-pieces/village/taiga/streets/crossroad_05.json index de0530df..4f2dabf6 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_05.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_05.json @@ -59,7 +59,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_06.json b/jigsaw-pieces/village/taiga/streets/crossroad_06.json index 0d5b5505..e2173d3e 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_06.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_06.json @@ -72,7 +72,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index eed0cc4f..eef47e55 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -113,7 +112,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index 11c0963c..df7d2e49 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -87,7 +86,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index d0e81665..24220cec 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -113,7 +112,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 2284b65b..50536b17 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -74,7 +73,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index 01ba2f07..696e884c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -126,7 +125,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index 7cef33ee..f0a7654c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -269,7 +268,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index 9112ac83..b2d88317 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -3,7 +3,6 @@ { "targetName": "village/taiga/villagers/unemployed", "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -74,7 +73,7 @@ "meld": false, "density": 1, "edit": [{ - "find": [{"block": "minecraft:grass_path"}], + "find": [{"block": "minecraft:dirt_path"}], "replace": { "palette": [ {"block": "minecraft:gravel"}, diff --git a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json index 06d3ebad..d00d7d06 100644 --- a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json +++ b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json @@ -6,7 +6,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -9, "y": -1, @@ -59,7 +58,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -1, @@ -73,7 +71,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -2, "y": -1, diff --git a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json index 0004c1e4..eed9c77c 100644 --- a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json +++ b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json @@ -19,7 +19,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -4, "y": -2, @@ -46,7 +45,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": -3, "y": -2, @@ -86,7 +84,6 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 4, "y": -2, diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index f193030e..d8df1829 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -10,7 +10,6 @@ "y": -1, "z": 0 }, - "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, diff --git a/jigsaw-structures/desert-pyramid.json b/jigsaw-structures/desert-pyramid.json index ad9279ce..41b6b47f 100644 --- a/jigsaw-structures/desert-pyramid.json +++ b/jigsaw-structures/desert-pyramid.json @@ -1,7 +1,4 @@ { "maxDepth": 1, - "pieces": ["pyramid-desert"], - "feature": { - "entitySpawners": ["dank"] - } + "pieces": ["pyramid-desert"] } diff --git a/jigsaw-structures/igloo.json b/jigsaw-structures/igloo.json index 9dc931c3..5639e7df 100644 --- a/jigsaw-structures/igloo.json +++ b/jigsaw-structures/igloo.json @@ -1,7 +1,4 @@ { - "feature": { - "entitySpawners": ["villager"] - }, "maxDepth": 3, "pieces": [ "igloo/top1", diff --git a/jigsaw-structures/jungle-pyramid.json b/jigsaw-structures/jungle-pyramid.json index c9e9fd00..208f3b7f 100644 --- a/jigsaw-structures/jungle-pyramid.json +++ b/jigsaw-structures/jungle-pyramid.json @@ -1,7 +1,4 @@ { "maxDepth": 1, - "pieces": ["jungle_pyramid/jungle_pyramid"], - "feature": { - "entitySpawners": ["dank"] - } + "pieces": ["jungle_pyramid/jungle_pyramid"] } diff --git a/jigsaw-structures/mush-huts.json b/jigsaw-structures/mush-huts.json index 4efcc7ef..e606d736 100644 --- a/jigsaw-structures/mush-huts.json +++ b/jigsaw-structures/mush-huts.json @@ -2,7 +2,5 @@ "pieces": ["mushhut/paths/path4"], "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - } + "feature": {"entitySpawners": ["villager"]} } diff --git a/jigsaw-structures/pillager_outpost.json b/jigsaw-structures/pillager_outpost.json index d1fba5a4..9cbfd752 100644 --- a/jigsaw-structures/pillager_outpost.json +++ b/jigsaw-structures/pillager_outpost.json @@ -7,6 +7,7 @@ ], "terminate": true, "feature": { + "blockRadius": 10, "entitySpawners": [ "pillager", "pillager-respawn" diff --git a/jigsaw-structures/stronghold.json b/jigsaw-structures/stronghold.json index 65ff064f..4bc2ee4e 100644 --- a/jigsaw-structures/stronghold.json +++ b/jigsaw-structures/stronghold.json @@ -3,7 +3,5 @@ "pieces": ["stronghold/portal/main"], "terminate": false, "lockY": 14, - "feature": { - "entitySpawners": ["silverfish"] - } + "feature": {"entitySpawners": ["silverfish"]} } diff --git a/jigsaw-structures/village-hot.json b/jigsaw-structures/village-hot.json index c4027383..4b5edada 100644 --- a/jigsaw-structures/village-hot.json +++ b/jigsaw-structures/village-hot.json @@ -1,9 +1,6 @@ { "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "village/desert/town_centers/desert_meeting_point_1", "village/desert/town_centers/desert_meeting_point_2", diff --git a/jigsaw-structures/village-jap.json b/jigsaw-structures/village-jap.json index a2306493..6949cd0b 100644 --- a/jigsaw-structures/village-jap.json +++ b/jigsaw-structures/village-jap.json @@ -1,9 +1,6 @@ { "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "houses/jap/j5", "houses/jap/j4", diff --git a/jigsaw-structures/village-savanna.json b/jigsaw-structures/village-savanna.json index 06bf1e67..1b56abde 100644 --- a/jigsaw-structures/village-savanna.json +++ b/jigsaw-structures/village-savanna.json @@ -1,9 +1,6 @@ { "maxDepth": 3, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "village/savanna/town_centers/savanna_meeting_point_1", "village/savanna/town_centers/savanna_meeting_point_2", diff --git a/jigsaw-structures/village-snowy.json b/jigsaw-structures/village-snowy.json index 143b2264..8d33c895 100644 --- a/jigsaw-structures/village-snowy.json +++ b/jigsaw-structures/village-snowy.json @@ -1,9 +1,6 @@ { "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "village/snowy/town_centers/snowy_meeting_point_1", "village/snowy/town_centers/snowy_meeting_point_2", diff --git a/jigsaw-structures/village-temperate.json b/jigsaw-structures/village-temperate.json index 606614e7..a71fc4b4 100644 --- a/jigsaw-structures/village-temperate.json +++ b/jigsaw-structures/village-temperate.json @@ -1,9 +1,6 @@ { "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "village/plains/town_centers/plains_fountain_01", "village/plains/town_centers/plains_meeting_point_1", diff --git a/jigsaw-structures/village-tundra.json b/jigsaw-structures/village-tundra.json index 52960524..a65f209d 100644 --- a/jigsaw-structures/village-tundra.json +++ b/jigsaw-structures/village-tundra.json @@ -1,9 +1,6 @@ { "maxDepth": 5, "terminate": true, - "feature": { - "entitySpawners": ["villager"] - }, "pieces": [ "village/taiga/town_centers/taiga_meeting_point_1", "village/taiga/town_centers/taiga_meeting_point_2" diff --git a/markers/dank.json b/markers/dank.json new file mode 100644 index 00000000..37315915 --- /dev/null +++ b/markers/dank.json @@ -0,0 +1,4 @@ +{ + "removeOnChange": true, + "spawners": ["dank"] +} diff --git a/markers/villager.json b/markers/villager.json new file mode 100644 index 00000000..3d52b9ea --- /dev/null +++ b/markers/villager.json @@ -0,0 +1,5 @@ +{ + "removeOnChange": true, + "spawners": ["villager"], + "exhaustionChance": 0.75 +} diff --git a/objects/trees/jungle/nh-lgeneric1.iob b/objects/trees/jungle/nh-lgeneric1.iob new file mode 100644 index 00000000..8104ea6c Binary files /dev/null and b/objects/trees/jungle/nh-lgeneric1.iob differ diff --git a/objects/trees/jungle/nh-lgeneric2.iob b/objects/trees/jungle/nh-lgeneric2.iob new file mode 100644 index 00000000..9d9fe060 Binary files /dev/null and b/objects/trees/jungle/nh-lgeneric2.iob differ diff --git a/objects/trees/jungle/nh-lgeneric3.iob b/objects/trees/jungle/nh-lgeneric3.iob new file mode 100644 index 00000000..a9da1f06 Binary files /dev/null and b/objects/trees/jungle/nh-lgeneric3.iob differ diff --git a/objects/trees/jungle/nh-lgeneric5.iob b/objects/trees/jungle/nh-lgeneric5.iob new file mode 100644 index 00000000..7a8af803 Binary files /dev/null and b/objects/trees/jungle/nh-lgeneric5.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index a04c0b52..3e13aa9f 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -261,7 +261,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" } ], diff --git a/regions/hot.json b/regions/hot.json index 36483a37..6ded85b9 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -329,7 +329,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" } ], diff --git a/regions/temperate.json b/regions/temperate.json index 9dca3288..09843435 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -11,6 +11,7 @@ "temperate/oak-forest", "temperate/osaka-red-forest", "temperate/birch-forest", + "temperate/reaching-forest", "temperate/lush-plains" ], "shoreBiomes": [ @@ -227,7 +228,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" } ], diff --git a/regions/tropical.json b/regions/tropical.json index 5630286a..859163e8 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -251,7 +251,7 @@ "chance": 0.2 } ], - "mode": "VACUUM", + "mode": "FAST_MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" } ], diff --git a/regions/tundra.json b/regions/tundra.json index 76c13583..c7ae9a5a 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -14,6 +14,7 @@ "tundra/mountains-cliffs", "mountain/hills", "mountain/forest-hills", + "tundra/frosted-peaks", "mountain/forest", "mountain/plains", "mountain/cliffs", diff --git a/spawners/villager.json b/spawners/villager.json index 6a1c6cfa..43dce48d 100644 --- a/spawners/villager.json +++ b/spawners/villager.json @@ -1,4 +1,12 @@ -{"initialSpawns": [{ - "entity": "standard/passive/villager", - "rarity": 1 -}]} +{ + "spawns": [ + { + "entity": "standard/passive/villager", + "rarity": 1 + }, + { + "entity": "standard/passive/golem", + "rarity": 24 + } + ] +} \ No newline at end of file