From 52cbb94cb0abe56c4008b6f7efc1517811029e96 Mon Sep 17 00:00:00 2001 From: "j.katzwinkel@posteo.de" Date: Thu, 21 Nov 2024 12:09:47 +0100 Subject: [PATCH] Update to Dalamud API 11 and FFXIV 7.1 --- Echosync/Echosync.csproj | 2 +- Echosync/Helper/AddonTalkHelper.cs | 1 + Echosync/Helper/ClickHelper.cs | 4 +++- Echosync/Helper/SyncClientHelper.cs | 3 ++- Echosync/packages.lock.json | 6 +++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Echosync/Echosync.csproj b/Echosync/Echosync.csproj index 2bd2028..ebbdd94 100644 --- a/Echosync/Echosync.csproj +++ b/Echosync/Echosync.csproj @@ -3,7 +3,7 @@ - 0.0.0.3 + 0.1.0.0 Echosync https://github.com/RenNagasaki/Echosync AGPL-3.0-or-later diff --git a/Echosync/Helper/AddonTalkHelper.cs b/Echosync/Helper/AddonTalkHelper.cs index 3d2dd8b..31e607f 100644 --- a/Echosync/Helper/AddonTalkHelper.cs +++ b/Echosync/Helper/AddonTalkHelper.cs @@ -128,6 +128,7 @@ private unsafe void OnPreReceiveEvent(AddonEvent type, AddonArgs args) if (!config.Enabled) return; if (condition[ConditionFlag.OccupiedSummoningBell]) return; if (!condition[ConditionFlag.OccupiedInQuestEvent] && !condition[ConditionFlag.OccupiedInCutSceneEvent] && !condition[ConditionFlag.OccupiedInEvent]) return; + if (!SyncClientHelper.Connected || SyncClientHelper.ConnectedPlayersDialogue < 2) return; if (args is not AddonReceiveEventArgs receiveEventArgs) return; LogHelper.Info(MethodBase.GetCurrentMethod().Name, $"Param: {receiveEventArgs.EventParam} Type: {receiveEventArgs.AtkEventType} B: {receiveEventArgs.AtkEvent}", SyncClientHelper.CurrentEvent); diff --git a/Echosync/Helper/ClickHelper.cs b/Echosync/Helper/ClickHelper.cs index c7030a2..08e0f43 100644 --- a/Echosync/Helper/ClickHelper.cs +++ b/Echosync/Helper/ClickHelper.cs @@ -18,7 +18,9 @@ public static void ClickDialogue(nint addon, EKEventId eventId) new() { Listener = (AtkEventListener*)unitBase, - Flags = 132, + State = new AtkEventState() { + StateFlags = AtkEventStateFlags.Completed | AtkEventStateFlags.Unk3, + }, Target = &AtkStage.Instance()->AtkEventTarget } }; diff --git a/Echosync/Helper/SyncClientHelper.cs b/Echosync/Helper/SyncClientHelper.cs index cfee06a..488b331 100644 --- a/Echosync/Helper/SyncClientHelper.cs +++ b/Echosync/Helper/SyncClientHelper.cs @@ -152,7 +152,8 @@ public static void CreateMessage(SyncMessages message, string dialogue = "") return; } - var characterName = "|" + ClientState.LocalPlayer?.Name.TextValue + "@" + ClientState.LocalPlayer?.HomeWorld.Id ?? "TEST"; + var worldId = ClientState.LocalPlayer?.HomeWorld.Value.Name; + var characterName = "|" + ClientState.LocalPlayer?.Name.TextValue + "@" + worldId ?? "TEST"; var npcId = !string.IsNullOrWhiteSpace(AddonTalkHelper.ActiveNpcId) ? "|" + AddonTalkHelper.ActiveNpcId : ""; dialogue = !string.IsNullOrWhiteSpace(dialogue) ? "|" + dialogue : ""; diff --git a/Echosync/packages.lock.json b/Echosync/packages.lock.json index 1f10b9a..0c66ee9 100644 --- a/Echosync/packages.lock.json +++ b/Echosync/packages.lock.json @@ -4,9 +4,9 @@ "net8.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.13, )", - "resolved": "2.1.13", - "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ==" + "requested": "[11.0.0, )", + "resolved": "11.0.0", + "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" }, "WebSocketSharp": { "type": "Direct",