diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index a6ec81487..4a31ec71c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -36,8 +36,8 @@ namespace Barotrauma _servicesProvider = SetupServicesProvider(); if (!ValidateLuaCsContent()) { - Logger.LogError($"{nameof(LuaCsSetup)}: ModConfigXml missing. Unable to continue."); - throw new ApplicationException($"{nameof(LuaCsSetup)}: Lua ModConfig.xml is missing. Unable to continue."); + Logger.LogError($"{nameof(LuaCsSetup)}: ModConfig.xml missing. Unable to continue."); + throw new ApplicationException($"{nameof(LuaCsSetup)}: Lua's ModConfig.xml is missing. Unable to continue."); } _runStateMachine = SetupStateMachine(); SubscribeToLuaCsEvents(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PackageManagementService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PackageManagementService.cs index 3626f6e1c..22a3626b6 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PackageManagementService.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PackageManagementService.cs @@ -151,12 +151,17 @@ public sealed class PackageManagementService : IPackageManagementService try { var res = new FluentResults.Result(); - var r = Task.WhenAll( - new Task>(async Task () => new FluentResults.Result() + var configsTask = new Task>(async Task () => + new FluentResults.Result() .WithReasons((await _configService.LoadConfigsAsync(config.Configs)).Reasons) - .WithReasons((await _configService.LoadConfigsProfilesAsync(config.Configs)).Reasons)), - new Task>(async () => await _luaScriptManagementService.LoadScriptResourcesAsync(config.LuaScripts)) - ).ConfigureAwait(false).GetAwaiter().GetResult(); + .WithReasons((await _configService.LoadConfigsProfilesAsync(config.Configs)).Reasons)); + var luaScriptsTask = new Task>(async () => + await _luaScriptManagementService.LoadScriptResourcesAsync(config.LuaScripts)); + + configsTask.Start(); + luaScriptsTask.Start(); + + var r = Task.WhenAll(configsTask, luaScriptsTask).ConfigureAwait(false).GetAwaiter().GetResult(); foreach (var task in r) res.WithReasons(task.ConfigureAwait(false).GetAwaiter().GetResult().Reasons); diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Processing/ModConfigService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Processing/ModConfigService.cs index c6d41fb36..6025fce08 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Processing/ModConfigService.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Processing/ModConfigService.cs @@ -235,6 +235,7 @@ public sealed class ModConfigService : IModConfigService private async Task> CreateFromLegacyAsync(ContentPackage src) { + // TODO: Implement legacy mod analysis return new ModConfigInfo() { Package = src,