Update to 1.37

Metalit · Jun 8, 2024 · c10daff · c10daff
1 parent f2ca36d
commit c10daff
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 66 deletions.
diff --git a/mod.template.json b/mod.template.json
@@ -6,7 +6,7 @@
   "version": "${version}",
   "modloader": "Scotland2",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.36.1_8647505571",
+  "packageVersion": "1.37.0_9064817954",
   "description": "Loads playlists and provides lots of functionality to other mods.",
   "coverImage": "cover.png",
   "dependencies": [],

diff --git a/qpm.json b/qpm.json
@@ -5,7 +5,7 @@
   "info": {
     "name": "PlaylistCore",
     "id": "playlistcore",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "url": "https://github.com/Metalit/PlaylistCore",
     "additionalData": {
       "overrideSoName": "libplaylistcore.so"
@@ -50,7 +50,7 @@
     },
     {
       "id": "bs-cordl",
-      "versionRange": "^3601.0.0",
+      "versionRange": "^3700.0.0",
       "additionalData": {}
     },
     {

diff --git a/qpm.shared.json b/qpm.shared.json
@@ -6,7 +6,7 @@
     "info": {
       "name": "PlaylistCore",
       "id": "playlistcore",
-      "version": "1.4.0",
+      "version": "1.4.1",
       "url": "https://github.com/Metalit/PlaylistCore",
       "additionalData": {
         "overrideSoName": "libplaylistcore.so"
@@ -54,7 +54,7 @@
       },
       {
         "id": "bs-cordl",
-        "versionRange": "^3601.0.0",
+        "versionRange": "^3700.0.0",
         "additionalData": {}
       },
       {
@@ -137,17 +137,17 @@
     {
       "dependency": {
         "id": "bsml",
-        "versionRange": "=0.4.26",
+        "versionRange": "=0.4.34",
         "additionalData": {
-          "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.26/libbsml.so",
-          "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.26/debug_libbsml.so",
+          "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.34/libbsml.so",
+          "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.34/debug_libbsml.so",
           "overrideSoName": "libbsml.so",
-          "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.26/BSML.qmod",
-          "branchName": "version/v0_4_26",
+          "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.34/BSML.qmod",
+          "branchName": "version/v0_4_34",
           "cmake": true
         }
       },
-      "version": "0.4.26"
+      "version": "0.4.34"
     },
     {
       "dependency": {
@@ -166,13 +166,13 @@
     {
       "dependency": {
         "id": "custom-types",
-        "versionRange": "=0.17.7",
+        "versionRange": "=0.17.8",
         "additionalData": {
-          "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/libcustom-types.so",
-          "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/debug_libcustom-types.so",
+          "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/libcustom-types.so",
+          "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/debug_libcustom-types.so",
           "overrideSoName": "libcustom-types.so",
-          "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/CustomTypes.qmod",
-          "branchName": "version/v0_17_7",
+          "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/CustomTypes.qmod",
+          "branchName": "version/v0_17_8",
           "compileOptions": {
             "cppFlags": [
               "-Wno-invalid-offsetof"
@@ -181,25 +181,26 @@
           "cmake": true
         }
       },
-      "version": "0.17.7"
+      "version": "0.17.8"
     },
     {
       "dependency": {
         "id": "libil2cpp",
-        "versionRange": "=0.3.1",
+        "versionRange": "=0.3.2",
         "additionalData": {
-          "headersOnly": true
+          "headersOnly": true,
+          "cmake": false
         }
       },
-      "version": "0.3.1"
+      "version": "0.3.2"
     },
     {
       "dependency": {
         "id": "bs-cordl",
-        "versionRange": "=3601.0.0",
+        "versionRange": "=3700.0.0",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v3601_0_0",
+          "branchName": "version/v3700_0_0",
           "compileOptions": {
             "includePaths": [
               "include"
@@ -214,34 +215,34 @@
           }
         }
       },
-      "version": "3601.0.0"
+      "version": "3700.0.0"
     },
     {
       "dependency": {
         "id": "songcore",
-        "versionRange": "=1.1.10",
+        "versionRange": "=1.1.12",
         "additionalData": {
-          "soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.10/libsongcore.so",
-          "debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.10/debug_libsongcore.so",
+          "soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.12/libsongcore.so",
+          "debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.12/debug_libsongcore.so",
           "overrideSoName": "libsongcore.so",
-          "modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.10/SongCore.qmod",
-          "branchName": "version/v1_1_10"
+          "modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.12/SongCore.qmod",
+          "branchName": "version/v1_1_12"
         }
       },
-      "version": "1.1.10"
+      "version": "1.1.12"
     },
     {
       "dependency": {
         "id": "beatsaber-hook",
-        "versionRange": "=5.1.6",
+        "versionRange": "=5.1.7",
         "additionalData": {
-          "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.6/libbeatsaber-hook_5_1_6.so",
-          "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.6/debug_libbeatsaber-hook_5_1_6.so",
-          "branchName": "version/v5_1_6",
+          "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/libbeatsaber-hook_5_1_7.so",
+          "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/debug_libbeatsaber-hook_5_1_7.so",
+          "branchName": "version/v5_1_7",
           "cmake": true
         }
       },
-      "version": "5.1.6"
+      "version": "5.1.7"
     },
     {
       "dependency": {
@@ -256,21 +257,6 @@
       },
       "version": "0.1.4"
     },
-    {
-      "dependency": {
-        "id": "tinyxml2",
-        "versionRange": "=10.0.0",
-        "additionalData": {
-          "soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
-          "debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
-          "overrideSoName": "libtinyxml2.so",
-          "modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
-          "branchName": "version/v10_0_0",
-          "cmake": true
-        }
-      },
-      "version": "10.0.0"
-    },
     {
       "dependency": {
         "id": "fmt",
@@ -289,6 +275,21 @@
         }
       },
       "version": "10.0.0"
+    },
+    {
+      "dependency": {
+        "id": "tinyxml2",
+        "versionRange": "=10.0.0",
+        "additionalData": {
+          "soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
+          "debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
+          "overrideSoName": "libtinyxml2.so",
+          "modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
+          "branchName": "version/v10_0_0",
+          "cmake": true
+        }
+      },
+      "version": "10.0.0"
     }
   ]
 }
diff --git a/src/Main.cpp b/src/Main.cpp
@@ -3,11 +3,8 @@
 #include "Types/Config.hpp"
 #include "PlaylistCore.hpp"
 #include "Settings.hpp"
-#include "Utils.hpp"
 #include "ResettableStaticPtr.hpp"
 
-#include <chrono>
-
 #include "beatsaber-hook/shared/utils/il2cpp-utils.hpp"
 #include "beatsaber-hook/shared/config/config-utils.hpp"
 #include "beatsaber-hook/shared/utils/hooking.hpp"
@@ -16,8 +13,6 @@
 
 #include "bsml/shared/BSML.hpp"
 
-#include "custom-types/shared/delegate.hpp"
-
 #include "GlobalNamespace/StandardLevelDetailViewController.hpp"
 #include "GlobalNamespace/LevelCollectionViewController.hpp"
 #include "GlobalNamespace/LevelCollectionTableView.hpp"
@@ -34,31 +29,23 @@
 #include "GlobalNamespace/PlayerData.hpp"
 #include "GlobalNamespace/PlayerDataModel.hpp"
 #include "GlobalNamespace/SongPreviewPlayer.hpp"
-#include "GlobalNamespace/StandardLevelInfoSaveData.hpp"
 #include "GlobalNamespace/EnvironmentInfoSO.hpp"
 #include "GlobalNamespace/BeatmapLevel.hpp"
 #include "GlobalNamespace/IEntitlementModel.hpp"
 
 #include "UnityEngine/Resources.hpp"
 #include "UnityEngine/GameObject.hpp"
-#include "UnityEngine/Rect.hpp" // This needs to be included before RectTransform
 #include "UnityEngine/RectTransform.hpp"
-#include "UnityEngine/Events/UnityAction.hpp"
-#include "UnityEngine/UI/Button.hpp"
-#include "UnityEngine/UI/VerticalLayoutGroup.hpp"
 #include "HMUI/TableView.hpp"
 #include "HMUI/ScrollView.hpp"
 #include "HMUI/ViewController.hpp"
 #include "HMUI/FlowCoordinator.hpp"
 #include "HMUI/InputFieldView.hpp"
-#include "Tweening/TimeTweeningManager.hpp"
 #include "Tweening/Vector2Tween.hpp"
 #include "Zenject/DiContainer.hpp"
 #include "Zenject/StaticMemoryPool_7.hpp"
-#include "System/Tuple_2.hpp"
 #include "System/Action_1.hpp"
 #include "System/Action_2.hpp"
-#include "System/Collections/Generic/HashSet_1.hpp"
 
 using namespace GlobalNamespace;
 using namespace PlaylistCore;
@@ -154,12 +141,12 @@ MAKE_HOOK_MATCH(AnnotatedBeatmapLevelCollectionsGridViewAnimator_AnimateOpen, &A
 
 // ensure animator doesn't get stuck at the wrong position
 MAKE_HOOK_MATCH(AnnotatedBeatmapLevelCollectionsGridViewAnimator_ScrollToRowIdxInstant, &AnnotatedBeatmapLevelCollectionsGridViewAnimator::ScrollToRowIdxInstant,
-        void, AnnotatedBeatmapLevelCollectionsGridViewAnimator* self, int selectedRow) {
+        void, AnnotatedBeatmapLevelCollectionsGridViewAnimator* self, int selectedColumn, int selectedRow) {
 
     // despawns tweens and force sets the viewport and anchored pos
-    self->AnimateClose(selectedRow, false);
+    self->AnimateClose(selectedColumn, selectedRow, false);
 
-    AnnotatedBeatmapLevelCollectionsGridViewAnimator_ScrollToRowIdxInstant(self, selectedRow);
+    AnnotatedBeatmapLevelCollectionsGridViewAnimator_ScrollToRowIdxInstant(self, selectedColumn, selectedRow);
 }
 
 // prevent download icon showing up on empty custom playlists unless manager is changing the behavior

diff --git a/src/SpriteCache.cpp b/src/SpriteCache.cpp
@@ -42,7 +42,7 @@ void RemoveCachedSprite(Sprite* sprite) {
 
 void ClearCachedSprites() {
     for(auto& pair : caches) {
-        if (pair.second && pair.second->m_CachedPtr) {
+        if (pair.second && pair.second->m_CachedPtr.m_value) {
             Object::Destroy(pair.second);
         }
     }