Remove all statics from Logger

valkyrienyanko · valkyrienyanko · commit 9c382cc5a9f9 · 2022-05-10T14:12:12.000-05:00
diff --git a/Scripts/Msc/Commands/CommandDebug.cs b/Scripts/Msc/Commands/CommandDebug.cs
@@ -18,7 +18,7 @@ public override void Run(string[] args)
 
             if (args[0] == "a")
                 if (NetworkManager.IsServerRunning())
-                    Logger.LogDebug(NetworkManager.GameServer.Players.Print());
+                    GameManager.Logger.LogDebug(NetworkManager.GameServer.Players.Print());
         }
     }
 }
diff --git a/Scripts/Msc/Commands/CommandHelp.cs b/Scripts/Msc/Commands/CommandHelp.cs
@@ -12,6 +12,6 @@ public class CommandHelp : Command
                 .Select(Activator.CreateInstance).Cast<Command>()
                 .Select(x => x.GetType().Name.Replace("Command", "").ToLower()).ToList();
 
-        public override void Run(string[] args) => Logger.Log($"Commands:\n{CommandNames.Print()}");
+        public override void Run(string[] args) => GameManager.Logger.Log($"Commands:\n{CommandNames.Print()}");
     }
 }
diff --git a/Scripts/Msc/UIGameConsole.cs b/Scripts/Msc/UIGameConsole.cs
@@ -49,7 +49,7 @@ private void _on_Console_text_entered(string text)
             if (command != null)
                 command.Run(inputArr.Skip(1).ToArray());
             else
-                Logger.Log($"The command '{cmd}' does not exist");
+                GameManager.Logger.Log($"The command '{cmd}' does not exist");
 
             Console.Clear();
         }
diff --git a/Scripts/Netcode/Client/ENetClient.cs b/Scripts/Netcode/Client/ENetClient.cs
@@ -61,7 +61,7 @@ public async void Start(string ip, ushort port)
             }
             catch (Exception e)
             {
-                Logger.LogErr(e, "Client");
+                GameManager.Logger.LogErr(e, "Client");
             }
         }
 
@@ -70,7 +70,7 @@ public async void Start(string ip, ushort port)
         /// </summary>
         public void Stop() => ENetCmds.Enqueue(new ThreadCmd<ENetOpcode>(ENetOpcode.ClientWantsToDisconnect));
 
-        public void Log(object obj) => Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
+        public void Log(object obj) => GameManager.Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
 
         /// <summary>
         /// This is in the ENet thread, anything from the ENet thread can be used here
diff --git a/Scripts/Netcode/Client/GodotCommands.cs b/Scripts/Netcode/Client/GodotCommands.cs
@@ -22,7 +22,7 @@ public async Task Dequeue()
 
                         if (!ENetClient.HandlePacket.ContainsKey(opcode))
                         {
-                            Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");
+                            GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");
                             break;
                         }
 
@@ -33,7 +33,7 @@ public async Task Dequeue()
                         }
                         catch (System.IO.EndOfStreamException ex)
                         {
-                            Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");
+                            GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");
                             break;
                         }
                         await handlePacket.Handle();
diff --git a/Scripts/Netcode/Common/Server/ENetServer.cs b/Scripts/Netcode/Common/Server/ENetServer.cs
@@ -47,7 +47,7 @@ public async Task Start(ushort port, int maxClients)
             }
             catch (Exception e)
             {
-                Logger.LogErr(e, "Server");
+                GameManager.Logger.LogErr(e, "Server");
             }
         }
 
@@ -75,7 +75,7 @@ public void Kick(uint id, DisconnectOpcode opcode)
 
         public void Send(ServerPacketOpcode opcode, APacket data, PacketFlags flags = PacketFlags.Reliable, params Peer[] peers) => Outgoing.Enqueue(new ServerPacket((byte)opcode, flags, data, peers));
 
