diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26bedad1..3656f9d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,3 +27,8 @@ jobs: git diff --color=always; exit 1; fi + - run: | + if zig build fmt -- --zon *.zon assets/*.zon assets/*/*.zon assets/*/*/*.zon assets/*/*/*/*.zon assets/*/*/*/*/*.zon assets/*/*/*/*/*/*.zon assets/*/*/*/*/*/*/*.zon assets/*/*/*/*/*/*/*/*.zon assets/*/*/*/*/*/*/*/*/*.zon assets/*/*/*/*/*/*/*/*/*/*.zon | grep -q . ; then + git diff --color=always; + exit 1; + fi diff --git a/assets/cubyz/biomes/cave/cave.zig.zon b/assets/cubyz/biomes/cave/cave.zig.zon index f880c638..83e852a5 100644 --- a/assets/cubyz/biomes/cave/cave.zig.zon +++ b/assets/cubyz/biomes/cave/cave.zig.zon @@ -7,8 +7,6 @@ .music = "cubyz:heart-of-the-beast", - - .structures = .{ .{ .id = "cubyz:ground_patch", diff --git a/assets/cubyz/biomes/cave/dropoff.zig.zon b/assets/cubyz/biomes/cave/dropoff.zig.zon index 613a832c..e75a3f11 100644 --- a/assets/cubyz/biomes/cave/dropoff.zig.zon +++ b/assets/cubyz/biomes/cave/dropoff.zig.zon @@ -9,6 +9,5 @@ .music = "cubyz:heart-of-the-beast", - .structures = .{ - }, + .structures = .{}, } diff --git a/assets/cubyz/biomes/cave/lava_cave.zig.zon b/assets/cubyz/biomes/cave/lava_cave.zig.zon index 6ed145f3..6a65490d 100644 --- a/assets/cubyz/biomes/cave/lava_cave.zig.zon +++ b/assets/cubyz/biomes/cave/lava_cave.zig.zon @@ -9,25 +9,25 @@ .stoneBlock = "cubyz:obsidian", .stripes = .{ .{ - .direction= .{4, 1, 3}, - .block= "cubyz:magma", - .distance= 16, - .offset= 5, - .width= 2, + .direction = .{4, 1, 3}, + .block = "cubyz:magma", + .distance = 16, + .offset = 5, + .width = 2, }, .{ - .direction= .{2, 2.5, 3}, - .block= "cubyz:magma", - .distance= 14, - .offset= 6, - .width= 1, + .direction = .{2, 2.5, 3}, + .block = "cubyz:magma", + .distance = 14, + .offset = 6, + .width = 1, }, .{ - .direction= .{3, 4, 2}, - .block= "cubyz:magma", - .distance= 14, - .offset= 7, - .width= 1, + .direction = .{3, 4, 2}, + .block = "cubyz:magma", + .distance = 14, + .offset = 7, + .width = 1, }, }, .structures = .{ diff --git a/assets/cubyz/biomes/cave/void/void.zig.zon b/assets/cubyz/biomes/cave/void/void.zig.zon index 5f3e3afe..8ee28d88 100644 --- a/assets/cubyz/biomes/cave/void/void.zig.zon +++ b/assets/cubyz/biomes/cave/void/void.zig.zon @@ -8,6 +8,5 @@ .caves = 1, .music = "cubyz:heart-of-the-beast", - .structures = .{ - }, + .structures = .{}, } diff --git a/assets/cubyz/biomes/decorative/stone_pit.zig.zon b/assets/cubyz/biomes/decorative/stone_pit.zig.zon index 3a616826..c8bd086a 100644 --- a/assets/cubyz/biomes/decorative/stone_pit.zig.zon +++ b/assets/cubyz/biomes/decorative/stone_pit.zig.zon @@ -1,8 +1,7 @@ .{ - .properties = .{ - }, + .properties = .{}, .radius = 16, - .chance = 0 + .chance = 0, .minHeight = 2, .maxHeight = 10, .roughness = 1, diff --git a/assets/cubyz/biomes/decorative/stone_rock.zig.zon b/assets/cubyz/biomes/decorative/stone_rock.zig.zon index b0b00c29..9145c02d 100644 --- a/assets/cubyz/biomes/decorative/stone_rock.zig.zon +++ b/assets/cubyz/biomes/decorative/stone_rock.zig.zon @@ -1,8 +1,7 @@ .{ - .properties = .{ - }, + .properties = .{}, .radius = 16, - .chance = 0 + .chance = 0, .minHeight = 50, .maxHeight = 80, .roughness = 1, diff --git a/assets/cubyz/biomes/forest/base.zig.zon b/assets/cubyz/biomes/forest/base.zig.zon index 23f90d9b..624e582c 100644 --- a/assets/cubyz/biomes/forest/base.zig.zon +++ b/assets/cubyz/biomes/forest/base.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .minHeight = 22, .maxHeight = 40, .minRadius = 256, diff --git a/assets/cubyz/biomes/forest/birch.zig.zon b/assets/cubyz/biomes/forest/birch.zig.zon index 523bcf9f..06fbb7a7 100644 --- a/assets/cubyz/biomes/forest/birch.zig.zon +++ b/assets/cubyz/biomes/forest/birch.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .minHeight = 20, .maxHeight = 48, .minRadius = 200, diff --git a/assets/cubyz/biomes/forest/chopped.zig.zon b/assets/cubyz/biomes/forest/chopped.zig.zon index dc68353d..1703ef1f 100644 --- a/assets/cubyz/biomes/forest/chopped.zig.zon +++ b/assets/cubyz/biomes/forest/chopped.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .minHeight = 22, .maxHeight = 40, .minRadius = 64, diff --git a/assets/cubyz/biomes/forest/clearing.zig.zon b/assets/cubyz/biomes/forest/clearing.zig.zon index 86a71c7d..49d0733e 100644 --- a/assets/cubyz/biomes/forest/clearing.zig.zon +++ b/assets/cubyz/biomes/forest/clearing.zig.zon @@ -1,7 +1,6 @@ .{ .chance = 0, - .properties = .{ - }, + .properties = .{}, .radius = 32, .minHeight = 22, .maxHeight = 40, diff --git a/assets/cubyz/biomes/forest/thin_birch.zig.zon b/assets/cubyz/biomes/forest/thin_birch.zig.zon index 14731d49..7026dd58 100644 --- a/assets/cubyz/biomes/forest/thin_birch.zig.zon +++ b/assets/cubyz/biomes/forest/thin_birch.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .minHeight = 20, .maxHeight = 24, .minRadius = 200, diff --git a/assets/cubyz/biomes/glass_forest.zig.zon b/assets/cubyz/biomes/glass_forest.zig.zon index 897ef407..17748122 100644 --- a/assets/cubyz/biomes/glass_forest.zig.zon +++ b/assets/cubyz/biomes/glass_forest.zig.zon @@ -1,7 +1,6 @@ .{ .chance = 0.02, - .properties = .{ - }, + .properties = .{}, .minHeight = 22, .maxHeight = 40, @@ -12,14 +11,13 @@ .validPlayerSpawn = false, - .ground_structure = .{ - }, + .ground_structure = .{}, .structures = .{ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/aqua", - .log = "cubyz:chalk/aqua", - .top = "cubyz:chalk/aqua", + .log = "cubyz:chalk/aqua", + .top = "cubyz:chalk/aqua", .chance = 0.008, .type = .round, .height = 10, @@ -30,8 +28,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/black", - .log = "cubyz:chalk/black", - .top = "cubyz:chalk/black", + .log = "cubyz:chalk/black", + .top = "cubyz:chalk/black", .chance = 0.008, .type = .round, .height = 10, @@ -78,8 +76,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/cyan", - .log = "cubyz:chalk/cyan", - .top = "cubyz:chalk/cyan", + .log = "cubyz:chalk/cyan", + .top = "cubyz:chalk/cyan", .chance = 0.008, .type = .round, .height = 10, @@ -90,8 +88,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/dark_grey", - .log = "cubyz:chalk/dark_grey", - .top = "cubyz:chalk/dark_grey", + .log = "cubyz:chalk/dark_grey", + .top = "cubyz:chalk/dark_grey", .chance = 0.008, .type = .round, .height = 10, @@ -102,8 +100,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/green", - .log = "cubyz:chalk/green", - .top = "cubyz:chalk/green", + .log = "cubyz:chalk/green", + .top = "cubyz:chalk/green", .chance = 0.008, .type = .round, .height = 10, @@ -114,8 +112,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/grey", - .log = "cubyz:chalk/grey", - .top = "cubyz:chalk/grey", + .log = "cubyz:chalk/grey", + .top = "cubyz:chalk/grey", .chance = 0.008, .type = .round, .height = 10, @@ -126,8 +124,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/indigo", - .log = "cubyz:chalk/indigo", - .top = "cubyz:chalk/indigo", + .log = "cubyz:chalk/indigo", + .top = "cubyz:chalk/indigo", .chance = 0.008, .type = .round, .height = 10, @@ -138,8 +136,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/lime", - .log = "cubyz:chalk/lime", - .top = "cubyz:chalk/lime", + .log = "cubyz:chalk/lime", + .top = "cubyz:chalk/lime", .chance = 0.008, .type = .round, .height = 10, @@ -150,8 +148,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/magenta", - .log = "cubyz:chalk/magenta", - .top = "cubyz:chalk/magenta", + .log = "cubyz:chalk/magenta", + .top = "cubyz:chalk/magenta", .chance = 0.008, .type = .round, .height = 10, @@ -162,8 +160,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/orange", - .log = "cubyz:chalk/orange", - .top = "cubyz:chalk/orange", + .log = "cubyz:chalk/orange", + .top = "cubyz:chalk/orange", .chance = 0.008, .type = .round, .height = 10, @@ -174,8 +172,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/pink", - .log = "cubyz:chalk/pink", - .top = "cubyz:chalk/pink", + .log = "cubyz:chalk/pink", + .top = "cubyz:chalk/pink", .chance = 0.008, .type = .round, .height = 10, @@ -186,8 +184,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/purple", - .log = "cubyz:chalk/purple", - .top = "cubyz:chalk/purple", + .log = "cubyz:chalk/purple", + .top = "cubyz:chalk/purple", .chance = 0.008, .type = .round, .height = 10, @@ -198,8 +196,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/red", - .log = "cubyz:chalk/red", - .top = "cubyz:chalk/red", + .log = "cubyz:chalk/red", + .top = "cubyz:chalk/red", .chance = 0.008, .type = .round, .height = 10, @@ -210,8 +208,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/violet", - .log = "cubyz:chalk/violet", - .top = "cubyz:chalk/violet", + .log = "cubyz:chalk/violet", + .top = "cubyz:chalk/violet", .chance = 0.008, .type = .round, .height = 10, @@ -222,8 +220,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/viridian", - .log = "cubyz:chalk/viridian", - .top = "cubyz:chalk/viridian", + .log = "cubyz:chalk/viridian", + .top = "cubyz:chalk/viridian", .chance = 0.008, .type = .round, .height = 10, @@ -234,8 +232,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/white", - .log = "cubyz:chalk/white", - .top = "cubyz:chalk/white", + .log = "cubyz:chalk/white", + .top = "cubyz:chalk/white", .chance = 0.008, .type = .round, .height = 10, @@ -246,8 +244,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:glass/yellow", - .log = "cubyz:chalk/yellow", - .top = "cubyz:chalk/yellow", + .log = "cubyz:chalk/yellow", + .top = "cubyz:chalk/yellow", .chance = 0.008, .type = .round, .height = 10, diff --git a/assets/cubyz/biomes/grassland.zig.zon b/assets/cubyz/biomes/grassland.zig.zon index e584af62..c0d38b85 100644 --- a/assets/cubyz/biomes/grassland.zig.zon +++ b/assets/cubyz/biomes/grassland.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .minHeight = 22, .maxHeight = 40, .minRadius = 256, diff --git a/assets/cubyz/biomes/modern_art.zig.zon b/assets/cubyz/biomes/modern_art.zig.zon index b003a912..8f97805b 100644 --- a/assets/cubyz/biomes/modern_art.zig.zon +++ b/assets/cubyz/biomes/modern_art.zig.zon @@ -1,7 +1,6 @@ .{ .chance = 0.02, - .properties = .{ - }, + .properties = .{}, .minHeight = 22, .maxHeight = 40, @@ -12,8 +11,7 @@ .validPlayerSpawn = false, - .ground_structure = .{ - }, + .ground_structure = .{}, .stoneBlock = "cubyz:chalk/white", .structures = .{ .{ diff --git a/assets/cubyz/biomes/prairie/base.zig.zon b/assets/cubyz/biomes/prairie/base.zig.zon index 47a57716..85eabd6b 100644 --- a/assets/cubyz/biomes/prairie/base.zig.zon +++ b/assets/cubyz/biomes/prairie/base.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .dry - }, + .properties = .{.dry}, .minHeight = 40, .maxHeight = 44, .minRadius = 256, diff --git a/assets/cubyz/biomes/rocky_grassland.zig.zon b/assets/cubyz/biomes/rocky_grassland.zig.zon index 5493d6db..d4832b79 100644 --- a/assets/cubyz/biomes/rocky_grassland.zig.zon +++ b/assets/cubyz/biomes/rocky_grassland.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .chance = 0.04, .minHeight = 20, .maxHeight = 40, diff --git a/assets/cubyz/biomes/savannah/butte.zig.zon b/assets/cubyz/biomes/savannah/butte.zig.zon index 986235c4..5b3db40d 100644 --- a/assets/cubyz/biomes/savannah/butte.zig.zon +++ b/assets/cubyz/biomes/savannah/butte.zig.zon @@ -21,7 +21,7 @@ }, .{ .direction = .{1, 1, 5}, - .block= "cubyz:sandstone", + .block = "cubyz:sandstone", .distance = 10, .offset = 6, .width = 1, diff --git a/assets/cubyz/biomes/savannah/elevated.zig.zon b/assets/cubyz/biomes/savannah/elevated.zig.zon index 8acf8754..8a72581c 100644 --- a/assets/cubyz/biomes/savannah/elevated.zig.zon +++ b/assets/cubyz/biomes/savannah/elevated.zig.zon @@ -71,5 +71,4 @@ .chance = 8, }, }, - } diff --git a/assets/cubyz/biomes/spawn.zig.zon b/assets/cubyz/biomes/spawn.zig.zon index 7d8c86ff..8a109ad8 100644 --- a/assets/cubyz/biomes/spawn.zig.zon +++ b/assets/cubyz/biomes/spawn.zig.zon @@ -1,6 +1,5 @@ .{ - .properties = .{ - }, + .properties = .{}, .chance = 0.01, .minHeight = 22, .maxHeight = 40, diff --git a/assets/cubyz/biomes/tall_mountain/base.zig.zon b/assets/cubyz/biomes/tall_mountain/base.zig.zon index 92ffd92a..63df0c88 100644 --- a/assets/cubyz/biomes/tall_mountain/base.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/base.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 320, .minHeight = 128, .maxHeight = 128, diff --git a/assets/cubyz/biomes/tall_mountain/peak.zig.zon b/assets/cubyz/biomes/tall_mountain/peak.zig.zon index f8054fe1..d197b0ce 100644 --- a/assets/cubyz/biomes/tall_mountain/peak.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/peak.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 60, .minHeight = 864, .maxHeight = 864, diff --git a/assets/cubyz/biomes/tall_mountain/slope1.zig.zon b/assets/cubyz/biomes/tall_mountain/slope1.zig.zon index 8d459bf6..428c0ad9 100644 --- a/assets/cubyz/biomes/tall_mountain/slope1.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope1.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 280, .minHeight = 256, .maxHeight = 256, diff --git a/assets/cubyz/biomes/tall_mountain/slope2.zig.zon b/assets/cubyz/biomes/tall_mountain/slope2.zig.zon index c7d50ed5..878c2fa8 100644 --- a/assets/cubyz/biomes/tall_mountain/slope2.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope2.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 240, .minHeight = 384, .maxHeight = 384, diff --git a/assets/cubyz/biomes/tall_mountain/slope3.zig.zon b/assets/cubyz/biomes/tall_mountain/slope3.zig.zon index 751dee63..5fd3bdcc 100644 --- a/assets/cubyz/biomes/tall_mountain/slope3.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope3.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 200, .minHeight = 480, .maxHeight = 480, diff --git a/assets/cubyz/biomes/tall_mountain/slope4.zig.zon b/assets/cubyz/biomes/tall_mountain/slope4.zig.zon index 9c47e5ef..50d2914c 100644 --- a/assets/cubyz/biomes/tall_mountain/slope4.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope4.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 160, .minHeight = 576, .maxHeight = 576, diff --git a/assets/cubyz/biomes/tall_mountain/slope5.zig.zon b/assets/cubyz/biomes/tall_mountain/slope5.zig.zon index c50e0eda..b46b57cf 100644 --- a/assets/cubyz/biomes/tall_mountain/slope5.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope5.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 120, .minHeight = 672, .maxHeight = 672, diff --git a/assets/cubyz/biomes/tall_mountain/slope6.zig.zon b/assets/cubyz/biomes/tall_mountain/slope6.zig.zon index 79579095..2c3b2ae4 100644 --- a/assets/cubyz/biomes/tall_mountain/slope6.zig.zon +++ b/assets/cubyz/biomes/tall_mountain/slope6.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 90, .minHeight = 768, .maxHeight = 768, diff --git a/assets/cubyz/biomes/thicket.zig.zon b/assets/cubyz/biomes/thicket.zig.zon index 17569952..d71d58c3 100644 --- a/assets/cubyz/biomes/thicket.zig.zon +++ b/assets/cubyz/biomes/thicket.zig.zon @@ -1,5 +1,5 @@ .{ - .chance= 0, + .chance = 0, .properties = .{ .wet, }, diff --git a/assets/cubyz/biomes/volcano/base.zig.zon b/assets/cubyz/biomes/volcano/base.zig.zon index 6678d084..4f284fad 100644 --- a/assets/cubyz/biomes/volcano/base.zig.zon +++ b/assets/cubyz/biomes/volcano/base.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 320, .minHeight = 128, .maxHeight = 128, diff --git a/assets/cubyz/biomes/volcano/peak.zig.zon b/assets/cubyz/biomes/volcano/peak.zig.zon index 2dbb229b..f4957386 100644 --- a/assets/cubyz/biomes/volcano/peak.zig.zon +++ b/assets/cubyz/biomes/volcano/peak.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 40, .minHeight = 600, .maxHeight = 600, diff --git a/assets/cubyz/biomes/volcano/slope1.zig.zon b/assets/cubyz/biomes/volcano/slope1.zig.zon index b0f89528..9529293a 100644 --- a/assets/cubyz/biomes/volcano/slope1.zig.zon +++ b/assets/cubyz/biomes/volcano/slope1.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 260, .minHeight = 256, .maxHeight = 256, diff --git a/assets/cubyz/biomes/volcano/slope2.zig.zon b/assets/cubyz/biomes/volcano/slope2.zig.zon index 74a09f2f..ac2a4085 100644 --- a/assets/cubyz/biomes/volcano/slope2.zig.zon +++ b/assets/cubyz/biomes/volcano/slope2.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 220, .minHeight = 384, .maxHeight = 384, diff --git a/assets/cubyz/biomes/volcano/slope3.zig.zon b/assets/cubyz/biomes/volcano/slope3.zig.zon index d459eb26..8bd69a9f 100644 --- a/assets/cubyz/biomes/volcano/slope3.zig.zon +++ b/assets/cubyz/biomes/volcano/slope3.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 180, .minHeight = 480, .maxHeight = 480, diff --git a/assets/cubyz/biomes/volcano/slope4.zig.zon b/assets/cubyz/biomes/volcano/slope4.zig.zon index 9bd2f279..c754fcb9 100644 --- a/assets/cubyz/biomes/volcano/slope4.zig.zon +++ b/assets/cubyz/biomes/volcano/slope4.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 140, .minHeight = 576, .maxHeight = 576, diff --git a/assets/cubyz/biomes/volcano/slope5.zig.zon b/assets/cubyz/biomes/volcano/slope5.zig.zon index 53545cde..b73afce6 100644 --- a/assets/cubyz/biomes/volcano/slope5.zig.zon +++ b/assets/cubyz/biomes/volcano/slope5.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 100, .minHeight = 672, .maxHeight = 672, diff --git a/assets/cubyz/biomes/volcano/slope6.zig.zon b/assets/cubyz/biomes/volcano/slope6.zig.zon index 088c645d..dcaf61c9 100644 --- a/assets/cubyz/biomes/volcano/slope6.zig.zon +++ b/assets/cubyz/biomes/volcano/slope6.zig.zon @@ -1,7 +1,5 @@ .{ - .properties = .{ - .mountain - }, + .properties = .{.mountain}, .radius = 80, .minHeight = 640, .maxHeight = 640, diff --git a/assets/cubyz/blocks/air.zig.zon b/assets/cubyz/blocks/air.zig.zon index 608020ad..ec6a40a3 100644 --- a/assets/cubyz/blocks/air.zig.zon +++ b/assets/cubyz/blocks/air.zig.zon @@ -8,7 +8,7 @@ .rotation = .no_rotation, .degradable = true, .hasItem = false, - .collide= false, + .collide = false, .drops = .{}, .model = .none, diff --git a/assets/cubyz/blocks/baobab_branch.zig.zon b/assets/cubyz/blocks/baobab_branch.zig.zon index 514c55f9..97d0afba 100644 --- a/assets/cubyz/blocks/baobab_branch.zig.zon +++ b/assets/cubyz/blocks/baobab_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/birch_branch.zig.zon b/assets/cubyz/blocks/birch_branch.zig.zon index edc57461..e9c76b75 100644 --- a/assets/cubyz/blocks/birch_branch.zig.zon +++ b/assets/cubyz/blocks/birch_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/bolete.zig.zon b/assets/cubyz/blocks/bolete.zig.zon index d4f2c215..016e4403 100644 --- a/assets/cubyz/blocks/bolete.zig.zon +++ b/assets/cubyz/blocks/bolete.zig.zon @@ -7,7 +7,7 @@ .solid = false, .viewThrough = true, .absorbedLight = 0x010101, - .collide= false, + .collide = false, .rotation = .torch, .model = .{ .base = "cubyz:bolete/floor", diff --git a/assets/cubyz/blocks/cactus_arm.zig.zon b/assets/cubyz/blocks/cactus_arm.zig.zon index d0a8d943..01819a01 100644 --- a/assets/cubyz/blocks/cactus_arm.zig.zon +++ b/assets/cubyz/blocks/cactus_arm.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 2.5, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/daisies.zig.zon b/assets/cubyz/blocks/daisies.zig.zon index 0d7c531c..eeecfac7 100644 --- a/assets/cubyz/blocks/daisies.zig.zon +++ b/assets/cubyz/blocks/daisies.zig.zon @@ -11,7 +11,7 @@ .model = "cubyz:plane", .rotation = .carpet, .texture = "cubyz:daisies", - .item= .{ + .item = .{ .texture = "daisies.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/dandelions.zig.zon b/assets/cubyz/blocks/dandelions.zig.zon index c49c8442..71098ce2 100644 --- a/assets/cubyz/blocks/dandelions.zig.zon +++ b/assets/cubyz/blocks/dandelions.zig.zon @@ -11,7 +11,7 @@ .model = "cubyz:plane", .rotation = .carpet, .texture = "cubyz:dandelions", - .item= .{ + .item = .{ .texture = "dandelions.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/glimmergill.zig.zon b/assets/cubyz/blocks/glimmergill.zig.zon index b9f51c8b..66c70886 100644 --- a/assets/cubyz/blocks/glimmergill.zig.zon +++ b/assets/cubyz/blocks/glimmergill.zig.zon @@ -8,7 +8,7 @@ .viewThrough = true, .absorbedLight = 0x010101, .emittedLight = 0x392862, - .collide= false, + .collide = false, .rotation = .torch, .model = .{ .base = "cubyz:glimmergill/floor", diff --git a/assets/cubyz/blocks/lava.zig.zon b/assets/cubyz/blocks/lava.zig.zon index 6f949cb2..85a5d98a 100644 --- a/assets/cubyz/blocks/lava.zig.zon +++ b/assets/cubyz/blocks/lava.zig.zon @@ -6,7 +6,7 @@ .degradable = true, .transparent = true, .hasBackFace = true, - .collide= false, + .collide = false, .absorbedLight = 0x0084ff, .emittedLight = 0xff7b00, .model = "cubyz:cube", diff --git a/assets/cubyz/blocks/limestone_bricks.zig.zon b/assets/cubyz/blocks/limestone_bricks.zig.zon index 7666c74a..355399ba 100644 --- a/assets/cubyz/blocks/limestone_bricks.zig.zon +++ b/assets/cubyz/blocks/limestone_bricks.zig.zon @@ -4,7 +4,7 @@ .drops = .{ .{.items = .{.auto}}, }, - .rotation= .stairs, - .model= "cubyz:cube", - .texture= "cubyz:limestone_bricks", + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:limestone_bricks", } diff --git a/assets/cubyz/blocks/limestone_tiles.zig.zon b/assets/cubyz/blocks/limestone_tiles.zig.zon index 17741dd7..609ff169 100644 --- a/assets/cubyz/blocks/limestone_tiles.zig.zon +++ b/assets/cubyz/blocks/limestone_tiles.zig.zon @@ -4,7 +4,7 @@ .drops = .{ .{.items = .{.auto}}, }, - .rotation= .stairs, - .model= "cubyz:cube", - .texture= "cubyz:limestone_tiles", + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:limestone_tiles", } diff --git a/assets/cubyz/blocks/mahogany_branch.zig.zon b/assets/cubyz/blocks/mahogany_branch.zig.zon index 701d03c9..74edd5d0 100644 --- a/assets/cubyz/blocks/mahogany_branch.zig.zon +++ b/assets/cubyz/blocks/mahogany_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/marble.zig.zon b/assets/cubyz/blocks/marble.zig.zon index de0d813e..61a07232 100644 --- a/assets/cubyz/blocks/marble.zig.zon +++ b/assets/cubyz/blocks/marble.zig.zon @@ -24,7 +24,7 @@ }, }, .allowOres = true, - .rotation= .stairs, - .model= "cubyz:cube", - .texture= "cubyz:marble", + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:marble", } diff --git a/assets/cubyz/blocks/marble_bricks.zig.zon b/assets/cubyz/blocks/marble_bricks.zig.zon index d163c49f..a710e8fb 100644 --- a/assets/cubyz/blocks/marble_bricks.zig.zon +++ b/assets/cubyz/blocks/marble_bricks.zig.zon @@ -4,7 +4,7 @@ .drops = .{ .{.items = .{.auto}}, }, - .rotation= .stairs, - .model= "cubyz:cube", - .texture= "cubyz:marble_bricks", + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:marble_bricks", } diff --git a/assets/cubyz/blocks/marble_tile.zig.zon b/assets/cubyz/blocks/marble_tile.zig.zon index f4ff8717..ac9260af 100644 --- a/assets/cubyz/blocks/marble_tile.zig.zon +++ b/assets/cubyz/blocks/marble_tile.zig.zon @@ -4,7 +4,7 @@ .drops = .{ .{.items = .{.auto}}, }, - .rotation= .stairs, - .model= "cubyz:cube", - .texture= "cubyz:marble_tile", + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:marble_tile", } diff --git a/assets/cubyz/blocks/oak_branch.zig.zon b/assets/cubyz/blocks/oak_branch.zig.zon index bb7d1540..93b8e264 100644 --- a/assets/cubyz/blocks/oak_branch.zig.zon +++ b/assets/cubyz/blocks/oak_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/pine_branch.zig.zon b/assets/cubyz/blocks/pine_branch.zig.zon index 4cd1ff8b..d6000a4c 100644 --- a/assets/cubyz/blocks/pine_branch.zig.zon +++ b/assets/cubyz/blocks/pine_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/red_leaf_pile.zig.zon b/assets/cubyz/blocks/red_leaf_pile.zig.zon index 1fbc32a2..40f51b14 100644 --- a/assets/cubyz/blocks/red_leaf_pile.zig.zon +++ b/assets/cubyz/blocks/red_leaf_pile.zig.zon @@ -11,7 +11,7 @@ .model = "cubyz:plane", .rotation = .carpet, .texture = "cubyz:red_leaf_pile", - .item= .{ + .item = .{ .texture = "red_leaf_pile.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/toadstool.zig.zon b/assets/cubyz/blocks/toadstool.zig.zon index c2e438bb..de0ce926 100644 --- a/assets/cubyz/blocks/toadstool.zig.zon +++ b/assets/cubyz/blocks/toadstool.zig.zon @@ -7,7 +7,7 @@ .solid = false, .viewThrough = true, .absorbedLight = 0x010101, - .collide= false, + .collide = false, .rotation = .torch, .model = .{ .base = "cubyz:toadstool/floor", diff --git a/assets/cubyz/blocks/torch.zig.zon b/assets/cubyz/blocks/torch.zig.zon index c11a7eac..f3e62191 100644 --- a/assets/cubyz/blocks/torch.zig.zon +++ b/assets/cubyz/blocks/torch.zig.zon @@ -8,7 +8,7 @@ .emittedLight = 0xa58d73, .viewThrough = true, .absorbedLight = 0x010101, - .collide= false, + .collide = false, .rotation = .torch, .model = .{ .base = "cubyz:torch", diff --git a/assets/cubyz/blocks/water.zig.zon b/assets/cubyz/blocks/water.zig.zon index 4e5ba3f4..dcd5ff1b 100644 --- a/assets/cubyz/blocks/water.zig.zon +++ b/assets/cubyz/blocks/water.zig.zon @@ -6,7 +6,7 @@ .degradable = true, .transparent = true, .hasBackFace = true, - .collide= false, + .collide = false, .absorbedLight = 0x090501, .model = "cubyz:cube", .texture = "cubyz:water", diff --git a/assets/cubyz/blocks/willow_branch.zig.zon b/assets/cubyz/blocks/willow_branch.zig.zon index 98711dcd..dcf76315 100644 --- a/assets/cubyz/blocks/willow_branch.zig.zon +++ b/assets/cubyz/blocks/willow_branch.zig.zon @@ -2,7 +2,7 @@ .tags = .{.wood}, .blockHealth = 4, .drops = .{ - .{ .items = .{.auto} }, + .{.items = .{.auto}}, }, .absorbedLight = 0x202830, .rotation = .branch, diff --git a/assets/cubyz/blocks/yellow_leaf_pile.zig.zon b/assets/cubyz/blocks/yellow_leaf_pile.zig.zon index a6d45ac7..88d0621c 100644 --- a/assets/cubyz/blocks/yellow_leaf_pile.zig.zon +++ b/assets/cubyz/blocks/yellow_leaf_pile.zig.zon @@ -11,7 +11,7 @@ .model = "cubyz:plane", .rotation = .carpet, .texture = "cubyz:yellow_leaf_pile", - .item= .{ + .item = .{ .texture = "yellow_leaf_pile.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/recipes/brick_recipes.zig.zon b/assets/cubyz/recipes/brick_recipes.zig.zon index 8e06cd2e..df7695e4 100644 --- a/assets/cubyz/recipes/brick_recipes.zig.zon +++ b/assets/cubyz/recipes/brick_recipes.zig.zon @@ -111,4 +111,4 @@ .inputs = .{"cubyz:void_stone"}, .output = "2 cubyz:void_stone_wall", }, -}, +} diff --git a/assets/cubyz/tools/shover.zig.zon b/assets/cubyz/tools/shover.zig.zon index 3d2f4227..5ff53dd7 100644 --- a/assets/cubyz/tools/shover.zig.zon +++ b/assets/cubyz/tools/shover.zig.zon @@ -138,10 +138,10 @@ }, }, .slots = .{ - .tiptip, .tip, .edge, .none, .none, - .tip, .blade, .blade, .edge, .none, - .edge, .blade, .center, .back, .none, - .none, .edge, .back, .handle, .none, - .none, .none, .none, .none, .handle, + .tiptip, .tip, .edge, .none, .none, + .tip, .blade, .blade, .edge, .none, + .edge, .blade, .center, .back, .none, + .none, .edge, .back, .handle, .none, + .none, .none, .none, .none, .handle, }, } diff --git a/src/formatter/format.zig b/src/formatter/format.zig index 7403b891..72b8f4db 100644 --- a/src/formatter/format.zig +++ b/src/formatter/format.zig @@ -78,7 +78,7 @@ fn checkDirectory(dir: std.fs.Dir) !void { std.log.err("File name should end with .zig.zon so it gets syntax highlighting on github.", .{}); failed = true; } - if(child.kind == .file and (std.mem.endsWith(u8, child.basename, ".zon") or std.mem.endsWith(u8, child.basename, ".vs") or std.mem.endsWith(u8, child.basename, ".fs") or std.mem.endsWith(u8, child.basename, ".glsl"))) { + if(child.kind == .file and (std.mem.endsWith(u8, child.basename, ".vs") or std.mem.endsWith(u8, child.basename, ".fs") or std.mem.endsWith(u8, child.basename, ".glsl"))) { try checkFile(dir, child.path); } } @@ -94,7 +94,5 @@ pub fn main() !void { dir = try std.fs.cwd().openDir("assets", .{.iterate = true}); try checkDirectory(dir); - try checkFile(std.fs.cwd(), "build.zig.zon"); - if(failed) std.posix.exit(1); }