From b8441e5a87ba1fc7ff39822c7d6f45268f0b478c Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 2 Dec 2021 21:37:58 -0500 Subject: [PATCH 1/4] fix sig: JobGaugeData --- Dalamud/Game/ClientState/ClientStateAddressResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs index 11b77e2df..c5b5d5fb9 100644 --- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs +++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs @@ -94,7 +94,7 @@ namespace Dalamud.Game.ClientState this.GroupManager = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 80 B8 ?? ?? ?? ?? ?? 76 50"); this.LocalContentId = sig.GetStaticAddressFromSig("48 0F 44 05 ?? ?? ?? ?? 48 39 07"); - this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 0D ?? ?? ?? ?? 48 85 C9 74 43") + 0x8; + this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 48 85 FF 0F 84 ?? ?? ?? ?? 0F B6 05 ?? ?? ?? ??") + 0x8; this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??"); From 2d804e51591c8c7fa0c6dde62b497322b60dd634 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 2 Dec 2021 21:38:12 -0500 Subject: [PATCH 2/4] fix docstring, missing bracket --- .../Plugin/Internal/Types/PluginManifest.cs | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Dalamud/Plugin/Internal/Types/PluginManifest.cs b/Dalamud/Plugin/Internal/Types/PluginManifest.cs index 537535d4b..5083d7e4c 100644 --- a/Dalamud/Plugin/Internal/Types/PluginManifest.cs +++ b/Dalamud/Plugin/Internal/Types/PluginManifest.cs @@ -157,23 +157,24 @@ namespace Dalamud.Plugin.Internal.Types /// public List? ImageUrls { get; init; } - /// - /// Gets an URL for the plugin's icon. - /// - public string? IconUrl { get; init; } + /// + /// Gets an URL for the plugin's icon. + /// + public string? IconUrl { get; init; } - /// - /// Gets a value that indicates whether or not this plugin accepts feedback. - /// - public bool AcceptsFeedback { get; init; } = true; + /// + /// Gets a value indicating whether this plugin accepts feedback. + /// + public bool AcceptsFeedback { get; init; } = true; - /// - /// Gets a message that is shown to users when sending feedback. - /// - public string? FeedbackMessage { get; init; } + /// + /// Gets a message that is shown to users when sending feedback. + /// + public string? FeedbackMessage { get; init; } - /// - /// Gets a value indicating the webhook URL feedback is sent to. - /// - public string? FeedbackWebhook { get; init; } + /// + /// Gets a value indicating the webhook URL feedback is sent to. + /// + public string? FeedbackWebhook { get; init; } + } } From 8208a62941d22e88c67d0550004c0c3bb0921ad5 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 2 Dec 2021 21:53:09 -0500 Subject: [PATCH 3/4] fix sig: SetupTerritoryType --- Dalamud/Game/ClientState/ClientStateAddressResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs index c5b5d5fb9..6eab41a33 100644 --- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs +++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs @@ -96,7 +96,7 @@ namespace Dalamud.Game.ClientState this.LocalContentId = sig.GetStaticAddressFromSig("48 0F 44 05 ?? ?? ?? ?? 48 39 07"); this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 48 85 FF 0F 84 ?? ?? ?? ?? 0F B6 05 ?? ?? ?? ??") + 0x8; - this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??"); + this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??"); // These resolve to fixed offsets only, without the base address added in, so GetStaticAddressFromSig() can't be used. // lea rcx, ds:1DB9F74h[rax*4] KeyboardState From adeed62b6848157ce645e1f10008086295646aa2 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 2 Dec 2021 22:55:01 -0500 Subject: [PATCH 4/4] update JobGauge sig --- Dalamud/Game/ClientState/ClientStateAddressResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs index 6eab41a33..64b7f5d4c 100644 --- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs +++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs @@ -94,7 +94,7 @@ namespace Dalamud.Game.ClientState this.GroupManager = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 80 B8 ?? ?? ?? ?? ?? 76 50"); this.LocalContentId = sig.GetStaticAddressFromSig("48 0F 44 05 ?? ?? ?? ?? 48 39 07"); - this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 48 85 FF 0F 84 ?? ?? ?? ?? 0F B6 05 ?? ?? ?? ??") + 0x8; + this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 33 ED") + 0x8; this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??");