From 32849cad54cf3be4c325c631e0fee026730e4805 Mon Sep 17 00:00:00 2001 From: Herp Derpinstine Date: Fri, 11 Oct 2024 10:37:15 -0600 Subject: [PATCH] Fixed an issue with MelonLoader Internal Calls being Incorrect --- Bootstrap/src/icalls/mod.rs | 8 ++++---- MelonLoader/InternalUtils/Resolver/AssemblyManager.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bootstrap/src/icalls/mod.rs b/Bootstrap/src/icalls/mod.rs index 0729ebc1..ca8ed453 100644 --- a/Bootstrap/src/icalls/mod.rs +++ b/Bootstrap/src/icalls/mod.rs @@ -14,10 +14,10 @@ pub fn init(runtime: &FerrexRuntime) -> Result<(), DynErr> { runtime.add_internal_call("MelonLoader.MelonUtils::IsGame32Bit", melon_utils::is_32_bit as MethodPointer)?; runtime.add_internal_call("MelonLoader.BootstrapInterop::NativeHookAttach", bootstrap_interop::attach as MethodPointer)?; runtime.add_internal_call("MelonLoader.BootstrapInterop::NativeHookDetach", bootstrap_interop::detach as MethodPointer)?; - runtime.add_internal_call("MelonLoader.MonoInternals.MonoLibrary::GetLibPtr", mono_library::get_lib_ptr as MethodPointer)?; - runtime.add_internal_call("MelonLoader.MonoInternals.MonoLibrary::CastManagedAssemblyPtr", mono_library::cast_assembly_ptr as MethodPointer)?; - runtime.add_internal_call("MelonLoader.MonoInternals.MonoLibrary::GetRootDomainPtr", mono_library::get_domain_ptr as MethodPointer)?; - runtime.add_internal_call("MelonLoader.MonoInternals.ResolveInternals.AssemblyManager::InstallHooks", resolve_internals::install_hooks as MethodPointer)?; + runtime.add_internal_call("MelonLoader.InternalUtils.MonoLibrary::GetLibPtr", mono_library::get_lib_ptr as MethodPointer)?; + runtime.add_internal_call("MelonLoader.InternalUtils.MonoLibrary::CastManagedAssemblyPtr", mono_library::cast_assembly_ptr as MethodPointer)?; + runtime.add_internal_call("MelonLoader.InternalUtils.MonoLibrary::GetRootDomainPtr", mono_library::get_domain_ptr as MethodPointer)?; + runtime.add_internal_call("MelonLoader.InternalUtils.Resolver.AssemblyManager::InstallHooks", resolve_internals::install_hooks as MethodPointer)?; runtime.add_internal_call("MelonLoader.Support.Preload::GetManagedDirectory", preload::get_managed_dir as MethodPointer)?; Ok(()) diff --git a/MelonLoader/InternalUtils/Resolver/AssemblyManager.cs b/MelonLoader/InternalUtils/Resolver/AssemblyManager.cs index 8dea8a24..90865ef1 100644 --- a/MelonLoader/InternalUtils/Resolver/AssemblyManager.cs +++ b/MelonLoader/InternalUtils/Resolver/AssemblyManager.cs @@ -3,9 +3,9 @@ using System.Reflection; #if NET6_0_OR_GREATER +using System.IO; using System.Runtime.Loader; #else -using System.IO; using System.Runtime.CompilerServices; #endif