From c4e11fa01cc83f70da7b645cbbb9e661ea9674ed Mon Sep 17 00:00:00 2001
From: Meivyn <793322+Meivyn@users.noreply.github.com>
Date: Thu, 5 Oct 2023 22:26:37 -0400
Subject: [PATCH] Fix for game v1.32.0

---
 .../Managers/PlaylistDataManager.cs           |   2 +-
 PlaylistManager/Managers/PlaylistUIManager.cs |   3 +-
 PlaylistManager/PlaylistManager.csproj        | 191 +++++++++---------
 PlaylistManager/Utilities/PlaylistLibUtils.cs |   2 -
 PlaylistManager/manifest.json                 |   6 +-
 5 files changed, 106 insertions(+), 98 deletions(-)

diff --git a/PlaylistManager/Managers/PlaylistDataManager.cs b/PlaylistManager/Managers/PlaylistDataManager.cs
index 850a7fe..e7fefd5 100644
--- a/PlaylistManager/Managers/PlaylistDataManager.cs
+++ b/PlaylistManager/Managers/PlaylistDataManager.cs
@@ -41,7 +41,7 @@ internal PlaylistDataManager(AnnotatedBeatmapLevelCollectionsViewController anno
             this.levelCollectionsTableUpdaters = levelCollectionsTableUpdaters;
             this.previewBeatmapLevelUpdaters = previewBeatmapLevelUpdaters;
 
-            emptyBeatmapLevelPack = new BeatmapLevelPack(CustomLevelLoader.kCustomLevelPackPrefixId + "CustomLevels", "Custom Levels", "Custom Levels", BeatSaberMarkupLanguage.Utilities.ImageResources.BlankSprite, BeatSaberMarkupLanguage.Utilities.ImageResources.BlankSprite, new BeatmapLevelCollection(new IPreviewBeatmapLevel[0]));
+            emptyBeatmapLevelPack = new BeatmapLevelPack(CustomLevelLoader.kCustomLevelPackPrefixId + "CustomLevels", "Custom Levels", "Custom Levels", BeatSaberMarkupLanguage.Utilities.ImageResources.BlankSprite, BeatSaberMarkupLanguage.Utilities.ImageResources.BlankSprite, new BeatmapLevelCollection(new IPreviewBeatmapLevel[0]), PlayerSensitivityFlag.Safe);
         }
 
         public void Initialize()
diff --git a/PlaylistManager/Managers/PlaylistUIManager.cs b/PlaylistManager/Managers/PlaylistUIManager.cs
index b196a89..0c3e6b7 100644
--- a/PlaylistManager/Managers/PlaylistUIManager.cs
+++ b/PlaylistManager/Managers/PlaylistUIManager.cs
@@ -6,6 +6,7 @@
 using PlaylistManager.Utilities;
 using PlaylistManager.HarmonyPatches;
 using System.Linq;
+using System.Threading;
 using PlaylistManager.Downloaders;
 using PlaylistManager.UI;
 
