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

Changed publicized assembly discovery to fallback to the alternate option if the /Pubicized folder cannot be found. IE. Workshop Lua folder if Game folder is missing and vice versa.

Browse Source
This commit is contained in:
MapleWheels
2023-09-29 03:51:05 -04:00
committed by Evil Factory
parent 3708e837e7
commit 40c8f3e666
1 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
+45 -12
View File
@@ -298,28 +298,61 @@ public sealed class CsPackageManager : IDisposable
} }
ImmutableList<Assembly> publicizedAssemblies = ImmutableList<Assembly>.Empty; ImmutableList<Assembly> publicizedAssemblies = ImmutableList<Assembly>.Empty;
if (Directory.Exists(publicizedDir)) ImmutableList<string> list;
try
{ {
// search for assemblies // search for assemblies
var list = Directory.GetFiles(publicizedDir, "*.dll") list = Directory.GetFiles(publicizedDir, "*.dll")
#if CLIENT #if CLIENT
.Where(s => !s.ToLowerInvariant().EndsWith("dedicatedserver.dll")); .Where(s => !s.ToLowerInvariant().EndsWith("dedicatedserver.dll"))
#elif SERVER #elif SERVER
.Where(s => !s.ToLowerInvariant().EndsWith("barotrauma.dll")); .Where(s => !s.ToLowerInvariant().EndsWith("barotrauma.dll"))
#endif #endif
.ToImmutableList();
// try load them into an acl if (list.Count < 1)
var loadState = _assemblyManager.LoadAssembliesFromLocations(list, ref _publicizedAssemblyLoader); throw new DirectoryNotFoundException("No publicized assemblies found.");
}
// loaded // no directory found, use the other one
if (loadState is AssemblyLoadingSuccessState.Success) catch (DirectoryNotFoundException dne)
{
if (_luaCsSetup.Config.PreferToUseWorkshopLuaSetup)
{ {
if (_assemblyManager.TryGetACL(_publicizedAssemblyLoader, out var acl)) ModUtils.Logging.PrintError($"Unable to find <LuaCsPackage>/Binary/Publicized/ . Using Game folder instead.");
publicizedDir = Path.Combine(Environment.CurrentDirectory, "Publicized");
}
else
{
ModUtils.Logging.PrintError($"Unable to find <GameFolder>/Publicized/ . Using LuaCsPackage folder instead.");
var pck = LuaCsSetup.GetPackage(LuaCsSetup.LuaForBarotraumaId);
if (pck is not null)
{ {
publicizedAssemblies = acl.Acl.Assemblies.ToImmutableList(); publicizedDir = Path.Combine(pck.Dir, "Binary", "Publicized");
_assemblyManager.SetACLToTemplateMode(_publicizedAssemblyLoader);
} }
} }
// search for assemblies
list = Directory.GetFiles(publicizedDir, "*.dll")
#if CLIENT
.Where(s => !s.ToLowerInvariant().EndsWith("dedicatedserver.dll"))
#elif SERVER
.Where(s => !s.ToLowerInvariant().EndsWith("barotrauma.dll"))
#endif
.ToImmutableList();
}
// try load them into an acl
var loadState = _assemblyManager.LoadAssembliesFromLocations(list, ref _publicizedAssemblyLoader);
// loaded
if (loadState is AssemblyLoadingSuccessState.Success)
{
if (_assemblyManager.TryGetACL(_publicizedAssemblyLoader, out var acl))
{
publicizedAssemblies = acl.Acl.Assemblies.ToImmutableList();
_assemblyManager.SetACLToTemplateMode(_publicizedAssemblyLoader);
}
} }