Skip to content

Unity 6 update #4

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

Closed
iLillie wants to merge 5 commits into from
Closed

Unity 6 update #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ab8895
bump qpm dependencies and fix GameScenesManager changes ++
iLillie Dec 10, 2025
cf5d3a0
chore: update packageVersion
iLillie Dec 12, 2025
0501a53
chore: beatsaber-hook update to 7.4.0
iLillie Dec 12, 2025
8d58e20
chore: qpm restore
iLillie Dec 12, 2025
ce93e2b
fix dependencies restore
iLillie Dec 17, 2025
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
2 changes: 1 addition & 1 deletion mod.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "Metalit",
"version": "${version}",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.40.8_7379",
"packageVersion": "1.41.0_11623",
"description": "Provides way too many utilities for mod developers",
"dependencies": [],
"modFiles": ["${binary}"],
Expand Down
19 changes: 13 additions & 6 deletions qpm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
"version": "0.1.0",
"sharedDir": "shared",
"dependenciesDir": "extern",
"info": {
"name": "MetaCore",
"id": "metacore",
"version": "1.6.2",
"version": "1.7.0",
"url": "https://github.com/Metalit/MetaCore",
"additionalData": {
"overrideSoName": "libmetacore.so",
Expand Down Expand Up @@ -38,6 +39,7 @@
"pwsh ./scripts/pull-tombstone.ps1 -analyze"
]
},
"ndk": "^27.3.13750724",
"qmodIncludeDirs": [
"./build",
"./extern/libs"
Expand All @@ -48,7 +50,7 @@
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^6.4.2",
"versionRange": "=7.4.1",
"additionalData": {}
},
{
Expand All @@ -60,7 +62,7 @@
},
{
"id": "bs-cordl",
"versionRange": "^4008.0.0",
"versionRange": "^4100.0.0",
"additionalData": {}
},
{
Expand All @@ -70,12 +72,12 @@
},
{
"id": "rapidjson-macros",
"versionRange": "^2.1.0",
"versionRange": "^3.0.0",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.18.3",
"versionRange": "^0.19.0",
"additionalData": {
"private": true
}
Expand All @@ -93,6 +95,11 @@
"additionalData": {
"private": true
}
},
{
"id": "flamingo",
"versionRange": "^1.1.2",
"additionalData": {}
}
]
}
}
112 changes: 66 additions & 46 deletions qpm.shared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"info": {
"name": "MetaCore",
"id": "metacore",
"version": "1.6.2",
"version": "1.7.0",
"url": "https://github.com/Metalit/MetaCore",
"additionalData": {
"overrideSoName": "libmetacore.so",
Expand Down Expand Up @@ -40,6 +40,7 @@
"pwsh ./scripts/pull-tombstone.ps1 -analyze"
]
},
"ndk": "^27.3.13750724",
"qmodIncludeDirs": [
"./build",
"./extern/libs"
Expand All @@ -50,7 +51,7 @@
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^6.4.2",
"versionRange": "=7.4.1",
"additionalData": {}
},
{
Expand All @@ -62,7 +63,7 @@
},
{
"id": "bs-cordl",
"versionRange": "^4008.0.0",
"versionRange": "^4100.0.0",
"additionalData": {}
},
{
Expand All @@ -72,12 +73,12 @@
},
{
"id": "rapidjson-macros",
"versionRange": "^2.1.0",
"versionRange": "^3.0.0",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.18.3",
"versionRange": "^0.19.0",
"additionalData": {
"private": true
}
Expand All @@ -95,20 +96,25 @@
"additionalData": {
"private": true
}
},
{
"id": "flamingo",
"versionRange": "^1.1.2",
"additionalData": {}
}
]
},
"restoredDependencies": [
{
"dependency": {
"id": "custom-types",
"versionRange": "=0.18.3",
"versionRange": "=0.19.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",
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.19.0/libcustom-types.so",
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.19.0/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",
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.19.0/CustomTypes.qmod",
"branchName": "version/v0_19_0",
"compileOptions": {
"cppFlags": [
"-Wno-invalid-offsetof"
Expand All @@ -117,27 +123,27 @@
"cmake": true
}
},
"version": "0.18.3"
"version": "0.19.0"
},
{
"dependency": {
"id": "rapidjson-macros",
"versionRange": "=2.1.0",
"versionRange": "=3.0.0",
"additionalData": {
"headersOnly": true,
"branchName": "version/v2_1_0",
"branchName": "version/v3_0_0",
"cmake": false
}
},
"version": "2.1.0"
"version": "3.0.0"
},
{
"dependency": {
"id": "bs-cordl",
"versionRange": "=4008.0.0",
"versionRange": "=4100.0.1",
"additionalData": {
"headersOnly": true,
"branchName": "version/v4008_0_0",
"branchName": "version/v4100_0_1",
"compileOptions": {
"includePaths": [
"include"
Expand All @@ -146,24 +152,24 @@
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DUNITY_6",
"-DHAS_CODEGEN",
"-Wno-invalid-offsetof"
]
}
}
},
"version": "4008.0.0"
"version": "4100.0.1"
},
{
"dependency": {
"id": "paper2_scotland2",
"versionRange": "=4.6.4",
"versionRange": "=4.7.0",
"additionalData": {
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/libpaper2_scotland2.so",
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.7.0/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",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.7.0/paper2_scotland2.qmod",
"branchName": "version/v4_7_0",
"compileOptions": {
"systemIncludes": [
"shared/utfcpp/source"
Expand All @@ -172,7 +178,20 @@
"cmake": false
}
},
"version": "4.6.4"
"version": "4.7.0"
},
{
"dependency": {
"id": "scotland2",
"versionRange": "=0.1.7",
"additionalData": {
"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": {
Expand All @@ -196,13 +215,13 @@
{
"dependency": {
"id": "beatsaber-hook",
"versionRange": "=6.4.2",
"versionRange": "=7.4.1",
"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/v7.4.1/libbeatsaber-hook.so",
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v7.4.1/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/v7.4.1/beatsaber-hook.qmod",
"branchName": "version/v7_4_1",
"compileOptions": {
"cppFlags": [
"-Wno-extra-qualification"
Expand All @@ -211,7 +230,7 @@
"cmake": true
}
},
"version": "6.4.2"
"version": "7.4.1"
},
{
"dependency": {
Expand All @@ -230,16 +249,19 @@
},
{
"dependency": {
"id": "scotland2",
"versionRange": "=0.1.6",
"id": "libil2cpp",
"versionRange": "=0.5.0",
"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"
"headersOnly": true,
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
]
}
}
},
"version": "0.1.6"
"version": "0.5.0"
},
{
"dependency": {
Expand All @@ -258,19 +280,17 @@
},
{
"dependency": {
"id": "libil2cpp",
"versionRange": "=0.4.0",
"id": "flamingo",
"versionRange": "=1.1.2",
"additionalData": {
"headersOnly": true,
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
]
}
"soLink": "https://github.com/sc2ad/Flamingo/releases/download/v1.1.2/libflamingo.so",
"debugSoLink": "https://github.com/sc2ad/Flamingo/releases/download/v1.1.2/debug_libflamingo.so",
"overrideSoName": "libflamingo.so",
"modLink": "https://github.com/sc2ad/Flamingo/releases/download/v1.1.2/flamingo.qmod",
"branchName": "version/v1_1_2"
}
},
"version": "0.4.0"
"version": "1.1.2"
}
]
}
17 changes: 9 additions & 8 deletions src/hooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "hooks.hpp"

#include "GlobalNamespace/AnnotatedBeatmapLevelCollectionsViewController.hpp"
#include "System/Collections/Generic/IReadOnlyList_1.hpp"
#include "GlobalNamespace/AudioTimeSyncController.hpp"
#include "GlobalNamespace/BeatmapObjectExecutionRatingsRecorder.hpp"
#include "GlobalNamespace/BeatmapObjectManager.hpp"
Expand Down Expand Up @@ -296,9 +297,9 @@ MAKE_AUTO_HOOK_MATCH(
// initialize as soon as the scene is loaded
MAKE_AUTO_HOOK_MATCH(
GameScenesManager_PushScenes_Delegate,
&GameScenesManager::__c__DisplayClass40_0::_PushScenes_b__1,
&GameScenesManager::__c__DisplayClass44_0::_PushScenes_b__1,
void,
GameScenesManager::__c__DisplayClass40_0* self,
GameScenesManager::__c__DisplayClass44_0* self,
Zenject::DiContainer* container
) {
CheckInitialize(self->scenesTransitionSetupData);
Expand All @@ -309,9 +310,9 @@ MAKE_AUTO_HOOK_MATCH(
// initialize on level restarts as well
MAKE_AUTO_HOOK_MATCH(
GameScenesManager_ReplaceScenes_Delegate_AfterLoad,
&GameScenesManager::__c__DisplayClass42_0::_ReplaceScenes_b__2,
&GameScenesManager::__c__DisplayClass47_0::_ReplaceScenes_b__2,
void,
GameScenesManager::__c__DisplayClass42_0* self,
GameScenesManager::__c__DisplayClass47_0* self,
Zenject::DiContainer* container
) {
CheckInitialize(self->scenesTransitionSetupData);
Expand Down Expand Up @@ -442,9 +443,9 @@ MAKE_AUTO_HOOK_MATCH(
// track when gameplay scenes are removed
MAKE_AUTO_HOOK_MATCH(
GameScenesManager_PopScenes_Delegate,
&GameScenesManager::__c__DisplayClass41_0::_PopScenes_b__0,
&GameScenesManager::__c__DisplayClass45_0::_PopScenes_b__0,
void,
GameScenesManager::__c__DisplayClass41_0* self,
GameScenesManager::__c__DisplayClass45_0* self,
Zenject::DiContainer* container
) {
CheckSceneFinish();
Expand All @@ -455,9 +456,9 @@ MAKE_AUTO_HOOK_MATCH(
// track when gameplay scenes are replaced for level restarts
MAKE_AUTO_HOOK_MATCH(
GameScenesManager_ReplaceScenes_Delegate_AfterUnload,
&GameScenesManager::__c__DisplayClass42_0::_ReplaceScenes_b__0,
&GameScenesManager::__c__DisplayClass47_0::_ReplaceScenes_b__0,
void,
GameScenesManager::__c__DisplayClass42_0* self,
GameScenesManager::__c__DisplayClass47_0* self,
Zenject::DiContainer* container
) {
CheckSceneFinish();
Expand Down
4 changes: 2 additions & 2 deletions src/songs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ void MetaCore::Songs::GetSongCover(BeatmapLevel* beatmap, std::function<void(Uni
}

// avoid back and forth string -> StringW conversions
static BeatmapLevel* FindLevelInternal(StringW levelId) {
return MetaCore::Game::GetAppDiContainer()->Resolve<BeatmapLevelsModel*>()->GetBeatmapLevel(levelId);
static BeatmapLevel* FindLevelInternal(StringW levelId, bool ignoreCase = false) {
return MetaCore::Game::GetAppDiContainer()->Resolve<BeatmapLevelsModel*>()->GetBeatmapLevel(levelId, ignoreCase);
}

BeatmapLevel* MetaCore::Songs::FindLevel(std::string levelId) {
Expand Down