-        public void Log(object obj) => Logger.Log($"[Server]: {obj}", ConsoleColor.Cyan);
+        public void Log(object obj) => GameManager.Logger.Log($"[Server]: {obj}", ConsoleColor.Cyan);
 
         protected Peer[] GetOtherPeers(uint id)
         {
@@ -188,7 +188,7 @@ private Task ENetThreadWorker(ushort port, int maxClients)
 
                         if (!HandlePacket.ContainsKey(opcode))
                         {
-                            Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} (Ignoring)");
+                            GameManager.Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} (Ignoring)");
                             break;
                         }
 
@@ -199,7 +199,7 @@ private Task ENetThreadWorker(ushort port, int maxClients)
                         }
                         catch (System.IO.EndOfStreamException e)
                         {
-                            Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} {e.Message} (Ignoring)");
+                            GameManager.Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} {e.Message} (Ignoring)");
                             break;
                         }
                         handlePacket.Handle(netEvent.Peer);
diff --git a/Scripts/Netcode/Common/Utils/Extensions.cs b/Scripts/Netcode/Common/Utils/Extensions.cs
@@ -14,7 +14,7 @@ public static bool Duplicate<TKey, TValue>(this IDictionary<TKey, TValue> dict,
         {
             if (dict.ContainsKey(key))
             {
-                Logger.LogWarning($"'{caller}' tried to add duplicate key '{key}' to dictionary\n" +
+                GameManager.Logger.LogWarning($"'{caller}' tried to add duplicate key '{key}' to dictionary\n" +
                     $"   at {path} line:{lineNumber}");
                 return true;
             }
@@ -29,7 +29,7 @@ public static bool DoesNotHave<TKey, TValue>(this IDictionary<TKey, TValue> dict
         {
             if (!dict.ContainsKey(key))
             {
-                Logger.LogWarning($"'{caller}' tried to access non-existent key '{key}' from dictionary\n" +
+                GameManager.Logger.LogWarning($"'{caller}' tried to access non-existent key '{key}' from dictionary\n" +
                     $"   at {path} line:{lineNumber}");
                 return true;
             }
diff --git a/Scripts/Netcode/Common/Utils/GodotFileManager.cs b/Scripts/Netcode/Common/Utils/GodotFileManager.cs
@@ -24,7 +24,7 @@ public static bool LoadDir(string path, System.Action<Directory, string> action)
             var error = dir.Open($"res://{path}");
             if (error != Error.Ok)
             {
-                Logger.LogWarning($"Failed to open {path}");
+                GameManager.Logger.LogWarning($"Failed to open {path}");
                 return false;
             }
 
diff --git a/Scripts/Netcode/Common/Utils/Logger.cs b/Scripts/Netcode/Common/Utils/Logger.cs
@@ -5,21 +5,21 @@
 
 namespace GodotModules
 {
-    public static class Logger
+    public class Logger
     {
-        private static ConcurrentQueue<ThreadCmd<LoggerOpcode>> Messages = new ConcurrentQueue<ThreadCmd<LoggerOpcode>>();
+        private ConcurrentQueue<ThreadCmd<LoggerOpcode>> Messages = new ConcurrentQueue<ThreadCmd<LoggerOpcode>>();
 
-        public static void LogErr(Exception ex, string hint = "")
+        public void LogErr(Exception ex, string hint = "")
         {
             Messages.Enqueue(new ThreadCmd<LoggerOpcode>(LoggerOpcode.LogError, new GodotError
             {
                 Exception = ex,
                 Hint = hint
             }));
         }
-        public static void LogTODO(object v, ConsoleColor color = ConsoleColor.White) => Log($"[TODO]: {v}", color);
-        public static void LogWarning(object v, ConsoleColor color = ConsoleColor.Yellow) => Log($"[Warning]: {v}", color);
-        public static void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta, bool trace = true, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)
+        public void LogTODO(object v, ConsoleColor color = ConsoleColor.White) => Log($"[TODO]: {v}", color);
+        public void LogWarning(object v, ConsoleColor color = ConsoleColor.Yellow) => Log($"[Warning]: {v}", color);
+        public void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta, bool trace = true, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)
         {
             var path = "";
             if (trace)
@@ -32,7 +32,7 @@ public static void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta,
                 Color = color
             }));
         }
-        public static void Log(object v, ConsoleColor color = ConsoleColor.Gray)
+        public void Log(object v, ConsoleColor color = ConsoleColor.Gray)
         {
             Messages.Enqueue(new ThreadCmd<LoggerOpcode>(LoggerOpcode.LogMessage, new GodotMessage
             {
@@ -41,7 +41,7 @@ public static void Log(object v, ConsoleColor color = ConsoleColor.Gray)
             }));
         }
 
-        public static void LogMs(Action code)
+        public void LogMs(Action code)
         {
             var watch = new Stopwatch();
             watch.Start();
@@ -50,7 +50,7 @@ public static void LogMs(Action code)
             Log($"Took {watch.ElapsedMilliseconds} ms");
         }
 
-        public static void Dequeue()
+        public void Dequeue()
         {
             if (Messages.TryDequeue(out ThreadCmd<LoggerOpcode> cmd))
             {
diff --git a/Scripts/Netcode/Common/Utils/NetworkManager.cs b/Scripts/Netcode/Common/Utils/NetworkManager.cs
@@ -27,7 +27,7 @@ public override void _Ready()
             ENetInitialized = ENet.Library.Initialize();
             if (!ENetInitialized)
             {
-                Logger.LogWarning("Failed to initialize ENet! Remember ENet-CSharp.dll AND enet.dll are required in order for ENet to run properly!");
+                GameManager.Logger.LogWarning("Failed to initialize ENet! Remember ENet-CSharp.dll AND enet.dll are required in order for ENet to run properly!");
             }
         }
 
@@ -80,7 +80,7 @@ private static async Task ExitCleanup()
                     {
                         GameServerStillRunning++;
                         if (GameServerStillRunning > 4)
-                            Logger.LogDebug("Game server taking a long time to stop");
+                            GameManager.Logger.LogDebug("Game server taking a long time to stop");
                         await Task.Delay(100);
                     }
                 }
@@ -94,7 +94,7 @@ private static async Task ExitCleanup()
                     {
                         GameClientStillRunning++;
                         if (GameClientStillRunning > 4)
-                            Logger.LogDebug("Game client taking a long time to stop");
+                            GameManager.Logger.LogDebug("Game client taking a long time to stop");
                         await Task.Delay(100);
                     }
                 }
@@ -106,7 +106,7 @@ private static async Task ExitCleanup()
             }
             catch (Exception e)
             {
-                Logger.LogErr(e, "Game exit cleanup");
+                GameManager.Logger.LogErr(e, "Game exit cleanup");
                 await Task.Delay(3000);
             }
 
diff --git a/Scripts/Netcode/Common/Utils/WebClient.cs b/Scripts/Netcode/Common/Utils/WebClient.cs
@@ -96,7 +96,7 @@ private async Task<WebServerResponse<string>> PostAsync(string path, Dictionary<
                 if (LogExceptions)
                 {
                     var message = $"Failed to POST to http://{WEB_SERVER_IP}/api/{path} {e.Message}";
-                    Logger.LogWarning(message);
+                    GameManager.Logger.LogWarning(message);
                 }
                 return new WebServerResponse<string>
                 {
@@ -141,7 +141,7 @@ public async Task<WebServerResponse<T>> Get<T>(string path)
                 if (LogExceptions)
                 {
                     var message = $"Failed to GET from http://{WEB_SERVER_IP}/api/{path} {e.Message}";
-                    Logger.LogWarning(message); // no need to notify user of this kind of error
+                    GameManager.Logger.LogWarning(message); // no need to notify user of this kind of error
                 }
                 return new WebServerResponse<T>
                 {
diff --git a/Scripts/Scenes/Game Servers/SceneGameServers.cs b/Scripts/Scenes/Game Servers/SceneGameServers.cs
@@ -89,7 +89,7 @@ public async Task JoinServer(LobbyListing info, bool directConnect)
             NetworkManager.CurrentLobby = info;
             NetworkManager.ClientConnectingToLobby = true;
 
-            Logger.Log("Connecting to lobby...");
+            GameManager.Logger.Log("Connecting to lobby...");
             NetworkManager.StartClient(info.Ip, info.Port);
 
             await ClientConnect(async () =>
@@ -162,7 +162,7 @@ public async Task ListServers()
                     }
                     catch (TaskCanceledException)
                     {
-                        Logger.LogDebug("Dummy client task cancelled (A)");
+                        GameManager.Logger.LogDebug("Dummy client task cancelled (A)");
                     }
                 }, CTSPingServers.Token);
 
@@ -173,7 +173,7 @@ public async Task ListServers()
                     await task;
                 } catch(TaskCanceledException)
                 {
-                    Logger.LogDebug("Dummy client task cancelled (B)");
+                    GameManager.Logger.LogDebug("Dummy client task cancelled (B)");
                 }
 
                 if (!CTSPingServers.IsCancellationRequested)
diff --git a/Scripts/Scenes/Main/GameManager.cs b/Scripts/Scenes/Main/GameManager.cs
@@ -11,6 +11,7 @@ public class GameManager : Node
         public static ModLoader ModLoader { get; set; }
         public static UIGameConsole GameConsole { get; set; }
         public static GodotCommands GodotCommands { get; set; }
+        public static Logger Logger { get; set; }
 
         public static string GameName = "Godot Modules";
         public static OptionsData Options { get; set; }
@@ -21,6 +22,7 @@ public override void _Ready()
             GameTree = GetTree();
             GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
             GodotCommands = new GodotCommands();
+            Logger = new Logger();
         }
 
         public override async void _Process(float delta)
