[Milestone] PackageManagementService completed.

- ContentPackageInfoLookup Service completed.
- Implemented ModConfigService.cs
- Implemented some of the resource processors.

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Configuration/DisplayableData.cs

@@ -1,18 +0,0 @@
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma.LuaCs.Configuration;
-
-public record DisplayableData : IDisplayableData
-{
-    public string InternalName { get; init; }
-    public ContentPackage OwnerPackage { get; init; }
-    public string FallbackPackageName { get; init; }
-    public string DisplayName { get; init; }
-    public string DisplayModName { get; init; }
-    public string DisplayCategory { get; init; }
-    public string Tooltip { get; init; }
-    public string ImageIcon { get; init; }
-    public Point IconResolution { get; init; }
-    public bool ShowWhenNotLoaded { get; init; }
-    public string Description { get; init; }
-}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Configuration/IConfigDisplayDefinitions.cs

@@ -1,6 +0,0 @@
-using Barotrauma.LuaCs.Configuration;
-using Barotrauma.LuaCs.Data;
-
-namespace Barotrauma.LuaCs.Configuration;
-
-public partial interface IConfigBase : IDisplayableData, IDisplayableInitialize { }

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Configuration/IDisplayables.cs

@@ -1,63 +0,0 @@
-using System.Numerics;
-using Barotrauma.LuaCs.Data;
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma.LuaCs.Configuration;
-
-/// <summary>
-/// Contains the Display Data for use with Menus.
-/// </summary>
-public interface IDisplayableData : IDataInfo
-{
-    /// <summary>
-    /// The name to display in GUIs and Menus.
-    /// </summary>
-    string DisplayName { get; }
-    /// <summary>
-    /// The mod name to display in GUIs and Menus.
-    /// </summary>
-    string DisplayModName { get; } 
-    /// <summary>
-    /// Category this instance falls under. Used by menus when filtering by category.
-    /// </summary>
-    string DisplayCategory { get; } 
-    /// <summary>
-    /// The tooltip shown on hover.
-    /// </summary>
-    string Tooltip { get; } 
-    /// <summary>
-    /// The fully qualified filepath to the image icon for this config.
-    /// </summary>
-    string ImageIcon { get; } 
-    /// <summary>
-    /// Required if ImageIcon is set. X,Y resolution of the image.
-    /// </summary>
-    Point IconResolution { get; }
-    /// <summary>
-    /// Whether to show the entry in the menu when not loaded.
-    /// </summary>
-    bool ShowWhenNotLoaded { get; }
-    /// <summary>
-    /// What does this setting do?
-    /// </summary>
-    string Description { get; }
-}
-
-public interface IDisplayableInitialize
-{
-    void Initialize(IDisplayableData values);
-    
-    // copy this as needed
-    /*public void Initialize(IDisplayableData values)
-    {
-        this.InternalName = values.InternalName;
-        this.OwnerPackage = values.OwnerPackage;
-        this.DisplayName = values.DisplayName;
-        this.DisplayModName = values.DisplayModName;
-        this.DisplayCategory = values.DisplayCategory;
-        this.Tooltip = values.Tooltip;
-        this.ImageIcon = values.ImageIcon;
-        this.IconResolution = values.IconResolution;
-        this.ShowWhenNotLoaded = values.ShowWhenNotLoaded;
-    }*/
-}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Data/DataInterfaceDefinitions.cs

@@ -5,7 +5,7 @@ namespace Barotrauma.LuaCs.Data;
 
 public partial record ModConfigInfo : IModConfigInfo
 {
-    public ImmutableArray<IStylesResourceInfo> StylesResourceInfos { get; init; }
+    public ImmutableArray<IStylesResourceInfo> Styles { get; init; }
 }
 
 public record StylesResourceInfo : IStylesResourceInfo
