Merge pull request #152 from EnderdracheLP/1.16.3

Added Download Progress Bar and warning dialog for Quickplay customs

Author: Goobwabber

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();
+            }).DownloadZIP(progress: UI.CenterScreenLoadingPanel.self);
 #if DEBUG
             TimeSpan delay = TimeSpan.FromSeconds(Plugin.Config.DebugConfig?.MinDownloadTime ?? 0) - TimeSpan.FromMilliseconds(sw.ElapsedMilliseconds);
             if (delay > TimeSpan.Zero)

MultiplayerExtensions/Extensions/ExtendedGameStateController.cs

@@ -115,6 +115,13 @@ public async override void HandleMultiplayerLevelLoaderCountdownFinished(IPrevie
             _levelLoadSyncCts = null;
 
             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);
         }
     }

MultiplayerExtensions/HarmonyPatches/QuickplayPatches.cs

@@ -0,0 +1,50 @@
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using IPA.Utilities;
+using HMUI;
+
+namespace MultiplayerExtensions.HarmonyPatches
+{
+    [HarmonyPatch(typeof(MultiplayerModeSelectionFlowCoordinator), nameof(MultiplayerModeSelectionFlowCoordinator.HandleJoinQuickPlayViewControllerDidFinish), MethodType.Normal)]
+    internal class MultiplayerModeSelectionFlowCoordinatorPatch
+    {
+        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"))
+            {
+                ____simpleDialogPromptViewController.Init(
+                    "Custom Song Quickplay",
+                    "<color=#EB4949>This category includes songs of varying difficulty.\nIt may be more enjoyable to play in a private lobby with friends.",
+                    "Continue",
+                    "Cancel",
+                    delegate (int btnId)
+                    {
+                        switch (btnId)
+                        {
+                            default:
+                            case 0: // Continue
+                                __instance.HandleJoinQuickPlayViewControllerDidFinish(true);
+                                break;
+                            case 1: // Cancel
+                                __instance.InvokeMethod<object, MultiplayerModeSelectionFlowCoordinator>("ReplaceTopViewController", new object[] {
+                                    ____joinQuickPlayViewController, null, ViewController.AnimationType.In, ViewController.AnimationDirection.Vertical
+                                });
+                                break;
+                        }
+                    }
+                    );
+                __instance.InvokeMethod<object, MultiplayerModeSelectionFlowCoordinator>("ReplaceTopViewController", new object[] {
+                                    ____simpleDialogPromptViewController, null, ViewController.AnimationType.In, ViewController.AnimationDirection.Vertical
+                                });
+                return false;
+            }
+            return true;
+        }
+    }
+}

MultiplayerExtensions/MultiplayerExtensions.csproj

@@ -35,7 +35,6 @@
     <DisableZipRelease>True</DisableZipRelease>
   </PropertyGroup>
   <ItemGroup>
-    <None Remove="UI\CenterScreenLoading.bsml" />
     <None Remove="UI\LobbySetupPanel.bsml" />
     <None Remove="UI\settings.bsml" />
   </ItemGroup>
@@ -204,7 +203,6 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="manifest.json" />
-    <EmbeddedResource Include="UI\CenterScreenLoading.bsml" />
     <EmbeddedResource Include="UI\LobbySetupPanel.bsml" />
     <EmbeddedResource Include="UI\settings.bsml" />
     <None Remove="Assets\IconSteam64.png" />

MultiplayerExtensions/UI/CenterScreenLoading.bsml

@@ -1,46 +1,72 @@
 using BeatSaberMarkupLanguage.Attributes;
 using BeatSaberMarkupLanguage.ViewControllers;
+using System;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 using Zenject;
 
 namespace MultiplayerExtensions.UI
 {
-    class CenterScreenLoadingPanel : BSMLResourceViewController
+    class CenterScreenLoadingPanel : MonoBehaviour, IProgress<double>
     {
-        public override string ResourceName => "MultiplayerExtensions.UI.CenterScreenLoading.bsml";
         private IMultiplayerSessionManager sessionManager;
         private ILobbyGameStateController gameStateController;
         private CenterStageScreenController screenController;
+        private LoadingControl? loadingControl;
+        private bool isDownloading;
+        public static CenterScreenLoadingPanel? self { get; private set; }
 
         [Inject]
         internal void Inject(IMultiplayerSessionManager sessionManager, ILobbyGameStateController gameStateController, CenterStageScreenController screenController)
         {
+            self = this;
             this.sessionManager = sessionManager;
             this.gameStateController = gameStateController;
             this.screenController = screenController;
-            base.DidActivate(true, false, true);
 
-            loadIndicator.color = Color.white;
-        }
-
-        [UIComponent("LoadingDisplay")]
-        public RectTransform loadingDisplay;
+            BeatSaberMarkupLanguage.Tags.VerticalLayoutTag verticalTag = new BeatSaberMarkupLanguage.Tags.VerticalLayoutTag();
+            GameObject vertical = verticalTag.CreateObject(transform);
+            (vertical.transform as RectTransform).sizeDelta = new Vector2(60, 60);
+            (vertical.transform as RectTransform).anchoredPosition = new Vector2(0.0f, -30.0f);
+            var layout = vertical.AddComponent<LayoutElement>().minWidth = 60;
 
-        [UIComponent("LoadIndicator")]
-        public Image loadIndicator;
+            GameObject existingLoadingControl = Resources.FindObjectsOfTypeAll<LoadingControl>().First().gameObject;
+            GameObject loadingControlGameObject = GameObject.Instantiate(existingLoadingControl, vertical.transform);
+            loadingControl = loadingControlGameObject.GetComponent<LoadingControl>();
+            loadingControl.Hide();
+        }
 
         public void Update()
         {
-            if (screenController.countdownShown && sessionManager.syncTime >= gameStateController.startTime && gameStateController.levelStartInitiated)
+            if (isDownloading)
             {
-                if (loadingDisplay != null)
-                    loadingDisplay.gameObject.SetActive(true);
+                return;
+            }
+            else if (screenController.countdownShown && sessionManager.syncTime >= gameStateController.startTime && gameStateController.levelStartInitiated)
+            {
+                if (loadingControl != null)
+                    loadingControl.ShowLoading("Loading...");
             }
             else
             {
-                if (loadingDisplay != null)
-                    loadingDisplay.gameObject.SetActive(false);
+                if (loadingControl != null)
+                    loadingControl.Hide();
+            }
+        }
+
+        public void OnDisable()
+        {
+            if (loadingControl != null)
+                loadingControl.Hide();
+        }
+
+        public void Report(double value)
+        {
+            isDownloading = (value < 1.0);
+            if (loadingControl != null)
+            {
+                loadingControl.ShowDownloadingProgress("Downloading...", (float)value);
             }
         }
     }

MultiplayerExtensions/UI/CenterScreenLoadingPanel.cs

@@ -49,6 +49,7 @@ static HarmonyManager()
             AddDefaultPatch<PacketErrorLoggingPatch>();
             //AddDefaultPatch<YeetPredictionsPatch>();
             AddDefaultPatch<DisableAvatarRestrictions>();
+            AddDefaultPatch<MultiplayerModeSelectionFlowCoordinatorPatch>();
         }
 
         private static void AddDefaultPatch<T>() where T : class