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..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"} ] }], @@ -92,12 +93,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/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/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/biomes/frozen/hills.json b/biomes/frozen/hills.json index d8ec6c82..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", @@ -44,13 +45,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-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-middle.json b/biomes/frozen/mountain-middle.json index 35a7e38d..c33117bb 100644 --- a/biomes/frozen/mountain-middle.json +++ b/biomes/frozen/mountain-middle.json @@ -7,16 +7,12 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, + "max": 180, "min": 30 } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_mountain_middle", "waterColor": "#216FC4", "fogColor": "#A6D1FF", 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/frozen/mountains.json b/biomes/frozen/mountains.json index feae7da5..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", @@ -63,13 +64,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..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", @@ -92,13 +93,8 @@ ], "generators": [ { - "min": 14, - "max": 24, - "generator": "plain" - }, - { - "min": 56, - "max": 96, + "min": 60, + "max": 180, "generator": "mountain" } ], diff --git a/biomes/frozen/pine-hills.json b/biomes/frozen/pine-hills.json index 46438735..a3f8586c 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, @@ -79,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/frozen/pine-plains.json b/biomes/frozen/pine-plains.json index 2e6efbdb..2362e01b 100644 --- a/biomes/frozen/pine-plains.json +++ b/biomes/frozen/pine-plains.json @@ -8,16 +8,12 @@ "generators": [ { "generator": "plain", - "max": 10, - "min": 6 - }, - { - "generator": "mountain", - "max": 6, - "min": 7 + "max": 16, + "min": 13 } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_pine_plains", "waterColor": "#216FC4", "fogColor": "#A6D1FF", diff --git a/biomes/frozen/pines.json b/biomes/frozen/pines.json index c96813f4..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", @@ -48,13 +49,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..7595292f 100644 --- a/biomes/frozen/plains.json +++ b/biomes/frozen/plains.json @@ -7,17 +7,13 @@ "children": ["frozen/hills"], "generators": [ { - "min": 4, - "max": 6, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, + "min": 6, + "max": 11, "generator": "plain" } ], "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 d3ff12b4..4afc3d96 100644 --- a/biomes/frozen/redwood-forest.json +++ b/biomes/frozen/redwood-forest.json @@ -5,18 +5,15 @@ "rarity": 1, "vanillaDerivative": "SNOWY_TAIGA", "generators": [ + { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 48, + "min": 16, + "max": 64, "generator": "mountain" } ], "customDerivitives": [{ + "category": "icy", "id": "frozen_redwood_forest", "waterColor": "#216FC4", "fogColor": "#A6D1FF", 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, diff --git a/biomes/frozen/spruce-plains.json b/biomes/frozen/spruce-plains.json index e335af91..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", @@ -57,8 +58,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..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", @@ -73,13 +74,8 @@ }], "generators": [ { - "min": 3, - "max": 16, - "generator": "plain" - }, - { - "min": 13, - "max": 44, + "min": 15, + "max": 64, "generator": "mountain" } ], diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json index f0a437ad..7d1dca90 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, @@ -67,17 +67,18 @@ }, "place": [ "jigsaw/pyramid/rpyramid-extreme", - "jigsaw/pyramid/rpyramid" + "jigsaw/pyramid/rpyramid", + "jigsaw/pyramid/pyramidred45" ], "translate": { "x": 0, - "y": -9, + "y": -3, "z": 0 } }, { "chance": 0.0015, - "mode": "STILT", + "mode": "VACUUM", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index 8f0e0133..b888d820 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -55,7 +55,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "VACUUM", "rotation": { "yAxis": { "min": 0, @@ -78,7 +78,7 @@ }, { "chance": 0.0015, - "mode": "STILT", + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, @@ -90,12 +90,12 @@ }, "place": [ "jigsaw/pyramid/pyramid-extreme", - "jigsaw/pyramid/pyramid" - + "jigsaw/pyramid/pyramid", + "jigsaw/pyramid/pyramid45" ], "translate": { "x": 0, - "y": -9, + "y": -3, "z": 0 } } 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": [ { 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": [ 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/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/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/savanna/acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json index 1a08e35c..db2c4147 100644 --- a/biomes/savanna/acacia-denmyre.json +++ b/biomes/savanna/acacia-denmyre.json @@ -5,10 +5,11 @@ "color": "#FFB641", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "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 e0c49f17..3d9f51a7 100644 --- a/biomes/savanna/cliff.json +++ b/biomes/savanna/cliff.json @@ -6,16 +6,18 @@ "vanillaDerivative": "SAVANNA", "children": ["savanna/acacia-denmyre"], "customDerivitives": [{ + "category": "savanna", "id": "savanna_cliffs", "grassColor": "#DFD545", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], - "generators": [{ - "min": 9, - "max": 28, - "generator": "plain" + "generators": [ + { + "min": 5, + "max": 15, + "generator": "plain-cliffs" }], "jigsawStructures": [ { diff --git a/biomes/savanna/forest.json b/biomes/savanna/forest.json index 3130c251..bab2a026 100644 --- a/biomes/savanna/forest.json +++ b/biomes/savanna/forest.json @@ -5,10 +5,11 @@ "derivative": "SAVANNA", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "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 4779aa61..e632bd1c 100644 --- a/biomes/savanna/plateau.json +++ b/biomes/savanna/plateau.json @@ -5,16 +5,17 @@ "color": "#805B21", "vanillaDerivative": "SAVANNA", "customDerivitives": [{ + "category": "savanna", "id": "savanna_plateau", "grassColor": "#FFCB31", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [{ "min": 13, "max": 26, - "generator": "canyon-steep" + "generator": "mountain" }], "jigsawStructures": [ { diff --git a/biomes/savanna/savanna.json b/biomes/savanna/savanna.json index 333fc9c7..3be6d6bf 100644 --- a/biomes/savanna/savanna.json +++ b/biomes/savanna/savanna.json @@ -6,21 +6,17 @@ "vanillaDerivative": "SAVANNA", "children": ["savanna/cliff"], "customDerivitives": [{ + "category": "savanna", "id": "savanna", "grassColor": "#DFD545", "foliageColor": "#D6A513", - "waterColor": "#E2EF3B", + "waterColor": "#33CB99", "downfallType": "none" }], "generators": [ { - "min": 7, - "max": 15, - "generator": "mountain" - }, - { - "min": 3, - "max": 5, + "min": 10, + "max": 20, "generator": "plain" } ], diff --git a/biomes/swamp/cambian-drift.json b/biomes/swamp/cambian-drift.json index ab2dd275..0858fc4c 100644 --- a/biomes/swamp/cambian-drift.json +++ b/biomes/swamp/cambian-drift.json @@ -87,10 +87,11 @@ "objects": [ { "chance": 0.7, + "translate": {"y": -2}, "density": 2, "edit": [ { - "find": [{"block": "birch_leaves"}], + "find": [{"block": "oak_leaves"}], "replace": {"palette": [{"block": "dark_oak_leaves"}]} }, { 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 e26802d3..272c846c 100644 --- a/biomes/swamp/marsh.json +++ b/biomes/swamp/marsh.json @@ -7,10 +7,11 @@ "children": ["swamp/marsh-rotten"], "generators": [{ "min": 3, - "max": 6, + "max": 10, "generator": "mountain" }], "customDerivitives": [{ + "category": "swamp", "id": "swamp_marsh_rotten", "waterColor": "#684D1A", "grassColor": "#5C581A", 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/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" 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": [ { 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..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 } } ], @@ -221,25 +224,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..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 } } ], @@ -193,25 +196,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..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" ] }, { @@ -308,6 +292,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], @@ -318,26 +305,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..3f1bce33 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, @@ -123,6 +112,17 @@ { "mode": "FAST_MIN_HEIGHT", "chance": 0.33, + "addFeatures": [ + { + "rarity": 1, + "zone": { + "blockRadius": 8, + "entitySpawners": [ + "hives" + ] + } + } + ], "rotation": { "yAxis": { "min": 0, @@ -148,31 +148,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" ] }, @@ -389,6 +376,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], 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..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 } } ], @@ -408,19 +411,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..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 } } ], @@ -223,19 +226,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..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 } } ], @@ -223,19 +226,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..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 } } ], @@ -251,19 +254,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..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 } } ], @@ -220,25 +223,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..6a4bf684 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -233,27 +233,10 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } - ], - "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..40caf1cd 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -310,23 +310,12 @@ "min": 0, "max": 360 } + }, + "translate": { + "y": 1 } } ], - "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..811f960a 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, @@ -207,6 +187,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/temperate/shore/beach.json b/biomes/temperate/shore/beach.json index 1962aad6..b767931e 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": [ @@ -62,14 +62,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "turtle", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 80 - } - ], "objects": [{ "mode": "PAINT", "chance": 0.0025, 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 eea59fca..d4229387 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": [{ @@ -161,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-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/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 2152d7c3..c4418836 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, @@ -165,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 106026cf..6c0ff94e 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 } }, @@ -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 bdd21146..7bd6f4e2 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", @@ -191,7 +191,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, @@ -266,6 +266,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], 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..b18522b0 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": [ { @@ -182,7 +182,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, @@ -257,6 +257,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tropical/rainforest.json b/biomes/tropical/rainforest.json index 801bd7a7..26d30546 100644 --- a/biomes/tropical/rainforest.json +++ b/biomes/tropical/rainforest.json @@ -193,7 +193,7 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, @@ -268,6 +268,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], 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 9a4c9df8..96b6858d 100644 --- a/biomes/tropical/volcanic-plains.json +++ b/biomes/tropical/volcanic-plains.json @@ -11,6 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ + "category": "jungle", "id": "tropical_volcanic_plains", "grassColor": "#9BC20D", "foliageColor": "#9CD320", @@ -42,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 3cd864da..de128d05 100644 --- a/biomes/tropical/volcanoes-lava.json +++ b/biomes/tropical/volcanoes-lava.json @@ -5,6 +5,7 @@ "rarity": 1, "color": "#50AF52", "customDerivitives": [{ + "category": "jungle", "id": "tropical_volcanic_lava", "grassColor": "#BDBF0B", "foliageColor": "#BDBF0B", @@ -14,13 +15,8 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, - "min": 30 + "max": 180, + "min": 3 } ], "layers": [ @@ -49,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 f601ec47..7eda7b9e 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", @@ -15,12 +16,7 @@ "generators": [ { "generator": "mountain", - "max": 100, - "min": 0 - }, - { - "generator": "plain", - "max": 80, + "max": 180, "min": 30 } ], @@ -52,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/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index c99368da..48ca9bcd 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -487,21 +487,10 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/forest-cliffs.json b/biomes/tundra/forest-cliffs.json index 0baa4701..7036e65f 100644 --- a/biomes/tundra/forest-cliffs.json +++ b/biomes/tundra/forest-cliffs.json @@ -4,19 +4,18 @@ "rarity": 3, "color": "#3E8F7A", "vanillaDerivative": "TAIGA_MOUNTAINS", - "generators": [ - { - "generator": "smooth-dunes", - "max": 14, - "min": 8 - }, - { - "min": 12, - "max": 17, - "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", @@ -266,6 +265,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index cbfd7fda..7ba514f1 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", @@ -204,6 +205,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], @@ -221,19 +225,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 bd206410..1f02a090 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -6,17 +6,13 @@ "vanillaDerivative": "TAIGA_MOUNTAINS", "generators": [ { - "min": 11, - "max": 32, - "generator": "mountain" - }, - { - "min": 12, - "max": 62, + "min": 23, + "max": 94, "generator": "plain-cliffs" } ], "customDerivitives": [{ + "category": "forest", "id": "tundra_magical_forest_cliffs", "grassColor": "#B0A747", "waterColor": "#80B4C6", @@ -272,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..3396e501 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", @@ -164,6 +165,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], @@ -227,25 +231,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 94512bb2..7202a6d3 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -4,19 +4,18 @@ "rarity": 3, "color": "#5DA899", "vanillaDerivative": "DARK_FOREST", - "generators": [ - { - "min": 15, - "max": 25, - "generator": "mountain" - }, - { - "min": 12, - "max": 25, - "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", @@ -410,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..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", @@ -371,19 +372,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..55ecce1e 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", @@ -311,25 +312,14 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], "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/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 70cd085b..37b0e005 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", @@ -293,6 +294,9 @@ "min": 0, "interval": 90 } + }, + "translate": { + "y": 1 } } ], @@ -303,19 +307,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/dimensions/overworld.json b/dimensions/overworld.json index 86437976..5cc6878b 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", @@ -8,7 +8,6 @@ "continentZoom": 1, "continentalStyle": { "style": "NOWHERE_CELLULAR", - "zoom": 5 }, "landChance": 0.69, @@ -331,33 +330,9 @@ "placeObjects": true, "terrainZoom": 1, "stronghold": "stronghold", + "strongholdJumpDistance": 670, + "maxStrongholds": 27, "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"} } diff --git a/entities/pillager.json b/entities/pillager.json deleted file mode 100644 index c95faa59..00000000 --- a/entities/pillager.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "PILLAGER", - "silent": false, - "aware": true, - "customName": "§f" -} 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/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/standard/hostile/pillager.json b/entities/standard/hostile/pillager.json new file mode 100644 index 00000000..846bcb4a --- /dev/null +++ b/entities/standard/hostile/pillager.json @@ -0,0 +1,10 @@ +{ + "type": "PILLAGER", + "spawnEffect": { + "interval": 1, + "chance": 1, + "particleEffect": "SOUL", + "particleCount": 100, + "sound": "ITEM_TRIDENT_RETURN" + } +} 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/standard/hostile/silverfish.json b/entities/standard/hostile/silverfish.json new file mode 100644 index 00000000..f2e5f497 --- /dev/null +++ b/entities/standard/hostile/silverfish.json @@ -0,0 +1,2 @@ +{"type": "SILVERFISH", +"silent": true} 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/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/chicken.json b/entities/standard/passive/chicken.json similarity index 100% rename from entities/chicken.json rename to entities/standard/passive/chicken.json diff --git a/entities/cow.json b/entities/standard/passive/cow.json similarity index 100% rename from entities/cow.json rename to entities/standard/passive/cow.json 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/pig.json b/entities/standard/passive/pig.json similarity index 100% rename from entities/pig.json rename to entities/standard/passive/pig.json 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/sheep.json b/entities/standard/passive/sheep.json similarity index 100% rename from entities/sheep.json rename to entities/standard/passive/sheep.json diff --git a/entities/turtle.json b/entities/standard/passive/turtle.json similarity index 100% rename from entities/turtle.json rename to entities/standard/passive/turtle.json diff --git a/entities/standard/passive/villager.json b/entities/standard/passive/villager.json new file mode 100644 index 00000000..9a4bb0ce --- /dev/null +++ b/entities/standard/passive/villager.json @@ -0,0 +1,3 @@ +{ + "type": "VILLAGER" +} 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/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 62% rename from entities/brian.json rename to entities/unique/brian.json index 164952ce..a49900ff 100644 --- a/entities/brian.json +++ b/entities/unique/brian.json @@ -1,6 +1,7 @@ { "type": "EVOKER", "customName": "&dMagic Psychopath", + "spawnEffect": {"particleEffect": "SPELL_MOB_AMBIENT", "particleCount": 9, "chance": 1, "interval": 1, "sound": "ENTITY_EVOKER_PREPARE_WOLOLO", "volume": 10}, "attributes": [ { "attribute": "GENERIC_ARMOR", @@ -23,10 +24,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/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/entities/villager.json b/entities/villager.json deleted file mode 100644 index 0eb7c7cc..00000000 --- a/entities/villager.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "VILLAGER", - "aware": true, - "ai": true -} 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, 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/objects/jigsaw/pyramid/pyramid45.iob b/objects/jigsaw/pyramid/pyramid45.iob new file mode 100644 index 00000000..46ead463 Binary files /dev/null and b/objects/jigsaw/pyramid/pyramid45.iob differ diff --git a/objects/jigsaw/pyramid/pyramidred45.iob b/objects/jigsaw/pyramid/pyramidred45.iob new file mode 100644 index 00000000..69bba260 Binary files /dev/null and b/objects/jigsaw/pyramid/pyramidred45.iob differ diff --git a/objects/trees/birch/omni1.iob b/objects/trees/birch/omni1.iob new file mode 100644 index 00000000..b0de6c65 Binary files /dev/null and b/objects/trees/birch/omni1.iob differ diff --git a/objects/trees/oak/antioch1.iob b/objects/trees/oak/antioch1.iob new file mode 100644 index 00000000..5279735e Binary files /dev/null and b/objects/trees/oak/antioch1.iob differ diff --git a/objects/trees/oak/antioch10.iob b/objects/trees/oak/antioch10.iob new file mode 100644 index 00000000..58c829c4 Binary files /dev/null and b/objects/trees/oak/antioch10.iob differ diff --git a/objects/trees/oak/antioch11.iob b/objects/trees/oak/antioch11.iob new file mode 100644 index 00000000..ab015015 Binary files /dev/null and b/objects/trees/oak/antioch11.iob differ diff --git a/objects/trees/oak/antioch12.iob b/objects/trees/oak/antioch12.iob new file mode 100644 index 00000000..da792510 Binary files /dev/null and b/objects/trees/oak/antioch12.iob differ diff --git a/objects/trees/oak/antioch13.iob b/objects/trees/oak/antioch13.iob new file mode 100644 index 00000000..d3a259ab Binary files /dev/null and b/objects/trees/oak/antioch13.iob differ diff --git a/objects/trees/oak/antioch2.iob b/objects/trees/oak/antioch2.iob new file mode 100644 index 00000000..33edf34b Binary files /dev/null and b/objects/trees/oak/antioch2.iob differ diff --git a/objects/trees/oak/antioch3.iob b/objects/trees/oak/antioch3.iob new file mode 100644 index 00000000..e35a407b Binary files /dev/null and b/objects/trees/oak/antioch3.iob differ diff --git a/objects/trees/oak/antioch4.iob b/objects/trees/oak/antioch4.iob new file mode 100644 index 00000000..71509e87 Binary files /dev/null and b/objects/trees/oak/antioch4.iob differ diff --git a/objects/trees/oak/antioch5.iob b/objects/trees/oak/antioch5.iob new file mode 100644 index 00000000..495c895b Binary files /dev/null and b/objects/trees/oak/antioch5.iob differ diff --git a/objects/trees/oak/antioch6.iob b/objects/trees/oak/antioch6.iob new file mode 100644 index 00000000..23b01634 Binary files /dev/null and b/objects/trees/oak/antioch6.iob differ diff --git a/objects/trees/oak/antioch7.iob b/objects/trees/oak/antioch7.iob new file mode 100644 index 00000000..5e36e387 Binary files /dev/null and b/objects/trees/oak/antioch7.iob differ diff --git a/objects/trees/oak/antioch8.iob b/objects/trees/oak/antioch8.iob new file mode 100644 index 00000000..e3b2a86c Binary files /dev/null and b/objects/trees/oak/antioch8.iob differ diff --git a/objects/trees/oak/antioch9.iob b/objects/trees/oak/antioch9.iob new file mode 100644 index 00000000..37f9f55b Binary files /dev/null and b/objects/trees/oak/antioch9.iob differ diff --git a/objects/trees/oak/omni1.iob b/objects/trees/oak/omni1.iob new file mode 100644 index 00000000..e20fe81a Binary files /dev/null and b/objects/trees/oak/omni1.iob differ diff --git a/objects/trees/spruce/omni1.iob b/objects/trees/spruce/omni1.iob new file mode 100644 index 00000000..ead68050 Binary files /dev/null and b/objects/trees/spruce/omni1.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index 57094852..14993a92 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,38 +38,6 @@ "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, @@ -118,7 +86,54 @@ "cold-treasure" ] }, + "blockDrops": [ + { + "blocks": [{"block": "stone"}], + "drops": [{"rarity": 1, "maxAmount": 2, "minAmount": 1, "type": "spruce_sapling"}] + } + ], + "entitySpawners": [ + "frozen/land-passive", + "frozen/land-hostile", + "frozen/land-cave" + ], "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..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, @@ -31,38 +36,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, @@ -168,6 +141,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..0c30988d 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": { @@ -124,18 +259,10 @@ "soundDistance": 3 } ], - "entityInitialSpawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 20 - } + "entitySpawners": [ + "mushroom/land-passive", + "mushroom/land-hostile", + "mushroom/land-cave" ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, diff --git a/regions/swamp.json b/regions/swamp.json index 8b2624a2..4b6c5e38 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,37 +31,10 @@ "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 - } + "entitySpawners": [ + "swamp/land-passive", + "swamp/land-hostile", + "swamp/land-cave" ], "biomeImplosionRatio": 0.26, "deposits": [ @@ -86,7 +59,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..bb230f18 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -31,32 +31,11 @@ "structure": "murky_stronghold", "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 - } + "ENTITY_SPAWNS": "ALL ENTITY SPAWNS FOR THE REGION", + "entitySpawners": [ + "temperate/land-passive", + "temperate/land-hostile", + "temperate/land-cave" ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, @@ -77,10 +56,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}, + "trees": [ {"sizes": [ {"depth": 1, "width": 1} ], "treeTypes": ["TREE", "BIG_TREE"]}], "place": [ "trees/oak/truegeneric1", "trees/oak/truegeneric2", @@ -89,6 +66,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, diff --git a/regions/tropical.json b/regions/tropical.json index f7181650..02577b55 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 @@ -121,6 +53,13 @@ "palette": [{"block": "emerald_ore"}], "varience": 2 }], + "entitySpawners": [ + "tropical/land-passive", + "tropical/land-hostile", + "tropical/land-hostile-day", + "tropical/land-cave", + "tropical/beach" + ], "landBiomeZoom": 1.85, "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, @@ -136,6 +75,28 @@ ] }, "objects": [ + { + "chance": 0, + "rotation": {"enabled": true, "yAxis": {"enabled": true, "interval":90, "max": 360, "min": 0}}, + "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": [ + "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 11e1bfba..443b1528 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 @@ -32,37 +32,10 @@ "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 - } + "entitySpawners": [ + "tundra/land-passive", + "tundra/land-hostile", + "tundra/land-cave" ], "riverBiomes": [ "tundra/sea/river", @@ -104,7 +77,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": { diff --git a/spawners/dank.json b/spawners/dank.json new file mode 100644 index 00000000..f2f57710 --- /dev/null +++ b/spawners/dank.json @@ -0,0 +1,25 @@ + +{ + "spawns": [ + { + "entity": "unique/dan", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "unique/brian", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "unique/aeternum", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ], + "group": "NORMAL", + "weather": "DOWNFALL" +} \ No newline at end of file diff --git a/spawners/frozen/land-cave.json b/spawners/frozen/land-cave.json new file mode 100644 index 00000000..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..6413eb5a --- /dev/null +++ b/spawners/frozen/land-passive.json @@ -0,0 +1,47 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "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 new file mode 100644 index 00000000..43017770 --- /dev/null +++ b/spawners/hives.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "standard/passive/bee", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ 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..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..5cb46b48 --- /dev/null +++ b/spawners/hot/land-passive.json @@ -0,0 +1,48 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/donkey", + "maxSpawns": 3, + "minSpawns": 2, + "rarity": 25 + }, + { + "entity": "standard/passive/mule", + "maxSpawns": 3, + "minSpawns": 2, + "rarity": 25 + }, + { + "entity": "standard/passive/rabbit", + "maxSpawns": 1, + "minSpawns": 1, + "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 new file mode 100644 index 00000000..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..9caf9b8e --- /dev/null +++ b/spawners/mushroom/land-passive.json @@ -0,0 +1,34 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "unique/mooshroom", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/cow", + "maxSpawns": 2, + "rarity": 3 + }, + { + "entity": "standard/passive/pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file diff --git a/spawners/pillager.json b/spawners/pillager.json new file mode 100644 index 00000000..b099b4bb --- /dev/null +++ b/spawners/pillager.json @@ -0,0 +1,12 @@ +{ + "weather": "ANY", + "group": "NORMAL", + "spawns": [ + { + "entity": "standard/hostile/pillager", + "maxSpawns": 5, + "minSpawns": 3, + "rarity": 1 + } + ] +} \ No newline at end of file diff --git a/spawners/silverfish.json b/spawners/silverfish.json new file mode 100644 index 00000000..4e6363f7 --- /dev/null +++ b/spawners/silverfish.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "standard/hostile/silverfish", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + } + ] +} \ 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..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..58f774b1 --- /dev/null +++ b/spawners/swamp/land-passive.json @@ -0,0 +1,49 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "energyMultiplier": 1.25 + }, + { + "entity": "standard/passive/cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "entity": "standard/passive/pig", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/sheep", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.25 + }, + { + "entity": "standard/passive/wolf", + "maxSpawns": 2, + "minSpawns": 1, + "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 new file mode 100644 index 00000000..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..eb5028c4 --- /dev/null +++ b/spawners/temperate/land-passive.json @@ -0,0 +1,50 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.125 + }, + { + "entity": "standard/passive/cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5, + "energyMultiplier": 1.25 + }, + { + "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/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..3a239796 --- /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": 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 new file mode 100644 index 00000000..04c7efc5 --- /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": 5 + } + ] +} \ 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..f79b5e6a --- /dev/null +++ b/spawners/tropical/land-passive.json @@ -0,0 +1,89 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 2 + }, + { + "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": "standard/passive/parrot", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 3, + "energyMultiplier": 1.25 + }, + { + "entity": "standard/passive/turtle", + "maxSpawns": 1, + "minSpawns": 1, + "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 new file mode 100644 index 00000000..3a239796 --- /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": 5 + } + ] +} \ 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..04c7efc5 --- /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": 5 + } + ] +} \ 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..f863e118 --- /dev/null +++ b/spawners/tundra/land-passive.json @@ -0,0 +1,56 @@ +{ + "group": "NORMAL", + "maximumRate": { + "amount": 15, + "per": { + "seconds": 30 + } + }, + "timeBlock": { + "startHour": 6, + "endHour": 18 + }, + "energyMultiplier": 0.85, + "weather": "NONE", + "spawns": [ + { + "entity": "standard/passive/chicken", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 1 + }, + { + "entity": "standard/passive/cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4, + "energyMultiplier": 1.2 + }, + { + "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 new file mode 100644 index 00000000..4300eddc --- /dev/null +++ b/spawners/villager.json @@ -0,0 +1,10 @@ +{ + "spawns": [ + { + "entity": "standard/passive/villager", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 2 + } + ] +} \ No newline at end of file