Remove all static from GameConsole

Author: valkyrienyanko

Scenes/Main.tscn

@@ -1,16 +1,27 @@
-[gd_scene load_steps=9 format=2]
+[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/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]
 [ext_resource path="res://Scripts/Scenes/Main/SceneManager.cs" type="Script" id=5]
-[ext_resource path="res://Scenes/Prefabs/Debugger.tscn" type="PackedScene" id=6]
+[ext_resource path="res://Themes/Main.tres" type="Theme" id=6]
 [ext_resource path="res://Scripts/Scenes/Main/ErrorNotifier.cs" type="Script" id=7]
+[ext_resource path="res://Scripts/Msc/UIGameConsole.cs" type="Script" id=8]
 [ext_resource path="res://Scenes/Prefabs/ServerSimulation.tscn" type="PackedScene" id=9]
 
+[sub_resource type="StyleBoxEmpty" id=1]
+
+[sub_resource type="StyleBoxEmpty" id=7]
+
+[sub_resource type="StyleBoxEmpty" id=6]
+
+[sub_resource type="StyleBoxFlat" id=8]
+bg_color = Color( 0, 0, 0, 0.784314 )
+
 [node name="Main" type="Node"]
 script = ExtResource( 1 )
+NodePathGameConsole = NodePath("CanvasLayer/Game Console")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 volume_db = -10.0
@@ -54,5 +65,37 @@ gui_disable_input = true
 [node name="Camera2D" type="Camera2D" parent="CanvasLayer/Server Simulation/ViewportContainer/Viewport"]
 current = true
 
-[node name="Debugger" parent="CanvasLayer" instance=ExtResource( 6 )]
+[node name="Game Console" type="PanelContainer" parent="CanvasLayer"]
 visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 6 )
+custom_styles/panel = SubResource( 1 )
+script = ExtResource( 8 )
+NodePathLogs = NodePath("VBoxContainer/TextEdit")
+NodePathConsole = NodePath("VBoxContainer/Console")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/Game Console"]
+margin_right = 1024.0
+margin_bottom = 600.0
+
+[node name="TextEdit" type="TextEdit" parent="CanvasLayer/Game Console/VBoxContainer"]
+margin_right = 1024.0
+margin_bottom = 580.0
+size_flags_vertical = 3
+custom_styles/read_only = SubResource( 7 )
+custom_styles/focus = SubResource( 6 )
+custom_styles/normal = SubResource( 8 )
+readonly = true
+syntax_highlighting = true
+show_line_numbers = true
+highlight_all_occurrences = true
+smooth_scrolling = true
+wrap_enabled = true
+
+[node name="Console" type="LineEdit" parent="CanvasLayer/Game Console/VBoxContainer"]
+margin_top = 584.0
+margin_right = 1024.0
+margin_bottom = 600.0
+
+[connection signal="text_entered" from="CanvasLayer/Game Console/VBoxContainer/Console" to="CanvasLayer/Game Console" method="_on_Console_text_entered"]

Scenes/Prefabs/Debugger.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Themes/Main.tres" type="Theme" id=1]
-[ext_resource path="res://Scripts/Msc/UIDebugger.cs" type="Script" id=2]
+[ext_resource path="res://Scripts/Msc/UIGameConsole.cs" type="Script" id=2]
 
 [sub_resource type="StyleBoxEmpty" id=1]
 
@@ -18,8 +18,6 @@ anchor_bottom = 1.0
 theme = ExtResource( 1 )
 custom_styles/panel = SubResource( 1 )
 script = ExtResource( 2 )
-NodePathLogs = NodePath("VBoxContainer/TextEdit")
-NodePathConsole = NodePath("VBoxContainer/Console")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 margin_right = 1024.0

Scripts/Msc/UIDebugger.cs Scripts/Msc/UIGameConsole.csScripts/Msc/UIDebugger.cs renamed to Scripts/Msc/UIGameConsole.cs

@@ -4,39 +4,37 @@
 namespace GodotModules
 {
     // This is the in game console which appears on pressing F12
-    public class UIDebugger : Control
+    public class UIGameConsole : PanelContainer
     {
         [Export] public readonly NodePath NodePathLogs;
         [Export] public readonly NodePath NodePathConsole;
 
-        public static UIDebugger Instance { get; set; }
-        private static TextEdit Logs { get; set; }
+        private TextEdit Logs { get; set; }
 
         private LineEdit Console { get; set; } // the console input
 
         public override void _Ready()
         {
-            Instance = this;
             Logs = GetNode<TextEdit>(NodePathLogs);
             Console = GetNode<LineEdit>(NodePathConsole);
         }
 
-        public static void AddException(Exception e) => AddMessage($"{e.Message}\n{e.StackTrace}");
+        public void AddException(Exception e) => AddMessage($"{e.Message}\n{e.StackTrace}");
 
-        public static void AddMessage(string message)
+        public void AddMessage(string message)
         {
             Logs.Text += $"{message}\n";
             ScrollToBottom();
         }
 
-        public static void ToggleVisibility()
+        public void ToggleVisibility()
         {
-            Instance.Visible = !Instance.Visible;
-            Instance.Console.GrabFocus();
+            Visible = !Visible;
+            Console.GrabFocus();
             ScrollToBottom();
         }
 
-        private static void ScrollToBottom() => Logs.ScrollVertical = Mathf.Inf;
+        private void ScrollToBottom() => Logs.ScrollVertical = Mathf.Inf;
 
         private void _on_Console_text_entered(string text)
         {

Scripts/Netcode/Common/Utils/Logger.cs

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

Scripts/Scenes/Main/GameManager.cs

@@ -7,13 +7,17 @@ namespace GodotModules
 {
     public class GameManager : Node
     {
+        [Export] public readonly NodePath NodePathGameConsole;
+        public static UIGameConsole GameConsole { get; set; }
+
         public static string GameName = "Godot Modules";
         public static OptionsData Options { get; set; }
         public static SceneTree GameTree { get; set; }
 
         public override void _Ready()
         {
             GameTree = GetTree();
+            GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
         }
 
         public override async void _Process(float delta)
@@ -27,7 +31,7 @@ public override void _Input(InputEvent @event)
         {
             if (Input.IsActionJustPressed("ui_debug"))
             {
-                UIDebugger.ToggleVisibility();
+                GameConsole.ToggleVisibility();
             }
 
             if (Input.IsActionJustPressed("ui_fullscreen"))

Scripts/Scenes/Main/SceneManager.cs

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