1.7.1.5

API14

.gitea/workflows/release-clubpenguin-on-tag.yml

@@ -1,4 +1,4 @@
-name: Release 
+name: Build and Update Repo 
 
 on:
   push:
@@ -7,10 +7,10 @@ on:
 
 env:
   PLUGIN_NAME: ClubPenguinSync
-  DOTNET_VERSION: 9.x
+  DOTNET_VERSION: 10.x
 
 jobs:
-  tag-and-release:
+  build-and-update-repo:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -22,10 +22,10 @@ jobs:
         fetch-depth: 0
         submodules: true
 
-    - name: Setup .NET 9 SDK
+    - name: Setup .NET 10 SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
 
     - name: Download Dalamud
       run: |
@@ -79,7 +79,9 @@ jobs:
                 if .InternalName == $internalName
                 then
                   .DalamudApiLevel = $dalamudApiLevel
+                  | .TestingDalamudApiLevel = $dalamudApiLevel
                   | .AssemblyVersion = $version
+                  | .TestingAssemblyVersion = $version
                   | .DownloadLinkInstall = $downloadUrl
                   | .DownloadLinkTesting = $downloadUrl
                   | .DownloadLinkUpdate = $downloadUrl

MareSynchronos/Interop/GameChatHooks.cs

@@ -3,6 +3,7 @@ using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Hooking;
 using Dalamud.Memory;
 using Dalamud.Plugin.Services;
+using Dalamud.Utility;
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
@@ -26,7 +27,7 @@ public unsafe sealed class GameChatHooks : IDisposable
     // Based on https://git.anna.lgbt/anna/ExtraChat/src/branch/main/client/ExtraChat/GameFunctions.cs
 
     private readonly ILogger<GameChatHooks> _logger;
-    private readonly Action<int, byte[]> _ssCommandHandler;
+    private readonly Action<int, byte[]> _psCommandHandler;
 
     #region signatures
     #pragma warning disable CS0649
@@ -130,10 +131,10 @@ public unsafe sealed class GameChatHooks : IDisposable
         }
     }
 
-    public GameChatHooks(ILogger<GameChatHooks> logger, IGameInteropProvider gameInteropProvider, Action<int, byte[]> ssCommandHandler)
+    public GameChatHooks(ILogger<GameChatHooks> logger, IGameInteropProvider gameInteropProvider, Action<int, byte[]> psCommandHandler)
     {
         _logger = logger;
-        _ssCommandHandler = ssCommandHandler;
+        _psCommandHandler = psCommandHandler;
 
         logger.LogInformation("Initializing GameChatHooks");
         gameInteropProvider.InitializeFromAttributes(this);
@@ -209,19 +210,41 @@ public unsafe sealed class GameChatHooks : IDisposable
             if (isReply)
                 _nextMessageIsReply = utcNow + TimeSpan.FromMilliseconds(100);
 
-            // If it is a command, check if it begins with /ss first so we can handle the message directly
+            // If it is a command, check if it begins with /ps first so we can handle the message directly
             // Letting Dalamud handle the commands causes all of the special payloads to be dropped
-            if (isCommand && messageSpan.StartsWith(System.Text.Encoding.ASCII.GetBytes("/ss")))
+            if (isCommand && messageSpan.StartsWith(System.Text.Encoding.ASCII.GetBytes("/ps")))
             {
+                
                 for (int i = 1; i <= ChatService.CommandMaxNumber; ++i)
                 {
-                    var cmdString = $"/ss{i} ";
+                    var cmdString = $"/ps{i} ";
                     if (messageSpan.StartsWith(System.Text.Encoding.ASCII.GetBytes(cmdString)))
                     {
-                        var ssChatBytes = ProcessChatMessage(message);
+                        var psChatBytes = ProcessChatMessage(message);
-                        ssChatBytes = ssChatBytes.Skip(cmdString.Length).ToArray();
+                        psChatBytes = psChatBytes.Skip(cmdString.Length).ToArray();
-                        _ssCommandHandler?.Invoke(i, ssChatBytes);
+                        if (psChatBytes.Length > 0)
-                        return;
+                        {
+                            bool isBlank = true;
+                            int j;
+
+                            for (j = 0; j < psChatBytes.Length; j++)
+                            {
+                                if(!char.IsWhiteSpace((char)psChatBytes[j]))
+                                {
+                                    isBlank = false;
+                                    break;
+                                }
+                            }
+
+                            if (isBlank)
+                            {
+                                SendMessageHook!.OriginalDisposeSafe(thisPtr, message, uiModule);
+                                return;
+                            }
+
+                            _psCommandHandler?.Invoke(i, psChatBytes);
+                            return;
+                        }
                     }
                 }
             }

MareSynchronos/Interop/Ipc/IpcCallerHonorific.cs

@@ -14,6 +14,7 @@ public sealed class IpcCallerHonorific : IIpcCaller
     private readonly ICallGateSubscriber<int, object> _honorificClearCharacterTitle;
     private readonly ICallGateSubscriber<object> _honorificDisposing;
     private readonly ICallGateSubscriber<string> _honorificGetLocalCharacterTitle;
+    private readonly ICallGateSubscriber<int, string> _honorificGetCharacterTitle;
     private readonly ICallGateSubscriber<string, object> _honorificLocalCharacterTitleChanged;
     private readonly ICallGateSubscriber<object> _honorificReady;
     private readonly ICallGateSubscriber<int, string, object> _honorificSetCharacterTitle;
@@ -29,6 +30,7 @@ public sealed class IpcCallerHonorific : IIpcCaller
         _dalamudUtil = dalamudUtil;
         _honorificApiVersion = pi.GetIpcSubscriber<(uint, uint)>("Honorific.ApiVersion");
         _honorificGetLocalCharacterTitle = pi.GetIpcSubscriber<string>("Honorific.GetLocalCharacterTitle");
+        _honorificGetCharacterTitle = pi.GetIpcSubscriber<int, string>("Honorific.GetCharacterTitle");
         _honorificClearCharacterTitle = pi.GetIpcSubscriber<int, object>("Honorific.ClearCharacterTitle");
         _honorificSetCharacterTitle = pi.GetIpcSubscriber<int, string, object>("Honorific.SetCharacterTitle");
         _honorificLocalCharacterTitleChanged = pi.GetIpcSubscriber<string, object>("Honorific.LocalCharacterTitleChanged");
@@ -84,6 +86,23 @@ public sealed class IpcCallerHonorific : IIpcCaller
         return string.IsNullOrEmpty(title) ? string.Empty : Convert.ToBase64String(Encoding.UTF8.GetBytes(title));
     }
 
