diff --git a/Dependencies/Il2CppAssemblyGenerator/Core.cs b/Dependencies/Il2CppAssemblyGenerator/Core.cs index 2c6d1608..6b34cc40 100644 --- a/Dependencies/Il2CppAssemblyGenerator/Core.cs +++ b/Dependencies/Il2CppAssemblyGenerator/Core.cs @@ -52,16 +52,18 @@ public override void OnInitialize() BasePath = Path.GetDirectoryName(Assembly.Location); } +#pragma warning disable IDE0051 // Remove unused private members; called via reflection private static int Run() +#pragma warning restore IDE0051 { Config.Initialize(); if (!MelonLaunchOptions.Il2CppAssemblyGenerator.OfflineMode) RemoteAPI.Contact(); - Cpp2IL cpp2IL_netcore = new Cpp2IL(); + Packages.Cpp2IL cpp2IL_netcore = new Packages.Cpp2IL(); if (MelonUtils.IsWindows - && (cpp2IL_netcore.VersionSem < Cpp2IL.NetCoreMinVersion)) + && (cpp2IL_netcore.VersionSem < Packages.Cpp2IL.NetCoreMinVersion)) cpp2il = new Cpp2IL_NetFramework(); else cpp2il = cpp2IL_netcore; diff --git a/MelonLoader/Core.cs b/MelonLoader/Core.cs index 56fa6a28..1a84b478 100644 --- a/MelonLoader/Core.cs +++ b/MelonLoader/Core.cs @@ -8,6 +8,9 @@ using JNISharp.NativeInterface; using System.Linq; using System.Drawing; +using MelonLoader.Utils; +using MelonLoader.InternalUtils; +using MelonLoader.Resolver; #if NET6_0_OR_GREATER using MelonLoader.CoreClrUtils; diff --git a/MelonLoader/MelonLoader.csproj b/MelonLoader/MelonLoader.csproj index c7bf6d11..d544ede8 100644 --- a/MelonLoader/MelonLoader.csproj +++ b/MelonLoader/MelonLoader.csproj @@ -50,6 +50,7 @@ + diff --git a/MelonLoader/Resolver/MelonAssemblyResolver.cs b/MelonLoader/Resolver/MelonAssemblyResolver.cs index d4062503..bb48d9d1 100644 --- a/MelonLoader/Resolver/MelonAssemblyResolver.cs +++ b/MelonLoader/Resolver/MelonAssemblyResolver.cs @@ -28,7 +28,6 @@ internal static void Setup() MelonEnvironment.GameRootDirectory, MelonEnvironment.OurRuntimeDirectory, MelonEnvironment.Il2CppAssembliesDirectory, - MelonEnvironment.UnityGameManagedDirectory, }; foreach (string path in searchdirlist) AddSearchDirectory(path);