Rename GameManager to GM

Author: valkyrienyanko

Scenes/Main.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=14 format=2]
 
-[ext_resource path="res://Scripts/Scenes/Main/GameManager.cs" type="Script" id=1]
+[ext_resource path="res://Scripts/Scenes/Main/GM.cs" type="Script" id=1]
 [ext_resource path="res://Scripts/Scenes/Main/MusicManager.cs" type="Script" id=2]
 [ext_resource path="res://Scripts/Scenes/Main/Debug.cs" type="Script" id=3]
 [ext_resource path="res://Scripts/Netcode/Common/Utils/NetworkManager.cs" type="Script" id=4]

Scripts/Msc/Commands/CommandDebug.cs

@@ -18,7 +18,7 @@ public override void Run(string[] args)
 
             if (args[0] == "a")
                 if (NetworkManager.IsServerRunning())
-                    GameManager.Logger.LogDebug(NetworkManager.GameServer.Players.Print());
+                    GM.Logger.LogDebug(NetworkManager.GameServer.Players.Print());
         }
     }
 }

Scripts/Msc/Commands/CommandExit.cs

@@ -6,7 +6,7 @@ public class CommandExit : Command
 
         public override void Run(string[] args)
         {
-            GameManager.Exit();
+            GM.Exit();
         }
     }
 }

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) => GameManager.Logger.Log($"Commands:\n{CommandNames.Print()}");
+        public override void Run(string[] args) => GM.Logger.Log($"Commands:\n{CommandNames.Print()}");
     }
 }

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
-                GameManager.Logger.Log($"The command '{cmd}' does not exist");
+                GM.Logger.Log($"The command '{cmd}' does not exist");
 
             Console.Clear();
         }

Scripts/Msc/UIPopupCreateLobby.cs

@@ -94,7 +94,7 @@ private async void _on_Create_pressed()
                 Port = port,
                 Description = desc,
                 MaxPlayerCount = ValidatedMaxPlayerCount,
-                LobbyHost = GameManager.Options.OnlineUsername,
+                LobbyHost = GM.Options.OnlineUsername,
                 Public = Public.Pressed
             };
 
@@ -113,7 +113,7 @@ private async void _on_Create_pressed()
 
                 if (attempts == 0)
                 {
-                    GameManager.SpawnPopupMessage($"The port '{port}' must be port forwarded first");
+                    GM.SpawnPopupMessage($"The port '{port}' must be port forwarded first");
                     NetworkManager.GameServer.Stop();
                     dummyClient.Stop();
                     return;
@@ -131,7 +131,7 @@ await SceneGameServersScript.ClientConnect(async () => {
                 await NetworkManager.WaitForHostToConnectToServer();
                 await NetworkManager.GameClient.Send(ClientPacketOpcode.Lobby, new CPacketLobby(LobbyOpcode.LobbyCreate)
                 {
-                    Username = GameManager.Options.OnlineUsername,
+                    Username = GM.Options.OnlineUsername,
                     LobbyName = name,
                     LobbyDescription = desc
                 });

Scripts/Msc/UIPopupFileDialogMods.cs

@@ -15,7 +15,7 @@ public override void _Ready()
 
         public void Open()
         {
-            FileManager.CurrentDir = GameManager.ModLoader.PathMods;
+            FileManager.CurrentDir = GM.ModLoader.PathMods;
             FileManager.PopupCentered();
         }
 

Scripts/Netcode/Client/ENetClient.cs

@@ -61,7 +61,7 @@ public async void Start(string ip, ushort port)
             }
             catch (Exception e)
             {
-                GameManager.Logger.LogErr(e, "Client");
+                GM.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) => GameManager.Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
+        public void Log(object obj) => GM.Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
 
         /// <summary>
         /// This is in the ENet thread, anything from the ENet thread can be used here
@@ -171,7 +171,7 @@ private Task ENetThreadWorker(string ip, ushort port)
                                 continue;
                             }
 
-                            GameManager.GodotCommands.Enqueue(GodotOpcode.ENetPacket, new PacketReader(packet));
+                            GM.GodotCommands.Enqueue(GodotOpcode.ENetPacket, new PacketReader(packet));
                             break;
 
                         case EventType.Timeout:

Scripts/Netcode/Client/GameClient.cs

@@ -33,7 +33,7 @@ private void HandlePeerLeave(DisconnectOpcode opcode)
             NetworkManager.ClientConnectingToLobby = false;
             NetworkManager.ClientDisconnected = true;
             Connected = 0;
-            GameManager.GodotCommands.Enqueue(GodotOpcode.Disconnect, opcode);
+            GM.GodotCommands.Enqueue(GodotOpcode.Disconnect, opcode);
             if (CTSClientTask != null)
             {
                 CTSClientTask.Cancel();

Scripts/Netcode/Client/GodotCommands.cs

@@ -22,7 +22,7 @@ public async Task Dequeue()
 
                         if (!ENetClient.HandlePacket.ContainsKey(opcode))
                         {
-                            GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");
+                            GM.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} (Ignoring)");
                             break;
                         }
 
@@ -33,7 +33,7 @@ public async Task Dequeue()
                         }
                         catch (System.IO.EndOfStreamException ex)
                         {
-                            GameManager.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");
+                            GM.Logger.LogWarning($"[Client]: Received malformed opcode: {opcode} {ex.Message} (Ignoring)");
                             break;
                         }
                         await handlePacket.Handle();
@@ -42,7 +42,7 @@ public async Task Dequeue()
                         break;
 
                     case GodotOpcode.PopupMessage:
-                        GameManager.SpawnPopupMessage((string)cmd.Data);
+                        GM.SpawnPopupMessage((string)cmd.Data);
                         break;
 
                     case GodotOpcode.ChangeScene: