From 1d7dbf309298105e705e7ed9ee5c05717d2fb170 Mon Sep 17 00:00:00 2001 From: Daniel <790119+DanTheMan827@users.noreply.github.com> Date: Tue, 20 Oct 2026 15:51:50 -0500 Subject: [PATCH] Bump for 1.45.3_30054 --- CMakeLists.txt | 4 +- include/Helpers/getMainFlowCoordinator.hpp | 4 +- include/assets.hpp | 16 ++ mod.template.json | 2 +- qpm.json | 28 ++- qpm.shared.json | 277 ++++++++++++--------- src/main.cpp | 2 +- 7 files changed, 195 insertions(+), 138 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0eb5b5..539ff7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22) option(QUEST "Build for quest" ON) # Globals -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED 20) +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED 23) set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) diff --git a/include/Helpers/getMainFlowCoordinator.hpp b/include/Helpers/getMainFlowCoordinator.hpp index 8c652b1..980c6d0 100644 --- a/include/Helpers/getMainFlowCoordinator.hpp +++ b/include/Helpers/getMainFlowCoordinator.hpp @@ -8,8 +8,8 @@ */ inline GlobalNamespace::MainFlowCoordinator* GetMainFlowCoordinator() { auto flowCoordinators = UnityEngine::Resources::FindObjectsOfTypeAll(); - if (flowCoordinators->get_Length() > 0) { - return flowCoordinators.get(0); + if (flowCoordinators.size() > 0) { + return flowCoordinators[0]; } return nullptr; diff --git a/include/assets.hpp b/include/assets.hpp index 8e27265..f6b67b0 100644 --- a/include/assets.hpp +++ b/include/assets.hpp @@ -2,7 +2,11 @@ #include +#if __has_include("beatsaber-hook/shared/utils/typedefs.h") #include "beatsaber-hook/shared/utils/typedefs.h" +#else +#include "beatsaber-hook/shared/utils.hpp" +#endif #if __has_include("bsml/shared/Helpers/utilities.hpp") #include "bsml/shared/Helpers/utilities.hpp" @@ -23,16 +27,28 @@ struct IncludedAsset { } operator std::string_view() const { +#if __has_include("beatsaber-hook/shared/utils/typedefs.h") return {reinterpret_cast(array->_values), array->get_Length()}; +#else + return {reinterpret_cast(array->_values), array->max_length}; +#endif } operator std::span() const { +#if __has_include("beatsaber-hook/shared/utils/typedefs.h") return {array->_values, array->get_Length()}; +#else + return {array->_values, array->max_length}; +#endif } void init() const { if (!array->klass) { +#if __has_include("beatsaber-hook/shared/utils/typedefs.h") array->klass = classof(Array*); +#else + array->klass = i2c::class_of*>(); +#endif } } diff --git a/mod.template.json b/mod.template.json index f874cba..d7bbe76 100644 --- a/mod.template.json +++ b/mod.template.json @@ -7,7 +7,7 @@ "author": "laynia", "version": "${version}", "packageId": "com.beatgames.beatsaber", - "packageVersion": "1.44.2_21558", + "packageVersion": "1.45.3_30054", "description": "Expands the song artwork to cover the right side of the level select.", "dependencies": [], "modFiles": [ diff --git a/qpm.json b/qpm.json index f453bb4..05cc42f 100644 --- a/qpm.json +++ b/qpm.json @@ -65,7 +65,7 @@ "pwsh ./scripts/update-version.ps1 $0:?" ] }, - "ndk": "^27.3.13750724", + "ndk": "^29.0.14206865", "qmodIncludeDirs": [ "./build", "./extern/libs" @@ -81,37 +81,47 @@ }, { "id": "beatsaber-hook", - "versionRange": "^8.0.1", + "versionRange": "^9.3.0", "additionalData": {} }, { "id": "bs-cordl", - "versionRange": "4402.*", + "versionRange": "4503.*", "additionalData": {} }, { "id": "bsml", - "versionRange": "^0.5.3", + "versionRange": "^0.6.5", "additionalData": {} }, { "id": "config-utils", - "versionRange": "^2.0.4", + "versionRange": "^3.0.0", "additionalData": {} }, { "id": "custom-types", - "versionRange": "^0.20.0", + "versionRange": "^0.21.2", + "additionalData": {} + }, + { + "id": "flamingo", + "versionRange": "^1.2.1", "additionalData": {} }, { "id": "mmkay", - "versionRange": "^0.2.1", + "versionRange": "^0.2.2", "additionalData": {} }, { "id": "paper2_scotland2", - "versionRange": "^4.6.5", + "versionRange": "^4.8.0", + "additionalData": {} + }, + { + "id": "reflectcpp", + "versionRange": "^0.25.0", "additionalData": {} }, { @@ -122,4 +132,4 @@ } } ] -} +} \ No newline at end of file diff --git a/qpm.shared.json b/qpm.shared.json index 4bcb696..864c6d4 100644 --- a/qpm.shared.json +++ b/qpm.shared.json @@ -7,7 +7,7 @@ "info": { "name": "ImageCoverExpander", "id": "imagecoverexpander", - "version": "0.2.4", + "version": "0.2.5", "url": null, "additionalData": { "overrideSoName": "libimagecoverexpander.so", @@ -66,7 +66,7 @@ "pwsh ./scripts/update-version.ps1 $0:?" ] }, - "ndk": "^27.3.13750724", + "ndk": "^29.0.14206865", "qmodIncludeDirs": [ "./build", "./extern/libs" @@ -82,42 +82,52 @@ }, { "id": "beatsaber-hook", - "versionRange": "^6.4.2", + "versionRange": "^9.3.0", "additionalData": {} }, { "id": "bs-cordl", - "versionRange": "4008.*", + "versionRange": "4503.*", "additionalData": {} }, { "id": "bsml", - "versionRange": "^0.4.55", + "versionRange": "^0.6.5", "additionalData": {} }, { "id": "config-utils", - "versionRange": "^2.0.3", + "versionRange": "^3.0.0", "additionalData": {} }, { "id": "custom-types", - "versionRange": "^0.18.3", + "versionRange": "^0.21.2", + "additionalData": {} + }, + { + "id": "flamingo", + "versionRange": "^1.2.1", "additionalData": {} }, { "id": "mmkay", - "versionRange": "^0.2.1", + "versionRange": "^0.2.2", "additionalData": {} }, { "id": "paper2_scotland2", - "versionRange": "^4.6.4", + "versionRange": "^4.8.0", + "additionalData": {} + }, + { + "id": "reflectcpp", + "versionRange": "^0.25.0", "additionalData": {} }, { "id": "scotland2", - "versionRange": "^0.1.6", + "versionRange": "^0.1.7", "additionalData": { "includeQmod": false } @@ -127,161 +137,211 @@ "restoredDependencies": [ { "dependency": { - "id": "custom-types", - "versionRange": "=0.18.3", + "id": "bs-cordl", + "versionRange": "=4503.0.0", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.3/libcustom-types.so", - "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.3/debug_libcustom-types.so", - "overrideSoName": "libcustom-types.so", - "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.3/CustomTypes.qmod", - "branchName": "version/v0_18_3", + "headersOnly": true, + "branchName": "version/v4503_0_0", "compileOptions": { + "includePaths": [ + "include" + ], + "cppFeatures": [], "cppFlags": [ + "-fdeclspec", + "-DUNITY_6", + "-DUNITY_6_3", + "-DHAS_CODEGEN", "-Wno-invalid-offsetof" ] - }, + } + } + }, + "version": "4503.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": "0.18.3" + "version": "10.0.0" }, { "dependency": { - "id": "mmkay", - "versionRange": "=0.2.1", + "id": "autohooks", + "versionRange": "=0.1.2533287675297792", "additionalData": { "headersOnly": true, - "branchName": "version/v0_2_1" + "overrideSoName": "libautohooks.so", + "branchName": "version/v0_1_2533287675297792", + "cmake": true } }, - "version": "0.2.1" + "version": "0.1.2533287675297792" }, { "dependency": { - "id": "bs-cordl", - "versionRange": "=4008.0.0", + "id": "fmt", + "versionRange": "=11.0.2", "additionalData": { "headersOnly": true, - "branchName": "version/v4008_0_0", + "branchName": "version/v11_0_2", "compileOptions": { - "includePaths": [ - "include" + "systemIncludes": [ + "fmt/include/" ], - "cppFeatures": [], "cppFlags": [ - "-DNEED_UNSAFE_CSHARP", - "-fdeclspec", - "-DUNITY_2021", - "-DHAS_CODEGEN", - "-Wno-invalid-offsetof" + "-DFMT_HEADER_ONLY" ] } } }, - "version": "4008.0.0" + "version": "11.0.2" }, { "dependency": { - "id": "paper2_scotland2", - "versionRange": "=4.6.4", + "id": "scotland2", + "versionRange": "=0.1.7", "additionalData": { - "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/libpaper2_scotland2.so", - "overrideSoName": "libpaper2_scotland2.so", - "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/paper2_scotland2.qmod", - "branchName": "version/v4_6_4", + "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.7/libsl2.so", + "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.7/debug_libsl2.so", + "overrideSoName": "libsl2.so", + "branchName": "version/v0_1_7" + } + }, + "version": "0.1.7" + }, + { + "dependency": { + "id": "flamingo", + "versionRange": "=1.2.1", + "additionalData": { + "soLink": "https://github.com/QuestPackageManager/Flamingo/releases/download/v1.2.1/libflamingo.so", + "debugSoLink": "https://github.com/QuestPackageManager/Flamingo/releases/download/v1.2.1/debug_libflamingo.so", + "overrideSoName": "libflamingo.so", + "modLink": "https://github.com/QuestPackageManager/Flamingo/releases/download/v1.2.1/flamingo.qmod", + "branchName": "version/v1_2_1" + } + }, + "version": "1.2.1" + }, + { + "dependency": { + "id": "libil2cpp", + "versionRange": "=0.5.0", + "additionalData": { + "headersOnly": true, "compileOptions": { "systemIncludes": [ - "shared/utfcpp/source" + "il2cpp/external/baselib/Include", + "il2cpp/external/baselib/Platforms/Android/Include" ] - }, - "cmake": false + } } }, - "version": "4.6.4" + "version": "0.5.0" }, { "dependency": { - "id": "tinyxml2", - "versionRange": "=10.0.0", + "id": "custom-types", + "versionRange": "=0.21.2", "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", + "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.21.2/libcustom-types.so", + "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.21.2/debug_libcustom-types.so", + "overrideSoName": "libcustom-types.so", + "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.21.2/CustomTypes.qmod", + "branchName": "version/v0_21_2", + "compileOptions": { + "cppFlags": [ + "-Wno-invalid-offsetof" + ] + }, "cmake": true } }, - "version": "10.0.0" + "version": "0.21.2" }, { "dependency": { - "id": "rapidjson-macros", - "versionRange": "=2.1.0", + "id": "mmkay", + "versionRange": "=0.2.2", "additionalData": { "headersOnly": true, - "branchName": "version/v2_1_0", - "cmake": false + "branchName": "version/v0_2_2" } }, - "version": "2.1.0" + "version": "0.2.2" }, { "dependency": { - "id": "config-utils", - "versionRange": "=2.0.3", + "id": "paper2_scotland2", + "versionRange": "=4.8.0", "additionalData": { - "headersOnly": true, - "soLink": "https://github.com/darknight1050/config-utils/releases/download/v2.0.3/libconfig-utils_test.so", - "overrideSoName": "libconfig-utils_test.so", - "branchName": "version/v2_0_3", - "cmake": true + "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.8.0/libpaper2_scotland2.so", + "overrideSoName": "libpaper2_scotland2.so", + "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.8.0/paper2_scotland2.qmod", + "branchName": "version/v4_8_0", + "compileOptions": { + "systemIncludes": [ + "shared/utfcpp/source" + ] + }, + "cmake": false } }, - "version": "2.0.3" + "version": "4.8.0" }, { "dependency": { - "id": "autohooks", - "versionRange": "=0.1.1688867040264192", + "id": "reflectcpp", + "versionRange": "=0.25.0", "additionalData": { - "headersOnly": true, - "overrideSoName": "libautohooks.so", - "branchName": "version/v0_1_1688867040264192", - "cmake": true + "soLink": "https://github.com/kodenamekrak/reflectcpp-qpm/releases/download/v0.25.0/libreflectcpp.so", + "debugSoLink": "https://github.com/kodenamekrak/reflectcpp-qpm/releases/download/v0.25.0/debug_libreflectcpp.so", + "overrideSoName": "libreflectcpp.so", + "modLink": "https://github.com/kodenamekrak/reflectcpp-qpm/releases/download/v0.25.0/reflectcpp.qmod", + "branchName": "version/v0_25_0" } }, - "version": "0.1.1688867040264192" + "version": "0.25.0" }, { "dependency": { - "id": "fmt", - "versionRange": "=11.0.2", + "id": "config-utils", + "versionRange": "=3.0.0", "additionalData": { "headersOnly": true, - "branchName": "version/v11_0_2", + "soLink": "https://github.com/darknight1050/config-utils/releases/download/v3.0.0/libconfig-utils_test.so", + "overrideSoName": "libconfig-utils_test.so", + "branchName": "version/v3_0_0", "compileOptions": { - "systemIncludes": [ - "fmt/include/" - ], "cppFlags": [ - "-DFMT_HEADER_ONLY" + "-DREFLECT_CPP_C_ARRAYS_OR_INHERITANCE" ] - } + }, + "cmake": true } }, - "version": "11.0.2" + "version": "3.0.0" }, { "dependency": { "id": "beatsaber-hook", - "versionRange": "=6.4.2", + "versionRange": "=9.3.0", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/libbeatsaber-hook.so", - "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/debug_libbeatsaber-hook.so", + "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v9.3.0/libbeatsaber-hook.so", + "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v9.3.0/debug_libbeatsaber-hook.so", "overrideSoName": "libbeatsaber-hook.so", - "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/beatsaber-hook.qmod", - "branchName": "version/v6_4_2", + "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v9.3.0/beatsaber-hook.qmod", + "branchName": "version/v9_3_0", "compileOptions": { "cppFlags": [ "-Wno-extra-qualification" @@ -290,51 +350,22 @@ "cmake": true } }, - "version": "6.4.2" + "version": "9.3.0" }, { "dependency": { "id": "bsml", - "versionRange": "=0.4.55", + "versionRange": "=0.6.5", "additionalData": { - "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/libbsml.so", - "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/debug_libbsml.so", + "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.6.5/libbsml.so", + "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.6.5/debug_libbsml.so", "overrideSoName": "libbsml.so", - "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod", - "branchName": "version/v0_4_55", + "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.6.5/BSML.qmod", + "branchName": "version/v0_6_5", "cmake": true } }, - "version": "0.4.55" - }, - { - "dependency": { - "id": "scotland2", - "versionRange": "=0.1.6", - "additionalData": { - "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so", - "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so", - "overrideSoName": "libsl2.so", - "branchName": "version/v0_1_6" - } - }, - "version": "0.1.6" - }, - { - "dependency": { - "id": "libil2cpp", - "versionRange": "=0.4.0", - "additionalData": { - "headersOnly": true, - "compileOptions": { - "systemIncludes": [ - "il2cpp/external/baselib/Include", - "il2cpp/external/baselib/Platforms/Android/Include" - ] - } - } - }, - "version": "0.4.0" + "version": "0.6.5" } ] } \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 6e8bde1..01f2bb5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -163,7 +163,7 @@ MOD_EXPORT_FUNC void setup(CModInfo& info) { /// @brief Called later on in the game loading - a good time to install function hooks /// @return MOD_EXPORT_FUNC void late_load() { - il2cpp_functions::Init(); + i2c::functions::initialize(); getModConfig().Init(modInfo); BSML::Init();