Unity 6.x games support and other improvements

.gitignore

@@ -0,0 +1,8 @@
+/.vs/
+**/.vs/
+**/bin/
+**/obj/
+*.user
+*.suo
+*.VC.db
+*.VC.opendb

API/Callback.hpp

@@ -14,14 +14,14 @@ namespace IL2CPP
 	{
 		namespace OnUpdate
 		{
-			CallbackHook_t m_CallbackHook;
+			inline CallbackHook_t m_CallbackHook;
 
-			void Add(void* m_pFunction) 
-			{ 
+			inline void Add(void* m_pFunction)
+			{
 				m_CallbackHook.m_Funcs.emplace_back(m_pFunction);
 			}
 
-			void __fastcall Hook(void* rcx)
+			inline void __fastcall Hook(void* rcx)
 			{
 				for (void* m_Func : m_CallbackHook.m_Funcs)
 					reinterpret_cast<void(*)()>(m_Func)();
@@ -32,14 +32,14 @@ namespace IL2CPP
 
 		namespace OnLateUpdate
 		{
-			CallbackHook_t m_CallbackHook;
+			inline CallbackHook_t m_CallbackHook;
 
-			void Add(void* m_pFunction)
+			inline void Add(void* m_pFunction)
 			{
 				m_CallbackHook.m_Funcs.emplace_back(m_pFunction);
 			}
 
-			void __fastcall Hook(void* rcx)
+			inline void __fastcall Hook(void* rcx)
 			{
 				for (void* m_Func : m_CallbackHook.m_Funcs)
 					reinterpret_cast<void(*)()>(m_Func)();
@@ -48,34 +48,53 @@ namespace IL2CPP
 			}
 		}
 
-		void Initialize()
+		inline void Initialize()
 		{
-			void* m_IL2CPPThread = Thread::Attach(IL2CPP::Domain::Get());
+			IL2CPP::ScopedThreadAttachment m_Attachment;
+
+			Unity::CComponent* mb = IL2CPP::Helper::GetMonoBehaviour();
+			if (!mb || !mb->m_CachedPtr)
+				return;
 
-			// Find
-			void** m_MonoBehaviourVTable = *reinterpret_cast<void***>(IL2CPP::Helper::GetMonoBehaviour()->m_CachedPtr);
+			void** m_MonoBehaviourVTable = *reinterpret_cast<void***>(mb->m_CachedPtr);
 			if (m_MonoBehaviourVTable)
 			{
 #ifdef _WIN64
-				OnUpdate::m_CallbackHook.m_VFunc		= Utils::VTable::FindFunction(m_MonoBehaviourVTable, 99, { 0x33, 0xD2, 0xE9 }); // xor edx, edx | jmp
-				OnLateUpdate::m_CallbackHook.m_VFunc	= Utils::VTable::FindFunction(m_MonoBehaviourVTable, 99, { 0xBA, 0x01, 0x00, 0x00, 0x00, 0xE9 }); //  mov edx, 1 | jmp
+				// Unity versions may slightly change thunk prologues; use masked patterns + scan a wider range.
+				const unsigned char upd_pat1[] = { 0x33, 0xD2, 0xE9 }; // xor edx, edx | jmp
+				const unsigned char upd_msk1[] = { 0xFF, 0xFF, 0xFF };
+
+				const unsigned char late_pat1[] = { 0xBA, 0x01, 0x00, 0x00, 0x00, 0xE9 }; // mov edx,1 | jmp
+				const unsigned char late_msk1[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
+				OnUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunctionMasked(m_MonoBehaviourVTable, 256, upd_pat1, upd_msk1, sizeof(upd_pat1));
+				OnLateUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunctionMasked(m_MonoBehaviourVTable, 256, late_pat1, late_msk1, sizeof(late_pat1));
+
+				// Fallback: original exact matcher (some titles still match)
+				if (!OnUpdate::m_CallbackHook.m_VFunc)
+					OnUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunction(m_MonoBehaviourVTable, 256, { 0x33, 0xD2, 0xE9 });
+				if (!OnLateUpdate::m_CallbackHook.m_VFunc)
+					OnLateUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunction(m_MonoBehaviourVTable, 256, { 0xBA, 0x01, 0x00, 0x00, 0x00, 0xE9 });
 #elif _WIN32
-				OnUpdate::m_CallbackHook.m_VFunc		= Utils::VTable::FindFunction(m_MonoBehaviourVTable, 99, { 0x6A, 0x00, 0xE8 }); // push 00 | call
-				OnLateUpdate::m_CallbackHook.m_VFunc	= Utils::VTable::FindFunction(m_MonoBehaviourVTable, 99, { 0x6A, 0x01, 0xE8 }); // push 01 | call
+				OnUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunction(m_MonoBehaviourVTable, 512, { 0x6A, 0x00, 0xE8 }); // push 00 | call
+				OnLateUpdate::m_CallbackHook.m_VFunc = Utils::VTable::FindFunction(m_MonoBehaviourVTable, 512, { 0x6A, 0x01, 0xE8 }); // push 01 | call
 #endif
 			}
 
-			IL2CPP::Thread::Detach(m_IL2CPPThread);
-
-			// Replace (Hook)
-			Utils::VTable::ReplaceFunction(OnUpdate::m_CallbackHook.m_VFunc, OnUpdate::Hook, &OnUpdate::m_CallbackHook.m_Original);
-			Utils::VTable::ReplaceFunction(OnLateUpdate::m_CallbackHook.m_VFunc, OnLateUpdate::Hook, &OnLateUpdate::m_CallbackHook.m_Original);
+			// Replace (Hook) - only if we successfully located targets
+			if (OnUpdate::m_CallbackHook.m_VFunc)
+				Utils::VTable::ReplaceFunction(OnUpdate::m_CallbackHook.m_VFunc, OnUpdate::Hook, &OnUpdate::m_CallbackHook.m_Original);
+			if (OnLateUpdate::m_CallbackHook.m_VFunc)
+				Utils::VTable::ReplaceFunction(OnLateUpdate::m_CallbackHook.m_VFunc, OnLateUpdate::Hook, &OnLateUpdate::m_CallbackHook.m_Original);
 		}
 
-		void Uninitialize()
+		inline void Uninitialize()
 		{
-			Utils::VTable::ReplaceFunction(OnUpdate::m_CallbackHook.m_VFunc, OnUpdate::m_CallbackHook.m_Original);
-			Utils::VTable::ReplaceFunction(OnLateUpdate::m_CallbackHook.m_VFunc, OnLateUpdate::m_CallbackHook.m_Original);
+			if (OnUpdate::m_CallbackHook.m_VFunc && OnUpdate::m_CallbackHook.m_Original)
+				Utils::VTable::ReplaceFunction(OnUpdate::m_CallbackHook.m_VFunc, OnUpdate::m_CallbackHook.m_Original);
+
+			if (OnLateUpdate::m_CallbackHook.m_VFunc && OnLateUpdate::m_CallbackHook.m_Original)
+				Utils::VTable::ReplaceFunction(OnLateUpdate::m_CallbackHook.m_VFunc, OnLateUpdate::m_CallbackHook.m_Original);
 		}
 	}
-}
+}