Added fallback native assembly resolver.

Author: MapleWheels

Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Plugins/IAssemblyLoaderService.cs

@@ -44,6 +44,10 @@ public record LoaderInitData(
     /// </summary>
     Guid Id { get; }
     /// <summary>
+    /// The owner content package.
+    /// </summary>
+    ContentPackage OwnerPackage { get; }
+    /// <summary>
     /// Indicates that the assemblies in this load context are metadata references only and not
     /// intended for execution.
     /// </summary>

Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs

@@ -116,15 +116,16 @@ private void RegisterConsoleCommands(IConsoleCommandsService commands)
 
         commands.RegisterCommand("cl_toggleluadebug", "Toggles the MoonSharp Debug Server.", (string[] args) =>
         {
-            int port = 41912;
+            DebugConsole.Log($"This command is currently not implemented. Please open a github issue if you need this feature.");
+            /*int port = 41912;
 
             if (args.Length > 0)
             {
                 int.TryParse(args[0], out port);
             }
 
             throw new NotImplementedException();
-            //GameMain.LuaCs.ToggleDebugger(port);
+            //GameMain.LuaCs.ToggleDebugger(port);*/
         });
 
 #elif SERVER

Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs

@@ -6,6 +6,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Runtime.Loader;
 using System.Text;
 using System.Threading;
@@ -199,6 +200,7 @@ public FluentResults.Result Reset()
     private readonly ConcurrentDictionary<Type, ContentPackage> _pluginPackageLookup = new();
     private readonly ConcurrentDictionary<ContentPackage, ImmutableArray<IAssemblyPlugin>> _pluginInstances = new();
     private readonly ConditionalWeakTable<IAssemblyLoaderService, ContentPackage> _unloadingAssemblyLoaders = new();
+    private readonly ConcurrentBag<IntPtr> _loadedNativeLibraries = new();
     private readonly AsyncReaderWriterLock _operationsLock = new();
     private ServiceContainer _pluginInjectorContainer;
 
@@ -632,10 +634,39 @@ private string DoSourceCodeTextCompatibilityPass(string sourceCode)
         return sourceCode.Replace("GameMain.LuaCs", "LuaCsSetup.Instance");
     }
 
-    private IntPtr OnAssemblyLoaderResolvingUnmanaged(Assembly arg1, string arg2)
+    private IntPtr OnAssemblyLoaderResolvingUnmanaged(Assembly callerAssembly, string targetAssemblyName)
     {
-        // TODO: Implement extern assembly lookup for Native/Unmanaged Assemblies.
-        throw new NotImplementedException();
+        Guard.IsNull(callerAssembly, nameof(callerAssembly));
+        Guard.IsNullOrWhiteSpace(targetAssemblyName, nameof(targetAssemblyName));
+        
+        if (AssemblyLoadContext.GetLoadContext(callerAssembly) is not IAssemblyLoaderService loaderService)
+        {
+            return IntPtr.Zero;
+        }
+
+        var targetDirectory = Path.GetFullPath(loaderService.OwnerPackage.Dir);
+        if (!targetAssemblyName.TrimEnd().EndsWith(".dll"))
+        {
+            targetAssemblyName += ".dll";
+        }
+
+        var res = _storageService.FindFilesInPackage(loaderService.OwnerPackage, string.Empty, targetAssemblyName, true);
+
+        if (res.IsFailed || !res.Value.Any())
+        {
+            return IntPtr.Zero;
+        }
+
+        foreach (var path in res.Value)
+        {
+            if (System.Runtime.InteropServices.NativeLibrary.TryLoad(path, out IntPtr asmPtr))
+            {
+                _loadedNativeLibraries.Add(asmPtr);
+                return asmPtr;
+            }
+        }
+
+        return IntPtr.Zero;
     }
 
     private Assembly OnAssemblyLoaderResolvingManaged(IAssemblyLoaderService requestingLoader, AssemblyName searchName)
@@ -708,6 +739,25 @@ public FluentResults.Result UnloadManagedAssemblies()
         _assemblyLoaders.Clear();
         GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
 
+        // clear native libraries
+        if (_loadedNativeLibraries.Any())
+        {
+            foreach (var ptr in _loadedNativeLibraries)
+            {
+                try
+                {
+                    System.Runtime.InteropServices.NativeLibrary.Free(ptr);
+                }
+                catch 
+                {
+                    // ignored
+                    continue;
+                }
+            }
+            
+            _loadedNativeLibraries.Clear();
+        }
+        
         return results;
     }