more encapsulation

Author: valkyrienyanko

Scripts/Netcode/Common/Utils/Logger.cs

@@ -75,7 +75,7 @@ public void Dequeue()
                         Console.ResetColor();
 
 #if CLIENT
-                        GM.GameConsole.AddMessage(text);
+                        GM.LogConsoleMessage(text);
 #endif
                         break;
                     case LoggerOpcode.LogError:
@@ -91,7 +91,7 @@ public void Dequeue()
 
 #if CLIENT
                         ErrorNotifier.IncrementErrorCount();
-                        GM.GameConsole.AddMessage(errorText);
+                        GM.LogConsoleMessage(errorText);
 #endif
                         break;
                 }

Scripts/Scenes/Main/ErrorNotifier.cs

@@ -8,12 +8,12 @@ public class ErrorNotifier : Node
 
         public static void IncrementErrorCount() => ErrorCount++;
 
-        private static GTimer Timer { get; set; }
+        private static GTimer TimerNotifyErrors { get; set; }
 
         public override void _Ready()
         {
-            Timer = new GTimer(1500);
-            Timer.Connect(this, nameof(SpawnErrorNotification));
+            TimerNotifyErrors = new GTimer(1500);
+            TimerNotifyErrors.Connect(this, nameof(SpawnErrorNotification));
         }
 
         private static void SpawnErrorNotification()
@@ -23,7 +23,7 @@ private static void SpawnErrorNotification()
 
             var notifyError = Prefabs.NotifyError.Instance<UINotifyError>();
             notifyError.Count = ErrorCount;
-            GM.GameTree.CurrentScene.AddChild(notifyError);
+            GM.PersistentTree.CurrentScene.AddChild(notifyError);
 
             ErrorCount = 0;
         }

Scripts/Scenes/Main/GM.cs

@@ -9,18 +9,19 @@ namespace GodotModules
     public class GM : Node
     {
         [Export] public readonly NodePath NodePathGameConsole;
+        
         public static ModLoader ModLoader { get; set; }
-        public static UIGameConsole GameConsole { get; set; }
-        private static GodotCommands GodotCommands { get; set; }
-        private static Logger Logger { get; set; }
-
         public static string GameName = "Godot Modules";
         public static OptionsData Options { get; set; }
-        public static SceneTree GameTree { get; set; }
+        public static SceneTree PersistentTree { get; set; }
+
+        private static UIGameConsole GameConsole { get; set; }
+        private static GodotCommands GodotCommands { get; set; }
+        private static Logger Logger { get; set; }
 
         public override void _Ready()
         {
-            GameTree = GetTree();
+            PersistentTree = GetTree();
             GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
             GodotCommands = new GodotCommands();
             Logger = new Logger();
@@ -49,7 +50,7 @@ public override void _Input(InputEvent @event)
         public static void SpawnPopupMessage(string message)
         {
             var popupMessage = Prefabs.PopupMessage.Instance<UIPopupMessage>();
-            GameTree.CurrentScene.AddChild(popupMessage);
+            PersistentTree.CurrentScene.AddChild(popupMessage);
             popupMessage.Init(message);
             popupMessage.PopupCentered();
         }
@@ -58,11 +59,15 @@ public static void SpawnPopupError(Exception e)
         {
             ErrorNotifier.IncrementErrorCount();
             var popupError = Prefabs.PopupError.Instance<UIPopupError>();
-            GameTree.CurrentScene.AddChild(popupError);
+            PersistentTree.CurrentScene.AddChild(popupError);
             popupError.Init(e.Message, e.StackTrace);
             popupError.PopupCentered();
         }
 
+        public static void LogConsoleMessage(string message) => GameConsole.AddMessage(message);
+        public static void ToggleConsoleVisibility() => GameConsole.ToggleVisibility();
+        public static bool GameConsoleVisible => GameConsole.Visible;
+
         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);
@@ -72,10 +77,6 @@ public static void SpawnPopupError(Exception e)
         public static void LogTODO(object v, ConsoleColor color = ConsoleColor.White) => Logger.LogTODO(v, color);
         public static void LogMs(Action code) => Logger.LogMs(code);
 
-        /// <summary>
-        /// This should be used instead of GetTree().Quit() has it will handle cleanup and saving options
-        /// Note that if the console is closed directly then the cleanup will never happen, this should be avoided.
-        /// </summary>
-        public static void Exit() => GameTree.Notification(MainLoop.NotificationWmQuitRequest);
+        public static void Exit() => PersistentTree.Notification(MainLoop.NotificationWmQuitRequest);
     }
 }

Scripts/Scenes/Main/SceneManager.cs

@@ -61,9 +61,9 @@ public static void EscapePressed(Action action)
         {
             if (Input.IsActionJustPressed("ui_cancel"))
             {
-                if (GM.GameConsole.Visible) 
+                if (GM.GameConsoleVisible) 
                 {
-                    GM.GameConsole.ToggleVisibility();
+                    GM.ToggleConsoleVisibility();
                     return;
                 }