Merge pull request #155 from EnderdracheLP/1.16.3-1.18.3

Goobwabber · web-flow · commit fed24503cbdd · 2021-11-14T10:39:53.000-05:00
Fix MultiplayerModeSelectionFlowCoordinatorPatch, Remove ConnectToMatchmakingPatch, Improve CenterScreenLoadingPanel
diff --git a/MultiplayerExtensions/Downloader.cs b/MultiplayerExtensions/Downloader.cs
@@ -49,7 +49,7 @@ public static bool TryGetDownload(string levelId, out Task<IPreviewBeatmapLevel?
             byte[]? beatmapBytes = await bm.Versions.ToList().Find(version => {
                 Plugin.Log?.Info($"Version: '{version.Key}' '{version.Hash}'");
                 return version.Hash.ToUpper() == hash;
-            }).DownloadZIP(progress: UI.CenterScreenLoadingPanel.self);
+            }).DownloadZIP(progress: UI.CenterScreenLoadingPanel.Instance);
 #if DEBUG
             TimeSpan delay = TimeSpan.FromSeconds(Plugin.Config.DebugConfig?.MinDownloadTime ?? 0) - TimeSpan.FromMilliseconds(sw.ElapsedMilliseconds);
             if (delay > TimeSpan.Zero)
diff --git a/MultiplayerExtensions/Extensions/ExtendedEntitlementChecker.cs b/MultiplayerExtensions/Extensions/ExtendedEntitlementChecker.cs
@@ -1,6 +1,7 @@
 ﻿using BeatSaverSharp.Models;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Zenject;
@@ -75,12 +76,40 @@ public override Task<EntitlementsStatus> GetEntitlementStatus(string levelId)
 				return base.GetEntitlementStatus(levelId);
 
 			if (SongCore.Collections.songWithHashPresent(hash))
+            {
+				// The input parameter for RetrieveExtraSongData is called levelId but it only takes the level hash
+				var extraSongData = SongCore.Collections.RetrieveExtraSongData(hash);
+				if (extraSongData != null)
+				{
+					foreach (var difficultyData in extraSongData._difficulties)
+					{
+						if (difficultyData.additionalDifficultyData != null &&
+							((difficultyData.additionalDifficultyData._requirements.Contains("Noodle Extensions") && !Plugin.IsNoodleInstalled) ||
+							(difficultyData.additionalDifficultyData._requirements.Contains("Mapping Extensions") && !Plugin.IsMappingInstalled)))
+							return Task.FromResult(EntitlementsStatus.NotOwned);
+						else if (difficultyData.additionalDifficultyData != null)
+						{
+							foreach (string requirement in difficultyData.additionalDifficultyData._requirements) Plugin.Log?.Info($"Requirement found: {requirement}");
+						}
+						else Plugin.Log?.Debug("difficultyData.additionalDifficultyData is null");
+
+					}
+				}
+				else Plugin.Log?.Debug("extraSongData is null");
 				return Task.FromResult(EntitlementsStatus.Ok);
+			}
 			return Plugin.BeatSaver.BeatmapByHash(hash).ContinueWith<EntitlementsStatus>(r =>
 			{
 				Beatmap? beatmap = r.Result;
 				if (beatmap == null)
 					return EntitlementsStatus.NotOwned;
+				else
+                {
+					foreach (var difficulty in beatmap.Versions[0].Difficulties)
+                    {
+						if ((difficulty.NoodleExtensions && !Plugin.IsNoodleInstalled) || (difficulty.MappingExtensions && !Plugin.IsMappingInstalled)) return EntitlementsStatus.NotOwned;
+					}
+				}
 				return EntitlementsStatus.NotDownloaded;
 			});
 		}
