Encapsulate GodotCommands.Enqueue

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -171,7 +171,7 @@ private Task ENetThreadWorker(string ip, ushort port)
                                 continue;
                             }
 
-                            GM.GodotCommands.Enqueue(GodotOpcode.ENetPacket, new PacketReader(packet));
+                            GM.EnqueueGodotCmd(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;
-            GM.GodotCommands.Enqueue(GodotOpcode.Disconnect, opcode);
+            GM.EnqueueGodotCmd(GodotOpcode.Disconnect, opcode);
             if (CTSClientTask != null)
             {
                 CTSClientTask.Cancel();

Scripts/Netcode/Common/Server/ENetServer.cs

@@ -136,7 +136,7 @@ private Task ENetThreadWorker(ushort port, int maxClients)
                 var message = $"A server is running on port {port} already! {e.Message}";
                 Log(message);
 #if CLIENT
-                GM.GodotCommands.Enqueue(GodotOpcode.PopupMessage, message);
+                GM.EnqueueGodotCmd(GodotOpcode.PopupMessage, message);
                 NetworkManager.GameClient.Stop();
 #endif
                 Stop();

Scripts/Scenes/Main/GM.cs

@@ -11,7 +11,7 @@ public class GM : Node
         [Export] public readonly NodePath NodePathGameConsole;
         public static ModLoader ModLoader { get; set; }
         public static UIGameConsole GameConsole { get; set; }
-        public static GodotCommands GodotCommands { get; set; }
+        private static GodotCommands GodotCommands { get; set; }
         private static Logger Logger { get; set; }
 
         public static string GameName = "Godot Modules";
@@ -63,6 +63,8 @@ public static void SpawnPopupError(Exception e)
             popupError.PopupCentered();
         }
 
+        public static void EnqueueGodotCmd(GodotOpcode opcode, object data = null) => GodotCommands.Enqueue(opcode, data);
+
         public static void Log(object v, ConsoleColor color = ConsoleColor.Gray) => Logger.Log(v, color);
         public static void LogWarning(object v, ConsoleColor color = ConsoleColor.Yellow) => Logger.LogWarning(v, color);
         public static void LogDebug(object v, ConsoleColor color = ConsoleColor.Magenta, bool trace = true, [CallerFilePath] string filePath = "", [CallerLineNumber] int lineNumber = 0) => Logger.LogDebug(v, color, trace, filePath, lineNumber);