Small changes, remove unused code, allow for live color updating

Author: michael-r-elp

MultiplayerExtensions/Extensions/ExtendedGameStateController.cs

@@ -94,7 +94,6 @@ public async override void HandleMultiplayerLevelLoaderCountdownFinished(IPrevie
 		{
             if (_multiplayerLevelLoader.GetField<MultiplayerLevelLoader.MultiplayerBeatmapLoaderState, MultiplayerLevelLoader>("_loaderState") == MultiplayerLevelLoader.MultiplayerBeatmapLoaderState.NotLoading)
             {
-                Plugin.Log?.Info("HandleMultiplayerLevelLoaderCountdownFinished already running, returning");
                 return;
             }
             _multiplayerLevelLoader.SetField("_loaderState", MultiplayerLevelLoader.MultiplayerBeatmapLoaderState.NotLoading);

MultiplayerExtensions/Extensions/ExtendedSessionManager.cs

@@ -97,6 +97,7 @@ private void HandleExtendedPlayerPacket(ExtendedPlayerPacket packet, IConnectedP
 				extendedPlayer.platform = packet.platform;
 				extendedPlayer.playerColor = packet.playerColor;
 				extendedPlayer.mpexVersion = new Hive.Versioning.Version(packet.mpexVersion);
+				extendedPlayerConnectedEvent?.Invoke(extendedPlayer);
 			}
 			else
 			{
@@ -106,9 +107,9 @@ private void HandleExtendedPlayerPacket(ExtendedPlayerPacket packet, IConnectedP
 				if (Plugin.ProtocolVersion != extendedPlayer.mpexVersion)
 				{
 					Plugin.Log?.Warn("###################################################################");
-					Plugin.Log?.Warn("Different MultiplayerExtensions version detected!");
-					Plugin.Log?.Warn($"The player '{player.userName}' is using MultiplayerExtensions {extendedPlayer.mpexVersion} while you are using MultiplayerExtensions {Plugin.ProtocolVersion}");
-					Plugin.Log?.Warn("For best compatibility all players should use the same version of MultiplayerExtensions.");
+					Plugin.Log?.Warn("Different MultiplayerExtensions protocol detected!");
+					Plugin.Log?.Warn($"The player '{player.userName}' is using MpEx protocol version {extendedPlayer.mpexVersion} while you are using MpEx protocol {Plugin.ProtocolVersion}");
+					Plugin.Log?.Warn("For best compatibility all players should use a compatible version of MultiplayerExtensions/MultiQuestensions.");
 					Plugin.Log?.Warn("###################################################################");
 				}
 

MultiplayerExtensions/Plugin.cs

@@ -3,20 +3,16 @@
 using IPA.Config;
 using IPA.Config.Stores;
 using IPA.Loader;
-using MultiplayerExtensions.HarmonyPatches;
 using MultiplayerExtensions.Installers;
 using SiraUtil.Zenject;
 using MultiplayerExtensions.Utilities;
 using System;
-using System.Reflection;
 using System.Threading.Tasks;
 using IPALogger = IPA.Logging.Logger;
 using BeatSaverSharp;
 using System.Diagnostics;
-using Zenject;
 using MultiplayerExtensions.UI;
 using BeatSaberMarkupLanguage.Settings;
-using System.Net.Http;
 
 namespace MultiplayerExtensions
 {
@@ -36,7 +32,6 @@ public class Plugin
         internal static IPALogger Log { get; private set; } = null!;
         internal static PluginConfig Config = null!;
 
-        internal static HttpClient HttpClient { get; private set; } = null!;
         internal static BeatSaver BeatSaver = null!;
         internal static Harmony? _harmony;
         internal static Harmony Harmony
@@ -47,15 +42,6 @@ internal static Harmony Harmony
             }
         }
 
-        public static string UserAgent
-        {
-            get
-            {
-                var modVersion = PluginMetadata.Version.ToString();
-                var bsVersion = IPA.Utilities.UnityGame.GameVersion.ToString();
-                return $"MultiplayerExtensions/{modVersion} (BeatSaber/{bsVersion})";
-            }
-        }
 
         private const int MaxPlayers = 100;
         private const int MinPlayers = 10;
@@ -73,9 +59,8 @@ public Plugin(IPALogger logger, Config conf, Zenjector zenjector, PluginMetadata
             zenjector.OnGame<MPGameInstaller>().OnlyForMultiplayer();
 
             BeatSaverOptions options = new BeatSaverOptions("MultiplayerExtensions", new Version(pluginMetadata.Version.ToString()));
+            options.Timeout = TimeSpan.FromMinutes(1);
             BeatSaver = new BeatSaver(options);
-            HttpClient = new HttpClient();
-            HttpClient.DefaultRequestHeaders.Add("User-Agent", Plugin.UserAgent);
         }
 
         [OnStart]