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

PackageId -> PackageName

Browse Source
This commit is contained in:
Evil Factory
2026-04-10 16:50:15 -03:00
parent 1adf76168d
commit 5505f20925
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSetup.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace Barotrauma
} }
ImmutableArray<ContentPackage> contentPackages = PackageManagementService.GetLoadedAssemblyPackages() ImmutableArray<ContentPackage> contentPackages = PackageManagementService.GetLoadedAssemblyPackages()
.Where(p => p.Name != PackageId) .Where(p => p.Name != PackageName)
.ToImmutableArray(); .ToImmutableArray();
return (contentPackages.IsEmpty, contentPackages); return (contentPackages.IsEmpty, contentPackages);
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+8 -8
View File
@@ -25,7 +25,7 @@ namespace Barotrauma
partial class LuaCsSetup : IDisposable, IEventScreenSelected, IEventEnabledPackageListChanged, partial class LuaCsSetup : IDisposable, IEventScreenSelected, IEventEnabledPackageListChanged,
IEventReloadAllPackages IEventReloadAllPackages
{ {
public const string PackageId = "LuaCsForBarotrauma"; public const string PackageName = "LuaCsForBarotrauma";
private static LuaCsSetup _luaCsSetup; private static LuaCsSetup _luaCsSetup;
public static LuaCsSetup Instance => _luaCsSetup ??= new LuaCsSetup(); public static LuaCsSetup Instance => _luaCsSetup ??= new LuaCsSetup();
@@ -118,9 +118,9 @@ namespace Barotrauma
public static ContentPackage GetLuaCsPackage() public static ContentPackage GetLuaCsPackage()
{ {
return ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches(PackageId), null) return ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches(PackageName), null)
?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches(PackageId)) ?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches(PackageName))
?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches(PackageId)); ?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches(PackageName));
} }
void LoadLuaCsConfig() void LoadLuaCsConfig()
@@ -281,13 +281,13 @@ namespace Barotrauma
private ImmutableArray<ContentPackage> GetLuaCsEnabledPackagesList(ImmutableArray<ContentPackage> enabledRegular) private ImmutableArray<ContentPackage> GetLuaCsEnabledPackagesList(ImmutableArray<ContentPackage> enabledRegular)
{ {
if (!enabledRegular.Any(p => p.Name.Equals(PackageId, StringComparison.InvariantCultureIgnoreCase))) if (!enabledRegular.Any(p => p.Name.Equals(PackageName, StringComparison.InvariantCultureIgnoreCase)))
{ {
var luaCs = ContentPackageManager.AllPackages.FirstOrDefault(p => p.Name.Equals(PackageId, StringComparison.InvariantCultureIgnoreCase)); var luaCs = ContentPackageManager.AllPackages.FirstOrDefault(p => p.Name.Equals(PackageName, StringComparison.InvariantCultureIgnoreCase));
if (luaCs is null) if (luaCs is null)
{ {
DebugConsole.ThrowError($"The '{PackageId}' mod could not be found. Please subscribe to it and add it to the EnabledPackages List!", DebugConsole.ThrowError($"The '{PackageName}' mod could not be found. Please subscribe to it and add it to the EnabledPackages List!",
new NullReferenceException($"The '{PackageId}' mod could not be found. Please subscribe to it and add it to the EnabledPackages List!"), new NullReferenceException($"The '{PackageName}' mod could not be found. Please subscribe to it and add it to the EnabledPackages List!"),
createMessageBox: true); createMessageBox: true);
return enabledRegular; return enabledRegular;
} }
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaCsInfoProvider.cs
+3 -3
View File
@@ -20,9 +20,9 @@ public sealed class LuaCsInfoProvider : ILuaCsInfoProvider
{ {
get get
{ {
return ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageId), null) return ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageName), null)
?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageId)) ?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageName))
?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageId)); ?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches(LuaCsSetup.PackageName));
} }
} }
} }