diff --git a/include/git_info.h b/include/git_info.h index 7be4b05..d315608 100644 --- 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 0xe337f56 +#define GIT_COMMIT 0x9d550ce #define GIT_MODIFIED 1 diff --git a/mod.json b/mod.json index d0bf112..c04b91e 100644 --- a/mod.json +++ b/mod.json @@ -5,42 +5,42 @@ "id": "qbeatsaberplus-menumusic", "modloader": "Scotland2", "author": "HardCPP", - "version": "6.4.0", + "version": "6.4.1", "packageId": "com.beatgames.beatsaber", - "packageVersion": "1.40.4_5283", + "packageVersion": "1.40.8_7379", "description": "Feel good!", "coverImage": "cover.png", "dependencies": [ { - "version": "^6.4.1", + "version": "^6.4.2", "id": "beatsaber-hook", - "downloadIfMissing": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/beatsaber-hook.qmod" + "downloadIfMissing": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/beatsaber-hook.qmod" }, { - "version": "^0.18.2", + "version": "^0.18.3", "id": "custom-types", - "downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/CustomTypes.qmod" + "downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.3/CustomTypes.qmod" }, { - "version": "^1.1.20", + "version": "^1.1.24", "id": "songcore", - "downloadIfMissing": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.20/SongCore.qmod" + "downloadIfMissing": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/SongCore.qmod" }, { - "version": "^4.6.1", + "version": "^4.6.4", "id": "paper2_scotland2", - "downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.2/paper2_scotland2.qmod" + "downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/paper2_scotland2.qmod" }, { - "version": "^6.4.0", + "version": "^6.4.1", "id": "chatplex-sdk-bs", - "downloadIfMissing": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.0/ChatPlexSDK-BS.qmod" + "downloadIfMissing": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.1/ChatPlexSDK-BS.qmod" } ], - "modFiles": [ + "modFiles": [], + "lateModFiles": [ "libqbeatsaberplus-menumusic.so" ], - "lateModFiles": [], "libraryFiles": [], "fileCopies": [], "copyExtensions": [] diff --git a/mod.template.json b/mod.template.json index 5af37ad..ba4d5ff 100644 --- a/mod.template.json +++ b/mod.template.json @@ -7,11 +7,12 @@ "author": "HardCPP", "version": "${version}", "packageId": "com.beatgames.beatsaber", - "packageVersion": "1.40.4_5283", + "packageVersion": "1.40.8_7379", "description": "Feel good!", "coverImage": "cover.png", "dependencies": [], - "modFiles": ["${binary}"], + "modFiles": [], + "lateModFiles": ["${binary}"], "libraryFiles": [], "fileCopies": [], "copyExtensions": [] diff --git a/qpm.json b/qpm.json index f425081..9d84a7a 100644 --- a/qpm.json +++ b/qpm.json @@ -1,101 +1,96 @@ { - "version": "0.4.0", - "sharedDir": "shared", - "dependenciesDir": "extern", - "info": { - "name": "QBeatSaberPlus-MenuMusic", - "id": "qbeatsaberplus-menumusic", - "version": "6.4.0", - "url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic", + "version": "0.4.0", + "sharedDir": "shared", + "dependenciesDir": "extern", + "info": { + "name": "QBeatSaberPlus-MenuMusic", + "id": "qbeatsaberplus-menumusic", + "version": "6.4.1", + "url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic", + "additionalData": { + "overrideSoName": "libqbeatsaberplus-menumusic.so", + "cmake": true + } + }, + "workspace": { + "scripts": { + "build": [ + "pwsh ./build.ps1" + ], + "clean": [ + "pwsh ./build.ps1 -clean" + ], + "copy": [ + "pwsh ./copy.ps1" + ], + "log": [ + "pwsh ./start-logging.ps1" + ], + "qmod": [ + "pwsh ./build.ps1 -clean", + "pwsh ./createqmod.ps1 -clean" + ], + "qmod_backup": [ + "pwsh ./build.ps1 -clean", + "qpm qmod build", + "pwsh ./createqmod.ps1 -clean" + ] + }, + "ndk": "^27.2.12479018", + "qmodIncludeDirs": [ + "build", + "extern/libs" + ], + "qmodIncludeFiles": [], + "qmodOutput": "./QBeatSaberPlus-MenuMusic.qmod" + }, + "dependencies": [ + { + "id": "beatsaber-hook", + "versionRange": "^6.4.2", + "additionalData": {} + }, + { + "id": "bs-cordl", + "versionRange": "^4008.*", + "additionalData": {} + }, + { + "id": "custom-types", + "versionRange": "^0.18.3", + "additionalData": {} + }, + { + "id": "scotland2", + "versionRange": "^0.1.6", "additionalData": { - "overrideSoName": "libqbeatsaberplus-menumusic.so", - "cmake": true + "includeQmod": false, + "private": true } }, - "workspace": { - "scripts": { - "build": [ - "pwsh ./build.ps1" - ], - "clean": [ - "pwsh ./build.ps1 -clean" - ], - "copy": [ - "pwsh ./copy.ps1" - ], - "log": [ - "pwsh ./start-logging.ps1" - ], - "qmod": [ - "pwsh ./build.ps1 -clean", - "pwsh ./createqmod.ps1 -clean" - ], - "qmod_backup": [ - "pwsh ./build.ps1 -clean", - "qpm qmod build", - "pwsh ./createqmod.ps1 -clean" - ] - }, - "ndk": "^27.2.12479018", - "qmodIncludeDirs": [ - "build", - "extern/libs" - ], - "qmodIncludeFiles": [], - "qmodOutput": "./QBeatSaberPlus-MenuMusic.qmod" + { + "id": "songcore", + "versionRange": "^1.1.24", + "additionalData": { + "private": true + } }, - "dependencies": [ - { - "id": "beatsaber-hook", - "versionRange": "^6.4.1", - "additionalData": {} - }, - { - "id": "bs-cordl", - "versionRange": "^4004.0.0", - "additionalData": {} - }, - { - "id": "custom-types", - "versionRange": "^0.18.2", - "additionalData": {} - }, - { - "id": "scotland2", - "versionRange": "^0.1.6", - "additionalData": { - "includeQmod": false, - "private": true - } - }, - { - "id": "libil2cpp", - "versionRange": "^0.4.0", - "additionalData": {} - }, - { - "id": "songcore", - "versionRange": "^1.1.20", - "additionalData": { - "private": true - } - }, - { - "id": "paper2_scotland2", - "versionRange": "^4.6.1", - "additionalData": {} - }, - { - "id": "kaleb", - "versionRange": "^0.1.9", - "additionalData": {} - }, - { - "id": "chatplex-sdk-bs", - "versionRange": "^6.4.0", - "additionalData": { - "private": true - } + { + "id": "paper2_scotland2", + "versionRange": "^4.6.4", + "additionalData": {} + }, + { + "id": "kaleb", + "versionRange": "^0.1.9", + "additionalData": {} + }, + { + "id": "chatplex-sdk-bs", + "versionRange": "^6.4.1", + "additionalData": { + "private": true } - ] - } \ No newline at end of file + } + ] +} \ No newline at end of file diff --git a/qpm.shared.json b/qpm.shared.json index 7b6bf8f..b2750fe 100644 --- a/qpm.shared.json +++ b/qpm.shared.json @@ -7,7 +7,7 @@ "info": { "name": "QBeatSaberPlus-MenuMusic", "id": "qbeatsaberplus-menumusic", - "version": "6.4.0", + "version": "6.4.1", "url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic", "additionalData": { "overrideSoName": "libqbeatsaberplus-menumusic.so", @@ -49,17 +49,17 @@ "dependencies": [ { "id": "beatsaber-hook", - "versionRange": "^6.4.1", + "versionRange": "^6.4.2", "additionalData": {} }, { "id": "bs-cordl", - "versionRange": "^4004.0.0", + "versionRange": "4008.*", "additionalData": {} }, { "id": "custom-types", - "versionRange": "^0.18.2", + "versionRange": "^0.18.3", "additionalData": {} }, { @@ -70,21 +70,16 @@ "private": true } }, - { - "id": "libil2cpp", - "versionRange": "^0.4.0", - "additionalData": {} - }, { "id": "songcore", - "versionRange": "^1.1.20", + "versionRange": "^1.1.24", "additionalData": { "private": true } }, { "id": "paper2_scotland2", - "versionRange": "^4.6.1", + "versionRange": "^4.6.4", "additionalData": {} }, { @@ -94,7 +89,7 @@ }, { "id": "chatplex-sdk-bs", - "versionRange": "^6.4.0", + "versionRange": "^6.4.1", "additionalData": { "private": true } @@ -122,12 +117,12 @@ { "dependency": { "id": "paper2_scotland2", - "versionRange": "=4.6.2", + "versionRange": "=4.6.4", "additionalData": { - "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.2/libpaper2_scotland2.so", + "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.2/paper2_scotland2.qmod", - "branchName": "version/v4_6_2", + "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/paper2_scotland2.qmod", + "branchName": "version/v4_6_4", "compileOptions": { "systemIncludes": [ "shared/utfcpp/source" @@ -136,7 +131,7 @@ "cmake": false } }, - "version": "4.6.2" + "version": "4.6.4" }, { "dependency": { @@ -157,28 +152,28 @@ { "dependency": { "id": "chatplex-sdk-bs", - "versionRange": "=6.4.0", + "versionRange": "=6.4.1", "additionalData": { - "soLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.0/libchatplex-sdk-bs.so", - "debugSoLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.0/debug_libchatplex-sdk-bs.so", + "soLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.1/libchatplex-sdk-bs.so", + "debugSoLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.1/debug_libchatplex-sdk-bs.so", "overrideSoName": "libchatplex-sdk-bs.so", - "modLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.0/ChatPlexSDK-BS.qmod", - "branchName": "version/v6_4_0", + "modLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v6.4.1/ChatPlexSDK-BS.qmod", + "branchName": "version/v6_4_1", "cmake": true } }, - "version": "6.4.0" + "version": "6.4.1" }, { "dependency": { "id": "custom-types", - "versionRange": "=0.18.2", + "versionRange": "=0.18.3", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/libcustom-types.so", - "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/debug_libcustom-types.so", + "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.2/CustomTypes.qmod", - "branchName": "version/v0_18_2", + "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.3/CustomTypes.qmod", + "branchName": "version/v0_18_3", "compileOptions": { "cppFlags": [ "-Wno-invalid-offsetof" @@ -187,15 +182,15 @@ "cmake": true } }, - "version": "0.18.2" + "version": "0.18.3" }, { "dependency": { "id": "bs-cordl", - "versionRange": "=4004.0.0", + "versionRange": "=4008.0.0", "additionalData": { "headersOnly": true, - "branchName": "version/v4004_0_0", + "branchName": "version/v4008_0_0", "compileOptions": { "includePaths": [ "include" @@ -211,37 +206,55 @@ } } }, - "version": "4004.0.0" + "version": "4008.0.0" + }, + { + "dependency": { + "id": "libcurl", + "versionRange": "=8.5.0", + "additionalData": { + "staticLinking": true, + "soLink": "https://github.com/darknight1050/openssl-curl-android/releases/download/v8.5.0/libcurl.a", + "overrideSoName": "libcurl.a", + "branchName": "version-v8.5.0" + } + }, + "version": "8.5.0" }, { "dependency": { "id": "songcore", - "versionRange": "=1.1.20", + "versionRange": "=1.1.24", "additionalData": { - "soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.20/libsongcore.so", - "debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.20/debug_libsongcore.so", + "soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/libsongcore.so", + "debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/debug_libsongcore.so", "overrideSoName": "libsongcore.so", - "modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.20/SongCore.qmod", - "branchName": "version/v1_1_20", + "modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/SongCore.qmod", + "branchName": "version/v1_1_24", "cmake": true } }, - "version": "1.1.20" + "version": "1.1.24" }, { "dependency": { "id": "beatsaber-hook", - "versionRange": "=6.4.1", + "versionRange": "=6.4.2", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/libbeatsaber-hook.so", - "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/debug_libbeatsaber-hook.so", + "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", "overrideSoName": "libbeatsaber-hook.so", - "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/beatsaber-hook.qmod", - "branchName": "version/v6_4_1", + "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/beatsaber-hook.qmod", + "branchName": "version/v6_4_2", + "compileOptions": { + "cppFlags": [ + "-Wno-extra-qualification" + ] + }, "cmake": true } }, - "version": "6.4.1" + "version": "6.4.2" }, { "dependency": {