@@ -150,7 +151,7 @@ private async void AssignAuthor()
         {
             if (PluginConfig.Instance.AutomaticAuthorName)
             {
-                var user = await platformUserModel.GetUserInfo();
+                var user = await platformUserModel.GetUserInfo(CancellationToken.None);
                 if (PluginConfig.Instance.AuthorName == null && user == null)
                 {
                     PluginConfig.Instance.AuthorName = nameof(PlaylistManager);
diff --git a/PlaylistManager/PlaylistManager.csproj b/PlaylistManager/PlaylistManager.csproj
index 2093455..cf27c26 100644
--- a/PlaylistManager/PlaylistManager.csproj
+++ b/PlaylistManager/PlaylistManager.csproj
@@ -29,99 +29,108 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Reference Include="BeatmapCore">
-          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll</HintPath>
+      <Reference Include="0Harmony">
+          <HintPath>$(BeatSaberDir)\Libs\0Harmony.dll</HintPath>
           <Private>False</Private>
-        </Reference>
-        <Reference Include="Hive.Versioning">
-          <HintPath>$(BeatSaberDir)\Libs\Hive.Versioning.dll</HintPath>
+      </Reference>
+      <Reference Include="AdditionalContentModel.Interfaces">
+        <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\AdditionalContentModel.Interfaces.dll</HintPath>
+        <Private>false</Private>
+      </Reference>
+      <Reference Include="BeatmapCore">
+        <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll</HintPath>
+        <Private>False</Private>
+      </Reference>
+      <Reference Include="BeatSaberPlaylistsLib">
+          <HintPath>$(BeatSaberDir)\Libs\BeatSaberPlaylistsLib.dll</HintPath>
           <Private>False</Private>
-        </Reference>
-        <Reference Include="Polyglot, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Polyglot.dll</HintPath>
-        </Reference>
-        <Reference Include="Tweening">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Tweening.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="UnityEngine">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="UnityEngine.CoreModule">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="Unity.TextMeshPro">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="UnityEngine.UI">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="UnityEngine.UIModule">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="System">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\System.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="HMLib">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="HMUI">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll</HintPath>
-            <Private>False</Private>
-            <Publicize>True</Publicize>
-        </Reference>
-        <Reference Include="Main">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll</HintPath>
-            <Private>False</Private>
-            <Publicize>True</Publicize>
-        </Reference>
-        <Reference Include="0Harmony">
-            <HintPath>$(BeatSaberDir)\Libs\0Harmony.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="IPA.Loader">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="BeatSaberPlaylistsLib">
-            <HintPath>$(BeatSaberDir)\Libs\BeatSaberPlaylistsLib.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="BeatSaverSharp">
-            <HintPath>$(BeatSaberDir)\Libs\BeatSaverSharp.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="BSML">
-            <HintPath>$(BeatSaberDir)\Plugins\BSML.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="SongCore">
-            <HintPath>$(BeatSaberDir)\Plugins\SongCore.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="SiraUtil">
-            <HintPath>$(BeatSaberDir)\Plugins\SiraUtil.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Zenject">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Zenject-usage">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject-usage.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="mscorlib">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\mscorlib.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
+      </Reference>
+      <Reference Include="BeatSaverSharp">
+          <HintPath>$(BeatSaberDir)\Libs\BeatSaverSharp.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="BGLib.DotnetExtension">
+        <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.DotnetExtension.dll</HintPath>
+        <Private>false</Private>
+      </Reference>
+      <Reference Include="BSML">
+          <HintPath>$(BeatSaberDir)\Plugins\BSML.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="Hive.Versioning">
+        <HintPath>$(BeatSaberDir)\Libs\Hive.Versioning.dll</HintPath>
+        <Private>False</Private>
+      </Reference>
+      <Reference Include="HMLib">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="HMUI">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll</HintPath>
+          <Private>False</Private>
+          <Publicize>True</Publicize>
+      </Reference>
+      <Reference Include="IPA.Loader">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="Main">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll</HintPath>
+          <Private>False</Private>
+          <Publicize>True</Publicize>
+      </Reference>
+      <Reference Include="mscorlib">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\mscorlib.dll</HintPath>
+          <Private>false</Private>
+      </Reference>
+      <Reference Include="PlatformUserModel">
+        <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\PlatformUserModel.dll</HintPath>
+        <Private>false</Private>
+      </Reference>
+      <Reference Include="SiraUtil">
+          <HintPath>$(BeatSaberDir)\Plugins\SiraUtil.dll</HintPath>
+          <Private>false</Private>
+      </Reference>
+      <Reference Include="SongCore">
+          <HintPath>$(BeatSaberDir)\Plugins\SongCore.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="System">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\System.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="Tweening">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Tweening.dll</HintPath>
+          <Private>false</Private>
+      </Reference>
+      <Reference Include="Unity.TextMeshPro">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="UnityEngine">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="UnityEngine.CoreModule">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="UnityEngine.UI">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="UnityEngine.UIModule">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
+      <Reference Include="Zenject">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll</HintPath>
+          <Private>false</Private>
+      </Reference>
+      <Reference Include="Zenject-usage">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Zenject-usage.dll</HintPath>
+          <Private>false</Private>
+      </Reference>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/PlaylistManager/Utilities/PlaylistLibUtils.cs b/PlaylistManager/Utilities/PlaylistLibUtils.cs
index 05ceab5..658f3a4 100644
--- a/PlaylistManager/Utilities/PlaylistLibUtils.cs
+++ b/PlaylistManager/Utilities/PlaylistLibUtils.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Reflection;
diff --git a/PlaylistManager/manifest.json b/PlaylistManager/manifest.json
index 2e7bd2c..caf0af0 100644
--- a/PlaylistManager/manifest.json
+++ b/PlaylistManager/manifest.json
@@ -3,19 +3,19 @@
     "id": "PlaylistManager",
     "name": "PlaylistManager",
     "author": "PixelBoom",
-    "version": "1.6.8",
+    "version": "1.6.9",
     "description": [
         "#![PlaylistManager.Description.md]",
         "Load, Create, Edit, Organize Playlists and Download their Songs in Beat Saber."
     ],
-    "gameVersion": "1.31.1",
+    "gameVersion": "1.32.0",
     "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",
+        "BeatSaberPlaylistsLib": "^1.6.8",
         "BeatSaverSharp": "^3.4.5",
         "System.IO.Compression": "^4.6.57",
         "System.IO.Compression.FileSystem": "^4.7.3056"