diff --git a/Scripts/Scenes/Menu/ModLoader.cs b/Scripts/Scenes/Menu/ModLoader.cs
@@ -132,7 +132,7 @@ public void Call(string v, params object[] args)
             catch (ScriptRuntimeException e)
             {
                 UIModLoader.Log($"{e.DecoratedMessage}");
-                Logger.LogErr(e, $"[ModLoader]: ");
+                GameManager.Logger.LogErr(e, $"[ModLoader]: ");
             }
         }
 
@@ -160,7 +160,7 @@ public void GetModsEnabled()
 
         private void Log(object obj)
         {
-            Logger.Log($"[ModLoader]: {obj}");
+            GameManager.Logger.Log($"[ModLoader]: {obj}");
             UIModLoader.Log($"{obj}");
         }
 
@@ -182,7 +182,7 @@ private void LoadLuaScripts(string directory)
                     else
                     {
                         UIModLoader.Log($"Could not open file: {absolutePath}");
-                        Logger.LogWarning($"Could not open file: {absolutePath}");
+                        GameManager.Logger.LogWarning($"Could not open file: {absolutePath}");
                     }
                 }
             });
@@ -257,7 +257,7 @@ private void LoadMod(Mod mod, ref int modLoadedCount)
             {
                 // Mod script did not run right
                 UIModLoader.Log($"{e.DecoratedMessage}");
-                Logger.LogErr(e, "[ModLoader]: ");
+                GameManager.Logger.LogErr(e, "[ModLoader]: ");
             }
         }
 