+    public async Task<string> GetTitleForPlayer(IntPtr character)
+    {
+        if (!APIAvailable) return string.Empty;
+
+        string title = await _dalamudUtil.RunOnFrameworkThread(() =>
+        {
+            var gameObj = _dalamudUtil.CreateGameObject(character);
+            if (gameObj is IPlayerCharacter pc)
+            {
+                return _honorificGetCharacterTitle.InvokeFunc(pc.ObjectIndex);
+            }
+            return string.Empty;
+        }).ConfigureAwait(false);
+
+        return string.IsNullOrEmpty(title) ? string.Empty : Convert.ToBase64String(Encoding.UTF8.GetBytes(title));
+    }
+
     public async Task SetTitleAsync(IntPtr character, string honorificDataB64)
     {
         if (!APIAvailable) return;

MareSynchronos/Interop/Ipc/IpcCallerOtherSync.cs

@@ -28,9 +28,9 @@ public sealed class IpcCallerOtherSync : DisposableMediatorSubscriberBase
             _lightlessLoaded = msg.IsLoaded;
         });
 
-        _snowcloakLoaded = PluginWatcherService.GetInitialPluginState(pi, "SnowcloakSync")?.IsLoaded ?? false;
+        _snowcloakLoaded = PluginWatcherService.GetInitialPluginState(pi, "Snowcloak")?.IsLoaded ?? false;
 
