Version 6.4.0

hardcpp · hardcpp · commit 5285dd4c0a54 · 2025-05-07T17:34:52.000+02:00
diff --git a/.github/actions/canary-ndk/action.yml b/.github/actions/canary-ndk/action.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,14 +22,9 @@ jobs:
 
     - uses: seanmiddleditch/gha-setup-ninja@v3
 
-    # Use canary NDK to avoid lesser known compile bugs
-    - name: Setup canary NDK
-      id: setup-ndk
-      uses: ./.github/actions/canary-ndk
-
     - name: Create ndkpath.txt
       run: |
-        echo ${{ steps.setup-ndk.outputs.ndk-path }} > ${GITHUB_WORKSPACE}/ndkpath.txt
+        echo $ANDROID_NDK_HOME > ${GITHUB_WORKSPACE}/ndkpath.txt
         cat ${GITHUB_WORKSPACE}/ndkpath.txt
 
     # get version from pushed tag
diff --git a/include/git_info.h b/include/git_info.h
@@ -1,5 +1,5 @@
 #pragma once
 #define GIT_USER "HardCPP"
 #define GIT_BRANCH "dev"
-#define GIT_COMMIT 0xc593a3c
+#define GIT_COMMIT 0xc20158d
 #define GIT_MODIFIED 1
diff --git a/mod.json b/mod.json
@@ -5,7 +5,7 @@
   "id": "chatplex-sdk-bs",
   "modloader": "Scotland2",
   "author": "HardCPP",
-  "version": "6.4.0",
+  "version": "6.3.2",
   "packageId": "com.beatgames.beatsaber",
   "packageVersion": "1.40.4_5283",
   "description": "ChatPlex BeatSaber modding SDK (Dependence for other mods)",
