0.6.6 Fixes

LemonLoader · Nov 28, 2024 · cd844db · cd844db
1 parent 139052b
commit cd844db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -50,6 +50,7 @@
 		<ProjectReference Include="..\External\Il2CppInterop\Il2CppInterop.Common\Il2CppInterop.Common.csproj" />
 		<ProjectReference Include="..\External\Il2CppInterop\Il2CppInterop.Generator\Il2CppInterop.Generator.csproj" />
 		<ProjectReference Include="..\External\Il2CppInterop\Il2CppInterop.Runtime\Il2CppInterop.Runtime.csproj" />
+		<ProjectReference Include="..\External\Il2CppInterop\Il2CppInterop.HarmonySupport\Il2CppInterop.HarmonySupport.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<EmbeddedResource Include="Resources\classdata.tpk" />

diff --git 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);