Run the zon format check with our zig fmt (#1175)

* Format all the zon assets to prepare for running the the format check with our zig fmt

* Update ci.yml

* Remove zon files from the old formatter

* Add a formatting violation to test the CI

* Undo the check

.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

assets/cubyz/biomes/cave/cave.zig.zon

@@ -7,8 +7,6 @@
 
 	.music = "cubyz:heart-of-the-beast",
 
-
-
 	.structures = .{
 		.{
 			.id = "cubyz:ground_patch",

assets/cubyz/biomes/cave/dropoff.zig.zon

@@ -9,6 +9,5 @@
 
 	.music = "cubyz:heart-of-the-beast",
 
-	.structures = .{
+	.structures = .{},
-	},
 }

assets/cubyz/biomes/cave/void/void.zig.zon

@@ -8,6 +8,5 @@
 	.caves = 1,
 	.music = "cubyz:heart-of-the-beast",
 
-	.structures = .{
+	.structures = .{},
-	},
 }

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,

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,

assets/cubyz/biomes/forest/base.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.minHeight = 22,
 	.maxHeight = 40,
 	.minRadius = 256,

assets/cubyz/biomes/forest/birch.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.minHeight = 20,
 	.maxHeight = 48,
 	.minRadius = 200,

assets/cubyz/biomes/forest/chopped.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.minHeight = 22,
 	.maxHeight = 40,
 	.minRadius = 64,

assets/cubyz/biomes/forest/clearing.zig.zon

@@ -1,7 +1,6 @@
 .{
 	.chance = 0,
-	.properties = .{
+	.properties = .{},
-	},
 	.radius = 32,
 	.minHeight = 22,
 	.maxHeight = 40,

assets/cubyz/biomes/forest/thin_birch.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.minHeight = 20,
 	.maxHeight = 24,
 	.minRadius = 200,

assets/cubyz/biomes/glass_forest.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 = .{},
-	},
 	.structures = .{
 		.{
 			.id = "cubyz:simple_tree",

assets/cubyz/biomes/grassland.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.minHeight = 22,
 	.maxHeight = 40,
 	.minRadius = 256,

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 = .{
 		.{

assets/cubyz/biomes/prairie/base.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.dry},
-		.dry
-	},
 	.minHeight = 40,
 	.maxHeight = 44,
 	.minRadius = 256,

assets/cubyz/biomes/rocky_grassland.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.chance = 0.04,
 	.minHeight = 20,
 	.maxHeight = 40,

assets/cubyz/biomes/savannah/elevated.zig.zon

@@ -71,5 +71,4 @@
 			.chance = 8,
 		},
 	},
-
 }

assets/cubyz/biomes/spawn.zig.zon

@@ -1,6 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{},
-	},
 	.chance = 0.01,
 	.minHeight = 22,
 	.maxHeight = 40,

assets/cubyz/biomes/tall_mountain/base.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 320,
 	.minHeight = 128,
 	.maxHeight = 128,

assets/cubyz/biomes/tall_mountain/peak.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 60,
 	.minHeight = 864,
 	.maxHeight = 864,

assets/cubyz/biomes/tall_mountain/slope1.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 280,
 	.minHeight = 256,
 	.maxHeight = 256,

assets/cubyz/biomes/tall_mountain/slope2.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 240,
 	.minHeight = 384,
 	.maxHeight = 384,

assets/cubyz/biomes/tall_mountain/slope3.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 200,
 	.minHeight = 480,
 	.maxHeight = 480,

assets/cubyz/biomes/tall_mountain/slope4.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 160,
 	.minHeight = 576,
 	.maxHeight = 576,

assets/cubyz/biomes/tall_mountain/slope5.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 120,
 	.minHeight = 672,
 	.maxHeight = 672,

assets/cubyz/biomes/tall_mountain/slope6.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 90,
 	.minHeight = 768,
 	.maxHeight = 768,

assets/cubyz/biomes/volcano/base.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 320,
 	.minHeight = 128,
 	.maxHeight = 128,

assets/cubyz/biomes/volcano/peak.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 40,
 	.minHeight = 600,
 	.maxHeight = 600,

assets/cubyz/biomes/volcano/slope1.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 260,
 	.minHeight = 256,
 	.maxHeight = 256,

assets/cubyz/biomes/volcano/slope2.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 220,
 	.minHeight = 384,
 	.maxHeight = 384,

assets/cubyz/biomes/volcano/slope3.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 180,
 	.minHeight = 480,
 	.maxHeight = 480,

assets/cubyz/biomes/volcano/slope4.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 140,
 	.minHeight = 576,
 	.maxHeight = 576,

assets/cubyz/biomes/volcano/slope5.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 100,
 	.minHeight = 672,
 	.maxHeight = 672,

assets/cubyz/biomes/volcano/slope6.zig.zon

@@ -1,7 +1,5 @@
 .{
-	.properties = .{
+	.properties = .{.mountain},
-		.mountain
-	},
 	.radius = 80,
 	.minHeight = 640,
 	.maxHeight = 640,

assets/cubyz/recipes/brick_recipes.zig.zon

@@ -111,4 +111,4 @@
 		.inputs = .{"cubyz:void_stone"},
 		.output = "2 cubyz:void_stone_wall",
 	},
-},
+}

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);
 }