Move some statics to NetworkManager.cs

Author: valkyrienyanko

Scripts/Msc/Commands/Command.cs

@@ -1,5 +1,4 @@
 using System;
-
 using System.Reflection;
 
 namespace GodotModules

Scripts/Msc/UIPopupCreateLobby.cs

@@ -74,7 +74,7 @@ private void _on_Description_text_changed() =>
 
         private async void _on_Create_pressed()
         {
-            if (GameClient.ConnectingToLobby)
+            if (NetworkManager.ClientConnectingToLobby)
                 return;
 
             if (ValidatedName == null || ValidatedDescription == null)

Scripts/Netcode/Client/ENetClient.cs

@@ -49,7 +49,7 @@ public async void Start(string ip, ushort port)
             {
                 if (IsENetThreadRunning)
                 {
-                    GameClient.ConnectingToLobby = false;
+                    NetworkManager.ClientConnectingToLobby = false;
                     Log($"Client is running already");
                     return;
                 }

Scripts/Netcode/Client/GameClient.cs

@@ -4,9 +4,6 @@ namespace GodotModules.Netcode.Client
 {
     public class GameClient : ENetClient
     {
-        public static bool ConnectingToLobby { get; set; }
-        public static bool Disconnected { get; set; }
-
         public Dictionary<uint, string> Players { get; set; }
 
         public GameClient()
@@ -33,8 +30,8 @@ protected override void Disconnect(Event netEvent)
 
         private void HandlePeerLeave(DisconnectOpcode opcode)
         {
-            ConnectingToLobby = false;
-            Disconnected = true;
+            NetworkManager.ClientConnectingToLobby = false;
+            NetworkManager.ClientDisconnected = true;
             Connected = 0;
             GodotCommands.Enqueue(GodotOpcode.Disconnect, opcode);
             if (CTSClientTask != null)

Scripts/Netcode/Common/Utils/NetworkManager.cs

@@ -34,6 +34,8 @@ public override void _Ready()
         // SERVER
         public static GameServer GameServer { get; set; }
         public static ServerSimulation ServerSimulation { get; set; }
+        public static bool ClientConnectingToLobby { get; set; }
+        public static bool ClientDisconnected { get; set; }
         public static bool ServerAuthoritativeMovement { get; set; }
         private static int GameServerStillRunning { get; set; }
         public static bool IsServerRunning() => GameServer == null ? false : GameServer.IsRunning;

Scripts/Scenes/Game Servers/SceneGameServers.cs

@@ -31,9 +31,9 @@ public override async void _Ready()
 
             LobbyListings = new();
 
-            if (GameClient.Disconnected)
+            if (NetworkManager.ClientDisconnected)
             {
-                GameClient.Disconnected = false;
+                NetworkManager.ClientDisconnected = false;
                 var message = "Disconnected";
 
                 switch (NetworkManager.DisconnectOpcode)
@@ -83,11 +83,11 @@ public override void _Input(InputEvent @event)
 
         public async Task JoinServer(LobbyListing info, bool directConnect)
         {
-            if (GameClient.ConnectingToLobby)
+            if (NetworkManager.ClientConnectingToLobby)
                 return;
 
             NetworkManager.CurrentLobby = info;
-            GameClient.ConnectingToLobby = true;
+            NetworkManager.ClientConnectingToLobby = true;
 
             Logger.Log("Connecting to lobby...");
             NetworkManager.StartClient(info.Ip, info.Port);

Scripts/Scenes/Game Servers/UILobbyListing.cs

@@ -24,7 +24,7 @@ public class UILobbyListing : Control
         public override void _Ready()
         {
             SceneGameServersScript = SceneManager.GetActiveSceneScript<SceneGameServers>();
-            GameClient.ConnectingToLobby = false;
+            NetworkManager.ClientConnectingToLobby = false;
             LabelTitle = GetNode<Label>(NodePathLabelTitle);
             LabelDescription = GetNode<Label>(NodePathLabelDescription);
             LabelPing = GetNode<Label>(NodePathLabelPing);