@@ -118,7 +147,11 @@ public async Task WaitForOkEntitlement(string userId, string levelId, Cancellati
         {
 			if (_entitlementsDictionary.TryGetValue(userId, out Dictionary<string, EntitlementsStatus> userDictionary))
 				if (userDictionary.TryGetValue(levelId, out EntitlementsStatus entitlement) && entitlement == EntitlementsStatus.Ok)
+                {
+                    UI.CenterScreenLoadingPanel.Instance.playersReady++;
+					Plugin.Log?.Info($"User '{userId}' for level '{levelId}' is '{entitlement}'");
 					return;
+				}
 
 			if (!_tcsDictionary.ContainsKey(userId))
 				_tcsDictionary[userId] = new Dictionary<string, TaskCompletionSource<EntitlementsStatus>>();
@@ -133,6 +166,8 @@ public async Task WaitForOkEntitlement(string userId, string levelId, Cancellati
 				result = await _tcsDictionary[userId][levelId].Task.ContinueWith(t => t.IsCompleted ? t.Result : EntitlementsStatus.Unknown);
 				_tcsDictionary[userId][levelId] = new TaskCompletionSource<EntitlementsStatus>();
 			}
+			if (!cancellationToken.IsCancellationRequested) UI.CenterScreenLoadingPanel.Instance.playersReady++;
+			Plugin.Log?.Info($"User '{userId}' for level '{levelId}' is '{result}' was task cancelled {(cancellationToken.IsCancellationRequested ? "true" : "false")}");
 		}
 	}
 }
