diff --git a/BepInEx.IL2CPP/BasePlugin.cs b/BepInEx.IL2CPP/BasePlugin.cs index 6af7046..fc5c3a2 100644 --- a/BepInEx.IL2CPP/BasePlugin.cs +++ b/BepInEx.IL2CPP/BasePlugin.cs @@ -1,7 +1,6 @@ using BepInEx.Configuration; using BepInEx.Logging; -using Il2CppInterop.Runtime; -using Logger = BepInEx.Logging.Logger; +using Il2CppInterop.Runtime.InteropTypes; namespace BepInEx.IL2CPP; diff --git a/BepInEx.IL2CPP/BepInEx.IL2CPP.csproj b/BepInEx.IL2CPP/BepInEx.IL2CPP.csproj index 95da5de..f1c047b 100644 --- a/BepInEx.IL2CPP/BepInEx.IL2CPP.csproj +++ b/BepInEx.IL2CPP/BepInEx.IL2CPP.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/BepInEx.IL2CPP/Hook/IL2CPPDetourMethodPatcher.cs b/BepInEx.IL2CPP/Hook/IL2CPPDetourMethodPatcher.cs index 0b1c796..e775f80 100644 --- a/BepInEx.IL2CPP/Hook/IL2CPPDetourMethodPatcher.cs +++ b/BepInEx.IL2CPP/Hook/IL2CPPDetourMethodPatcher.cs @@ -7,7 +7,9 @@ using System.Runtime.InteropServices; using BepInEx.Logging; using HarmonyLib; using HarmonyLib.Public.Patching; +using Il2CppInterop.Common; using Il2CppInterop.Runtime; +using Il2CppInterop.Runtime.InteropTypes; using Il2CppInterop.Runtime.Runtime; using Il2CppInterop.Runtime.Runtime.VersionSpecific.MethodInfo; using MonoMod.Cil; diff --git a/BepInEx.IL2CPP/IL2CPPChainloader.cs b/BepInEx.IL2CPP/IL2CPPChainloader.cs index 95e0537..a1eb386 100644 --- a/BepInEx.IL2CPP/IL2CPPChainloader.cs +++ b/BepInEx.IL2CPP/IL2CPPChainloader.cs @@ -13,8 +13,8 @@ using BepInEx.Logging; using BepInEx.Preloader.Core; using BepInEx.Preloader.Core.Logging; using HarmonyLib.Public.Patching; -using Il2CppInterop.Runtime; using Il2CppInterop.Runtime.Injection; +using Il2CppInterop.Runtime.InteropTypes; using MonoMod.Utils; using UnityEngine; using Logger = BepInEx.Logging.Logger; diff --git a/BepInEx.IL2CPP/Il2CppInteropManager.cs b/BepInEx.IL2CPP/Il2CppInteropManager.cs index c8f6ac9..04ad888 100644 --- a/BepInEx.IL2CPP/Il2CppInteropManager.cs +++ b/BepInEx.IL2CPP/Il2CppInteropManager.cs @@ -11,8 +11,9 @@ using BepInEx.Configuration; using BepInEx.Logging; using Cpp2IL.Core; using HarmonyLib; +using Il2CppInterop.Common; using Il2CppInterop.Generator; -using Il2CppInterop.Runtime; +using Il2CppInterop.Runtime.XrefScans; using LibCpp2IL; using Mono.Cecil; @@ -141,6 +142,13 @@ internal static class Il2CppInteropManager AppDomain.CurrentDomain.AssemblyResolve += ResolveInteropAssemblies; + GenerateInteropAssemblies(); + + XrefRuntimeScanner.Initialize(); + } + + private static void GenerateInteropAssemblies() + { if (!CheckIfGenerationRequired()) return; diff --git a/BepInEx.IL2CPP/Utils/Il2CppUtils.cs b/BepInEx.IL2CPP/Utils/Il2CppUtils.cs index 0506e7b..889344f 100644 --- a/BepInEx.IL2CPP/Utils/Il2CppUtils.cs +++ b/BepInEx.IL2CPP/Utils/Il2CppUtils.cs @@ -1,6 +1,7 @@ using System; using Il2CppInterop.Runtime; using Il2CppInterop.Runtime.Injection; +using Il2CppInterop.Runtime.InteropTypes; using UnityEngine; namespace BepInEx.IL2CPP.Utils;