Update to api 10

Olaren15 · Jul 2, 2024 · 5c1322e · 5c1322e
1 parent 2bd991a
commit 5c1322e
Show file tree

Hide file tree

Showing 20 changed files with 147 additions and 109 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference
       Include="SonarAnalyzer.CSharp"
-      Version="9.25.1.91650"
+      Version="9.28.0.94264"
       PrivateAssets="all"
       Condition="$(MSBuildProjectExtension) == '.csproj'"
     />

diff --git a/EasyTranslate.DalamudPlugin/Configuration/DalamudPluginModule.cs b/EasyTranslate.DalamudPlugin/Configuration/DalamudPluginModule.cs
@@ -13,7 +13,7 @@ namespace EasyTranslate.DalamudPlugin.Configuration;
 
 public static class DalamudPluginModule
 {
-    public static ServiceProvider CreateServiceProvider(DalamudPluginInterface pluginInterface)
+    public static ServiceProvider CreateServiceProvider(IDalamudPluginInterface pluginInterface)
     {
         return new ServiceCollection()
             .AddDalamudServices(pluginInterface)
@@ -25,7 +25,7 @@ public static ServiceProvider CreateServiceProvider(DalamudPluginInterface plugi
 
     private static IServiceCollection AddDalamudServices(
         this IServiceCollection serviceCollection,
-        DalamudPluginInterface pluginInterface
+        IDalamudPluginInterface pluginInterface
     )
     {
         return serviceCollection
@@ -67,7 +67,7 @@ private static IServiceCollection AddDalamudService<T>(this IServiceCollection s
         serviceCollection.AddSingleton(
             serviceProvider =>
             {
-                DalamudPluginInterface? pluginInterface = serviceProvider.GetService<DalamudPluginInterface>();
+                IDalamudPluginInterface? pluginInterface = serviceProvider.GetService<IDalamudPluginInterface>();
                 DalamudServiceWrapper<T> wrapper = new(pluginInterface!);
                 return wrapper.Service;
             }

diff --git a/EasyTranslate.DalamudPlugin/Configuration/DalamudServiceWrapper.cs b/EasyTranslate.DalamudPlugin/Configuration/DalamudServiceWrapper.cs
@@ -7,12 +7,10 @@ namespace EasyTranslate.DalamudPlugin.Configuration;
 
 public class DalamudServiceWrapper<T>
 {
-    public DalamudServiceWrapper(DalamudPluginInterface pluginInterface)
+    public DalamudServiceWrapper(IDalamudPluginInterface pluginInterface)
     {
         pluginInterface.Inject(this);
     }
 
-    [PluginService]
-    [RequiredVersion("1.0")]
-    public T Service { get; init; }
+    [PluginService] public T Service { get; init; }
 }
diff --git a/EasyTranslate.DalamudPlugin/EasyTranslatePlugin.cs b/EasyTranslate.DalamudPlugin/EasyTranslatePlugin.cs
@@ -3,7 +3,6 @@
 using System.Reflection;
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
-using Dalamud.IoC;
 using Dalamud.Plugin;
 using EasyTranslate.DalamudPlugin.Attributes;
 using EasyTranslate.DalamudPlugin.Configuration;
@@ -15,14 +14,14 @@ namespace EasyTranslate.DalamudPlugin;
 public sealed class EasyTranslatePlugin : IDalamudPlugin
 {
     private readonly ServiceProvider _serviceProvider;
-    private readonly UiBuilder _uiBuilder;
+    private readonly IUiBuilder _uiBuilder;
     private readonly WindowSystem _windowSystem;
 
-    public EasyTranslatePlugin([RequiredVersion("1.0")] DalamudPluginInterface pluginInterface)
+    public EasyTranslatePlugin(IDalamudPluginInterface pluginInterface)
     {
         _serviceProvider = DalamudPluginModule.CreateServiceProvider(pluginInterface);
         _windowSystem = _serviceProvider.GetService<WindowSystem>()!;
-        _uiBuilder = _serviceProvider.GetService<UiBuilder>()!;
+        _uiBuilder = _serviceProvider.GetService<IUiBuilder>()!;
 
         _uiBuilder.Draw += _windowSystem.Draw;
 

diff --git a/EasyTranslate.DalamudPlugin/Localisation/LanguageSwitcher.cs b/EasyTranslate.DalamudPlugin/Localisation/LanguageSwitcher.cs
@@ -7,9 +7,9 @@ namespace EasyTranslate.DalamudPlugin.Localisation;
 
 public sealed class LanguageSwitcher : IDisposable
 {
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
 
-    public LanguageSwitcher(DalamudPluginInterface pluginInterface)
+    public LanguageSwitcher(IDalamudPluginInterface pluginInterface)
     {
         _pluginInterface = pluginInterface;
 

diff --git a/EasyTranslate.DalamudPlugin/Search/ContentMapper.cs b/EasyTranslate.DalamudPlugin/Search/ContentMapper.cs
@@ -12,7 +12,7 @@ private PresentableContent ConvertToPresentableItem(Content content)
         return new PresentableContent(
             content.Type,
             content.IconId,
-            content.IconId.HasValue ? textureProvider.GetIcon(content.IconId.Value) : null,
+            content.IconId.HasValue ? textureProvider.GetFromGameIcon(content.IconId.Value) : null,
             content.EnglishName,
             content.FrenchName,
             content.GermanName,

diff --git a/EasyTranslate.DalamudPlugin/Search/PresentableContent.cs b/EasyTranslate.DalamudPlugin/Search/PresentableContent.cs
@@ -1,12 +1,12 @@
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures;
 using EasyTranslate.Domain.Entities;
 
 namespace EasyTranslate.DalamudPlugin.Search;
 
 public record PresentableContent(
     ContentType Type,
     uint? IconId,
-    IDalamudTextureWrap? IconTexture,
+    ISharedImmediateTexture? IconTexture,
     string EnglishName,
     string FrenchName,
     string GermanName,

diff --git a/EasyTranslate.DalamudPlugin/Search/SearchContextMenuItem.cs b/EasyTranslate.DalamudPlugin/Search/SearchContextMenuItem.cs
@@ -55,7 +55,7 @@ private MenuItem CreateMenuItem()
         };
     }
 
-    private void SearchTranslations(MenuItemClickedArgs menuItemClickedArgs)
+    private void SearchTranslations(IMenuItemClickedArgs menuItemClickedArgs)
     {
         if (menuItemClickedArgs.MenuType != ContextMenuType.Inventory)
         {

diff --git a/EasyTranslate.DalamudPlugin/Search/SearchView.cs b/EasyTranslate.DalamudPlugin/Search/SearchView.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
 using Dalamud.Interface;
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Windowing;
 using EasyTranslate.DalamudPlugin.Localisation;
 using EasyTranslate.DalamudPlugin.Resources;
@@ -13,14 +13,14 @@ public sealed class SearchView : Window, IDisposable
 {
     private const int MaxImageSize = 80;
     private readonly SearchViewModel _searchViewModel;
-    private readonly UiBuilder _uiBuilder;
+    private readonly IUiBuilder _uiBuilder;
     private readonly WindowSystem _windowSystem;
 
     private bool _windowJustOpened;
 
     public SearchView(
         SearchViewModel searchViewModel,
-        UiBuilder uiBuilder,
+        IUiBuilder uiBuilder,
         WindowSystem windowSystem,
         LanguageSwitcher languageSwitcher
     ) : base(Strings.SearchWindowTitle)
@@ -126,7 +126,8 @@ private void DrawSearchResults()
                 ImGui.TableNextColumn();
                 if (searchResult.IconTexture is not null)
                 {
-                    ImGui.Image(searchResult.IconTexture.ImGuiHandle, CalculateImageSize(searchResult.IconTexture));
+                    IDalamudTextureWrap textureWrap = searchResult.IconTexture.GetWrapOrEmpty();
+                    ImGui.Image(textureWrap.ImGuiHandle, CalculateImageSize(textureWrap));
                 }
 
                 ImGui.TableNextColumn();

diff --git a/EasyTranslate.DalamudPlugin/Settings/SettingsView.cs b/EasyTranslate.DalamudPlugin/Settings/SettingsView.cs
@@ -12,12 +12,12 @@ namespace EasyTranslate.DalamudPlugin.Settings;
 public sealed class SettingsView : Window, IDisposable
 {
     private readonly SettingsViewModel _settingsViewModel;
-    private readonly UiBuilder _uiBuilder;
+    private readonly IUiBuilder _uiBuilder;
     private readonly WindowSystem _windowSystem;
 
     public SettingsView(
         SettingsViewModel settingsViewModel,
-        UiBuilder uiBuilder,
+        IUiBuilder uiBuilder,
         WindowSystem windowSystem,
         LanguageSwitcher languageSwitcher
     ) : base(Strings.SettingsWindowTitle)

diff --git a/EasyTranslate.DalamudPlugin/Settings/UserSettingsRepository.cs b/EasyTranslate.DalamudPlugin/Settings/UserSettingsRepository.cs
@@ -1,4 +1,4 @@
-using Dalamud;
+using Dalamud.Game;
 using Dalamud.Game.Config;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
@@ -9,11 +9,11 @@ namespace EasyTranslate.DalamudPlugin.Settings;
 public class UserSettingsRepository
 {
     private readonly IGameConfig _gameConfig;
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
 
     private UserSettings _userSettings;
 
-    public UserSettingsRepository(DalamudPluginInterface pluginInterface, IGameConfig gameConfig)
+    public UserSettingsRepository(IDalamudPluginInterface pluginInterface, IGameConfig gameConfig)
     {
         _gameConfig = gameConfig;
         _pluginInterface = pluginInterface;

diff --git a/EasyTranslate.DalamudPlugin/packages.lock.json b/EasyTranslate.DalamudPlugin/packages.lock.json
@@ -4,9 +4,9 @@
         "net8.0-windows7.0": {
             "DalamudPackager": {
                 "type": "Direct",
-                "requested": "[2.1.12, )",
-                "resolved": "2.1.12",
-                "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+                "requested": "[2.1.13, )",
+                "resolved": "2.1.13",
+                "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
             },
             "Microsoft.Extensions.DependencyInjection": {
                 "type": "Direct",
@@ -19,9 +19,9 @@
             },
             "SonarAnalyzer.CSharp": {
                 "type": "Direct",
-                "requested": "[9.25.1.91650, )",
-                "resolved": "9.25.1.91650",
-                "contentHash": "Z1/H8vGk2FZ8m6TK++A1Tn5npEw0L0ZNVAgf0aPI/nkq4mTER+enRZcgrkhdSo1mGbFDFgEh5ym/j3Onk6mROA=="
+                "requested": "[9.28.0.94264, )",
+                "resolved": "9.28.0.94264",
+                "contentHash": "P5ri/HgukP7KPoN/Lo0njq0d5IdUMpiqHoDVT3QRauwwCWXk0ACmC3FNtMR0l4X4TzfqmIZV+SeSLIDijNp6sQ=="
             },
             "Microsoft.Extensions.DependencyInjection.Abstractions": {
                 "type": "Transitive",

diff --git a/EasyTranslate.Domain.Tests/EasyTranslate.Domain.Tests.csproj b/EasyTranslate.Domain.Tests/EasyTranslate.Domain.Tests.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
-    <PackageReference Include="xunit" Version="2.8.0"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageReference Include="xunit" Version="2.8.1"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/EasyTranslate.Infrastructure.Tests/EasyTranslate.Infrastructure.Tests.csproj b/EasyTranslate.Infrastructure.Tests/EasyTranslate.Infrastructure.Tests.csproj
@@ -9,8 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
     <PackageReference Include="Moq" Version="4.20.70"/>
-    <PackageReference Include="xunit" Version="2.8.0"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageReference Include="xunit" Version="2.8.1"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/EasyTranslate.Integration.Tests/EasyTranslate.Integration.Tests.csproj b/EasyTranslate.Integration.Tests/EasyTranslate.Integration.Tests.csproj
@@ -11,8 +11,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
     <PackageReference Include="Snapshooter.Xunit" Version="0.14.1"/>
-    <PackageReference Include="xunit" Version="2.5.3"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
+    <PackageReference Include="xunit" Version="2.8.1"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...napshots__/SearchContentByNameTest.Action_SearchContentByName_ReturnsMatchingResults.snap b/...napshots__/SearchContentByNameTest.Action_SearchContentByName_ReturnsMatchingResults.snap
@@ -481,7 +481,7 @@
   },
   {
     "Type": "Instance",
-    "IconId": 61806,
+    "IconId": 61846,
     "EnglishName": "the Borderland Ruins (Secure)",
     "FrenchName": "les Ruines frontalières (annexion)",
     "GermanName": "Äußere Ruinen (Sicherung)",

diff --git a/...hContentByNameTest.ContentFinderCondition_SearchContentByName_ReturnsMatchingResults.snap b/...hContentByNameTest.ContentFinderCondition_SearchContentByName_ReturnsMatchingResults.snap
@@ -1,7 +1,7 @@
 [
   {
     "Type": "Instance",
-    "IconId": 61801,
+    "IconId": 61817,
     "EnglishName": "Sastasha",
     "FrenchName": "Sastasha",
     "GermanName": "Sastasha",
@@ -41,7 +41,7 @@
   },
   {
     "Type": "Instance",
-    "IconId": 61801,
+    "IconId": null,
     "EnglishName": "Sastasha (Hard)",
     "FrenchName": "Sastasha (brutal)",
     "GermanName": "Sastasha (schwer)",