diff --git a/biomes/carving/lush.json b/biomes/carving/lush.json index 2a7a7412..fcebd481 100644 --- a/biomes/carving/lush.json +++ b/biomes/carving/lush.json @@ -1,96 +1,108 @@ { - "name": "Lush Cavern", - "wall": { - "style": { "style": "IRIS" , "zoom": 0.5}, - "palette": [ - { - "block": "minecraft:deepslate" - }, - { "block": "minecraft:mossy_cobblestone" }, - { "block": "minecraft:moss_block" } - ] - }, - "layers": [ - { - "style": { "style": "IRIS" }, - "maxHeight": 1, - "minHeight": 1, - "palette": [ - { "block": "minecraft:moss_block", "weight": 2 }, - { "block": "minecraft:clay" }, - { "block": "minecraft:water" }, - { "block": "minecraft:clay" }, - { "block": "minecraft:deepslate" }, - { "block": "minecraft:grass_block" } - ] + "name": "Lush Cavern", + "wall": { + "style": { + "style": "IRIS", + "zoom": 0.5 + }, + "palette": [ + {"block": "minecraft:deepslate"}, + {"block": "minecraft:mossy_cobblestone"}, + {"block": "minecraft:moss_block"} + ] }, - { - "style": { "style": "CELLULAR" }, - "maxHeight": 2, - "minHeight": 1, - "palette": [ - { "block": "minecraft:clay", "weight": 5}, - { "block": "minecraft:deepslate" } - ] - } - ], - "caveCeilingLayers": [ - { - "style": { "style": "IRIS" }, - "maxHeight": 2, - "minHeight": 2, - "palette": [ - { "block": "minecraft:moss_block", "weight": 2 }, + "layers": [ { - "block": "minecraft:deepslate" + "style": {"style": "IRIS"}, + "maxHeight": 1, + "minHeight": 1, + "palette": [ + { + "block": "minecraft:moss_block", + "weight": 2 + }, + {"block": "minecraft:clay"}, + {"block": "minecraft:water"}, + {"block": "minecraft:clay"}, + {"block": "minecraft:deepslate"}, + {"block": "minecraft:grass_block"} + ] + }, + { + "style": {"style": "CELLULAR"}, + "maxHeight": 2, + "minHeight": 1, + "palette": [ + { + "block": "minecraft:clay", + "weight": 5 + }, + {"block": "minecraft:deepslate"} + ] } - ] - } - ], - "decorators": [ - { - "chance": 0.01, - "absoluteMaxStack": 1, - "palette": [{ "block": "minecraft:big_dripleaf" }] - }, - { - "chance": 0.03, - "style": { - "style": "STATIC" - }, - "absoluteMaxStack": 1, - - "palette": [ - { "block": "minecraft:grass" }, - { "block": "minecraft:azalea_leaves" }, - { "block": "minecraft:azalea" }, - { "block": "minecraft:flowering_azalea" }, - { "block": "minecraft:flowering_azalea_leaves" } - ] - }, - { - "partOf": "CEILING", - "chance": 0.05, - "absoluteMaxStack": 30, - "scaleStack": true, - "stackMin": 4, - "stackMax": 25, - "topPalette": [ - {"block": "minecraft:cave_vines"}, - {"block": "minecraft:spore_blossom"}, - {"block": "minecraft:cave_vines","data": {"berries": "true"}} + ], + "caveCeilingLayers": [{ + "style": {"style": "IRIS"}, + "maxHeight": 2, + "minHeight": 2, + "palette": [ + { + "block": "minecraft:moss_block", + "weight": 2 + }, + {"block": "minecraft:deepslate"} + ] + }], + "decorators": [ + { + "chance": 0.01, + "absoluteMaxStack": 1, + "palette": [{"block": "minecraft:big_dripleaf"}] + }, + { + "chance": 0.03, + "style": {"style": "STATIC"}, + "absoluteMaxStack": 1, + "palette": [ + {"block": "minecraft:grass"}, + {"block": "minecraft:azalea_leaves"}, + {"block": "minecraft:azalea"}, + {"block": "minecraft:flowering_azalea"}, + {"block": "minecraft:flowering_azalea_leaves"} + ] + }, + { + "partOf": "CEILING", + "chance": 0.05, + "absoluteMaxStack": 30, + "scaleStack": true, + "stackMin": 4, + "stackMax": 25, + "topPalette": [ + {"block": "minecraft:cave_vines"}, + {"block": "minecraft:spore_blossom"}, + { + "block": "minecraft:cave_vines", + "data": {"berries": "true"} + } ], - "palette": [ - { "block": "minecraft:cave_vines_plant", "data": { "berries": false } }, - { "block": "minecraft:cave_vines_plant", "data": { "berries": true } } - ] - }, - { - "partOf": "CEILING", - "chance": 0.03, - "stackMin": 1, - "stackMax": 1, - "palette": [{ "block": "minecraft:glow_lichen" }] - } - ] + "palette": [ + { + "block": "minecraft:cave_vines_plant", + "data": {"berries": false} + }, + { + "block": "minecraft:cave_vines_plant", + "data": {"berries": true} + } + ] + }, + { + "partOf": "CEILING", + "chance": 0.03, + "stackMin": 1, + "stackMax": 1, + "palette": [{"block": "minecraft:glow_lichen"}] + } + ] } diff --git a/biomes/mesa/mesa.json b/biomes/mesa/mesa.json index 14a87a12..ea233264 100644 --- a/biomes/mesa/mesa.json +++ b/biomes/mesa/mesa.json @@ -21,15 +21,17 @@ "mesa/blue" ], "generators": [ - { + { "min": 50, "max": 70, "generator": "highplains" - },{ - "min": 90, - "max": 130, - "generator": "highplains" - }], + }, + { + "min": 90, + "max": 130, + "generator": "highplains" + } + ], "layers": [ { "style": {"style": "IRIS"}, @@ -107,7 +109,7 @@ "palette": [{"block": "minecraft:terracotta"}] }, { - "minHeight": 2, + "minHeight": 2, "maxHeight": 3, "style": {"style": "STATIC"}, "palette": [ @@ -133,7 +135,6 @@ } ], "childStyle": { - "style": "NOWHERE_CELLULAR", "zoom": 1.2, "exponent": 1.3 diff --git a/biomes/ocean/deep.json b/biomes/ocean/deep.json index cf1b2529..215b9032 100644 --- a/biomes/ocean/deep.json +++ b/biomes/ocean/deep.json @@ -93,17 +93,11 @@ "structures/shipgenericc" ], "chance": 0.001, - "markers": [ - { - "mark": [ - { - "block": "minecraft:spruce_planks" - } - ], - "maximumMarkers": 5, - "marker": "skelepirate" - } - ], + "markers": [{ + "mark": [{"block": "minecraft:spruce_planks"}], + "maximumMarkers": 5, + "marker": "skelepirate" + }], "onwater": true, "translate": {"y": -1}, "waterloggable": true diff --git a/biomes/ocean/warm-bottom.json b/biomes/ocean/warm-bottom.json index 3016b789..dbc81895 100644 --- a/biomes/ocean/warm-bottom.json +++ b/biomes/ocean/warm-bottom.json @@ -200,17 +200,11 @@ "structures/shipgenericu", "structures/shipgenericc" ], - "markers": [ - { - "mark": [ - { - "block": "minecraft:spruce_planks" - } - ], - "maximumMarkers": 5, - "marker": "skelepirate" - } - ], + "markers": [{ + "mark": [{"block": "minecraft:spruce_planks"}], + "maximumMarkers": 5, + "marker": "skelepirate" + }], "chance": 0.005, "onwater": true, "translate": {"y": -1}, diff --git a/biomes/ocean/warm.json b/biomes/ocean/warm.json index 088bfa36..1d33c300 100644 --- a/biomes/ocean/warm.json +++ b/biomes/ocean/warm.json @@ -166,17 +166,11 @@ "structures/shipgenericu", "structures/shipgenericc" ], - "markers": [ - { - "mark": [ - { - "block": "minecraft:spruce_planks" - } - ], - "maximumMarkers": 5, - "marker": "skelepirate" - } - ], + "markers": [{ + "mark": [{"block": "minecraft:spruce_planks"}], + "maximumMarkers": 5, + "marker": "skelepirate" + }], "chance": 0.005, "onwater": true, "translate": {"y": -1}, diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 8d5f25b7..618cdde7 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -9,7 +9,7 @@ "generator": "plain" }], "rarity": 2, - "color":"#96EB73", + "color": "#96EB73", "biomeZoom": 50, "layers": [ { diff --git a/biomes/tropical/sea/river-soft.json b/biomes/tropical/sea/river-soft.json index 91685920..42a463c1 100644 --- a/biomes/tropical/sea/river-soft.json +++ b/biomes/tropical/sea/river-soft.json @@ -179,17 +179,11 @@ "structures/shipgenericu", "structures/shipgenericc" ], - "markers": [ - { - "mark": [ - { - "block": "minecraft:spruce_planks" - } - ], - "maximumMarkers": 5, - "marker": "skelepirate" - } - ], + "markers": [{ + "mark": [{"block": "minecraft:spruce_planks"}], + "maximumMarkers": 5, + "marker": "skelepirate" + }], "chance": 0.003, "onwater": true, "translate": {"y": -1}, diff --git a/biomes/tropical/sea/river-steep.json b/biomes/tropical/sea/river-steep.json index 9baeccf2..ade440e1 100644 --- a/biomes/tropical/sea/river-steep.json +++ b/biomes/tropical/sea/river-steep.json @@ -138,17 +138,12 @@ "structures/shipgenericr", "structures/shipgenericu", "structures/shipgenericc" - ],"markers": [ - { - "mark": [ - { - "block": "minecraft:spruce_planks" - } - ], - "maximumMarkers": 5, - "marker": "skelepirate" - } ], + "markers": [{ + "mark": [{"block": "minecraft:spruce_planks"}], + "maximumMarkers": 5, + "marker": "skelepirate" + }], "chance": 0.005, "onwater": true, "translate": {"y": -1}, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 53a29abe..f53853df 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -1,275 +1,272 @@ { - "version": 2023, - "name": "Overworld", - "environment": "NORMAL", - "fluidHeight": 75, - "continentZoom": 1, - "continentalStyle": { - "style": "NOWHERE_CELLULAR", - "zoom": 5 - }, - "landChance": 0.69, - "regionStyle": { - "style": "NOWHERE_CELLULAR", - "fracture": { - "multiplier": 55, - "axialFracturing": true, - "style": "NOWHERE", - "zoom": 0.15, - "fracture": { - "axialFracturing": true, - "style": "STATIC", - "multiplier": 4 - } - } - }, - "regionZoom": 6.15, - "regions": [ - "mushroom", - "swamp", - "frozen", - "tundra", - "temperate", - "tropical", - "hot" - - ], - "carving": { - "caves": [ - { - "breakSurface": true, - "cave": "deep/main", - "rarity": 30, - "caveStartHeight": { - "max": 90, - "min": 12, - "style": { "style": "STATIC" } + "version": 2023, + "name": "Overworld", + "environment": "NORMAL", + "fluidHeight": 75, + "continentZoom": 1, + "continentalStyle": { + "style": "NOWHERE_CELLULAR", + "zoom": 5 + }, + "landChance": 0.69, + "regionStyle": { + "style": "NOWHERE_CELLULAR", + "fracture": { + "multiplier": 55, + "axialFracturing": true, + "style": "NOWHERE", + "zoom": 0.15, + "fracture": { + "axialFracturing": true, + "style": "STATIC", + "multiplier": 4 + } } - }, - { - "cave": "lush/main", - "rarity": 50, - "breakSurface": false, - "caveStartHeight": { - "max": 60, - "min": 7, - "style": { - "style": "STATIC" - } - } - }, - { - "breakSurface": false, - "cave": "deep/elongated", - "rarity": 27, - "caveStartHeight": { - "max": 90, - "min": 12, - "style": { "style": "STATIC" } - } - } - ] - }, - "islandBiomeChanceStyle": { - "style": "NOWHERE_CELLULAR", - "axialFracturing": true, - "fracture": { - "multiplier": 55, - "axialFracturing": true, - "style": "NOWHERE", - "zoom": 0.15, - "fracture": { - "axialFracturing": true, - "style": "STATIC", - "multiplier": 4 - } - } - }, - "treeSettings": { - "enabled": true, - "mode": "FIRST" - }, - "seaZoom": 1.25, - "seaBiomeStyle": { "style": "FRACTAL_FBM_IRIS" }, - "landZoom": 3.2, - "landBiomeStyle": { - "style": "NOWHERE_CELLULAR", - "axialFracturing": true, - "fracture": { - "multiplier": 55, - "axialFracturing": true, - "style": "NOWHERE", - "zoom": 0.15, - "fracture": { - "axialFracturing": true, - "style": "STATIC", - "multiplier": 4 - } - } - }, - "shoreBiomeStyle": { "style": "NOWHERE_CELLULAR" }, - "lootTries": 32, - "loot": { "tables": ["global-treasure", "global-tools", "global-clutter"] }, - "deposits": [ - { - "minHeight": 19, - "maxPerChunk": 4, - "maxHeight": 150, - "minPerChunk": 1, - "minSize": 25, - "maxSize": 25, - "palette": [{ "block": "minecraft:granite" }], - "varience": 2 }, - { - "minHeight": 19, - "maxPerChunk": 4, - "maxHeight": 150, - "minPerChunk": 1, - "minSize": 25, - "maxSize": 25, - "palette": [{ "block": "minecraft:andesite" }], - "varience": 2 - }, - { - "minHeight": 19, - "maxPerChunk": 4, - "maxHeight": 150, - "minPerChunk": 1, - "minSize": 25, - "maxSize": 25, - "palette": [{ "block": "minecraft:diorite" }], - "varience": 2 - }, - { - "minHeight": 19, - "maxPerChunk": 4, - "maxHeight": 150, - "minPerChunk": 1, - "minSize": 25, - "maxSize": 25, - "palette": [{ "block": "minecraft:gravel" }], - "varience": 2 - }, - { - "minHeight": 5, - "maxPerChunk": 128, - "maxHeight": 13, - "minPerChunk": 128, - "minSize": 8, - "maxSize": 4, - "palette": [{ "block": "minecraft:deepslate" }], - "varience": 4 - }, - { - "minHeight": 5, - "maxPerChunk": 5, - "maxHeight": 15, - "minPerChunk": 5, - "minSize": 8, - "maxSize": 4, - "palette": [ - { "block": "minecraft:deepslate_copper_ore" }, - { "block": "minecraft:deepslate_diamond_ore" }, - { "block": "minecraft:deepslate_emerald_ore" }, - { "block": "minecraft:deepslate_gold_ore" }, - { "block": "minecraft:deepslate_iron_ore" }, - { "block": "minecraft:deepslate_coal_ore" }, - { "block": "minecraft:deepslate_redstone_ore" }, - { "block": "minecraft:deepslate_lapis_ore" } - ], - "varience": 4 - }, - { - "minHeight": 2, - "maxPerChunk": 3, - "maxHeight": 22, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 6, - "palette": [{ "block": "minecraft:diamond_ore" }], - "varience": 5 - }, - { - "minHeight": 4, - "maxPerChunk": 11, - "maxHeight": 40, - "minPerChunk": 5, - "minSize": 6, - "maxSize": 10, - "palette": [ + "regionZoom": 6.15, + "regions": [ + "mushroom", + "swamp", + "frozen", + "tundra", + "temperate", + "tropical", + "hot" + ], + "carving": {"caves": [ { - "data": { "lit": false }, - "block": "minecraft:redstone_ore" + "breakSurface": true, + "cave": "deep/main", + "rarity": 30, + "caveStartHeight": { + "max": 90, + "min": 12, + "style": {"style": "STATIC"} + } + }, + { + "cave": "lush/main", + "rarity": 50, + "breakSurface": false, + "caveStartHeight": { + "max": 60, + "min": 7, + "style": {"style": "STATIC"} + } + }, + { + "breakSurface": false, + "cave": "deep/elongated", + "rarity": 27, + "caveStartHeight": { + "max": 90, + "min": 12, + "style": {"style": "STATIC"} + } + } + ]}, + "islandBiomeChanceStyle": { + "style": "NOWHERE_CELLULAR", + "axialFracturing": true, + "fracture": { + "multiplier": 55, + "axialFracturing": true, + "style": "NOWHERE", + "zoom": 0.15, + "fracture": { + "axialFracturing": true, + "style": "STATIC", + "multiplier": 4 + } } - ], - "varience": 7 }, - { - "minHeight": 1, - "maxPerChunk": 7, - "maxHeight": 67, - "minPerChunk": 3, - "minSize": 3, - "maxSize": 5, - "palette": [{ "block": "minecraft:gold_ore" }], - "varience": 3 + "treeSettings": { + "enabled": true, + "mode": "FIRST" }, - { - "minHeight": 1, - "maxPerChunk": 8, - "maxHeight": 29, - "minPerChunk": 4, - "minSize": 3, - "maxSize": 8, - "palette": [{ "block": "minecraft:lapis_ore" }], - "varience": 5 + "seaZoom": 1.25, + "seaBiomeStyle": {"style": "FRACTAL_FBM_IRIS"}, + "landZoom": 3.2, + "landBiomeStyle": { + "style": "NOWHERE_CELLULAR", + "axialFracturing": true, + "fracture": { + "multiplier": 55, + "axialFracturing": true, + "style": "NOWHERE", + "zoom": 0.15, + "fracture": { + "axialFracturing": true, + "style": "STATIC", + "multiplier": 4 + } + } }, - { - "minHeight": 1, - "maxPerChunk": 18, - "maxHeight": 120, - "minPerChunk": 16, - "minSize": 4, - "maxSize": 8, - "palette": [{ "block": "minecraft:iron_ore" }], - "varience": 7 - }, - { - "minHeight": 1, - "maxPerChunk": 18, - "maxHeight": 64, - "minPerChunk": 9, - "minSize": 4, - "maxSize": 9, - "palette": [{ "block": "minecraft:copper_ore" }], - "varience": 7 - }, - { - "minHeight": 1, - "maxPerChunk": 18, - "maxHeight": 175, - "minPerChunk": 20, - "minSize": 6, - "maxSize": 10, - "palette": [{ "block": "minecraft:coal_ore" }], - "varience": 9 - } - ], - "caveBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" }, - "aggressiveBiomeReshuffle": true, - "coordFractureDistance": 926, - "coordFractureZoom": 0.15, - "preventLeafDecay": true, - "noiseModificationFromFeatures": false, - "postProcessCaves": true, - "postProcessing": true, - "useMantle": true, - "terrainZoom": 1, - "stronghold": "stronghold", - "strongholdJumpDistance": 670, - "maxStrongholds": 27, - "decorate": true, - "skylandBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" }, - "islandBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" } + "shoreBiomeStyle": {"style": "NOWHERE_CELLULAR"}, + "lootTries": 32, + "loot": {"tables": [ + "global-treasure", + "global-tools", + "global-clutter" + ]}, + "deposits": [ + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [{"block": "minecraft:granite"}], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [{"block": "minecraft:andesite"}], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [{"block": "minecraft:diorite"}], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 25, + "maxSize": 25, + "palette": [{"block": "minecraft:gravel"}], + "varience": 2 + }, + { + "minHeight": 5, + "maxPerChunk": 128, + "maxHeight": 13, + "minPerChunk": 128, + "minSize": 8, + "maxSize": 4, + "palette": [{"block": "minecraft:deepslate"}], + "varience": 4 + }, + { + "minHeight": 5, + "maxPerChunk": 5, + "maxHeight": 15, + "minPerChunk": 5, + "minSize": 8, + "maxSize": 4, + "palette": [ + {"block": "minecraft:deepslate_copper_ore"}, + {"block": "minecraft:deepslate_diamond_ore"}, + {"block": "minecraft:deepslate_emerald_ore"}, + {"block": "minecraft:deepslate_gold_ore"}, + {"block": "minecraft:deepslate_iron_ore"}, + {"block": "minecraft:deepslate_coal_ore"}, + {"block": "minecraft:deepslate_redstone_ore"}, + {"block": "minecraft:deepslate_lapis_ore"} + ], + "varience": 4 + }, + { + "minHeight": 2, + "maxPerChunk": 3, + "maxHeight": 22, + "minPerChunk": 1, + "minSize": 3, + "maxSize": 6, + "palette": [{"block": "minecraft:diamond_ore"}], + "varience": 5 + }, + { + "minHeight": 4, + "maxPerChunk": 11, + "maxHeight": 40, + "minPerChunk": 5, + "minSize": 6, + "maxSize": 10, + "palette": [{ + "data": {"lit": false}, + "block": "minecraft:redstone_ore" + }], + "varience": 7 + }, + { + "minHeight": 1, + "maxPerChunk": 7, + "maxHeight": 67, + "minPerChunk": 3, + "minSize": 3, + "maxSize": 5, + "palette": [{"block": "minecraft:gold_ore"}], + "varience": 3 + }, + { + "minHeight": 1, + "maxPerChunk": 8, + "maxHeight": 29, + "minPerChunk": 4, + "minSize": 3, + "maxSize": 8, + "palette": [{"block": "minecraft:lapis_ore"}], + "varience": 5 + }, + { + "minHeight": 1, + "maxPerChunk": 18, + "maxHeight": 120, + "minPerChunk": 16, + "minSize": 4, + "maxSize": 8, + "palette": [{"block": "minecraft:iron_ore"}], + "varience": 7 + }, + { + "minHeight": 1, + "maxPerChunk": 18, + "maxHeight": 64, + "minPerChunk": 9, + "minSize": 4, + "maxSize": 9, + "palette": [{"block": "minecraft:copper_ore"}], + "varience": 7 + }, + { + "minHeight": 1, + "maxPerChunk": 18, + "maxHeight": 175, + "minPerChunk": 20, + "minSize": 6, + "maxSize": 10, + "palette": [{"block": "minecraft:coal_ore"}], + "varience": 9 + } + ], + "caveBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, + "aggressiveBiomeReshuffle": true, + "coordFractureDistance": 926, + "coordFractureZoom": 0.15, + "preventLeafDecay": true, + "noiseModificationFromFeatures": false, + "postProcessCaves": true, + "postProcessing": true, + "useMantle": true, + "terrainZoom": 1, + "stronghold": "stronghold", + "strongholdJumpDistance": 670, + "maxStrongholds": 27, + "decorate": true, + "skylandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"}, + "islandBiomeStyle": {"style": "CELLULAR_IRIS_DOUBLE"} } diff --git a/entities/standard/hostile/drowned.json b/entities/standard/hostile/drowned.json index acf50d1c..2d8f7158 100644 --- a/entities/standard/hostile/drowned.json +++ b/entities/standard/hostile/drowned.json @@ -1,3 +1 @@ -{ - "type": "DROWNED" - } +{"type": "DROWNED"} diff --git a/entities/standard/hostile/enderman.json b/entities/standard/hostile/enderman.json index 4833c68d..499f1968 100644 --- a/entities/standard/hostile/enderman.json +++ b/entities/standard/hostile/enderman.json @@ -1,3 +1 @@ -{ - "type": "ENDERMAN" -} +{"type": "ENDERMAN"} diff --git a/entities/standard/hostile/skeleton.json b/entities/standard/hostile/skeleton.json index 4b3f6561..2366670e 100644 --- a/entities/standard/hostile/skeleton.json +++ b/entities/standard/hostile/skeleton.json @@ -1,3 +1 @@ -{ - "type": "SKELETON" -} +{"type": "SKELETON"} diff --git a/entities/standard/hostile/slime.json b/entities/standard/hostile/slime.json index 27395655..a7210345 100644 --- a/entities/standard/hostile/slime.json +++ b/entities/standard/hostile/slime.json @@ -1,3 +1 @@ -{ - "type": "SLIME" -} +{"type": "SLIME"} diff --git a/entities/standard/hostile/spider.json b/entities/standard/hostile/spider.json index 9433e2e7..27f3a4a3 100644 --- a/entities/standard/hostile/spider.json +++ b/entities/standard/hostile/spider.json @@ -1,3 +1 @@ -{ - "type": "SPIDER" -} +{"type": "SPIDER"} diff --git a/entities/standard/hostile/zombie.json b/entities/standard/hostile/zombie.json index cc8144c5..f0b95021 100644 --- a/entities/standard/hostile/zombie.json +++ b/entities/standard/hostile/zombie.json @@ -1,3 +1 @@ -{ - "type": "ZOMBIE" -} +{"type": "ZOMBIE"} diff --git a/entities/unique/aeternum.json b/entities/unique/aeternum.json index 97d6370b..f5371701 100644 --- a/entities/unique/aeternum.json +++ b/entities/unique/aeternum.json @@ -1,3 +1 @@ -{ - "type": "PARROT" -} +{"type": "PARROT"} diff --git a/entities/unique/dan.json b/entities/unique/dan.json index 0af2deb9..d83d7b94 100644 --- a/entities/unique/dan.json +++ b/entities/unique/dan.json @@ -1,3 +1 @@ -{ - "type": "VEX" -} +{"type": "VEX"} diff --git a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json index 654250ba..72769ef1 100644 --- a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json +++ b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json @@ -1,21 +1,15 @@ { "connectors": [], "placementOptions": { - "markers": [ - { - "emptyAbove": true, - "mark": [ - { - "block": "minecraft:cobblestone" - }, - { - "block": "minecraft:mossy_cobblestone" - } - ], - "marker": "dank", - "maximumMarkers": 9 - } - ], + "markers": [{ + "emptyAbove": true, + "mark": [ + {"block": "minecraft:cobblestone"}, + {"block": "minecraft:mossy_cobblestone"} + ], + "marker": "dank", + "maximumMarkers": 9 + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/base_plate.json b/jigsaw-pieces/pillager_outpost/base_plate.json index 4fc3c445..c5b68bab 100644 --- a/jigsaw-pieces/pillager_outpost/base_plate.json +++ b/jigsaw-pieces/pillager_outpost/base_plate.json @@ -71,18 +71,13 @@ "direction": "NORTH_NEGATIVE_Z" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "pillager" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "pillager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/feature_plate.json b/jigsaw-pieces/pillager_outpost/feature_plate.json index 64189573..59cce637 100644 --- a/jigsaw-pieces/pillager_outpost/feature_plate.json +++ b/jigsaw-pieces/pillager_outpost/feature_plate.json @@ -27,18 +27,13 @@ "direction": "EAST_POSITIVE_X" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "pillager" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "pillager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/overgrown/cage.json b/jigsaw-pieces/pillager_outpost/overgrown/cage.json index 6e884024..1adee0c9 100644 --- a/jigsaw-pieces/pillager_outpost/overgrown/cage.json +++ b/jigsaw-pieces/pillager_outpost/overgrown/cage.json @@ -122,18 +122,13 @@ "direction": "EAST_POSITIVE_X" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "place": [], "rotation": { "enabled": true, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json index 9aec2a76..4cf83e1a 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json @@ -77,18 +77,13 @@ "direction": "UP_POSITIVE_Y" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "place": [], "rotation": { "enabled": true, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json index cb474eb8..f2435e02 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json @@ -71,18 +71,13 @@ "direction": "UP_POSITIVE_Y" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_logs.json b/jigsaw-pieces/pillager_outpost/regular/feature_logs.json index 89ba74ff..ee236a5c 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_logs.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_logs.json @@ -53,18 +53,13 @@ "direction": "SOUTH_POSITIVE_Z" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_targets.json b/jigsaw-pieces/pillager_outpost/regular/feature_targets.json index 94556cf5..75ee242e 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_targets.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_targets.json @@ -66,18 +66,13 @@ "direction": "SOUTH_POSITIVE_Z" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json b/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json index 059fc16d..c1b2e61d 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json @@ -53,18 +53,13 @@ "direction": "SOUTH_POSITIVE_Z" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json b/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json index b7b20db2..8a21d76f 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json @@ -53,18 +53,13 @@ "direction": "SOUTH_POSITIVE_Z" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "igolem" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 1, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "igolem" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/watchtower.json b/jigsaw-pieces/pillager_outpost/watchtower.json index c02e5e62..c0add7ea 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower.json +++ b/jigsaw-pieces/pillager_outpost/watchtower.json @@ -253,18 +253,13 @@ "direction": "UP_POSITIVE_Y" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 3, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "pillager" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 3, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "pillager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json index 15e3f98d..d4473f00 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json +++ b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json @@ -121,18 +121,13 @@ "direction": "WEST_NEGATIVE_X" } ], - "placementOptions": {"markers": [ - { - "emptyAbove": true, - "maximumMarkers": 3, - "mark": [ - { - "block": "minecraft:birch_planks" - } - ], - "marker": "pillager" - } - ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 3, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "pillager" + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pyramid-desert.json b/jigsaw-pieces/pyramid-desert.json index 069939d8..020b8903 100644 --- a/jigsaw-pieces/pyramid-desert.json +++ b/jigsaw-pieces/pyramid-desert.json @@ -1,27 +1,17 @@ { "connectors": [], "placementOptions": { - "markers": [ - { - "emptyAbove": true, - "mark": [ - { - "block": "minecraft:sandstone" - }, - { - "block": "minecraft:cut_sandstone" - }, - { - "block": "minecraft:cut_red_sandstone" - }, - { - "block": "minecraft:red_sandstone" - } - ], - "marker": "dank", - "maximumMarkers": 9 - } - ], + "markers": [{ + "emptyAbove": true, + "mark": [ + {"block": "minecraft:sandstone"}, + {"block": "minecraft:cut_sandstone"}, + {"block": "minecraft:cut_red_sandstone"}, + {"block": "minecraft:red_sandstone"} + ], + "marker": "dank", + "maximumMarkers": 9 + }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json index 78bbb1b2..1c2f5254 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json index ba5dc613..bf4df5ed 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json @@ -13,7 +13,7 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json index a9810fc4..c6886d48 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json index 020346be..551d48d0 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json index 131acc48..6b026583 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json @@ -67,7 +67,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json index efda98f9..68d8b47c 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json @@ -13,7 +13,7 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json index 8186a127..95f60e00 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json index be9a0d73..3ff284e5 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json index 2e37b541..408b3bd3 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json @@ -54,7 +54,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json index 71abf15a..7e5a2531 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json @@ -13,7 +13,7 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json index db6a28f9..c6219219 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json index f5251297..564d60f1 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json index a578d16c..6102e9bf 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -67,7 +67,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json index c86a8489..60d7e3d4 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json index f7a5c215..c20962eb 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json index 97ce46da..b2cb8b43 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json index 33f35b23..0e8ed05e 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json index 35a4ddbe..6e00d5ef 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json index 7ea34218..09915f31 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json index 54a1165f..4b9389d9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json index 3bc874c5..c73973e3 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json index bc395d59..e4f1d915 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json @@ -13,7 +13,7 @@ "direction": "WEST_NEGATIVE_X" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json index 972caa78..15e5dfa9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json @@ -13,7 +13,7 @@ "direction": "SOUTH_POSITIVE_Z" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json index 473a72b4..1e7320e4 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json @@ -41,7 +41,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json index 49f971ab..28c27057 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json @@ -13,7 +13,7 @@ "direction": "NORTH_NEGATIVE_Z" }], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json index 34b551a4..c77ac198 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json @@ -28,7 +28,7 @@ } ], "placementOptions": { - "markers": [{ + "markers": [{ "emptyAbove": true, "maximumMarkers": 1, "mark": [ diff --git a/markers/pillager.json b/markers/pillager.json index 79ad2f75..41540c23 100644 --- a/markers/pillager.json +++ b/markers/pillager.json @@ -1,4 +1,7 @@ { "removeOnChange": true, - "spawners": ["pillager", "pillager-respawn"] + "spawners": [ + "pillager", + "pillager-respawn" + ] } diff --git a/regions/frozen.json b/regions/frozen.json index 95b947e8..09056563 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -1,297 +1,277 @@ { - "name": "Frozen", - "color": "#44C3D1", - "landBiomes": [ - "frozen/plains", - "frozen/pines", - "frozen/plains", - "frozen/mountain", - "frozen/redwood-forest", - "frozen/hills", - "frozen/pine-plains", - "frozen/spruce-plains" - ], - "shoreBiomes": ["frozen/shore/beach"], - "seaBiomes": ["frozen/sea/frozen-river-ice", "frozen/sea/ocean"], - "riverBiomes": ["frozen/sea/frozen-river-ice", "frozen/sea/ocean"], - "jigsawStructures": [ - { - "structure": "murky_stronghold", - "rarity": 250 - } - ], - "spotBiomes": [ - { - "biome": "frozen/vander", - "scale": 25, - "type": "LAND", - "shuffle": 328, - "rarity": 3 - } - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "NOWHERE", - "zoom": 5 - } - }, - "deposits": [ - { - "minHeight": 8, - "maxPerChunk": 2, - "maxHeight": 20, - "minPerChunk": 1, - "minSize": 2, - "maxSize": 4, - "palette": [{ "block": "minecraft:diamond_ore" }], - "varience": 4 - }, - { - "minHeight": 1, - "maxPerChunk": 2, - "maxHeight": 64, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 8, - "palette": [{ "block": "minecraft:copper_ore" }], - "varience": 8 - } - ], - "biomeImplosionRatio": 0.25, - "riverRarity": 1, - "landBiomeZoom": 5, - "shoreHeightMin": 2.2, - "shoreHeightMax": 4.2, - "loot": { - "mode": "ADD", - "multiplier": 1, - "tables": [ - "global-tools", - "frozen-clutter", - "frozen-food", - "snow-clutter", - "cold-treasure" - ] - }, - "blockDrops": [ - { - "blocks": [{ "block": "minecraft: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, - "style": { - "style": "SIMPLEX", - "multiplier": 10 - }, - "offsetY": 5 - }, - "chance": 0.05, - "bottom": true, - "density": 1, - "place": [ - "structures/amethyst1", - "structures/amethyst2", - "structures/amethyst3", - "structures/amethyst4", - "structures/amethyst5", - "structures/amethyst6" - ], - "edit": [ - { - "find": [{ "block": "minecraft:glass" }], - "replace": { "palette": [{ "block": "minecraft:void_air" }] } - } - ], - "enabled": true, - "xAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "yAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "translate": { - "yRandom": 10, - "y": 2 - } - }, - { - "name": "standard-surface-portals", - "chance": 0.001, - "place": [ - "structures/giantportal1", - "structures/giantportal2", - "structures/giantportal3", - "structures/portal1", - "structures/portal2", - "structures/portal3", - "structures/portal4", - "structures/portal5", - "structures/portal6", - "structures/portal7", - "structures/portal8", - "structures/portal9", - "structures/portal10" - ], - "edit": [ - { - "find": [{ "block": "minecraft:gold_block" }], - "replace": { "palette": [{ "block": "minecraft:air" }] }, - "chance": 0.1 - }, - { - "find": [{ "block": "minecraft:netherrack" }], - "replace": { "palette": [{ "block": "minecraft:magma_block" }] }, - "chance": 0.07 - }, - { - "find": [{ "block": "minecraft:obsidian" }], - "replace": { "palette": [{ "block": "minecraft:crying_obsidian" }] }, - "chance": 0.15 - }, - { - "find": [{ "block": "minecraft:lava" }], - "replace": { "palette": [{ "block": "minecraft:magma_block" }] }, - "chance": 0.2 - } - ], - "mode": "FAST_MIN_HEIGHT", - "carvingSupport": "SURFACE_ONLY" - } - ], - "carving": { - "ravines": [ - { - "rarity": 150, - "ravine": "ice/main" - } + "name": "Frozen", + "color": "#44C3D1", + "landBiomes": [ + "frozen/plains", + "frozen/pines", + "frozen/plains", + "frozen/mountain", + "frozen/redwood-forest", + "frozen/hills", + "frozen/pine-plains", + "frozen/spruce-plains" ], - "caves": [ - { - "breakSurface": true, - "cave": "ice/main", - "rarity": 22, - "caveStartHeight": { - "max": 200, - "min": 15, - "style": { "style": "VASCULAR" } + "shoreBiomes": ["frozen/shore/beach"], + "seaBiomes": [ + "frozen/sea/frozen-river-ice", + "frozen/sea/ocean" + ], + "riverBiomes": [ + "frozen/sea/frozen-river-ice", + "frozen/sea/ocean" + ], + "jigsawStructures": [{ + "structure": "murky_stronghold", + "rarity": 250 + }], + "spotBiomes": [{ + "biome": "frozen/vander", + "scale": 25, + "type": "LAND", + "shuffle": 328, + "rarity": 3 + }], + "riverStyle": { + "style": "VASCULAR", + "zoom": 4.77, + "fracture": { + "multiplier": 240, + "style": "NOWHERE", + "zoom": 5 } - } - ] - }, - "shoreHeightZoom": 1.14, - "riverThickness": 0.006, - "rarity": 1 + }, + "deposits": [ + { + "minHeight": 8, + "maxPerChunk": 2, + "maxHeight": 20, + "minPerChunk": 1, + "minSize": 2, + "maxSize": 4, + "palette": [{"block": "minecraft:diamond_ore"}], + "varience": 4 + }, + { + "minHeight": 1, + "maxPerChunk": 2, + "maxHeight": 64, + "minPerChunk": 1, + "minSize": 3, + "maxSize": 8, + "palette": [{"block": "minecraft:copper_ore"}], + "varience": 8 + } + ], + "biomeImplosionRatio": 0.25, + "riverRarity": 1, + "landBiomeZoom": 5, + "shoreHeightMin": 2.2, + "shoreHeightMax": 4.2, + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-tools", + "frozen-clutter", + "frozen-food", + "snow-clutter", + "cold-treasure" + ] + }, + "blockDrops": [{ + "blocks": [{"block": "minecraft: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, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 5 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "structures/amethyst1", + "structures/amethyst2", + "structures/amethyst3", + "structures/amethyst4", + "structures/amethyst5", + "structures/amethyst6" + ], + "edit": [{ + "find": [{"block": "minecraft:glass"}], + "replace": {"palette": [{"block": "minecraft:void_air"}]} + }], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": { + "yRandom": 10, + "y": 2 + } + }, + { + "name": "standard-surface-portals", + "chance": 0.001, + "place": [ + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" + ], + "edit": [ + { + "find": [{"block": "minecraft:gold_block"}], + "replace": {"palette": [{"block": "minecraft:air"}]}, + "chance": 0.1 + }, + { + "find": [{"block": "minecraft:netherrack"}], + "replace": {"palette": [{"block": "minecraft:magma_block"}]}, + "chance": 0.07 + }, + { + "find": [{"block": "minecraft:obsidian"}], + "replace": {"palette": [{"block": "minecraft:crying_obsidian"}]}, + "chance": 0.15 + }, + { + "find": [{"block": "minecraft:lava"}], + "replace": {"palette": [{"block": "minecraft:magma_block"}]}, + "chance": 0.2 + } + ], + "mode": "FAST_MIN_HEIGHT", + "carvingSupport": "SURFACE_ONLY" + } + ], + "carving": { + "ravines": [{ + "rarity": 150, + "ravine": "ice/main" + }], + "caves": [{ + "breakSurface": true, + "cave": "ice/main", + "rarity": 22, + "caveStartHeight": { + "max": 200, + "min": 15, + "style": {"style": "VASCULAR"} + } + }] + }, + "shoreHeightZoom": 1.14, + "riverThickness": 0.006, + "rarity": 1 } diff --git a/regions/mushroom.json b/regions/mushroom.json index 4ee3745d..ec87491d 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -1,7 +1,6 @@ { "name": "Mushroom", "color": "#F1C3EF", - "landBiomes": [ "mushroom/forest", "mushroom/crimson-forest", diff --git a/regions/temperate.json b/regions/temperate.json index 8521e381..6ceb4a16 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -41,8 +41,8 @@ "maxPerChunk": 13, "maxHeight": 200, "minPerChunk": 4, - "minSize": 3, - "maxSize": 8, + "minSize": 3, + "maxSize": 8, "palette": [ {"block": "minecraft:iron_ore"}, {"block": "minecraft:coal_ore"} diff --git a/regions/tropical.json b/regions/tropical.json index 5f863521..7f7b6488 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -91,11 +91,12 @@ "maxPerChunk": 4, "maxHeight": 52, "minPerChunk": 2, - "minSize": 3, - "maxSize": 8, + "minSize": 3, + "maxSize": 8, "palette": [ {"block": "minecraft:lapis_ore"}, - {"block": "minecraft:redstone_ore"}], + {"block": "minecraft:redstone_ore"} + ], "varience": 8 }], "entitySpawners": [ diff --git a/regions/tundra.json b/regions/tundra.json index 74e6fb0d..175a46a3 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -47,8 +47,8 @@ "maxPerChunk": 4, "maxHeight": 49, "minPerChunk": 2, - "minSize": 3, - "maxSize": 8, + "minSize": 3, + "maxSize": 8, "palette": [{"block": "minecraft:emerald_ore"}], "varience": 8 }], diff --git a/spawners/dank.json b/spawners/dank.json index aeaa12a2..8ba87c77 100644 --- a/spawners/dank.json +++ b/spawners/dank.json @@ -1,21 +1,21 @@ { "maximumRate": { "amount": 3, - "per": { - "minecraftDays": 3 - } + "per": {"minecraftDays": 3} }, "maxEntitiesPerChunk": 2, - "initialSpawns": [{ - "entity": "unique/brian", - "rarity": 15, - "maxSpawns": 2, - "minSpawns": 1 - },{ - "entity": "unique/skelepirate", - "rarity": 1, - "maxSpawns": 3, - "minSpawns": 1 - }] - -} \ No newline at end of file + "initialSpawns": [ + { + "entity": "unique/brian", + "rarity": 15, + "maxSpawns": 2, + "minSpawns": 1 + }, + { + "entity": "unique/skelepirate", + "rarity": 1, + "maxSpawns": 3, + "minSpawns": 1 + } + ] +} diff --git a/spawners/pillager.json b/spawners/pillager.json index eb527985..a7919460 100644 --- a/spawners/pillager.json +++ b/spawners/pillager.json @@ -1,14 +1,13 @@ { "maximumRate": { "amount": 3, - "per": { - "minecraftDays": 6 - } + "per": {"minecraftDays": 6} }, "maxEntitiesPerChunk": 2, "initialSpawns": [{ - "entity": "standard/hostile/pillager", - "rarity": 2, - "maxSpawns": 2, - "minSpawns": 1 -}]} + "entity": "standard/hostile/pillager", + "rarity": 2, + "maxSpawns": 2, + "minSpawns": 1 + }] +} diff --git a/spawners/skelepirate.json b/spawners/skelepirate.json index 741b6450..99b152a6 100644 --- a/spawners/skelepirate.json +++ b/spawners/skelepirate.json @@ -1,5 +1,4 @@ -{ - "initialSpawns": [{ +{"initialSpawns": [{ "entity": "unique/skelepirate", "rarity": 1, "maxSpawns": 3, diff --git a/spawners/villager.json b/spawners/villager.json index 86df5b26..942a87e2 100644 --- a/spawners/villager.json +++ b/spawners/villager.json @@ -1,21 +1,21 @@ { "maximumRate": { "amount": 3, - "per": { - "minecraftDays": 3 - } + "per": {"minecraftDays": 3} }, "maxEntitiesPerChunk": 2, - "initialSpawns": [{ - "entity": "unique/iron_golem", - "rarity": 15, - "maxSpawns": 2, - "minSpawns": 1 - },{ - "entity": "standard/passive/villager", - "rarity": 1, - "maxSpawns": 3, - "minSpawns": 1 - }] - -} \ No newline at end of file + "initialSpawns": [ + { + "entity": "unique/iron_golem", + "rarity": 15, + "maxSpawns": 2, + "minSpawns": 1 + }, + { + "entity": "standard/passive/villager", + "rarity": 1, + "maxSpawns": 3, + "minSpawns": 1 + } + ] +}