@@ -18,6 +18,6 @@ public record StylesResourceInfo : IStylesResourceInfo
     public ImmutableArray<CultureInfo> SupportedCultures { get; init; }
     public string InternalName { get; init; }
     public ContentPackage OwnerPackage { get; init; }
-    public string FallbackPackageName { get; }
-    public ImmutableArray<IPackageDependencyInfo> Dependencies { get; init; }
+    public string FallbackPackageName { get; init; }
+    public ImmutableArray<IPackageDependency> Dependencies { get; init; }
 }

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Data/IConfigInfo.cs

@@ -2,4 +2,18 @@ using Barotrauma.LuaCs.Configuration;
 
 namespace Barotrauma.LuaCs.Data;
 
-public partial interface IConfigInfo : IDisplayableData { }
+public partial interface IConfigInfo
+{
+    /// <summary>
+    /// Should this config be displayed in end-user menus.
+    /// </summary>
+    bool ShowInMenus { get; }
+    /// <summary>
+    /// User-friendly on-hover tooltip text or Localization Token.
+    /// </summary>
+    string Tooltip { get; }
+    /// <summary>
+    /// Icon for display in menus, if available.
+    /// </summary>
+    string ImageIconPath { get; }
+}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Data/IResourceInfoDeclarations.cs

@@ -4,12 +4,12 @@ namespace Barotrauma.LuaCs.Data;
 
 public partial interface IModConfigInfo : IStylesResourcesInfo { }
 
-public interface IStylesResourceInfo : IResourceInfo, IResourceCultureInfo, IPackageInfo, IPackageDependenciesInfo { }
+public interface IStylesResourceInfo : IResourceInfo, IResourceCultureInfo, IDataInfo, IPackageDependenciesInfo { }
 
 public interface IStylesResourcesInfo
 {
     /// <summary>
     /// Collection of loadable styles data.
     /// </summary>
-    ImmutableArray<IStylesResourceInfo> StylesResourceInfos { get; }
+    ImmutableArray<IStylesResourceInfo> Styles { get; }
 }

Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs

@@ -57,6 +57,9 @@ namespace Barotrauma
 
         public static void CheckUpdate()
         {
+            throw new NotImplementedException();
+            /*// TODO: Rewrite this to not rely on LuaCsSetup.
+            
             if (!File.Exists(LuaCsSetup.VersionFile)) { return; }
 
             ContentPackage luaPackage = LuaCsSetup.GetPackage(new SteamWorkshopId(GameMain.LuaCs.LuaForBarotraumaSteamId?.Value ?? 0));
@@ -116,6 +119,7 @@ namespace Barotrauma
                 msg.Close();
                 return true;
             };
+            */
             
         }
     }

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/IConfigService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Barotrauma.LuaCs.Configuration;
-using Barotrauma.LuaCs.Networking;
+using Barotrauma.LuaCs.Services;
 using Barotrauma.Networking;
 
 namespace Barotrauma.LuaCs.Services;

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/INetworkingService.cs

@@ -0,0 +1,8 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma.LuaCs.Services;
+
+internal partial interface INetworkingService : IReusableService
+{
+    void NetMessageReceived(IReadMessage message, ServerPacketHeader header);
+}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/IStylesService.cs

@@ -6,7 +6,7 @@ namespace Barotrauma.LuaCs.Services;
 /// <summary>
 /// Loads XML Style assets from the given content package.
 /// </summary>
-public interface IStylesService : IReusableService
+public interface IStylesService : IService
 {
     /// <summary>
     /// Tries to load the styles file for the given <see cref="ContentPackage"/> and path into a new <see cref="UIStyleProcessor"/> instance.

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/NetworkingService.cs

@@ -3,9 +3,9 @@ using Barotrauma.Networking;
 using System;
 using System.Collections.Generic;
 
-namespace Barotrauma.LuaCs.Networking;
+namespace Barotrauma.LuaCs.Services;
 
-partial class NetworkingService
+partial class NetworkingService : INetworkingService
 {
     private Dictionary<ushort, Queue<IReadMessage>> receiveQueue = new Dictionary<ushort, Queue<IReadMessage>>();
 
@@ -44,6 +44,11 @@ partial class NetworkingService
         }
     }
 
