From 171d2e7871ec6476227a73ae8b2d9d856297d90f Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 28 Jul 2021 21:09:00 -0700 Subject: [PATCH 01/46] V++ --- dimensions/overworld.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 86437976..de647dc9 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,5 +1,5 @@ { - "version": 2002, + "version": 2003, "OVERWORLD-VERSION": 3.134, "name": "Overworld", "environment": "NORMAL", From 88483d2aa0ee7a0069af3e7679f8187c645c26c3 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 06:52:23 -0700 Subject: [PATCH 02/46] Frozen Generation Mundation --- biomes/frozen/hills.json | 9 ++------- biomes/frozen/mountain-middle.json | 7 +------ biomes/frozen/mountains.json | 9 ++------- biomes/frozen/peak.json | 9 ++------- biomes/frozen/pine-plains.json | 9 ++------- biomes/frozen/pines.json | 9 ++------- biomes/frozen/plains.json | 9 ++------- biomes/frozen/redwood-forest.json | 10 +++------- biomes/frozen/spruce-plains.json | 4 ++-- biomes/frozen/vander.json | 9 ++------- 10 files changed, 20 insertions(+), 64 deletions(-) diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json index d8ec6c82..32628e2f 100644 --- a/biomes/frozen/hills.json +++ b/biomes/frozen/hills.json @@ -44,13 +44,8 @@ "generators": [ { "generator": "plain", - "max": 16, - "min": 12 - }, - { - "generator": "mountain", - "max": 10, - "min": 6 + "max": 26, + "min": 18 } ], "jigsawStructures": [ diff --git a/biomes/frozen/mountain-middle.json b/biomes/frozen/mountain-middle.json index 35a7e38d..5d0d2ce6 100644 --- a/biomes/frozen/mountain-middle.json +++ b/biomes/frozen/mountain-middle.json @@ -7,12 +7,7 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, + "max": 180, "min": 30 } ], diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json index feae7da5..3420ec32 100644 --- a/biomes/frozen/mountains.json +++ b/biomes/frozen/mountains.json @@ -63,13 +63,8 @@ ], "generators": [ { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 7, - "max": 48, + "min": 10, + "max": 150, "generator": "mountain" } ], diff --git a/biomes/frozen/peak.json b/biomes/frozen/peak.json index 3fa151ed..bb72d71e 100644 --- a/biomes/frozen/peak.json +++ b/biomes/frozen/peak.json @@ -92,13 +92,8 @@ ], "generators": [ { - "min": 14, - "max": 24, - "generator": "plain" - }, - { - "min": 56, - "max": 96, + "min": 60, + "max": 180, "generator": "mountain" } ], diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json index 2e6efbdb..4cca7799 100644 --- a/biomes/frozen/pine-plains.json +++ b/biomes/frozen/pine-plains.json @@ -8,13 +8,8 @@ "generators": [ { "generator": "plain", - "max": 10, - "min": 6 - }, - { - "generator": "mountain", - "max": 6, - "min": 7 + "max": 16, + "min": 13 } ], "customDerivitives": [{ diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json index c96813f4..66e7e98e 100644 --- a/biomes/frozen/pines.json +++ b/biomes/frozen/pines.json @@ -48,13 +48,8 @@ }], "generators": [ { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 48, + "min": 16, + "max": 64, "generator": "mountain" } ], diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json index edca9236..30a726ca 100644 --- a/biomes/frozen/plains.json +++ b/biomes/frozen/plains.json @@ -7,13 +7,8 @@ "children": ["frozen/hills"], "generators": [ { - "min": 4, - "max": 6, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, + "min": 6, + "max": 11, "generator": "plain" } ], diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json index d3ff12b4..7b422c47 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -5,14 +5,10 @@ "rarity": 1, "vanillaDerivative": "SNOWY_TAIGA", "generators": [ + { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 48, + "min": 16, + "max": 64, "generator": "mountain" } ], diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json index e335af91..15e1d727 100644 --- a/biomes/frozen/spruce-plains.json +++ b/biomes/frozen/spruce-plains.json @@ -57,8 +57,8 @@ ], "generators": [{ "generator": "smooth-dunes", - "max": 6, - "min": 3 + "max": 10, + "min": 4 }], "decorators": [{ "chance": 1, diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json index 2014bd10..4100ffae 100644 --- a/biomes/frozen/vander.json +++ b/biomes/frozen/vander.json @@ -73,13 +73,8 @@ }], "generators": [ { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 44, + "min": 15, + "max": 64, "generator": "mountain" } ], From 44cb55661b9893e50b543d53e93be9287bc8f055 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 06:52:29 -0700 Subject: [PATCH 03/46] Hot Generation Mundation --- biomes/hot/mountain-cliffs.json | 9 ++------- biomes/hot/mountain-middle.json | 7 +------ biomes/hot/mountain-plains.json | 4 ++-- biomes/hot/mountain.json | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/biomes/hot/mountain-cliffs.json b/biomes/hot/mountain-cliffs.json index 78487d8c..fc16ad71 100644 --- a/biomes/hot/mountain-cliffs.json +++ b/biomes/hot/mountain-cliffs.json @@ -6,13 +6,8 @@ "vanillaDerivative": "DESERT", "generators": [ { - "min": 11, - "max": 32, - "generator": "plain" - }, - { - "min": 12, - "max": 62, + "min": 23, + "max": 84, "generator": "cracked-cliffs" } ], diff --git a/biomes/hot/mountain-middle.json b/biomes/hot/mountain-middle.json index bf349f43..286ff781 100644 --- a/biomes/hot/mountain-middle.json +++ b/biomes/hot/mountain-middle.json @@ -7,12 +7,7 @@ "generators": [ { "generator": "mountain", - "max": 80, - "min": 0 - }, - { - "generator": "plain", - "max": 80, + "max": 160, "min": 40 } ], diff --git a/biomes/hot/mountain-plains.json b/biomes/hot/mountain-plains.json index cd2377da..9d64e0be 100644 --- a/biomes/hot/mountain-plains.json +++ b/biomes/hot/mountain-plains.json @@ -6,8 +6,8 @@ "vanillaDerivative": "DESERT", "generators": [{ "generator": "smooth-dunes", - "max": 2, - "min": 3 + "max": 8, + "min": 11 }], "layers": [ { diff --git a/biomes/hot/mountain.json b/biomes/hot/mountain.json index c37ee90d..c7816db8 100644 --- a/biomes/hot/mountain.json +++ b/biomes/hot/mountain.json @@ -7,7 +7,7 @@ "generators": [{ "min": 90, "max": 140, - "generator": "plain" + "generator": "mountain" }], "jigsawStructures": [ { From 447e4fe121268bb33229e978586f185218d1dab7 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 06:59:27 -0700 Subject: [PATCH 04/46] Mountain Generation Mundation --- biomes/mountain/cliffs.json | 14 ++------------ biomes/mountain/forest-hills.json | 9 ++------- biomes/mountain/forest.json | 9 ++------- biomes/mountain/main.json | 9 ++------- biomes/mountain/middle.json | 7 +------ biomes/mountain/mountain.json | 9 ++------- biomes/mountain/plain-hills.json | 9 ++------- biomes/mountain/plains.json | 9 ++------- 8 files changed, 15 insertions(+), 60 deletions(-) diff --git a/biomes/mountain/cliffs.json b/biomes/mountain/cliffs.json index 01eb29b8..8c656bca 100644 --- a/biomes/mountain/cliffs.json +++ b/biomes/mountain/cliffs.json @@ -6,18 +6,8 @@ "derivative": "TAIGA_MOUNTAINS", "generators": [ { - "min": 11, - "max": 32, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" - }, - { - "min": 12, - "max": 62, + "min": 26, + "max": 90, "generator": "cracked-cliffs" } ], diff --git a/biomes/mountain/forest-hills.json b/biomes/mountain/forest-hills.json index 6829bd67..f40218af 100644 --- a/biomes/mountain/forest-hills.json +++ b/biomes/mountain/forest-hills.json @@ -5,15 +5,10 @@ "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ - { - "generator": "plain", - "max": 5, - "min": 2 - }, { "generator": "mountain", - "max": 11, - "min": 32 + "max": 35, + "min": 11 } ], "jigsawStructures": [ diff --git a/biomes/mountain/forest.json b/biomes/mountain/forest.json index f7382a3d..d00b5cf7 100644 --- a/biomes/mountain/forest.json +++ b/biomes/mountain/forest.json @@ -5,15 +5,10 @@ "derivative": "TAIGA_MOUNTAINS", "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ - { - "generator": "plain", - "max": 5, - "min": 2 - }, { "generator": "mountain", - "max": 11, - "min": 32 + "max": 31, + "min": 15 } ], "jigsawStructures": [ diff --git a/biomes/mountain/main.json b/biomes/mountain/main.json index dbb8f45d..90b368be 100644 --- a/biomes/mountain/main.json +++ b/biomes/mountain/main.json @@ -7,14 +7,9 @@ "children": ["mountain/middle"], "generators": [ { - "min": 70, - "max": 120, + "min": 73, + "max": 125, "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" } ], "jigsawStructures": [ diff --git a/biomes/mountain/middle.json b/biomes/mountain/middle.json index ac72b96e..7c9255c0 100644 --- a/biomes/mountain/middle.json +++ b/biomes/mountain/middle.json @@ -7,12 +7,7 @@ "generators": [ { "generator": "mountain", - "max": 95, - "min": 0 - }, - { - "generator": "plain", - "max": 95, + "max": 190, "min": 40 } ], diff --git a/biomes/mountain/mountain.json b/biomes/mountain/mountain.json index c4dfb5c9..52ca88de 100644 --- a/biomes/mountain/mountain.json +++ b/biomes/mountain/mountain.json @@ -7,14 +7,9 @@ "children": ["mountain/middle"], "generators": [ { - "min": 70, - "max": 140, + "min": 73, + "max": 145, "generator": "mountain" - }, - { - "min": 3, - "max": 5, - "generator": "plain" } ], "jigsawStructures": [ diff --git a/biomes/mountain/plain-hills.json b/biomes/mountain/plain-hills.json index ac2b04bd..cf49de27 100644 --- a/biomes/mountain/plain-hills.json +++ b/biomes/mountain/plain-hills.json @@ -7,13 +7,8 @@ "generators": [ { "generator": "smooth-dunes", - "max": 10, - "min": 5 - }, - { - "generator": "small-cliffs", - "max": 8, - "min": -3 + "max": 20, + "min": 10 } ], "jigsawStructures": [ diff --git a/biomes/mountain/plains.json b/biomes/mountain/plains.json index 131da6bd..170cd43b 100644 --- a/biomes/mountain/plains.json +++ b/biomes/mountain/plains.json @@ -15,15 +15,10 @@ } ], "generators": [ - { - "generator": "plain", - "max": 10, - "min": 6 - }, { "generator": "mountain", - "max": 13, - "min": 11 + "max": 23, + "min": 15 } ], "layers": [ From 73dfd5a55957771c992ed1549d4927145ac03643 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:03:05 -0700 Subject: [PATCH 05/46] Sav/Swamp Generation Mundation --- biomes/savanna/savanna.json | 9 ++------- biomes/swamp/marsh.json | 2 +- biomes/swamp/roofed-forest.json | 2 +- biomes/swamp/roofed-wayward.json | 4 ++-- biomes/swamp/willow-forest.json | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index 333fc9c7..8c440d89 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -14,13 +14,8 @@ }], "generators": [ { - "min": 7, - "max": 15, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, + "min": 10, + "max": 20, "generator": "plain" } ], diff --git a/biomes/swamp/marsh.json b/biomes/swamp/marsh.json index e26802d3..604b38ec 100644 --- a/biomes/swamp/marsh.json +++ b/biomes/swamp/marsh.json @@ -7,7 +7,7 @@ "children": ["swamp/marsh-rotten"], "generators": [{ "min": 3, - "max": 6, + "max": 10, "generator": "mountain" }], "customDerivitives": [{ diff --git a/biomes/swamp/roofed-forest.json b/biomes/swamp/roofed-forest.json index bc9f8776..10c17c3c 100644 --- a/biomes/swamp/roofed-forest.json +++ b/biomes/swamp/roofed-forest.json @@ -109,7 +109,7 @@ ], "objects": [ { - "chance": 0.05, + "chance": 0.1, "edit": [ { "find": [{"block": "spruce_leaves"}], diff --git a/biomes/swamp/roofed-wayward.json b/biomes/swamp/roofed-wayward.json index aad39689..1206a13c 100644 --- a/biomes/swamp/roofed-wayward.json +++ b/biomes/swamp/roofed-wayward.json @@ -6,8 +6,8 @@ "vanillaDerivative": "DARK_FOREST", "children": ["swamp/sea/lake"], "generators": [{ - "min": -7, - "max": -3, + "min": 4, + "max": 11, "generator": "plain" }], "layers": [ diff --git a/biomes/swamp/willow-forest.json b/biomes/swamp/willow-forest.json index 8f54c7d7..384a50db 100644 --- a/biomes/swamp/willow-forest.json +++ b/biomes/swamp/willow-forest.json @@ -11,7 +11,7 @@ "generators": [{ "min": 4, "max": 11, - "generator": "plain" + "generator": "mountain" }], "layers": [ { From 0af0ffc47c9447817d420887c2e683de7f4edcea Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:07:58 -0700 Subject: [PATCH 06/46] Tropical Generation Mundation --- biomes/tropical/mountain-middle.json | 9 +- biomes/tropical/rainforest-wicked-child.json | 2 +- .../tropical/rainforest-wicked-village.json | 111 ------------------ biomes/tropical/rainforest-wicked.json | 2 +- biomes/tropical/volcanoes-lava.json | 9 +- biomes/tropical/volcanoes.json | 7 +- 6 files changed, 7 insertions(+), 133 deletions(-) delete mode 100644 biomes/tropical/rainforest-wicked-village.json diff --git a/biomes/tropical/mountain-middle.json b/biomes/tropical/mountain-middle.json index eea59fca..a10b0729 100644 --- a/biomes/tropical/mountain-middle.json +++ b/biomes/tropical/mountain-middle.json @@ -8,13 +8,8 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 10 - }, - { - "generator": "plain", - "max": 50, - "min": 10 + "max": 150, + "min": 20 } ], "customDerivitives": [{ diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json index bdd21146..dd6a86c3 100644 --- a/biomes/tropical/rainforest-wicked-child.json +++ b/biomes/tropical/rainforest-wicked-child.json @@ -7,7 +7,7 @@ "generators": [{ "min": 3, "max": 50, - "generator": "plain" + "generator": "mountain" }], "customDerivitives": [{ "id": "tropical_rainforest_wicked_child", diff --git a/biomes/tropical/rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json deleted file mode 100644 index 7889f825..00000000 --- a/biomes/tropical/rainforest-wicked-village.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "name": "Tropical Rainforest Wicked Village", - "derivative": "MODIFIED_JUNGLE", - "rarity": 1, - "color": "#00FF06", - "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", - "generators": [{ - "min": 3, - "max": 50, - "generator": "plain" - }], - "customDerivitives": [{ - "id": "tropical_rainforest_wicked_village", - "foliageColor": "#478F04", - "grassColor": "#197300", - "category": "jungle", - "waterColor": "#3AB2A2", - "waterFogColor": "#3AB2A2" - }], - "layers": [ - { - "style": {"style": "FRACTAL_BILLOW_IRIS"}, - "zoom": 0.6, - "palette": [ - {"block": "grass_block"}, - {"block": "jungle_leaves"}, - { - "weight": 2, - "block": "grass_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [{"block": "dirt"}] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": {"style": "STATIC"}, - "palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "stone"} - ] - } - ], - "effects": [{ - "particleAltX": 0.301, - "particleAltY": -0.33885, - "particleAltZ": 0.301, - "chance": 1, - "particleEffect": "TOTEM", - "particleOffset": 12, - "interval": 550, - "particleCount": 0 - }], - "decorators": [ - { - "chance": 0.45, - "variance": {"style": "IRIS"}, - "zoom": 0.1, - "palette": [ - {"block": "tall_grass"}, - {"block": "grass"} - ], - "style": { - "style": "FRACTAL_BILLOW_IRIS", - "fracture": {"style": "STATIC"} - } - }, - { - "chance": 0.1, - "verticalZoom": 88, - "variance": {"style": "IRIS"}, - "zoom": 10, - "palette": [{ - "weight": 3, - "block": "jungle_wood" - }], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "IRIS"} - }, - { - "chance": 0.5, - "verticalZoom": 88, - "variance": {"style": "STATIC"}, - "zoom": 10, - "palette": [ - {"block": "grass"}, - {"block": "tall_grass"} - ], - "style": {"style": "STATIC"}, - "heightVariance": {"style": "STATIC"} - } - ], - "wall": { - "style": {"style": "IRIS"}, - "zoom": 0.1, - "palette": [ - {"block": "stripped_jungle_wood"}, - {"block": "jungle_leaves"}, - {"block": "stripped_jungle_wood"}, - {"block": "jungle_leaves"}, - {"block": "stripped_jungle_wood"}, - {"block": "jungle_leaves"}, - {"block": "stripped_jungle_wood"} - ] - } -} diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json index 432d8d71..ee229dad 100644 --- a/biomes/tropical/rainforest-wicked.json +++ b/biomes/tropical/rainforest-wicked.json @@ -20,7 +20,7 @@ "generators": [{ "min": 3, "max": 50, - "generator": "plain" + "generator": "mountain" }], "layers": [ { diff --git a/biomes/tropical/volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json index 3cd864da..2fdfda6b 100644 --- a/biomes/tropical/volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -14,13 +14,8 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, - "min": 30 + "max": 180, + "min": 3 } ], "layers": [ diff --git a/biomes/tropical/volcanoes.json b/biomes/tropical/volcanoes.json index f601ec47..d240ebdd 100644 --- a/biomes/tropical/volcanoes.json +++ b/biomes/tropical/volcanoes.json @@ -15,12 +15,7 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, + "max": 180, "min": 30 } ], From f95d90bf24dd892d0b7518ab16b8b954be8de5ea Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:09:54 -0700 Subject: [PATCH 07/46] Tundra Generation Mundation --- biomes/tundra/forest-cliffs.json | 9 ++------- biomes/tundra/mountains-cliffs.json | 9 ++------- biomes/tundra/redwood-cliffs.json | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json index 0baa4701..62707cf2 100644 --- a/biomes/tundra/forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -6,13 +6,8 @@ "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ { - "generator": "smooth-dunes", - "max": 14, - "min": 8 - }, - { - "min": 12, - "max": 17, + "min": 19, + "max": 28, "generator": "plain-cliffs" } ], diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json index bd206410..7a704669 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -6,13 +6,8 @@ "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ { - "min": 11, - "max": 32, - "generator": "mountain" - }, - { - "min": 12, - "max": 62, + "min": 23, + "max": 94, "generator": "plain-cliffs" } ], diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index 94512bb2..905bf701 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -6,13 +6,8 @@ "vanillaDerivative": "DARK_FOREST", "generators": [ { - "min": 15, - "max": 25, - "generator": "mountain" - }, - { - "min": 12, - "max": 25, + "min": 30, + "max": 50, "generator": "plain-cliffs" } ], From 99b524056c50e5aa9ea12ec25fd4dfeafebed3da Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:16:58 -0700 Subject: [PATCH 08/46] Fixed Failed categorization --- biomes/frozen/mountain-middle.json | 1 + biomes/frozen/mountains.json | 1 + biomes/frozen/peak.json | 1 + biomes/frozen/pine-hills.json | 1 + biomes/frozen/pine-plains.json | 1 + biomes/frozen/pines.json | 1 + biomes/frozen/plains.json | 1 + biomes/frozen/redwood-forest.json | 1 + biomes/frozen/spruce-plains.json | 1 + biomes/frozen/vander.json | 1 + biomes/mushroom/forest-hills.json | 1 + biomes/mushroom/forest.json | 1 + biomes/mushroom/plains.json | 1 + biomes/savanna/acacia-denmyre.json | 1 + biomes/savanna/cliff.json | 1 + biomes/savanna/forest.json | 1 + biomes/savanna/plateau.json | 1 + biomes/savanna/savanna.json | 1 + biomes/swamp/marsh-rotten.json | 1 + biomes/swamp/marsh.json | 1 + biomes/tropical/mountain-water.json | 1 + biomes/tropical/volcanic-plains.json | 1 + biomes/tropical/volcanoes-lava.json | 1 + biomes/tundra/taiga.json | 1 + 24 files changed, 24 insertions(+) diff --git a/biomes/frozen/mountain-middle.json b/biomes/frozen/mountain-middle.json index 5d0d2ce6..c33117bb 100644 --- a/biomes/frozen/mountain-middle.json +++ b/biomes/frozen/mountain-middle.json @@ -12,6 +12,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_mountain_middle", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/mountains.json b/biomes/frozen/mountains.json index 3420ec32..f76ad786 100644 --- a/biomes/frozen/mountains.json +++ b/biomes/frozen/mountains.json @@ -9,6 +9,7 @@ "frozen/vander" ], "customDerivitives": [{ + "category": "icy", "id": "frozen_mountains", "waterColor": "#216FC4", "downfallType": "snow", diff --git a/biomes/frozen/peak.json b/biomes/frozen/peak.json index bb72d71e..1166c6eb 100644 --- a/biomes/frozen/peak.json +++ b/biomes/frozen/peak.json @@ -4,6 +4,7 @@ "color": "#48ADEA", "vanillaDerivative": "SNOWY_TAIGA_MOUNTAINS", "customDerivitives": [{ + "category": "icy", "id": "frozen_peak", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json index 46438735..bdc93d35 100644 --- a/biomes/frozen/pine-hills.json +++ b/biomes/frozen/pine-hills.json @@ -32,6 +32,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_pine_hills", "downfallType": "snow", "temperature": -3, diff --git a/biomes/frozen/pine-plains.json b/biomes/frozen/pine-plains.json index 4cca7799..2362e01b 100644 --- a/biomes/frozen/pine-plains.json +++ b/biomes/frozen/pine-plains.json @@ -13,6 +13,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_pine_plains", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json index 66e7e98e..8d4d1219 100644 --- a/biomes/frozen/pines.json +++ b/biomes/frozen/pines.json @@ -37,6 +37,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_pines", "waterColor": "#216FC4", "downfallType": "snow", diff --git a/biomes/frozen/plains.json b/biomes/frozen/plains.json index 30a726ca..7595292f 100644 --- a/biomes/frozen/plains.json +++ b/biomes/frozen/plains.json @@ -13,6 +13,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_plains", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/redwood-forest.json b/biomes/frozen/redwood-forest.json index 7b422c47..4afc3d96 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -13,6 +13,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_redwood_forest", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json index 15e1d727..070a0e1a 100644 --- a/biomes/frozen/spruce-plains.json +++ b/biomes/frozen/spruce-plains.json @@ -33,6 +33,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_spruce_plains", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/vander.json b/biomes/frozen/vander.json index 4100ffae..82321955 100644 --- a/biomes/frozen/vander.json +++ b/biomes/frozen/vander.json @@ -31,6 +31,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_vander", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/mushroom/forest-hills.json b/biomes/mushroom/forest-hills.json index c12bd2cc..4b7ad8bb 100644 --- a/biomes/mushroom/forest-hills.json +++ b/biomes/mushroom/forest-hills.json @@ -10,6 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ + "category": "mushroom", "id": "mushroom_hills", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", diff --git a/biomes/mushroom/forest.json b/biomes/mushroom/forest.json index d65591b0..7d489f2d 100644 --- a/biomes/mushroom/forest.json +++ b/biomes/mushroom/forest.json @@ -6,6 +6,7 @@ "vanillaDerivative": "MUSHROOM_FIELDS", "children": ["mushroom/forest-hills"], "customDerivitives": [{ + "category": "mushroom", "id": "mushroom_forest", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", diff --git a/biomes/mushroom/plains.json b/biomes/mushroom/plains.json index fa90da06..28ea8e1a 100644 --- a/biomes/mushroom/plains.json +++ b/biomes/mushroom/plains.json @@ -5,6 +5,7 @@ "derivative": "MUSHROOM_FIELDS", "vanillaDerivative": "MUSHROOM_FIELDS", "customDerivitives": [{ + "category": "mushroom", "id": "mushroom_plains", "waterColor": "#B4B2FF", "foliageColor": "#C9A9FF", diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index 1a08e35c..d17f1604 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -5,6 +5,7 @@ "color": "#FFB641", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "id": "savanna_acacia_denmyre", "grassColor": "#DFD545", "foliageColor": "#D6A513", diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json index e0c49f17..157d8e3f 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -6,6 +6,7 @@ "vanillaDerivative": "SAVANNA", "children": ["savanna/acacia-denmyre"], "customDerivitives": [{ + "category": "savanna", "id": "savanna_cliffs", "grassColor": "#DFD545", "foliageColor": "#D6A513", diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json index 3130c251..de8a498c 100644 --- a/biomes/savanna/forest.json +++ b/biomes/savanna/forest.json @@ -5,6 +5,7 @@ "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "id": "savanna_forest", "grassColor": "#E2EF3B", "foliageColor": "#D6A513", diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json index 4779aa61..c610b8dd 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -5,6 +5,7 @@ "color": "#805B21", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "id": "savanna_plateau", "grassColor": "#FFCB31", "foliageColor": "#D6A513", diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index 8c440d89..bb64ad9a 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -6,6 +6,7 @@ "vanillaDerivative": "SAVANNA", "children": ["savanna/cliff"], "customDerivitives": [{ + "category": "savanna", "id": "savanna", "grassColor": "#DFD545", "foliageColor": "#D6A513", diff --git a/biomes/swamp/marsh-rotten.json b/biomes/swamp/marsh-rotten.json index be746567..7d5199e5 100644 --- a/biomes/swamp/marsh-rotten.json +++ b/biomes/swamp/marsh-rotten.json @@ -10,6 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ + "category": "swamp", "id": "swamp_marsh_rotten", "waterColor": "#684D1A", "grassColor": "#5C581A", diff --git a/biomes/swamp/marsh.json b/biomes/swamp/marsh.json index 604b38ec..272c846c 100644 --- a/biomes/swamp/marsh.json +++ b/biomes/swamp/marsh.json @@ -11,6 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ + "category": "swamp", "id": "swamp_marsh_rotten", "waterColor": "#684D1A", "grassColor": "#5C581A", diff --git a/biomes/tropical/mountain-water.json b/biomes/tropical/mountain-water.json index 8e89ab3b..0620358a 100644 --- a/biomes/tropical/mountain-water.json +++ b/biomes/tropical/mountain-water.json @@ -9,6 +9,7 @@ "min": 2 }], "customDerivitives": [{ + "category": "forest", "id": "tropical_mountain_water", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/volcanic-plains.json b/biomes/tropical/volcanic-plains.json index 9a4c9df8..5319496f 100644 --- a/biomes/tropical/volcanic-plains.json +++ b/biomes/tropical/volcanic-plains.json @@ -11,6 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ + "category": "extreme_hills", "id": "tropical_volcanic_plains", "grassColor": "#9BC20D", "foliageColor": "#9CD320", diff --git a/biomes/tropical/volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json index 2fdfda6b..46fee4f2 100644 --- a/biomes/tropical/volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -5,6 +5,7 @@ "rarity": 1, "color": "#50AF52", "customDerivitives": [{ + "category": "extreme_hills", "id": "tropical_volcanic_lava", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index 70cd085b..18306c0b 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -10,6 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ + "category": "forest", "id": "tundra_taiga", "grassColor": "#7BA13C", "waterColor": "#80B4C6", From 68339edea71aef2c4b3e94ca35ec9e52c01c7c66 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:35:03 -0700 Subject: [PATCH 09/46] GRASS OCEAN??? --- biomes/hot/desert-dunes-red.json | 4 +- biomes/hot/desert-dunes.json | 4 +- biomes/mountain/sea/lake.json | 65 -------------------------------- dimensions/overworld.json | 1 - regions/tundra.json | 2 +- 5 files changed, 5 insertions(+), 71 deletions(-) delete mode 100644 biomes/mountain/sea/lake.json diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index f0a437ad..52093d77 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -55,7 +55,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, @@ -77,7 +77,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 8f0e0133..3eb1c438 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -55,7 +55,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, @@ -78,7 +78,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/mountain/sea/lake.json b/biomes/mountain/sea/lake.json deleted file mode 100644 index 48d08533..00000000 --- a/biomes/mountain/sea/lake.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "Mountain Lake", - "derivative": "TAIGA_MOUNTAINS", - "vanillaDerivative": "TAIGA_MOUNTAINS", - "color": "#4196FF", - "generators": [{ - "generator": "plain", - "max": -10, - "min": -30 - }], - "layers": [ - { - "minHeight": 1, - "maxHeight": 1, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3.3 - }, - "palette": [{"block": "grass_block"}] - }, - { - "minHeight": 2, - "maxHeight": 4, - "slopeCondition": {"minimumSlope": 4}, - "palette": [ - {"block": "gravel"}, - {"block": "cyan_terracotta"} - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "slopeCondition": {"minimumSlope": 4}, - "palette": [ - {"block": "stone"}, - {"block": "stone"}, - {"block": "cobblestone"} - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 4 - }, - "palette": [{"block": "grass_block"}] - }, - { - "minHeight": 3, - "maxHeight": 3, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3 - }, - "palette": [{"block": "dirt"}] - } - ], - "wall": {"palette": [ - {"block": "stone"}, - {"block": "andesite"}, - {"block": "gravel"}, - {"block": "cyan_terracotta"} - ]} -} diff --git a/dimensions/overworld.json b/dimensions/overworld.json index de647dc9..3125ce0c 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -8,7 +8,6 @@ "continentZoom": 1, "continentalStyle": { "style": "NOWHERE_CELLULAR", - "zoom": 5 }, "landChance": 0.69, diff --git a/regions/tundra.json b/regions/tundra.json index 11e1bfba..98b44ada 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -23,7 +23,7 @@ "tundra/shore/beach", "tundra/shore/beach-stone" ], - "seaBiomes": ["mountain/sea/lake"], + "seaBiomes": ["mountain/sea/river"], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 From 1ee809449a6697fcdf91cea5cdba740acf4a8ac7 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:57:22 -0700 Subject: [PATCH 10/46] Categorical Fixes --- biomes/frozen/hills.json | 1 + biomes/frozen/mountain-cliffs.json | 10 ++++++++-- biomes/frozen/mountain.json | 1 + biomes/savanna/cliff.json | 9 +++++---- biomes/tropical/volcanic-plains.json | 2 +- biomes/tropical/volcanoes-lava.json | 2 +- biomes/tropical/volcanoes.json | 1 + biomes/tundra/forest-cliffs.json | 18 +++++++++++------- biomes/tundra/mountains-cliffs.json | 1 + biomes/tundra/redwood-cliffs.json | 18 +++++++++++------- 10 files changed, 41 insertions(+), 22 deletions(-) diff --git a/biomes/frozen/hills.json b/biomes/frozen/hills.json index 32628e2f..aaf1cb57 100644 --- a/biomes/frozen/hills.json +++ b/biomes/frozen/hills.json @@ -32,6 +32,7 @@ } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_hills", "waterColor": "#216FC4", "downfallType": "snow", diff --git a/biomes/frozen/mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json index ad096637..700b7bd8 100644 --- a/biomes/frozen/mountain-cliffs.json +++ b/biomes/frozen/mountain-cliffs.json @@ -34,6 +34,7 @@ } ], "customDerivitives": [{ + "category": "extreme_hills", "id": "frozen_mountaincliff", "downfallType": "snow", "temperature": -3, @@ -58,9 +59,14 @@ } ], "generators": [{ - "min": 14, - "max": 65, + "min": 4, + "max": 30, "generator": "plain-cliffs" + }, + { + "min": 10, + "max": 40, + "generator": "mountain" }], "biomeScatter": [ "ICE_SPIKES", diff --git a/biomes/frozen/mountain.json b/biomes/frozen/mountain.json index 1eeb6f6d..e83968b7 100644 --- a/biomes/frozen/mountain.json +++ b/biomes/frozen/mountain.json @@ -10,6 +10,7 @@ "frozen/mountain-cliffs" ], "customDerivitives": [{ + "category": "extreme_hills", "id": "frozen_mountain", "waterColor": "#216FC4", "downfallType": "snow", diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json index 157d8e3f..217fdbc8 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -13,10 +13,11 @@ "waterColor": "#E2EF3B", "downfallType": "none" }], - "generators": [{ - "min": 9, - "max": 28, - "generator": "plain" + "generators": [ + { + "min": 5, + "max": 15, + "generator": "plain-cliffs" }], "jigsawStructures": [ { diff --git a/biomes/tropical/volcanic-plains.json b/biomes/tropical/volcanic-plains.json index 5319496f..90557e76 100644 --- a/biomes/tropical/volcanic-plains.json +++ b/biomes/tropical/volcanic-plains.json @@ -11,7 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "category": "extreme_hills", + "category": "jungle", "id": "tropical_volcanic_plains", "grassColor": "#9BC20D", "foliageColor": "#9CD320", diff --git a/biomes/tropical/volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json index 46fee4f2..4c640127 100644 --- a/biomes/tropical/volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -5,7 +5,7 @@ "rarity": 1, "color": "#50AF52", "customDerivitives": [{ - "category": "extreme_hills", + "category": "jungle", "id": "tropical_volcanic_lava", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", diff --git a/biomes/tropical/volcanoes.json b/biomes/tropical/volcanoes.json index d240ebdd..0d556db0 100644 --- a/biomes/tropical/volcanoes.json +++ b/biomes/tropical/volcanoes.json @@ -5,6 +5,7 @@ "rarity": 1, "color": "#609F61", "customDerivitives": [{ + "category": "jungle", "id": "tropical_volcano", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json index 62707cf2..83402b7f 100644 --- a/biomes/tundra/forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -4,14 +4,18 @@ "rarity": 3, "color": "#3E8F7A", "vanillaDerivative": "TAIGA_MOUNTAINS", - "generators": [ - { - "min": 19, - "max": 28, - "generator": "plain-cliffs" - } - ], + "generators": [{ + "min": 4, + "max": 10, + "generator": "plain-cliffs" + }, + { + "min": 10, + "max": 40, + "generator": "mountain" + }], "customDerivitives": [{ + "category": "forest", "id": "tundra_forest_cliffs", "grassColor": "#56B16F", "waterColor": "#80B4C6", diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json index 7a704669..c5d660a5 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -12,6 +12,7 @@ } ], "customDerivitives": [{ + "category": "forest", "id": "tundra_magical_forest_cliffs", "grassColor": "#B0A747", "waterColor": "#80B4C6", diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index 905bf701..64fc51d0 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -4,14 +4,18 @@ "rarity": 3, "color": "#5DA899", "vanillaDerivative": "DARK_FOREST", - "generators": [ - { - "min": 30, - "max": 50, - "generator": "plain-cliffs" - } - ], + "generators": [{ + "min": 4, + "max": 10, + "generator": "plain-cliffs" + }, + { + "min": 10, + "max": 40, + "generator": "mountain" + }], "customDerivitives": [{ + "category": "forest", "id": "tundra_redwood_cliffs", "grassColor": "#A17E3C", "waterColor": "#80B4C6", From f78df44f2dd083425605abf537fc49903e388916 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 07:58:41 -0700 Subject: [PATCH 11/46] ddd --- biomes/swamp/cambian-drift.json | 1 + 1 file changed, 1 insertion(+) diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json index ab2dd275..a852d6e9 100644 --- a/biomes/swamp/cambian-drift.json +++ b/biomes/swamp/cambian-drift.json @@ -87,6 +87,7 @@ "objects": [ { "chance": 0.7, + "translate": {"y": -2}, "density": 2, "edit": [ { From 7def48d2b8e6829efb61d4228fbe733633f20508 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 08:00:41 -0700 Subject: [PATCH 12/46] Sav WaTER fIX --- biomes/savanna/acacia-denmyre.json | 2 +- biomes/savanna/cliff.json | 2 +- biomes/savanna/forest.json | 2 +- biomes/savanna/plateau.json | 2 +- biomes/savanna/savanna.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/biomes/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index d17f1604..db2c4147 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -9,7 +9,7 @@ "id": "savanna_acacia_denmyre", "grassColor": "#DFD545", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [{ diff --git a/biomes/savanna/cliff.json b/biomes/savanna/cliff.json index 217fdbc8..3d9f51a7 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -10,7 +10,7 @@ "id": "savanna_cliffs", "grassColor": "#DFD545", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [ diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json index de8a498c..bab2a026 100644 --- a/biomes/savanna/forest.json +++ b/biomes/savanna/forest.json @@ -9,7 +9,7 @@ "id": "savanna_forest", "grassColor": "#E2EF3B", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [{ diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json index c610b8dd..a449ffa8 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -9,7 +9,7 @@ "id": "savanna_plateau", "grassColor": "#FFCB31", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [{ diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index bb64ad9a..3be6d6bf 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -10,7 +10,7 @@ "id": "savanna", "grassColor": "#DFD545", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [ From 5ed4bab02fa0a3a2505a0a4dfbf29e22bb826a50 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 08:02:30 -0700 Subject: [PATCH 13/46] Sphinx Attachment Issues --- biomes/hot/desert-dunes-red.json | 2 +- biomes/hot/desert-dunes.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index 52093d77..da1f7ad8 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -77,7 +77,7 @@ }, { "chance": 0.0015, - "mode": "MIN_HEIGHT", + "mode": "VACUUM", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 3eb1c438..1ec9a6f1 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -55,7 +55,7 @@ }, { "chance": 0.0015, - "mode": "MIN_HEIGHT", + "mode": "VACUUM", "rotation": { "yAxis": { "min": 0, From c63149e5bac6e16c2853d82bc16f30363cc74cb7 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 29 Jul 2021 08:14:08 -0700 Subject: [PATCH 14/46] more --- biomes/savanna/plateau.json | 2 +- biomes/swamp/cambian-drift.json | 2 +- biomes/temperate/shore/beach.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/biomes/savanna/plateau.json b/biomes/savanna/plateau.json index a449ffa8..e632bd1c 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -15,7 +15,7 @@ "generators": [{ "min": 13, "max": 26, - "generator": "canyon-steep" + "generator": "mountain" }], "jigsawStructures": [ { diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json index a852d6e9..0858fc4c 100644 --- a/biomes/swamp/cambian-drift.json +++ b/biomes/swamp/cambian-drift.json @@ -91,7 +91,7 @@ "density": 2, "edit": [ { - "find": [{"block": "birch_leaves"}], + "find": [{"block": "oak_leaves"}], "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { diff --git a/biomes/temperate/shore/beach.json b/biomes/temperate/shore/beach.json index 1962aad6..df16be32 100644 --- a/biomes/temperate/shore/beach.json +++ b/biomes/temperate/shore/beach.json @@ -18,7 +18,7 @@ { "minHeight": 1, "maxHeight": 3, - "palette": [{"block": "dirt"}] + "palette": [{"block": "sandstone"}] } ], "decorators": [ From 5b5975aa564ea491ab3ae5db5fd515a04026b919 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Thu, 29 Jul 2021 14:57:46 -0400 Subject: [PATCH 15/46] Tweak rare hills --- generators/rare-hills.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/rare-hills.json b/generators/rare-hills.json index db25552e..5a42cf45 100644 --- a/generators/rare-hills.json +++ b/generators/rare-hills.json @@ -8,7 +8,7 @@ { "style": { "style": "SIMPLEX_CELLS", - "zoom": 7.55, + "zoom": 3.55, "fracture": { "style": "IRIS", "zoom": 2.25, From 1a1a2f3d20ef7bedf1362be0aff27a76fa42b382 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 30 Jul 2021 05:09:28 -0400 Subject: [PATCH 16/46] Swamp beach tweaks --- biomes/swamp/shore/beach.json | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/biomes/swamp/shore/beach.json b/biomes/swamp/shore/beach.json index 843af0d7..94308af2 100644 --- a/biomes/swamp/shore/beach.json +++ b/biomes/swamp/shore/beach.json @@ -17,9 +17,8 @@ "zoom": 0.25, "palette": [ {"block": "dirt"}, - {"block": "podzol"}, {"block": "coarse_dirt"}, - {"block": "podzol"} + {"block": "rooted_dirt"} ] }, { @@ -36,7 +35,7 @@ ], "decorators": [ { - "chance": 0.004, + "chance": 0.01, "variance": {"style": "STATIC"}, "zoom": 0.3, "palette": [ @@ -52,27 +51,14 @@ ], "style": {"style": "STATIC"} }, - { - "chance": 9.0E-5, - "variance": {"style": "STATIC"}, - "zoom": 0.3, - "palette": [ - {"block": "wither_rose"}, - {"block": "red_mushroom"}, - {"block": "brown_mushroom"}, - {"block": "poppy"} - ], - "style": {"style": "STATIC"} - }, { "partOf": "SHORE_LINE", - "chance": 0.09, + "chance": 0.29, "stackMin": 1, "stackMax": 4, "palette": [{"block": "sugar_cane"}], "style": { - "style": "IRIS", - "zoom": 0.65 + "style": "STATIC" }, "heightVariance": { "style": "STATIC" From 3b883c4f725087136831d65b5090fb498ebea2f3 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 30 Jul 2021 08:33:39 -0700 Subject: [PATCH 17/46] Sapling implementation // custom trees --- regions/frozen.json | 42 +++++++++++++ regions/hot.json | 45 ++++++++++++++ regions/mushroom.json | 137 ++++++++++++++++++++++++++++++++++++++++- regions/swamp.json | 26 +++++++- regions/temperate.json | 2 - regions/tropical.json | 22 +++++++ regions/tundra.json | 26 +++++++- 7 files changed, 295 insertions(+), 5 deletions(-) diff --git a/regions/frozen.json b/regions/frozen.json index 57094852..c5b1ab90 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -118,7 +118,49 @@ "cold-treasure" ] }, + "blockDrops": [ + { + "blocks": [{"block": "stone"}], + "drops": [{"rarity": 1, "maxAmount": 2, "minAmount": 1, "type": "spruce_sapling"}] + } + ], "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE"]}], + "place": [ + "trees/oak/truegeneric1", + "trees/oak/truegeneric2", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5" + ] + }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["REDWOOD"]}], + "place": [ + "trees/spruce/twirl1", + "trees/spruce/twirl2", + "trees/spruce/twirl3", + "trees/spruce/twirl4", + "trees/spruce/twirl5" + ] + }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 2, "width": 2} ], "treeTypes": ["MEGA_REDWOOD"]}], + "place": [ + "trees/spruce/twirl6", + "trees/spruce/twirl7", + "trees/spruce/twirl8", + "trees/spruce/twirl9", + "trees/spruce/twirl10" + ] + }, { "heightmap": { "seed": 1337, diff --git a/regions/hot.json b/regions/hot.json index 1ff8c166..80b038b7 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -31,6 +31,7 @@ "zoom": 5 } }, + "entityInitialSpawns": [ { "entity": "chicken", @@ -168,6 +169,50 @@ "replaceVanillaDrops": true }], "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0 }}, + "translate": {"y": 0, "yRandom": -1}, + "trees": [{"anySize":true, "treeTypes": ["ACACIA"], "sizes": [{"depth": 1, "width": 1}]}], + "place": [ + "trees/acacia/savannaF1", + "trees/acacia/savannaF2", + "trees/acacia/savannaF3", + "trees/acacia/savannaF4", + "trees/acacia/savannaF5", + "trees/acacia/savannaF6", + "trees/acacia/savannaF7", + "trees/acacia/savannaF8", + "trees/acacia/savannaF9", + "trees/acacia/savannaF10", + "trees/acacia/savannaF11", + "trees/acacia/savannaF13", + "trees/acacia/savannaF14" + ] + }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0 }}, + "translate": {"y": 0, "yRandom": -1}, + "trees": [{"anySize":true, "treeTypes": ["TREE", "BIG_TREE"], "sizes": [{"depth": 1, "width": 1}, {"width": 2, "depth": 2}]}], + "edit": [ + {"find": [{"block": "spruce_fence"}, {"block": "spruce_slab"}], "replace": {"palette": [{"block": "acacia_wood"}]}},{"find": [{"block": "oak_wood"}, {"block": "dark_oak_wood"}], "replace": {"palette": [{"block": "acacia_wood"}]}}, {"find": [{"block": "oak_leaves"},{"block": "dark_oak_leaves"}], "replace": {"palette": [{"block": "acacia_leaves"}]}}], + "place": [ + "trees/oak/truegeneric1", + "trees/oak/truegeneric2", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/hoakgeneric1", + "trees/oak/hoakgeneric2", + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8" + ] + }, { "heightmap": { "seed": 1337, diff --git a/regions/mushroom.json b/regions/mushroom.json index 0e619623..fb3c2424 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -59,7 +59,142 @@ ], "varience": 4 }], - "objects": [{ + "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["RED_MUSHROOM"]}], + "edit": [{"find": [{"block": "brown_mushroom_block"}],"replace": {"palette": [{"block": "brown_mushroom_block"}]}}], + "place": [ + "trees/mushroom/redgeneric3", + "trees/mushroom/redgeneric4", + "trees/mushroom/redgeneric5", + "trees/mushroom/redgeneric6", + "trees/mushroom/redgeneric7", + "trees/mushroom/redgeneric8", + "trees/mushroom/redgeneric9", + "trees/mushroom/redgeneric10", + "trees/mushroom/redgeneric11" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["BROWN_MUSHROOM"]}], + "edit": [{"find": [{"block": "red_mushroom_block"}],"replace": {"palette": [{"block": "brown_mushroom_block"}]}}], + "place": [ + "trees/mushroom/redgeneric3", + "trees/mushroom/redgeneric4", + "trees/mushroom/redgeneric5", + "trees/mushroom/redgeneric6", + "trees/mushroom/redgeneric7", + "trees/mushroom/redgeneric8", + "trees/mushroom/redgeneric9", + "trees/mushroom/redgeneric10", + "trees/mushroom/redgeneric11" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0, + "density": 2, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["WARPED_FUNGUS"]}], + "edit": [ + { + "find": [{"block": "brown_mushroom_block"}], + "replace": {"palette": [{"block": "warped_hyphae"}]} + }, + { + "find": [{"block": "red_mushroom_block"}], + "replace": {"palette": [{"block": "warped_wart_block"}]} + }, + { + "find": [{"block": "mushroom_stem"}], + "replace": {"palette": [{"block": "blackstone"}]} + } + ], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/mushroom/redgeneric1", + "trees/mushroom/redgeneric2", + "trees/mushroom/browngeneric1", + "trees/mushroom/browngeneric2", + "trees/mushroom/redgeneric3", + "trees/mushroom/redgeneric4", + "trees/mushroom/redgeneric5", + "trees/mushroom/redgeneric6", + "trees/mushroom/redgeneric7", + "trees/mushroom/redgeneric8", + "trees/mushroom/redgeneric9", + "trees/mushroom/redgeneric10" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0, + "density": 2, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["CRIMSON_FUNGUS"]}], + "edit": [ + { + "find": [{"block": "brown_mushroom_block"}], + "replace": {"palette": [{"block": "crimson_hyphae"}]} + }, + { + "find": [{"block": "red_mushroom_block"}], + "replace": {"palette": [{"block": "nether_wart_block"}]} + } + ], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "trees/mushroom/redgeneric1", + "trees/mushroom/redgeneric2", + "trees/mushroom/browngeneric1", + "trees/mushroom/browngeneric2", + "trees/mushroom/redgeneric3", + "trees/mushroom/redgeneric4", + "trees/mushroom/redgeneric5", + "trees/mushroom/redgeneric6", + "trees/mushroom/redgeneric7", + "trees/mushroom/redgeneric8", + "trees/mushroom/redgeneric9", + "trees/mushroom/redgeneric10" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { "heightmap": { "seed": 1337, "style": { diff --git a/regions/swamp.json b/regions/swamp.json index 8b2624a2..ae856250 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -86,7 +86,31 @@ "varience": 4 } ], - "objects": [{ + "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0 }}, + "translate": {"y": 0, "yRandom": -1}, + "trees": [{"anySize":true, "treeTypes": ["TREE", "BIG_TREE" , "REDWOOD", "MEGA_REDWOOD", "TALL_REDWOOD", "DARK_OAK"], "sizes": [{"depth": 1, "width": 1}, {"width": 2, "depth": 2}]}], + "edit": [ + {"find": [{"block": "spruce_fence"}, {"block": "spruce_slab"}], "replace": {"palette": [{"block": "spruce_wood"}]}},{"find": [{"block": "oak_wood"}, {"block": "dark_oak_wood"}], "replace": {"palette": [{"block": "dark_oak_wood"},{"block": "spruce_wood"}], "style": {"style": "SIMPLEX", "zoom": 0.25}}}, {"find": [{"block": "oak_leaves"}], "replace": {"palette": [{"block": "dark_oak_leaves"}]}}], + "place": [ + "trees/oak/truegeneric1", + "trees/oak/truegeneric2", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/hoakgeneric1", + "trees/oak/hoakgeneric2", + "trees/oak/hoakgeneric3", + "trees/oak/hoakgeneric4", + "trees/oak/hoakgeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8" + ] + }, + { "heightmap": { "seed": 1337, "style": { diff --git a/regions/temperate.json b/regions/temperate.json index 3733c885..1ec4184a 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -77,10 +77,8 @@ "objects": [ { "chance": 0, - "mode": "MIN_HEIGHT", "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE"]}], - "translate": {"y": 7}, "place": [ "trees/oak/truegeneric1", "trees/oak/truegeneric2", diff --git a/regions/tropical.json b/regions/tropical.json index f7181650..e955a4f9 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -136,6 +136,28 @@ ] }, "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth":1, "width": 1} ], "treeTypes": ["JUNGLE"]}], + "edit": [{"find": [{"block": "jungle_log"}], "replace": {"palette": [{"block": "jungle_wood"}]}},{"find": [{"block": "oak_log"}, {"block": "oak_wood"}], "replace": {"palette": [{"block": "jungle_wood"}]}}], + "translate": {"y": -1}, + "place": [ + "trees/jungle/cocogeneric2", + "trees/jungle/cocogeneric3", + "trees/jungle/cocogeneric4", + "trees/jungle/cocogeneric5", + "trees/jungle/lgeneric1", + "trees/jungle/lgeneric2", + "trees/jungle/lgeneric3", + "trees/jungle/lgeneric4", + "trees/jungle/lgeneric5", + "trees/jungle/lgeneric6", + "trees/jungle/lgeneric7", + "trees/jungle/lgeneric8", + "trees/jungle/lgeneric9" + ] + }, { "heightmap": { "seed": 1337, diff --git a/regions/tundra.json b/regions/tundra.json index 98b44ada..aea96a5d 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -104,7 +104,31 @@ "cold-food" ] }, - "objects": [{ + "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0 }}, + "translate": {"y": 0, "yRandom": -1}, + "trees": [{"anySize":true, "treeTypes": ["REDWOOD", "MEGA_REDWOOD", "TALL_REDWOOD"], "sizes": [{"depth": 1, "width": 1}, {"width": 2, "depth": 2}]}], + "edit": [ + {"find": [{"block": "spruce_fence"}, {"block": "spruce_slab"}], "replace": {"palette": [{"block": "spruce_wood"}]}},{"find": [{"block": "oak_wood"}, {"block": "dark_oak_wood"}], "replace": {"palette": [{"block": "spruce_wood"}]}}, {"find": [{"block": "oak_leaves"}], "replace": {"palette": [{"block": "spruce_leaves"}]}}], + "place": [ + "trees/oak/truegeneric1", + "trees/oak/truegeneric2", + "trees/oak/truegeneric3", + "trees/oak/truegeneric4", + "trees/oak/truegeneric5", + "trees/oak/hoakgeneric6", + "trees/oak/hoakgeneric7", + "trees/oak/hoakgeneric8", + "trees/spruce/vgeneric1", + "trees/spruce/vgeneric2", + "trees/spruce/vgeneric3", + "trees/spruce/vgeneric4", + "trees/spruce/vgeneric5" + ] + }, + { "heightmap": { "seed": 1337, "style": { From 12545904aacb86399aa8fdcf90d24895d01d0f36 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 30 Jul 2021 08:33:48 -0700 Subject: [PATCH 18/46] Fixes --- biomes/frozen/pine-hills.json | 6 +++++- biomes/tropical/plains.json | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json index bdc93d35..a3f8586c 100644 --- a/biomes/frozen/pine-hills.json +++ b/biomes/frozen/pine-hills.json @@ -80,7 +80,11 @@ {"block": "andesite"} ]}, "objects": [{ - "edit": [{ + "edit": [ + { + "find": [{"block": "dark_oak_fence"}, {"block": "dark_oak_fence_gate"}], "replace": {"palette": [{"block": "spruce_wood"}]} + }, + { "find": [{"block": "spruce_leaves"}], "replace": { "style": { diff --git a/biomes/tropical/plains.json b/biomes/tropical/plains.json index 2152d7c3..0b24d590 100644 --- a/biomes/tropical/plains.json +++ b/biomes/tropical/plains.json @@ -108,7 +108,7 @@ ], "translate": { "x": 0, - "y": -5, + "y": -2, "z": 0 } }, @@ -134,6 +134,7 @@ "trees/jungle/lgeneric8", "trees/jungle/lgeneric9" ], + "edit": [{"find": [{"block": "oak_log"}, {"block": "oak_wood"}], "replace": {"palette": [{"block": "jungle_wood"}]}}], "chance": 1, "rotation": { "enabled": true, From 5f662ed5ac2cabaef4643f856c61d30f3b778045 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 16:06:05 -0700 Subject: [PATCH 19/46] Entity Inital Spawns REMOVED Will re implement later with the intended system --- biomes/ocean/deep.json | 8 --- biomes/temperate/birch-denmyre.json | 14 ----- biomes/temperate/birch-forest.json | 22 +------- biomes/temperate/birch-thin.json | 22 +------- biomes/temperate/combo-forest.json | 23 +------- biomes/temperate/flower-forest.json | 11 ---- biomes/temperate/highlands.json | 14 ----- biomes/temperate/island.json | 8 --- biomes/temperate/longtree-forest.json | 16 +----- biomes/temperate/lush-plains-red.json | 16 +----- biomes/temperate/lush-plains-yellow.json | 16 +----- biomes/temperate/lush-plains.json | 16 +----- biomes/temperate/meadows.json | 14 ----- biomes/temperate/oak-denmyre.json | 22 +------- biomes/temperate/oak-forest.json | 20 ------- biomes/temperate/plains.json | 14 ----- biomes/temperate/plateau.json | 22 +------- biomes/temperate/sakura-pink-forest.json | 20 ------- biomes/temperate/shore/beach.json | 8 --- biomes/tundra/autumn.json | 14 ----- biomes/tundra/forest.json | 14 ----- biomes/tundra/mountains-cliffs.json | 20 ------- biomes/tundra/mountains.json | 20 ------- biomes/tundra/redwood-cliffs.json | 14 ----- biomes/tundra/redwood-forest.json | 14 ----- biomes/tundra/sequia-redwoods.json | 16 +----- biomes/tundra/taiga.json | 16 +----- regions/frozen.json | 34 +----------- regions/hot.json | 33 ------------ regions/mushroom.json | 13 ----- regions/swamp.json | 32 ----------- regions/temperate.json | 26 --------- regions/tropical.json | 68 ------------------------ regions/tundra.json | 33 +----------- 34 files changed, 13 insertions(+), 660 deletions(-) diff --git a/biomes/ocean/deep.json b/biomes/ocean/deep.json index 0686905b..5fa65e20 100644 --- a/biomes/ocean/deep.json +++ b/biomes/ocean/deep.json @@ -134,13 +134,5 @@ "structures/shipupsidedownbackhalfdegraded" ] } - ], - "entityInitialSpawns": [ - { - "entity": "dolphin", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 100 - } ] } diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json index 9b852312..e6210a19 100644 --- a/biomes/temperate/birch-denmyre.json +++ b/biomes/temperate/birch-denmyre.json @@ -210,20 +210,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index bcc51a7a..5dbdea0d 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -221,25 +221,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index 600e8655..f0ba798c 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -193,25 +193,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + } } diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 8b01e466..578b0187 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -318,26 +318,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "biomeScatter": ["FOREST"], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 5b31b383..5a3494ec 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -61,17 +61,6 @@ "structure": "village-temperate" } ], - "entityInitialSpawns": [{ - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 20 - }, { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }], "objects": [ { "chance": 0.07, diff --git a/biomes/temperate/highlands.json b/biomes/temperate/highlands.json index 459b922b..68d872f8 100644 --- a/biomes/temperate/highlands.json +++ b/biomes/temperate/highlands.json @@ -55,20 +55,6 @@ ] } ], - "entityInitialSpawns": [ - { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "decorators": [ { "chance": 0.003, diff --git a/biomes/temperate/island.json b/biomes/temperate/island.json index cb7ec4cc..4e9b5cdd 100644 --- a/biomes/temperate/island.json +++ b/biomes/temperate/island.json @@ -127,13 +127,5 @@ "biomeScatter": [ "FOREST", "PLAINS" - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } ] } diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 03bd9e73..4273ae60 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -408,19 +408,5 @@ } ], "style": {"style": "STATIC"} - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 3e2bb614..d0d450d8 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -223,19 +223,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 4a4d458b..45a8ca22 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -223,19 +223,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index 2add643f..f8d3875d 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -251,19 +251,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index aaa02124..3e86b798 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -213,20 +213,6 @@ } ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - } - ], "biomeStyle": {"style": "SIMPLEX"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index a93177ad..582610c9 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -220,25 +220,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + } } diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 27314c2f..9e1d19bd 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -235,25 +235,5 @@ } } } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } ] } diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 4fd1af6e..467d9a7b 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -313,20 +313,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "biomeStyle": {"style": "SIMPLEX"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json index 69724edc..464ed3b8 100644 --- a/biomes/temperate/plateau.json +++ b/biomes/temperate/plateau.json @@ -311,25 +311,5 @@ {"block": "stone"} ] }, - "biomeScatter": ["FOREST"], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + "biomeScatter": ["FOREST"] } diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json index 8a3a5af7..3a78eb20 100644 --- a/biomes/temperate/sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -48,26 +48,6 @@ ] } ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ], "objects": [ { "chance": 0.2, diff --git a/biomes/temperate/shore/beach.json b/biomes/temperate/shore/beach.json index df16be32..b767931e 100644 --- a/biomes/temperate/shore/beach.json +++ b/biomes/temperate/shore/beach.json @@ -62,14 +62,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "turtle", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 80 - } - ], "objects": [{ "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index c99368da..5ba268d3 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -489,19 +489,5 @@ } } } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index cbfd7fda..0cadfef1 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -221,19 +221,5 @@ "biomeScatter": [ "TAIGA_HILLS", "MOUNTAINS" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json index c5d660a5..1f02a090 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -268,25 +268,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - }, - { - "entity": "llama", - "maxSpawns": 2, - "minSpawns": 5, - "rarity": 80 - } ] } diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json index 68e5324f..7044241a 100644 --- a/biomes/tundra/mountains.json +++ b/biomes/tundra/mountains.json @@ -227,25 +227,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - }, - { - "entity": "llama", - "maxSpawns": 2, - "minSpawns": 5, - "rarity": 80 - } ] } diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index 64fc51d0..7202a6d3 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -409,19 +409,5 @@ ], "mode": "VACUUM" } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 60 - } ] } diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 635ff364..243b91f2 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -371,19 +371,5 @@ ], "mode": "VACUUM" } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index d0cd49ec..42472afa 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -317,19 +317,5 @@ "wall": { "style": {"style": "STATIC"}, "palette": [{"block": "coarse_dirt"}] - }, - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 50 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 50 - } - ] + } } diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index 18306c0b..258db56a 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -304,19 +304,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } - ] + } } diff --git a/regions/frozen.json b/regions/frozen.json index c5b1ab90..ebbb80c6 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -37,39 +37,7 @@ "style": "IRIS", "zoom": 5 } - }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } - ], + } "deposits": [ { "minHeight": 8, diff --git a/regions/hot.json b/regions/hot.json index 80b038b7..3fc7ed0c 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -31,39 +31,6 @@ "zoom": 5 } }, - - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "donkey", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "mule", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "rabbit", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 20 - }, - { - "entity": "wanderingtrader", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 250 - } - ], "spotBiomes": [{ "biome": "hot/oasis", "scale": 5, diff --git a/regions/mushroom.json b/regions/mushroom.json index fb3c2424..69054ba5 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -259,19 +259,6 @@ "soundDistance": 3 } ], - "entityInitialSpawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 20 - } - ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { diff --git a/regions/swamp.json b/regions/swamp.json index ae856250..265307b0 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,38 +31,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 8 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 28 - } - ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/temperate.json b/regions/temperate.json index 1ec4184a..9b2c20de 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -32,32 +32,6 @@ "rarity": 750 }], "ENTITY_SPAWNS": "Sheep is purposely missing from this list so it doesn't spawn in estranged plains", - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "bee", - "maxSpawns": 3, - "minSpawns": 2, - "rarity": 60 - } - ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, "biomeImplosionRatio": 0.7, diff --git a/regions/tropical.json b/regions/tropical.json index e955a4f9..0c850d52 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -39,74 +39,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 39 - }, - { - "entity": "ocelot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "parrot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "turtle", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 80 - }, - { - "entity": "panda", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 40 - }, - { - "entity": "pandaUwU", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 150 - }, - { - "entity": "aeternum", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 200 - } - ], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 diff --git a/regions/tundra.json b/regions/tundra.json index aea96a5d..6e93fc9c 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -32,38 +32,7 @@ "cave/tundra-cavern", "cave/spiked-cavern" ], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 29 - } - ], + "riverBiomes": [ "tundra/sea/river", "tundra/sea/river-rocky", From 14d470d1b2f0b0be8eaf36b9f0207da08ce2b860 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 16:07:27 -0700 Subject: [PATCH 20/46] Entity Spawn Overrides REMOVED Will re implement later --- biomes/cave/cavern-coral.json | 7 +------ biomes/cave/cavern-root.json | 7 +------ biomes/cave/cracked-cavern.json | 7 +------ biomes/cave/ice-cavern.json | 7 +------ biomes/cave/murky-cavern.json | 7 +------ biomes/cave/sandy-cave.json | 7 +------ biomes/cave/sandy-red-cave.json | 7 +------ biomes/cave/tropical-cavern.json | 7 +------ biomes/cave/tundra-cavern.json | 7 +------ dimensions/overworld.json | 26 -------------------------- 10 files changed, 9 insertions(+), 80 deletions(-) diff --git a/biomes/cave/cavern-coral.json b/biomes/cave/cavern-coral.json index a0afd216..f8e14214 100644 --- a/biomes/cave/cavern-coral.json +++ b/biomes/cave/cavern-coral.json @@ -22,12 +22,7 @@ {"block": "dead_fire_coral_block"} ] }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [ { "chance": 1.0E-4, diff --git a/biomes/cave/cavern-root.json b/biomes/cave/cavern-root.json index 073e740f..f8691f43 100644 --- a/biomes/cave/cavern-root.json +++ b/biomes/cave/cavern-root.json @@ -14,12 +14,7 @@ "max": 6, "generator": "plain" }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [ { "chance": 1.0E-4, diff --git a/biomes/cave/cracked-cavern.json b/biomes/cave/cracked-cavern.json index 5a91d424..8d6e7c0e 100644 --- a/biomes/cave/cracked-cavern.json +++ b/biomes/cave/cracked-cavern.json @@ -92,12 +92,7 @@ } } ], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 7 - }], + "slab": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/cave/ice-cavern.json b/biomes/cave/ice-cavern.json index aa8ce625..409bc1a0 100644 --- a/biomes/cave/ice-cavern.json +++ b/biomes/cave/ice-cavern.json @@ -34,12 +34,7 @@ "max": 6, "generator": "plain" }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [ { "chance": 0.01, diff --git a/biomes/cave/murky-cavern.json b/biomes/cave/murky-cavern.json index 1a4390ba..e10b7502 100644 --- a/biomes/cave/murky-cavern.json +++ b/biomes/cave/murky-cavern.json @@ -26,12 +26,7 @@ "max": 6, "generator": "plain" }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 5 - }], + "decorators": [ { "chance": 1.0E-4, diff --git a/biomes/cave/sandy-cave.json b/biomes/cave/sandy-cave.json index b2d4117c..3c3a9d4f 100644 --- a/biomes/cave/sandy-cave.json +++ b/biomes/cave/sandy-cave.json @@ -12,12 +12,7 @@ "maxHeight": 2, "palette": [{"block": "smooth_sandstone"}] }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [ { "chance": 1.0E-4, diff --git a/biomes/cave/sandy-red-cave.json b/biomes/cave/sandy-red-cave.json index b20ecbd6..c5048865 100644 --- a/biomes/cave/sandy-red-cave.json +++ b/biomes/cave/sandy-red-cave.json @@ -12,12 +12,7 @@ "maxHeight": 2, "palette": [{"block": "terracotta"}] }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [{ "chance": 1.0E-4, "palette": [{"block": "barrel"}] diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json index a9295705..6a922644 100644 --- a/biomes/cave/tropical-cavern.json +++ b/biomes/cave/tropical-cavern.json @@ -31,12 +31,7 @@ {"block": "stone"} ] }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [{ "chance": 1.0E-5, "palette": [{"block": "barrel"}] diff --git a/biomes/cave/tundra-cavern.json b/biomes/cave/tundra-cavern.json index 608bb683..e39b9a2b 100644 --- a/biomes/cave/tundra-cavern.json +++ b/biomes/cave/tundra-cavern.json @@ -19,12 +19,7 @@ {"block": "gravel"} ] }], - "entitySpawnOverrides": [{ - "trigger": "SKELETON", - "entity": "shroud", - "cancelSourceSpawn": true, - "rarity": 12 - }], + "decorators": [ { "chance": 1.0E-4, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 3125ce0c..113f2d9e 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -331,32 +331,6 @@ "terrainZoom": 1, "stronghold": "stronghold", "decorate": true, - "entitySpawnOverrides": [ - { - "cancelSourceSpawn": true, - "entity": "fred", - "rarity": 60, - "trigger": "VEX" - }, - { - "cancelSourceSpawn": true, - "entity": "fred", - "rarity": 260, - "trigger": "PANDA" - }, - { - "cancelSourceSpawn": true, - "entity": "dan", - "rarity": 250, - "trigger": "CREEPER" - }, - { - "cancelSourceSpawn": true, - "entity": "phantomapi", - "rarity": 70, - "trigger": "PHANTOM" - } - ], "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"} } From ecf23f503be7121071cf1b6bc4aabc6667faf1a8 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 16:08:54 -0700 Subject: [PATCH 21/46] Fixes --- biomes/tundra/forest.json | 1 + biomes/tundra/mountains.json | 1 + biomes/tundra/redwood-forest.json | 1 + biomes/tundra/sequia-redwoods.json | 1 + regions/frozen.json | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index 0cadfef1..eeeda8b3 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -11,6 +11,7 @@ "min": 8 }], "customDerivitives": [{ + "category": "forest", "id": "tundra_forest", "grassColor": "#56B16F", "waterColor": "#80B4C6", diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json index 7044241a..5159844b 100644 --- a/biomes/tundra/mountains.json +++ b/biomes/tundra/mountains.json @@ -21,6 +21,7 @@ } ], "customDerivitives": [{ + "category": "forest", "id": "tundra_mountains", "grassColor": "#B0A747", "waterColor": "#80B4C6", diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 243b91f2..13f1f250 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -11,6 +11,7 @@ "generator": "smooth-dunes" }], "customDerivitives": [{ + "category": "forest", "id": "tundra_redwood_forest", "grassColor": "#AC7B1F", "waterColor": "#80B4C6", diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index 42472afa..f2c2e9cc 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -10,6 +10,7 @@ "generator": "plain" }], "customDerivitives": [{ + "category": "forest", "id": "tundra_sequoia_redwoods", "grassColor": "#7BA13C", "waterColor": "#80B4C6", diff --git a/regions/frozen.json b/regions/frozen.json index ebbb80c6..e0936e01 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -37,7 +37,7 @@ "style": "IRIS", "zoom": 5 } - } + }, "deposits": [ { "minHeight": 8, From af4c2b0c824d00f89a38c213efb5daa82e7f33ba Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 20:08:10 -0700 Subject: [PATCH 22/46] Spawn Overhaul --- dimensions/overworld.json | 3 ++ entities/brian.json | 10 ++++-- regions/frozen.json | 3 ++ regions/hot.json | 3 ++ regions/mushroom.json | 3 ++ regions/swamp.json | 3 ++ regions/temperate.json | 5 ++- regions/tropical.json | 3 ++ regions/tundra.json | 4 ++- spawners/frozen.json | 29 ++++++++++++++++ spawners/hot.json | 35 +++++++++++++++++++ spawners/mushroom.json | 16 +++++++++ spawners/swamp.json | 35 +++++++++++++++++++ spawners/temperate.json | 29 ++++++++++++++++ spawners/tropical.json | 71 +++++++++++++++++++++++++++++++++++++++ spawners/tundra.json | 35 +++++++++++++++++++ 16 files changed, 283 insertions(+), 4 deletions(-) create mode 100644 spawners/frozen.json create mode 100644 spawners/hot.json create mode 100644 spawners/mushroom.json create mode 100644 spawners/swamp.json create mode 100644 spawners/temperate.json create mode 100644 spawners/tropical.json create mode 100644 spawners/tundra.json diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 113f2d9e..6259e5fb 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -297,6 +297,9 @@ } } ], + "entitySpawners": [ + "frozen" + ], "caveBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "CAVERNS//CARVING": "Carving layers that cut off certain parts of the world", "carving": true, diff --git a/entities/brian.json b/entities/brian.json index 164952ce..1b589a49 100644 --- a/entities/brian.json +++ b/entities/brian.json @@ -1,6 +1,8 @@ { "type": "EVOKER", "customName": "&dMagic Psychopath", + "glowing": true, + "silent": true, "attributes": [ { "attribute": "GENERIC_ARMOR", @@ -23,10 +25,14 @@ }, "mainHand": { "type": "blaze_rod", - "displayName": "&dStrange Wand" + "unbreakable": true, + "lore": ["The wand of the world builder"], + "displayName": "&dBuilders Wand" }, "offHand": { "type": "blaze_rod", - "displayName": "&dStrange Wand" + "unbreakable": true, + "lore": ["The wand of the world builder"], + "displayName": "&dBuilders Wand" } } diff --git a/regions/frozen.json b/regions/frozen.json index e0936e01..1ce9af47 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,6 +38,9 @@ "zoom": 5 } }, + "entitySpawners": [ + "frozen" + ], "deposits": [ { "minHeight": 8, diff --git a/regions/hot.json b/regions/hot.json index 3fc7ed0c..c159c91b 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -31,6 +31,9 @@ "zoom": 5 } }, + "entitySpawners": [ + "hot" + ], "spotBiomes": [{ "biome": "hot/oasis", "scale": 5, diff --git a/regions/mushroom.json b/regions/mushroom.json index 69054ba5..e8334350 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -259,6 +259,9 @@ "soundDistance": 3 } ], + "entitySpawners": [ + "mushroom" + ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { diff --git a/regions/swamp.json b/regions/swamp.json index 265307b0..2537767f 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,6 +31,9 @@ "zoom": 5 } }, + "entitySpawners": [ + "swamp" + ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/temperate.json b/regions/temperate.json index 9b2c20de..66c2804f 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -31,7 +31,10 @@ "structure": "murky_stronghold", "rarity": 750 }], - "ENTITY_SPAWNS": "Sheep is purposely missing from this list so it doesn't spawn in estranged plains", + "ENTITY_SPAWNS": "ALL ENTITY SPAWNS FOR THE REGION", + "entitySpawners": [ + "temperate" + ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, "biomeImplosionRatio": 0.7, diff --git a/regions/tropical.json b/regions/tropical.json index 0c850d52..a71d1f6b 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -53,6 +53,9 @@ "palette": [{"block": "emerald_ore"}], "varience": 2 }], + "entitySpawners": [ + "tropical" + ], "landBiomeZoom": 1.85, "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, diff --git a/regions/tundra.json b/regions/tundra.json index 6e93fc9c..32b534de 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -32,7 +32,9 @@ "cave/tundra-cavern", "cave/spiked-cavern" ], - + "entitySpawners": [ + "tundra" + ], "riverBiomes": [ "tundra/sea/river", "tundra/sea/river-rocky", diff --git a/spawners/frozen.json b/spawners/frozen.json new file mode 100644 index 00000000..1141be04 --- /dev/null +++ b/spawners/frozen.json @@ -0,0 +1,29 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 + }, + { + "entity": "fox", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 + } + ] +} \ No newline at end of file diff --git a/spawners/hot.json b/spawners/hot.json new file mode 100644 index 00000000..5d504645 --- /dev/null +++ b/spawners/hot.json @@ -0,0 +1,35 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "donkey", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 100 + }, + { + "entity": "mule", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 100 + }, + { + "entity": "rabbit", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "wanderingtrader", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 250 + } + ] +} \ No newline at end of file diff --git a/spawners/mushroom.json b/spawners/mushroom.json new file mode 100644 index 00000000..c4e274a2 --- /dev/null +++ b/spawners/mushroom.json @@ -0,0 +1,16 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "mooshroom", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "cow", + "maxSpawns": 2, + "rarity": 3 + } + ] +} \ No newline at end of file diff --git a/spawners/swamp.json b/spawners/swamp.json new file mode 100644 index 00000000..65ede19c --- /dev/null +++ b/spawners/swamp.json @@ -0,0 +1,35 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 3 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4 + }, + { + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 + } + ] +} \ No newline at end of file diff --git a/spawners/temperate.json b/spawners/temperate.json new file mode 100644 index 00000000..2a20d32a --- /dev/null +++ b/spawners/temperate.json @@ -0,0 +1,29 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "bee", + "maxSpawns": 3, + "minSpawns": 2, + "rarity": 15 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical.json b/spawners/tropical.json new file mode 100644 index 00000000..6401c9f8 --- /dev/null +++ b/spawners/tropical.json @@ -0,0 +1,71 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 10 + }, + { + "entity": "ocelot", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "parrot", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 3 + }, + { + "entity": "turtle", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "panda", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 4 + }, + { + "entity": "pandaUwU", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 15 + }, + { + "entity": "aeternum", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 15 + } + ] +} \ No newline at end of file diff --git a/spawners/tundra.json b/spawners/tundra.json new file mode 100644 index 00000000..0fedb05d --- /dev/null +++ b/spawners/tundra.json @@ -0,0 +1,35 @@ +{ + "selection": {}, + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 + } + ] +} \ No newline at end of file From 642eae7be01307de7967f6760547b8a8255190b1 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 20:43:31 -0700 Subject: [PATCH 23/46] fff --- entities/brian.json | 1 + regions/temperate.json | 2 +- spawners/frozen.json | 2 +- spawners/hot.json | 1 - spawners/mushroom.json | 1 - spawners/swamp.json | 1 - spawners/temperate.json | 1 - spawners/tropical.json | 1 - spawners/tundra.json | 1 - 9 files changed, 3 insertions(+), 8 deletions(-) diff --git a/entities/brian.json b/entities/brian.json index 1b589a49..79a84b27 100644 --- a/entities/brian.json +++ b/entities/brian.json @@ -2,6 +2,7 @@ "type": "EVOKER", "customName": "&dMagic Psychopath", "glowing": true, + "spawnEffect": {"particleEffect": "FIREWORKS_SPARK", "particleCount": 9, "chance": 1, "interval": 1, "sound": "AMBIENT_BASALT_DELTAS_ADDITIONS", "volume": 10}, "silent": true, "attributes": [ { diff --git a/regions/temperate.json b/regions/temperate.json index 66c2804f..79c60dbc 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -55,7 +55,7 @@ { "chance": 0, "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, - "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE"]}], + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE", "BIG_TREE"]}], "place": [ "trees/oak/truegeneric1", "trees/oak/truegeneric2", diff --git a/spawners/frozen.json b/spawners/frozen.json index 1141be04..ecd11c5a 100644 --- a/spawners/frozen.json +++ b/spawners/frozen.json @@ -1,5 +1,5 @@ { - "selection": {}, + "spawns": [ { "entity": "chicken", diff --git a/spawners/hot.json b/spawners/hot.json index 5d504645..92473c08 100644 --- a/spawners/hot.json +++ b/spawners/hot.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "chicken", diff --git a/spawners/mushroom.json b/spawners/mushroom.json index c4e274a2..aae4ba00 100644 --- a/spawners/mushroom.json +++ b/spawners/mushroom.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "mooshroom", diff --git a/spawners/swamp.json b/spawners/swamp.json index 65ede19c..5dcd70e5 100644 --- a/spawners/swamp.json +++ b/spawners/swamp.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "chicken", diff --git a/spawners/temperate.json b/spawners/temperate.json index 2a20d32a..ec329313 100644 --- a/spawners/temperate.json +++ b/spawners/temperate.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "chicken", diff --git a/spawners/tropical.json b/spawners/tropical.json index 6401c9f8..798bd358 100644 --- a/spawners/tropical.json +++ b/spawners/tropical.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "chicken", diff --git a/spawners/tundra.json b/spawners/tundra.json index 0fedb05d..1485a90e 100644 --- a/spawners/tundra.json +++ b/spawners/tundra.json @@ -1,5 +1,4 @@ { - "selection": {}, "spawns": [ { "entity": "chicken", From 410256d1c8b31002b7091fbf9929f2acef946d31 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 20:51:56 -0700 Subject: [PATCH 24/46] fixes --- dimensions/overworld.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 6259e5fb..113f2d9e 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -297,9 +297,6 @@ } } ], - "entitySpawners": [ - "frozen" - ], "caveBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "CAVERNS//CARVING": "Carving layers that cut off certain parts of the world", "carving": true, From 5aad873334e781aaf1dc64b10e24b9b3250b8df5 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 31 Jul 2021 21:40:40 -0700 Subject: [PATCH 25/46] bdlaw --- entities/villager.json | 2 ++ regions/tropical.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/entities/villager.json b/entities/villager.json index 0eb7c7cc..b696db60 100644 --- a/entities/villager.json +++ b/entities/villager.json @@ -1,5 +1,7 @@ { "type": "VILLAGER", "aware": true, + "customNameVisible": true, + "customName": " ", "ai": true } diff --git a/regions/tropical.json b/regions/tropical.json index a71d1f6b..67387f68 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -74,7 +74,7 @@ { "chance": 0, "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, - "trees": [ {"sizes": [ {"depth":1, "width": 1} ], "treeTypes": ["JUNGLE"]}], + "trees": [ {"sizes": [ {"depth":1, "width": 1} ], "treeTypes": ["JUNGLE", "JUNGLE_BUSH"]}], "edit": [{"find": [{"block": "jungle_log"}], "replace": {"palette": [{"block": "jungle_wood"}]}},{"find": [{"block": "oak_log"}, {"block": "oak_wood"}], "replace": {"palette": [{"block": "jungle_wood"}]}}], "translate": {"y": -1}, "place": [ From 48e5c5f5fd51c222222c347c79147d1f46c41e05 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sun, 1 Aug 2021 01:46:55 -0700 Subject: [PATCH 26/46] Added trees, and block remissions --- biomes/cave/cracked-cavern.json | 1 + biomes/cave/lit-cavern.json | 3 ++- biomes/tropical/rainforest-island.json | 2 +- biomes/tropical/rainforest-wicked-child.json | 2 +- biomes/tropical/rainforest-wicked.json | 2 +- biomes/tropical/rainforest.json | 2 +- biomes/tropical/submerged-volcanic.json | 3 +++ biomes/tropical/volcanic-plains.json | 3 +++ biomes/tropical/volcanoes-lava.json | 4 +++- biomes/tropical/volcanoes.json | 5 +++++ biomes/tropical/wilds.json | 2 +- objects/trees/birch/omni1.iob | Bin 0 -> 14847 bytes objects/trees/oak/omni1.iob | Bin 0 -> 20192 bytes objects/trees/spruce/omni1.iob | Bin 0 -> 8423 bytes 14 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 objects/trees/birch/omni1.iob create mode 100644 objects/trees/oak/omni1.iob create mode 100644 objects/trees/spruce/omni1.iob diff --git a/biomes/cave/cracked-cavern.json b/biomes/cave/cracked-cavern.json index 8d6e7c0e..58c1e515 100644 --- a/biomes/cave/cracked-cavern.json +++ b/biomes/cave/cracked-cavern.json @@ -16,6 +16,7 @@ "palette": [ {"block": "stone"}, {"block": "andesite"}, + {"block": "calcite"}, {"block": "cobblestone"} ] }], diff --git a/biomes/cave/lit-cavern.json b/biomes/cave/lit-cavern.json index 14502905..3c46544c 100644 --- a/biomes/cave/lit-cavern.json +++ b/biomes/cave/lit-cavern.json @@ -14,7 +14,8 @@ "zoom": 0.1, "palette": [ {"block": "stone"}, - {"block": "andesite"} + {"block": "andesite"}, + {"block": "calcite"} ] }], "decorators": [ diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json index 106026cf..4bbe81d9 100644 --- a/biomes/tropical/rainforest-island.json +++ b/biomes/tropical/rainforest-island.json @@ -182,7 +182,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json index dd6a86c3..05acbdfe 100644 --- a/biomes/tropical/rainforest-wicked-child.json +++ b/biomes/tropical/rainforest-wicked-child.json @@ -191,7 +191,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json index ee229dad..0bae6854 100644 --- a/biomes/tropical/rainforest-wicked.json +++ b/biomes/tropical/rainforest-wicked.json @@ -182,7 +182,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json index 801bd7a7..c671c7e8 100644 --- a/biomes/tropical/rainforest.json +++ b/biomes/tropical/rainforest.json @@ -193,7 +193,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, diff --git a/biomes/tropical/submerged-volcanic.json b/biomes/tropical/submerged-volcanic.json index e392db59..bfd55f88 100644 --- a/biomes/tropical/submerged-volcanic.json +++ b/biomes/tropical/submerged-volcanic.json @@ -40,6 +40,9 @@ { "data": {"axis": "z"}, "block": "basalt" + }, + { + "block": "tuff" } ] }, diff --git a/biomes/tropical/volcanic-plains.json b/biomes/tropical/volcanic-plains.json index 90557e76..96b6858d 100644 --- a/biomes/tropical/volcanic-plains.json +++ b/biomes/tropical/volcanic-plains.json @@ -43,6 +43,9 @@ { "weight": 1, "block": "magma_block" + }, + { + "block": "tuff" } ] }, diff --git a/biomes/tropical/volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json index 4c640127..de128d05 100644 --- a/biomes/tropical/volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -45,5 +45,7 @@ "wall": {"palette": [{ "block": "lava", "data": {"level": 1} - }]} + },{ + "block": "tuff" + }]} } diff --git a/biomes/tropical/volcanoes.json b/biomes/tropical/volcanoes.json index 0d556db0..7eda7b9e 100644 --- a/biomes/tropical/volcanoes.json +++ b/biomes/tropical/volcanoes.json @@ -48,6 +48,11 @@ "minHeight": 3, "maxHeight": 10, "palette": [{"block": "blackstone"}] + }, + { + "minHeight": 1, + "maxHeight": 2, + "palette": [{"block": "tuff"}] } ], "childStyle": { diff --git a/biomes/tropical/wilds.json b/biomes/tropical/wilds.json index 1307f432..8e255691 100644 --- a/biomes/tropical/wilds.json +++ b/biomes/tropical/wilds.json @@ -245,7 +245,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, diff --git a/objects/trees/birch/omni1.iob b/objects/trees/birch/omni1.iob new file mode 100644 index 0000000000000000000000000000000000000000..b0de6c652f0cac822e0ca1bf22b28da0ff1fc73a GIT binary patch literal 14847 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 literal 0 HcmV?d00001 diff --git a/objects/trees/spruce/omni1.iob b/objects/trees/spruce/omni1.iob new file mode 100644 index 0000000000000000000000000000000000000000..ead68050d6c6fc656b88f217f5a00f5b6bb015f4 GIT binary patch literal 8423 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 HTA%*_oxo1Q literal 0 HcmV?d00001 From 8ebee109a25071d67cd38914e9dc6a0ae0b3440c Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Sun, 1 Aug 2021 23:46:28 +1200 Subject: [PATCH 27/46] Translate Melons & Pumpkins --- biomes/temperate/birch-forest.json | 3 +++ biomes/temperate/birch-thin.json | 3 +++ biomes/temperate/combo-forest.json | 3 +++ biomes/temperate/flower-forest.json | 3 +++ biomes/temperate/longtree-forest.json | 3 +++ biomes/temperate/lush-plains-red.json | 3 +++ biomes/temperate/lush-plains-yellow.json | 3 +++ biomes/temperate/lush-plains.json | 3 +++ biomes/temperate/oak-denmyre.json | 3 +++ biomes/temperate/oak-forest.json | 3 +++ biomes/temperate/plains.json | 3 +++ biomes/temperate/sakura-pink-forest.json | 3 +++ biomes/temperate/wilds.json | 3 +++ biomes/tropical/bamboo-forest.json | 3 +++ biomes/tropical/mountain-extreme.json | 3 +++ biomes/tropical/mountain-middle.json | 3 +++ biomes/tropical/mountain-plains.json | 3 +++ biomes/tropical/mountain.json | 3 +++ biomes/tropical/plains-hills.json | 3 +++ biomes/tropical/plains.json | 3 +++ biomes/tropical/rainforest-hills.json | 3 +++ biomes/tropical/rainforest-island.json | 3 +++ biomes/tropical/rainforest-wicked-child.json | 3 +++ biomes/tropical/rainforest-wicked.json | 3 +++ biomes/tropical/rainforest.json | 3 +++ biomes/tundra/autumn.json | 3 +++ biomes/tundra/forest-cliffs.json | 3 +++ biomes/tundra/forest.json | 3 +++ biomes/tundra/mountains.json | 3 +++ biomes/tundra/sequia-redwoods.json | 3 +++ biomes/tundra/spruce-denmyre.json | 3 +++ biomes/tundra/taiga.json | 3 +++ 32 files changed, 96 insertions(+) diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index 5dbdea0d..3d3e3c44 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -179,6 +179,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index f0ba798c..26f82f48 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -150,6 +150,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 578b0187..0a801da2 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -308,6 +308,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 5a3494ec..7649c365 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -378,6 +378,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 4273ae60..179201a8 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -388,6 +388,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index d0d450d8..4f975b37 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -216,6 +216,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 45a8ca22..4e3d2c64 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -216,6 +216,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index f8d3875d..8f966143 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -244,6 +244,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index 582610c9..7cf39084 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -210,6 +210,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 9e1d19bd..6a4bf684 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -233,6 +233,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 467d9a7b..40caf1cd 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -310,6 +310,9 @@ "min": 0, "max": 360 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json index 3a78eb20..811f960a 100644 --- a/biomes/temperate/sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -187,6 +187,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/wilds.json b/biomes/temperate/wilds.json index e74d2e2d..9657b331 100644 --- a/biomes/temperate/wilds.json +++ b/biomes/temperate/wilds.json @@ -155,6 +155,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/bamboo-forest.json b/biomes/tropical/bamboo-forest.json index 5b447b12..7fc9a0c5 100644 --- a/biomes/tropical/bamboo-forest.json +++ b/biomes/tropical/bamboo-forest.json @@ -191,6 +191,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/mountain-extreme.json b/biomes/tropical/mountain-extreme.json index ea63bb33..90bbe6d6 100644 --- a/biomes/tropical/mountain-extreme.json +++ b/biomes/tropical/mountain-extreme.json @@ -184,6 +184,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tropical/mountain-middle.json b/biomes/tropical/mountain-middle.json index a10b0729..d4229387 100644 --- a/biomes/tropical/mountain-middle.json +++ b/biomes/tropical/mountain-middle.json @@ -156,6 +156,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tropical/mountain-plains.json b/biomes/tropical/mountain-plains.json index fa241bfb..0f665c37 100644 --- a/biomes/tropical/mountain-plains.json +++ b/biomes/tropical/mountain-plains.json @@ -191,6 +191,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tropical/mountain.json b/biomes/tropical/mountain.json index 25b53c14..7c25be4b 100644 --- a/biomes/tropical/mountain.json +++ b/biomes/tropical/mountain.json @@ -166,6 +166,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/plains-hills.json b/biomes/tropical/plains-hills.json index 0bd3a5bf..8bf7de10 100644 --- a/biomes/tropical/plains-hills.json +++ b/biomes/tropical/plains-hills.json @@ -167,6 +167,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tropical/plains.json b/biomes/tropical/plains.json index 0b24d590..c4418836 100644 --- a/biomes/tropical/plains.json +++ b/biomes/tropical/plains.json @@ -166,6 +166,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tropical/rainforest-hills.json b/biomes/tropical/rainforest-hills.json index a528330a..75b1d006 100644 --- a/biomes/tropical/rainforest-hills.json +++ b/biomes/tropical/rainforest-hills.json @@ -262,6 +262,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/rainforest-island.json b/biomes/tropical/rainforest-island.json index 4bbe81d9..6c0ff94e 100644 --- a/biomes/tropical/rainforest-island.json +++ b/biomes/tropical/rainforest-island.json @@ -257,6 +257,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json index 05acbdfe..7bd6f4e2 100644 --- a/biomes/tropical/rainforest-wicked-child.json +++ b/biomes/tropical/rainforest-wicked-child.json @@ -266,6 +266,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json index 0bae6854..b18522b0 100644 --- a/biomes/tropical/rainforest-wicked.json +++ b/biomes/tropical/rainforest-wicked.json @@ -257,6 +257,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json index c671c7e8..26d30546 100644 --- a/biomes/tropical/rainforest.json +++ b/biomes/tropical/rainforest.json @@ -268,6 +268,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index 5ba268d3..48ca9bcd 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -487,6 +487,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ] diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json index 83402b7f..7036e65f 100644 --- a/biomes/tundra/forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -265,6 +265,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index eeeda8b3..7ba514f1 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -205,6 +205,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json index 5159844b..3396e501 100644 --- a/biomes/tundra/mountains.json +++ b/biomes/tundra/mountains.json @@ -165,6 +165,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index f2c2e9cc..55ecce1e 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -312,6 +312,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json index ecd44353..ae1fa579 100644 --- a/biomes/tundra/spruce-denmyre.json +++ b/biomes/tundra/spruce-denmyre.json @@ -256,6 +256,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index 258db56a..37b0e005 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -294,6 +294,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], From 978707e0acec2ac4d88db20fa58b7e2f7ad8b9a8 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Sun, 1 Aug 2021 23:47:50 +1200 Subject: [PATCH 28/46] Birch Antioch -> Oak (Copy) --- biomes/temperate/combo-forest.json | 38 ++++++++-------------------- biomes/temperate/flower-forest.json | 35 ++++++++----------------- objects/trees/oak/antioch1.iob | Bin 0 -> 2104 bytes objects/trees/oak/antioch10.iob | Bin 0 -> 562 bytes objects/trees/oak/antioch11.iob | Bin 0 -> 434 bytes objects/trees/oak/antioch12.iob | Bin 0 -> 1258 bytes objects/trees/oak/antioch13.iob | Bin 0 -> 730 bytes objects/trees/oak/antioch2.iob | Bin 0 -> 682 bytes objects/trees/oak/antioch3.iob | Bin 0 -> 1202 bytes objects/trees/oak/antioch4.iob | Bin 0 -> 954 bytes objects/trees/oak/antioch5.iob | Bin 0 -> 1705 bytes objects/trees/oak/antioch6.iob | Bin 0 -> 1258 bytes objects/trees/oak/antioch7.iob | Bin 0 -> 1664 bytes objects/trees/oak/antioch8.iob | Bin 0 -> 919 bytes objects/trees/oak/antioch9.iob | Bin 0 -> 394 bytes regions/temperate.json | 36 ++++++++++++++++++++++++++ 16 files changed, 58 insertions(+), 51 deletions(-) create mode 100644 objects/trees/oak/antioch1.iob create mode 100644 objects/trees/oak/antioch10.iob create mode 100644 objects/trees/oak/antioch11.iob create mode 100644 objects/trees/oak/antioch12.iob create mode 100644 objects/trees/oak/antioch13.iob create mode 100644 objects/trees/oak/antioch2.iob create mode 100644 objects/trees/oak/antioch3.iob create mode 100644 objects/trees/oak/antioch4.iob create mode 100644 objects/trees/oak/antioch5.iob create mode 100644 objects/trees/oak/antioch6.iob create mode 100644 objects/trees/oak/antioch7.iob create mode 100644 objects/trees/oak/antioch8.iob create mode 100644 objects/trees/oak/antioch9.iob diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 0a801da2..2d840bdc 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -174,34 +174,18 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - {"block": "birch_wood"}, - {"block": "birch_log"} - ], - "replace": {"palette": [{"block": "oak_wood"}]} - }, - { - "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{ - "block": "oak_leaves", - "data": {"persistent": true} - }]} - } - ], "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "trees/oak/antioch3", + "trees/oak/antioch4", + "trees/oak/antioch5", + "trees/oak/antioch6", + "trees/oak/antioch7", + "trees/oak/antioch8", + "trees/oak/antioch9", + "trees/oak/antioch10", + "trees/oak/antioch11", + "trees/oak/antioch12", + "trees/oak/antioch13" ] }, { diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 7649c365..f970d6ee 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -137,31 +137,18 @@ }, "enabled": true }, - "edit": [ - { - "find": [ - {"block": "birch_wood"}, - {"block": "birch_log"} - ], - "replace": {"palette": [{"block": "oak_wood"}]} - }, - { - "find": [{"block": "birch_leaves"}], - "replace": {"palette": [{"block": "oak_leaves"}]} - } - ], "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "trees/oak/antioch3", + "trees/oak/antioch4", + "trees/oak/antioch5", + "trees/oak/antioch6", + "trees/oak/antioch7", + "trees/oak/antioch8", + "trees/oak/antioch9", + "trees/oak/antioch10", + "trees/oak/antioch11", + "trees/oak/antioch12", + "trees/oak/antioch13" ] }, diff --git a/objects/trees/oak/antioch1.iob b/objects/trees/oak/antioch1.iob new file mode 100644 index 0000000000000000000000000000000000000000..5279735eb78e27b70f617930f35b9c531da23b77 GIT binary patch literal 2104 zcmY+FOK%fF5QN81g2agWm2AfTCUpjO>?<@xo$qbziyi^ zZFhRH?6%G7yj{F_`nlb7V(n_X*lupxv-0HrjNA44;=xh7%G>+C%T{ZgwoSKP zTsGHT`*gM5Y(LcJZhdq2eA{f>&Gq`~s=cV*+jf|ArntYCQJD)%-v`UM%;2&IOHh9E z{!npW{o^vN`d|r{-duWc)bEXBtv|881m%b0j~xYLRIwOG(qTsz|5%C)aHRdrrHef( z*7<*ERVh7!y#};DRNPnpSSvBu*&`@9T;4nTzWR5z_dTdt#&N$l634u*9GsMyx$13H zy@fnbNY-}=`*hqREAS?`YHN}x$+dIf3VX( z@f)=ln7&~>YRu1FXFX?=8AFYt$FA(8!Alk8ca^L+Ctt7V{)sLfNCt5FCwgNYddhq-Iv zy5H3vq!PIiz9EV(NRP^{e~|t#SA^CF$sY|$q2{_G?y_q44O3NFi}N~iR)?S>ePG@j z*$d8XpI19b@6JHkr_~OkANT~jhG$C;l1o;jtMIc%bg3?}i~Cft(?`(-*%3cEM+c7F zN7j2M*@DWRopW2*i|V3FBN%YVvMW1q4q!Sh_N>FZB>p36A$^eZ$s2ucJKvZ1jf!hp?I76>TyHeT?JtF^lX>C9 z5boN$uGUM5T|=mP-*LV$I(O~Bi4$$~Mp<*mwIyqb`>Zq@^eNa*p7^P+4){Y1JwhZaHz|f>33FD@AP+WTyq*4#eH{tU*{xMl-WJ z8*hkcOhk|TjOnTNO(>VMvR=&Jsi5gk)4GkfpZ!~BzdpX5{c~ZpZ9;F`jjLWJJLdy4 z*Y;KKf8Cm%?>qKgw_Vvo6RP8yC%mR9{NghL&_hDQ({Kb$jLHoe)dfWd&(+yQk@)Gv z0Z4@^H%BU%L63v_g?55zOkI}mW;~9PYz1)-Bl*4Yy0J5%|z2bmBz&!6-@gF%ZjXeMW literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch11.iob b/objects/trees/oak/antioch11.iob new file mode 100644 index 0000000000000000000000000000000000000000..ab015015b65227650754a579bcd86bb3a34df707 GIT binary patch literal 434 zcmY*VyAHxI40H+%NPGcPM+OGOf&}Wq)`^X!s!-GhsRCM*gx9}AiybFLSZXfk^Vv=T zU<3eT{Dv?|b!FoHGER5f4MecGRJAI!Jlb_5PlvOTcV)7&GFH}wN>=l$(gvBTZDRFJ zVtUf~Y} Hj6&TPqF`-J literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch12.iob b/objects/trees/oak/antioch12.iob new file mode 100644 index 0000000000000000000000000000000000000000..da79251055eff7fd4aff66b1f8dc2427a6ed80d8 GIT binary patch literal 1258 zcmY+E&2H0B5QXPDN!hSq&8iQ;0~dVzaY&(HUp@$}=H)AJ8!@2jiVUpL#~df$IKyxaAkuf7cZ_hG!a z*^GyNdp)e*zWO%oN2p(qrACy-U$+&f!{=_G7%ISCb%dC^^ zd=)N9+#*&i;){5;M&IL$c(z8rR4jM1Pa#PNTolWg>Wt zHk&p3m^vcfW}@$@H^=8+aFxkeh6{C#^EOY6&(O)|oYCi;IWD5MwWczicHF;$rU$#> zG|*@FR3~Itpml1JyK|l=m-9u<3eGb*U-UUwj*F;cjlRSe*|+3B#1By+dlNBtBMOXLp+q3!N=IT;1Ien^|xbCX^;i9b`?jB?H8vEs@?uV*b$MXE- zId;9O*bL>+y~LFq?^e9E?PgiM*M0f1(i^Vz9O!}VJ7iB8^urV|Fr-8sWM*D5!awPp zc_2DuMlmAKbQ#93oVj< z$ZztC{B%m;H_D7RI)miY6EkQ%M$~#dZQY+nYNyUi?JwbrJXfpLERG4iFZ=2L@?8~V zPG+QST3_!QN3Q4lYq3SsdcSQ*_hC6s+Z*H70ee-ge*a^b2Awg@RJZe|)z3-(0BVo1 AfB*mh literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch2.iob b/objects/trees/oak/antioch2.iob new file mode 100644 index 0000000000000000000000000000000000000000..33edf34b20a0ef1621159a4066f94ba5775ded3b GIT binary patch literal 682 zcmY*WyH3ME5ZtpJD#Qm+o z&F<}5L>3})g1wOARad9w{l#*1cXKV7oIlr1+;-Jtf7Mp|ho@M*#kAhlsjr%CEHBSq zVwb>T)0chs8aHzK-|^nIyLI(Zr}A@y3b)ut*doEI>X%kmUKomDm?r0$9angK-_`-cSyIc`$a9vR|8@E&Rji&1y>7Mfq{6}^ZZ7U-e`2&{HpNIee literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch3.iob b/objects/trees/oak/antioch3.iob new file mode 100644 index 0000000000000000000000000000000000000000..e35a407bbb6a4b79fb5cd0b0560307ece7bb52d5 GIT binary patch literal 1202 zcmY*Y$xZ@65Um+dF8TwW_y7;ai;0GdH%{KX5Mw4VCPW3p;PwZ8vkUl^YK%k3>(}+F zx|Z&U7(~P&{)0FeujbwG`gAzHy1a-wP9EorcDicr*5}LS{`R45UfOOln|JGGF>Oa@ z$4~9518W!S(R%gV-o(*=kJsgLHfi4G-RS)WCwxQ|`#^riI`+gWVTCn$wcX}^9sRT$ zL!5T=Ui4(Ig%#qHGma2C<3`BcI`u^A%|pnz;@eH`_Y{j(#-yIePaJx2=*@r9?yMZu ze#J)!KYj2s|1nqPwork5q^!1^^r&|p^u(FsL`EQfCw?V<3en$;V638_oTz?^qmM%L zG3`RE&C$Qq5!JuciDNB0vMM^pRtHiij8PL%U9jGW zlgKqC>3FX=8Qv>nU&#AH&imqhA$-j1-NZflasz0kp1XfP#xG|Yc^|CPRJ8Uv;+b2S zUR9>&ZZMpyP?hvU{fYq(O`HnW&i<7<2B*;BJl%eKDnFE{nW-D9d>Q#W5VU0<)4X?k(` zoZ1d7t@~-;zNCen>_@z9HmiC4-gMKC1x{$N{WM=={uVYOnlR_!rBz`UnmFv_`6uip zZt1HCG$H(?m$1k#bWd!=4?4}m58}9B*D7`jEg9>N2l9kxk+-2cB6t1{{0jUO+Bh=TZlTTqrR{c@hy(}!am%T2u&PaaJ%1=e*PuSO1z%Xg@__YcIk>|MXG!h zovVo6cXg7881Vw?&|&We?nCaHbalydQlkfmkf%$Jm(q(tCuiSb&)c28jl30K#QUW; z9MIn!XE73|FcZ%U-7}**vDqV--Ggy~-cR{NKFpyejmY}NIf*>y|72)FG%@~uh}y_wU}uEM9)u?VIgk^QnK+Za#m!Z#LhX z?)q-m^_%^+S-*bqwK;UKnti|S58s-bc>e#4A8mVgz4^K8*1vAz*<)?65e84uRvptu83Uf50!XiCH%rmFtm>iNN>da#fw&APfFUcu6n)&pX@WgjC z%9O4;J=HlPMZut=Oy_vc&`hYE0df25GAd)03==x}p)<#f*JVh(8M2vIHuR_XQMxE3 z<0t!pHdgpI`N#3N;EM5EijxWDB6lL<-9(+F8#7+TJar=8$r`(~jrvJHoOLtVs2^BC zXB+jSAKyKlum~SXo$WE>754_c_NevKrcQpG+9|FYQk!wt6jA#`%(IQ`uAn?jZyQnh z@yrUB2hKk5ah)|80Uxdy?y`@9_6=$EbD(rKTeND2j?Kj!ij@KDCaUQbS--u)2 zWR%BbU(6u}s@!pW44jzX;ttZIgY-JnTc~n~@moQRX+`BK(dF1C#na9*_U@NoZ%*1%!l&DAQadyg^)QyFAR$A*yzicG5pZ9=nFcV*0 Wob|Y=V9#}9@lW4C#uNBjdt;C}P~ literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch6.iob b/objects/trees/oak/antioch6.iob new file mode 100644 index 0000000000000000000000000000000000000000..23b016349fd532e344dd5bd04758c8682f3c6e71 GIT binary patch literal 1258 zcmb7@Jx{_=6oyX=RWzs1-ue`g#lXYBm#>SZ+QUzM+ey7#tn{iEe-EB1J}oMATA zv^Mo{ZSZOu>j;_dburfiTe64FG|jL>?4dKCKJk17>=4~f8s^Q9>r9@OH0wa(AbFvQ z2)p}~7q!R;J0w0d-lzvdQ8QD7YiG+lAi`A9^PRcu3pZzp=2U&B`gUsd=G)`Ui65=? znmP5vuf$p6XW~cVd(b-GyXKts0CPQ|HRt3nk{_y1Ym05|8e)S!M`z3=mxWqB8xhSU ze5xXOeCvYUi>lGgMa4T6ADaDPXAbVyoJ8elBG~m7RnJMjF6NL?)9*MxQEwp~_41gPx*(3uHG@R@V<*vN{D*vJ+COo+ FegQ*#Q=|X@ literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch7.iob b/objects/trees/oak/antioch7.iob new file mode 100644 index 0000000000000000000000000000000000000000..5e36e387d427b764aadefb8d9c9f47e4c741d360 GIT binary patch literal 1664 zcmb7^$!-%t5Qb~UYZhJramWL3fB-@Q`NAzHZd{@WS;-(-fQ@Xkz6|dewm4pf|EsEr zge+vmR{NX3s=B7Ty4q&eF|&Ib9XmXkj%G)%j*m`WzIbkZd+>fVuFj{!H}hwc;oH~m zs^O<=-|=}exi}qu8O;V?&+Nax zZ#&=gc>7H|cJuVsGoIXf#-r^SX5Ur&I~rz%9Xicf==ngSlzrd5<}B;_M(?G+pMHox zbZI?l@d6>?n`Z zf5R`c`(Y=aI#y_g`<<$TW`>5!m%6CeX@^>8>at#?9cn%G(shwECwUtCb;d*Njb8Zt zqP|K$EY0da$=}Ie$)Cv|$;+S}Py-EU8v9V6JrO&klKr$p?5?$2*pt7Peu&?-*mb+k z6Pw~7A4r^Q<#E4sTcf9)w48;Lcr@{lb#ivZc@E_bYNfL4oIJ+QEwn0!T{Dv#DB;ws ztJI71H@r^0bn2WkZk6_+&O5a32VKYgprg1SDAf}x26{cAbl<5uirfWi#J8)#K4Q>g zQM*RB)7Ns+_Yuq8^g9EU-?d22==1QihUjb89--ViiO_40uhqBG-oIgArQNCcWyW7S zi+Yi|;ia_tQhmY=v3kW>`#C^r5_dc9IOo0b-f4^U0&9-Gfx7F&%T7M;J7p)|8v5ym YX6Mu){!7@s`}G_4R%-q`h-+wn0UcS!@c;k- literal 0 HcmV?d00001 diff --git a/objects/trees/oak/antioch8.iob b/objects/trees/oak/antioch8.iob new file mode 100644 index 0000000000000000000000000000000000000000..e3b2a86cf0b81dbae29af49b366c5d7bba5b6437 GIT binary patch literal 919 zcmY+CJ5R$f6os#w1{jzaVc`cbAQmK07q(7pELBy7)<8sQP!e9hyoEl@IoH=M+$jEh z?!&pZBOD|R?|MuouGC6-KXMS845A9V|JddWnc=ydNW~mYkj8RU(#|R>oY!aSq!ZaBtYX zYD^=;9AuwM(@OTO8v7xk*A`FQSRA3aR@Au1c*41o_ZYv~HJw>J-HZ~oQFCOyo()F5 zP3u+HK_49%t<1b>02fmaXWMNoF}wv#t6V@TO56m^rfe*Je{P105{BYk;EUJ?cX z0{|GKk6==0WwQM;D|Xurq_DWCR@Pb^?Ya}E!&!>EG-acV6>Tl^)%+^8K_*+9TYZxi zO#c;+u4_v1R3?8_xM7AqL?@%I010mKMwsyDc|zPd%#it)Lt>aG!~PHfBeGa=J$C>j zs$Gv2uKSMA85EQY%7|gId-EP}A3{{cxgkPM(`hf?$mq54X2R%vGhdee`okai0-pzC ANB{r; literal 0 HcmV?d00001 diff --git a/regions/temperate.json b/regions/temperate.json index 79c60dbc..dfa527b0 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -64,6 +64,42 @@ "trees/oak/truegeneric5" ] }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE", "BIG_TREE"]}], + "place": [ + "trees/oak/antioch3", + "trees/oak/antioch4", + "trees/oak/antioch5", + "trees/oak/antioch6", + "trees/oak/antioch7", + "trees/oak/antioch8", + "trees/oak/antioch9", + "trees/oak/antioch10", + "trees/oak/antioch11", + "trees/oak/antioch12", + "trees/oak/antioch13" + ] + }, + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["BIRCH"]}], + "place": [ + "trees/birch/antioch3", + "trees/birch/antioch4", + "trees/birch/antioch5", + "trees/birch/antioch6", + "trees/birch/antioch7", + "trees/birch/antioch8", + "trees/birch/antioch9", + "trees/birch/antioch10", + "trees/birch/antioch11", + "trees/birch/antioch12", + "trees/birch/antioch13" + ] + }, { "heightmap": { "seed": 1337, From 47c549d52f1a179aa4d34f0629dbd86842370ba4 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 14:27:51 -0700 Subject: [PATCH 29/46] Villager Remandate --- jigsaw-pieces/mushhut/hut/hut1.json | 11 +++++++++-- jigsaw-pieces/mushhut/hut/hut2.json | 12 ++++++++++-- jigsaw-pieces/mushhut/hut/hut3.json | 12 ++++++++++-- jigsaw-pieces/mushhut/hut/hut4.json | 12 ++++++++++-- jigsaw-pieces/mushhut/hut/hut5.json | 12 ++++++++++-- jigsaw-pieces/mushhut/hut/hut6.json | 12 ++++++++++-- jigsaw-pieces/mushhut/hut/hut7.json | 11 +++++++++-- .../desert/houses/desert_cartographer_house_1.json | 9 +++++++++ .../village/desert/houses/desert_fisher_1.json | 9 +++++++++ .../desert/houses/desert_fletcher_house_1.json | 9 +++++++++ .../village/desert/houses/desert_medium_house_1.json | 11 +++++++++-- .../village/desert/houses/desert_medium_house_2.json | 11 +++++++++-- .../village/desert/houses/desert_small_house_1.json | 12 ++++++++++-- .../village/desert/houses/desert_small_house_2.json | 10 +++++++++- .../village/desert/houses/desert_small_house_3.json | 10 +++++++++- .../village/desert/houses/desert_small_house_4.json | 10 +++++++++- .../village/desert/houses/desert_small_house_5.json | 11 +++++++++-- .../village/desert/houses/desert_small_house_6.json | 10 +++++++++- .../village/desert/houses/desert_small_house_7.json | 10 +++++++++- .../village/desert/houses/desert_small_house_8.json | 11 +++++++++-- .../village/desert/houses/desert_tool_smith_1.json | 9 +++++++++ .../village/desert/houses/desert_weaponsmith_1.json | 9 +++++++++ jigsaw-pieces/village/desert/streets/corner_01.json | 12 ++++++++++-- jigsaw-pieces/village/desert/streets/corner_02.json | 12 ++++++++++-- .../village/desert/streets/crossroad_01.json | 11 +++++++++-- .../village/desert/streets/crossroad_02.json | 11 +++++++++-- .../village/desert/streets/crossroad_03.json | 12 ++++++++++-- .../village/desert/streets/straight_01.json | 11 +++++++++-- .../village/desert/streets/straight_02.json | 12 ++++++++++-- .../village/desert/streets/straight_03.json | 12 ++++++++++-- jigsaw-pieces/village/desert/streets/turn_01.json | 11 +++++++++-- .../desert/town_centers/desert_meeting_point_1.json | 9 +++++++++ .../desert/town_centers/desert_meeting_point_2.json | 9 +++++++++ .../desert/town_centers/desert_meeting_point_3.json | 9 +++++++++ .../village/desert/villagers/unemployed.json | 10 +++++++++- .../plains/houses/plains_armorer_house_1.json | 9 +++++++++ .../village/plains/houses/plains_big_house_1.json | 9 +++++++++ .../village/plains/houses/plains_butcher_shop_1.json | 9 +++++++++ .../village/plains/houses/plains_butcher_shop_2.json | 9 +++++++++ .../village/plains/houses/plains_cartographer_1.json | 9 +++++++++ .../plains/houses/plains_fisher_cottage_1.json | 9 +++++++++ .../plains/houses/plains_fletcher_house_1.json | 9 +++++++++ .../village/plains/houses/plains_library_1.json | 9 +++++++++ .../village/plains/houses/plains_library_2.json | 9 +++++++++ .../village/plains/houses/plains_masons_house_1.json | 9 +++++++++ .../village/plains/houses/plains_medium_house_1.json | 9 +++++++++ .../village/plains/houses/plains_medium_house_2.json | 9 +++++++++ .../plains/houses/plains_shepherds_house_1.json | 9 +++++++++ .../village/plains/houses/plains_small_farm_1.json | 9 +++++++++ .../village/plains/houses/plains_small_house_1.json | 9 +++++++++ .../village/plains/houses/plains_small_house_2.json | 9 +++++++++ .../village/plains/houses/plains_small_house_3.json | 9 +++++++++ .../village/plains/houses/plains_small_house_4.json | 9 +++++++++ .../village/plains/houses/plains_small_house_5.json | 9 +++++++++ .../village/plains/houses/plains_small_house_6.json | 9 +++++++++ .../village/plains/houses/plains_small_house_7.json | 9 +++++++++ .../village/plains/houses/plains_small_house_8.json | 9 +++++++++ .../village/plains/houses/plains_temple_3.json | 9 +++++++++ .../village/plains/houses/plains_temple_4.json | 9 +++++++++ .../village/plains/houses/plains_tool_smith_1.json | 9 +++++++++ .../village/plains/houses/plains_weaponsmith_1.json | 9 +++++++++ jigsaw-pieces/village/plains/streets/corner_01.json | 9 +++++++++ jigsaw-pieces/village/plains/streets/corner_02.json | 9 +++++++++ jigsaw-pieces/village/plains/streets/corner_03.json | 9 +++++++++ .../village/plains/streets/straight_01.json | 9 +++++++++ .../village/plains/streets/straight_02.json | 9 +++++++++ .../village/plains/streets/straight_03.json | 9 +++++++++ .../village/plains/streets/straight_04.json | 9 +++++++++ .../village/plains/streets/straight_05.json | 9 +++++++++ .../village/plains/streets/straight_06.json | 9 +++++++++ jigsaw-pieces/village/plains/streets/turn_01.json | 9 +++++++++ .../plains/town_centers/plains_fountain_01.json | 9 +++++++++ .../plains/town_centers/plains_meeting_point_1.json | 9 +++++++++ .../plains/town_centers/plains_meeting_point_2.json | 9 +++++++++ .../plains/town_centers/plains_meeting_point_3.json | 9 +++++++++ .../village/plains/villagers/unemployed.json | 9 +++++++++ jigsaw-pieces/village/savanna/streets/corner_01.json | 9 +++++++++ jigsaw-pieces/village/savanna/streets/corner_03.json | 9 +++++++++ jigsaw-pieces/village/savanna/streets/split_01.json | 9 +++++++++ jigsaw-pieces/village/savanna/streets/split_02.json | 9 +++++++++ .../village/savanna/streets/straight_02.json | 9 +++++++++ .../village/savanna/streets/straight_04.json | 9 +++++++++ .../village/savanna/streets/straight_05.json | 9 +++++++++ .../village/savanna/streets/straight_06.json | 9 +++++++++ .../village/savanna/streets/straight_08.json | 9 +++++++++ .../village/savanna/streets/straight_09.json | 9 +++++++++ .../village/savanna/streets/straight_10.json | 9 +++++++++ .../village/savanna/streets/straight_11.json | 9 +++++++++ jigsaw-pieces/village/savanna/streets/turn_01.json | 9 +++++++++ .../village/savanna/villagers/unemployed.json | 9 +++++++++ .../village/snowy/houses/snowy_medium_house_1.json | 9 +++++++++ .../village/snowy/houses/snowy_medium_house_2.json | 9 +++++++++ .../village/snowy/houses/snowy_medium_house_3.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_1.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_2.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_3.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_4.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_5.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_6.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_7.json | 9 +++++++++ .../village/snowy/houses/snowy_small_house_8.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/corner_01.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/corner_02.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/corner_03.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_01.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_02.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_03.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_04.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_06.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/straight_08.json | 9 +++++++++ jigsaw-pieces/village/snowy/streets/turn_01.json | 9 +++++++++ .../snowy/town_centers/snowy_meeting_point_1.json | 9 +++++++++ .../snowy/town_centers/snowy_meeting_point_2.json | 9 +++++++++ .../snowy/town_centers/snowy_meeting_point_3.json | 9 +++++++++ .../village/snowy/villagers/unemployed.json | 9 +++++++++ .../village/taiga/houses/taiga_medium_house_1.json | 9 +++++++++ .../village/taiga/houses/taiga_medium_house_2.json | 9 +++++++++ .../village/taiga/houses/taiga_medium_house_3.json | 9 +++++++++ .../village/taiga/houses/taiga_medium_house_4.json | 9 +++++++++ .../village/taiga/houses/taiga_small_house_1.json | 9 +++++++++ .../village/taiga/houses/taiga_small_house_2.json | 9 +++++++++ .../village/taiga/houses/taiga_small_house_3.json | 9 +++++++++ .../village/taiga/houses/taiga_small_house_4.json | 9 +++++++++ .../village/taiga/houses/taiga_small_house_5.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/corner_01.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/corner_02.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/corner_03.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_01.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_02.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_03.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_04.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_05.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/straight_06.json | 9 +++++++++ jigsaw-pieces/village/taiga/streets/turn_01.json | 9 +++++++++ .../taiga/town_centers/taiga_meeting_point_1.json | 9 +++++++++ .../taiga/town_centers/taiga_meeting_point_2.json | 9 +++++++++ .../village/taiga/villagers/unemployed.json | 9 +++++++++ spawners/villager.json | 10 ++++++++++ 138 files changed, 1254 insertions(+), 48 deletions(-) create mode 100644 spawners/villager.json diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 9b5614f8..62d6b2c7 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -2,8 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +14,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index 7adace4f..336cbfa5 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -2,8 +2,7 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, + "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +15,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index 851619ec..ac35ebed 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -2,8 +2,7 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, + "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +15,15 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index 529b59dd..fb1a8b1e 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -2,8 +2,7 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, + "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +15,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index 96476f65..0f9cf3ce 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -2,8 +2,7 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, + "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +15,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index 0110652c..9ad042fd 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -2,8 +2,7 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, + "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -61,6 +60,15 @@ "underwater": false, "loot": [], "place": [], + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "onwater": false, "clamp": { "minimumHeight": 0, diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index 88eb5ae7..e93fc6bd 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -2,8 +2,6 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - "spawnEntity": "villager", - "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -16,6 +14,15 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..f27af97f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -28,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..99583a42 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -28,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..05649aba 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..b2460c48 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, @@ -43,6 +41,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..d043aeb2 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, @@ -43,6 +41,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..d874da70 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -5,8 +5,7 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "entityCount": 3, - "spawnEntity": "villager", + "position": { "x": 0, "y": -3, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..bca9c486 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, @@ -42,6 +41,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..a3dc8a05 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, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..5493050b 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, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..8fa5c8ce 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -5,8 +5,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 1, "y": -3, @@ -29,6 +27,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..13c06a7c 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, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..aa9f33e8 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, @@ -29,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..6fb0bbd0 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -5,8 +5,6 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - "entityCount": 3, - "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -29,6 +27,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..1b5cf822 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -13,6 +13,15 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..550f0cc4 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -13,6 +13,15 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index ba84c66d..d74b5214 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -2,8 +2,7 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", + "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -71,6 +70,15 @@ "placementOptions": { "overStilt": 0, "chance": 1, + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "meld": false, "density": 1, "edit": [], diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index d8251275..2ff378ad 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -2,8 +2,7 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", + "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -56,6 +55,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..5d36c363 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -2,8 +2,6 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -173,6 +171,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..d0f4dd45 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -2,8 +2,6 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +106,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..085904fc 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -2,8 +2,7 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", + "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -69,6 +68,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..622d80bf 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -2,8 +2,6 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +106,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..a39e16ad 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -2,8 +2,7 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", + "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -108,6 +107,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..2b5fb672 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -2,8 +2,7 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", + "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -43,6 +42,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..0f21907e 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -2,8 +2,6 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - "entityCount": 3, - "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -56,6 +54,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..b493da24 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 @@ -174,6 +174,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..290bbfdb 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 @@ -135,6 +135,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..13059173 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 @@ -161,6 +161,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index 9c0d781c..ff2b434e 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, @@ -19,6 +18,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..49ed490e 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..8998f163 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -71,6 +71,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..4968c861 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..10f9504a 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..b5e5843b 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..4fd3bc12 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..88b5643f 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..0b75c53a 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..b92ab4b1 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..beb2dba6 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..e05e7241 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..6ae89515 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..0847ebf8 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..624425da 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..3fbbfd8b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..830ef2e7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..c74f17d9 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..22142800 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..12d4e7b5 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -68,6 +68,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..5aeb11cd 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..b0a268cd 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..ab1e3f4b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..59f84c4f 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..57b0958a 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..196df422 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..71f7fc5e 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": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index 1038709b..b89adb4a 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index 3f305cb7..e74acd00 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 71b62c06..366e2ca5 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index b7e449e9..b5ac7818 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index bcf61586..bc484e56 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index fd3f71be..afb20660 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index ec518b4e..83bae706 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index b521e7ce..0f4781cd 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -95,6 +95,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 6ecc4f8f..0418fdc8 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -264,6 +264,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index fddad95f..1ddcd473 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..63054120 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -135,6 +135,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..8f4e958d 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 @@ -147,6 +147,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..b6567345 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 @@ -148,6 +148,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..e2e206e4 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 @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index 7d922ce1..a31b72ad 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -19,6 +19,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index 33208b7a..1f47209a 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 089c9df7..39f67e92 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index cf2a6ffb..3eb5a8bf 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index a09cb3de..f563cf4d 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index 8006ebf9..3507e0bc 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index 7a5075df..b4ea2f26 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index da6833f4..2790b668 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -95,6 +95,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index be5c42b2..3ac2b0b1 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index f2cb511d..50d685e7 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index dd0792b4..02b361b1 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 81d89505..36fb3f04 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 91578d90..235f1d5b 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 7f3f0f5e..9d3b81f9 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index e1597c69..77137321 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -19,6 +19,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..57aa23de 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..e7c74023 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..85471a63 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..39422b8c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..f2861fae 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..d9bce2ad 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..65cef1aa 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..50b4aa9e 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..bbb36ac2 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..2d5a05f9 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..1f5637fd 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index 6c05953a..fd890187 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -134,6 +134,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "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..8e6b52c4 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index 2396efb5..ea6f41b4 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 5a248144..66a93b44 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index 155194da..34a68652 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -56,6 +56,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 83030311..59172a0b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -134,6 +134,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index c8d4105f..c23bdc3d 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -82,6 +82,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index bc7181a5..fb64cfba 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -264,6 +264,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index 67f75c3b..abe11363 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index c7d59299..b753a6cb 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -82,6 +82,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..ada7b9dd 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 @@ -160,6 +160,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..ed979399 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 @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..c57f11eb 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 @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index 0be358f3..3863f507 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -19,6 +19,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..c8ab502a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..d68ae6d7 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..3f93e93b 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..a97d11ec 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..e7c2dd06 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..2190603a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..26fceea8 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..dfb346d6 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -42,6 +42,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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..7a173f12 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -29,6 +29,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index aa5031db..8ebfd5b0 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index 5e64ed61..c4f793d3 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -82,6 +82,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index a8828f19..5eaa62b1 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -43,6 +43,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index 7f6f1cc7..02baf60a 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index 4e46cf82..bd0061a2 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -82,6 +82,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index 8799588c..2b0c664e 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -108,6 +108,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 33b5e1fd..3b0e942b 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index 27c61769..3bf8b7c9 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -121,6 +121,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index acc54350..dc7b7c4c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -264,6 +264,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index 7768a5fc..eabd8c45 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -69,6 +69,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..007daef0 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 @@ -239,6 +239,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, 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..90775053 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 @@ -161,6 +161,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index f193030e..56357040 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -19,6 +19,15 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["villager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/spawners/villager.json b/spawners/villager.json new file mode 100644 index 00000000..796dc196 --- /dev/null +++ b/spawners/villager.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "villager", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ No newline at end of file From c0567464ad21219744cb04d73496fd870d01463f Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 15:20:00 -0700 Subject: [PATCH 30/46] more changes --- entities/villager.json | 4 +--- jigsaw-pieces/mushhut/hut/hut1.json | 4 +++- jigsaw-pieces/mushhut/hut/hut2.json | 4 +++- jigsaw-pieces/mushhut/hut/hut3.json | 4 +++- jigsaw-pieces/mushhut/hut/hut4.json | 4 +++- jigsaw-pieces/mushhut/hut/hut5.json | 4 +++- jigsaw-pieces/mushhut/hut/hut6.json | 4 +++- jigsaw-pieces/mushhut/hut/hut7.json | 4 +++- jigsaw-pieces/pillager_outpost/feature_plate.json | 9 +++++++++ jigsaw-pieces/pillager_outpost/pillager.json | 13 ++++++++++++- jigsaw-pieces/pillager_outpost/watchtower.json | 9 +++++++++ .../desert/houses/desert_cartographer_house_1.json | 4 +++- .../village/desert/houses/desert_fisher_1.json | 4 +++- .../desert/houses/desert_fletcher_house_1.json | 4 +++- .../desert/houses/desert_medium_house_1.json | 4 +++- .../desert/houses/desert_medium_house_2.json | 4 +++- .../village/desert/houses/desert_small_house_1.json | 4 +++- .../village/desert/houses/desert_small_house_2.json | 4 +++- .../village/desert/houses/desert_small_house_3.json | 4 +++- .../village/desert/houses/desert_small_house_4.json | 4 +++- .../village/desert/houses/desert_small_house_5.json | 4 +++- .../village/desert/houses/desert_small_house_6.json | 4 +++- .../village/desert/houses/desert_small_house_7.json | 4 +++- .../village/desert/houses/desert_small_house_8.json | 4 +++- .../village/desert/houses/desert_tool_smith_1.json | 4 +++- .../village/desert/houses/desert_weaponsmith_1.json | 4 +++- jigsaw-pieces/village/desert/streets/corner_01.json | 4 +++- jigsaw-pieces/village/desert/streets/corner_02.json | 4 +++- .../village/desert/streets/crossroad_01.json | 4 +++- .../village/desert/streets/crossroad_02.json | 4 +++- .../village/desert/streets/crossroad_03.json | 4 +++- .../village/desert/streets/straight_01.json | 4 +++- .../village/desert/streets/straight_02.json | 4 +++- .../village/desert/streets/straight_03.json | 4 +++- jigsaw-pieces/village/desert/streets/turn_01.json | 4 +++- .../desert/town_centers/desert_meeting_point_1.json | 4 +++- .../desert/town_centers/desert_meeting_point_2.json | 4 +++- .../desert/town_centers/desert_meeting_point_3.json | 4 +++- .../village/desert/villagers/unemployed.json | 4 +++- .../plains/houses/plains_armorer_house_1.json | 4 +++- .../village/plains/houses/plains_big_house_1.json | 4 +++- .../plains/houses/plains_butcher_shop_1.json | 4 +++- .../plains/houses/plains_butcher_shop_2.json | 4 +++- .../plains/houses/plains_cartographer_1.json | 4 +++- .../plains/houses/plains_fisher_cottage_1.json | 4 +++- .../plains/houses/plains_fletcher_house_1.json | 4 +++- .../village/plains/houses/plains_library_1.json | 4 +++- .../village/plains/houses/plains_library_2.json | 4 +++- .../plains/houses/plains_masons_house_1.json | 4 +++- .../plains/houses/plains_medium_house_1.json | 4 +++- .../plains/houses/plains_medium_house_2.json | 4 +++- .../plains/houses/plains_shepherds_house_1.json | 4 +++- .../village/plains/houses/plains_small_farm_1.json | 4 +++- .../village/plains/houses/plains_small_house_1.json | 4 +++- .../village/plains/houses/plains_small_house_2.json | 4 +++- .../village/plains/houses/plains_small_house_3.json | 4 +++- .../village/plains/houses/plains_small_house_4.json | 4 +++- .../village/plains/houses/plains_small_house_5.json | 4 +++- .../village/plains/houses/plains_small_house_6.json | 4 +++- .../village/plains/houses/plains_small_house_7.json | 4 +++- .../village/plains/houses/plains_small_house_8.json | 4 +++- .../village/plains/houses/plains_temple_3.json | 4 +++- .../village/plains/houses/plains_temple_4.json | 4 +++- .../village/plains/houses/plains_tool_smith_1.json | 4 +++- .../village/plains/houses/plains_weaponsmith_1.json | 4 +++- jigsaw-pieces/village/plains/streets/corner_01.json | 4 +++- jigsaw-pieces/village/plains/streets/corner_02.json | 4 +++- jigsaw-pieces/village/plains/streets/corner_03.json | 4 +++- .../village/plains/streets/straight_01.json | 4 +++- .../village/plains/streets/straight_02.json | 4 +++- .../village/plains/streets/straight_03.json | 4 +++- .../village/plains/streets/straight_04.json | 4 +++- .../village/plains/streets/straight_05.json | 4 +++- .../village/plains/streets/straight_06.json | 4 +++- jigsaw-pieces/village/plains/streets/turn_01.json | 4 +++- .../plains/town_centers/plains_fountain_01.json | 4 +++- .../plains/town_centers/plains_meeting_point_1.json | 4 +++- .../plains/town_centers/plains_meeting_point_2.json | 4 +++- .../plains/town_centers/plains_meeting_point_3.json | 4 +++- .../village/plains/villagers/unemployed.json | 4 +++- .../village/savanna/streets/corner_01.json | 4 +++- .../village/savanna/streets/corner_03.json | 4 +++- jigsaw-pieces/village/savanna/streets/split_01.json | 4 +++- jigsaw-pieces/village/savanna/streets/split_02.json | 4 +++- .../village/savanna/streets/straight_02.json | 4 +++- .../village/savanna/streets/straight_04.json | 4 +++- .../village/savanna/streets/straight_05.json | 4 +++- .../village/savanna/streets/straight_06.json | 4 +++- .../village/savanna/streets/straight_08.json | 4 +++- .../village/savanna/streets/straight_09.json | 4 +++- .../village/savanna/streets/straight_10.json | 4 +++- .../village/savanna/streets/straight_11.json | 4 +++- jigsaw-pieces/village/savanna/streets/turn_01.json | 4 +++- .../village/savanna/villagers/unemployed.json | 4 +++- .../village/snowy/houses/snowy_medium_house_1.json | 4 +++- .../village/snowy/houses/snowy_medium_house_2.json | 4 +++- .../village/snowy/houses/snowy_medium_house_3.json | 4 +++- .../village/snowy/houses/snowy_small_house_1.json | 4 +++- .../village/snowy/houses/snowy_small_house_2.json | 4 +++- .../village/snowy/houses/snowy_small_house_3.json | 4 +++- .../village/snowy/houses/snowy_small_house_4.json | 4 +++- .../village/snowy/houses/snowy_small_house_5.json | 4 +++- .../village/snowy/houses/snowy_small_house_6.json | 4 +++- .../village/snowy/houses/snowy_small_house_7.json | 4 +++- .../village/snowy/houses/snowy_small_house_8.json | 4 +++- jigsaw-pieces/village/snowy/streets/corner_01.json | 4 +++- jigsaw-pieces/village/snowy/streets/corner_02.json | 4 +++- jigsaw-pieces/village/snowy/streets/corner_03.json | 4 +++- .../village/snowy/streets/straight_01.json | 4 +++- .../village/snowy/streets/straight_02.json | 4 +++- .../village/snowy/streets/straight_03.json | 4 +++- .../village/snowy/streets/straight_04.json | 4 +++- .../village/snowy/streets/straight_06.json | 4 +++- .../village/snowy/streets/straight_08.json | 4 +++- jigsaw-pieces/village/snowy/streets/turn_01.json | 4 +++- .../snowy/town_centers/snowy_meeting_point_1.json | 4 +++- .../snowy/town_centers/snowy_meeting_point_2.json | 4 +++- .../snowy/town_centers/snowy_meeting_point_3.json | 4 +++- .../village/snowy/villagers/unemployed.json | 4 +++- .../village/taiga/houses/taiga_medium_house_1.json | 4 +++- .../village/taiga/houses/taiga_medium_house_2.json | 4 +++- .../village/taiga/houses/taiga_medium_house_3.json | 4 +++- .../village/taiga/houses/taiga_medium_house_4.json | 4 +++- .../village/taiga/houses/taiga_small_house_1.json | 4 +++- .../village/taiga/houses/taiga_small_house_2.json | 4 +++- .../village/taiga/houses/taiga_small_house_3.json | 4 +++- .../village/taiga/houses/taiga_small_house_4.json | 4 +++- .../village/taiga/houses/taiga_small_house_5.json | 4 +++- jigsaw-pieces/village/taiga/streets/corner_01.json | 4 +++- jigsaw-pieces/village/taiga/streets/corner_02.json | 4 +++- jigsaw-pieces/village/taiga/streets/corner_03.json | 4 +++- .../village/taiga/streets/straight_01.json | 4 +++- .../village/taiga/streets/straight_02.json | 4 +++- .../village/taiga/streets/straight_03.json | 4 +++- .../village/taiga/streets/straight_04.json | 4 +++- .../village/taiga/streets/straight_05.json | 4 +++- .../village/taiga/streets/straight_06.json | 4 +++- jigsaw-pieces/village/taiga/streets/turn_01.json | 4 +++- .../taiga/town_centers/taiga_meeting_point_1.json | 4 +++- .../taiga/town_centers/taiga_meeting_point_2.json | 4 +++- .../village/taiga/villagers/unemployed.json | 4 +++- spawners/pillager.json | 10 ++++++++++ 142 files changed, 452 insertions(+), 141 deletions(-) create mode 100644 spawners/pillager.json diff --git a/entities/villager.json b/entities/villager.json index b696db60..65c6040a 100644 --- a/entities/villager.json +++ b/entities/villager.json @@ -1,7 +1,5 @@ { "type": "VILLAGER", - "aware": true, "customNameVisible": true, - "customName": " ", - "ai": true + "customName": " " } diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 62d6b2c7..316c0779 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -19,7 +19,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index 336cbfa5..f517979b 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -20,7 +20,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index ac35ebed..af22544d 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -20,7 +20,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index fb1a8b1e..48035aae 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -20,7 +20,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index 0f9cf3ce..e4aca634 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -20,7 +20,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index 9ad042fd..ff13fd36 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -65,7 +65,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index e93fc6bd..786a4185 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -19,7 +19,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/pillager_outpost/feature_plate.json b/jigsaw-pieces/pillager_outpost/feature_plate.json index 00cd2eb7..9eca30ef 100644 --- a/jigsaw-pieces/pillager_outpost/feature_plate.json +++ b/jigsaw-pieces/pillager_outpost/feature_plate.json @@ -28,6 +28,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["pillager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/pillager.json b/jigsaw-pieces/pillager_outpost/pillager.json index f7b5eaad..d3949cc6 100644 --- a/jigsaw-pieces/pillager_outpost/pillager.json +++ b/jigsaw-pieces/pillager_outpost/pillager.json @@ -1,4 +1,16 @@ { + "placementOptions": { + "place": [], + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["pillager"], + "blockRadius": 3 + } + } + ] + }, "connectors": [{ "name": "pillager", "position": { @@ -8,7 +20,6 @@ }, "direction": "DOWN_NEGATIVE_Y", "entityCount": 50, - "spawnEntity": "pillager", "rotateConnector": false, "innerConnector": true }], diff --git a/jigsaw-pieces/pillager_outpost/watchtower.json b/jigsaw-pieces/pillager_outpost/watchtower.json index fc515bcc..3c864fc5 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower.json +++ b/jigsaw-pieces/pillager_outpost/watchtower.json @@ -264,6 +264,15 @@ } ], "placementOptions": { + "addFeatures": [ + { + "rarity": 1, + "zone": { + "entitySpawners": ["pillager"], + "blockRadius": 3 + } + } + ], "overStilt": 0, "chance": 1, "meld": 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 f27af97f..f457f383 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json index 99583a42..294349ec 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 05649aba..52d6aff9 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 b2460c48..64c55982 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json @@ -46,7 +46,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 d043aeb2..01f93c13 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json @@ -46,7 +46,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 d874da70..362d8c0a 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 bca9c486..6c5955eb 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json @@ -46,7 +46,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 a3dc8a05..1cc4d0e7 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 5493050b..0082d539 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 8fa5c8ce..778d83e6 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -32,7 +32,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 13c06a7c..f979d21b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 aa9f33e8..44e44819 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 6fb0bbd0..23e4e894 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -32,7 +32,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 1b5cf822..b391b81f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json index 550f0cc4..ba112ddf 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index d74b5214..3bdf5fa2 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -75,7 +75,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index 2ff378ad..18a66318 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -60,7 +60,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_01.json b/jigsaw-pieces/village/desert/streets/crossroad_01.json index 5d36c363..5db3cec7 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -176,7 +176,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_02.json b/jigsaw-pieces/village/desert/streets/crossroad_02.json index d0f4dd45..8cf4dd43 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -111,7 +111,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_03.json b/jigsaw-pieces/village/desert/streets/crossroad_03.json index 085904fc..5b00a8a3 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -73,7 +73,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_01.json b/jigsaw-pieces/village/desert/streets/straight_01.json index 622d80bf..5fd8e541 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -111,7 +111,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_02.json b/jigsaw-pieces/village/desert/streets/straight_02.json index a39e16ad..797dd210 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -112,7 +112,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_03.json b/jigsaw-pieces/village/desert/streets/straight_03.json index 2b5fb672..82bb0b03 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -47,7 +47,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/streets/turn_01.json b/jigsaw-pieces/village/desert/streets/turn_01.json index 0f21907e..145979a0 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -59,7 +59,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 b493da24..971e6c73 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 @@ -179,7 +179,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 290bbfdb..4869b7eb 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 @@ -140,7 +140,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 13059173..7b0f4aff 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 @@ -166,7 +166,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index ff2b434e..ef7221df 100644 --- a/jigsaw-pieces/village/desert/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/villagers/unemployed.json @@ -23,7 +23,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 49ed490e..039abe4d 100644 --- a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 8998f163..70451a43 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -76,7 +76,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 4968c861..a998619e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 10f9504a..d0ffa57e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json @@ -85,7 +85,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json index b5e5843b..46118e19 100644 --- a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 4fd3bc12..6d28f626 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 88b5643f..5d968454 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json @@ -33,7 +33,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_library_1.json b/jigsaw-pieces/village/plains/houses/plains_library_1.json index 0b75c53a..2b8b3b49 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_library_2.json b/jigsaw-pieces/village/plains/houses/plains_library_2.json index b92ab4b1..3f603be0 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_2.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 beb2dba6..85c861a5 100644 --- a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 e05e7241..01a840fd 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 6ae89515..b2450f21 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 0847ebf8..15b7e1eb 100644 --- a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json @@ -59,7 +59,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 624425da..cdf73aa1 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 3fbbfd8b..f1019811 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 830ef2e7..e0885424 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 c74f17d9..98bc6544 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 22142800..f23b6c73 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 12d4e7b5..b068dde8 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -73,7 +73,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 5aeb11cd..f6fd7a89 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 b0a268cd..3d4db348 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 ab1e3f4b..debf09ad 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_3.json b/jigsaw-pieces/village/plains/houses/plains_temple_3.json index 59f84c4f..bfedda86 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_3.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_4.json b/jigsaw-pieces/village/plains/houses/plains_temple_4.json index 57b0958a..e9a4e377 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_4.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 196df422..8d85f479 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json index 71f7fc5e..e7ce4be7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json @@ -18,7 +18,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index b89adb4a..86915d0a 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index e74acd00..fb449ffb 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 366e2ca5..8ec39fae 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index b5ac7818..ec7d3f64 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index bc484e56..3c8f7bee 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index afb20660..0d6ede1e 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index 83bae706..11edda4a 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index 0f4781cd..901e910f 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -100,7 +100,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 0418fdc8..6342d7bd 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -269,7 +269,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index 1ddcd473..17cea9a8 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 63054120..61d868d0 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -140,7 +140,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 8f4e958d..e3ebe0da 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 @@ -152,7 +152,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 b6567345..2adafd08 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 @@ -153,7 +153,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 e2e206e4..01b8f961 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 @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index a31b72ad..3f579f4b 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -24,7 +24,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index 1f47209a..b351168b 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 39f67e92..19eb8594 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index 3eb5a8bf..b4202754 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index f563cf4d..a992878e 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index 3507e0bc..fb5af3d3 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index b4ea2f26..66596f75 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index 2790b668..46b502dc 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -100,7 +100,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index 3ac2b0b1..89a2e29f 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index 50d685e7..f3c40cfb 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index 02b361b1..81a4c845 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 36fb3f04..6c4c55c6 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 235f1d5b..2b16bdf1 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 9d3b81f9..6f76610a 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index 77137321..27ce47f8 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -24,7 +24,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 57aa23de..3716b94e 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 e7c74023..f82618e1 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 85471a63..3bdfd97c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 39422b8c..faabc2fc 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 f2861fae..59944403 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 d9bce2ad..f14fb434 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 65cef1aa..9ebfd5eb 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 50b4aa9e..603a36e8 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 bbb36ac2..63ed092b 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 2d5a05f9..9055b81b 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 1f5637fd..62b27e54 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index fd890187..2a406d7a 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -139,7 +139,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_02.json b/jigsaw-pieces/village/snowy/streets/corner_02.json index 8e6b52c4..744888f0 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index ea6f41b4..81f7768b 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 66a93b44..6bfe0253 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index 34a68652..e28be82b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -61,7 +61,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 59172a0b..978456b2 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -139,7 +139,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index c23bdc3d..1bd78071 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -87,7 +87,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index fb64cfba..ec9ce0b0 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -269,7 +269,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index abe11363..76709caf 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index b753a6cb..add43a77 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -87,7 +87,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 ada7b9dd..9bff4540 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 @@ -165,7 +165,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 ed979399..12bfc710 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 @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 c57f11eb..25ddf727 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 @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index 3863f507..e4f3043c 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -24,7 +24,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 c8ab502a..8368ca1a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 d68ae6d7..196825f3 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 3f93e93b..612c053e 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 a97d11ec..2ffa5439 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 e7c2dd06..b4bc6a92 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 2190603a..67ccaae9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 26fceea8..f2fcd501 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 dfb346d6..080e8003 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -47,7 +47,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 7a173f12..14ce8ee5 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -34,7 +34,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index 8ebfd5b0..488dbcdd 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index c4f793d3..e8f7b07b 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -87,7 +87,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index 5eaa62b1..ab57f2fd 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -48,7 +48,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index 02baf60a..06b462c0 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index bd0061a2..82e8b0a3 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -87,7 +87,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index 2b0c664e..949b75c8 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -113,7 +113,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 3b0e942b..9731eebe 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index 3bf8b7c9..a541a288 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -126,7 +126,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index dc7b7c4c..2d77871d 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -269,7 +269,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index eabd8c45..8266277b 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -74,7 +74,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 007daef0..83f4915d 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 @@ -244,7 +244,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], 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 90775053..2a5e9b57 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 @@ -166,7 +166,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index 56357040..2169d906 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -24,7 +24,9 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "blockRadius": 3 + "strength": 1, + "customBiome": "frozen/vander", + "blockRadius": 8 } } ], diff --git a/spawners/pillager.json b/spawners/pillager.json new file mode 100644 index 00000000..9f943e52 --- /dev/null +++ b/spawners/pillager.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "pillager", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ No newline at end of file From 9b1476a958557b151a8d79add9dfb04e0f261f9c Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 15:20:00 -0700 Subject: [PATCH 31/46] Revert "more changes" This reverts commit c0567464ad21219744cb04d73496fd870d01463f. --- entities/villager.json | 4 +++- jigsaw-pieces/mushhut/hut/hut1.json | 4 +--- jigsaw-pieces/mushhut/hut/hut2.json | 4 +--- jigsaw-pieces/mushhut/hut/hut3.json | 4 +--- jigsaw-pieces/mushhut/hut/hut4.json | 4 +--- jigsaw-pieces/mushhut/hut/hut5.json | 4 +--- jigsaw-pieces/mushhut/hut/hut6.json | 4 +--- jigsaw-pieces/mushhut/hut/hut7.json | 4 +--- jigsaw-pieces/pillager_outpost/feature_plate.json | 9 --------- jigsaw-pieces/pillager_outpost/pillager.json | 13 +------------ jigsaw-pieces/pillager_outpost/watchtower.json | 9 --------- .../desert/houses/desert_cartographer_house_1.json | 4 +--- .../village/desert/houses/desert_fisher_1.json | 4 +--- .../desert/houses/desert_fletcher_house_1.json | 4 +--- .../desert/houses/desert_medium_house_1.json | 4 +--- .../desert/houses/desert_medium_house_2.json | 4 +--- .../village/desert/houses/desert_small_house_1.json | 4 +--- .../village/desert/houses/desert_small_house_2.json | 4 +--- .../village/desert/houses/desert_small_house_3.json | 4 +--- .../village/desert/houses/desert_small_house_4.json | 4 +--- .../village/desert/houses/desert_small_house_5.json | 4 +--- .../village/desert/houses/desert_small_house_6.json | 4 +--- .../village/desert/houses/desert_small_house_7.json | 4 +--- .../village/desert/houses/desert_small_house_8.json | 4 +--- .../village/desert/houses/desert_tool_smith_1.json | 4 +--- .../village/desert/houses/desert_weaponsmith_1.json | 4 +--- jigsaw-pieces/village/desert/streets/corner_01.json | 4 +--- jigsaw-pieces/village/desert/streets/corner_02.json | 4 +--- .../village/desert/streets/crossroad_01.json | 4 +--- .../village/desert/streets/crossroad_02.json | 4 +--- .../village/desert/streets/crossroad_03.json | 4 +--- .../village/desert/streets/straight_01.json | 4 +--- .../village/desert/streets/straight_02.json | 4 +--- .../village/desert/streets/straight_03.json | 4 +--- jigsaw-pieces/village/desert/streets/turn_01.json | 4 +--- .../desert/town_centers/desert_meeting_point_1.json | 4 +--- .../desert/town_centers/desert_meeting_point_2.json | 4 +--- .../desert/town_centers/desert_meeting_point_3.json | 4 +--- .../village/desert/villagers/unemployed.json | 4 +--- .../plains/houses/plains_armorer_house_1.json | 4 +--- .../village/plains/houses/plains_big_house_1.json | 4 +--- .../plains/houses/plains_butcher_shop_1.json | 4 +--- .../plains/houses/plains_butcher_shop_2.json | 4 +--- .../plains/houses/plains_cartographer_1.json | 4 +--- .../plains/houses/plains_fisher_cottage_1.json | 4 +--- .../plains/houses/plains_fletcher_house_1.json | 4 +--- .../village/plains/houses/plains_library_1.json | 4 +--- .../village/plains/houses/plains_library_2.json | 4 +--- .../plains/houses/plains_masons_house_1.json | 4 +--- .../plains/houses/plains_medium_house_1.json | 4 +--- .../plains/houses/plains_medium_house_2.json | 4 +--- .../plains/houses/plains_shepherds_house_1.json | 4 +--- .../village/plains/houses/plains_small_farm_1.json | 4 +--- .../village/plains/houses/plains_small_house_1.json | 4 +--- .../village/plains/houses/plains_small_house_2.json | 4 +--- .../village/plains/houses/plains_small_house_3.json | 4 +--- .../village/plains/houses/plains_small_house_4.json | 4 +--- .../village/plains/houses/plains_small_house_5.json | 4 +--- .../village/plains/houses/plains_small_house_6.json | 4 +--- .../village/plains/houses/plains_small_house_7.json | 4 +--- .../village/plains/houses/plains_small_house_8.json | 4 +--- .../village/plains/houses/plains_temple_3.json | 4 +--- .../village/plains/houses/plains_temple_4.json | 4 +--- .../village/plains/houses/plains_tool_smith_1.json | 4 +--- .../village/plains/houses/plains_weaponsmith_1.json | 4 +--- jigsaw-pieces/village/plains/streets/corner_01.json | 4 +--- jigsaw-pieces/village/plains/streets/corner_02.json | 4 +--- jigsaw-pieces/village/plains/streets/corner_03.json | 4 +--- .../village/plains/streets/straight_01.json | 4 +--- .../village/plains/streets/straight_02.json | 4 +--- .../village/plains/streets/straight_03.json | 4 +--- .../village/plains/streets/straight_04.json | 4 +--- .../village/plains/streets/straight_05.json | 4 +--- .../village/plains/streets/straight_06.json | 4 +--- jigsaw-pieces/village/plains/streets/turn_01.json | 4 +--- .../plains/town_centers/plains_fountain_01.json | 4 +--- .../plains/town_centers/plains_meeting_point_1.json | 4 +--- .../plains/town_centers/plains_meeting_point_2.json | 4 +--- .../plains/town_centers/plains_meeting_point_3.json | 4 +--- .../village/plains/villagers/unemployed.json | 4 +--- .../village/savanna/streets/corner_01.json | 4 +--- .../village/savanna/streets/corner_03.json | 4 +--- jigsaw-pieces/village/savanna/streets/split_01.json | 4 +--- jigsaw-pieces/village/savanna/streets/split_02.json | 4 +--- .../village/savanna/streets/straight_02.json | 4 +--- .../village/savanna/streets/straight_04.json | 4 +--- .../village/savanna/streets/straight_05.json | 4 +--- .../village/savanna/streets/straight_06.json | 4 +--- .../village/savanna/streets/straight_08.json | 4 +--- .../village/savanna/streets/straight_09.json | 4 +--- .../village/savanna/streets/straight_10.json | 4 +--- .../village/savanna/streets/straight_11.json | 4 +--- jigsaw-pieces/village/savanna/streets/turn_01.json | 4 +--- .../village/savanna/villagers/unemployed.json | 4 +--- .../village/snowy/houses/snowy_medium_house_1.json | 4 +--- .../village/snowy/houses/snowy_medium_house_2.json | 4 +--- .../village/snowy/houses/snowy_medium_house_3.json | 4 +--- .../village/snowy/houses/snowy_small_house_1.json | 4 +--- .../village/snowy/houses/snowy_small_house_2.json | 4 +--- .../village/snowy/houses/snowy_small_house_3.json | 4 +--- .../village/snowy/houses/snowy_small_house_4.json | 4 +--- .../village/snowy/houses/snowy_small_house_5.json | 4 +--- .../village/snowy/houses/snowy_small_house_6.json | 4 +--- .../village/snowy/houses/snowy_small_house_7.json | 4 +--- .../village/snowy/houses/snowy_small_house_8.json | 4 +--- jigsaw-pieces/village/snowy/streets/corner_01.json | 4 +--- jigsaw-pieces/village/snowy/streets/corner_02.json | 4 +--- jigsaw-pieces/village/snowy/streets/corner_03.json | 4 +--- .../village/snowy/streets/straight_01.json | 4 +--- .../village/snowy/streets/straight_02.json | 4 +--- .../village/snowy/streets/straight_03.json | 4 +--- .../village/snowy/streets/straight_04.json | 4 +--- .../village/snowy/streets/straight_06.json | 4 +--- .../village/snowy/streets/straight_08.json | 4 +--- jigsaw-pieces/village/snowy/streets/turn_01.json | 4 +--- .../snowy/town_centers/snowy_meeting_point_1.json | 4 +--- .../snowy/town_centers/snowy_meeting_point_2.json | 4 +--- .../snowy/town_centers/snowy_meeting_point_3.json | 4 +--- .../village/snowy/villagers/unemployed.json | 4 +--- .../village/taiga/houses/taiga_medium_house_1.json | 4 +--- .../village/taiga/houses/taiga_medium_house_2.json | 4 +--- .../village/taiga/houses/taiga_medium_house_3.json | 4 +--- .../village/taiga/houses/taiga_medium_house_4.json | 4 +--- .../village/taiga/houses/taiga_small_house_1.json | 4 +--- .../village/taiga/houses/taiga_small_house_2.json | 4 +--- .../village/taiga/houses/taiga_small_house_3.json | 4 +--- .../village/taiga/houses/taiga_small_house_4.json | 4 +--- .../village/taiga/houses/taiga_small_house_5.json | 4 +--- jigsaw-pieces/village/taiga/streets/corner_01.json | 4 +--- jigsaw-pieces/village/taiga/streets/corner_02.json | 4 +--- jigsaw-pieces/village/taiga/streets/corner_03.json | 4 +--- .../village/taiga/streets/straight_01.json | 4 +--- .../village/taiga/streets/straight_02.json | 4 +--- .../village/taiga/streets/straight_03.json | 4 +--- .../village/taiga/streets/straight_04.json | 4 +--- .../village/taiga/streets/straight_05.json | 4 +--- .../village/taiga/streets/straight_06.json | 4 +--- jigsaw-pieces/village/taiga/streets/turn_01.json | 4 +--- .../taiga/town_centers/taiga_meeting_point_1.json | 4 +--- .../taiga/town_centers/taiga_meeting_point_2.json | 4 +--- .../village/taiga/villagers/unemployed.json | 4 +--- spawners/pillager.json | 10 ---------- 142 files changed, 141 insertions(+), 452 deletions(-) delete mode 100644 spawners/pillager.json diff --git a/entities/villager.json b/entities/villager.json index 65c6040a..b696db60 100644 --- a/entities/villager.json +++ b/entities/villager.json @@ -1,5 +1,7 @@ { "type": "VILLAGER", + "aware": true, "customNameVisible": true, - "customName": " " + "customName": " ", + "ai": true } diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 316c0779..62d6b2c7 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -19,9 +19,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index f517979b..336cbfa5 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -20,9 +20,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index af22544d..ac35ebed 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -20,9 +20,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index 48035aae..fb1a8b1e 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -20,9 +20,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index e4aca634..0f9cf3ce 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -20,9 +20,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index ff13fd36..9ad042fd 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -65,9 +65,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index 786a4185..e93fc6bd 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -19,9 +19,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/pillager_outpost/feature_plate.json b/jigsaw-pieces/pillager_outpost/feature_plate.json index 9eca30ef..00cd2eb7 100644 --- a/jigsaw-pieces/pillager_outpost/feature_plate.json +++ b/jigsaw-pieces/pillager_outpost/feature_plate.json @@ -28,15 +28,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["pillager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/pillager.json b/jigsaw-pieces/pillager_outpost/pillager.json index d3949cc6..f7b5eaad 100644 --- a/jigsaw-pieces/pillager_outpost/pillager.json +++ b/jigsaw-pieces/pillager_outpost/pillager.json @@ -1,16 +1,4 @@ { - "placementOptions": { - "place": [], - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["pillager"], - "blockRadius": 3 - } - } - ] - }, "connectors": [{ "name": "pillager", "position": { @@ -20,6 +8,7 @@ }, "direction": "DOWN_NEGATIVE_Y", "entityCount": 50, + "spawnEntity": "pillager", "rotateConnector": false, "innerConnector": true }], diff --git a/jigsaw-pieces/pillager_outpost/watchtower.json b/jigsaw-pieces/pillager_outpost/watchtower.json index 3c864fc5..fc515bcc 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower.json +++ b/jigsaw-pieces/pillager_outpost/watchtower.json @@ -264,15 +264,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["pillager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 f457f383..f27af97f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json index 294349ec..99583a42 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 52d6aff9..05649aba 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 64c55982..b2460c48 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json @@ -46,9 +46,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 01f93c13..d043aeb2 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json @@ -46,9 +46,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 362d8c0a..d874da70 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 6c5955eb..bca9c486 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json @@ -46,9 +46,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 1cc4d0e7..a3dc8a05 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 0082d539..5493050b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 778d83e6..8fa5c8ce 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -32,9 +32,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f979d21b..13c06a7c 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 44e44819..aa9f33e8 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 23e4e894..6fb0bbd0 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -32,9 +32,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 b391b81f..1b5cf822 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json index ba112ddf..550f0cc4 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index 3bdf5fa2..d74b5214 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -75,9 +75,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index 18a66318..2ff378ad 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -60,9 +60,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_01.json b/jigsaw-pieces/village/desert/streets/crossroad_01.json index 5db3cec7..5d36c363 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -176,9 +176,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_02.json b/jigsaw-pieces/village/desert/streets/crossroad_02.json index 8cf4dd43..d0f4dd45 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -111,9 +111,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/crossroad_03.json b/jigsaw-pieces/village/desert/streets/crossroad_03.json index 5b00a8a3..085904fc 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -73,9 +73,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_01.json b/jigsaw-pieces/village/desert/streets/straight_01.json index 5fd8e541..622d80bf 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -111,9 +111,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_02.json b/jigsaw-pieces/village/desert/streets/straight_02.json index 797dd210..a39e16ad 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -112,9 +112,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/straight_03.json b/jigsaw-pieces/village/desert/streets/straight_03.json index 82bb0b03..2b5fb672 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -47,9 +47,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/streets/turn_01.json b/jigsaw-pieces/village/desert/streets/turn_01.json index 145979a0..0f21907e 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -59,9 +59,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 971e6c73..b493da24 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 @@ -179,9 +179,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 4869b7eb..290bbfdb 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 @@ -140,9 +140,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 7b0f4aff..13059173 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 @@ -166,9 +166,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index ef7221df..ff2b434e 100644 --- a/jigsaw-pieces/village/desert/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/villagers/unemployed.json @@ -23,9 +23,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 039abe4d..49ed490e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 70451a43..8998f163 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -76,9 +76,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 a998619e..4968c861 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 d0ffa57e..10f9504a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json @@ -85,9 +85,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json index 46118e19..b5e5843b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 6d28f626..4fd3bc12 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 5d968454..88b5643f 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json @@ -33,9 +33,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_library_1.json b/jigsaw-pieces/village/plains/houses/plains_library_1.json index 2b8b3b49..0b75c53a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_library_2.json b/jigsaw-pieces/village/plains/houses/plains_library_2.json index 3f603be0..b92ab4b1 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_2.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 85c861a5..beb2dba6 100644 --- a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 01a840fd..e05e7241 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 b2450f21..6ae89515 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 15b7e1eb..0847ebf8 100644 --- a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json @@ -59,9 +59,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 cdf73aa1..624425da 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f1019811..3fbbfd8b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 e0885424..830ef2e7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 98bc6544..c74f17d9 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f23b6c73..22142800 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 b068dde8..12d4e7b5 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -73,9 +73,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f6fd7a89..5aeb11cd 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 3d4db348..b0a268cd 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 debf09ad..ab1e3f4b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_3.json b/jigsaw-pieces/village/plains/houses/plains_temple_3.json index bfedda86..59f84c4f 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_3.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_4.json b/jigsaw-pieces/village/plains/houses/plains_temple_4.json index e9a4e377..57b0958a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_4.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 8d85f479..196df422 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json index e7ce4be7..71f7fc5e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json @@ -18,9 +18,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index 86915d0a..b89adb4a 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index fb449ffb..e74acd00 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 8ec39fae..366e2ca5 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index ec7d3f64..b5ac7818 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index 3c8f7bee..bc484e56 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index 0d6ede1e..afb20660 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index 11edda4a..83bae706 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index 901e910f..0f4781cd 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -100,9 +100,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 6342d7bd..0418fdc8 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -269,9 +269,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index 17cea9a8..1ddcd473 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 61d868d0..63054120 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -140,9 +140,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 e3ebe0da..8f4e958d 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 @@ -152,9 +152,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 2adafd08..b6567345 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 @@ -153,9 +153,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 01b8f961..e2e206e4 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 @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index 3f579f4b..a31b72ad 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -24,9 +24,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index b351168b..1f47209a 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 19eb8594..39f67e92 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index b4202754..3eb5a8bf 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index a992878e..f563cf4d 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index fb5af3d3..3507e0bc 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index 66596f75..b4ea2f26 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index 46b502dc..2790b668 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -100,9 +100,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index 89a2e29f..3ac2b0b1 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index f3c40cfb..50d685e7 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index 81a4c845..02b361b1 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 6c4c55c6..36fb3f04 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 2b16bdf1..235f1d5b 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 6f76610a..9d3b81f9 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index 27ce47f8..77137321 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -24,9 +24,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 3716b94e..57aa23de 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f82618e1..e7c74023 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 3bdfd97c..85471a63 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 faabc2fc..39422b8c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 59944403..f2861fae 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f14fb434..d9bce2ad 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 9ebfd5eb..65cef1aa 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 603a36e8..50b4aa9e 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 63ed092b..bbb36ac2 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 9055b81b..2d5a05f9 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 62b27e54..1f5637fd 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index 2a406d7a..fd890187 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -139,9 +139,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_02.json b/jigsaw-pieces/village/snowy/streets/corner_02.json index 744888f0..8e6b52c4 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index 81f7768b..ea6f41b4 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 6bfe0253..66a93b44 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index e28be82b..34a68652 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -61,9 +61,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 978456b2..59172a0b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -139,9 +139,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index 1bd78071..c23bdc3d 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -87,9 +87,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index ec9ce0b0..fb64cfba 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -269,9 +269,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index 76709caf..abe11363 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index add43a77..b753a6cb 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -87,9 +87,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 9bff4540..ada7b9dd 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 @@ -165,9 +165,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 12bfc710..ed979399 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 @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 25ddf727..c57f11eb 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 @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index e4f3043c..3863f507 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -24,9 +24,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 8368ca1a..c8ab502a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 196825f3..d68ae6d7 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 612c053e..3f93e93b 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 2ffa5439..a97d11ec 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 b4bc6a92..e7c2dd06 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 67ccaae9..2190603a 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 f2fcd501..26fceea8 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 080e8003..dfb346d6 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -47,9 +47,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 14ce8ee5..7a173f12 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -34,9 +34,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index 488dbcdd..8ebfd5b0 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index e8f7b07b..c4f793d3 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -87,9 +87,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index ab57f2fd..5eaa62b1 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -48,9 +48,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index 06b462c0..02baf60a 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index 82e8b0a3..bd0061a2 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -87,9 +87,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index 949b75c8..2b0c664e 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -113,9 +113,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 9731eebe..3b0e942b 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index a541a288..3bf8b7c9 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -126,9 +126,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index 2d77871d..dc7b7c4c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -269,9 +269,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index 8266277b..eabd8c45 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -74,9 +74,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 83f4915d..007daef0 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 @@ -244,9 +244,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], 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 2a5e9b57..90775053 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 @@ -166,9 +166,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index 2169d906..56357040 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -24,9 +24,7 @@ "rarity": 1, "zone": { "entitySpawners": ["villager"], - "strength": 1, - "customBiome": "frozen/vander", - "blockRadius": 8 + "blockRadius": 3 } } ], diff --git a/spawners/pillager.json b/spawners/pillager.json deleted file mode 100644 index 9f943e52..00000000 --- a/spawners/pillager.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "spawns": [ - { - "entity": "pillager", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 1 - } - ] -} \ No newline at end of file From 2c4cb872ab98f525ea794b3f71cb54f7705e7f66 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 14:27:51 -0700 Subject: [PATCH 32/46] Revert "Villager Remandate" This reverts commit 47c549d52f1a179aa4d34f0629dbd86842370ba4. --- jigsaw-pieces/mushhut/hut/hut1.json | 11 ++--------- jigsaw-pieces/mushhut/hut/hut2.json | 12 ++---------- jigsaw-pieces/mushhut/hut/hut3.json | 12 ++---------- jigsaw-pieces/mushhut/hut/hut4.json | 12 ++---------- jigsaw-pieces/mushhut/hut/hut5.json | 12 ++---------- jigsaw-pieces/mushhut/hut/hut6.json | 12 ++---------- jigsaw-pieces/mushhut/hut/hut7.json | 11 ++--------- .../desert/houses/desert_cartographer_house_1.json | 9 --------- .../village/desert/houses/desert_fisher_1.json | 9 --------- .../desert/houses/desert_fletcher_house_1.json | 9 --------- .../village/desert/houses/desert_medium_house_1.json | 11 ++--------- .../village/desert/houses/desert_medium_house_2.json | 11 ++--------- .../village/desert/houses/desert_small_house_1.json | 12 ++---------- .../village/desert/houses/desert_small_house_2.json | 10 +--------- .../village/desert/houses/desert_small_house_3.json | 10 +--------- .../village/desert/houses/desert_small_house_4.json | 10 +--------- .../village/desert/houses/desert_small_house_5.json | 11 ++--------- .../village/desert/houses/desert_small_house_6.json | 10 +--------- .../village/desert/houses/desert_small_house_7.json | 10 +--------- .../village/desert/houses/desert_small_house_8.json | 11 ++--------- .../village/desert/houses/desert_tool_smith_1.json | 9 --------- .../village/desert/houses/desert_weaponsmith_1.json | 9 --------- jigsaw-pieces/village/desert/streets/corner_01.json | 12 ++---------- jigsaw-pieces/village/desert/streets/corner_02.json | 12 ++---------- .../village/desert/streets/crossroad_01.json | 11 ++--------- .../village/desert/streets/crossroad_02.json | 11 ++--------- .../village/desert/streets/crossroad_03.json | 12 ++---------- .../village/desert/streets/straight_01.json | 11 ++--------- .../village/desert/streets/straight_02.json | 12 ++---------- .../village/desert/streets/straight_03.json | 12 ++---------- jigsaw-pieces/village/desert/streets/turn_01.json | 11 ++--------- .../desert/town_centers/desert_meeting_point_1.json | 9 --------- .../desert/town_centers/desert_meeting_point_2.json | 9 --------- .../desert/town_centers/desert_meeting_point_3.json | 9 --------- .../village/desert/villagers/unemployed.json | 10 +--------- .../plains/houses/plains_armorer_house_1.json | 9 --------- .../village/plains/houses/plains_big_house_1.json | 9 --------- .../village/plains/houses/plains_butcher_shop_1.json | 9 --------- .../village/plains/houses/plains_butcher_shop_2.json | 9 --------- .../village/plains/houses/plains_cartographer_1.json | 9 --------- .../plains/houses/plains_fisher_cottage_1.json | 9 --------- .../plains/houses/plains_fletcher_house_1.json | 9 --------- .../village/plains/houses/plains_library_1.json | 9 --------- .../village/plains/houses/plains_library_2.json | 9 --------- .../village/plains/houses/plains_masons_house_1.json | 9 --------- .../village/plains/houses/plains_medium_house_1.json | 9 --------- .../village/plains/houses/plains_medium_house_2.json | 9 --------- .../plains/houses/plains_shepherds_house_1.json | 9 --------- .../village/plains/houses/plains_small_farm_1.json | 9 --------- .../village/plains/houses/plains_small_house_1.json | 9 --------- .../village/plains/houses/plains_small_house_2.json | 9 --------- .../village/plains/houses/plains_small_house_3.json | 9 --------- .../village/plains/houses/plains_small_house_4.json | 9 --------- .../village/plains/houses/plains_small_house_5.json | 9 --------- .../village/plains/houses/plains_small_house_6.json | 9 --------- .../village/plains/houses/plains_small_house_7.json | 9 --------- .../village/plains/houses/plains_small_house_8.json | 9 --------- .../village/plains/houses/plains_temple_3.json | 9 --------- .../village/plains/houses/plains_temple_4.json | 9 --------- .../village/plains/houses/plains_tool_smith_1.json | 9 --------- .../village/plains/houses/plains_weaponsmith_1.json | 9 --------- jigsaw-pieces/village/plains/streets/corner_01.json | 9 --------- jigsaw-pieces/village/plains/streets/corner_02.json | 9 --------- jigsaw-pieces/village/plains/streets/corner_03.json | 9 --------- .../village/plains/streets/straight_01.json | 9 --------- .../village/plains/streets/straight_02.json | 9 --------- .../village/plains/streets/straight_03.json | 9 --------- .../village/plains/streets/straight_04.json | 9 --------- .../village/plains/streets/straight_05.json | 9 --------- .../village/plains/streets/straight_06.json | 9 --------- jigsaw-pieces/village/plains/streets/turn_01.json | 9 --------- .../plains/town_centers/plains_fountain_01.json | 9 --------- .../plains/town_centers/plains_meeting_point_1.json | 9 --------- .../plains/town_centers/plains_meeting_point_2.json | 9 --------- .../plains/town_centers/plains_meeting_point_3.json | 9 --------- .../village/plains/villagers/unemployed.json | 9 --------- jigsaw-pieces/village/savanna/streets/corner_01.json | 9 --------- jigsaw-pieces/village/savanna/streets/corner_03.json | 9 --------- jigsaw-pieces/village/savanna/streets/split_01.json | 9 --------- jigsaw-pieces/village/savanna/streets/split_02.json | 9 --------- .../village/savanna/streets/straight_02.json | 9 --------- .../village/savanna/streets/straight_04.json | 9 --------- .../village/savanna/streets/straight_05.json | 9 --------- .../village/savanna/streets/straight_06.json | 9 --------- .../village/savanna/streets/straight_08.json | 9 --------- .../village/savanna/streets/straight_09.json | 9 --------- .../village/savanna/streets/straight_10.json | 9 --------- .../village/savanna/streets/straight_11.json | 9 --------- jigsaw-pieces/village/savanna/streets/turn_01.json | 9 --------- .../village/savanna/villagers/unemployed.json | 9 --------- .../village/snowy/houses/snowy_medium_house_1.json | 9 --------- .../village/snowy/houses/snowy_medium_house_2.json | 9 --------- .../village/snowy/houses/snowy_medium_house_3.json | 9 --------- .../village/snowy/houses/snowy_small_house_1.json | 9 --------- .../village/snowy/houses/snowy_small_house_2.json | 9 --------- .../village/snowy/houses/snowy_small_house_3.json | 9 --------- .../village/snowy/houses/snowy_small_house_4.json | 9 --------- .../village/snowy/houses/snowy_small_house_5.json | 9 --------- .../village/snowy/houses/snowy_small_house_6.json | 9 --------- .../village/snowy/houses/snowy_small_house_7.json | 9 --------- .../village/snowy/houses/snowy_small_house_8.json | 9 --------- jigsaw-pieces/village/snowy/streets/corner_01.json | 9 --------- jigsaw-pieces/village/snowy/streets/corner_02.json | 9 --------- jigsaw-pieces/village/snowy/streets/corner_03.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_01.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_02.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_03.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_04.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_06.json | 9 --------- jigsaw-pieces/village/snowy/streets/straight_08.json | 9 --------- jigsaw-pieces/village/snowy/streets/turn_01.json | 9 --------- .../snowy/town_centers/snowy_meeting_point_1.json | 9 --------- .../snowy/town_centers/snowy_meeting_point_2.json | 9 --------- .../snowy/town_centers/snowy_meeting_point_3.json | 9 --------- .../village/snowy/villagers/unemployed.json | 9 --------- .../village/taiga/houses/taiga_medium_house_1.json | 9 --------- .../village/taiga/houses/taiga_medium_house_2.json | 9 --------- .../village/taiga/houses/taiga_medium_house_3.json | 9 --------- .../village/taiga/houses/taiga_medium_house_4.json | 9 --------- .../village/taiga/houses/taiga_small_house_1.json | 9 --------- .../village/taiga/houses/taiga_small_house_2.json | 9 --------- .../village/taiga/houses/taiga_small_house_3.json | 9 --------- .../village/taiga/houses/taiga_small_house_4.json | 9 --------- .../village/taiga/houses/taiga_small_house_5.json | 9 --------- jigsaw-pieces/village/taiga/streets/corner_01.json | 9 --------- jigsaw-pieces/village/taiga/streets/corner_02.json | 9 --------- jigsaw-pieces/village/taiga/streets/corner_03.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_01.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_02.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_03.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_04.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_05.json | 9 --------- jigsaw-pieces/village/taiga/streets/straight_06.json | 9 --------- jigsaw-pieces/village/taiga/streets/turn_01.json | 9 --------- .../taiga/town_centers/taiga_meeting_point_1.json | 9 --------- .../taiga/town_centers/taiga_meeting_point_2.json | 9 --------- .../village/taiga/villagers/unemployed.json | 9 --------- spawners/villager.json | 10 ---------- 138 files changed, 48 insertions(+), 1254 deletions(-) delete mode 100644 spawners/villager.json diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 62d6b2c7..9b5614f8 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -2,6 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -14,15 +16,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index 336cbfa5..7adace4f 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -2,7 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -15,15 +16,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index ac35ebed..851619ec 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -2,7 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -15,15 +16,6 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index fb1a8b1e..529b59dd 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -2,7 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -15,15 +16,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index 0f9cf3ce..96476f65 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -2,7 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -15,15 +16,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index 9ad042fd..0110652c 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -2,7 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, - + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -60,15 +61,6 @@ "underwater": false, "loot": [], "place": [], - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "onwater": false, "clamp": { "minimumHeight": 0, diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index e93fc6bd..88eb5ae7 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -2,6 +2,8 @@ "connectors": [{ "targetName": "*", "innerConnector": true, + "spawnEntity": "villager", + "entityCount": 1, "rotateConnector": false, "name": "", "pools": ["mush_huts/paths"], @@ -14,15 +16,6 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 f27af97f..af930068 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -28,15 +28,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json index 99583a42..f3a7f227 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -28,15 +28,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 05649aba..f875a421 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 b2460c48..509f1668 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -19,6 +20,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -41,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 d043aeb2..178d036f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": -1, "y": -4, @@ -32,6 +33,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 2, "y": -2, @@ -41,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 d874da70..d5d1c133 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -5,7 +5,8 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", - + "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 0, "y": -3, @@ -28,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 bca9c486..28cee59a 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json @@ -19,6 +19,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": -2, "y": -3, @@ -41,15 +42,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 a3dc8a05..0159ddd5 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -28,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 5493050b..81e57049 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 1, "y": -2, @@ -28,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 8fa5c8ce..a357fd3d 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -5,6 +5,8 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", + "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 1, "y": -3, @@ -27,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 13c06a7c..e39aea3b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": -1, "y": -9, @@ -28,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 aa9f33e8..d8d8e183 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json @@ -6,6 +6,7 @@ "rotateConnector": false, "name": "minecraft:bottom", "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 1, "y": -2, @@ -28,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 6fb0bbd0..59bce1c3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -5,6 +5,8 @@ "innerConnector": false, "rotateConnector": false, "name": "minecraft:bottom", + "entityCount": 3, + "spawnEntity": "villager", "position": { "x": 0, "y": -2, @@ -27,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 1b5cf822..8c596094 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json index 550f0cc4..5dba6a0f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -13,15 +13,6 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index d74b5214..ba84c66d 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -2,7 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -70,15 +71,6 @@ "placementOptions": { "overStilt": 0, "chance": 1, - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "meld": false, "density": 1, "edit": [], diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index 2ff378ad..d8251275 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -2,7 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -55,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 5d36c363..d21759e7 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -2,6 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -171,15 +173,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 d0f4dd45..778b8cf0 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -2,6 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -106,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 085904fc..bc34e0fd 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -2,7 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -68,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 622d80bf..ad9bab0d 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -2,6 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -106,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 a39e16ad..62f41505 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -2,7 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -107,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 2b5fb672..fb17b3df 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -2,7 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", - + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -42,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 0f21907e..39cd0236 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -2,6 +2,8 @@ "connectors": [ { "targetName": "village/desert/villagers/unemployed", + "entityCount": 3, + "spawnEntity": "villager", "innerConnector": true, "rotateConnector": false, "name": "villager", @@ -54,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 b493da24..c8a81b40 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 @@ -174,15 +174,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 290bbfdb..ad63b01f 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 @@ -135,15 +135,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 13059173..5be0252b 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 @@ -161,15 +161,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index ff2b434e..9c0d781c 100644 --- a/jigsaw-pieces/village/desert/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/villagers/unemployed.json @@ -10,6 +10,7 @@ "y": -1, "z": 0 }, + "spawnEntity": "villager", "entityPosition": { "x": 0, "y": 2, @@ -18,15 +19,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 49ed490e..23a8da11 100644 --- a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 8998f163..0c045c63 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -71,15 +71,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 4968c861..d295f9f8 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json @@ -28,15 +28,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 10f9504a..8c73010c 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json @@ -80,15 +80,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json index b5e5843b..8809bc9a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 4fd3bc12..b4b89bef 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 88b5643f..59a2561e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json @@ -28,15 +28,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_library_1.json b/jigsaw-pieces/village/plains/houses/plains_library_1.json index 0b75c53a..00ca30c4 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_library_2.json b/jigsaw-pieces/village/plains/houses/plains_library_2.json index b92ab4b1..b52beb32 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_2.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 beb2dba6..b4461438 100644 --- a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 e05e7241..e779d907 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 6ae89515..a341136b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 0847ebf8..03163b0c 100644 --- a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json @@ -54,15 +54,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 624425da..1ef3e0d7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 3fbbfd8b..6bb2476e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 830ef2e7..63f4a60a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 c74f17d9..84551634 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 22142800..0c394812 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 12d4e7b5..d5cdd602 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -68,15 +68,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 5aeb11cd..5d922568 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 b0a268cd..e9e2ddcc 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 ab1e3f4b..7b635b2b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_3.json b/jigsaw-pieces/village/plains/houses/plains_temple_3.json index 59f84c4f..30f0e8db 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_3.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_4.json b/jigsaw-pieces/village/plains/houses/plains_temple_4.json index 57b0958a..fa751405 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_4.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 196df422..d39f79f4 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json index 71f7fc5e..4520062f 100644 --- a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json @@ -13,15 +13,6 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index b89adb4a..1038709b 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index e74acd00..3f305cb7 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 366e2ca5..71b62c06 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index b5ac7818..b7e449e9 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index bc484e56..bcf61586 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index afb20660..fd3f71be 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index 83bae706..ec518b4e 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index 0f4781cd..b521e7ce 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -95,15 +95,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 0418fdc8..6ecc4f8f 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -264,15 +264,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index 1ddcd473..fddad95f 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 63054120..17180857 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -135,15 +135,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 8f4e958d..04ea90e1 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 @@ -147,15 +147,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 b6567345..c9e80eda 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 @@ -148,15 +148,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 e2e206e4..83afb72c 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 @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index a31b72ad..7d922ce1 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -19,15 +19,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index 1f47209a..33208b7a 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 39f67e92..089c9df7 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index 3eb5a8bf..cf2a6ffb 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index f563cf4d..a09cb3de 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index 3507e0bc..8006ebf9 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index b4ea2f26..7a5075df 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index 2790b668..da6833f4 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -95,15 +95,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index 3ac2b0b1..be5c42b2 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index 50d685e7..f2cb511d 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index 02b361b1..dd0792b4 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 36fb3f04..81d89505 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 235f1d5b..91578d90 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 9d3b81f9..7f3f0f5e 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index 77137321..e1597c69 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -19,15 +19,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 57aa23de..6c455734 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 e7c74023..5e2b705a 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 85471a63..2f66b275 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 39422b8c..7f38cc83 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 f2861fae..009c663c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 d9bce2ad..ffe8258b 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 65cef1aa..fe889334 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 50b4aa9e..ed8052c9 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 bbb36ac2..416ab283 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 2d5a05f9..8668389d 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 1f5637fd..c3026650 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index fd890187..6c05953a 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -134,15 +134,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "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 8e6b52c4..dd9563e7 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index ea6f41b4..2396efb5 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 66a93b44..5a248144 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index 34a68652..155194da 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -56,15 +56,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 59172a0b..83030311 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -134,15 +134,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index c23bdc3d..c8d4105f 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -82,15 +82,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index fb64cfba..bc7181a5 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -264,15 +264,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index abe11363..67f75c3b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index b753a6cb..c7d59299 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -82,15 +82,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 ada7b9dd..744d825b 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 @@ -160,15 +160,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 ed979399..e9524102 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 @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 c57f11eb..58f636da 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 @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index 3863f507..0be358f3 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -19,15 +19,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 c8ab502a..2608f554 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 d68ae6d7..2a920d6c 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 3f93e93b..1b1fa342 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 a97d11ec..d5913af9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 e7c2dd06..573b88be 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 2190603a..b41e5b1b 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 26fceea8..4a39bbfb 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 dfb346d6..b6ff9e07 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -42,15 +42,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": 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 7a173f12..468c7946 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -29,15 +29,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index 8ebfd5b0..aa5031db 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index c4f793d3..5e64ed61 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -82,15 +82,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index 5eaa62b1..a8828f19 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -43,15 +43,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index 02baf60a..7f6f1cc7 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index bd0061a2..4e46cf82 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -82,15 +82,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index 2b0c664e..8799588c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -108,15 +108,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 3b0e942b..33b5e1fd 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index 3bf8b7c9..27c61769 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -121,15 +121,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index dc7b7c4c..acc54350 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -264,15 +264,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index eabd8c45..7768a5fc 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -69,15 +69,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 007daef0..06d3ebad 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 @@ -239,15 +239,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, 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 90775053..0004c1e4 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 @@ -161,15 +161,6 @@ } ], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index 56357040..f193030e 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -19,15 +19,6 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "addFeatures": [ - { - "rarity": 1, - "zone": { - "entitySpawners": ["villager"], - "blockRadius": 3 - } - } - ], "overStilt": 0, "chance": 1, "meld": false, diff --git a/spawners/villager.json b/spawners/villager.json deleted file mode 100644 index 796dc196..00000000 --- a/spawners/villager.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "spawns": [ - { - "entity": "villager", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 1 - } - ] -} \ No newline at end of file From 26be729a34c0052802a35f5839d050ecf5d254b3 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 3 Aug 2021 23:07:02 -0400 Subject: [PATCH 33/46] Dont decorate frozen ocean with snow --- biomes/frozen/sea/ocean.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/biomes/frozen/sea/ocean.json b/biomes/frozen/sea/ocean.json index d85e8a00..424d9828 100644 --- a/biomes/frozen/sea/ocean.json +++ b/biomes/frozen/sea/ocean.json @@ -29,20 +29,6 @@ "max": -7, "generator": "plain" }], - "decorators": [{ - "chance": 1, - "variance": { - "style": "IRIS", - "zoom": 0.23 - }, - "palette": [ - { - "data": {"layers": 1}, - "block": "snow" - }, - {"block": "air"} - ] - }], "seaLayers": [ { "minHeight": 3, From 0d304fb78034f034d7db6c58c3bea344e9d839e6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 21:09:48 -0700 Subject: [PATCH 34/46] fff --- biomes/hot/desert-dunes-red.json | 2 +- biomes/hot/desert-dunes.json | 2 +- dimensions/overworld.json | 1 + entities/brian.json | 4 +--- entities/pillager.json | 10 +++++++--- entities/silverfish.json | 2 ++ entities/villager.json | 6 +----- jigsaw-structures/desert-pyramid.json | 8 +++++++- jigsaw-structures/igloo.json | 6 ++++++ jigsaw-structures/jungle-pyramid.json | 8 +++++++- jigsaw-structures/murky_stronghold.json | 8 +++++++- jigsaw-structures/mush-huts.json | 8 +++++++- jigsaw-structures/pillager_outpost.json | 8 +++++++- jigsaw-structures/stronghold.json | 8 +++++++- jigsaw-structures/village-hot.json | 8 ++++++-- jigsaw-structures/village-jap.json | 8 ++++++-- jigsaw-structures/village-savanna.json | 8 ++++++-- jigsaw-structures/village-snowy.json | 8 ++++++-- jigsaw-structures/village-temperate.json | 8 ++++++-- jigsaw-structures/village-tundra.json | 8 ++++++-- spawners/dank.json | 25 ++++++++++++++++++++++++ spawners/pillager.json | 16 +++++++++++++++ spawners/silverfish.json | 14 +++++++++++++ spawners/villager.json | 10 ++++++++++ 24 files changed, 163 insertions(+), 31 deletions(-) create mode 100644 entities/silverfish.json create mode 100644 spawners/dank.json create mode 100644 spawners/pillager.json create mode 100644 spawners/silverfish.json create mode 100644 spawners/villager.json diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index da1f7ad8..a9769e1a 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -35,7 +35,7 @@ "structure": "pillager_outpost" }, { - "rarity": 1500, + "rarity": 200, "structure": "village-hot" }, { diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 1ec9a6f1..0c4b85f7 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -95,7 +95,7 @@ ], "translate": { "x": 0, - "y": -9, + "y": -2, "z": 0 } } diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 113f2d9e..92aabb92 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -2,6 +2,7 @@ "version": 2003, "OVERWORLD-VERSION": 3.134, "name": "Overworld", + "focus": "hot/desert-dunes", "environment": "NORMAL", "fluidHeight": 63, "CONTINENTS": "Continent settings containing placement of the continents.", diff --git a/entities/brian.json b/entities/brian.json index 79a84b27..a49900ff 100644 --- a/entities/brian.json +++ b/entities/brian.json @@ -1,9 +1,7 @@ { "type": "EVOKER", "customName": "&dMagic Psychopath", - "glowing": true, - "spawnEffect": {"particleEffect": "FIREWORKS_SPARK", "particleCount": 9, "chance": 1, "interval": 1, "sound": "AMBIENT_BASALT_DELTAS_ADDITIONS", "volume": 10}, - "silent": true, + "spawnEffect": {"particleEffect": "SPELL_MOB_AMBIENT", "particleCount": 9, "chance": 1, "interval": 1, "sound": "ENTITY_EVOKER_PREPARE_WOLOLO", "volume": 10}, "attributes": [ { "attribute": "GENERIC_ARMOR", diff --git a/entities/pillager.json b/entities/pillager.json index c95faa59..846bcb4a 100644 --- a/entities/pillager.json +++ b/entities/pillager.json @@ -1,6 +1,10 @@ { "type": "PILLAGER", - "silent": false, - "aware": true, - "customName": "§f" + "spawnEffect": { + "interval": 1, + "chance": 1, + "particleEffect": "SOUL", + "particleCount": 100, + "sound": "ITEM_TRIDENT_RETURN" + } } diff --git a/entities/silverfish.json b/entities/silverfish.json new file mode 100644 index 00000000..f2e5f497 --- /dev/null +++ b/entities/silverfish.json @@ -0,0 +1,2 @@ +{"type": "SILVERFISH", +"silent": true} diff --git a/entities/villager.json b/entities/villager.json index b696db60..9a4bb0ce 100644 --- a/entities/villager.json +++ b/entities/villager.json @@ -1,7 +1,3 @@ { - "type": "VILLAGER", - "aware": true, - "customNameVisible": true, - "customName": " ", - "ai": true + "type": "VILLAGER" } diff --git a/jigsaw-structures/desert-pyramid.json b/jigsaw-structures/desert-pyramid.json index 41b6b47f..4bd10b34 100644 --- a/jigsaw-structures/desert-pyramid.json +++ b/jigsaw-structures/desert-pyramid.json @@ -1,4 +1,10 @@ { "maxDepth": 1, - "pieces": ["pyramid-desert"] + "pieces": ["pyramid-desert"], + "feature": { + "blockRadius": 10, + "entitySpawners": [ + "dank" + ] + } } diff --git a/jigsaw-structures/igloo.json b/jigsaw-structures/igloo.json index 5639e7df..17515535 100644 --- a/jigsaw-structures/igloo.json +++ b/jigsaw-structures/igloo.json @@ -1,4 +1,10 @@ { + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "villager" + ] + }, "maxDepth": 3, "pieces": [ "igloo/top1", diff --git a/jigsaw-structures/jungle-pyramid.json b/jigsaw-structures/jungle-pyramid.json index 208f3b7f..34f92fc4 100644 --- a/jigsaw-structures/jungle-pyramid.json +++ b/jigsaw-structures/jungle-pyramid.json @@ -1,4 +1,10 @@ { "maxDepth": 1, - "pieces": ["jungle_pyramid/jungle_pyramid"] + "pieces": ["jungle_pyramid/jungle_pyramid"], + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "dank" + ] + } } diff --git a/jigsaw-structures/murky_stronghold.json b/jigsaw-structures/murky_stronghold.json index f89fc57e..5e0cab70 100644 --- a/jigsaw-structures/murky_stronghold.json +++ b/jigsaw-structures/murky_stronghold.json @@ -1,4 +1,10 @@ { "maxDepth": 6, - "pieces": ["murky_stronghold/void/1"] + "pieces": ["murky_stronghold/void/1"], + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "silverfish" + ] + } } diff --git a/jigsaw-structures/mush-huts.json b/jigsaw-structures/mush-huts.json index 55bd285d..afd754b1 100644 --- a/jigsaw-structures/mush-huts.json +++ b/jigsaw-structures/mush-huts.json @@ -1,5 +1,11 @@ { "pieces": ["mushhut/paths/path4"], "maxDepth": 5, - "terminate": true + "terminate": true, + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "villager" + ] + } } diff --git a/jigsaw-structures/pillager_outpost.json b/jigsaw-structures/pillager_outpost.json index e8c23496..26f9287d 100644 --- a/jigsaw-structures/pillager_outpost.json +++ b/jigsaw-structures/pillager_outpost.json @@ -5,5 +5,11 @@ "pillager_outpost/watchtower", "pillager_outpost/watchtower_overgrown" ], - "terminate": true + "terminate": true, + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "pillager" + ] + } } diff --git a/jigsaw-structures/stronghold.json b/jigsaw-structures/stronghold.json index 3147c272..96041630 100644 --- a/jigsaw-structures/stronghold.json +++ b/jigsaw-structures/stronghold.json @@ -1,5 +1,11 @@ { "maxDepth": 9, "pieces": ["stronghold/portal/main"], - "terminate": true + "terminate": true, + "feature": { + "blockRadius": 5, + "entitySpawners": [ + "silverfish" + ] + } } diff --git a/jigsaw-structures/village-hot.json b/jigsaw-structures/village-hot.json index 50d84b6d..d909cb72 100644 --- a/jigsaw-structures/village-hot.json +++ b/jigsaw-structures/village-hot.json @@ -4,8 +4,12 @@ "feature": { "objectChance": 0, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "interpolationRadius": 5, + "blockRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "village/desert/town_centers/desert_meeting_point_1", diff --git a/jigsaw-structures/village-jap.json b/jigsaw-structures/village-jap.json index 26f21593..fb4a8bbb 100644 --- a/jigsaw-structures/village-jap.json +++ b/jigsaw-structures/village-jap.json @@ -3,9 +3,13 @@ "terminate": true, "feature": { "objectChance": 0, + "blockRadius": 5, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "interpolationRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "houses/jap/j5", diff --git a/jigsaw-structures/village-savanna.json b/jigsaw-structures/village-savanna.json index f9dfb4b1..cd12a500 100644 --- a/jigsaw-structures/village-savanna.json +++ b/jigsaw-structures/village-savanna.json @@ -3,9 +3,13 @@ "terminate": true, "feature": { "objectChance": 0, + "blockRadius": 5, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "interpolationRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "village/savanna/town_centers/savanna_meeting_point_1", diff --git a/jigsaw-structures/village-snowy.json b/jigsaw-structures/village-snowy.json index e8d1f07e..038d8be0 100644 --- a/jigsaw-structures/village-snowy.json +++ b/jigsaw-structures/village-snowy.json @@ -3,9 +3,13 @@ "terminate": true, "feature": { "objectChance": 0, + "blockRadius": 5, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "interpolationRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "village/snowy/town_centers/snowy_meeting_point_1", diff --git a/jigsaw-structures/village-temperate.json b/jigsaw-structures/village-temperate.json index 1ea91d05..a6a93cd3 100644 --- a/jigsaw-structures/village-temperate.json +++ b/jigsaw-structures/village-temperate.json @@ -4,8 +4,12 @@ "feature": { "objectChance": 0, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "blockRadius": 5, + "interpolationRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "village/plains/town_centers/plains_fountain_01", diff --git a/jigsaw-structures/village-tundra.json b/jigsaw-structures/village-tundra.json index b3989f06..209afca1 100644 --- a/jigsaw-structures/village-tundra.json +++ b/jigsaw-structures/village-tundra.json @@ -4,8 +4,12 @@ "feature": { "objectChance": 0, "strength": 1, - "interpolationRadius": 64, - "interpolator": "BILINEAR" + "blockRadius": 5, + "interpolationRadius": 5, + "interpolator": "BILINEAR", + "entitySpawners": [ + "villager" + ] }, "pieces": [ "village/taiga/town_centers/taiga_meeting_point_1", diff --git a/spawners/dank.json b/spawners/dank.json new file mode 100644 index 00000000..36e7e8b7 --- /dev/null +++ b/spawners/dank.json @@ -0,0 +1,25 @@ + +{ + "spawns": [ + { + "entity": "dan", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "brian", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "aeternum", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ], + "group": "NORMAL", + "weather": "DOWNFALL" +} \ No newline at end of file diff --git a/spawners/pillager.json b/spawners/pillager.json new file mode 100644 index 00000000..99832aa4 --- /dev/null +++ b/spawners/pillager.json @@ -0,0 +1,16 @@ +{ + "weather": "ANY", + "timeBlock": { + "startHour": 22, + "endHour": 4 + }, + "group": "NORMAL", + "spawns": [ + { + "entity": "pillager", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ No newline at end of file diff --git a/spawners/silverfish.json b/spawners/silverfish.json new file mode 100644 index 00000000..84d24c2c --- /dev/null +++ b/spawners/silverfish.json @@ -0,0 +1,14 @@ +{ + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "spawns": [ + { + "entity": "silverfish", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ No newline at end of file diff --git a/spawners/villager.json b/spawners/villager.json new file mode 100644 index 00000000..3c2c111a --- /dev/null +++ b/spawners/villager.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "villager", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file From 3088fd30973992ec2fd13cce5d1213a1be8f1b13 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 21:13:31 -0700 Subject: [PATCH 35/46] Five Spawners --- spawners/hives.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 spawners/hives.json diff --git a/spawners/hives.json b/spawners/hives.json new file mode 100644 index 00000000..b5d604c7 --- /dev/null +++ b/spawners/hives.json @@ -0,0 +1,14 @@ +{ + "timeBlock": { + "startHour": 5, + "endHour":15 + }, + "spawns": [ + { + "entity": "bee", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ No newline at end of file From 7aa2a66527cab90b76fcd21d00f8279c2445c4ec Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 00:20:20 -0400 Subject: [PATCH 36/46] Spawners & Entities --- entities/standard/hostile/creeper.json | 1 + entities/standard/hostile/skeleton.json | 1 + entities/standard/hostile/spider.json | 1 + entities/standard/hostile/zombie.json | 1 + spawners/temperate/land-cave.json | 32 ++++++++++++++++++ spawners/temperate/land-hostile.json | 37 +++++++++++++++++++++ spawners/temperate/land-passive.json | 43 +++++++++++++++++++++++++ 7 files changed, 116 insertions(+) create mode 100644 entities/standard/hostile/creeper.json create mode 100644 entities/standard/hostile/skeleton.json create mode 100644 entities/standard/hostile/spider.json create mode 100644 entities/standard/hostile/zombie.json create mode 100644 spawners/temperate/land-cave.json create mode 100644 spawners/temperate/land-hostile.json create mode 100644 spawners/temperate/land-passive.json diff --git a/entities/standard/hostile/creeper.json b/entities/standard/hostile/creeper.json new file mode 100644 index 00000000..559b11df --- /dev/null +++ b/entities/standard/hostile/creeper.json @@ -0,0 +1 @@ +{"type": "CREEPER"} \ No newline at end of file diff --git a/entities/standard/hostile/skeleton.json b/entities/standard/hostile/skeleton.json new file mode 100644 index 00000000..d1bceeef --- /dev/null +++ b/entities/standard/hostile/skeleton.json @@ -0,0 +1 @@ +{"type": "SKELETON"} \ No newline at end of file diff --git a/entities/standard/hostile/spider.json b/entities/standard/hostile/spider.json new file mode 100644 index 00000000..e5fd31c3 --- /dev/null +++ b/entities/standard/hostile/spider.json @@ -0,0 +1 @@ +{"type": "SPIDER"} \ No newline at end of file diff --git a/entities/standard/hostile/zombie.json b/entities/standard/hostile/zombie.json new file mode 100644 index 00000000..3ada89f8 --- /dev/null +++ b/entities/standard/hostile/zombie.json @@ -0,0 +1 @@ +{"type": "ZOMBIE"} \ No newline at end of file diff --git a/spawners/temperate/land-cave.json b/spawners/temperate/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/temperate/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/temperate/land-hostile.json b/spawners/temperate/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/temperate/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/temperate/land-passive.json b/spawners/temperate/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/temperate/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file From 7082e410f0060957e529ea3ceb17b7e50c90e0b2 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 00:23:55 -0400 Subject: [PATCH 37/46] Drop regional spawners --- regions/frozen.json | 3 -- regions/hot.json | 3 -- regions/mushroom.json | 3 -- regions/swamp.json | 3 -- regions/temperate.json | 4 ++- regions/tropical.json | 3 -- regions/tundra.json | 3 -- spawners/frozen.json | 29 ----------------- spawners/hot.json | 34 -------------------- spawners/mushroom.json | 15 --------- spawners/swamp.json | 34 -------------------- spawners/temperate.json | 28 ----------------- spawners/tropical.json | 70 ----------------------------------------- spawners/tundra.json | 34 -------------------- 14 files changed, 3 insertions(+), 263 deletions(-) delete mode 100644 spawners/frozen.json delete mode 100644 spawners/hot.json delete mode 100644 spawners/mushroom.json delete mode 100644 spawners/swamp.json delete mode 100644 spawners/temperate.json delete mode 100644 spawners/tropical.json delete mode 100644 spawners/tundra.json diff --git a/regions/frozen.json b/regions/frozen.json index 1ce9af47..e0936e01 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,9 +38,6 @@ "zoom": 5 } }, - "entitySpawners": [ - "frozen" - ], "deposits": [ { "minHeight": 8, diff --git a/regions/hot.json b/regions/hot.json index c159c91b..3fc7ed0c 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -31,9 +31,6 @@ "zoom": 5 } }, - "entitySpawners": [ - "hot" - ], "spotBiomes": [{ "biome": "hot/oasis", "scale": 5, diff --git a/regions/mushroom.json b/regions/mushroom.json index e8334350..69054ba5 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -259,9 +259,6 @@ "soundDistance": 3 } ], - "entitySpawners": [ - "mushroom" - ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { diff --git a/regions/swamp.json b/regions/swamp.json index 2537767f..265307b0 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,9 +31,6 @@ "zoom": 5 } }, - "entitySpawners": [ - "swamp" - ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/temperate.json b/regions/temperate.json index dfa527b0..bb230f18 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -33,7 +33,9 @@ }], "ENTITY_SPAWNS": "ALL ENTITY SPAWNS FOR THE REGION", "entitySpawners": [ - "temperate" + "temperate/land-passive", + "temperate/land-hostile", + "temperate/land-cave" ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, diff --git a/regions/tropical.json b/regions/tropical.json index 67387f68..f032cffd 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -53,9 +53,6 @@ "palette": [{"block": "emerald_ore"}], "varience": 2 }], - "entitySpawners": [ - "tropical" - ], "landBiomeZoom": 1.85, "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, diff --git a/regions/tundra.json b/regions/tundra.json index 32b534de..0989057f 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -32,9 +32,6 @@ "cave/tundra-cavern", "cave/spiked-cavern" ], - "entitySpawners": [ - "tundra" - ], "riverBiomes": [ "tundra/sea/river", "tundra/sea/river-rocky", diff --git a/spawners/frozen.json b/spawners/frozen.json deleted file mode 100644 index ecd11c5a..00000000 --- a/spawners/frozen.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "fox", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - } - ] -} \ No newline at end of file diff --git a/spawners/hot.json b/spawners/hot.json deleted file mode 100644 index 92473c08..00000000 --- a/spawners/hot.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "donkey", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 100 - }, - { - "entity": "mule", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 100 - }, - { - "entity": "rabbit", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "wanderingtrader", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 250 - } - ] -} \ No newline at end of file diff --git a/spawners/mushroom.json b/spawners/mushroom.json deleted file mode 100644 index aae4ba00..00000000 --- a/spawners/mushroom.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "spawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 3 - } - ] -} \ No newline at end of file diff --git a/spawners/swamp.json b/spawners/swamp.json deleted file mode 100644 index 5dcd70e5..00000000 --- a/spawners/swamp.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 3 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 4 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - } - ] -} \ No newline at end of file diff --git a/spawners/temperate.json b/spawners/temperate.json deleted file mode 100644 index ec329313..00000000 --- a/spawners/temperate.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "bee", - "maxSpawns": 3, - "minSpawns": 2, - "rarity": 15 - } - ] -} \ No newline at end of file diff --git a/spawners/tropical.json b/spawners/tropical.json deleted file mode 100644 index 798bd358..00000000 --- a/spawners/tropical.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "ocelot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "parrot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 3 - }, - { - "entity": "turtle", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "panda", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 4 - }, - { - "entity": "pandaUwU", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "aeternum", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 15 - } - ] -} \ No newline at end of file diff --git a/spawners/tundra.json b/spawners/tundra.json deleted file mode 100644 index 1485a90e..00000000 --- a/spawners/tundra.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "spawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 1 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 2 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - } - ] -} \ No newline at end of file From 910ea040cf2ad274086cace0cb5c3f061049ae81 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 00:24:27 -0400 Subject: [PATCH 38/46] Unfocus dim --- dimensions/overworld.json | 1 - 1 file changed, 1 deletion(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 92aabb92..113f2d9e 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -2,7 +2,6 @@ "version": 2003, "OVERWORLD-VERSION": 3.134, "name": "Overworld", - "focus": "hot/desert-dunes", "environment": "NORMAL", "fluidHeight": 63, "CONTINENTS": "Continent settings containing placement of the continents.", From 167c57cd43b3b0837e1a85d555c69bd78098a424 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 21:53:53 -0700 Subject: [PATCH 39/46] Pyra changes --- biomes/hot/desert-dunes-red.json | 3 ++- biomes/hot/desert-dunes.json | 3 ++- objects/jigsaw/pyramid/pyramid45.iob | Bin 0 -> 174001 bytes objects/jigsaw/pyramid/pyramidred45.iob | Bin 0 -> 174005 bytes 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 objects/jigsaw/pyramid/pyramid45.iob create mode 100644 objects/jigsaw/pyramid/pyramidred45.iob diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index a9769e1a..51cd29d5 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -67,7 +67,8 @@ }, "place": [ "jigsaw/pyramid/rpyramid-extreme", - "jigsaw/pyramid/rpyramid" + "jigsaw/pyramid/rpyramid", + "jigsaw/pyramid/pyramidred45" ], "translate": { "x": 0, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 0c4b85f7..b0e82dd5 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -90,7 +90,8 @@ }, "place": [ "jigsaw/pyramid/pyramid-extreme", - "jigsaw/pyramid/pyramid" + "jigsaw/pyramid/pyramid", + "jigsaw/pyramid/pyramid45" ], "translate": { diff --git a/objects/jigsaw/pyramid/pyramid45.iob b/objects/jigsaw/pyramid/pyramid45.iob new file mode 100644 index 0000000000000000000000000000000000000000..46ead463dc5ba33faebe2ad914b838da1bd68372 GIT binary patch literal 174001 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 literal 0 HcmV?d00001 diff --git a/objects/jigsaw/pyramid/pyramidred45.iob b/objects/jigsaw/pyramid/pyramidred45.iob new file mode 100644 index 0000000000000000000000000000000000000000..69bba260cd2691aba5a2ca71426044297a423a36 GIT binary patch literal 174005 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 m=g&{?r^oZU_P9TM{Np|D50Ag! Date: Tue, 3 Aug 2021 21:54:35 -0700 Subject: [PATCH 40/46] oops --- biomes/hot/desert-dunes-red.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index 51cd29d5..4916270c 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -35,7 +35,7 @@ "structure": "pillager_outpost" }, { - "rarity": 200, + "rarity": 1500, "structure": "village-hot" }, { From 27224f21a35a5e69d8928f5812ca34ae440beb5d Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 01:16:56 -0400 Subject: [PATCH 41/46] More entities --- entities/standard/passive/chicken.json | 1 + entities/standard/passive/cow.json | 1 + entities/standard/passive/pig.json | 1 + entities/standard/passive/sheep.json | 1 + entities/standard/passive/turtle.json | 1 + 5 files changed, 5 insertions(+) create mode 100644 entities/standard/passive/chicken.json create mode 100644 entities/standard/passive/cow.json create mode 100644 entities/standard/passive/pig.json create mode 100644 entities/standard/passive/sheep.json create mode 100644 entities/standard/passive/turtle.json diff --git a/entities/standard/passive/chicken.json b/entities/standard/passive/chicken.json new file mode 100644 index 00000000..024a264c --- /dev/null +++ b/entities/standard/passive/chicken.json @@ -0,0 +1 @@ +{"type": "CHICKEN"} \ No newline at end of file diff --git a/entities/standard/passive/cow.json b/entities/standard/passive/cow.json new file mode 100644 index 00000000..2dc87140 --- /dev/null +++ b/entities/standard/passive/cow.json @@ -0,0 +1 @@ +{"type": "COW"} \ No newline at end of file diff --git a/entities/standard/passive/pig.json b/entities/standard/passive/pig.json new file mode 100644 index 00000000..b52a7ec4 --- /dev/null +++ b/entities/standard/passive/pig.json @@ -0,0 +1 @@ +{"type": "PIG"} \ No newline at end of file diff --git a/entities/standard/passive/sheep.json b/entities/standard/passive/sheep.json new file mode 100644 index 00000000..5f76d459 --- /dev/null +++ b/entities/standard/passive/sheep.json @@ -0,0 +1 @@ +{"type": "SHEEP"} \ No newline at end of file diff --git a/entities/standard/passive/turtle.json b/entities/standard/passive/turtle.json new file mode 100644 index 00000000..7e9efa32 --- /dev/null +++ b/entities/standard/passive/turtle.json @@ -0,0 +1 @@ +{"type": "TURTLE"} \ No newline at end of file From 681cca85c226897b3f8321e6502a9065b1bd694c Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 01:17:04 -0400 Subject: [PATCH 42/46] Standard spawners --- spawners/frozen/land-cave.json | 32 +++++++++++++++++++++ spawners/frozen/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/frozen/land-passive.json | 43 +++++++++++++++++++++++++++++ spawners/hot/land-cave.json | 32 +++++++++++++++++++++ spawners/hot/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/hot/land-passive.json | 43 +++++++++++++++++++++++++++++ spawners/mushroom/land-cave.json | 32 +++++++++++++++++++++ spawners/mushroom/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/mushroom/land-passive.json | 43 +++++++++++++++++++++++++++++ spawners/swamp/land-cave.json | 32 +++++++++++++++++++++ spawners/swamp/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/swamp/land-passive.json | 43 +++++++++++++++++++++++++++++ spawners/tropical/beach.json | 21 ++++++++++++++ spawners/tropical/land-cave.json | 32 +++++++++++++++++++++ spawners/tropical/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/tropical/land-passive.json | 43 +++++++++++++++++++++++++++++ spawners/tundra/land-cave.json | 32 +++++++++++++++++++++ spawners/tundra/land-hostile.json | 37 +++++++++++++++++++++++++ spawners/tundra/land-passive.json | 43 +++++++++++++++++++++++++++++ 19 files changed, 693 insertions(+) create mode 100644 spawners/frozen/land-cave.json create mode 100644 spawners/frozen/land-hostile.json create mode 100644 spawners/frozen/land-passive.json create mode 100644 spawners/hot/land-cave.json create mode 100644 spawners/hot/land-hostile.json create mode 100644 spawners/hot/land-passive.json create mode 100644 spawners/mushroom/land-cave.json create mode 100644 spawners/mushroom/land-hostile.json create mode 100644 spawners/mushroom/land-passive.json create mode 100644 spawners/swamp/land-cave.json create mode 100644 spawners/swamp/land-hostile.json create mode 100644 spawners/swamp/land-passive.json create mode 100644 spawners/tropical/beach.json create mode 100644 spawners/tropical/land-cave.json create mode 100644 spawners/tropical/land-hostile.json create mode 100644 spawners/tropical/land-passive.json create mode 100644 spawners/tundra/land-cave.json create mode 100644 spawners/tundra/land-hostile.json create mode 100644 spawners/tundra/land-passive.json diff --git a/spawners/frozen/land-cave.json b/spawners/frozen/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/frozen/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/frozen/land-hostile.json b/spawners/frozen/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/frozen/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/frozen/land-passive.json b/spawners/frozen/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/frozen/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/hot/land-cave.json b/spawners/hot/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/hot/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/hot/land-hostile.json b/spawners/hot/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/hot/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/hot/land-passive.json b/spawners/hot/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/hot/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/mushroom/land-cave.json b/spawners/mushroom/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/mushroom/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/mushroom/land-hostile.json b/spawners/mushroom/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/mushroom/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/mushroom/land-passive.json b/spawners/mushroom/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/mushroom/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/swamp/land-cave.json b/spawners/swamp/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/swamp/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/swamp/land-hostile.json b/spawners/swamp/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/swamp/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/swamp/land-passive.json b/spawners/swamp/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/swamp/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical/beach.json b/spawners/tropical/beach.json new file mode 100644 index 00000000..11349eb2 --- /dev/null +++ b/spawners/tropical/beach.json @@ -0,0 +1,21 @@ +{ + "group": "BEACH", + "maximumRate": { + "amount": 3, + "per": { + "minute": 7 + } + }, + "timeBlock": { + "startHour": 4, + "endHour": 18 + }, + "energyMultiplier": 1.25, + "spawns": [ + { + "entity": "standard/passive/turtle", + "energyMultiplier": 2.885, + "rarity": 1 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical/land-cave.json b/spawners/tropical/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/tropical/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical/land-hostile.json b/spawners/tropical/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/tropical/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical/land-passive.json b/spawners/tropical/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/tropical/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/tundra/land-cave.json b/spawners/tundra/land-cave.json new file mode 100644 index 00000000..8e7ed794 --- /dev/null +++ b/spawners/tundra/land-cave.json @@ -0,0 +1,32 @@ +{ + "group": "CAVE", + "maximumRate": { + "amount": 3, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 3, + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/tundra/land-hostile.json b/spawners/tundra/land-hostile.json new file mode 100644 index 00000000..3d3add50 --- /dev/null +++ b/spawners/tundra/land-hostile.json @@ -0,0 +1,37 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 30, + "per": { + "seconds": 25 + } + }, + "timeBlock": { + "startHour": 20, + "endHour": 3 + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/zombie", + "energyMultiplier": 0.885, + "rarity": 1 + }, + { + "entity": "standard/hostile/skeleton", + "energyMultiplier": 1.35, + "rarity": 4 + }, + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + }, + { + "entity": "standard/hostile/creeper", + "energyMultiplier": 1.75, + "rarity": 6 + } + ] +} \ No newline at end of file diff --git a/spawners/tundra/land-passive.json b/spawners/tundra/land-passive.json new file mode 100644 index 00000000..957aa2ef --- /dev/null +++ b/spawners/tundra/land-passive.json @@ -0,0 +1,43 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "entity": "pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file From 951ecbdd47ea00cf1b8cba56fcb64b683f6c5311 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 01:17:12 -0400 Subject: [PATCH 43/46] Link up spawners --- regions/frozen.json | 5 +++++ regions/hot.json | 5 +++++ regions/mushroom.json | 5 +++++ regions/swamp.json | 5 +++++ regions/tropical.json | 6 ++++++ regions/tundra.json | 5 +++++ 6 files changed, 31 insertions(+) diff --git a/regions/frozen.json b/regions/frozen.json index e0936e01..14993a92 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -92,6 +92,11 @@ "drops": [{"rarity": 1, "maxAmount": 2, "minAmount": 1, "type": "spruce_sapling"}] } ], + "entitySpawners": [ + "frozen/land-passive", + "frozen/land-hostile", + "frozen/land-cave" + ], "objects": [ { "chance": 0, diff --git a/regions/hot.json b/regions/hot.json index 3fc7ed0c..c28fda97 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -22,6 +22,11 @@ "cave/sandy-cave", "cave/sandy-red-cave" ], + "entitySpawners": [ + "hot/land-passive", + "hot/land-hostile", + "hot/land-cave" + ], "riverStyle": { "style": "VASCULAR", "zoom": 4.77, diff --git a/regions/mushroom.json b/regions/mushroom.json index 69054ba5..0c30988d 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -259,6 +259,11 @@ "soundDistance": 3 } ], + "entitySpawners": [ + "mushroom/land-passive", + "mushroom/land-hostile", + "mushroom/land-cave" + ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { diff --git a/regions/swamp.json b/regions/swamp.json index 265307b0..22b4b512 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,6 +31,11 @@ "zoom": 5 } }, + "entitySpawners": [ + "tropical/land-passive", + "tropical/land-hostile", + "tropical/land-cave" + ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/tropical.json b/regions/tropical.json index f032cffd..d0101aed 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -53,6 +53,12 @@ "palette": [{"block": "emerald_ore"}], "varience": 2 }], + "entitySpawners": [ + "tropical/land-passive", + "tropical/land-hostile", + "tropical/land-cave", + "tropical/beach" + ], "landBiomeZoom": 1.85, "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, diff --git a/regions/tundra.json b/regions/tundra.json index 0989057f..443b1528 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -32,6 +32,11 @@ "cave/tundra-cavern", "cave/spiked-cavern" ], + "entitySpawners": [ + "tundra/land-passive", + "tundra/land-hostile", + "tundra/land-cave" + ], "riverBiomes": [ "tundra/sea/river", "tundra/sea/river-rocky", From 13f077f61dff61346a7f39fd83ad34ae8c8112a7 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 22:53:38 -0700 Subject: [PATCH 44/46] fff --- biomes/hot/desert-dunes-red.json | 2 +- biomes/hot/desert-dunes.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index 4916270c..7d1dca90 100644 --- a/biomes/hot/desert-dunes-red.json +++ b/biomes/hot/desert-dunes-red.json @@ -72,7 +72,7 @@ ], "translate": { "x": 0, - "y": -9, + "y": -3, "z": 0 } }, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index b0e82dd5..b888d820 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -92,11 +92,10 @@ "jigsaw/pyramid/pyramid-extreme", "jigsaw/pyramid/pyramid", "jigsaw/pyramid/pyramid45" - ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } } From 9f8eff20eda4977a38d734ab43bb4bf512e0ff67 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 02:19:00 -0400 Subject: [PATCH 45/46] Define stronghold positions --- dimensions/overworld.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 113f2d9e..5cc6878b 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -330,6 +330,8 @@ "placeObjects": true, "terrainZoom": 1, "stronghold": "stronghold", + "strongholdJumpDistance": 670, + "maxStrongholds": 27, "decorate": true, "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"} From ec46b513669c5b1a1bf3b3dd733197d57d76c1ea Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 3 Aug 2021 23:43:58 -0700 Subject: [PATCH 46/46] Another mob Overhaul --- biomes/temperate/flower-forest.json | 11 ++++ entities/chicken.json | 1 - entities/cow.json | 1 - entities/pig.json | 1 - entities/sheep.json | 1 - entities/{ => standard/hostile}/drowned.json | 0 entities/{ => standard/hostile}/pillager.json | 0 entities/{ => standard/hostile}/shroud.json | 0 .../{ => standard/hostile}/silverfish.json | 0 entities/{ => standard/passive}/bee.json | 0 entities/standard/passive/chicken.json | 2 +- entities/standard/passive/cow.json | 2 +- entities/{ => standard/passive}/dolphin.json | 0 entities/{ => standard/passive}/donkey.json | 0 entities/{ => standard/passive}/fox.json | 0 entities/{ => standard/passive}/goat.json | 0 entities/{ => standard/passive}/horse.json | 0 entities/{ => standard/passive}/llama.json | 0 entities/{ => standard/passive}/mule.json | 0 entities/{ => standard/passive}/ocelot.json | 0 entities/{ => standard/passive}/panda.json | 0 entities/{ => standard/passive}/parrot.json | 0 entities/standard/passive/pig.json | 2 +- .../{ => standard/passive}/polar-bear.json | 0 entities/{ => standard/passive}/rabbit.json | 0 entities/standard/passive/sheep.json | 2 +- entities/standard/passive/turtle.json | 2 +- entities/{ => standard/passive}/villager.json | 0 .../passive}/wanderingtrader.json | 0 entities/{ => standard/passive}/wolf.json | 0 entities/turtle.json | 1 - entities/{ => unique}/aeternum.json | 0 entities/{ => unique}/brian.json | 0 entities/{ => unique}/dan.json | 0 entities/{ => unique}/fred.json | 0 entities/{ => unique}/glowsquid.json | 0 entities/{ => unique}/golem.json | 0 entities/{ => unique}/iron_golem.json | 0 entities/{ => unique}/mooshroom.json | 0 entities/{ => unique}/pandaUwU.json | 0 entities/{ => unique}/phantomapi.json | 0 entities/{ => unique}/village_vex_test.json | 0 regions/swamp.json | 6 +- regions/tropical.json | 1 + spawners/dank.json | 6 +- spawners/frozen/land-cave.json | 2 +- spawners/frozen/land-hostile.json | 2 +- spawners/frozen/land-passive.json | 30 +++++---- spawners/hives.json | 6 +- spawners/hot/land-cave.json | 2 +- spawners/hot/land-hostile.json | 2 +- spawners/hot/land-passive.json | 35 +++++----- spawners/mushroom/land-cave.json | 2 +- spawners/mushroom/land-hostile.json | 2 +- spawners/mushroom/land-passive.json | 19 ++---- spawners/pillager.json | 10 +-- spawners/silverfish.json | 6 +- spawners/swamp/land-cave.json | 2 +- spawners/swamp/land-hostile.json | 2 +- spawners/swamp/land-passive.json | 24 ++++--- spawners/temperate/land-cave.json | 2 +- spawners/temperate/land-hostile.json | 2 +- spawners/temperate/land-passive.json | 15 +++-- spawners/tropical/land-cave.json | 2 +- spawners/tropical/land-hostile-day.json | 18 +++++ spawners/tropical/land-hostile.json | 2 +- spawners/tropical/land-passive.json | 66 ++++++++++++++++--- spawners/tundra/land-cave.json | 2 +- spawners/tundra/land-hostile.json | 2 +- spawners/tundra/land-passive.json | 39 +++++++---- spawners/villager.json | 2 +- 71 files changed, 211 insertions(+), 126 deletions(-) delete mode 100644 entities/chicken.json delete mode 100644 entities/cow.json delete mode 100644 entities/pig.json delete mode 100644 entities/sheep.json rename entities/{ => standard/hostile}/drowned.json (100%) rename entities/{ => standard/hostile}/pillager.json (100%) rename entities/{ => standard/hostile}/shroud.json (100%) rename entities/{ => standard/hostile}/silverfish.json (100%) rename entities/{ => standard/passive}/bee.json (100%) rename entities/{ => standard/passive}/dolphin.json (100%) rename entities/{ => standard/passive}/donkey.json (100%) rename entities/{ => standard/passive}/fox.json (100%) rename entities/{ => standard/passive}/goat.json (100%) rename entities/{ => standard/passive}/horse.json (100%) rename entities/{ => standard/passive}/llama.json (100%) rename entities/{ => standard/passive}/mule.json (100%) rename entities/{ => standard/passive}/ocelot.json (100%) rename entities/{ => standard/passive}/panda.json (100%) rename entities/{ => standard/passive}/parrot.json (100%) rename entities/{ => standard/passive}/polar-bear.json (100%) rename entities/{ => standard/passive}/rabbit.json (100%) rename entities/{ => standard/passive}/villager.json (100%) rename entities/{ => standard/passive}/wanderingtrader.json (100%) rename entities/{ => standard/passive}/wolf.json (100%) delete mode 100644 entities/turtle.json rename entities/{ => unique}/aeternum.json (100%) rename entities/{ => unique}/brian.json (100%) rename entities/{ => unique}/dan.json (100%) rename entities/{ => unique}/fred.json (100%) rename entities/{ => unique}/glowsquid.json (100%) rename entities/{ => unique}/golem.json (100%) rename entities/{ => unique}/iron_golem.json (100%) rename entities/{ => unique}/mooshroom.json (100%) rename entities/{ => unique}/pandaUwU.json (100%) rename entities/{ => unique}/phantomapi.json (100%) rename entities/{ => unique}/village_vex_test.json (100%) create mode 100644 spawners/tropical/land-hostile-day.json diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index f970d6ee..3f1bce33 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -112,6 +112,17 @@ { "mode": "FAST_MIN_HEIGHT", "chance": 0.33, + "addFeatures": [ + { + "rarity": 1, + "zone": { + "blockRadius": 8, + "entitySpawners": [ + "hives" + ] + } + } + ], "rotation": { "yAxis": { "min": 0, diff --git a/entities/chicken.json b/entities/chicken.json deleted file mode 100644 index 354b7489..00000000 --- a/entities/chicken.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "CHICKEN"} diff --git a/entities/cow.json b/entities/cow.json deleted file mode 100644 index 9d59d646..00000000 --- a/entities/cow.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "COW"} diff --git a/entities/pig.json b/entities/pig.json deleted file mode 100644 index e7a0d35b..00000000 --- a/entities/pig.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "PIG"} diff --git a/entities/sheep.json b/entities/sheep.json deleted file mode 100644 index aefdf212..00000000 --- a/entities/sheep.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "SHEEP"} diff --git a/entities/drowned.json b/entities/standard/hostile/drowned.json similarity index 100% rename from entities/drowned.json rename to entities/standard/hostile/drowned.json diff --git a/entities/pillager.json b/entities/standard/hostile/pillager.json similarity index 100% rename from entities/pillager.json rename to entities/standard/hostile/pillager.json diff --git a/entities/shroud.json b/entities/standard/hostile/shroud.json similarity index 100% rename from entities/shroud.json rename to entities/standard/hostile/shroud.json diff --git a/entities/silverfish.json b/entities/standard/hostile/silverfish.json similarity index 100% rename from entities/silverfish.json rename to entities/standard/hostile/silverfish.json diff --git a/entities/bee.json b/entities/standard/passive/bee.json similarity index 100% rename from entities/bee.json rename to entities/standard/passive/bee.json diff --git a/entities/standard/passive/chicken.json b/entities/standard/passive/chicken.json index 024a264c..354b7489 100644 --- a/entities/standard/passive/chicken.json +++ b/entities/standard/passive/chicken.json @@ -1 +1 @@ -{"type": "CHICKEN"} \ No newline at end of file +{"type": "CHICKEN"} diff --git a/entities/standard/passive/cow.json b/entities/standard/passive/cow.json index 2dc87140..9d59d646 100644 --- a/entities/standard/passive/cow.json +++ b/entities/standard/passive/cow.json @@ -1 +1 @@ -{"type": "COW"} \ No newline at end of file +{"type": "COW"} diff --git a/entities/dolphin.json b/entities/standard/passive/dolphin.json similarity index 100% rename from entities/dolphin.json rename to entities/standard/passive/dolphin.json diff --git a/entities/donkey.json b/entities/standard/passive/donkey.json similarity index 100% rename from entities/donkey.json rename to entities/standard/passive/donkey.json diff --git a/entities/fox.json b/entities/standard/passive/fox.json similarity index 100% rename from entities/fox.json rename to entities/standard/passive/fox.json diff --git a/entities/goat.json b/entities/standard/passive/goat.json similarity index 100% rename from entities/goat.json rename to entities/standard/passive/goat.json diff --git a/entities/horse.json b/entities/standard/passive/horse.json similarity index 100% rename from entities/horse.json rename to entities/standard/passive/horse.json diff --git a/entities/llama.json b/entities/standard/passive/llama.json similarity index 100% rename from entities/llama.json rename to entities/standard/passive/llama.json diff --git a/entities/mule.json b/entities/standard/passive/mule.json similarity index 100% rename from entities/mule.json rename to entities/standard/passive/mule.json diff --git a/entities/ocelot.json b/entities/standard/passive/ocelot.json similarity index 100% rename from entities/ocelot.json rename to entities/standard/passive/ocelot.json diff --git a/entities/panda.json b/entities/standard/passive/panda.json similarity index 100% rename from entities/panda.json rename to entities/standard/passive/panda.json diff --git a/entities/parrot.json b/entities/standard/passive/parrot.json similarity index 100% rename from entities/parrot.json rename to entities/standard/passive/parrot.json diff --git a/entities/standard/passive/pig.json b/entities/standard/passive/pig.json index b52a7ec4..e7a0d35b 100644 --- a/entities/standard/passive/pig.json +++ b/entities/standard/passive/pig.json @@ -1 +1 @@ -{"type": "PIG"} \ No newline at end of file +{"type": "PIG"} diff --git a/entities/polar-bear.json b/entities/standard/passive/polar-bear.json similarity index 100% rename from entities/polar-bear.json rename to entities/standard/passive/polar-bear.json diff --git a/entities/rabbit.json b/entities/standard/passive/rabbit.json similarity index 100% rename from entities/rabbit.json rename to entities/standard/passive/rabbit.json diff --git a/entities/standard/passive/sheep.json b/entities/standard/passive/sheep.json index 5f76d459..aefdf212 100644 --- a/entities/standard/passive/sheep.json +++ b/entities/standard/passive/sheep.json @@ -1 +1 @@ -{"type": "SHEEP"} \ No newline at end of file +{"type": "SHEEP"} diff --git a/entities/standard/passive/turtle.json b/entities/standard/passive/turtle.json index 7e9efa32..659fd6b6 100644 --- a/entities/standard/passive/turtle.json +++ b/entities/standard/passive/turtle.json @@ -1 +1 @@ -{"type": "TURTLE"} \ No newline at end of file +{"type": "TURTLE"} diff --git a/entities/villager.json b/entities/standard/passive/villager.json similarity index 100% rename from entities/villager.json rename to entities/standard/passive/villager.json diff --git a/entities/wanderingtrader.json b/entities/standard/passive/wanderingtrader.json similarity index 100% rename from entities/wanderingtrader.json rename to entities/standard/passive/wanderingtrader.json diff --git a/entities/wolf.json b/entities/standard/passive/wolf.json similarity index 100% rename from entities/wolf.json rename to entities/standard/passive/wolf.json diff --git a/entities/turtle.json b/entities/turtle.json deleted file mode 100644 index 659fd6b6..00000000 --- a/entities/turtle.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "TURTLE"} diff --git a/entities/aeternum.json b/entities/unique/aeternum.json similarity index 100% rename from entities/aeternum.json rename to entities/unique/aeternum.json diff --git a/entities/brian.json b/entities/unique/brian.json similarity index 100% rename from entities/brian.json rename to entities/unique/brian.json diff --git a/entities/dan.json b/entities/unique/dan.json similarity index 100% rename from entities/dan.json rename to entities/unique/dan.json diff --git a/entities/fred.json b/entities/unique/fred.json similarity index 100% rename from entities/fred.json rename to entities/unique/fred.json diff --git a/entities/glowsquid.json b/entities/unique/glowsquid.json similarity index 100% rename from entities/glowsquid.json rename to entities/unique/glowsquid.json diff --git a/entities/golem.json b/entities/unique/golem.json similarity index 100% rename from entities/golem.json rename to entities/unique/golem.json diff --git a/entities/iron_golem.json b/entities/unique/iron_golem.json similarity index 100% rename from entities/iron_golem.json rename to entities/unique/iron_golem.json diff --git a/entities/mooshroom.json b/entities/unique/mooshroom.json similarity index 100% rename from entities/mooshroom.json rename to entities/unique/mooshroom.json diff --git a/entities/pandaUwU.json b/entities/unique/pandaUwU.json similarity index 100% rename from entities/pandaUwU.json rename to entities/unique/pandaUwU.json diff --git a/entities/phantomapi.json b/entities/unique/phantomapi.json similarity index 100% rename from entities/phantomapi.json rename to entities/unique/phantomapi.json diff --git a/entities/village_vex_test.json b/entities/unique/village_vex_test.json similarity index 100% rename from entities/village_vex_test.json rename to entities/unique/village_vex_test.json diff --git a/regions/swamp.json b/regions/swamp.json index 22b4b512..4b6c5e38 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -32,9 +32,9 @@ } }, "entitySpawners": [ - "tropical/land-passive", - "tropical/land-hostile", - "tropical/land-cave" + "swamp/land-passive", + "swamp/land-hostile", + "swamp/land-cave" ], "biomeImplosionRatio": 0.26, "deposits": [ diff --git a/regions/tropical.json b/regions/tropical.json index d0101aed..02577b55 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -56,6 +56,7 @@ "entitySpawners": [ "tropical/land-passive", "tropical/land-hostile", + "tropical/land-hostile-day", "tropical/land-cave", "tropical/beach" ], diff --git a/spawners/dank.json b/spawners/dank.json index 36e7e8b7..f2f57710 100644 --- a/spawners/dank.json +++ b/spawners/dank.json @@ -2,19 +2,19 @@ { "spawns": [ { - "entity": "dan", + "entity": "unique/dan", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "brian", + "entity": "unique/brian", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "aeternum", + "entity": "unique/aeternum", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 diff --git a/spawners/frozen/land-cave.json b/spawners/frozen/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/frozen/land-cave.json +++ b/spawners/frozen/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/frozen/land-hostile.json b/spawners/frozen/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/frozen/land-hostile.json +++ b/spawners/frozen/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/frozen/land-passive.json b/spawners/frozen/land-passive.json index 957aa2ef..6413eb5a 100644 --- a/spawners/frozen/land-passive.json +++ b/spawners/frozen/land-passive.json @@ -14,30 +14,34 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 + "rarity": 2 }, { - "entity": "cow", + "entity": "standard/passive/sheep", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 5, - "energyMultiplier": 1.25 - }, - { - "entity": "pig", + "entity": "standard/passive/polar-bear", "maxSpawns": 2, "minSpawns": 1, - "rarity": 2 + "rarity": 15 + }, + { + "entity": "unique/golem", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 + }, + { + "entity": "standard/passive/fox", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 } ] } \ No newline at end of file diff --git a/spawners/hives.json b/spawners/hives.json index b5d604c7..43017770 100644 --- a/spawners/hives.json +++ b/spawners/hives.json @@ -1,11 +1,7 @@ { - "timeBlock": { - "startHour": 5, - "endHour":15 - }, "spawns": [ { - "entity": "bee", + "entity": "standard/passive/bee", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 diff --git a/spawners/hot/land-cave.json b/spawners/hot/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/hot/land-cave.json +++ b/spawners/hot/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/hot/land-hostile.json b/spawners/hot/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/hot/land-hostile.json +++ b/spawners/hot/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/hot/land-passive.json b/spawners/hot/land-passive.json index 957aa2ef..5cb46b48 100644 --- a/spawners/hot/land-passive.json +++ b/spawners/hot/land-passive.json @@ -14,30 +14,35 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 - }, - { - "entity": "cow", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", + "entity": "standard/passive/donkey", "maxSpawns": 3, - "minSpawns": 1, - "rarity": 5, - "energyMultiplier": 1.25 + "minSpawns": 2, + "rarity": 25 }, { - "entity": "pig", - "maxSpawns": 2, + "entity": "standard/passive/mule", + "maxSpawns": 3, + "minSpawns": 2, + "rarity": 25 + }, + { + "entity": "standard/passive/rabbit", + "maxSpawns": 1, "minSpawns": 1, - "rarity": 2 + "rarity": 1 + }, + { + "entity": "standard/passive/wanderingtrader", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 250, + "energyMultiplier": 5 } ] } \ No newline at end of file diff --git a/spawners/mushroom/land-cave.json b/spawners/mushroom/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/mushroom/land-cave.json +++ b/spawners/mushroom/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/mushroom/land-hostile.json b/spawners/mushroom/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/mushroom/land-hostile.json +++ b/spawners/mushroom/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/mushroom/land-passive.json b/spawners/mushroom/land-passive.json index 957aa2ef..9caf9b8e 100644 --- a/spawners/mushroom/land-passive.json +++ b/spawners/mushroom/land-passive.json @@ -14,27 +14,18 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 - }, - { - "entity": "cow", + "entity": "unique/mooshroom", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 5, - "energyMultiplier": 1.25 + "entity": "standard/passive/cow", + "maxSpawns": 2, + "rarity": 3 }, { - "entity": "pig", + "entity": "standard/passive/pig", "maxSpawns": 2, "minSpawns": 1, "rarity": 2 diff --git a/spawners/pillager.json b/spawners/pillager.json index 99832aa4..b099b4bb 100644 --- a/spawners/pillager.json +++ b/spawners/pillager.json @@ -1,15 +1,11 @@ { "weather": "ANY", - "timeBlock": { - "startHour": 22, - "endHour": 4 - }, "group": "NORMAL", "spawns": [ { - "entity": "pillager", - "maxSpawns": 4, - "minSpawns": 1, + "entity": "standard/hostile/pillager", + "maxSpawns": 5, + "minSpawns": 3, "rarity": 1 } ] diff --git a/spawners/silverfish.json b/spawners/silverfish.json index 84d24c2c..4e6363f7 100644 --- a/spawners/silverfish.json +++ b/spawners/silverfish.json @@ -1,11 +1,7 @@ { - "timeBlock": { - "startHour": 20, - "endHour": 3 - }, "spawns": [ { - "entity": "silverfish", + "entity": "standard/hostile/silverfish", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 diff --git a/spawners/swamp/land-cave.json b/spawners/swamp/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/swamp/land-cave.json +++ b/spawners/swamp/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/swamp/land-hostile.json b/spawners/swamp/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/swamp/land-hostile.json +++ b/spawners/swamp/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/swamp/land-passive.json b/spawners/swamp/land-passive.json index 957aa2ef..58f774b1 100644 --- a/spawners/swamp/land-passive.json +++ b/spawners/swamp/land-passive.json @@ -14,30 +14,36 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 + "energyMultiplier": 1.25 }, { - "entity": "cow", + "entity": "standard/passive/cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/pig", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", - "maxSpawns": 3, + "entity": "standard/passive/sheep", + "maxSpawns": 2, "minSpawns": 1, - "rarity": 5, + "rarity": 4, "energyMultiplier": 1.25 }, { - "entity": "pig", + "entity": "standard/passive/wolf", "maxSpawns": 2, "minSpawns": 1, - "rarity": 2 + "rarity": 15, + "energyMultiplier": 1.25 } ] } \ No newline at end of file diff --git a/spawners/temperate/land-cave.json b/spawners/temperate/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/temperate/land-cave.json +++ b/spawners/temperate/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/temperate/land-hostile.json b/spawners/temperate/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/temperate/land-hostile.json +++ b/spawners/temperate/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/temperate/land-passive.json b/spawners/temperate/land-passive.json index 957aa2ef..eb5028c4 100644 --- a/spawners/temperate/land-passive.json +++ b/spawners/temperate/land-passive.json @@ -14,30 +14,37 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, "rarity": 4, "energyMultiplier": 1.125 }, { - "entity": "cow", + "entity": "standard/passive/cow", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", + "entity": "standard/passive/sheep", "maxSpawns": 3, "minSpawns": 1, "rarity": 5, "energyMultiplier": 1.25 }, { - "entity": "pig", + "entity": "standard/passive/pig", "maxSpawns": 2, "minSpawns": 1, "rarity": 2 + }, + { + "entity": "horse", + "maxSpawns": 4, + "minSpawns": 2, + "rarity": 15, + "energyMultiplier": 5 } ] } \ No newline at end of file diff --git a/spawners/tropical/land-cave.json b/spawners/tropical/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/tropical/land-cave.json +++ b/spawners/tropical/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/tropical/land-hostile-day.json b/spawners/tropical/land-hostile-day.json new file mode 100644 index 00000000..db18d312 --- /dev/null +++ b/spawners/tropical/land-hostile-day.json @@ -0,0 +1,18 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 5, + "per": { + "seconds": 30 + } + }, + "energyMultiplier": 0.95, + "weather": "ANY", + "spawns": [ + { + "entity": "standard/hostile/spider", + "energyMultiplier": 1.15, + "rarity": 3 + } + ] +} \ No newline at end of file diff --git a/spawners/tropical/land-hostile.json b/spawners/tropical/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/tropical/land-hostile.json +++ b/spawners/tropical/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/tropical/land-passive.json b/spawners/tropical/land-passive.json index 957aa2ef..f79b5e6a 100644 --- a/spawners/tropical/land-passive.json +++ b/spawners/tropical/land-passive.json @@ -14,30 +14,76 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 + "rarity": 2 }, { - "entity": "cow", + "entity": "standard/passive/cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 8, + "energyMultiplier": 1.25 + }, + { + "entity": "standard/passive/ocelot", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", - "maxSpawns": 3, + "entity": "standard/passive/parrot", + "maxSpawns": 2, "minSpawns": 1, - "rarity": 5, + "rarity": 3, "energyMultiplier": 1.25 }, { - "entity": "pig", - "maxSpawns": 2, + "entity": "standard/passive/turtle", + "maxSpawns": 1, "minSpawns": 1, - "rarity": 2 + "rarity": 6, + "energyMultiplier": 1.25 + }, + { + "entity": "standard/passive/panda", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.25 + }, + { + "entity": "unique/pandaUwU", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 15, + "energyMultiplier": 2.5 + }, + { + "entity": "unique/aeternum", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 15, + "energyMultiplier": 3 } ] } \ No newline at end of file diff --git a/spawners/tundra/land-cave.json b/spawners/tundra/land-cave.json index 8e7ed794..3a239796 100644 --- a/spawners/tundra/land-cave.json +++ b/spawners/tundra/land-cave.json @@ -26,7 +26,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/tundra/land-hostile.json b/spawners/tundra/land-hostile.json index 3d3add50..04c7efc5 100644 --- a/spawners/tundra/land-hostile.json +++ b/spawners/tundra/land-hostile.json @@ -31,7 +31,7 @@ { "entity": "standard/hostile/creeper", "energyMultiplier": 1.75, - "rarity": 6 + "rarity": 5 } ] } \ No newline at end of file diff --git a/spawners/tundra/land-passive.json b/spawners/tundra/land-passive.json index 957aa2ef..f863e118 100644 --- a/spawners/tundra/land-passive.json +++ b/spawners/tundra/land-passive.json @@ -14,30 +14,43 @@ "weather": "NONE", "spawns": [ { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 4, - "energyMultiplier": 1.125 - }, - { - "entity": "cow", + "entity": "standard/passive/chicken", "maxSpawns": 2, "minSpawns": 1, "rarity": 1 }, { - "entity": "sheep", - "maxSpawns": 3, + "entity": "standard/passive/cow", + "maxSpawns": 2, "minSpawns": 1, - "rarity": 5, - "energyMultiplier": 1.25 + "rarity": 4, + "energyMultiplier": 1.2 }, { - "entity": "pig", + "entity": "standard/passive/pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.2 + }, + { + "entity": "standard/passive/sheep", "maxSpawns": 2, "minSpawns": 1, "rarity": 2 + }, + { + "entity": "standard/passive/goat", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.2 + }, + { + "entity": "standard/passive/wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 15 } ] } \ No newline at end of file diff --git a/spawners/villager.json b/spawners/villager.json index 3c2c111a..4300eddc 100644 --- a/spawners/villager.json +++ b/spawners/villager.json @@ -1,7 +1,7 @@ { "spawns": [ { - "entity": "villager", + "entity": "standard/passive/villager", "maxSpawns": 1, "minSpawns": 1, "rarity": 2