Remove the root . . . . . . . . . . import, replacing it with @import("main")

To fully solve the ZLS issues I had to also add the import to the other executables.
This commit is contained in:
IntegratedQuantum 2025-03-27 21:16:35 +01:00
parent a82ed65dfb
commit c2ef9aba62
153 changed files with 166 additions and 152 deletions

View File

@ -18,6 +18,7 @@ pub fn build(b: *std.Build) !void {
.optimize = optimize,
//.sanitize_thread = true,
});
exe.root_module.addImport("main", exe.root_module);
exe.linkLibC();
exe.linkLibCpp();
@ -96,6 +97,7 @@ pub fn build(b: *std.Build) !void {
.target = target,
.optimize = optimize,
});
exe_tests.root_module.addImport("main", exe_tests.root_module);
const run_exe_tests = b.addRunArtifact(exe_tests);
const test_step = b.step("test", "Run unit tests");
@ -109,6 +111,12 @@ pub fn build(b: *std.Build) !void {
.target = target,
.optimize = optimize,
});
// ZLS is stupid and cannot detect which executable is the main one, so we add the import everywhere...
formatter.root_module.addAnonymousImport("main", .{
.target = target,
.optimize = optimize,
.root_source_file = b.path("src/main.zig"),
});
const formatter_install = b.addInstallArtifact(formatter, .{});
@ -127,6 +135,12 @@ pub fn build(b: *std.Build) !void {
.target = target,
.optimize = optimize,
});
// ZLS is stupid and cannot detect which executable is the main one, so we add the import everywhere...
zig_fmt.root_module.addAnonymousImport("main", .{
.target = target,
.optimize = optimize,
.root_source_file = b.path("src/main.zig"),
});
const zig_fmt_install = b.addInstallArtifact(zig_fmt, .{});

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("main.zig");
const main = @import("main");
const BaseItem = main.items.BaseItem;
const Block = main.blocks.Block;
const Item = main.items.Item;

View File

