Added Overall MPType to GUI

PULSAR-Modders · Aug 25, 2024 · 5fb269a · 5fb269a
1 parent 6f636d7
commit 5fb269a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/PulsarModLoader/CustomGUI/GUIMain.cs b/PulsarModLoader/CustomGUI/GUIMain.cs
@@ -226,6 +226,7 @@ void WindowFunction(int WindowID)
                             {
                                 DrawModListModButton(mod);
                             }
+                            Label("Overall MPType: " + GetColoredMPTypeText(MPModCheckManager.Instance.HighestLevelOfMPMods));
                         }
                         EndScrollView();
                     }

diff --git a/PulsarModLoader/MPModChecks/MPModCheckManager.cs b/PulsarModLoader/MPModChecks/MPModCheckManager.cs
@@ -105,7 +105,7 @@ internal void UpdateLobbyModList()  //Update Photon Lobby Listing with mod list
 
         internal Dictionary<PhotonPlayer, MPUserDataBlock> NetworkedPeersModLists = new Dictionary<PhotonPlayer, MPUserDataBlock>();
 
-        private int HighestLevelOfMPMods = 0;
+        public MPRequirement HighestLevelOfMPMods { get; private set; } = MPRequirement.None;
 
         internal void SendModlistToClient(PhotonPlayer photonPlayer)
         {
@@ -218,9 +218,9 @@ private List<PulsarMod> GetMPModList()
             {
                 if (mod.MPRequirements != (int)MPRequirement.HideFromServerList)
                 {
-                    if (mod.MPRequirements != (int)MPRequirement.MatchVersion && (mod.MPRequirements == (int)MPRequirement.Host || mod.MPRequirements == (int)MPRequirement.All) && mod.MPRequirements > HighestLevelOfMPMods)
+                    if (mod.MPRequirements != (int)MPRequirement.MatchVersion && (mod.MPRequirements == (int)MPRequirement.Host || mod.MPRequirements == (int)MPRequirement.All) && mod.MPRequirements > (int)HighestLevelOfMPMods)
                     {
-                        HighestLevelOfMPMods = (mod.MPRequirements);
+                        HighestLevelOfMPMods = (MPRequirement)mod.MPRequirements;
                     }
                     modList.Add(mod);
                 }
@@ -431,7 +431,7 @@ public bool ClientClickJoinRoom(RoomInfo room)
             MPUserDataBlock HostModData = GetHostModList(room);
             if (HostModData.PMLVersion == string.Empty)
             {
-                if (HighestLevelOfMPMods == (int)MPRequirement.Host || HighestLevelOfMPMods == (int)MPRequirement.All)
+                if (HighestLevelOfMPMods == MPRequirement.Host || HighestLevelOfMPMods == MPRequirement.All)
                 {
                     PLNetworkManager.Instance.MainMenu.AddActiveMenu(new PLErrorMessageMenu($"<color=red>FAILED TO JOIN CREW!</color>\nMods requiring host installation or higher have been installed locally"));
 
@@ -666,7 +666,7 @@ public bool HostOnClientJoined(PhotonPlayer Player)
             }
             else //client wasn't found in mod list
             {
-                if (HighestLevelOfMPMods >= (int)MPRequirement.All)
+                if (HighestLevelOfMPMods >= MPRequirement.All)
                 {
                     Utilities.Logger.Info("Didn't receive message or proper modlist. proceeding to kick PhotonPlayer");
                     string message = $"You have been disconnected for not having the mod loader installed";
-Original file line number
+Diff line change
@@ Expand Up / @@ -226,6 +226,7 @@ void WindowFunction(int WindowID) @@
                                 {
                                     DrawModListModButton(mod);
                                 }
+                                Label("Overall MPType: " + GetColoredMPTypeText(MPModCheckManager.Instance.HighestLevelOfMPMods));
                             }
                             EndScrollView();
                         }
@@ Expand Down @@