feat: allow cherry-picking hooks
This commit is contained in:
parent
0a5b54a145
commit
d8417b53da
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Text;
|
|
||||||
using Dalamud.Game;
|
using Dalamud.Game;
|
||||||
using Dalamud.Game.Text.SeStringHandling;
|
using Dalamud.Game.Text.SeStringHandling;
|
||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
@ -9,6 +8,7 @@ namespace XivCommon.Functions {
|
|||||||
public class BattleTalk : IDisposable {
|
public class BattleTalk : IDisposable {
|
||||||
private GameFunctions Functions { get; }
|
private GameFunctions Functions { get; }
|
||||||
private SeStringManager SeStringManager { get; }
|
private SeStringManager SeStringManager { get; }
|
||||||
|
private bool Enabled { get; }
|
||||||
|
|
||||||
public delegate void BattleTalkEventDelegate(ref SeString sender, ref SeString message, ref BattleTalkOptions options, ref bool isHandled);
|
public delegate void BattleTalkEventDelegate(ref SeString sender, ref SeString message, ref BattleTalkOptions options, ref bool isHandled);
|
||||||
|
|
||||||
@ -16,11 +16,16 @@ namespace XivCommon.Functions {
|
|||||||
|
|
||||||
private delegate byte AddBattleTalkDelegate(IntPtr uiModule, IntPtr sender, IntPtr message, float duration, byte style);
|
private delegate byte AddBattleTalkDelegate(IntPtr uiModule, IntPtr sender, IntPtr message, float duration, byte style);
|
||||||
|
|
||||||
private Hook<AddBattleTalkDelegate> AddBattleTextHook { get; }
|
private Hook<AddBattleTalkDelegate>? AddBattleTextHook { get; }
|
||||||
|
|
||||||
internal BattleTalk(GameFunctions functions, SigScanner scanner, SeStringManager seStringManager) {
|
internal BattleTalk(GameFunctions functions, SigScanner scanner, SeStringManager seStringManager, bool hook) {
|
||||||
this.Functions = functions;
|
this.Functions = functions;
|
||||||
this.SeStringManager = seStringManager;
|
this.SeStringManager = seStringManager;
|
||||||
|
this.Enabled = hook;
|
||||||
|
|
||||||
|
if (!hook) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var addBattleTextPtr = scanner.ScanText("48 89 5C 24 ?? 57 48 83 EC 50 48 8B 01 49 8B D8 0F 29 74 24 ?? 48 8B FA 0F 28 F3 FF 50 40 C7 44 24 ?? ?? ?? ?? ??");
|
var addBattleTextPtr = scanner.ScanText("48 89 5C 24 ?? 57 48 83 EC 50 48 8B 01 49 8B D8 0F 29 74 24 ?? 48 8B FA 0F 28 F3 FF 50 40 C7 44 24 ?? ?? ?? ?? ??");
|
||||||
this.AddBattleTextHook = new Hook<AddBattleTalkDelegate>(addBattleTextPtr, new AddBattleTalkDelegate(this.AddBattleTalkDetour));
|
this.AddBattleTextHook = new Hook<AddBattleTalkDelegate>(addBattleTextPtr, new AddBattleTalkDelegate(this.AddBattleTalkDetour));
|
||||||
@ -28,7 +33,7 @@ namespace XivCommon.Functions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
this.AddBattleTextHook.Dispose();
|
this.AddBattleTextHook?.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe byte AddBattleTalkDetour(IntPtr uiModule, IntPtr senderPtr, IntPtr messagePtr, float duration, byte style) {
|
private unsafe byte AddBattleTalkDetour(IntPtr uiModule, IntPtr senderPtr, IntPtr messagePtr, float duration, byte style) {
|
||||||
@ -58,7 +63,7 @@ namespace XivCommon.Functions {
|
|||||||
var finalMessage = message.Encode().Terminate();
|
var finalMessage = message.Encode().Terminate();
|
||||||
|
|
||||||
fixed (byte* fSenderPtr = finalSender, fMessagePtr = finalMessage) {
|
fixed (byte* fSenderPtr = finalSender, fMessagePtr = finalMessage) {
|
||||||
return this.AddBattleTextHook.Original(uiModule, (IntPtr) fSenderPtr, (IntPtr) fMessagePtr, options.Duration, (byte) options.Style);
|
return this.AddBattleTextHook!.Original(uiModule, (IntPtr) fSenderPtr, (IntPtr) fMessagePtr, options.Duration, (byte) options.Style);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,6 +72,10 @@ namespace XivCommon.Functions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void Show(byte[] sender, byte[] message, BattleTalkOptions? options) {
|
private void Show(byte[] sender, byte[] message, BattleTalkOptions? options) {
|
||||||
|
if (!this.Enabled) {
|
||||||
|
throw new InvalidOperationException("BattleTalk hooks are not enabled");
|
||||||
|
}
|
||||||
|
|
||||||
if (sender.Length == 0) {
|
if (sender.Length == 0) {
|
||||||
throw new ArgumentException("sender cannot be empty", nameof(sender));
|
throw new ArgumentException("sender cannot be empty", nameof(sender));
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using Dalamud.Game;
|
using Dalamud.Game;
|
||||||
using Dalamud.Game.Internal.Gui;
|
|
||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
|
|
||||||
namespace XivCommon.Functions {
|
namespace XivCommon.Functions {
|
||||||
@ -9,28 +8,40 @@ namespace XivCommon.Functions {
|
|||||||
private delegate byte RequestPartyFinderListingsDelegate(IntPtr agent, byte categoryIdx);
|
private delegate byte RequestPartyFinderListingsDelegate(IntPtr agent, byte categoryIdx);
|
||||||
|
|
||||||
private RequestPartyFinderListingsDelegate RequestPartyFinderListings { get; }
|
private RequestPartyFinderListingsDelegate RequestPartyFinderListings { get; }
|
||||||
private Hook<RequestPartyFinderListingsDelegate> RequestPfListingsHook { get; }
|
private Hook<RequestPartyFinderListingsDelegate>? RequestPfListingsHook { get; }
|
||||||
|
|
||||||
|
private bool Enabled { get; }
|
||||||
private IntPtr PartyFinderAgent { get; set; } = IntPtr.Zero;
|
private IntPtr PartyFinderAgent { get; set; } = IntPtr.Zero;
|
||||||
|
|
||||||
internal PartyFinder(SigScanner scanner) {
|
internal PartyFinder(SigScanner scanner, bool hook) {
|
||||||
var requestPfPtr = scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 40 0F 10 81 ?? ?? ?? ??");
|
var requestPfPtr = scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 40 0F 10 81 ?? ?? ?? ??");
|
||||||
|
|
||||||
this.RequestPartyFinderListings = Marshal.GetDelegateForFunctionPointer<RequestPartyFinderListingsDelegate>(requestPfPtr);
|
this.RequestPartyFinderListings = Marshal.GetDelegateForFunctionPointer<RequestPartyFinderListingsDelegate>(requestPfPtr);
|
||||||
|
|
||||||
|
this.Enabled = hook;
|
||||||
|
|
||||||
|
if (!hook) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.RequestPfListingsHook = new Hook<RequestPartyFinderListingsDelegate>(requestPfPtr, new RequestPartyFinderListingsDelegate(this.OnRequestPartyFinderListings));
|
this.RequestPfListingsHook = new Hook<RequestPartyFinderListingsDelegate>(requestPfPtr, new RequestPartyFinderListingsDelegate(this.OnRequestPartyFinderListings));
|
||||||
this.RequestPfListingsHook.Enable();
|
this.RequestPfListingsHook.Enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
this.RequestPfListingsHook.Dispose();
|
this.RequestPfListingsHook?.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private byte OnRequestPartyFinderListings(IntPtr agent, byte categoryIdx) {
|
private byte OnRequestPartyFinderListings(IntPtr agent, byte categoryIdx) {
|
||||||
this.PartyFinderAgent = agent;
|
this.PartyFinderAgent = agent;
|
||||||
return this.RequestPfListingsHook.Original(agent, categoryIdx);
|
return this.RequestPfListingsHook!.Original(agent, categoryIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RefreshListings() {
|
public void RefreshListings() {
|
||||||
|
if (!this.Enabled) {
|
||||||
|
throw new InvalidOperationException("PartyFinder hooks are not enabled");
|
||||||
|
}
|
||||||
|
|
||||||
// Updated 5.41
|
// Updated 5.41
|
||||||
const int categoryOffset = 10_655;
|
const int categoryOffset = 10_655;
|
||||||
|
|
||||||
|
@ -16,15 +16,15 @@ namespace XivCommon {
|
|||||||
public PartyFinder PartyFinder { get; }
|
public PartyFinder PartyFinder { get; }
|
||||||
public BattleTalk BattleTalk { get; }
|
public BattleTalk BattleTalk { get; }
|
||||||
|
|
||||||
internal GameFunctions(SigScanner scanner, SeStringManager seStringManager) {
|
internal GameFunctions(Hooks hooks, SigScanner scanner, SeStringManager seStringManager) {
|
||||||
this.UiModulePtr = scanner.GetStaticAddressFromSig("48 8B 0D ?? ?? ?? ?? 48 8D 54 24 ?? 48 83 C1 10 E8 ?? ?? ?? ??");
|
this.UiModulePtr = scanner.GetStaticAddressFromSig("48 8B 0D ?? ?? ?? ?? 48 8D 54 24 ?? 48 83 C1 10 E8 ?? ?? ?? ??");
|
||||||
|
|
||||||
var getUiModulePtr = scanner.ScanText("E8 ?? ?? ?? ?? 83 3B 01");
|
var getUiModulePtr = scanner.ScanText("E8 ?? ?? ?? ?? 83 3B 01");
|
||||||
this.InternalGetUiModule = Marshal.GetDelegateForFunctionPointer<GetUiModuleDelegate>(getUiModulePtr);
|
this.InternalGetUiModule = Marshal.GetDelegateForFunctionPointer<GetUiModuleDelegate>(getUiModulePtr);
|
||||||
|
|
||||||
this.Chat = new Chat(this, scanner);
|
this.Chat = new Chat(this, scanner);
|
||||||
this.PartyFinder = new PartyFinder(scanner);
|
this.PartyFinder = new PartyFinder(scanner, hooks.HasFlag(Hooks.PartyFinder));
|
||||||
this.BattleTalk = new BattleTalk(this, scanner, seStringManager);
|
this.BattleTalk = new BattleTalk(this, scanner, seStringManager, hooks.HasFlag(Hooks.BattleTalk));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
|
14
XivCommon/Hooks.cs
Executable file
14
XivCommon/Hooks.cs
Executable file
@ -0,0 +1,14 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace XivCommon {
|
||||||
|
[Flags]
|
||||||
|
public enum Hooks {
|
||||||
|
None,
|
||||||
|
BattleTalk,
|
||||||
|
PartyFinder,
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static class HooksExt {
|
||||||
|
internal const Hooks DefaultHooks = Hooks.None;
|
||||||
|
}
|
||||||
|
}
|
@ -1,14 +1,12 @@
|
|||||||
using System;
|
using System;
|
||||||
using Dalamud.Game;
|
|
||||||
using Dalamud.Game.Text.SeStringHandling;
|
|
||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
|
|
||||||
namespace XivCommon {
|
namespace XivCommon {
|
||||||
public class XivCommonBase : IDisposable {
|
public class XivCommonBase : IDisposable {
|
||||||
public GameFunctions Functions { get; }
|
public GameFunctions Functions { get; }
|
||||||
|
|
||||||
public XivCommonBase(DalamudPluginInterface @interface) {
|
public XivCommonBase(DalamudPluginInterface @interface, Hooks hooks = HooksExt.DefaultHooks) {
|
||||||
this.Functions = new GameFunctions(@interface.TargetModuleScanner, @interface.SeStringManager);
|
this.Functions = new GameFunctions(hooks, @interface.TargetModuleScanner, @interface.SeStringManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
|
Loading…
Reference in New Issue
Block a user