From c2ef9aba62440ff116f84434bf420b35f6f29866 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Thu, 27 Mar 2025 21:16:35 +0100 Subject: [PATCH] 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. --- build.zig | 14 ++++++++++++++ src/Inventory.zig | 2 +- src/assets.zig | 2 +- src/audio.zig | 2 +- src/blocks.zig | 2 +- src/blueprint.zig | 2 +- src/chunk.zig | 2 +- src/entity.zig | 2 +- src/files.zig | 2 +- src/game.zig | 2 +- src/graphics.zig | 2 +- src/graphics/Window.zig | 2 +- src/gui/GuiWindow.zig | 2 +- src/gui/components/Button.zig | 2 +- src/gui/components/CheckBox.zig | 2 +- src/gui/components/ContinuousSlider.zig | 2 +- src/gui/components/DiscreteSlider.zig | 2 +- src/gui/components/HorizontalList.zig | 2 +- src/gui/components/Icon.zig | 2 +- src/gui/components/ItemSlot.zig | 2 +- src/gui/components/Label.zig | 2 +- src/gui/components/MutexComponent.zig | 2 +- src/gui/components/ScrollBar.zig | 2 +- src/gui/components/TextInput.zig | 2 +- src/gui/components/VerticalList.zig | 2 +- src/gui/gamepad_cursor.zig | 2 +- src/gui/gui.zig | 2 +- src/gui/gui_component.zig | 2 +- src/gui/windows/advanced_controls.zig | 2 +- src/gui/windows/change_name.zig | 2 +- src/gui/windows/chat.zig | 2 +- src/gui/windows/controls.zig | 2 +- src/gui/windows/creative_inventory.zig | 2 +- src/gui/windows/crosshair.zig | 2 +- src/gui/windows/debug.zig | 2 +- src/gui/windows/debug_network.zig | 2 +- src/gui/windows/debug_network_advanced.zig | 2 +- src/gui/windows/delete_world_confirmation.zig | 2 +- src/gui/windows/download_controller_mappings.zig | 2 +- src/gui/windows/energybar.zig | 2 +- src/gui/windows/error_prompt.zig | 2 +- src/gui/windows/gpu_performance_measuring.zig | 2 +- src/gui/windows/graphics.zig | 2 +- src/gui/windows/healthbar.zig | 2 +- src/gui/windows/hotbar.zig | 2 +- src/gui/windows/inventory.zig | 2 +- src/gui/windows/inventory_crafting.zig | 2 +- src/gui/windows/invite.zig | 2 +- src/gui/windows/main.zig | 2 +- src/gui/windows/manage_players.zig | 2 +- src/gui/windows/multiplayer.zig | 2 +- src/gui/windows/notification.zig | 2 +- src/gui/windows/pause.zig | 2 +- src/gui/windows/pause_gear.zig | 2 +- src/gui/windows/performance_graph.zig | 2 +- src/gui/windows/save_creation.zig | 2 +- src/gui/windows/save_selection.zig | 2 +- src/gui/windows/settings.zig | 2 +- src/gui/windows/shared_inventory_testing.zig | 2 +- src/gui/windows/sound.zig | 2 +- src/gui/windows/workbench.zig | 2 +- src/itemdrop.zig | 2 +- src/items.zig | 2 +- src/json.zig | 2 +- src/migrations.zig | 2 +- src/models.zig | 2 +- src/network.zig | 2 +- src/random.zig | 2 +- src/renderer.zig | 2 +- src/renderer/chunk_meshing.zig | 2 +- src/renderer/lighting.zig | 2 +- src/renderer/mesh_storage.zig | 2 +- src/rotation.zig | 2 +- src/rotation/branch.zig | 2 +- src/rotation/carpet.zig | 2 +- src/rotation/fence.zig | 2 +- src/rotation/log.zig | 2 +- src/rotation/ore.zig | 2 +- src/rotation/planar.zig | 2 +- src/rotation/stairs.zig | 2 +- src/rotation/texture_pile.zig | 2 +- src/rotation/torch.zig | 2 +- src/server/Entity.zig | 2 +- src/server/command/_command.zig | 2 +- src/server/command/clear.zig | 2 +- src/server/command/gamemode.zig | 2 +- src/server/command/help.zig | 2 +- src/server/command/invite.zig | 2 +- src/server/command/kill.zig | 2 +- src/server/command/time.zig | 2 +- src/server/command/tp.zig | 2 +- src/server/command/worldedit/blueprint.zig | 2 +- src/server/command/worldedit/copy.zig | 2 +- src/server/command/worldedit/deselect.zig | 2 +- src/server/command/worldedit/paste.zig | 2 +- src/server/command/worldedit/pos1.zig | 2 +- src/server/command/worldedit/pos2.zig | 2 +- src/server/command/worldedit/rotate.zig | 2 +- src/server/command/worldedit/undo.zig | 2 +- src/server/server.zig | 2 +- src/server/storage.zig | 2 +- src/server/terrain/CaveBiomeMap.zig | 2 +- src/server/terrain/CaveMap.zig | 2 +- src/server/terrain/ClimateMap.zig | 2 +- src/server/terrain/LightMap.zig | 2 +- src/server/terrain/StructureMap.zig | 2 +- src/server/terrain/SurfaceMap.zig | 2 +- src/server/terrain/biomes.zig | 2 +- .../cavebiomegen/RandomBiomeDistribution.zig | 2 +- .../terrain/cavegen/FractalCaveGenerator.zig | 2 +- src/server/terrain/cavegen/NoiseCaveGenerator.zig | 2 +- src/server/terrain/cavegen/SurfaceGenerator.zig | 2 +- src/server/terrain/chunkgen/CrystalGenerator.zig | 2 +- src/server/terrain/chunkgen/OreGenerator.zig | 2 +- src/server/terrain/chunkgen/StructureGenerator.zig | 2 +- src/server/terrain/chunkgen/TerrainGenerator.zig | 2 +- .../terrain/climategen/NoiseBasedVoronoi.zig | 2 +- src/server/terrain/mapgen/MapGenV1.zig | 2 +- src/server/terrain/noise/BlueNoise.zig | 2 +- src/server/terrain/noise/CachedFractalNoise.zig | 2 +- src/server/terrain/noise/CachedFractalNoise3D.zig | 2 +- src/server/terrain/noise/FractalNoise.zig | 2 +- src/server/terrain/noise/FractalNoise1D.zig | 2 +- src/server/terrain/noise/FractalNoise3D.zig | 2 +- src/server/terrain/noise/PerlinNoise.zig | 2 +- .../terrain/noise/RandomlyWeightedFractalNoise.zig | 2 +- src/server/terrain/noise/ValueNoise.zig | 2 +- src/server/terrain/simple_structures/Boulder.zig | 2 +- .../terrain/simple_structures/FallenTree.zig | 2 +- .../terrain/simple_structures/FlowerPatch.zig | 2 +- .../terrain/simple_structures/GroundPatch.zig | 2 +- .../terrain/simple_structures/SimpleTreeModel.zig | 2 +- .../terrain/simple_structures/SimpleVegetation.zig | 2 +- .../terrain/simple_structures/Stalagmite.zig | 2 +- src/server/terrain/structure_building_blocks.zig | 2 +- .../terrain/structuremapgen/SimpleStructureGen.zig | 2 +- src/server/terrain/terrain.zig | 2 +- src/server/world.zig | 2 +- src/settings.zig | 2 +- src/tool/modifiers/bad_at.zig | 2 +- src/tool/modifiers/durable.zig | 2 +- src/tool/modifiers/fragile.zig | 2 +- src/tool/modifiers/good_at.zig | 2 +- src/tool/modifiers/heavy.zig | 2 +- src/tool/modifiers/light.zig | 2 +- src/tool/modifiers/powerful.zig | 2 +- src/tool/modifiers/single_use.zig | 2 +- src/tool/modifiers/weak.zig | 2 +- src/utils.zig | 2 +- src/utils/file_monitor.zig | 2 +- src/utils/heap.zig | 2 +- src/utils/list.zig | 2 +- src/zon.zig | 2 +- 153 files changed, 166 insertions(+), 152 deletions(-) diff --git a/build.zig b/build.zig index 86ec4534..a1c18fb3 100644 --- a/build.zig +++ b/build.zig @@ -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, .{}); diff --git a/src/Inventory.zig b/src/Inventory.zig index a54844c3..3ddbc475 100644 --- a/src/Inventory.zig +++ b/src/Inventory.zig @@ -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; diff --git a/src/assets.zig b/src/assets.zig index 49b6346d..bcc9cf3c 100644 --- a/src/assets.zig +++ b/src/assets.zig @@ -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; diff --git a/src/audio.zig b/src/audio.zig index 059d4b63..b4cf9421 100644 --- a/src/audio.zig +++ b/src/audio.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const utils = main.utils; const c = @cImport({ diff --git a/src/blocks.zig b/src/blocks.zig index 5a411691..9a4db6f1 100644 --- a/src/blocks.zig +++ b/src/blocks.zig @@ -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"); diff --git a/src/blueprint.zig b/src/blueprint.zig index 28bcd745..f638c9e1 100644 --- a/src/blueprint.zig +++ b/src/blueprint.zig @@ -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; diff --git a/src/chunk.zig b/src/chunk.zig index 045705ea..d2bc479f 100644 --- a/src/chunk.zig +++ b/src/chunk.zig @@ -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; diff --git a/src/entity.zig b/src/entity.zig index dc660575..445e9135 100644 --- a/src/entity.zig +++ b/src/entity.zig @@ -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"); diff --git a/src/files.zig b/src/files.zig index 17911007..64d0c741 100644 --- a/src/files.zig +++ b/src/files.zig @@ -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; diff --git a/src/game.zig b/src/game.zig index c36ac3fe..ab1612f4 100644 --- a/src/game.zig +++ b/src/game.zig @@ -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; diff --git a/src/graphics.zig b/src/graphics.zig index 14532c4e..d85c0af7 100644 --- a/src/graphics.zig +++ b/src/graphics.zig @@ -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; diff --git a/src/graphics/Window.zig b/src/graphics/Window.zig index c164a465..1df6619b 100644 --- a/src/graphics/Window.zig +++ b/src/graphics/Window.zig @@ -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; diff --git a/src/gui/GuiWindow.zig b/src/gui/GuiWindow.zig index 62e10130..73531956 100644 --- a/src/gui/GuiWindow.zig +++ b/src/gui/GuiWindow.zig @@ -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; diff --git a/src/gui/components/Button.zig b/src/gui/components/Button.zig index 077a1130..1984ee29 100644 --- a/src/gui/components/Button.zig +++ b/src/gui/components/Button.zig @@ -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; diff --git a/src/gui/components/CheckBox.zig b/src/gui/components/CheckBox.zig index 62d8c043..9005d9f8 100644 --- a/src/gui/components/CheckBox.zig +++ b/src/gui/components/CheckBox.zig @@ -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; diff --git a/src/gui/components/ContinuousSlider.zig b/src/gui/components/ContinuousSlider.zig index a66bb715..f95751b2 100644 --- a/src/gui/components/ContinuousSlider.zig +++ b/src/gui/components/ContinuousSlider.zig @@ -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; diff --git a/src/gui/components/DiscreteSlider.zig b/src/gui/components/DiscreteSlider.zig index 35be3e9b..ace53812 100644 --- a/src/gui/components/DiscreteSlider.zig +++ b/src/gui/components/DiscreteSlider.zig @@ -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; diff --git a/src/gui/components/HorizontalList.zig b/src/gui/components/HorizontalList.zig index 9e407996..b1ac838c 100644 --- a/src/gui/components/HorizontalList.zig +++ b/src/gui/components/HorizontalList.zig @@ -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; diff --git a/src/gui/components/Icon.zig b/src/gui/components/Icon.zig index e5f3387a..bf2b1a5d 100644 --- a/src/gui/components/Icon.zig +++ b/src/gui/components/Icon.zig @@ -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; diff --git a/src/gui/components/ItemSlot.zig b/src/gui/components/ItemSlot.zig index d36cc29c..4f293338 100644 --- a/src/gui/components/ItemSlot.zig +++ b/src/gui/components/ItemSlot.zig @@ -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; diff --git a/src/gui/components/Label.zig b/src/gui/components/Label.zig index e488778a..793966d6 100644 --- a/src/gui/components/Label.zig +++ b/src/gui/components/Label.zig @@ -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; diff --git a/src/gui/components/MutexComponent.zig b/src/gui/components/MutexComponent.zig index 5e2e4a5f..d6814320 100644 --- a/src/gui/components/MutexComponent.zig +++ b/src/gui/components/MutexComponent.zig @@ -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; diff --git a/src/gui/components/ScrollBar.zig b/src/gui/components/ScrollBar.zig index 84c134f5..1c07ba75 100644 --- a/src/gui/components/ScrollBar.zig +++ b/src/gui/components/ScrollBar.zig @@ -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; diff --git a/src/gui/components/TextInput.zig b/src/gui/components/TextInput.zig index 80638baa..ea89b17c 100644 --- a/src/gui/components/TextInput.zig +++ b/src/gui/components/TextInput.zig @@ -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; diff --git a/src/gui/components/VerticalList.zig b/src/gui/components/VerticalList.zig index ad69c120..d88995d4 100644 --- a/src/gui/components/VerticalList.zig +++ b/src/gui/components/VerticalList.zig @@ -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; diff --git a/src/gui/gamepad_cursor.zig b/src/gui/gamepad_cursor.zig index fd8e77fd..109b2f63 100644 --- a/src/gui/gamepad_cursor.zig +++ b/src/gui/gamepad_cursor.zig @@ -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; diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 23ebf0b8..27c77e68 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -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; diff --git a/src/gui/gui_component.zig b/src/gui/gui_component.zig index e1e8da9e..d9fc7790 100644 --- a/src/gui/gui_component.zig +++ b/src/gui/gui_component.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const vec = main.vec; const Vec2f = vec.Vec2f; diff --git a/src/gui/windows/advanced_controls.zig b/src/gui/windows/advanced_controls.zig index 3e1baf93..b6d4afc7 100644 --- a/src/gui/windows/advanced_controls.zig +++ b/src/gui/windows/advanced_controls.zig @@ -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; diff --git a/src/gui/windows/change_name.zig b/src/gui/windows/change_name.zig index 1b19d1f6..2904e24a 100644 --- a/src/gui/windows/change_name.zig +++ b/src/gui/windows/change_name.zig @@ -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; diff --git a/src/gui/windows/chat.zig b/src/gui/windows/chat.zig index 1f916bfd..970f8cee 100644 --- a/src/gui/windows/chat.zig +++ b/src/gui/windows/chat.zig @@ -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"); diff --git a/src/gui/windows/controls.zig b/src/gui/windows/controls.zig index 2168e9a6..43b715d7 100644 --- a/src/gui/windows/controls.zig +++ b/src/gui/windows/controls.zig @@ -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"); diff --git a/src/gui/windows/creative_inventory.zig b/src/gui/windows/creative_inventory.zig index ca3b2903..141da064 100644 --- a/src/gui/windows/creative_inventory.zig +++ b/src/gui/windows/creative_inventory.zig @@ -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; diff --git a/src/gui/windows/crosshair.zig b/src/gui/windows/crosshair.zig index 290da16d..37ec041e 100644 --- a/src/gui/windows/crosshair.zig +++ b/src/gui/windows/crosshair.zig @@ -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; diff --git a/src/gui/windows/debug.zig b/src/gui/windows/debug.zig index 9701bfcf..a8fc1a24 100644 --- a/src/gui/windows/debug.zig +++ b/src/gui/windows/debug.zig @@ -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; diff --git a/src/gui/windows/debug_network.zig b/src/gui/windows/debug_network.zig index be484c51..56795f8d 100644 --- a/src/gui/windows/debug_network.zig +++ b/src/gui/windows/debug_network.zig @@ -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; diff --git a/src/gui/windows/debug_network_advanced.zig b/src/gui/windows/debug_network_advanced.zig index c0b55e8f..43648bec 100644 --- a/src/gui/windows/debug_network_advanced.zig +++ b/src/gui/windows/debug_network_advanced.zig @@ -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; diff --git a/src/gui/windows/delete_world_confirmation.zig b/src/gui/windows/delete_world_confirmation.zig index 6929ad60..e6d3145d 100644 --- a/src/gui/windows/delete_world_confirmation.zig +++ b/src/gui/windows/delete_world_confirmation.zig @@ -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"); diff --git a/src/gui/windows/download_controller_mappings.zig b/src/gui/windows/download_controller_mappings.zig index 5ac03a49..b03d47e5 100644 --- a/src/gui/windows/download_controller_mappings.zig +++ b/src/gui/windows/download_controller_mappings.zig @@ -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; diff --git a/src/gui/windows/energybar.zig b/src/gui/windows/energybar.zig index 526d1c7e..3ce79415 100644 --- a/src/gui/windows/energybar.zig +++ b/src/gui/windows/energybar.zig @@ -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; diff --git a/src/gui/windows/error_prompt.zig b/src/gui/windows/error_prompt.zig index 54f0e747..578fb7c3 100644 --- a/src/gui/windows/error_prompt.zig +++ b/src/gui/windows/error_prompt.zig @@ -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; diff --git a/src/gui/windows/gpu_performance_measuring.zig b/src/gui/windows/gpu_performance_measuring.zig index aa42d5e3..e9d62fa3 100644 --- a/src/gui/windows/gpu_performance_measuring.zig +++ b/src/gui/windows/gpu_performance_measuring.zig @@ -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; diff --git a/src/gui/windows/graphics.zig b/src/gui/windows/graphics.zig index 4e210df4..1284c001 100644 --- a/src/gui/windows/graphics.zig +++ b/src/gui/windows/graphics.zig @@ -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; diff --git a/src/gui/windows/healthbar.zig b/src/gui/windows/healthbar.zig index 297dae5c..e095c77a 100644 --- a/src/gui/windows/healthbar.zig +++ b/src/gui/windows/healthbar.zig @@ -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; diff --git a/src/gui/windows/hotbar.zig b/src/gui/windows/hotbar.zig index b58e32e2..f5dadc1f 100644 --- a/src/gui/windows/hotbar.zig +++ b/src/gui/windows/hotbar.zig @@ -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; diff --git a/src/gui/windows/inventory.zig b/src/gui/windows/inventory.zig index ee9a91e4..7eb94113 100644 --- a/src/gui/windows/inventory.zig +++ b/src/gui/windows/inventory.zig @@ -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; diff --git a/src/gui/windows/inventory_crafting.zig b/src/gui/windows/inventory_crafting.zig index 8043698d..93351298 100644 --- a/src/gui/windows/inventory_crafting.zig +++ b/src/gui/windows/inventory_crafting.zig @@ -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; diff --git a/src/gui/windows/invite.zig b/src/gui/windows/invite.zig index 008ba618..1a9f8a04 100644 --- a/src/gui/windows/invite.zig +++ b/src/gui/windows/invite.zig @@ -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; diff --git a/src/gui/windows/main.zig b/src/gui/windows/main.zig index 37b5f8e7..39b77502 100644 --- a/src/gui/windows/main.zig +++ b/src/gui/windows/main.zig @@ -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"); diff --git a/src/gui/windows/manage_players.zig b/src/gui/windows/manage_players.zig index 964c1574..f39af948 100644 --- a/src/gui/windows/manage_players.zig +++ b/src/gui/windows/manage_players.zig @@ -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; diff --git a/src/gui/windows/multiplayer.zig b/src/gui/windows/multiplayer.zig index 155ebff2..c7046bdf 100644 --- a/src/gui/windows/multiplayer.zig +++ b/src/gui/windows/multiplayer.zig @@ -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; diff --git a/src/gui/windows/notification.zig b/src/gui/windows/notification.zig index 3b55f7b9..c87f48dd 100644 --- a/src/gui/windows/notification.zig +++ b/src/gui/windows/notification.zig @@ -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"); diff --git a/src/gui/windows/pause.zig b/src/gui/windows/pause.zig index 4555f6c4..cb564d88 100644 --- a/src/gui/windows/pause.zig +++ b/src/gui/windows/pause.zig @@ -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"); diff --git a/src/gui/windows/pause_gear.zig b/src/gui/windows/pause_gear.zig index b0c08cf1..7b8a965b 100644 --- a/src/gui/windows/pause_gear.zig +++ b/src/gui/windows/pause_gear.zig @@ -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; diff --git a/src/gui/windows/performance_graph.zig b/src/gui/windows/performance_graph.zig index 9e452e51..d440c42c 100644 --- a/src/gui/windows/performance_graph.zig +++ b/src/gui/windows/performance_graph.zig @@ -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; diff --git a/src/gui/windows/save_creation.zig b/src/gui/windows/save_creation.zig index fd1a6062..b5d4853f 100644 --- a/src/gui/windows/save_creation.zig +++ b/src/gui/windows/save_creation.zig @@ -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; diff --git a/src/gui/windows/save_selection.zig b/src/gui/windows/save_selection.zig index 044393fa..efc6c5db 100644 --- a/src/gui/windows/save_selection.zig +++ b/src/gui/windows/save_selection.zig @@ -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; diff --git a/src/gui/windows/settings.zig b/src/gui/windows/settings.zig index 4591ba27..f2330941 100644 --- a/src/gui/windows/settings.zig +++ b/src/gui/windows/settings.zig @@ -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"); diff --git a/src/gui/windows/shared_inventory_testing.zig b/src/gui/windows/shared_inventory_testing.zig index 854279d8..04d3c35e 100644 --- a/src/gui/windows/shared_inventory_testing.zig +++ b/src/gui/windows/shared_inventory_testing.zig @@ -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; diff --git a/src/gui/windows/sound.zig b/src/gui/windows/sound.zig index 219cf231..1a25349d 100644 --- a/src/gui/windows/sound.zig +++ b/src/gui/windows/sound.zig @@ -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; diff --git a/src/gui/windows/workbench.zig b/src/gui/windows/workbench.zig index bee41457..a49a4059 100644 --- a/src/gui/windows/workbench.zig +++ b/src/gui/windows/workbench.zig @@ -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; diff --git a/src/itemdrop.zig b/src/itemdrop.zig index c0ab7842..cae696a4 100644 --- a/src/itemdrop.zig +++ b/src/itemdrop.zig @@ -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"); diff --git a/src/items.zig b/src/items.zig index 2f34ad18..04bf42f3 100644 --- a/src/items.zig +++ b/src/items.zig @@ -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"); diff --git a/src/json.zig b/src/json.zig index 025b4e14..5a93c23f 100644 --- a/src/json.zig +++ b/src/json.zig @@ -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; diff --git a/src/migrations.zig b/src/migrations.zig index 738bfdf1..fd104079 100644 --- a/src/migrations.zig +++ b/src/migrations.zig @@ -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; diff --git a/src/models.zig b/src/models.zig index 6a0379d8..6a9c6e60 100644 --- a/src/models.zig +++ b/src/models.zig @@ -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; diff --git a/src/network.zig b/src/network.zig index 6500eb41..7d60c797 100644 --- a/src/network.zig +++ b/src/network.zig @@ -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"); diff --git a/src/random.zig b/src/random.zig index b94f2646..3d91fbac 100644 --- a/src/random.zig +++ b/src/random.zig @@ -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; diff --git a/src/renderer.zig b/src/renderer.zig index fa29b60d..b73982bd 100644 --- a/src/renderer.zig +++ b/src/renderer.zig @@ -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"); diff --git a/src/renderer/chunk_meshing.zig b/src/renderer/chunk_meshing.zig index f08e7766..b775b897 100644 --- a/src/renderer/chunk_meshing.zig +++ b/src/renderer/chunk_meshing.zig @@ -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; diff --git a/src/renderer/lighting.zig b/src/renderer/lighting.zig index efb5517a..3e42153a 100644 --- a/src/renderer/lighting.zig +++ b/src/renderer/lighting.zig @@ -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"); diff --git a/src/renderer/mesh_storage.zig b/src/renderer/mesh_storage.zig index 0d1a6823..7660c883 100644 --- a/src/renderer/mesh_storage.zig +++ b/src/renderer/mesh_storage.zig @@ -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; diff --git a/src/rotation.zig b/src/rotation.zig index 2cc84978..21a7d609 100644 --- a/src/rotation.zig +++ b/src/rotation.zig @@ -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; diff --git a/src/rotation/branch.zig b/src/rotation/branch.zig index bbf4a4b2..8f047038 100644 --- a/src/rotation/branch.zig +++ b/src/rotation/branch.zig @@ -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; diff --git a/src/rotation/carpet.zig b/src/rotation/carpet.zig index 58fe67d3..c5cc0d40 100644 --- a/src/rotation/carpet.zig +++ b/src/rotation/carpet.zig @@ -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; diff --git a/src/rotation/fence.zig b/src/rotation/fence.zig index de444b7c..61b7131e 100644 --- a/src/rotation/fence.zig +++ b/src/rotation/fence.zig @@ -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; diff --git a/src/rotation/log.zig b/src/rotation/log.zig index c546d5b4..82cb699f 100644 --- a/src/rotation/log.zig +++ b/src/rotation/log.zig @@ -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; diff --git a/src/rotation/ore.zig b/src/rotation/ore.zig index 8efe4c91..06f1851d 100644 --- a/src/rotation/ore.zig +++ b/src/rotation/ore.zig @@ -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; diff --git a/src/rotation/planar.zig b/src/rotation/planar.zig index 164c45b8..b6b3489c 100644 --- a/src/rotation/planar.zig +++ b/src/rotation/planar.zig @@ -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; diff --git a/src/rotation/stairs.zig b/src/rotation/stairs.zig index 15c61901..b936b286 100644 --- a/src/rotation/stairs.zig +++ b/src/rotation/stairs.zig @@ -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; diff --git a/src/rotation/texture_pile.zig b/src/rotation/texture_pile.zig index 1cd41a4f..69d2705c 100644 --- a/src/rotation/texture_pile.zig +++ b/src/rotation/texture_pile.zig @@ -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; diff --git a/src/rotation/torch.zig b/src/rotation/torch.zig index dd8ab604..62e711bb 100644 --- a/src/rotation/torch.zig +++ b/src/rotation/torch.zig @@ -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; diff --git a/src/server/Entity.zig b/src/server/Entity.zig index 5f0cac30..42226f8e 100644 --- a/src/server/Entity.zig +++ b/src/server/Entity.zig @@ -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; diff --git a/src/server/command/_command.zig b/src/server/command/_command.zig index 4be8b29f..5d95c997 100644 --- a/src/server/command/_command.zig +++ b/src/server/command/_command.zig @@ -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 { diff --git a/src/server/command/clear.zig b/src/server/command/clear.zig index be67ea1a..d2d2c09b 100644 --- a/src/server/command/clear.zig +++ b/src/server/command/clear.zig @@ -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"; diff --git a/src/server/command/gamemode.zig b/src/server/command/gamemode.zig index 5cb7611f..851d218f 100644 --- a/src/server/command/gamemode.zig +++ b/src/server/command/gamemode.zig @@ -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."; diff --git a/src/server/command/help.zig b/src/server/command/help.zig index 114a6d02..8581ffae 100644 --- a/src/server/command/help.zig +++ b/src/server/command/help.zig @@ -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"); diff --git a/src/server/command/invite.zig b/src/server/command/invite.zig index 85b53075..7a001275 100644 --- a/src/server/command/invite.zig +++ b/src/server/command/invite.zig @@ -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"; diff --git a/src/server/command/kill.zig b/src/server/command/kill.zig index 083ad608..23f08c4f 100644 --- a/src/server/command/kill.zig +++ b/src/server/command/kill.zig @@ -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"; diff --git a/src/server/command/time.zig b/src/server/command/time.zig index a3e33f45..94da32f0 100644 --- a/src/server/command/time.zig +++ b/src/server/command/time.zig @@ -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."; diff --git a/src/server/command/tp.zig b/src/server/command/tp.zig index 92356698..0dce4963 100644 --- a/src/server/command/tp.zig +++ b/src/server/command/tp.zig @@ -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."; diff --git a/src/server/command/worldedit/blueprint.zig b/src/server/command/worldedit/blueprint.zig index a63a3922..59e57c2c 100644 --- a/src/server/command/worldedit/blueprint.zig +++ b/src/server/command/worldedit/blueprint.zig @@ -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; diff --git a/src/server/command/worldedit/copy.zig b/src/server/command/worldedit/copy.zig index b5c4e530..0b1d5f61 100644 --- a/src/server/command/worldedit/copy.zig +++ b/src/server/command/worldedit/copy.zig @@ -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; diff --git a/src/server/command/worldedit/deselect.zig b/src/server/command/worldedit/deselect.zig index 23d47ac8..be66739c 100644 --- a/src/server/command/worldedit/deselect.zig +++ b/src/server/command/worldedit/deselect.zig @@ -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."; diff --git a/src/server/command/worldedit/paste.zig b/src/server/command/worldedit/paste.zig index a9d6b2c7..27da5afb 100644 --- a/src/server/command/worldedit/paste.zig +++ b/src/server/command/worldedit/paste.zig @@ -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; diff --git a/src/server/command/worldedit/pos1.zig b/src/server/command/worldedit/pos1.zig index 620af0ad..72641234 100644 --- a/src/server/command/worldedit/pos1.zig +++ b/src/server/command/worldedit/pos1.zig @@ -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; diff --git a/src/server/command/worldedit/pos2.zig b/src/server/command/worldedit/pos2.zig index 4836dad2..034ce221 100644 --- a/src/server/command/worldedit/pos2.zig +++ b/src/server/command/worldedit/pos2.zig @@ -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; diff --git a/src/server/command/worldedit/rotate.zig b/src/server/command/worldedit/rotate.zig index f508b57a..8865c290 100644 --- a/src/server/command/worldedit/rotate.zig +++ b/src/server/command/worldedit/rotate.zig @@ -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; diff --git a/src/server/command/worldedit/undo.zig b/src/server/command/worldedit/undo.zig index 69e8e09d..a7cefc48 100644 --- a/src/server/command/worldedit/undo.zig +++ b/src/server/command/worldedit/undo.zig @@ -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; diff --git a/src/server/server.zig b/src/server/server.zig index fdc6dac5..232a17c5 100644 --- a/src/server/server.zig +++ b/src/server/server.zig @@ -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; diff --git a/src/server/storage.zig b/src/server/storage.zig index de06350f..3695b98e 100644 --- a/src/server/storage.zig +++ b/src/server/storage.zig @@ -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 server = @import("server.zig"); diff --git a/src/server/terrain/CaveBiomeMap.zig b/src/server/terrain/CaveBiomeMap.zig index cfef466e..39021c28 100644 --- a/src/server/terrain/CaveBiomeMap.zig +++ b/src/server/terrain/CaveBiomeMap.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array3D = main.utils.Array3D; const Cache = main.utils.Cache; const ServerChunk = main.chunk.ServerChunk; diff --git a/src/server/terrain/CaveMap.zig b/src/server/terrain/CaveMap.zig index df6b3677..1322fc40 100644 --- a/src/server/terrain/CaveMap.zig +++ b/src/server/terrain/CaveMap.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Atomic = std.atomic.Value; -const main = @import("root"); +const main = @import("main"); const ServerChunk = main.chunk.ServerChunk; const ChunkPosition = main.chunk.ChunkPosition; const Cache = main.utils.Cache; diff --git a/src/server/terrain/ClimateMap.zig b/src/server/terrain/ClimateMap.zig index 7cc0a7ac..1e5f5993 100644 --- a/src/server/terrain/ClimateMap.zig +++ b/src/server/terrain/ClimateMap.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Atomic = std.atomic.Value; -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; const Cache = main.utils.Cache; const ZonElement = main.ZonElement; diff --git a/src/server/terrain/LightMap.zig b/src/server/terrain/LightMap.zig index 24cbbf7f..5430054e 100644 --- a/src/server/terrain/LightMap.zig +++ b/src/server/terrain/LightMap.zig @@ -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.Chunk; const ChunkPosition = main.chunk.ChunkPosition; const Cache = main.utils.Cache; diff --git a/src/server/terrain/StructureMap.zig b/src/server/terrain/StructureMap.zig index c6c30307..ce11e7f7 100644 --- a/src/server/terrain/StructureMap.zig +++ b/src/server/terrain/StructureMap.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Atomic = std.atomic.Value; -const main = @import("root"); +const main = @import("main"); const ServerChunk = main.chunk.ServerChunk; const ChunkPosition = main.chunk.ChunkPosition; const Cache = main.utils.Cache; diff --git a/src/server/terrain/SurfaceMap.zig b/src/server/terrain/SurfaceMap.zig index 442cd6aa..7e1186a8 100644 --- a/src/server/terrain/SurfaceMap.zig +++ b/src/server/terrain/SurfaceMap.zig @@ -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.Chunk; const ChunkPosition = main.chunk.ChunkPosition; const Cache = main.utils.Cache; diff --git a/src/server/terrain/biomes.zig b/src/server/terrain/biomes.zig index 21da1a84..5c3d1810 100644 --- a/src/server/terrain/biomes.zig +++ b/src/server/terrain/biomes.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const blocks = main.blocks; const ServerChunk = main.chunk.ServerChunk; const ZonElement = main.ZonElement; diff --git a/src/server/terrain/cavebiomegen/RandomBiomeDistribution.zig b/src/server/terrain/cavebiomegen/RandomBiomeDistribution.zig index 3140ca55..e862c89a 100644 --- a/src/server/terrain/cavebiomegen/RandomBiomeDistribution.zig +++ b/src/server/terrain/cavebiomegen/RandomBiomeDistribution.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/cavegen/FractalCaveGenerator.zig b/src/server/terrain/cavegen/FractalCaveGenerator.zig index caeb430a..bf593c6a 100644 --- a/src/server/terrain/cavegen/FractalCaveGenerator.zig +++ b/src/server/terrain/cavegen/FractalCaveGenerator.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/cavegen/NoiseCaveGenerator.zig b/src/server/terrain/cavegen/NoiseCaveGenerator.zig index 313bc7b4..0798b180 100644 --- a/src/server/terrain/cavegen/NoiseCaveGenerator.zig +++ b/src/server/terrain/cavegen/NoiseCaveGenerator.zig @@ -1,7 +1,7 @@ const std = @import("std"); const sign = std.math.sign; -const main = @import("root"); +const main = @import("main"); const Array3D = main.utils.Array3D; const random = main.random; const ZonElement = main.ZonElement; diff --git a/src/server/terrain/cavegen/SurfaceGenerator.zig b/src/server/terrain/cavegen/SurfaceGenerator.zig index 2fd2acab..71bfc30f 100644 --- a/src/server/terrain/cavegen/SurfaceGenerator.zig +++ b/src/server/terrain/cavegen/SurfaceGenerator.zig @@ -1,7 +1,7 @@ const std = @import("std"); const sign = std.math.sign; -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/chunkgen/CrystalGenerator.zig b/src/server/terrain/chunkgen/CrystalGenerator.zig index 42f8b942..ef0b9658 100644 --- a/src/server/terrain/chunkgen/CrystalGenerator.zig +++ b/src/server/terrain/chunkgen/CrystalGenerator.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/chunkgen/OreGenerator.zig b/src/server/terrain/chunkgen/OreGenerator.zig index 16df656c..d926d1bb 100644 --- a/src/server/terrain/chunkgen/OreGenerator.zig +++ b/src/server/terrain/chunkgen/OreGenerator.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/chunkgen/StructureGenerator.zig b/src/server/terrain/chunkgen/StructureGenerator.zig index 31ca4fbd..5956dcfc 100644 --- a/src/server/terrain/chunkgen/StructureGenerator.zig +++ b/src/server/terrain/chunkgen/StructureGenerator.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/chunkgen/TerrainGenerator.zig b/src/server/terrain/chunkgen/TerrainGenerator.zig index 59d7671b..14432a86 100644 --- a/src/server/terrain/chunkgen/TerrainGenerator.zig +++ b/src/server/terrain/chunkgen/TerrainGenerator.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/climategen/NoiseBasedVoronoi.zig b/src/server/terrain/climategen/NoiseBasedVoronoi.zig index 9331c5b0..97c38329 100644 --- a/src/server/terrain/climategen/NoiseBasedVoronoi.zig +++ b/src/server/terrain/climategen/NoiseBasedVoronoi.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; const random = main.random; const ZonElement = main.ZonElement; diff --git a/src/server/terrain/mapgen/MapGenV1.zig b/src/server/terrain/mapgen/MapGenV1.zig index f9a473ac..ef539ca3 100644 --- a/src/server/terrain/mapgen/MapGenV1.zig +++ b/src/server/terrain/mapgen/MapGenV1.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; const random = main.random; const ZonElement = main.ZonElement; diff --git a/src/server/terrain/noise/BlueNoise.zig b/src/server/terrain/noise/BlueNoise.zig index fc272583..2a5b10e6 100644 --- a/src/server/terrain/noise/BlueNoise.zig +++ b/src/server/terrain/noise/BlueNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const Array2D = main.utils.Array2D; const NeverFailingAllocator = main.heap.NeverFailingAllocator; diff --git a/src/server/terrain/noise/CachedFractalNoise.zig b/src/server/terrain/noise/CachedFractalNoise.zig index 09067366..3f4ada5a 100644 --- a/src/server/terrain/noise/CachedFractalNoise.zig +++ b/src/server/terrain/noise/CachedFractalNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; const MapFragmentPosition = main.server.terrain.SurfaceMap.MapFragmentPosition; diff --git a/src/server/terrain/noise/CachedFractalNoise3D.zig b/src/server/terrain/noise/CachedFractalNoise3D.zig index 2edfc4eb..504d17f0 100644 --- a/src/server/terrain/noise/CachedFractalNoise3D.zig +++ b/src/server/terrain/noise/CachedFractalNoise3D.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array3D = main.utils.Array3D; const ChunkPosition = main.chunk.ChunkPosition; diff --git a/src/server/terrain/noise/FractalNoise.zig b/src/server/terrain/noise/FractalNoise.zig index a6b0b55c..e5ddf0d7 100644 --- a/src/server/terrain/noise/FractalNoise.zig +++ b/src/server/terrain/noise/FractalNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; fn setSeed(x: i32, y: i32, offsetX: i32, offsetY: i32, seed: *u64, worldSeed: u64, scale: u31, maxResolution: u31) void { diff --git a/src/server/terrain/noise/FractalNoise1D.zig b/src/server/terrain/noise/FractalNoise1D.zig index d492fdba..5e3b0bea 100644 --- a/src/server/terrain/noise/FractalNoise1D.zig +++ b/src/server/terrain/noise/FractalNoise1D.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); fn setSeed(x: i32, offsetX: i32, seed: *u64, worldSeed: u64, scale: u31) void { seed.* = main.random.initSeed2D(worldSeed, .{offsetX +% x, scale}); diff --git a/src/server/terrain/noise/FractalNoise3D.zig b/src/server/terrain/noise/FractalNoise3D.zig index c3f8576e..907ab2b3 100644 --- a/src/server/terrain/noise/FractalNoise3D.zig +++ b/src/server/terrain/noise/FractalNoise3D.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array3D = main.utils.Array3D; const ChunkPosition = main.chunk.ChunkPosition; const random = main.random; diff --git a/src/server/terrain/noise/PerlinNoise.zig b/src/server/terrain/noise/PerlinNoise.zig index 35ce1319..111265dc 100644 --- a/src/server/terrain/noise/PerlinNoise.zig +++ b/src/server/terrain/noise/PerlinNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; const random = main.random; const NeverFailingAllocator = main.heap.NeverFailingAllocator; diff --git a/src/server/terrain/noise/RandomlyWeightedFractalNoise.zig b/src/server/terrain/noise/RandomlyWeightedFractalNoise.zig index 8866805d..19199302 100644 --- a/src/server/terrain/noise/RandomlyWeightedFractalNoise.zig +++ b/src/server/terrain/noise/RandomlyWeightedFractalNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Array2D = main.utils.Array2D; fn setSeed(x: i32, y: i32, offsetX: i32, offsetY: i32, seed: *u64, worldSeed: u64, scale: u31, maxResolution: u31) void { diff --git a/src/server/terrain/noise/ValueNoise.zig b/src/server/terrain/noise/ValueNoise.zig index e5eb6a07..2478f497 100644 --- a/src/server/terrain/noise/ValueNoise.zig +++ b/src/server/terrain/noise/ValueNoise.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; fn getSeedX(x: f32, worldSeed: u64) u64 { diff --git a/src/server/terrain/simple_structures/Boulder.zig b/src/server/terrain/simple_structures/Boulder.zig index 9eec11ec..62e51002 100644 --- a/src/server/terrain/simple_structures/Boulder.zig +++ b/src/server/terrain/simple_structures/Boulder.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/FallenTree.zig b/src/server/terrain/simple_structures/FallenTree.zig index 056f07d7..14c2a993 100644 --- a/src/server/terrain/simple_structures/FallenTree.zig +++ b/src/server/terrain/simple_structures/FallenTree.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/FlowerPatch.zig b/src/server/terrain/simple_structures/FlowerPatch.zig index f32f1696..ebc47d4d 100644 --- a/src/server/terrain/simple_structures/FlowerPatch.zig +++ b/src/server/terrain/simple_structures/FlowerPatch.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/GroundPatch.zig b/src/server/terrain/simple_structures/GroundPatch.zig index 66037be8..3d90e819 100644 --- a/src/server/terrain/simple_structures/GroundPatch.zig +++ b/src/server/terrain/simple_structures/GroundPatch.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/SimpleTreeModel.zig b/src/server/terrain/simple_structures/SimpleTreeModel.zig index 3cdbf799..651d4a86 100644 --- a/src/server/terrain/simple_structures/SimpleTreeModel.zig +++ b/src/server/terrain/simple_structures/SimpleTreeModel.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/SimpleVegetation.zig b/src/server/terrain/simple_structures/SimpleVegetation.zig index 2ef4ffda..957b6880 100644 --- a/src/server/terrain/simple_structures/SimpleVegetation.zig +++ b/src/server/terrain/simple_structures/SimpleVegetation.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/simple_structures/Stalagmite.zig b/src/server/terrain/simple_structures/Stalagmite.zig index 8d1a0222..dc6e2c04 100644 --- a/src/server/terrain/simple_structures/Stalagmite.zig +++ b/src/server/terrain/simple_structures/Stalagmite.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/structure_building_blocks.zig b/src/server/terrain/structure_building_blocks.zig index 3f460583..e6e1b5bf 100644 --- a/src/server/terrain/structure_building_blocks.zig +++ b/src/server/terrain/structure_building_blocks.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const ZonElement = main.ZonElement; const Blueprint = main.blueprint.Blueprint; const List = main.List; diff --git a/src/server/terrain/structuremapgen/SimpleStructureGen.zig b/src/server/terrain/structuremapgen/SimpleStructureGen.zig index b79293be..72bc6e97 100644 --- a/src/server/terrain/structuremapgen/SimpleStructureGen.zig +++ b/src/server/terrain/structuremapgen/SimpleStructureGen.zig @@ -1,7 +1,7 @@ const std = @import("std"); const sign = std.math.sign; -const main = @import("root"); +const main = @import("main"); const random = main.random; const ZonElement = main.ZonElement; const terrain = main.server.terrain; diff --git a/src/server/terrain/terrain.zig b/src/server/terrain/terrain.zig index adc94b33..0e277cf2 100644 --- a/src/server/terrain/terrain.zig +++ b/src/server/terrain/terrain.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const ZonElement = main.ZonElement; const NeverFailingAllocator = main.heap.NeverFailingAllocator; diff --git a/src/server/world.zig b/src/server/world.zig index 0254d098..88ea1a61 100644 --- a/src/server/world.zig +++ b/src/server/world.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Block = main.blocks.Block; const Cache = main.utils.Cache; const chunk = main.chunk; diff --git a/src/settings.zig b/src/settings.zig index c6993f69..1a3f1286 100644 --- a/src/settings.zig +++ b/src/settings.zig @@ -2,7 +2,7 @@ const std = @import("std"); const builtin = @import("builtin"); const ZonElement = @import("zon.zig").ZonElement; -const main = @import("main.zig"); +const main = @import("main"); pub const defaultPort: u16 = 47649; pub const connectionTimeout = 60_000_000_000; diff --git a/src/tool/modifiers/bad_at.zig b/src/tool/modifiers/bad_at.zig index 77168851..27732642 100644 --- a/src/tool/modifiers/bad_at.zig +++ b/src/tool/modifiers/bad_at.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, tag: main.blocks.BlockTag, pad: u64 = undefined}; diff --git a/src/tool/modifiers/durable.zig b/src/tool/modifiers/durable.zig index 26a761f4..bd2cab94 100644 --- a/src/tool/modifiers/durable.zig +++ b/src/tool/modifiers/durable.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/fragile.zig b/src/tool/modifiers/fragile.zig index 5d07f59b..38f4c891 100644 --- a/src/tool/modifiers/fragile.zig +++ b/src/tool/modifiers/fragile.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/good_at.zig b/src/tool/modifiers/good_at.zig index 4e08e3ee..5044ab65 100644 --- a/src/tool/modifiers/good_at.zig +++ b/src/tool/modifiers/good_at.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, tag: main.blocks.BlockTag, pad: u64 = undefined}; diff --git a/src/tool/modifiers/heavy.zig b/src/tool/modifiers/heavy.zig index 2ff43b4b..a4001a82 100644 --- a/src/tool/modifiers/heavy.zig +++ b/src/tool/modifiers/heavy.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/light.zig b/src/tool/modifiers/light.zig index 9ea97d2d..41789e25 100644 --- a/src/tool/modifiers/light.zig +++ b/src/tool/modifiers/light.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/powerful.zig b/src/tool/modifiers/powerful.zig index f0e1c96c..b5ea6765 100644 --- a/src/tool/modifiers/powerful.zig +++ b/src/tool/modifiers/powerful.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/single_use.zig b/src/tool/modifiers/single_use.zig index 9437cff3..ec66b86e 100644 --- a/src/tool/modifiers/single_use.zig +++ b/src/tool/modifiers/single_use.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/tool/modifiers/weak.zig b/src/tool/modifiers/weak.zig index dc7c420f..2cb11033 100644 --- a/src/tool/modifiers/weak.zig +++ b/src/tool/modifiers/weak.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const main = @import("root"); +const main = @import("main"); const Tool = main.items.Tool; pub const Data = packed struct(u128) {strength: f32, pad: u96 = undefined}; diff --git a/src/utils.zig b/src/utils.zig index b72cb9c3..0a53ec33 100644 --- a/src/utils.zig +++ b/src/utils.zig @@ -3,7 +3,7 @@ const Allocator = std.mem.Allocator; const Atomic = std.atomic.Value; const builtin = @import("builtin"); -const main = @import("main.zig"); +const main = @import("main"); const NeverFailingAllocator = main.heap.NeverFailingAllocator; pub const file_monitor = @import("utils/file_monitor.zig"); diff --git a/src/utils/file_monitor.zig b/src/utils/file_monitor.zig index 74613afb..887b91e5 100644 --- a/src/utils/file_monitor.zig +++ b/src/utils/file_monitor.zig @@ -1,7 +1,7 @@ const std = @import("std"); const builtin = @import("builtin"); -const main = @import("root"); +const main = @import("main"); const CallbackFunction = *const fn(usize) void; diff --git a/src/utils/heap.zig b/src/utils/heap.zig index 1fc4a793..298e3da6 100644 --- a/src/utils/heap.zig +++ b/src/utils/heap.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Allocator = std.mem.Allocator; -const main = @import("root"); +const main = @import("main"); /// Allows for stack-like allocations in a fast and safe way. /// It is safe in the sense that a regular allocator will be used when the buffer is full. diff --git a/src/utils/list.zig b/src/utils/list.zig index f0774299..86b96ea9 100644 --- a/src/utils/list.zig +++ b/src/utils/list.zig @@ -1,7 +1,7 @@ const builtin = @import("builtin"); const std = @import("std"); -const main = @import("../main.zig"); +const main = @import("main"); const NeverFailingAllocator = main.heap.NeverFailingAllocator; fn growCapacity(current: usize, minimum: usize) usize { diff --git a/src/zon.zig b/src/zon.zig index e1ed67e0..fdf7fc94 100644 --- a/src/zon.zig +++ b/src/zon.zig @@ -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;