-        Mediator.SubscribeKeyed<PluginChangeMessage>(this, "SnowcloakSync", (msg) =>
+        Mediator.SubscribeKeyed<PluginChangeMessage>(this, "Snowcloak", (msg) =>
         {
             _snowcloakLoaded = msg.IsLoaded;
         });

MareSynchronos/MareSynchronos.csproj

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/13.1.0">
+<Project Sdk="Dalamud.NET.Sdk/14.0.0">
   <PropertyGroup>
     <AssemblyName>ClubPenguinSync</AssemblyName>
-    <Version>1.7.1.1</Version>
+    <Version>1.7.1.5</Version>
     <PackageProjectUrl>https://github.com/Rawrington/ClubPenguinSync/</PackageProjectUrl>
   </PropertyGroup>
 

MareSynchronos/PlayerData/Handlers/PairHandler.cs

@@ -149,7 +149,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     public string? PlayerName { get; private set; }
     public string PlayerNameHash => Pair.Ident;
 
-    public void ApplyCharacterData(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization = false)
+    public async void ApplyCharacterData(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization = false)
     {
         if (_configService.Current.HoldCombatApplication && _dalamudUtil.IsInCombatOrPerforming)
         {
@@ -175,7 +175,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             Logger.LogDebug("[BASE-{appBase}] Received data but player was in invalid state, charaHandlerIsNull: {charaIsNull}, playerPointerIsNull: {ptrIsNull}",
                 applicationBase, _charaHandler == null, PlayerCharacter == IntPtr.Zero);
             var hasDiffMods = characterData.CheckUpdatedData(applicationBase, _cachedData, Logger,
-                this, forceApplyCustomization, forceApplyMods: false)
+                this, forceApplyCustomization, forceApplyMods: false, string.Empty)
                 .Any(p => p.Value.Contains(PlayerChanges.ModManip) || p.Value.Contains(PlayerChanges.ModFiles));
             _forceApplyMods = hasDiffMods || _forceApplyMods || (PlayerCharacter == IntPtr.Zero && _cachedData == null);
             _cachedData = characterData;
@@ -201,7 +201,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 $"Not applying character data: {reasons}")));
             Logger.LogDebug("[BASE-{appBase}] Not applying due to hold: {reasons}", applicationBase, reasons);
             var hasDiffMods = characterData.CheckUpdatedData(applicationBase, _cachedData, Logger,
-                this, forceApplyCustomization, forceApplyMods: false)
+                this, forceApplyCustomization, forceApplyMods: false, _ipcManager.Honorific.GetTitleForPlayer(PlayerCharacter).GetAwaiter().GetResult())
                 .Any(p => p.Value.Contains(PlayerChanges.ModManip) || p.Value.Contains(PlayerChanges.ModFiles));
             _forceApplyMods = hasDiffMods || _forceApplyMods || (PlayerCharacter == IntPtr.Zero && _cachedData == null);
             _cachedData = characterData;
@@ -228,7 +228,8 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
         _forceApplyMods |= forceApplyCustomization;
 
