chore: update to apiX

kalilistic · Jun 30, 2024 · 45a29b5 · 45a29b5
1 parent bb9d495
commit 45a29b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Dalamud.Loc.Test/Dalamud.Loc.Test.csproj b/Dalamud.Loc.Test/Dalamud.Loc.Test.csproj
@@ -9,6 +9,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<IsPackable>false</IsPackable>
 		<NoWarn>1591</NoWarn>
+				<DalamudHome Condition=" '$(DALAMUD_HOME)' != '' ">$(DALAMUD_HOME)</DalamudHome>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220707-01" />
@@ -33,10 +34,11 @@
 		</PackageReference>
 	</ItemGroup>
    <ItemGroup>
-        <Reference Include="Dalamud">
-            <HintPath Condition="Exists('$(AppData)\XIVLauncher\addon\Hooks\dev')">$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
-            <HintPath Condition="Exists('/home/runner/Dalamud')">/home/runner/Dalamud/Dalamud.dll</HintPath>
-        </Reference>
+		<Reference Include="Dalamud">
+			<HintPath Condition=" '$(DALAMUD_HOME)' != '' AND Exists('$(DALAMUD_HOME)\Dalamud.dll')">$(DALAMUD_HOME)\Dalamud.dll</HintPath>
+			<HintPath Condition=" '$(DALAMUD_HOME)' == '' AND Exists('$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll')">$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
+			<HintPath Condition=" '$(DALAMUD_HOME)' == '' AND Exists('/home/runner/Dalamud/Dalamud.dll')">/home/runner/Dalamud/Dalamud.dll</HintPath>
+		</Reference>
         <Reference Include="Newtonsoft.Json">
             <HintPath Condition="Exists('$(AppData)\XIVLauncher\addon\Hooks\dev')">$(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
             <HintPath Condition="Exists('/home/runner/Dalamud')">/home/runner/Dalamud/Newtonsoft.Json.dll</HintPath>

diff --git a/Dalamud.Loc/Dalamud.Loc.csproj b/Dalamud.Loc/Dalamud.Loc.csproj
@@ -43,11 +43,12 @@
 		</AdditionalFiles>
 	</ItemGroup>
    <ItemGroup>
-        <Reference Include="Dalamud">
-            <HintPath Condition="Exists('$(AppData)\XIVLauncher\addon\Hooks\dev')">$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
-            <HintPath Condition="Exists('/home/runner/Dalamud')">/home/runner/Dalamud/Dalamud.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
+		<Reference Include="Dalamud">
+			<HintPath Condition=" '$(DALAMUD_HOME)' != '' AND Exists('$(DALAMUD_HOME)\Dalamud.dll')">$(DALAMUD_HOME)\Dalamud.dll</HintPath>
+			<HintPath Condition=" '$(DALAMUD_HOME)' == '' AND Exists('$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll')">$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
+			<HintPath Condition=" '$(DALAMUD_HOME)' == '' AND Exists('/home/runner/Dalamud/Dalamud.dll')">/home/runner/Dalamud/Dalamud.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
         <Reference Include="Newtonsoft.Json">
             <HintPath Condition="Exists('$(AppData)\XIVLauncher\addon\Hooks\dev')">$(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
             <HintPath Condition="Exists('/home/runner/Dalamud')">/home/runner/Dalamud/Newtonsoft.Json.dll</HintPath>

diff --git a/Dalamud.Loc/Localization.cs b/Dalamud.Loc/Localization.cs
@@ -19,7 +19,7 @@ public class Localization : ILocalization
 {
     // ReSharper disable once CollectionNeverQueried.Local
     private readonly Dictionary<Language, Dictionary<string, string>> strings = new ();
-    private readonly DalamudPluginInterface? pluginInterface;
+    private readonly IDalamudPluginInterface? pluginInterface;
     private readonly HttpClient httpClient;
     private readonly Dictionary<string, Language> languageCodes = new ();
     private Language currentLanguage;
@@ -29,7 +29,7 @@ public class Localization : ILocalization
     /// </summary>
     /// <param name="pluginInterface">Dalamud plugin interface.</param>
     /// <param name="httpClient">httpClient (will init if not passed).</param>
-    public Localization(DalamudPluginInterface? pluginInterface = null, HttpClient? httpClient = null)
+    public Localization(IDalamudPluginInterface? pluginInterface = null, HttpClient? httpClient = null)
     {
         if (pluginInterface != null)
         {