Merge branch 'Release2.0.0.1'

Glyceri · Jul 26, 2024 · c53b74c · c53b74c
2 parents 9293620 + 2007927
commit c53b74c
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 427 deletions.
diff --git a/PetNicknames/Configuration.cs b/PetNicknames/Configuration.cs
@@ -46,7 +46,6 @@ internal class Configuration : IPluginConfiguration
     public bool showOnTargetBars = true;
     public bool showOnPartyList = true;
     // --------------------------- UI SETTINGS ---------------------------
-    public bool quickButtonsToggle = false;
     public bool showKofiButton = true;
     public float petNicknamesUIScale = 1.5f;
     public bool uiFlare = true;

diff --git a/PetNicknames/PetNicknames.csproj b/PetNicknames/PetNicknames.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>Glyceri</Authors>
     <Company></Company>
-    <Version>2.0.0.0</Version>
+    <Version>2.0.0.1</Version>
     <Description>A pet nickname plugin.</Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Glyceri/FFXIVPetRenamer</PackageProjectUrl>

diff --git a/PetNicknames/PetNicknames/Hooking/HookTypes/SimpleTextHook.cs b/PetNicknames/PetNicknames/Hooking/HookTypes/SimpleTextHook.cs
@@ -55,15 +55,11 @@ public virtual void Setup(DalamudServices services, IPettableUserList userList,
 
     void OnName(INamesDatabase nameDatabase)
     {
-        if (lastPettableUser == null) return;
-        if (lastPettableUser.DataBaseEntry.ActiveDatabase != nameDatabase) return;
         SetDirty();
     }
 
     void OnEntry(IPettableDatabaseEntry entry)
     {
-        if (lastPettableUser == null) return;
-        if (lastPettableUser.DataBaseEntry != entry) return;
         SetDirty();
     }
 

diff --git a/PetNicknames/PetNicknames/PettableDatabase/PettableDirtyHandler.cs b/PetNicknames/PetNicknames/PettableDatabase/PettableDirtyHandler.cs
@@ -1,5 +1,4 @@
 using PetRenamer.PetNicknames.PettableDatabase.Interfaces;
-using PetRenamer.PetNicknames.Services;
 using System;
 
 namespace PetRenamer.PetNicknames.PettableDatabase;
@@ -11,13 +10,6 @@ internal class PettableDirtyHandler : IPettableDirtyListener, IPettableDirtyCall
     Action<IPettableDatabaseEntry>? OnClear = _ => { };
     Action<INamesDatabase>? OnName = _ => { };
 
-    readonly DalamudServices DalamudServices;
-
-    public PettableDirtyHandler(DalamudServices dalamudServices)
-    {
-        DalamudServices = dalamudServices;
-    }
-
     public void ClearEntry(in IPettableDatabaseEntry entry)
     {
         OnClear?.Invoke(entry);

diff --git a/PetNicknames/PetNicknames/PettableDatabase/PettableNameDatabase.cs b/PetNicknames/PetNicknames/PettableDatabase/PettableNameDatabase.cs
@@ -8,11 +8,11 @@ namespace PetRenamer.PetNicknames.PettableDatabase;
 
 internal class PettableNameDatabase : INamesDatabase
 {
-    public int[] IDs { get; private set; } = new int[0];
-    public string[] Names { get; private set; } = new string[0];
+    public int[] IDs { get; private set; } = [];
+    public string[] Names { get; private set; } = [];
     public int Length { get => IDs.Length; }
 
-    IPettableDirtyCaller? DirtyCaller = null;
+    readonly IPettableDirtyCaller? DirtyCaller = null;
 
     public PettableNameDatabase(int[] ids, string[] names, in IPettableDirtyCaller dirtyCaller)
     {

diff --git a/PetNicknames/PetNicknames/Serialization/SaveHandler.cs b/PetNicknames/PetNicknames/Serialization/SaveHandler.cs
@@ -1,22 +1,19 @@
 using PetRenamer.PetNicknames.IPC.Interfaces;
 using PetRenamer.PetNicknames.PettableDatabase.Interfaces;
 using PetRenamer.PetNicknames.PettableUsers.Interfaces;
-using PetRenamer.PetNicknames.Services;
 using System;
 
 namespace PetRenamer.PetNicknames.Serialization;
 
 internal class SaveHandler : IDisposable
 {
-    readonly DalamudServices DalamudServices;
     readonly Configuration Configuration;
     readonly IPettableUserList UserList;
     readonly IIpcProvider IpcProvider;
     readonly IPettableDirtyListener DirtyListener;
 
-    public SaveHandler(in DalamudServices dalamudServices, in Configuration configuration, in IPettableUserList userList, in IIpcProvider ipcProvider, in IPettableDirtyListener dirtyListener)
+    public SaveHandler(in Configuration configuration, in IPettableUserList userList, in IIpcProvider ipcProvider, in IPettableDirtyListener dirtyListener)
     {
-        DalamudServices = dalamudServices;
         Configuration = configuration;
         UserList = userList;
         IpcProvider = ipcProvider;

diff --git a/PetNicknames/PetNicknames/Services/ServiceWrappers/Structs/PetSheetData.cs b/PetNicknames/PetNicknames/Services/ServiceWrappers/Structs/PetSheetData.cs
@@ -98,20 +98,17 @@ readonly string GermanReplace(string baseString, sbyte pronoun)
     {
         try
         {
-            baseString = baseString.Replace("[p]", "");
-            baseString = baseString.Replace("[a]", checked(pronounList[pronoun]));
-            return baseString;
-        }
-        catch
-        {
-            return baseString;
-        }
+            baseString = baseString.Replace("[p]", "", System.StringComparison.InvariantCultureIgnoreCase);
+            baseString = baseString.Replace("[a]", checked(pronounList[pronoun]), System.StringComparison.InvariantCultureIgnoreCase);   
+        } catch { }
+
+        return baseString;
     }
 
     readonly string[] pronounList = ["er", "e", "es", "en"];
     readonly string[] englishStarters = ["the ", string.Empty];
     readonly string[] germanStarters = ["den ", "des ", "dem ", "die ", "der ", "das ", string.Empty];
-    readonly string[] frenchStarters = ["le ", "la ", string.Empty];
+    readonly string[] frenchStarters = ["le ", "la ", "l'", string.Empty];
     readonly string[] japaneseStarters = [string.Empty];
 
     readonly string[] GetList(ClientLanguage clientLanguage) => clientLanguage switch