diff --git a/MultiplayerExtensions/Extensions/ExtendedGameStateController.cs b/MultiplayerExtensions/Extensions/ExtendedGameStateController.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using IPA.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -91,7 +92,13 @@ public override void StopLoading()
 
         public async override void HandleMultiplayerLevelLoaderCountdownFinished(IPreviewBeatmapLevel previewBeatmapLevel, BeatmapDifficulty beatmapDifficulty, BeatmapCharacteristicSO beatmapCharacteristic, IDifficultyBeatmap difficultyBeatmap, GameplayModifiers gameplayModifiers)
 		{
+            if (_multiplayerLevelLoader.GetField<MultiplayerLevelLoader.MultiplayerBeatmapLoaderState, MultiplayerLevelLoader>("_loaderState") == MultiplayerLevelLoader.MultiplayerBeatmapLoaderState.NotLoading)
+            {
+                return;
+            }
+            _multiplayerLevelLoader.SetField("_loaderState", MultiplayerLevelLoader.MultiplayerBeatmapLoaderState.NotLoading);
             Plugin.Log?.Debug("Map finished loading, waiting for other players...");
+            UI.CenterScreenLoadingPanel.Instance.playersReady = 0;
             _menuRpcManager.SetIsEntitledToLevel(previewBeatmapLevel.levelID, EntitlementsStatus.Ok);
 
             if (_levelStartedOnTime == false)
@@ -116,11 +123,6 @@ public async override void HandleMultiplayerLevelLoaderCountdownFinished(IPrevie
 
             Plugin.Log?.Debug("All players ready, starting game.");
 
-            Plugin.Log?.Debug($"Null Checking previewBeatmapLevel: '{(previewBeatmapLevel == null ? "null" : "not null")}'");
-            Plugin.Log?.Debug($"Null Checking beatmapDifficulty: '{beatmapDifficulty}'");
-            Plugin.Log?.Debug($"Null Checking beatmapCharacteristic: '{(beatmapCharacteristic == null ? "null" : "not null")}'");
-            Plugin.Log?.Debug($"Null Checking difficultyBeatmap: '{(difficultyBeatmap == null ? "null" : "not null")}'");
-            Plugin.Log?.Debug($"Null Checking gameplayModifiers: '{(gameplayModifiers == null ? "null" : "not null")}'");
 
             base.HandleMultiplayerLevelLoaderCountdownFinished(previewBeatmapLevel, beatmapDifficulty, beatmapCharacteristic, difficultyBeatmap, gameplayModifiers);
         }
diff --git a/MultiplayerExtensions/Extensions/ExtendedPlayer.cs b/MultiplayerExtensions/Extensions/ExtendedPlayer.cs
@@ -22,7 +22,7 @@ public class ExtendedPlayer : IConnectedPlayer
         /// <summary>
         /// MultiplayerExtensions version reported by BSIPA.
         /// </summary>
-        public SemVer.Version mpexVersion;
+        public Hive.Versioning.Version mpexVersion;
 
         /// <summary>
         /// Player's color set in the plugin config.
@@ -37,19 +37,19 @@ public class ExtendedPlayer : IConnectedPlayer
         public ExtendedPlayer(IConnectedPlayer player)
 		{
             _connectedPlayer = player;
-            this.mpexVersion = Plugin.PluginMetadata.Version;
+            this.mpexVersion = Plugin.ProtocolVersion;
         }
 
         public ExtendedPlayer(IConnectedPlayer player, string platformID, Platform platform, Color playerColor)
 		{
             _connectedPlayer = player;
             this.platformID = platformID;
             this.platform = platform;
-            this.mpexVersion = Plugin.PluginMetadata.Version;
+            this.mpexVersion = Plugin.ProtocolVersion;
             this.playerColor = playerColor;
         }
 
-        public ExtendedPlayer(IConnectedPlayer player, string platformID, Platform platform, SemVer.Version mpexVersion, Color playerColor)
+        public ExtendedPlayer(IConnectedPlayer player, string platformID, Platform platform, Hive.Versioning.Version mpexVersion, Color playerColor)
         {
             _connectedPlayer = player;
             this.platformID = platformID;
@@ -102,7 +102,7 @@ public void Deserialize(NetDataReader reader)
         public ExtendedPlayerPacket Init(string platformID, Platform platform, Color playerColor)
         {
             this.platformID = platformID;
-            this.mpexVersion = Plugin.PluginMetadata.Version.ToString();
+            this.mpexVersion = Plugin.ProtocolVersion.ToString();
             this.playerColor = playerColor;
             this.platform = platform;
             return this;
diff --git a/MultiplayerExtensions/Extensions/ExtendedSessionManager.cs b/MultiplayerExtensions/Extensions/ExtendedSessionManager.cs
@@ -37,6 +37,10 @@ internal void Inject([InjectOptional] PacketManager packetManager, [InjectOption
 
 			SetLocalPlayerState("modded", true);
 
+			SetLocalPlayerState("ME_Installed", Plugin.IsMappingInstalled);
+			SetLocalPlayerState("NE_Installed", Plugin.IsNoodleInstalled);
+			SetLocalPlayerState("Chroma_Installed", Plugin.IsChromaInstalled);
+
 			connectedEvent += HandleConnected;
 
 			playerConnectedEvent += HandlePlayerConnected;
@@ -92,19 +96,20 @@ private void HandleExtendedPlayerPacket(ExtendedPlayerPacket packet, IConnectedP
 				extendedPlayer.platformID = packet.platformID;
 				extendedPlayer.platform = packet.platform;
 				extendedPlayer.playerColor = packet.playerColor;
-				extendedPlayer.mpexVersion = new SemVer.Version(packet.mpexVersion);
+				extendedPlayer.mpexVersion = new Hive.Versioning.Version(packet.mpexVersion);
+				extendedPlayerConnectedEvent?.Invoke(extendedPlayer);
 			}
 			else
 			{
 				Plugin.Log?.Info($"Received 'ExtendedPlayerPacket' from '{player.userId}' with platformID: '{packet.platformID}'  mpexVersion: '{packet.mpexVersion}'");
-				ExtendedPlayer extendedPlayer = new ExtendedPlayer(player, packet.platformID, packet.platform, new SemVer.Version(packet.mpexVersion), packet.playerColor);
+				ExtendedPlayer extendedPlayer = new ExtendedPlayer(player, packet.platformID, packet.platform, new Hive.Versioning.Version(packet.mpexVersion), packet.playerColor);
 
-				if (Plugin.PluginMetadata.Version != extendedPlayer.mpexVersion)
+				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.PluginMetadata.Version}");
-					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("###################################################################");
 				}
 
diff --git a/MultiplayerExtensions/HarmonyPatches/CustomSongsPatches.cs b/MultiplayerExtensions/HarmonyPatches/CustomSongsPatches.cs
@@ -22,18 +22,6 @@ static void Prefix(CreateServerFormData data)
         }
     }
 
-    [HarmonyPatch(typeof(MultiplayerLobbyConnectionController), nameof(MultiplayerLobbyConnectionController.ConnectToMatchmaking), MethodType.Normal)]
-    internal class ConnectToMatchmakingPatch
-	{
-        /// <summary>
-        /// Modifies the data used to matchmake
-        /// </summary>
-        static void Prefix(ref SongPackMask songPackMask)
-        {
-            if (!MPState.CurrentMasterServer.isOfficial)
-                songPackMask |= new SongPackMask("custom_levelpack_CustomLevels");
-        }
-    }
 
     [HarmonyPatch(typeof(MultiplayerLevelSelectionFlowCoordinator), "enableCustomLevels", MethodType.Getter)]
     internal class EnableCustomLevelsPatch
diff --git a/MultiplayerExtensions/HarmonyPatches/InstallerPatches.cs b/MultiplayerExtensions/HarmonyPatches/InstallerPatches.cs
@@ -1,4 +1,5 @@
 ﻿using HarmonyLib;
+using IPA.Utilities;
 using MultiplayerExtensions.Extensions;
 using System;
 using System.Collections.Generic;
@@ -145,7 +146,7 @@ internal static void Prefix(ref GameplayCoreInstaller __instance, ref IConnected
             ____sceneSetupData = new GameplayCoreSceneSetupData(
                 ____sceneSetupData.difficultyBeatmap,
                 ____sceneSetupData.previewBeatmapLevel,
-                ____sceneSetupData.gameplayModifiers.CopyWith(zenMode: Plugin.Config.LagReducer),
+                ____sceneSetupData.gameplayModifiers.CopyWith(zenMode: (____sceneSetupData.gameplayModifiers.zenMode || Plugin.Config.LagReducer)),
                 ____sceneSetupData.playerSpecificSettings,
                 ____sceneSetupData.practiceSettings,
                 ____sceneSetupData.useTestNoteCutSoundEffects,
diff --git a/MultiplayerExtensions/HarmonyPatches/QuickplayPatches.cs b/MultiplayerExtensions/HarmonyPatches/QuickplayPatches.cs
@@ -12,11 +12,12 @@ namespace MultiplayerExtensions.HarmonyPatches
     [HarmonyPatch(typeof(MultiplayerModeSelectionFlowCoordinator), nameof(MultiplayerModeSelectionFlowCoordinator.HandleJoinQuickPlayViewControllerDidFinish), MethodType.Normal)]
     internal class MultiplayerModeSelectionFlowCoordinatorPatch
     {
+        internal static bool skipCheck = false;
         static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool success, JoinQuickPlayViewController ____joinQuickPlayViewController, SimpleDialogPromptViewController ____simpleDialogPromptViewController, SongPackMaskModelSO ____songPackMaskModel)
         {
             string levelPackName = ____joinQuickPlayViewController.multiplayerModeSettings.quickPlaySongPackMaskSerializedName;
             Plugin.Log?.Debug(levelPackName);
-            if (success && ____songPackMaskModel.ToSongPackMask(levelPackName).Contains("custom_levelpack_CustomLevels"))
+            if (success && ____songPackMaskModel.ToSongPackMask(levelPackName).Contains("custom_levelpack_CustomLevels") && !skipCheck)
             {
                 ____simpleDialogPromptViewController.Init(
                     "Custom Song Quickplay",
@@ -29,6 +30,7 @@ static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool succ
                         {
                             default:
                             case 0: // Continue
+                                skipCheck = true;
                                 __instance.HandleJoinQuickPlayViewControllerDidFinish(true);
                                 break;
                             case 1: // Cancel
@@ -44,6 +46,7 @@ static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool succ
                                 });
                 return false;
             }
+            skipCheck = false;
             return true;
         }
     }
diff --git a/MultiplayerExtensions/MultiplayerExtensions.csproj b/MultiplayerExtensions/MultiplayerExtensions.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>MultiplayerExtensions</AssemblyName>
-    <AssemblyVersion>0.6.1</AssemblyVersion>
+    <AssemblyVersion>0.6.2</AssemblyVersion>
     <TargetFramework>net472</TargetFramework>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
diff --git a/MultiplayerExtensions/Plugin.cs b/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
 {
@@ -27,10 +23,15 @@ public class Plugin
 
         internal static Plugin Instance { get; private set; } = null!;
         internal static PluginMetadata PluginMetadata = null!;
+
+        internal static bool IsNoodleInstalled { get; private set; }
+        internal static bool IsMappingInstalled { get; private set; }
+        internal static bool IsChromaInstalled { get; private set; }
+
+        internal static Hive.Versioning.Version ProtocolVersion { get; } = new Hive.Versioning.Version("0.7.1");
         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
@@ -41,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;
@@ -67,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]
@@ -82,6 +73,11 @@ public void OnApplicationStart()
 
             HarmonyManager.ApplyDefaultPatches();
             Task versionTask = CheckVersion();
+
+            IsNoodleInstalled = IPA.Loader.PluginManager.IsEnabled(IPA.Loader.PluginManager.GetPluginFromId("NoodleExtensions"));
+            IsMappingInstalled = IPA.Loader.PluginManager.IsEnabled(IPA.Loader.PluginManager.GetPluginFromId("MappingExtensions"));
+            IsChromaInstalled = IPA.Loader.PluginManager.IsEnabled(IPA.Loader.PluginManager.GetPluginFromId("Chroma"));
+
             MPEvents_Test();
             
             Sprites.PreloadSprites();
diff --git a/MultiplayerExtensions/UI/CenterScreenLoadingPanel.cs b/MultiplayerExtensions/UI/CenterScreenLoadingPanel.cs
diff --git a/MultiplayerExtensions/Utilities/Harmony/HarmonyManager.cs b/MultiplayerExtensions/Utilities/Harmony/HarmonyManager.cs
diff --git a/MultiplayerExtensions/manifest.json b/MultiplayerExtensions/manifest.json

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@ namespace MultiplayerExtensions.HarmonyPatches`
`12`	`12`	`[HarmonyPatch(typeof(MultiplayerModeSelectionFlowCoordinator), nameof(MultiplayerModeSelectionFlowCoordinator.HandleJoinQuickPlayViewControllerDidFinish), MethodType.Normal)]`
`13`	`13`	`internal class MultiplayerModeSelectionFlowCoordinatorPatch`
`14`	`14`	`{`
	`15`	`+ internal static bool skipCheck = false;`
`15`	`16`	`static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool success, JoinQuickPlayViewController ____joinQuickPlayViewController, SimpleDialogPromptViewController ____simpleDialogPromptViewController, SongPackMaskModelSO ____songPackMaskModel)`
`16`	`17`	`{`
`17`	`18`	`string levelPackName = ____joinQuickPlayViewController.multiplayerModeSettings.quickPlaySongPackMaskSerializedName;`
`18`	`19`	`Plugin.Log?.Debug(levelPackName);`
`19`		`- if (success && ____songPackMaskModel.ToSongPackMask(levelPackName).Contains("custom_levelpack_CustomLevels"))`
	`20`	`+ if (success && ____songPackMaskModel.ToSongPackMask(levelPackName).Contains("custom_levelpack_CustomLevels") && !skipCheck)`
`20`	`21`	`{`
`21`	`22`	`____simpleDialogPromptViewController.Init(`
`22`	`23`	`"Custom Song Quickplay",`
`@@ -29,6 +30,7 @@ static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool succ`
`29`	`30`	`{`
`30`	`31`	`default:`
`31`	`32`	`case 0: // Continue`
	`33`	`+ skipCheck = true;`
`32`	`34`	`__instance.HandleJoinQuickPlayViewControllerDidFinish(true);`
`33`	`35`	`break;`
`34`	`36`	`case 1: // Cancel`
`@@ -44,6 +46,7 @@ static bool Prefix(MultiplayerModeSelectionFlowCoordinator __instance, bool succ`
`44`	`46`	`});`
`45`	`47`	`return false;`
`46`	`48`	`}`
	`49`	`+ skipCheck = false;`
`47`	`50`	`return true;`
`48`	`51`	`}`
`49`	`52`	`}`