Added event for mod checks finished. Appears functional.

PULSAR-Modders · Nov 11, 2023 · 2bbef4e · 2bbef4e
1 parent 38c3d18
commit 2bbef4e
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 7 deletions.
diff --git a/PulsarModLoader/MPModChecks/MPModCheckManager.cs b/PulsarModLoader/MPModChecks/MPModCheckManager.cs
@@ -2,7 +2,6 @@
 using PulsarModLoader.Patches;
 using Steamworks;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -25,20 +24,53 @@ public class MPModCheckManager
         public MPModCheckManager()
         {
             Instance = this;
-            RefreshData();
             ModManager.Instance.OnModUnloaded += RefreshData;
+            ModManager.Instance.OnModSuccessfullyLoaded += RefreshData;
+            ModManager.Instance.OnAllModsLoaded += RefreshData;
         }
 
+        /// <summary>
+        /// Delays Refreshing of MPModList until all mods have been loaded.
+        /// </summary>
+        public void HoldMPModListRefresh()
+        {
+            HoldRefreshUntilAllModsLoaded = true;
+        }
+
+        private bool HoldRefreshUntilAllModsLoaded = false;
+
         /// <summary>
         /// Updates modlists
         /// </summary>
-        /// <param name="mod"></param>
-        public void RefreshData(PulsarMod mod = null)
+        public void RefreshData()
         {
+            HoldRefreshUntilAllModsLoaded = true;
             UpdateMyModList();
             UpdateLobbyModList();
         }
 
+        /// <summary>
+        /// Calls normal RefreshData
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="mod"></param>
+        private void RefreshData(string name, PulsarMod mod)
+        {
+            if (HoldRefreshUntilAllModsLoaded)
+            {
+                RefreshData();
+            }
+        }
+
+        /// <summary>
+        /// Calls normal RefreshData
+        /// </summary>
+        /// <param name="mod"></param>
+        private void RefreshData(PulsarMod mod = null)
+        {
+            RefreshData();
+        }
+
         private void UpdateLobbyModList()  //Update Photon Lobby Listing with mod list
         {
             if (PhotonNetwork.isMasterClient && PhotonNetwork.inRoom && PLNetworkManager.Instance != null)
@@ -57,6 +89,27 @@ private void UpdateLobbyModList()  //Update Photon Lobby Listing with mod list
 
         private MPModDataBlock[] MyModList = null;
 
+        /// <summary>
+        /// Called after all mod checks finished HostSide
+        /// </summary>
+        public delegate void ModChecksFinishedHost(PhotonPlayer JoiningPhotonPlayer);
+
+        /// <summary>
+        /// Called after all mod checks finished HostSide
+        /// </summary>
+        public event ModChecksFinishedHost OnModChecksFinishedHost;
+
+        /*
+        /// <summary>
+        /// Called after all mod checks finished ClientSide
+        /// </summary>
+        //public delegate void ModChecksFinishedClient();
+
+        /// <summary>
+        /// Called after all mod checks finished ClientSide
+        /// </summary>
+        //public event ModChecksFinishedClient OnModChecksFinishedClient;*/
+
         /// <summary>
         /// List of clients that have requested mod lists of other clients.
         /// </summary>
@@ -600,6 +653,7 @@ public bool HostOnClientJoined(PhotonPlayer Player)
                 }
                 else
                 {
+                    OnModChecksFinishedHost?.Invoke(Player);
                     Logger.Info("Modcheck passed, proceding onwards");
                 }
             }

diff --git a/PulsarModLoader/ModManager.cs b/PulsarModLoader/ModManager.cs
@@ -8,6 +8,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.IO.Compression;
+using PulsarModLoader.MPModChecks;
 
 namespace PulsarModLoader
 {
@@ -199,6 +200,10 @@ public IEnumerable<PulsarMod> GetAllMods()
         /// <param name="modsDir"></param>
         public void LoadModsDirectory(string modsDir)
         {
+            //Delays MPModListRefresh
+            MPModCheckManager.Instance.HoldMPModListRefresh();
+
+
             OnModSuccessfullyLoaded += Events.EventHelper.RegisterEventHandlers;
             Logger.Info($"Attempting to load mods from {modsDir}");
 

diff --git a/PulsarModLoader/Patches/PLGlobalStart.cs b/PulsarModLoader/Patches/PLGlobalStart.cs
@@ -22,13 +22,13 @@ static void Prefix()
                 //KeybindManager Init()
                 _ = PulsarModLoader.Keybinds.KeybindManager.Instance;
 
+                //MP Mod Checks
+                new MPModChecks.MPModCheckManager();
+
                 //ModLoading
                 string modsDir = Path.Combine(Directory.GetCurrentDirectory(), "Mods");
                 ModManager.Instance.LoadModsDirectory(modsDir);
 
-                //MP Mod Checks
-                new MPModChecks.MPModCheckManager();
-
                 modsLoaded = true;
             }
         }