+    public void NetMessageReceived(IReadMessage message, ServerPacketHeader header)
+    {
+        throw new NotImplementedException();
+    }
+
     public INetWriteMessage Start(Guid netId)
     {
         var message = new WriteOnlyMessage();

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/PackageManagementService.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading.Tasks;
+using Barotrauma.LuaCs.Data;
+using Barotrauma.LuaCs.Services.Processing;
+using FluentResults;
+// ReSharper disable UseCollectionExpression
+
+namespace Barotrauma.LuaCs.Services;
+
+public partial class PackageManagementService : IPackageManagementService
+{
+    public PackageManagementService(
+        IConverterServiceAsync<ContentPackage, IModConfigInfo> modConfigParserService, 
+        IProcessorService<IReadOnlyList<IAssemblyResourceInfo>, IAssembliesResourcesInfo> assemblyInfoConverter, 
+        IProcessorService<IReadOnlyList<IConfigResourceInfo>, IConfigsResourcesInfo> configsInfoConverter, 
+        IProcessorService<IReadOnlyList<IConfigProfileResourceInfo>, IConfigProfilesResourcesInfo> configProfilesConverter, 
+        IProcessorService<IReadOnlyList<ILocalizationResourceInfo>, ILocalizationsResourcesInfo> localizationsConverter, 
+        IProcessorService<IReadOnlyList<ILuaScriptResourceInfo>, ILuaScriptsResourcesInfo> luaScriptsConverter, 
+        IPackageInfoLookupService packageInfoLookupService, Func<IReadOnlyList<IStylesResourceInfo>, IStylesResourcesInfo> stylesInfoConverter)
+    {
+        _stylesInfoConverter = stylesInfoConverter;
+        _modConfigParserService = modConfigParserService;
+        _assemblyInfoConverter = assemblyInfoConverter;
+        _configsInfoConverter = configsInfoConverter;
+        _configProfilesConverter = configProfilesConverter;
+        _localizationsConverter = localizationsConverter;
+        _luaScriptsConverter = luaScriptsConverter;
+        _packageInfoLookupService = packageInfoLookupService;
+    }
+    
+    private readonly Func<IReadOnlyList<IStylesResourceInfo>, IStylesResourcesInfo> _stylesInfoConverter;
+    
+    public ImmutableArray<IStylesResourceInfo> Styles => _modInfos.IsEmpty ? ImmutableArray<IStylesResourceInfo>.Empty 
+    : _modInfos.SelectMany(kvp => kvp.Value.Styles).ToImmutableArray();
+
+    public Result<IStylesResourcesInfo> GetStylesInfos(ContentPackage package, bool onlySupportedResources = true)
+    {
+        ((IService)this).CheckDisposed();
+        if (package is null)
+            return FluentResults.Result.Fail($"{nameof(GetStylesInfos)}: ContentPackage is null.");
+        if (_modInfos.TryGetValue(package, out var result))
+            return FluentResults.Result.Ok<IStylesResourcesInfo>(_stylesInfoConverter(onlySupportedResources?
+                result.Styles.Where(r => 
+                    (r.SupportedPlatforms & ModUtils.Environment.CurrentPlatform) > 0
+                    && (r.SupportedTargets & ModUtils.Environment.CurrentTarget) > 0).ToImmutableArray()
+                : result.Styles
+            ));
+        return FluentResults.Result.Fail(
+            $"{nameof(GetStylesInfos)}: ContentPackage {package.Name} is not registered.");
+    }
+
+    public Result<IStylesResourcesInfo> GetStylesInfos(IReadOnlyList<ContentPackage> packages, bool onlySupportedResources = true)
+    {
+        ((IService)this).CheckDisposed();
+        if (packages is null || packages.Count == 0)
+            return FluentResults.Result.Fail($"{nameof(GetStylesInfos)}: ContentPackage list is null or empty.");
+        var builder = ImmutableArray.CreateBuilder<IStylesResourceInfo>();
+        foreach (var package in packages)
+        {
+            if (_modInfos.TryGetValue(package, out var result) && result.Styles is { IsEmpty: false })
+            {
+                builder.AddRange(onlySupportedResources?
+                    result.Styles.Where(r => 
+                        (r.SupportedPlatforms & ModUtils.Environment.CurrentPlatform) > 0
+                        && (r.SupportedTargets & ModUtils.Environment.CurrentTarget) > 0).ToImmutableArray()
+                    : result.Styles);
+            }
+        }
+
+        return FluentResults.Result.Ok(_stylesInfoConverter(builder.MoveToImmutable()));
+    }
+
+    public async Task<Result<IStylesResourcesInfo>> GetStylesInfosAsync(IReadOnlyList<ContentPackage> packages, bool onlySupportedResources = true)
+    {
+        return await Task.Run(() => GetStylesInfos(packages, onlySupportedResources));
+
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/Processing/IClientParserDefinitions.cs

@@ -1,9 +0,0 @@
-using System.Xml.Linq;
-using Barotrauma.LuaCs.Data;
-
-namespace Barotrauma.LuaCs.Services.Processing;
-
-#region XmlToResourceParsers
-public interface IXmlStylesToResConverterService : IXmlResourceConverterService<IStylesResourceInfo> { }
-
-#endregion

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/Processing/ModConfigService.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using Barotrauma.LuaCs.Data;
+using FluentResults;
+
+namespace Barotrauma.LuaCs.Services.Processing;
+
+public partial class ModConfigService
+{
+    private partial async Task<Result<IModConfigInfo>> GetModConfigInfoAsync(ContentPackage package, XElement root)
+    {
+        var asm = root.GetChildElements("Assembly").ToImmutableArray();
+        var loc = root.GetChildElements("Localization").ToImmutableArray();
+        var cfg = root.GetChildElements("Config").ToImmutableArray();
+        var lua = root.GetChildElements("Lua").ToImmutableArray();
+        var stl = root.GetChildElements("Style").ToImmutableArray();
+
+        return FluentResults.Result.Ok<IModConfigInfo>(new ModConfigInfo()
+        {
+            Package = package,
+            PackageName = package.Name,
+            Assemblies = asm.Any() ? GetAssemblies(package, asm) : ImmutableArray<IAssemblyResourceInfo>.Empty,
+            Localizations = loc.Any() ? GetLocalizations(package, loc) : ImmutableArray<ILocalizationResourceInfo>.Empty,
+            Configs = cfg.Any() ? GetConfigs(package, cfg) : ImmutableArray<IConfigResourceInfo>.Empty,
+            ConfigProfiles = cfg.Any() ? GetConfigProfiles(package, cfg) : ImmutableArray<IConfigProfileResourceInfo>.Empty,
+            LuaScripts = lua.Any() ? GetLuaScripts(package, lua) : ImmutableArray<ILuaScriptResourceInfo>.Empty,
+            Styles = stl.Any() ? GetStyles(package, stl) : ImmutableArray<IStylesResourceInfo>.Empty
+        });
+    }
+    
+    private ImmutableArray<IStylesResourceInfo> GetStyles(ContentPackage src, IEnumerable<XElement> elements)
+    {
+        throw new NotImplementedException();
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/StylesService.cs

@@ -116,10 +116,5 @@ public class StylesService : IStylesService
         GC.SuppressFinalize(this);
     }
 
-    public FluentResults.Result Reset()
-    {
-        return UnloadAllStyles();
-    }
-
     public bool IsDisposed { get; private set; }
 }