-        var charaDataToUpdate = characterData.CheckUpdatedData(applicationBase, _cachedData?.DeepClone() ?? new(), Logger, this, forceApplyCustomization, _forceApplyMods);
+        string oldHonorificTitle = _ipcManager.Honorific.GetTitleForPlayer(PlayerCharacter).GetAwaiter().GetResult();
+        var charaDataToUpdate = characterData.CheckUpdatedData(applicationBase, _cachedData?.DeepClone() ?? new(), Logger, this, forceApplyCustomization, _forceApplyMods, oldHonorificTitle);
 
         if (_charaHandler != null && _forceApplyMods)
         {

MareSynchronos/Services/ChatService.cs

@@ -72,7 +72,7 @@ public class ChatService : DisposableMediatorSubscriberBase
     {
         var chatMsg = message.ChatMsg;
         var prefix = new SeStringBuilder();
-        prefix.AddText("[BnnuyChat] ");
+        prefix.AddText("[PenguinChat] ");
         _chatGui.Print(new XivChatEntry{
             MessageBytes = [..prefix.Build().Encode(), ..message.ChatMsg.PayloadContent],
             Name = chatMsg.SenderName,
@@ -121,7 +121,7 @@ public class ChatService : DisposableMediatorSubscriberBase
         }
         if (color != 0)
             msg.AddUiForeground((ushort)color);
-        msg.AddText($"[SS{shellNumber}]<");
+        msg.AddText($"[PS{shellNumber}]<");
         if (message.ChatMsg.Sender.UID.Equals(_apiController.UID, StringComparison.Ordinal))
         {
             // Don't link to your own character
@@ -179,7 +179,7 @@ public class ChatService : DisposableMediatorSubscriberBase
                 if (_gameChatHooks.IsValueCreated && _gameChatHooks.Value.ChatChannelOverride != null)
                 {
                     // Very dumb and won't handle re-numbering -- need to identify the active chat channel more reliably later
-                    if (_gameChatHooks.Value.ChatChannelOverride.ChannelName.StartsWith($"SS [{shellNumber}]", StringComparison.Ordinal))
+                    if (_gameChatHooks.Value.ChatChannelOverride.ChannelName.StartsWith($"PS [{shellNumber}]", StringComparison.Ordinal))
                         SwitchChatShell(shellNumber);
                 }
             }
@@ -200,7 +200,7 @@ public class ChatService : DisposableMediatorSubscriberBase
                 // BUG: This doesn't always update the chat window e.g. when renaming a group
                 _gameChatHooks.Value.ChatChannelOverride = new()
                 {
-                    ChannelName = $"SS [{shellNumber}]: {name}",
+                    ChannelName = $"PS [{shellNumber}]: {name}",
                     ChatMessageHandler = chatBytes => SendChatShell(shellNumber, chatBytes)
                 };
                 return;

MareSynchronos/Services/CommandManagerService.cs

@@ -1,5 +1,6 @@
 using Dalamud.Game.Command;
 using Dalamud.Plugin.Services;
+using Dalamud.Utility;
 using MareSynchronos.FileCache;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;
@@ -17,7 +18,7 @@ public sealed class CommandManagerService : IDisposable
     private const string _commandName = "/sync";
     private const string _commandName2 = "/clubpenguin";
 
-    private const string _ssCommandPrefix = "/ss";
+    private const string _psCommandPrefix = "/ps";
 
     private readonly ApiController _apiController;
     private readonly ICommandManager _commandManager;
@@ -52,7 +53,7 @@ public sealed class CommandManagerService : IDisposable
         // Lazy registration of all possible /ss# commands which tbf is what the game does for linkshells anyway
         for (int i = 1; i <= ChatService.CommandMaxNumber; ++i)
         {
-            _commandManager.AddHandler($"{_ssCommandPrefix}{i}", new CommandInfo(OnChatCommand)
+            _commandManager.AddHandler($"{_psCommandPrefix}{i}", new CommandInfo(OnChatCommand)
             {
                 ShowInHelp = false
             });
@@ -65,7 +66,7 @@ public sealed class CommandManagerService : IDisposable
         _commandManager.RemoveHandler(_commandName2);
 
         for (int i = 1; i <= ChatService.CommandMaxNumber; ++i)
-            _commandManager.RemoveHandler($"{_ssCommandPrefix}{i}");
+            _commandManager.RemoveHandler($"{_psCommandPrefix}{i}");
     }
 
     private void OnCommand(string command, string args)
@@ -139,9 +140,9 @@ public sealed class CommandManagerService : IDisposable
         if (_mareConfigService.Current.DisableSyncshellChat)
             return;
 
-        int shellNumber = int.Parse(command[_ssCommandPrefix.Length..]);
+        int shellNumber = int.Parse(command[_psCommandPrefix.Length..]);
 
-        if (args.Length == 0)
+        if (args.Length == 0 || args.IsNullOrWhitespace())
         {
             _chatService.SwitchChatShell(shellNumber);
         }

MareSynchronos/Services/DalamudUtilService.cs

@@ -7,6 +7,7 @@ using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
+using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using Lumina.Excel.Sheets;
@@ -139,7 +140,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             _ = RunOnFrameworkThread(() =>
             {
                 var addr = GetPlayerCharacterFromCachedTableByIdent(ident);
-                var pc = _clientState.LocalPlayer!;
+                var pc = _objectTable.LocalPlayer!;
                 var gobj = CreateGameObject(addr);
                 // Any further than roughly 55y is out of range for targetting
                 if (gobj != null && Vector3.Distance(pc.Position, gobj.Position) < 55.0f)
@@ -243,7 +244,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool GetIsPlayerPresent()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer != null && _clientState.LocalPlayer.IsValid();
+        return _objectTable.LocalPlayer != null && _objectTable.LocalPlayer.IsValid();
     }
 
     public async Task<bool> GetIsPlayerPresentAsync()
@@ -287,7 +288,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public IPlayerCharacter GetPlayerCharacter()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer!;
+        return _objectTable.LocalPlayer!;
     }
 
     public IntPtr GetPlayerCharacterFromCachedTableByName(string characterName)
@@ -309,7 +310,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public string GetPlayerName()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer?.Name.ToString() ?? "--";
+        return _objectTable.LocalPlayer?.Name.ToString() ?? "--";
     }
 
     public async Task<string> GetPlayerNameAsync()
@@ -325,7 +326,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public IntPtr GetPlayerPointer()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer?.Address ?? IntPtr.Zero;
+        return _objectTable.LocalPlayer?.Address ?? IntPtr.Zero;
     }
 
     public async Task<IntPtr> GetPlayerPointerAsync()
@@ -336,13 +337,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public uint GetHomeWorldId()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer?.HomeWorld.RowId ?? 0;
+        return _objectTable.LocalPlayer?.HomeWorld.RowId ?? 0;
     }
 
     public uint GetWorldId()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer!.CurrentWorld.RowId;
+        return _objectTable.LocalPlayer!.CurrentWorld.RowId;
     }
 
     public unsafe LocationInfo GetMapData()
