Client rework for API change and paradigm shift (#39)

* most of the groups refactoring on client

* register OnMethods for group stuff

* start implementing client (still pretty broken)

* finish implementing new api first iteration

* idk rework everything for pair shit (still WIP); goal is to remove PairedClients and GroupPairClients from ApiController

* move everything to PairManager, remove dictionaries from APiController

* remove admin stuff from client, cleanup

* adjust reconnection handling, add new settings, todo still to remove access from old stuff that's marked obsolete from config

* add back adding servers, fix intro ui

* fix obsolete calls

* adjust config namespace

* add UI for setting animation/sound permissions to syncshells

* add ConfigurationService to hot reload config on change from external

* move transient data cache to configuration

* add deleting service to ui

* fix saving of transient resources

* fix group pair user assignments

* halt scanner when penumbra inactive, add visible/online/offline split to individual pairs and tags

* add presence to syncshell ui

* move fullpause from config to server config

* fixes in code style

* more codestyle

* show info icon on player in shells, don't show icon when no changes from default state are made, add online notifs

* fixes to intro UI

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>

MareSynchronos/Utils/Crypto.cs

@@ -1,34 +1,28 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using System.Text;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 
 namespace MareSynchronos.Utils;
 
-public class Crypto
+public static class Crypto
 {
     public static string GetFileHash(string filePath)
     {
-        using SHA1CryptoServiceProvider cryptoProvider = new();
-        return BitConverter.ToString(cryptoProvider.ComputeHash(File.ReadAllBytes(filePath))).Replace("-", "", StringComparison.Ordinal);
+        return BitConverter.ToString(SHA1.HashData(File.ReadAllBytes(filePath))).Replace("-", "", StringComparison.Ordinal);
     }
 
-    public static string GetHash(string stringToHash)
+    public static string GetHash(this string stringToHash)
     {
-        using SHA1CryptoServiceProvider cryptoProvider = new();
-        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
+        return BitConverter.ToString(SHA1.HashData(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
     }
 
-    public static string GetHash256(string stringToHash)
+    public static string GetHash256(this string stringToHash)
     {
-        using SHA256CryptoServiceProvider cryptoProvider = new();
-        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
+        return BitConverter.ToString(SHA256.HashData(Encoding.UTF8.GetBytes(stringToHash))).Replace("-", "", StringComparison.Ordinal);
     }
 
-    public static string GetHash256(PlayerCharacter character)
+    public static string GetHash256(this PlayerCharacter character)
     {
-        using SHA256CryptoServiceProvider cryptoProvider = new();
-        return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(character.Name + character.HomeWorld.Id.ToString()))).Replace("-", "", StringComparison.Ordinal);
+        return BitConverter.ToString(SHA256.HashData(Encoding.UTF8.GetBytes(character.Name + character.HomeWorld.Id.ToString()))).Replace("-", "", StringComparison.Ordinal);
     }
 }

MareSynchronos/Utils/DalamudLoggingProvider.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.Utils;

MareSynchronos/Utils/DalamudUtil.cs

@@ -1,40 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Dalamud.Game;
+using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.Gui;
 using Dalamud.Game.Text.SeStringHandling;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
+using Lumina.Excel.GeneratedSheets;
+using MareSynchronos.Delegates;
 using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
 
 
 namespace MareSynchronos.Utils;
 
-public delegate void PlayerChange(Dalamud.Game.ClientState.Objects.Types.Character actor);
-
-public delegate void VoidDelegate();
 
 public class DalamudUtil : IDisposable
 {
     private readonly ClientState _clientState;
     private readonly ObjectTable _objectTable;
     private readonly Framework _framework;
-    private readonly Condition _condition;
+    private readonly Dalamud.Game.ClientState.Conditions.Condition _condition;
     private readonly ChatGui _chatGui;
+    private readonly Dalamud.Data.DataManager _gameData;
 
     public event VoidDelegate? LogIn;
     public event VoidDelegate? LogOut;
     public event VoidDelegate? FrameworkUpdate;
     public event VoidDelegate? ClassJobChanged;
-    private uint? classJobId = 0;
+    private uint? _classJobId = 0;
     public event VoidDelegate? DelayedFrameworkUpdate;
     public event VoidDelegate? ZoneSwitchStart;
     public event VoidDelegate? ZoneSwitchEnd;
@@ -58,21 +52,31 @@ public class DalamudUtil : IDisposable
         return false;
     }
 
-    public DalamudUtil(ClientState clientState, ObjectTable objectTable, Framework framework, Condition condition, ChatGui chatGui)
+    public DalamudUtil(ClientState clientState, ObjectTable objectTable, Framework framework, Dalamud.Game.ClientState.Conditions.Condition condition, ChatGui chatGui,
+        Dalamud.Data.DataManager gameData)
     {
         _clientState = clientState;
         _objectTable = objectTable;
         _framework = framework;
         _condition = condition;
         _chatGui = chatGui;
+        _gameData = gameData;
         _framework.Update += FrameworkOnUpdate;
         if (IsLoggedIn)
         {
-            classJobId = _clientState.LocalPlayer!.ClassJob.Id;
-            ClientStateOnLogin(null, EventArgs.Empty);
+            _classJobId = _clientState.LocalPlayer!.ClassJob.Id;
+            ClientStateOnLogin(sender: null, EventArgs.Empty);
         }
+        WorldData = new(() =>
+        {
+            return gameData.GetExcelSheet<World>(Dalamud.ClientLanguage.English)!
+                .Where(w => w.IsPublic && !w.Name.RawData.IsEmpty)
+                .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
+        });
     }
 
+    public Lazy<Dictionary<ushort, string>> WorldData { get; private set; }
+
     public void PrintInfoChat(string message)
     {
         SeStringBuilder se = new SeStringBuilder().AddText("[Mare Synchronos] Info: ").AddItalics(message);
@@ -119,7 +123,8 @@ public class DalamudUtil : IDisposable
 
             return;
         }
-        else if (_sentBetweenAreas)
+
+        if (_sentBetweenAreas)
         {
             Logger.Debug("Zone switch/Gpose end");
             _sentBetweenAreas = false;
@@ -160,9 +165,9 @@ public class DalamudUtil : IDisposable
         {
             var newclassJobId = _clientState.LocalPlayer.ClassJob.Id;
 
-            if (classJobId != newclassJobId)
+            if (_classJobId != newclassJobId)
             {
-                classJobId = newclassJobId;
+                _classJobId = newclassJobId;
                 ClassJobChanged?.Invoke();
             }
         }
@@ -205,7 +210,7 @@ public class DalamudUtil : IDisposable
 
     public bool IsPlayerPresent => _clientState.LocalPlayer != null && _clientState.LocalPlayer.IsValid();
 
-    public bool IsObjectPresent(Dalamud.Game.ClientState.Objects.Types.GameObject? obj)
+    public static bool IsObjectPresent(Dalamud.Game.ClientState.Objects.Types.GameObject? obj)
     {
         return obj != null && obj.IsValid();
     }
@@ -218,18 +223,19 @@ public class DalamudUtil : IDisposable
     public unsafe IntPtr GetPet(IntPtr? playerPointer = null)
     {
         var mgr = CharacterManager.Instance();
-        if (playerPointer == null) playerPointer = PlayerPointer;
-        return (IntPtr)mgr->LookupPetByOwnerObject((FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)playerPointer);
+        playerPointer ??= PlayerPointer;
+        return (IntPtr)mgr->LookupPetByOwnerObject((BattleChara*)playerPointer);
     }
 
     public unsafe IntPtr GetCompanion(IntPtr? playerPointer = null)
     {
         var mgr = CharacterManager.Instance();
-        if (playerPointer == null) playerPointer = PlayerPointer;
-        return (IntPtr)mgr->LookupBuddyByOwnerObject((FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)playerPointer);
+        playerPointer ??= PlayerPointer;
+        return (IntPtr)mgr->LookupBuddyByOwnerObject((BattleChara*)playerPointer);
     }
 
     public string PlayerName => _clientState.LocalPlayer?.Name.ToString() ?? "--";
+    public uint WorldId => _clientState.LocalPlayer!.HomeWorld.Id;
 
     public IntPtr PlayerPointer => _clientState.LocalPlayer?.Address ?? IntPtr.Zero;
 
@@ -241,7 +247,7 @@ public class DalamudUtil : IDisposable
     {
         return _objectTable.Where(obj =>
             obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player &&
-            !string.Equals(obj.Name.ToString(), PlayerName, StringComparison.Ordinal)).Select(p => (PlayerCharacter)p).ToList();
+            !string.Equals(obj.Name.ToString(), PlayerName, StringComparison.Ordinal)).Cast<PlayerCharacter>().ToList();
     }
 
     public Dalamud.Game.ClientState.Objects.Types.Character? GetCharacterFromObjectTableByIndex(int index)

MareSynchronos/Utils/Logger.cs

@@ -1,26 +1,24 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using Dalamud.Logging;
 using Dalamud.Utility;
-using Lumina.Excel.GeneratedSheets;
 using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.Utils;
 
 internal class Logger : ILogger
 {
-    private readonly string name;
+    private readonly string _name;
 
-    public static void Info(string info)
+    public static void Info(string? info)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
         PluginLog.Information($"[{caller}] {info}");
     }
 
-    public static void Debug(string debug, string stringToHighlight = "")
+    public static void Debug(string? debug, string stringToHighlight = "")
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
-        if (debug.Contains(stringToHighlight, StringComparison.Ordinal) && !stringToHighlight.IsNullOrEmpty())
+        if (debug != null && debug.Contains(stringToHighlight, StringComparison.Ordinal) && !stringToHighlight.IsNullOrEmpty())
         {
             PluginLog.Warning($"[{caller}] {debug}");
         }
@@ -30,31 +28,31 @@ internal class Logger : ILogger
         }
     }
 
