Skip to content

Fix Unity 6 native class resolver hooks #31

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
Fernthedev merged 1 commit into from
Oct 18, 2026
Merged

Fix Unity 6 native class resolver hooks #31

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 @@ -80,8 +80,8 @@
},
{
"id": "beatsaber-hook",
"versionRange": "^9.0.0",
"versionRange": "^9.3.0",
"additionalData": {}
}
]
}
}
14 changes: 7 additions & 7 deletions qpm.shared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
},
{
"id": "beatsaber-hook",
"versionRange": "^9.0.0",
"versionRange": "^9.3.0",
"additionalData": {}
}
]
Expand Down Expand Up @@ -153,13 +153,13 @@
{
"dependency": {
"id": "beatsaber-hook",
"versionRange": "=9.0.0",
"versionRange": "=9.3.0",
"additionalData": {
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v9.0.0/libbeatsaber-hook.so",
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v9.0.0/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/v9.0.0/beatsaber-hook.qmod",
"branchName": "version/v9_0_0",
"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"
Expand All @@ -168,7 +168,7 @@
"cmake": true
}
},
"version": "9.0.0"
"version": "9.3.0"
},
{
"dependency": {
Expand Down
18 changes: 18 additions & 0 deletions src/register.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,11 @@ MAKE_HOOK(Type_GetClassOrElementClass, (nullptr), Il2CppClass*, Il2CppType* type
return i2c::functions::Class_FromIl2CppType(type);
}

#ifdef UNITY_6
MAKE_HOOK(Class_Init, (nullptr), void, Il2CppClass* klass) {
#else
MAKE_HOOK(Class_Init, (nullptr), bool, Il2CppClass* klass) {
#endif
// If we are attempting to call Class::Init() on an Il2CppClass* that is a
// custom Il2CppClass*, we need to ignore.
if (!klass) {
Expand All @@ -94,7 +98,11 @@ MAKE_HOOK(Class_Init, (nullptr), bool, Il2CppClass* klass) {
#ifndef NO_VERBOSE_LOGS
logger.debug("custom idx: {}", idx);
#endif
#ifdef UNITY_6
return;
#else
return true;
#endif
}
}

Expand Down Expand Up @@ -302,16 +310,26 @@ namespace custom_types {
Paper::Logger::RegisterFileContextId(custom_types::logger.tag);

logger.debug("Installing FromIl2CppType hook...");
#ifdef UNITY_6
i2c::install_hook<Hook_FromIl2CppTypeMain<const Il2CppType*, bool>>(
logger, (void*) i2c::functions::Class_FromIl2CppTypeNative
);
#else
if constexpr (sizeof(Il2CppCodeGenModule) < 104) {
i2c::install_hook<Hook_FromIl2CppTypeMain<Il2CppType*>>(logger, (void*) i2c::functions::Class_FromIl2CppType);
} else {
i2c::install_hook<Hook_FromIl2CppTypeMain<Il2CppType*, bool>>(logger, (void*) i2c::functions::Class_FromIl2CppType);
}
#endif
INSTALL_HOOK(logger, GlobalMetadata_GetTypeInfoFromHandle, (void*) i2c::functions::GlobalMetadata_GetTypeInfoFromHandle);
INSTALL_HOOK(
logger, GlobalMetadata_GetTypeInfoFromTypeDefinitionIndex, (void*) i2c::functions::GlobalMetadata_GetTypeInfoFromTypeDefinitionIndex
);
#ifdef UNITY_6
INSTALL_HOOK(logger, Class_Init, (void*) i2c::functions::Class_InitNative);
#else
INSTALL_HOOK(logger, Class_Init, (void*) i2c::functions::Class_Init);
#endif

bool multiple;
uintptr_t GetScriptingClassAddr = i2c::binary::libunity_unique_pattern(
Expand Down
Loading