Remove another static

Author: valkyrienyanko

Scripts/Scenes/Main/GameManager.cs

@@ -21,9 +21,6 @@ public override void _Ready()
             GameTree = GetTree();
             GameConsole = GetNode<UIGameConsole>(NodePathGameConsole);
             GodotCommands = new GodotCommands();
-            ModLoader = new ModLoader();
-            ModLoader.Init();
-            ModLoader.LoadMods();
         }
 
         public override async void _Process(float delta)

Scripts/Scenes/Menu/ModLoader.cs

@@ -15,6 +15,12 @@ public class ModLoader
         public string PathMods { get; set; }
         public Script Script { get; set; }
         public string LuaScriptsPath = "";
+        public UIModLoader UIModLoader { get; set; }
+
+        public ModLoader(UIModLoader uiModLoader)
+        {
+            UIModLoader = uiModLoader;
+        }
 
         public void Init()
         {
@@ -59,7 +65,7 @@ public void SortMods()
 
         public void LoadMods()
         {
-            UIModLoader.Instance.ClearLog();
+            UIModLoader.ClearLog();
 
             //if (Script != null)
             //DebugServer.Detach(Script);
@@ -80,7 +86,7 @@ public void LoadMods()
                 .ForEach(mod => LoadMod(mod, ref modLoadedCount));
 
             if (modLoadedCount > 0)
-                UIModLoader.Instance.Log($"{modLoadedCount} mods have loaded successfully");
+                UIModLoader.Log($"{modLoadedCount} mods have loaded successfully");
         }
 
         private void DisableModsWithLackingDependencies()
@@ -110,7 +116,7 @@ private void CheckAllDependenciesEnabled(ModInfo firstMod, ModInfo modInfo, List
                 {
                     if (!modsToDisable.Contains(firstMod))
                         modsToDisable.Add(firstMod);
-                    UIModLoader.Instance.Log($"{firstMod.Name} requires dependency {dependency} to be enabled");
+                    UIModLoader.Log($"{firstMod.Name} requires dependency {dependency} to be enabled");
                 }
                 checkedMods.Add(dependency);
                 CheckAllDependenciesEnabled(firstMod, ModInfo[dependency].ModInfo, checkedMods, ref modsToDisable);
@@ -125,7 +131,7 @@ public void Call(string v, params object[] args)
             }
             catch (ScriptRuntimeException e)
             {
-                UIModLoader.Instance.Log($"{e.DecoratedMessage}");
+                UIModLoader.Log($"{e.DecoratedMessage}");
                 Logger.LogErr(e, $"[ModLoader]: ");
             }
         }
@@ -155,7 +161,7 @@ public void GetModsEnabled()
         private void Log(object obj)
         {
             Logger.Log($"[ModLoader]: {obj}");
-            UIModLoader.Instance.Log($"{obj}");
+            UIModLoader.Log($"{obj}");
         }
 
         private void LoadLuaScripts(string directory)
@@ -175,7 +181,7 @@ private void LoadLuaScripts(string directory)
                         Script.DoString(luaScript.GetAsText());
                     else
                     {
-                        UIModLoader.Instance.Log($"Could not open file: {absolutePath}");
+                        UIModLoader.Log($"Could not open file: {absolutePath}");
                         Logger.LogWarning($"Could not open file: {absolutePath}");
                     }
                 }
@@ -244,13 +250,13 @@ private void LoadMod(Mod mod, ref int modLoadedCount)
             try
             {
                 Script.DoFile(mod.PathScript);
-                UIModLoader.Instance.Log($"Loaded {mod.ModInfo.Name}");
+                UIModLoader.Log($"Loaded {mod.ModInfo.Name}");
                 modLoadedCount++;
             }
             catch (ScriptRuntimeException e)
             {
                 // Mod script did not run right
-                UIModLoader.Instance.Log($"{e.DecoratedMessage}");
+                UIModLoader.Log($"{e.DecoratedMessage}");
                 Logger.LogErr(e, "[ModLoader]: ");
             }
         }

Scripts/Scenes/Menu/UIModInfo.cs

@@ -37,6 +37,8 @@ public void SetColor(Color color)
             BtnModEnabled.AddColorOverride("font_color", color);
         }
 
+        public UIModLoader UIModLoader { get; set; }
+
         private void _on_Enabled_pressed()
         {
             Enabled = !BtnModEnabled.Pressed;
@@ -46,12 +48,12 @@ private void _on_Enabled_pressed()
             GameManager.ModLoader.ModInfo[modName].ModInfo.Enabled = Enabled;
 
             if (DisplayedInDependencies)
-                UIModLoader.Instance.ModInfoList[modName].SetModEnabled(Enabled);
+                UIModLoader.ModInfoList[modName].SetModEnabled(Enabled);
             else
-                if (UIModLoader.Instance.ModInfoDependencyList.ContainsKey(modName))
-                UIModLoader.Instance.ModInfoDependencyList[modName].SetModEnabled(Enabled);
+                if (UIModLoader.ModInfoDependencyList.ContainsKey(modName))
+                    UIModLoader.ModInfoDependencyList[modName].SetModEnabled(Enabled);
         }
 
-        private void _on_Mod_pressed() => UIModLoader.Instance.UpdateModInfo(BtnMod.Text);
+        private void _on_Mod_pressed() => UIModLoader.UpdateModInfo(BtnMod.Text);
     }
 }

Scripts/Scenes/Menu/UIModLoader.cs

@@ -6,8 +6,6 @@ namespace GodotModules
 {
     public class UIModLoader : Control
     {
-        public static UIModLoader Instance { get; set; }
-
         [Export] public readonly NodePath NodePathModList;
         [Export] public readonly NodePath NodePathModName;
         [Export] public readonly NodePath NodePathModGameVersions;
@@ -31,9 +29,8 @@ public class UIModLoader : Control
         // logger
         private RichTextLabel Logger { get; set; }
 
-        public override async void _Ready()
+        public override void _Ready()
         {
-            Instance = this;
             ModList = GetNode<VBoxContainer>(NodePathModList);
             ModName = GetNode<Label>(NodePathModName);
             ModGameVersions = GetNode<Label>(NodePathModGameVersions);
@@ -46,8 +43,9 @@ public override async void _Ready()
             ModDescription.Text = "";
             Logger.Clear();
 
-            while (GameManager.ModLoader == null) // this is ugly
-                await Task.Delay(1);
+            GameManager.ModLoader = new ModLoader(this);
+            GameManager.ModLoader.Init();
+            GameManager.ModLoader.LoadMods();
 
             DisplayMods();
         }
@@ -100,6 +98,7 @@ public void DisplayMods()
         private UIModInfo CreateModInfoInstance(string modName)
         {
             var instance = Prefabs.ModInfo.Instance<UIModInfo>();
+            instance.UIModLoader = this;
             instance.SetModName(modName);
 
             if (GameManager.ModLoader.ModInfo[modName].ModInfo.Enabled)