Skip to content

Revert back to il2cpp threads and update to fixed dependency #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-r-elp merged 1 commit into from
Aug 23, 2025
Merged

Revert back to il2cpp threads and update to fixed dependency #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qpm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.2.1",
"versionRange": "^0.2.2",
"additionalData": {}
},
{
Expand All @@ -128,4 +128,4 @@
"additionalData": {}
}
]
}
}
259 changes: 130 additions & 129 deletions qpm.shared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json",
"config": {
"version": "0.1.0",
"sharedDir": "shared",
Expand Down Expand Up @@ -119,7 +120,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.2.1",
"versionRange": "^0.2.2",
"additionalData": {}
},
{
Expand All @@ -132,60 +133,102 @@
"restoredDependencies": [
{
"dependency": {
"id": "web-utils",
"versionRange": "=0.6.7",
"id": "sombrero",
"versionRange": "=0.1.43",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/libweb-utils.so",
"debugSoLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/debug_libweb-utils.so",
"overrideSoName": "libweb-utils.so",
"modLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/WebUtils.qmod",
"branchName": "version/v0_6_7",
"headersOnly": true,
"branchName": "version/v0_1_43"
}
},
"version": "0.1.43"
},
{
"dependency": {
"id": "beatsaverplusplus",
"versionRange": "=0.2.2",
"additionalData": {
"soLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/debug_libbeatsaverplusplus.so",
"overrideSoName": "libbeatsaverplusplus.so",
"modLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_2_2",
"cmake": false
}
},
"version": "0.6.7"
"version": "0.2.2"
},
{
"dependency": {
"id": "libil2cpp",
"versionRange": "=0.4.0",
"id": "bs-cordl",
"versionRange": "=4008.0.0",
"additionalData": {
"headersOnly": true,
"branchName": "version/v4008_0_0",
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
"includePaths": [
"include"
],
"cppFeatures": [],
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DHAS_CODEGEN",
"-Wno-invalid-offsetof"
]
}
}
},
"version": "0.4.0"
"version": "4008.0.0"
},
{
"dependency": {
"id": "bsml",
"versionRange": "=0.4.55",
"id": "lapiz",
"versionRange": "=0.2.23",
"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",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod",
"branchName": "version/v0_4_55",
"soLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/liblapiz.so",
"debugSoLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/debug_liblapiz.so",
"overrideSoName": "liblapiz.so",
"modLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/Lapiz.qmod",
"branchName": "version/v0_2_23",
"cmake": true
}
},
"version": "0.4.55"
"version": "0.2.23"
},
{
"dependency": {
"id": "sombrero",
"versionRange": "=0.1.43",
"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",
"versionRange": "=11.0.2",
"additionalData": {
"headersOnly": true,
"branchName": "version/v0_1_43"
"branchName": "version/v11_0_2",
"compileOptions": {
"systemIncludes": [
"fmt/include/"
],
"cppFlags": [
"-DFMT_HEADER_ONLY"
]
}
}
},
"version": "0.1.43"
"version": "11.0.2"
},
{
"dependency": {
Expand All @@ -201,33 +244,47 @@
},
{
"dependency": {
"id": "songcore",
"versionRange": "=1.1.24",
"id": "web-utils",
"versionRange": "=0.6.7",
"additionalData": {
"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.24/SongCore.qmod",
"branchName": "version/v1_1_24",
"cmake": true
"soLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/libweb-utils.so",
"debugSoLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/debug_libweb-utils.so",
"overrideSoName": "libweb-utils.so",
"modLink": "https://github.com/RedBrumbler/WebUtils/releases/download/v0.6.7/WebUtils.qmod",
"branchName": "version/v0_6_7",
"cmake": false
}
},
"version": "1.1.24"
"version": "0.6.7"
},
{
"dependency": {
"id": "tinyxml2",
"versionRange": "=10.0.0",
"id": "libil2cpp",
"versionRange": "=0.4.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
"headersOnly": true,
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
]
}
}
},
"version": "10.0.0"
"version": "0.4.0"
},
{
"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": {
Expand All @@ -246,25 +303,6 @@
},
"version": "0.1.9"
},
{
"dependency": {
"id": "paper2_scotland2",
"versionRange": "=4.6.4",
"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",
"compileOptions": {
"systemIncludes": [
"shared/utfcpp/source"
]
},
"cmake": false
}
},
"version": "4.6.4"
},
{
"dependency": {
"id": "custom-types",
Expand All @@ -287,27 +325,22 @@
},
{
"dependency": {
"id": "bs-cordl",
"versionRange": "=4008.0.0",
"id": "paper2_scotland2",
"versionRange": "=4.6.4",
"additionalData": {
"headersOnly": true,
"branchName": "version/v4008_0_0",
"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",
"compileOptions": {
"includePaths": [
"include"
],
"cppFeatures": [],
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DHAS_CODEGEN",
"-Wno-invalid-offsetof"
"systemIncludes": [
"shared/utfcpp/source"
]
}
},
"cmake": false
}
},
"version": "4008.0.0"
"version": "4.6.4"
},
{
"dependency": {
Expand Down Expand Up @@ -342,65 +375,33 @@
},
{
"dependency": {
"id": "lapiz",
"versionRange": "=0.2.23",
"id": "songcore",
"versionRange": "=1.1.24",
"additionalData": {
"soLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/liblapiz.so",
"debugSoLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/debug_liblapiz.so",
"overrideSoName": "liblapiz.so",
"modLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/Lapiz.qmod",
"branchName": "version/v0_2_23",
"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.24/SongCore.qmod",
"branchName": "version/v1_1_24",
"cmake": true
}
},
"version": "0.2.23"
},
{
"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": "beatsaverplusplus",
"versionRange": "=0.2.1",
"additionalData": {
"soLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.1/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.1/debug_libbeatsaverplusplus.so",
"overrideSoName": "libbeatsaverplusplus.so",
"modLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.1/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_2_1",
"cmake": false
}
},
"version": "0.2.1"
"version": "1.1.24"
},
{
"dependency": {
"id": "fmt",
"versionRange": "=11.0.2",
"id": "bsml",
"versionRange": "=0.4.55",
"additionalData": {
"headersOnly": true,
"branchName": "version/v11_0_2",
"compileOptions": {
"systemIncludes": [
"fmt/include/"
],
"cppFlags": [
"-DFMT_HEADER_ONLY"
]
}
"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",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod",
"branchName": "version/v0_4_55",
"cmake": true
}
},
"version": "11.0.2"
"version": "0.4.55"
}
]
}
4 changes: 2 additions & 2 deletions src/Beatmaps/BeatSaverPreviewMediaData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace MultiplayerCore::Beatmaps {
}

if (!_coverImageTask || _coverImageTask->IsCancellationRequested) {
_coverImageTask = StartThread<UnityEngine::Sprite*>([this]() -> UnityEngine::Sprite* {
_coverImageTask = StartTask<UnityEngine::Sprite*>([this]() -> UnityEngine::Sprite* {
auto beatmapRes = BeatSaver::API::GetBeatmapByHash(_levelHash);
if (beatmapRes.DataParsedSuccessful()) {
auto versions = beatmapRes.responseData->GetVersions();
Expand Down Expand Up @@ -70,7 +70,7 @@ namespace MultiplayerCore::Beatmaps {
}

if (!_audioClipTask || _audioClipTask->IsCancellationRequested) {
_audioClipTask = StartThread<UnityEngine::AudioClip*>([this]() -> UnityEngine::AudioClip* {
_audioClipTask = StartTask<UnityEngine::AudioClip*>([this]() -> UnityEngine::AudioClip* {
auto beatmapRes = BeatSaver::API::GetBeatmapByHash(_levelHash);

if (beatmapRes.DataParsedSuccessful()) {
Expand Down
Loading