Remove all statics from GodotCommands.cs

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

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

Scripts/Netcode/Client/GodotCommands.cs

@@ -2,13 +2,13 @@
 
 namespace GodotModules
 {
-    public static class GodotCommands
+    public class GodotCommands
     {
-        private static ConcurrentQueue<ThreadCmd<GodotOpcode>> GodotCmdQueue = new ConcurrentQueue<ThreadCmd<GodotOpcode>>();
+        private ConcurrentQueue<ThreadCmd<GodotOpcode>> GodotCmdQueue = new ConcurrentQueue<ThreadCmd<GodotOpcode>>();
 
-        public static void Enqueue(GodotOpcode opcode, object data = null) => GodotCmdQueue.Enqueue(new ThreadCmd<GodotOpcode>(opcode, data));
+        public void Enqueue(GodotOpcode opcode, object data = null) => GodotCmdQueue.Enqueue(new ThreadCmd<GodotOpcode>(opcode, data));
 
-        public static async Task Dequeue()
+        public async Task Dequeue()
         {
             if (GodotCmdQueue.TryDequeue(out ThreadCmd<GodotOpcode> cmd))
             {

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
-                GodotCommands.Enqueue(GodotOpcode.PopupMessage, message);
+                GameManager.GodotCommands.Enqueue(GodotOpcode.PopupMessage, message);
                 NetworkManager.GameClient.Stop();
 #endif
                 Stop();

Scripts/Scenes/Main/GameManager.cs

@@ -10,6 +10,8 @@ public class GameManager : Node
         [Export] public readonly NodePath NodePathGameConsole;
         public static UIGameConsole GameConsole { get; set; }
 
+        public static GodotCommands GodotCommands { get; set; }
+
         public static string GameName = "Godot Modules";
         public static OptionsData Options { get; set; }
         public static SceneTree GameTree { get; set; }
@@ -18,6 +20,7 @@ public override void _Ready()
         {
             GameTree = GetTree();
             GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
+            GodotCommands = new GodotCommands();
         }
 
         public override async void _Process(float delta)