Merge pull request #64 from Meivyn/fix/1.31.1

rithik-b · Sep 11, 2023 · b3462c3 · b3462c3
2 parents 24af3c9 + 2dda00f
commit b3462c3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/PlaylistManager/Managers/PlaylistDataManager.cs b/PlaylistManager/Managers/PlaylistDataManager.cs
@@ -1,10 +1,10 @@
-using IPA.Utilities;
+using System;
+using System.Collections.Generic;
 using PlaylistManager.HarmonyPatches;
 using PlaylistManager.Interfaces;
 using PlaylistManager.UI;
 using PlaylistManager.Utilities;
-using System;
-using System.Collections.Generic;
+using UnityEngine;
 using Zenject;
 
 namespace PlaylistManager
@@ -88,7 +88,7 @@ private void LevelPackDetailViewController_didActivateEvent(bool firstActivation
             }
         }
 
-        private void LevelFilteringNavigationController_didSelectAnnotatedBeatmapLevelCollectionEvent(LevelFilteringNavigationController _, IAnnotatedBeatmapLevelCollection annotatedBeatmapLevelCollection, UnityEngine.GameObject __, BeatmapCharacteristicSO ___)
+        private void LevelFilteringNavigationController_didSelectAnnotatedBeatmapLevelCollectionEvent(LevelFilteringNavigationController controller, IAnnotatedBeatmapLevelCollection annotatedBeatmapLevelCollection, GameObject noDataInfoPrefab, bool sortAlphabetically, BeatmapCharacteristicSO preferredBeatmapCharacteristic)
         {
             AnnotatedBeatmapLevelCollectionsViewController_didSelectAnnotatedBeatmapLevelCollectionEvent(annotatedBeatmapLevelCollection);
         }

diff --git a/PlaylistManager/UI/RefreshButtonUI.cs b/PlaylistManager/UI/RefreshButtonUI.cs
@@ -3,7 +3,7 @@
 using SongCore;
 using SongCore.UI;
 using System;
-using IPA.Utilities.Async;
+using System.Threading.Tasks;
 using Zenject;
 
 namespace PlaylistManager.UI
@@ -28,11 +28,13 @@ private async void SongsLoaded(Loader _, System.Collections.Concurrent.Concurren
                 progressBar = ProgressBar.Create();
             }
 
-            var numPlaylists = await UnityMainThreadTaskScheduler.Factory.StartNew(() =>
-            {
-                PlaylistLibUtils.playlistManager.RefreshPlaylists(true);
-                return PlaylistLibUtils.playlistManager.GetPlaylistCount(true);
-            }).ConfigureAwait(false);
+            PlaylistLibUtils.playlistManager.RefreshPlaylists(true);
+            var numPlaylists = PlaylistLibUtils.playlistManager.GetPlaylistCount(true);
+
+            // This event handler is loading sprites and accessing Unity objects so it must be done on the main thread.
+            // Although SongsLoadedEvent is already invoked on the main thread, the default event handler in ProgressBar
+            // will overwrite our message. We're essentially skipping a frame to let the default event handler run first.
+            await Task.Yield();
 
             progressBar.enabled = true;
             progressBar.ShowMessage($"\n{numPlaylists} playlists loaded.", kMessageTime);

diff --git a/PlaylistManager/UI/ViewControllers/LevelDetailButtonsViewController.cs b/PlaylistManager/UI/ViewControllers/LevelDetailButtonsViewController.cs
@@ -112,15 +112,15 @@ private void RemoveSong()
             if ((PluginConfig.Instance.AuthorName.IndexOf("GOOBIE", StringComparison.OrdinalIgnoreCase) >= 0 || PluginConfig.Instance.AuthorName.IndexOf("ERIS", StringComparison.OrdinalIgnoreCase) >= 0 ||
                  PluginConfig.Instance.AuthorName.IndexOf("PINK", StringComparison.OrdinalIgnoreCase) >= 0 || PluginConfig.Instance.AuthorName.IndexOf("CANDL3", StringComparison.OrdinalIgnoreCase) >= 0) && PluginConfig.Instance.EasterEggs)
             {
-                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, $"{PluginConfig.Instance.AuthorName} Cute");
+                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, $"{PluginConfig.Instance.AuthorName} Cute", false);
             }
             else if (PluginConfig.Instance.AuthorName.IndexOf("JOSHABI", StringComparison.OrdinalIgnoreCase) >= 0)
             {
-                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, $"*Sneeze*");
+                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, $"*Sneeze*", false);
             }
             else
             {
-                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, "Play");
+                levelCollectionNavigationController.SetDataForPack(selectedPlaylist, true, true, "Play", false);
             }
 
             levelCollectionNavigationController.HideDetailViewController();

diff --git a/PlaylistManager/UI/ViewControllers/PlaylistDetailsViewController.cs b/PlaylistManager/UI/ViewControllers/PlaylistDetailsViewController.cs
@@ -189,9 +189,9 @@ private void ReadOnlyToggled(bool playlistReadOnly)
         {
             if (playlistReadOnly)
             {
-                playlistReadOnly = true;
+                PlaylistReadOnly = true;
             }
-            else if (PlaylistAllowDuplicates != PlaylistReadOnly)
+            else if (PlaylistReadOnly != playlistReadOnly)
             {
                 popupModalsController.ShowYesNoModal(modalTransform, "To turn off read only, this playlist will be cloned and writing will be enabled on the clone. Proceed?", ClonePlaylist, noButtonPressedCallback: UpdateReadOnly, animateParentCanvas: false);
             }

diff --git a/PlaylistManager/manifest.json b/PlaylistManager/manifest.json
@@ -3,20 +3,20 @@
     "id": "PlaylistManager",
     "name": "PlaylistManager",
     "author": "PixelBoom",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "description": [
         "#![PlaylistManager.Description.md]",
         "Load, Create, Edit, Organize Playlists and Download their Songs in Beat Saber."
     ],
-    "gameVersion": "1.31.0",
+    "gameVersion": "1.31.1",
     "icon": "PlaylistManager.Icons.Logo.png",
     "dependsOn": {
         "BSIPA": "^4.3.0",
         "SongCore": "^3.9.5",
         "BeatSaberMarkupLanguage": "^1.7.5",
         "SiraUtil": "^3.0.0",
         "BeatSaberPlaylistsLib": "^1.6.7",
-        "BeatSaverSharp": "^3.3.0",
+        "BeatSaverSharp": "^3.4.5",
         "System.IO.Compression": "^4.6.57",
         "System.IO.Compression.FileSystem": "^4.7.3056"
     },