- Moved plugin/assembly related code to their own folder (same namesp…

…ace). - Updated interfaces to reflect the use of Result<T>. - Partial refactor, incomplete.
evilfactory · Nov 10, 2024 · 93a3f02 · 93a3f02
1 parent a493ff5
commit 93a3f02
Show file tree

Hide file tree

Showing 19 changed files with 356 additions and 283 deletions.
diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/IStylesService.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/IStylesService.cs
@@ -12,11 +12,11 @@ public interface IStylesService : IService
     /// <param name="package"></param>
     /// <param name="path"></param>
     /// <returns></returns>
-    bool TryLoadStylesFile(ContentPackage package, ContentPath path);
+    FluentResults.Result LoadStylesFile(ContentPackage package, ContentPath path);
     /// <summary>
     /// Unloads all styles assets and UIStyleProcessor instances.
     /// </summary>
-    void UnloadAllStyles();
+    FluentResults.Result UnloadAllStyles();
 
     /// <summary>
     /// Tries to the get the font asset by xml asset name, returns null on failure.

diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/PackageService.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/Services/PackageService.cs
@@ -11,8 +11,7 @@ public partial class PackageService : IStylesResourcesInfo
     private readonly Lazy<IStylesService> _stylesService;
 
     public PackageService(
-        Lazy<IXmlModConfigConverterService> converterService, 
-        Lazy<ILegacyConfigService> legacyConfigService,
+        Lazy<IModConfigParserService> configParserService,
         Lazy<ILuaScriptService> luaScriptService,
         Lazy<ILocalizationService> localizationService,
         Lazy<IPluginService> pluginService,
@@ -22,8 +21,7 @@ public PackageService(
         IStorageService storageService,
         ILoggerService loggerService)
     {
-        _modConfigConverterService = converterService;
-        _legacyConfigService = legacyConfigService;
+        _configParserService = configParserService;
         _luaScriptService = luaScriptService;
         _localizationService = localizationService;
         _pluginService = pluginService;
@@ -36,7 +34,7 @@ public PackageService(
 
     public ImmutableArray<IStylesResourceInfo> StylesResourceInfos => ModConfigInfo?.StylesResourceInfos ?? ImmutableArray<IStylesResourceInfo>.Empty;
 
-    public void LoadStyles([NotNull]IStylesResourcesInfo stylesInfo)
+    public FluentResults.Result LoadStyles([NotNull]IStylesResourcesInfo stylesInfo)
     {
         throw new NotImplementedException();
     }   

diff --git a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/PackageService.cs b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/Services/PackageService.cs
@@ -8,8 +8,7 @@ namespace Barotrauma.LuaCs.Services;
 public partial class PackageService
 {
     public PackageService(
-        Lazy<IXmlModConfigConverterService> converterService, 
-        Lazy<ILegacyConfigService> legacyConfigService,
+        Lazy<IModConfigParserService> configParserService,
         Lazy<ILuaScriptService> luaScriptService,
         Lazy<ILocalizationService> localizationService,
         Lazy<IPluginService> pluginService,
@@ -18,8 +17,7 @@ public PackageService(
         IStorageService storageService,
         ILoggerService loggerService)
     {
-        _modConfigConverterService = converterService;
-        _legacyConfigService = legacyConfigService;
+        _configParserService = configParserService;
         _luaScriptService = luaScriptService;
         _localizationService = localizationService;
         _pluginService = pluginService;