From f84cd12c493c9db0d6dd78f5b8920fb3a26a7fe8 Mon Sep 17 00:00:00 2001 From: RDW Date: Fri, 15 Dec 2023 06:45:14 +0100 Subject: [PATCH] Refactor: Move the WorldServer prototype around It doesn't do much, but I'll probably want to research the various game mechanics more in the future. So for the time being, the server can stay, but it should be moved out of the way a little. --- Core/{World => WorldServer}/C_ServerHealth.lua | 0 Core/{ => WorldServer}/WorldServer.lua | 2 +- Tests/WorldServer/C_ServerHealth.spec.lua | 2 +- Tests/WorldServer/WorldServer.spec.lua | 4 ++-- main.lua | 5 ----- start-server.lua | 5 +++++ 6 files changed, 9 insertions(+), 9 deletions(-) rename Core/{World => WorldServer}/C_ServerHealth.lua (100%) rename Core/{ => WorldServer}/WorldServer.lua (97%) delete mode 100644 main.lua create mode 100644 start-server.lua diff --git a/Core/World/C_ServerHealth.lua b/Core/WorldServer/C_ServerHealth.lua similarity index 100% rename from Core/World/C_ServerHealth.lua rename to Core/WorldServer/C_ServerHealth.lua diff --git a/Core/WorldServer.lua b/Core/WorldServer/WorldServer.lua similarity index 97% rename from Core/WorldServer.lua rename to Core/WorldServer/WorldServer.lua index d1b4462c..7cd495d2 100644 --- a/Core/WorldServer.lua +++ b/Core/WorldServer/WorldServer.lua @@ -1,7 +1,7 @@ local ffi = require("ffi") local uv = require("uv") -local C_ServerHealth = require("Core.World.C_ServerHealth") +local C_ServerHealth = require("Core.WorldServer.C_ServerHealth") local TARGET_FPS = 50 diff --git a/Tests/WorldServer/C_ServerHealth.spec.lua b/Tests/WorldServer/C_ServerHealth.spec.lua index d4df0e20..9744920a 100644 --- a/Tests/WorldServer/C_ServerHealth.spec.lua +++ b/Tests/WorldServer/C_ServerHealth.spec.lua @@ -1,4 +1,4 @@ -local C_ServerHealth = require("Core.World.C_ServerHealth") +local C_ServerHealth = require("Core.WorldServer.C_ServerHealth") describe("C_ServerHealth", function() describe("UpdateWithTickTime", function() diff --git a/Tests/WorldServer/WorldServer.spec.lua b/Tests/WorldServer/WorldServer.spec.lua index 590708fc..45c72d03 100644 --- a/Tests/WorldServer/WorldServer.spec.lua +++ b/Tests/WorldServer/WorldServer.spec.lua @@ -1,8 +1,8 @@ local console = require("console") local uv = require("uv") -local WorldServer = require("Core.WorldServer") -local C_ServerHealth = require("Core.World.C_ServerHealth") +local WorldServer = require("Core.WorldServer.WorldServer") +local C_ServerHealth = require("Core.WorldServer.C_ServerHealth") local function simulateServerTick() local startTime = uv.hrtime() diff --git a/main.lua b/main.lua deleted file mode 100644 index 89f43002..00000000 --- a/main.lua +++ /dev/null @@ -1,5 +0,0 @@ -package.path = "?.lua" - -local WorldServer = require("Core.WorldServer") - -WorldServer:Start() diff --git a/start-server.lua b/start-server.lua new file mode 100644 index 00000000..a5c87b25 --- /dev/null +++ b/start-server.lua @@ -0,0 +1,5 @@ +package.path = "?.lua" + +local WorldServer = require("Core.WorldServer.WorldServer") + +WorldServer:Start()