Encapsulate Notifier

Author: valkyrienyanko

Scenes/Main.tscn

@@ -6,7 +6,7 @@
 [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://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/Scenes/Main/Notifier.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]
 
@@ -20,8 +20,11 @@
 bg_color = Color( 0, 0, 0, 0.784314 )
 
 [node name="Main" type="Node"]
+
+[node name="GameManager" type="Node" parent="."]
 script = ExtResource( 1 )
-NodePathGameConsole = NodePath("CanvasLayer/Game Console")
+NodePathGameConsole = NodePath("../CanvasLayer/Game Console")
+NodePathNotifier = NodePath("../Notifier")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 volume_db = -10.0
@@ -37,7 +40,7 @@ NodePathServerSimulation = NodePath("../CanvasLayer/Server Simulation/ViewportCo
 [node name="SceneManager" type="Node" parent="."]
 script = ExtResource( 5 )
 
-[node name="ErrorNotifier" type="Node" parent="."]
+[node name="Notifier" type="Node" parent="."]
 script = ExtResource( 7 )
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]

Scripts/Netcode/Common/Utils/Logger.cs

@@ -90,7 +90,7 @@ public void Dequeue()
                         Console.ResetColor();
 
 #if CLIENT
-                        ErrorNotifier.IncrementErrorCount();
+                        GM.IncrementErrorCount();
                         GM.LogConsoleMessage(errorText);
 #endif
                         break;

Scripts/Scenes/Main/ErrorNotifier.cs

@@ -9,6 +9,7 @@ namespace GodotModules
     public class GM : Node
     {
         [Export] public readonly NodePath NodePathGameConsole;
+        [Export] public readonly NodePath NodePathNotifier;
 
         public static ModLoader ModLoader { get; set; }
         public static string GameName = "Godot Modules";
@@ -18,13 +19,16 @@ public class GM : Node
         private static UIGameConsole GameConsole { get; set; }
         private static GodotCommands GodotCommands { get; set; }
         private static Logger Logger { get; set; }
+        private static Notifier Notifier { get; set; }
+        private static GTimer TimerNotifyErrors { get; set; }
 
         public override void _Ready()
         {
             PersistentTree = GetTree();
             GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
             GodotCommands = new GodotCommands();
             Logger = new Logger();
+            Notifier = GetNode<Notifier>(NodePathNotifier);
         }
 
         public override async void _Process(float delta)
@@ -37,32 +41,17 @@ public override async void _Process(float delta)
         public override void _Input(InputEvent @event)
         {
             if (Input.IsActionJustPressed("ui_debug"))
-            {
                 GameConsole.ToggleVisibility();
-            }
 
             if (Input.IsActionJustPressed("ui_fullscreen"))
                 UtilOptions.ToggleFullscreen();
         }
 
         public static string GetGameDataPath() => System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData), GM.GameName);
 
-        public static void SpawnPopupMessage(string message)
-        {
-            var popupMessage = Prefabs.PopupMessage.Instance<UIPopupMessage>();
-            PersistentTree.CurrentScene.AddChild(popupMessage);
-            popupMessage.Init(message);
-            popupMessage.PopupCentered();
-        }
-
-        public static void SpawnPopupError(Exception e)
-        {
-            ErrorNotifier.IncrementErrorCount();
-            var popupError = Prefabs.PopupError.Instance<UIPopupError>();
-            PersistentTree.CurrentScene.AddChild(popupError);
-            popupError.Init(e.Message, e.StackTrace);
-            popupError.PopupCentered();
-        }
+        public static void SpawnPopupMessage(string message) => Notifier.SpawnPopupMessage(message);
+        public static void SpawnPopupError(Exception e) => Notifier.SpawnPopupError(e);
+        public static void IncrementErrorCount() => Notifier.IncrementErrorCount();
 
         public static void LogConsoleMessage(string message) => GameConsole.AddMessage(message);
         public static void ToggleConsoleVisibility() => GameConsole.ToggleVisibility();

Scripts/Scenes/Main/GM.cs

@@ -0,0 +1,47 @@
+using Godot;
+using System;
+
+namespace GodotModules
+{
+    public class Notifier : Node
+    {
+        private int _errorCount;
+
+        public override void _Ready()
+        {
+            var timer = new GTimer(1500);
+            timer.Connect(this, nameof(SpawnErrorNotification));
+        }
+
+        public void IncrementErrorCount() => _errorCount++;
+
+        public void SpawnErrorNotification()
+        {
+            if (_errorCount == 0)
+                return;
+
+            var notifyError = Prefabs.NotifyError.Instance<UINotifyError>();
+            notifyError.Count = _errorCount;
+            GM.PersistentTree.CurrentScene.AddChild(notifyError);
+
+            _errorCount = 0;
+        }
+
+        public void SpawnPopupMessage(string message)
+        {
+            var popupMessage = Prefabs.PopupMessage.Instance<UIPopupMessage>();
+            GM.PersistentTree.CurrentScene.AddChild(popupMessage);
+            popupMessage.Init(message);
+            popupMessage.PopupCentered();
+        }
+
+        public void SpawnPopupError(Exception e)
+        {
+            IncrementErrorCount();
+            var popupError = Prefabs.PopupError.Instance<UIPopupError>();
+            GM.PersistentTree.CurrentScene.AddChild(popupError);
+            popupError.Init(e.Message, e.StackTrace);
+            popupError.PopupCentered();
+        }
+    }
+}