vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added friendly name to ACLs for identification during unloading.

Browse Source 
- Added debug messages showing mods that have not unloaded from a previous session.
This commit is contained in:
MapleWheels
2023-10-05 15:32:08 -04:00
committed by Evil Factory
parent 40c8f3e666
commit 523ee8d641
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
+21 -3
View File
@@ -284,6 +284,24 @@ public sealed class CsPackageManager : IDisposable
_assemblyManager.OnAssemblyLoaded += AssemblyManagerOnAssemblyLoaded;
_assemblyManager.OnAssemblyUnloading += AssemblyManagerOnAssemblyUnloading;
// log error if some ACLs are still unloading (some assembly is still in use)
if (_assemblyManager.IsCurrentlyUnloading)
{
ModUtils.Logging.PrintError($"WARNING: Some mods from a previous session (lobby) are still loaded! This may result in undefined behaviour! Please restart your game. \nIf you wish to avoid this issue in the future, please disable the below mods and report the error to the mod author.");
foreach (var wkref in _assemblyManager.StillUnloadingACLs)
{
ModUtils.Logging.PrintError($"The below ACL is still unloading:");
if (wkref.TryGetTarget(out var tgt))
{
ModUtils.Logging.PrintError($"ACL Name: {tgt.Name}");
foreach (Assembly assembly in tgt.Assemblies)
{
ModUtils.Logging.PrintError($"-- Assembly: {assembly.GetName()}");
}
}
}
}
// load publicized assemblies
var publicizedDir = Path.Combine(Environment.CurrentDirectory, "Publicized");
@@ -343,7 +361,7 @@ public sealed class CsPackageManager : IDisposable
}
// try load them into an acl
var loadState = _assemblyManager.LoadAssembliesFromLocations(list, ref _publicizedAssemblyLoader);
var loadState = _assemblyManager.LoadAssembliesFromLocations(list, "luacs_publicized_assemblies", ref _publicizedAssemblyLoader);
// loaded
if (loadState is AssemblyLoadingSuccessState.Success)
@@ -485,7 +503,7 @@ public sealed class CsPackageManager : IDisposable
}
#endif
successState = _assemblyManager.LoadAssembliesFromLocations(pair.Value.AssembliesFilePaths, ref id);
successState = _assemblyManager.LoadAssembliesFromLocations(pair.Value.AssembliesFilePaths, pair.Key.Name, ref id);
// error handling
if (successState is not AssemblyLoadingSuccessState.Success)
@@ -550,7 +568,7 @@ public sealed class CsPackageManager : IDisposable
syntaxTrees,
null,
CompilationOptions,
ref id, publicizedAssemblies);
pair.Key.Name, ref id, publicizedAssemblies);
if (successState is not AssemblyLoadingSuccessState.Success)
{