@ -6,7 +6,7 @@ const migrations_zig = @import("migrations.zig");
const blueprints_zig = @import("blueprint.zig");
const Blueprint = blueprints_zig.Blueprint;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const biomes_zig = main.server.terrain.biomes;
const sbb = main.server.terrain.structure_building_blocks;
const NeverFailingAllocator = main.heap.NeverFailingAllocator;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const utils = main.utils;
const c = @cImport({

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ZonElement = @import("zon.zig").ZonElement;
const Neighbor = @import("chunk.zig").Neighbor;
const graphics = @import("graphics.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("main.zig");
const main = @import("main");
const Compression = main.utils.Compression;
const ZonElement = @import("zon.zig").ZonElement;
const vec = main.vec;

View File

@ -2,7 +2,7 @@ const std = @import("std");
const blocks = @import("blocks.zig");
const Block = blocks.Block;
const main = @import("main.zig");
const main = @import("main");
const settings = @import("settings.zig");
const vec = @import("vec.zig");
const Vec3i = vec.Vec3i;

View File

@ -5,7 +5,7 @@ const game = @import("game.zig");
const graphics = @import("graphics.zig");
const c = graphics.c;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const renderer = @import("renderer.zig");
const settings = @import("settings.zig");
const utils = @import("utils.zig");

View File

@ -1,7 +1,7 @@
const std = @import("std");
const builtin = @import("builtin");
const main = @import("root");
const main = @import("main");
const NeverFailingAllocator = main.heap.NeverFailingAllocator;
const ZonElement = main.ZonElement;

View File

@ -8,7 +8,7 @@ const ClientItemDropManager = itemdrop.ClientItemDropManager;
const items = @import("items.zig");
const Inventory = items.Inventory;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const KeyBoard = main.KeyBoard;
const network = @import("network.zig");
const Connection = network.Connection;

View File

@ -24,7 +24,7 @@ const Vec2f = vec.Vec2f;
const Vec2i = vec.Vec2i;
const Vec3f = vec.Vec3f;
const main = @import("main.zig");
const main = @import("main");
const Window = main.Window;
const NeverFailingAllocator = main.heap.NeverFailingAllocator;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const settings = main.settings;
const files = main.files;
const vec = main.vec;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const TextBuffer = graphics.TextBuffer;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Inventory = main.items.Inventory;
const graphics = main.graphics;
const draw = graphics.draw;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const TextBuffer = graphics.TextBuffer;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const TextBuffer = graphics.TextBuffer;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Shader = graphics.Shader;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const TextBuffer = graphics.TextBuffer;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const TextBuffer = graphics.TextBuffer;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const ZonElement = main.ZonElement;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const vec = main.vec;
const Vec2f = vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const c = main.Window.c;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Item = main.items.Item;
const Inventory = main.items.Inventory;
const Player = main.game.Player;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const Shader = graphics.Shader;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const files = main.files;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const files = main.files;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const c = main.Window.c;
const graphics = main.graphics;
const draw = graphics.draw;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ItemStack = main.items.ItemStack;
const Player = main.game.Player;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Player = main.game.Player;
const ItemStack = main.items.ItemStack;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const items = main.items;
const BaseItem = items.BaseItem;
const Inventory = items.Inventory;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Texture = main.graphics.Texture;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const graphics = main.graphics;
const draw = graphics.draw;
const Texture = graphics.Texture;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const gui = @import("../gui.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const items = main.items;
const BaseItem = items.BaseItem;
const Inventory = items.Inventory;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;
const NeverFailingAllocator = main.heap.NeverFailingAllocator;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const items = main.items;
const BaseItem = items.BaseItem;
const Inventory = items.Inventory;

View File

@ -11,7 +11,7 @@ const c = graphics.c;
const items = @import("items.zig");
const ItemStack = items.ItemStack;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const random = @import("random.zig");
const settings = @import("settings.zig");
const utils = @import("utils.zig");

View File

@ -5,7 +5,7 @@ const Block = blocks.Block;
const graphics = @import("graphics.zig");
const Color = graphics.Color;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const chunk = main.chunk;
const random = @import("random.zig");
const vec = @import("vec.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("main.zig");
const main = @import("main");
const NeverFailingAllocator = main.heap.NeverFailingAllocator;
const List = main.List;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("main.zig");
const main = @import("main");
const ZonElement = @import("zon.zig").ZonElement;
const Palette = @import("assets.zig").Palette;

View File

@ -3,7 +3,7 @@ const std = @import("std");
const chunk = @import("chunk.zig");
const Neighbor = chunk.Neighbor;
const graphics = @import("graphics.zig");
const main = @import("main.zig");
const main = @import("main");
const vec = @import("vec.zig");
const Vec3i = vec.Vec3i;
const Vec3f = vec.Vec3f;

View File

@ -10,7 +10,7 @@ const items = @import("items.zig");
const Inventory = items.Inventory;
const ItemStack = items.ItemStack;
const ZonElement = @import("zon.zig").ZonElement;
const main = @import("main.zig");
const main = @import("main");
const game = @import("game.zig");
const settings = @import("settings.zig");
const renderer = @import("renderer.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const Vec2i = main.vec.Vec2i;
const Vec3i = main.vec.Vec3i;

View File

@ -10,7 +10,7 @@ const Shader = graphics.Shader;
const game = @import("game.zig");
const World = game.World;
const itemdrop = @import("itemdrop.zig");
const main = @import("main.zig");
const main = @import("main");
const Window = main.Window;
const models = @import("models.zig");
const network = @import("network.zig");

View File

@ -1,7 +1,7 @@
const std = @import("std");
const Atomic = std.atomic.Value;
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const chunk = main.chunk;

View File

@ -1,7 +1,7 @@
const std = @import("std");
const Atomic = std.atomic.Value;
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const chunk = main.chunk;
const chunk_meshing = @import("chunk_meshing.zig");

View File

@ -1,7 +1,7 @@
const std = @import("std");
const Atomic = std.atomic.Value;
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const chunk = main.chunk;
const game = main.game;

View File

@ -4,7 +4,7 @@ const blocks = @import("blocks.zig");
const Block = blocks.Block;
const chunk = @import("chunk.zig");
const Neighbor = chunk.Neighbor;
const main = @import("main.zig");
const main = @import("main");
const ModelIndex = main.models.ModelIndex;
const vec = main.vec;
const Vec3i = vec.Vec3i;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const blocks = main.blocks;
const Block = blocks.Block;
const Neighbor = main.chunk.Neighbor;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const ZonElement = main.ZonElement;
const vec = main.vec;
const Vec3f = vec.Vec3f;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const Command = struct {

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Clears your inventory";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Get or set your gamemode.";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const command = @import("_command.zig");

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Invite a player";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Kills the player";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Get or set the server time.";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Teleport to location.";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const vec = main.vec;
const Vec3i = vec.Vec3i;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const Block = main.blocks.Block;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
pub const description = "Clears pos1 and pos2 of selection.";

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const vec = main.vec;
const Vec3i = vec.Vec3i;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const Vec3i = main.vec.Vec3i;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const Vec3i = main.vec.Vec3i;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const Degrees = main.rotation.Degrees;

View File

@ -1,6 +1,6 @@
const std = @import("std");
const main = @import("root");
const main = @import("main");
const User = main.server.User;
const Block = main.blocks.Block;

View File

@ -1,7 +1,7 @@
const std = @import("std");
const Atomic = std.atomic.Value;
const main = @import("root");
const main = @import("main");
const chunk = main.chunk;
const network = main.network;
const Connection = network.Connection;

Some files were not shown because too many files have changed in this diff Show More