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

Fixed "Folder" attribute files not being found.

Browse Source
This commit is contained in:
Maplewheels
2026-04-11 23:20:00 -04:00
parent c5976ccae1
commit c6ccc68b2e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/ModConfigFileParserService.cs
+7 -5
View File
@@ -61,8 +61,9 @@ public sealed partial class ModConfigFileParserService :
if (CheckThrowNullRefs(src, "Assembly") is { IsFailed: true } fail) if (CheckThrowNullRefs(src, "Assembly") is { IsFailed: true } fail)
return fail; return fail;
var isScript = src.Element.GetAttributeBool("IsScript", false);
var runtimeEnv = GetRuntimeEnvironment(src.Element); var runtimeEnv = GetRuntimeEnvironment(src.Element);
var fileResults = await UnsafeGetCheckedFiles(src.Element, src.Owner, ".dll"); var fileResults = await UnsafeGetCheckedFiles(src.Element, src.Owner, isScript ? ".cs" : ".dll");
if (fileResults.IsFailed) if (fileResults.IsFailed)
return FluentResults.Result.Fail(fileResults.Errors); return FluentResults.Result.Fail(fileResults.Errors);
@@ -80,7 +81,7 @@ public sealed partial class ModConfigFileParserService :
IncompatiblePackages = src.Incompatible, IncompatiblePackages = src.Incompatible,
// Type Specific // Type Specific
FriendlyName = src.Element.GetAttributeString("FriendlyName", GetFallbackCompliantAssemblyName(src.Owner)), FriendlyName = src.Element.GetAttributeString("FriendlyName", GetFallbackCompliantAssemblyName(src.Owner)),
IsScript = src.Element.GetAttributeBool("IsScript", false), IsScript = isScript,
UseInternalAccessName = src.Element.GetAttributeBool("UseInternalAccessName", false), UseInternalAccessName = src.Element.GetAttributeBool("UseInternalAccessName", false),
IsReferenceModeOnly = src.Element.GetAttributeBool("IsReferenceModeOnly", false) IsReferenceModeOnly = src.Element.GetAttributeBool("IsReferenceModeOnly", false)
}; };
@@ -205,7 +206,7 @@ public sealed partial class ModConfigFileParserService :
var res = new FluentResults.Result<ImmutableArray<ContentPath>>(); var res = new FluentResults.Result<ImmutableArray<ContentPath>>();
if (!filePath.IsNullOrWhiteSpace()) if ((!filePath?.Value.IsNullOrWhiteSpace()) ?? false)
{ {
if (_storageService.FileExists(filePath.FullPath) is { IsSuccess: true, Value: true }) if (_storageService.FileExists(filePath.FullPath) is { IsSuccess: true, Value: true })
{ {
@@ -224,11 +225,12 @@ public sealed partial class ModConfigFileParserService :
} }
} }
if (!folderPath.IsNullOrWhiteSpace()) if ((!folderPath?.Value.IsNullOrWhiteSpace()) ?? false)
{ {
if (_storageService.DirectoryExists(folderPath.FullPath) is { IsSuccess: true, Value: true }) if (_storageService.DirectoryExists(folderPath.FullPath) is { IsSuccess: true, Value: true })
{ {
var files = _storageService.FindFilesInPackage(srcOwner, folderPath.Value, fileExtension, true); var searchLocation = System.IO.Path.GetRelativePath(srcOwner.Dir, folderPath.Value);
var files = _storageService.FindFilesInPackage(srcOwner, searchLocation, "*"+fileExtension, true);
if (files.IsFailed) if (files.IsFailed)
{ {
res.WithError($"{srcOwner.Name}: Failed to load files from {folderPath}!"); res.WithError($"{srcOwner.Name}: Failed to load files from {folderPath}!");