-    public static void Error(string msg, Exception ex)
+    public static void Error(string? msg, Exception ex)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
         PluginLog.Error($"[{caller}] {msg} {Environment.NewLine} Exception: {ex.Message} {Environment.NewLine} {ex.StackTrace}");
     }
 
-    public static void Warn(string msg, Exception ex)
+    public static void Warn(string? msg, Exception ex)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
         PluginLog.Warning($"[{caller}] {msg} {Environment.NewLine} Exception: {ex.Message} {Environment.NewLine} {ex.StackTrace}");
     }
 
-    public static void Error(string msg)
+    public static void Error(string? msg)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
         PluginLog.Error($"[{caller}] {msg}");
     }
 
-    public static void Warn(string warn)
+    public static void Warn(string? warn)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
         PluginLog.Warning($"[{caller}] {warn}");
     }
 
-    public static void Verbose(string verbose)
+    public static void Verbose(string? verbose)
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
 #if DEBUG
@@ -66,7 +64,7 @@ internal class Logger : ILogger
 
     public Logger(string name)
     {
-        this.name = name;
+        this._name = name;
     }
 
     public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
@@ -76,22 +74,22 @@ internal class Logger : ILogger
         switch (logLevel)
         {
             case LogLevel.Debug:
-                PluginLog.Debug($"[{name}] [{eventId}] {formatter(state, exception)}");
+                PluginLog.Debug($"[{_name}] [{eventId}] {formatter(state, exception)}");
                 break;
             case LogLevel.Error:
             case LogLevel.Critical:
-                PluginLog.Error($"[{name}] [{eventId}] {formatter(state, exception)}");
+                PluginLog.Error($"[{_name}] [{eventId}] {formatter(state, exception)}");
                 break;
             case LogLevel.Information:
-                PluginLog.Information($"[{name}] [{eventId}] {formatter(state, exception)}");
+                PluginLog.Information($"[{_name}] [{eventId}] {formatter(state, exception)}");
                 break;
             case LogLevel.Warning:
-                PluginLog.Warning($"[{name}] [{eventId}] {formatter(state, exception)}");
+                PluginLog.Warning($"[{_name}] [{eventId}] {formatter(state, exception)}");
                 break;
             case LogLevel.Trace:
             default:
 #if DEBUG
-                PluginLog.Verbose($"[{name}] [{eventId}] {formatter(state, exception)}");
+                PluginLog.Verbose($"[{_name}] [{eventId}] {formatter(state, exception)}");
 #else
                 PluginLog.Verbose($"[{name}] {eventId} {state} {formatter(state, exception)}");
 #endif

MareSynchronos/Utils/VariousExtensions.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
 
 namespace MareSynchronos.Utils;
 
@@ -28,4 +26,9 @@ public static class VariousExtensions
 
         return default;
     }
+
+    public static T DeepClone<T>(this T obj)
+    {
+        return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(obj))!;
+    }
 }