diff --git a/Scripts/Scenes/Menu/UIModLoader.cs b/Scripts/Scenes/Menu/UIModLoader.cs
@@ -150,7 +150,7 @@ private void _on_Open_Mods_Folder_pressed()
             }
             catch (Exception e)
             {
-                GodotModules.Logger.LogErr(e);
+                GameManager.Logger.LogErr(e);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public override void Run(string[] args)`
`18`	`18`
`19`	`19`	`if (args[0] == "a")`
`20`	`20`	`if (NetworkManager.IsServerRunning())`
`21`		`- Logger.LogDebug(NetworkManager.GameServer.Players.Print());`
	`21`	`+ GameManager.Logger.LogDebug(NetworkManager.GameServer.Players.Print());`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public class CommandHelp : Command`
`12`	`12`	`.Select(Activator.CreateInstance).Cast<Command>()`
`13`	`13`	`.Select(x => x.GetType().Name.Replace("Command", "").ToLower()).ToList();`
`14`	`14`
`15`		`- public override void Run(string[] args) => Logger.Log($"Commands:\n{CommandNames.Print()}");`
	`15`	`+ public override void Run(string[] args) => GameManager.Logger.Log($"Commands:\n{CommandNames.Print()}");`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private void _on_Console_text_entered(string text)`
`49`	`49`	`if (command != null)`
`50`	`50`	`command.Run(inputArr.Skip(1).ToArray());`
`51`	`51`	`else`
`52`		`- Logger.Log($"The command '{cmd}' does not exist");`
	`52`	`+ GameManager.Logger.Log($"The command '{cmd}' does not exist");`
`53`	`53`
`54`	`54`	`Console.Clear();`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public async void Start(string ip, ushort port)`
`61`	`61`	`}`
`62`	`62`	`catch (Exception e)`
`63`	`63`	`{`
`64`		`- Logger.LogErr(e, "Client");`
	`64`	`+ GameManager.Logger.LogErr(e, "Client");`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`@@ -70,7 +70,7 @@ public async void Start(string ip, ushort port)`
`70`	`70`	`/// </summary>`
`71`	`71`	`public void Stop() => ENetCmds.Enqueue(new ThreadCmd<ENetOpcode>(ENetOpcode.ClientWantsToDisconnect));`
`72`	`72`
`73`		`- public void Log(object obj) => Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);`
	`73`	`+ public void Log(object obj) => GameManager.Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);`
`74`	`74`
`75`	`75`	`/// <summary>`
`76`	`76`	`/// This is in the ENet thread, anything from the ENet thread can be used here`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public async Task Dequeue()`
`22`	`22`
`23`	`23`	`if (!ENetClient.HandlePacket.ContainsKey(opcode))`
`24`	`24`	`{`
`25`		`- Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");`
	`25`	`+ GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");`
`26`	`26`	`break;`
`27`	`27`	`}`
`28`	`28`
`@@ -33,7 +33,7 @@ public async Task Dequeue()`
`33`	`33`	`}`
`34`	`34`	`catch (System.IO.EndOfStreamException ex)`
`35`	`35`	`{`
`36`		`- Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");`
	`36`	`+ GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");`
`37`	`37`	`break;`
`38`	`38`	`}`
`39`	`39`	`await handlePacket.Handle();`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public async Task Start(ushort port, int maxClients)`
`47`	`47`	`}`
`48`	`48`	`catch (Exception e)`
`49`	`49`	`{`
`50`		`- Logger.LogErr(e, "Server");`
	`50`	`+ GameManager.Logger.LogErr(e, "Server");`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`@@ -75,7 +75,7 @@ public void Kick(uint id, DisconnectOpcode opcode)`
`75`	`75`
`76`	`76`	`public void Send(ServerPacketOpcode opcode, APacket data, PacketFlags flags = PacketFlags.Reliable, params Peer[] peers) => Outgoing.Enqueue(new ServerPacket((byte)opcode, flags, data, peers));`
`77`	`77`
`78`		`- public void Log(object obj) => Logger.Log($"[Server]: {obj}", ConsoleColor.Cyan);`
	`78`	`+ public void Log(object obj) => GameManager.Logger.Log($"[Server]: {obj}", ConsoleColor.Cyan);`
`79`	`79`
`80`	`80`	`protected Peer[] GetOtherPeers(uint id)`
`81`	`81`	`{`
`@@ -188,7 +188,7 @@ private Task ENetThreadWorker(ushort port, int maxClients)`
`188`	`188`
`189`	`189`	`if (!HandlePacket.ContainsKey(opcode))`
`190`	`190`	`{`
`191`		`- Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} (Ignoring)");`
	`191`	`+ GameManager.Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} (Ignoring)");`
`192`	`192`	`break;`
`193`	`193`	`}`
`194`	`194`
`@@ -199,7 +199,7 @@ private Task ENetThreadWorker(ushort port, int maxClients)`
`199`	`199`	`}`
`200`	`200`	`catch (System.IO.EndOfStreamException e)`
`201`	`201`	`{`
`202`		`- Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} {e.Message} (Ignoring)");`
	`202`	`+ GameManager.Logger.LogWarning($"[Server]: Received malformed opcode: {opcode} {e.Message} (Ignoring)");`
`203`	`203`	`break;`
`204`	`204`	`}`
`205`	`205`	`handlePacket.Handle(netEvent.Peer);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static bool Duplicate<TKey, TValue>(this IDictionary<TKey, TValue> dict,`
`14`	`14`	`{`
`15`	`15`	`if (dict.ContainsKey(key))`
`16`	`16`	`{`
`17`		`- Logger.LogWarning($"'{caller}' tried to add duplicate key '{key}' to dictionary\n" +`
	`17`	`+ GameManager.Logger.LogWarning($"'{caller}' tried to add duplicate key '{key}' to dictionary\n" +`
`18`	`18`	`$" at {path} line:{lineNumber}");`
`19`	`19`	`return true;`
`20`	`20`	`}`
`@@ -29,7 +29,7 @@ public static bool DoesNotHave<TKey, TValue>(this IDictionary<TKey, TValue> dict`
`29`	`29`	`{`
`30`	`30`	`if (!dict.ContainsKey(key))`
`31`	`31`	`{`
`32`		`- Logger.LogWarning($"'{caller}' tried to access non-existent key '{key}' from dictionary\n" +`
	`32`	`+ GameManager.Logger.LogWarning($"'{caller}' tried to access non-existent key '{key}' from dictionary\n" +`
`33`	`33`	`$" at {path} line:{lineNumber}");`
`34`	`34`	`return true;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static bool LoadDir(string path, System.Action<Directory, string> action)`
`24`	`24`	`var error = dir.Open($"res://{path}");`
`25`	`25`	`if (error != Error.Ok)`
`26`	`26`	`{`
`27`		`- Logger.LogWarning($"Failed to open {path}");`
	`27`	`+ GameManager.Logger.LogWarning($"Failed to open {path}");`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,21 @@`
`5`	`5`
`6`	`6`	`namespace GodotModules`
`7`	`7`	`{`
`8`		`- public static class Logger`
	`8`	`+ public class Logger`
`9`	`9`	`{`
`10`		`- private static ConcurrentQueue<ThreadCmd<LoggerOpcode>> Messages = new ConcurrentQueue<ThreadCmd<LoggerOpcode>>();`
	`10`	`+ private ConcurrentQueue<ThreadCmd<LoggerOpcode>> Messages = new ConcurrentQueue<ThreadCmd<LoggerOpcode>>();`
`11`	`11`
`12`		`- public static void LogErr(Exception ex, string hint = "")`
	`12`	`+ public void LogErr(Exception ex, string hint = "")`
`13`	`13`	`{`
`14`	`14`	`Messages.Enqueue(new ThreadCmd<LoggerOpcode>(LoggerOpcode.LogError, new GodotError`
`15`	`15`	`{`
`16`	`16`	`Exception = ex,`
`17`	`17`	`Hint = hint`
`18`	`18`	`}));`
`19`	`19`	`}`
`20`		`- public static void LogTODO(object v, ConsoleColor color = ConsoleColor.White) => Log($"[TODO]: {v}", color);`
`21`		`- public static void LogWarning(object v, ConsoleColor color = ConsoleColor.Yellow) => Log($"[Warning]: {v}", color);`
`22`		`- public static void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta, bool trace = true, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)`
	`20`	`+ public void LogTODO(object v, ConsoleColor color = ConsoleColor.White) => Log($"[TODO]: {v}", color);`
	`21`	`+ public void LogWarning(object v, ConsoleColor color = ConsoleColor.Yellow) => Log($"[Warning]: {v}", color);`
	`22`	`+ public void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta, bool trace = true, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0)`
`23`	`23`	`{`
`24`	`24`	`var path = "";`
`25`	`25`	`if (trace)`
`@@ -32,7 +32,7 @@ public static void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta,`
`32`	`32`	`Color = color`
`33`	`33`	`}));`
`34`	`34`	`}`
`35`		`- public static void Log(object v, ConsoleColor color = ConsoleColor.Gray)`
	`35`	`+ public void Log(object v, ConsoleColor color = ConsoleColor.Gray)`
`36`	`36`	`{`
`37`	`37`	`Messages.Enqueue(new ThreadCmd<LoggerOpcode>(LoggerOpcode.LogMessage, new GodotMessage`
`38`	`38`	`{`
`@@ -41,7 +41,7 @@ public static void Log(object v, ConsoleColor color = ConsoleColor.Gray)`
`41`	`41`	`}));`
`42`	`42`	`}`
`43`	`43`
`44`		`- public static void LogMs(Action code)`
	`44`	`+ public void LogMs(Action code)`
`45`	`45`	`{`
`46`	`46`	`var watch = new Stopwatch();`
`47`	`47`	`watch.Start();`
`@@ -50,7 +50,7 @@ public static void LogMs(Action code)`
`50`	`50`	`Log($"Took {watch.ElapsedMilliseconds} ms");`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static void Dequeue()`
	`53`	`+ public void Dequeue()`
`54`	`54`	`{`
`55`	`55`	`if (Messages.TryDequeue(out ThreadCmd<LoggerOpcode> cmd))`
`56`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override void _Ready()`
`27`	`27`	`ENetInitialized = ENet.Library.Initialize();`
`28`	`28`	`if (!ENetInitialized)`
`29`	`29`	`{`
`30`		`- Logger.LogWarning("Failed to initialize ENet! Remember ENet-CSharp.dll AND enet.dll are required in order for ENet to run properly!");`
	`30`	`+ GameManager.Logger.LogWarning("Failed to initialize ENet! Remember ENet-CSharp.dll AND enet.dll are required in order for ENet to run properly!");`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -80,7 +80,7 @@ private static async Task ExitCleanup()`
`80`	`80`	`{`
`81`	`81`	`GameServerStillRunning++;`
`82`	`82`	`if (GameServerStillRunning > 4)`
`83`		`- Logger.LogDebug("Game server taking a long time to stop");`
	`83`	`+ GameManager.Logger.LogDebug("Game server taking a long time to stop");`
`84`	`84`	`await Task.Delay(100);`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -94,7 +94,7 @@ private static async Task ExitCleanup()`
`94`	`94`	`{`
`95`	`95`	`GameClientStillRunning++;`
`96`	`96`	`if (GameClientStillRunning > 4)`
`97`		`- Logger.LogDebug("Game client taking a long time to stop");`
	`97`	`+ GameManager.Logger.LogDebug("Game client taking a long time to stop");`
`98`	`98`	`await Task.Delay(100);`
`99`	`99`	`}`
`100`	`100`	`}`
`@@ -106,7 +106,7 @@ private static async Task ExitCleanup()`
`106`	`106`	`}`
`107`	`107`	`catch (Exception e)`
`108`	`108`	`{`
`109`		`- Logger.LogErr(e, "Game exit cleanup");`
	`109`	`+ GameManager.Logger.LogErr(e, "Game exit cleanup");`
`110`	`110`	`await Task.Delay(3000);`
`111`	`111`	`}`
`112`	`112`