@@ -351,8 +352,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         var agentMap = AgentMap.Instance();
         var houseMan = HousingManager.Instance();
         uint serverId = 0;
-        if (_clientState.LocalPlayer == null) serverId = 0;
+        if (_objectTable.LocalPlayer == null) serverId = 0;
-        else serverId = _clientState.LocalPlayer.CurrentWorld.RowId;
+        else serverId = _objectTable.LocalPlayer.CurrentWorld.RowId;
         uint mapId = agentMap == null ? 0 : agentMap->CurrentMapId;
         uint territoryId = agentMap == null ? 0 : agentMap->CurrentTerritoryId;
         uint divisionId = houseMan == null ? 0 : (uint)(houseMan->GetCurrentDivision());
@@ -473,7 +474,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         _framework.Update += ClubPenguinSync.Plugin.Self.OnFrameworkUpdate;
         if (IsLoggedIn)
         {
-            _classJobId = _clientState.LocalPlayer!.ClassJob.RowId;
+            _classJobId = _objectTable.LocalPlayer!.ClassJob.RowId;
         }
 
         _logger.LogInformation("Started DalamudUtilService");
@@ -582,7 +583,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         bool isDrawingChanged = false;
         if ((nint)drawObj != IntPtr.Zero)
         {
-            isDrawing = gameObj->RenderFlags == 0b100000000000;
+            isDrawing = gameObj->RenderFlags == VisibilityFlags.Model;
             if (!isDrawing)
             {
                 isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
@@ -635,7 +636,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     private unsafe void FrameworkOnUpdateInternal()
     {
-        if (_clientState.LocalPlayer?.IsDead ?? false)
+        if (_objectTable.LocalPlayer?.IsDead ?? false)
         {
             return;
         }
@@ -764,7 +765,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
             }
 
-            var localPlayer = _clientState.LocalPlayer;
+            var localPlayer = _objectTable.LocalPlayer;
             if (localPlayer != null)
             {
                 _classJobId = localPlayer.ClassJob.RowId;

MareSynchronos/UI/Components/GroupPanel.cs

@@ -246,7 +246,7 @@ internal sealed class GroupPanel
             if (!_mareConfig.Current.DisableSyncshellChat && shellConfig.Enabled)
             {
                 ImGui.TextUnformatted($"[{shellNumber}]");
-                UiSharedService.AttachToolTip("Chat command prefix: /ss" + shellNumber);
+                UiSharedService.AttachToolTip("Chat command prefix: /ps" + shellNumber);
             }
             if (textIsGid) ImGui.PushFont(UiBuilder.MonoFont);
             ImGui.SameLine();

MareSynchronos/Utils/VariousExtensions.cs

@@ -56,7 +56,7 @@ public static class VariousExtensions
     }
 
     public static Dictionary<ObjectKind, HashSet<PlayerChanges>> CheckUpdatedData(this CharacterData newData, Guid applicationBase,
-        CharacterData? oldData, ILogger logger, PairHandler cachedPlayer, bool forceApplyCustomization, bool forceApplyMods)
+        CharacterData? oldData, ILogger logger, PairHandler cachedPlayer, bool forceApplyCustomization, bool forceApplyMods, string oldHonorificData)
     {
         oldData ??= new();
         var charaDataToUpdate = new Dictionary<ObjectKind, HashSet<PlayerChanges>>();
@@ -182,7 +182,7 @@ public static class VariousExtensions
                 charaDataToUpdate[objectKind].Add(PlayerChanges.Heels);
             }
 
-            bool honorificDataDifferent = !string.Equals(oldData.HonorificData, newData.HonorificData, StringComparison.Ordinal);
+            bool honorificDataDifferent = !string.Equals(oldHonorificData, newData.HonorificData, StringComparison.Ordinal);
             if (honorificDataDifferent || (forceApplyCustomization && !string.IsNullOrEmpty(newData.HonorificData)))
             {
                 logger.LogDebug("[BASE-{appBase}] Updating {object}/{kind} (Diff honorific data) => {change}", applicationBase, cachedPlayer, objectKind, PlayerChanges.Honorific);