@@ -34,7 +34,7 @@
     {
       "version": "^4.6.1",
       "id": "paper2_scotland2",
-      "downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.1/paper2_scotland2.qmod"
+      "downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.2/paper2_scotland2.qmod"
     }
   ],
   "modFiles": [
diff --git a/qpm.shared.json b/qpm.shared.json
@@ -127,12 +127,12 @@
     {
       "dependency": {
         "id": "paper2_scotland2",
-        "versionRange": "=4.6.1",
+        "versionRange": "=4.6.2",
         "additionalData": {
-          "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.1/libpaper2_scotland2.so",
+          "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.2/libpaper2_scotland2.so",
           "overrideSoName": "libpaper2_scotland2.so",
-          "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.1/paper2_scotland2.qmod",
-          "branchName": "version/v4_6_1",
+          "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.2/paper2_scotland2.qmod",
+          "branchName": "version/v4_6_2",
           "compileOptions": {
             "systemIncludes": [
               "shared/utfcpp/source"
@@ -141,7 +141,7 @@
           "cmake": false
         }
       },
-      "version": "4.6.1"
+      "version": "4.6.2"
     },
     {
       "dependency": {
diff --git a/shared/CP_SDK_BS/Game/BeatMaps/MapVersion.hpp b/shared/CP_SDK_BS/Game/BeatMaps/MapVersion.hpp
@@ -40,7 +40,7 @@ namespace CP_SDK_BS::Game::BeatMaps {
         CP_SDK_IL2CPP_ENUM_UTILS();
     };
 
-    struct MapVersion
+    struct CP_SDK_EXPORT MapVersion
     {
         MapVersion() = default;
         CP_SDK_NO_COPYMOVE_CTORS(MapVersion);
diff --git a/shared/CP_SDK_BS/UI/CP_SDK_UI_IViewControllerBridge.hpp b/shared/CP_SDK_BS/UI/CP_SDK_UI_IViewControllerBridge.hpp
@@ -15,7 +15,7 @@ namespace CP_SDK_BS::UI {
     class IHMUIViewController;
 
     /// @brief CP_SDK.UI.IViewController bridge component
-    class CP_SDK_UI_IViewControllerBridge : public CP_SDK::UI::IViewController
+    class CP_SDK_EXPORT CP_SDK_UI_IViewControllerBridge : public CP_SDK::UI::IViewController
     {
         CP_SDK_IL2CPP_INHERIT("CP_SDK_BS.UI", CP_SDK_UI_IViewControllerBridge, CP_SDK::UI::IViewController);
         CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(CP_SDK_UI_IViewControllerBridge);
diff --git a/shared/CP_SDK_BS/UI/DefaultComponentsOverrides/BS_CFloatingPanel.hpp b/shared/CP_SDK_BS/UI/DefaultComponentsOverrides/BS_CFloatingPanel.hpp
@@ -15,7 +15,7 @@ namespace CP_SDK_BS::UI::DefaultComponentsOverrides {
     }
 
     /// @brief BeatSaber CFloatingPanel component
-    class BS_CFloatingPanel : public CP_SDK::UI::DefaultComponents::DefaultCFloatingPanel
+    class CP_SDK_EXPORT BS_CFloatingPanel : public CP_SDK::UI::DefaultComponents::DefaultCFloatingPanel
     {
         CP_SDK_IL2CPP_INHERIT("CP_SDK_BS.UI.DefaultComponentsOverrides", BS_CFloatingPanel, CP_SDK::UI::DefaultComponents::DefaultCFloatingPanel);
         CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(BS_CFloatingPanel);
diff --git a/shared/CP_SDK_BS/UI/IHMUIViewController.hpp b/shared/CP_SDK_BS/UI/IHMUIViewController.hpp
@@ -25,7 +25,7 @@ namespace CP_SDK_BS::UI {
     }
 
     /// @brief IHMUIViewController interface
-    class IHMUIViewController : public HMUI::ViewController
+    class CP_SDK_EXPORT IHMUIViewController : public HMUI::ViewController
     {
         CP_SDK_IL2CPP_INHERIT("CP_SDK_BS.UI", IHMUIViewController, HMUI::ViewController);
         CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(IHMUIViewController);
diff --git a/src/CP_SDK/Logging/PaperLogger.cpp b/src/CP_SDK/Logging/PaperLogger.cpp
@@ -11,7 +11,10 @@ namespace CP_SDK::Logging {
     PaperLogger::PaperLogger(const std::string& p_Name)
         : m_PaperLogger(new Paper::LoggerContext(p_Name))
     {
-
+        Error(u"Test Error");
+        Warning(u"Test Warning");
+        Info(u"Test Info");
+        Debug(u"Test Debug");
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -29,10 +32,10 @@ namespace CP_SDK::Logging {
         auto l_String = l_UTF8Data.c_str();
         switch (p_Type)
         {
-            case ELogType::Error:    m_PaperLogger->error("{}", l_String);   break;
-            case ELogType::Warning:  m_PaperLogger->warn("{}", l_String); break;
-            case ELogType::Info:     m_PaperLogger->info("{}", l_String);    break;
-            case ELogType::Debug:    m_PaperLogger->debug("{}", l_String);   break;
+            case ELogType::Error:    m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Error>("{}", l_String);   break;
+            case ELogType::Warning:  m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Warn>("{}", l_String);    break;
+            case ELogType::Info:     m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Info>("{}", l_String);    break;
+            case ELogType::Debug:    m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Debug>("{}", l_String);   break;
         }
     }
     /// @brief Internal log method
@@ -43,10 +46,10 @@ namespace CP_SDK::Logging {
         auto l_String = p_Data.what();
         switch (p_Type)
         {
-            case ELogType::Error:    m_PaperLogger->error("{}", l_String);   break;
-            case ELogType::Warning:  m_PaperLogger->warn("{}", l_String); break;
-            case ELogType::Info:     m_PaperLogger->info("{}", l_String);    break;
-            case ELogType::Debug:    m_PaperLogger->debug("{}", l_String);   break;
+            case ELogType::Error:    m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Error>("{}", l_String);   break;
+            case ELogType::Warning:  m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Warn>("{}", l_String);    break;
+            case ELogType::Info:     m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Info>("{}", l_String);    break;
+            case ELogType::Debug:    m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Debug>("{}", l_String);   break;
         }
     }
 
diff --git a/src/CP_SDK_BS/Game/LevelSelection.cpp b/src/CP_SDK_BS/Game/LevelSelection.cpp
@@ -32,7 +32,6 @@ namespace CP_SDK_BS::Game {
     /// @param p_SongToFilter Song to filter
     bool LevelSelection::FilterToSpecificSong(_u::BeatmapLevel* p_SongToFilter)
     {
-        CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering 5");
         m_PendingFilterSong = p_SongToFilter;
 
         try
@@ -67,7 +66,6 @@ namespace CP_SDK_BS::Game {
     /// @param p_LevelSelectionNavigationController instance
     void LevelSelection::LevelSelectionNavigationController_didActivateEvent(_u::LevelSelectionNavigationController* p_LevelSelectionNavigationController)
     {
-        CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering 4");
         CP_SDK::Unity::MTCoroutineStarter::Start(custom_types::Helpers::CoroutineHelper::New(
             LevelSelection_SelectLevelCategory(p_LevelSelectionNavigationController)
         ));
@@ -77,7 +75,6 @@ namespace CP_SDK_BS::Game {
         void, _u::LevelSelectionNavigationController* __Instance,
         bool __a, bool __b, bool __c)
     {
-        CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering 3");
         //CP_SDK::ChatPlexSDK::Logger()->Error(u"Enter LevelSelectionNavigationController_DidActivate");
 
         LevelSelectionNavigationController_DidActivate(__Instance, __a, __b, __c);
@@ -106,7 +103,6 @@ namespace CP_SDK_BS::Game {
     /// @param p_LevelSelectionNavigationController LevelSelectionNavigationController instance
     custom_types::Helpers::Coroutine LevelSelection::LevelSelection_SelectLevelCategory(_u::LevelSelectionNavigationController* p_LevelSelectionNavigationController)
     {
-        CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering 2");
         while (!_v::IsUnityPtrValid(p_LevelSelectionNavigationController) || p_LevelSelectionNavigationController->____isInTransition)
         {
             if (!_v::IsUnityPtrValid(p_LevelSelectionNavigationController))
@@ -173,7 +169,6 @@ namespace CP_SDK_BS::Game {
     /// @param p_Wait Should wait for any transition
     custom_types::Helpers::Coroutine LevelSelection::LevelSelection_FilterLevel(_u::LevelSearchViewController* p_LevelSearchViewController, bool p_Wait)
     {
-        CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering 1");
         if (Logic::ActiveScene() != Logic::ESceneType::Menu)
             co_return;
 
@@ -199,7 +194,6 @@ namespace CP_SDK_BS::Game {
 
         try
         {
-            CP_SDK::ChatPlexSDK::Logger()->Info(u"filtering ");
             m_PreventLevelSearchViewController_didStartLoadingEvent = true;
             p_LevelSearchViewController->ResetAllFilterSettings(false);
 
diff --git a/src/CP_SDK_BS/Game/Levels.cpp b/src/CP_SDK_BS/Game/Levels.cpp
@@ -826,6 +826,9 @@ namespace CP_SDK_BS::Game {
                 m_BeatmapLevelsModel = l_MainFlowCoordinator->____beatmapLevelsModel;
         }
 
+        if (!m_MenuTransitionsHelper)
+            m_MenuTransitionsHelper = Resources::FindObjectsOfTypeAll<_u::MenuTransitionsHelper*>()->First();
+
         if (m_BeatmapLevelsModel)
         {
             if (m_GetLevelCancellationTokenSource)
@@ -838,19 +841,19 @@ namespace CP_SDK_BS::Game {
                 auto l_VersionTask = m_MenuTransitionsHelper->____beatmapLevelsEntitlementModel->GetLevelDataVersionAsync(p_LevelID, m_GetLevelCancellationTokenSource->get_Token());
                 _v::AwaitTaskAsync<BeatmapLevelDataVersion>(
                     l_VersionTask,
-                    [=](_v::MonoPtrRef<Tasks::Task_1<BeatmapLevelDataVersion>> p_VersionTask, bool p_Success) {
+                    [=](_v::MonoPtrRef<Tasks::Task_1<BeatmapLevelDataVersion>> p_VersionTask, bool p_VersionSuccess) {
                         try
                         {
-                            if (p_Success)
+                            if (p_VersionSuccess)
                             {
                                 auto l_Task = m_BeatmapLevelsModel->LoadBeatmapLevelDataAsync(p_LevelID, p_VersionTask->get_Result(), m_GetLevelCancellationTokenSource->get_Token());
 
                                 _v::AwaitTaskAsync<LoadBeatmapLevelDataResult>(
                                     l_Task,
-                                    [=](_v::MonoPtrRef<Tasks::Task_1<LoadBeatmapLevelDataResult>> p_Task, bool p_Success) {
+                                    [=](_v::MonoPtrRef<Tasks::Task_1<LoadBeatmapLevelDataResult>> p_Task, bool p_Success2) {
                                         try
                                         {
-                                            if (p_Success && !p_Task->get_Result().isError)
+                                            if (p_Success2 && !p_Task->get_Result().isError)
                                                 p_Callback(p_Task->get_Result().beatmapLevelData);
                                             else
                                                 p_Callback(nullptr);
@@ -862,15 +865,17 @@ namespace CP_SDK_BS::Game {
                                         }
                                     }
                                 );
+
+                                return;
                             }
-                            else
-                                p_Callback(nullptr);
                         }
                         catch (const std::exception& l_Exception)
                         {
                             CP_SDK::ChatPlexSDK::Logger()->Error(u"[CP_SDK_BS.Game][Levels.GetLevelFromLevelID] Error:");
                             CP_SDK::ChatPlexSDK::Logger()->Error(l_Exception);
                         }
+
+                        p_Callback(nullptr);
                     }
                 );
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -209,7 +209,7 @@ extern "C" __attribute__((visibility("default"))) void setup(CModInfo* p_ModInfo
         return p_Input;
     });
 
-    CP_SDK::ChatPlexSDK::Logger()->Error(u"ChatPlexSDK-BS Completed setup!");
+    CP_SDK::ChatPlexSDK::Logger()->Info(u"ChatPlexSDK-BS Completed setup!");
 }
 
 ////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace CP_SDK_BS::Game::BeatMaps {`
`40`	`40`	`CP_SDK_IL2CPP_ENUM_UTILS();`
`41`	`41`	`};`
`42`	`42`
`43`		`- struct MapVersion`
	`43`	`+ struct CP_SDK_EXPORT MapVersion`
`44`	`44`	`{`
`45`	`45`	`MapVersion() = default;`
`46`	`46`	`CP_SDK_NO_COPYMOVE_CTORS(MapVersion);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace CP_SDK_BS::UI {`
`15`	`15`	`class IHMUIViewController;`
`16`	`16`
`17`	`17`	`/// @brief CP_SDK.UI.IViewController bridge component`
`18`		`- class CP_SDK_UI_IViewControllerBridge : public CP_SDK::UI::IViewController`
	`18`	`+ class CP_SDK_EXPORT CP_SDK_UI_IViewControllerBridge : public CP_SDK::UI::IViewController`
`19`	`19`	`{`
`20`	`20`	`CP_SDK_IL2CPP_INHERIT("CP_SDK_BS.UI", CP_SDK_UI_IViewControllerBridge, CP_SDK::UI::IViewController);`
`21`	`21`	`CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(CP_SDK_UI_IViewControllerBridge);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace CP_SDK_BS::UI {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// @brief IHMUIViewController interface`
`28`		`- class IHMUIViewController : public HMUI::ViewController`
	`28`	`+ class CP_SDK_EXPORT IHMUIViewController : public HMUI::ViewController`
`29`	`29`	`{`
`30`	`30`	`CP_SDK_IL2CPP_INHERIT("CP_SDK_BS.UI", IHMUIViewController, HMUI::ViewController);`
`31`	`31`	`CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(IHMUIViewController);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@ namespace CP_SDK::Logging {`
`11`	`11`	`PaperLogger::PaperLogger(const std::string& p_Name)`
`12`	`12`	`: m_PaperLogger(new Paper::LoggerContext(p_Name))`
`13`	`13`	`{`
`14`		`-`
	`14`	`+ Error(u"Test Error");`
	`15`	`+ Warning(u"Test Warning");`
	`16`	`+ Info(u"Test Info");`
	`17`	`+ Debug(u"Test Debug");`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`////////////////////////////////////////////////////////////////////////////`
`@@ -29,10 +32,10 @@ namespace CP_SDK::Logging {`
`29`	`32`	`auto l_String = l_UTF8Data.c_str();`
`30`	`33`	`switch (p_Type)`
`31`	`34`	`{`
`32`		`- case ELogType::Error: m_PaperLogger->error("{}", l_String); break;`
`33`		`- case ELogType::Warning: m_PaperLogger->warn("{}", l_String); break;`
`34`		`- case ELogType::Info: m_PaperLogger->info("{}", l_String); break;`
`35`		`- case ELogType::Debug: m_PaperLogger->debug("{}", l_String); break;`
	`35`	`+ case ELogType::Error: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Error>("{}", l_String); break;`
	`36`	`+ case ELogType::Warning: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Warn>("{}", l_String); break;`
	`37`	`+ case ELogType::Info: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Info>("{}", l_String); break;`
	`38`	`+ case ELogType::Debug: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Debug>("{}", l_String); break;`
`36`	`39`	`}`
`37`	`40`	`}`
`38`	`41`	`/// @brief Internal log method`
`@@ -43,10 +46,10 @@ namespace CP_SDK::Logging {`
`43`	`46`	`auto l_String = p_Data.what();`
`44`	`47`	`switch (p_Type)`
`45`	`48`	`{`
`46`		`- case ELogType::Error: m_PaperLogger->error("{}", l_String); break;`
`47`		`- case ELogType::Warning: m_PaperLogger->warn("{}", l_String); break;`
`48`		`- case ELogType::Info: m_PaperLogger->info("{}", l_String); break;`
`49`		`- case ELogType::Debug: m_PaperLogger->debug("{}", l_String); break;`
	`49`	`+ case ELogType::Error: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Error>("{}", l_String); break;`
	`50`	`+ case ELogType::Warning: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Warn>("{}", l_String); break;`
	`51`	`+ case ELogType::Info: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Info>("{}", l_String); break;`
	`52`	`+ case ELogType::Debug: m_PaperLogger->fmtLog<(Paper::LogLevel)Paper::ffi::paper2_LogLevel::Debug>("{}", l_String); break;`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`