fix: BaseAddressResolver should take a ISigScanner instead

This commit is contained in:
goat 2023-10-05 23:15:34 +02:00
parent 2405dca9e1
commit db5b9d1b83
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
16 changed files with 21 additions and 21 deletions

View file

@ -14,7 +14,7 @@ internal class AddonEventManagerAddressResolver : BaseAddressResolver
/// Scan for and setup any configured address pointers.
/// </summary>
/// <param name="scanner">The signature scanner to facilitate setup.</param>
protected override void Setup64Bit(SigScanner scanner)
protected override void Setup64Bit(ISigScanner scanner)
{
this.UpdateCursor = scanner.ScanText("48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 20 4C 8B F1 E8 ?? ?? ?? ?? 49 8B CE");
}

View file

@ -48,7 +48,7 @@ internal class AddonLifecycleAddressResolver : BaseAddressResolver
/// Scan for and setup any configured address pointers.
/// </summary>
/// <param name="sig">The signature scanner to facilitate setup.</param>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.AddonSetup = sig.ScanText("FF 90 ?? ?? ?? ?? 48 8B 93 ?? ?? ?? ?? 80 8B");
this.AddonSetup2 = sig.ScanText("FF 90 ?? ?? ?? ?? 48 8B 03 48 8B CB 80 8B");

View file

@ -18,7 +18,7 @@ public abstract class BaseAddressResolver
public static Dictionary<string, List<(string ClassName, IntPtr Address)>> DebugScannedValues { get; } = new();
/// <summary>
/// Gets or sets a value indicating whether the resolver has successfully run <see cref="Setup32Bit(SigScanner)"/> or <see cref="Setup64Bit(SigScanner)"/>.
/// Gets or sets a value indicating whether the resolver has successfully run <see cref="Setup32Bit(ISigScanner)"/> or <see cref="Setup64Bit(ISigScanner)"/>.
/// </summary>
protected bool IsResolved { get; set; }
@ -26,7 +26,7 @@ public abstract class BaseAddressResolver
/// Setup the resolver, calling the appropriate method based on the process architecture.
/// </summary>
/// <param name="scanner">The SigScanner instance.</param>
public void Setup(SigScanner scanner)
public void Setup(ISigScanner scanner)
{
// Because C# don't allow to call virtual function while in ctor
// we have to do this shit :\
@ -83,7 +83,7 @@ public abstract class BaseAddressResolver
/// Setup the resolver by finding any necessary memory addresses.
/// </summary>
/// <param name="scanner">The SigScanner instance.</param>
protected virtual void Setup32Bit(SigScanner scanner)
protected virtual void Setup32Bit(ISigScanner scanner)
{
throw new NotSupportedException("32 bit version is not supported.");
}
@ -92,7 +92,7 @@ public abstract class BaseAddressResolver
/// Setup the resolver by finding any necessary memory addresses.
/// </summary>
/// <param name="scanner">The SigScanner instance.</param>
protected virtual void Setup64Bit(SigScanner scanner)
protected virtual void Setup64Bit(ISigScanner scanner)
{
throw new NotSupportedException("64 bit version is not supported.");
}
@ -101,7 +101,7 @@ public abstract class BaseAddressResolver
/// Setup the resolver by finding any necessary memory addresses.
/// </summary>
/// <param name="scanner">The SigScanner instance.</param>
protected virtual void SetupInternal(SigScanner scanner)
protected virtual void SetupInternal(ISigScanner scanner)
{
// Do nothing
}

View file

@ -79,7 +79,7 @@ internal sealed class ClientStateAddressResolver : BaseAddressResolver
/// Scan for and setup any configured address pointers.
/// </summary>
/// <param name="sig">The signature scanner to facilitate setup.</param>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.ObjectTable = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 44 0F B6 83 ?? ?? ?? ?? C6 83 ?? ?? ?? ?? ??");

View file

@ -11,7 +11,7 @@ internal sealed class GameConfigAddressResolver : BaseAddressResolver
public nint ConfigChangeAddress { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner scanner)
protected override void Setup64Bit(ISigScanner scanner)
{
this.ConfigChangeAddress = scanner.ScanText("E8 ?? ?? ?? ?? 48 8B 3F 49 3B 3E");
}

View file

@ -14,7 +14,7 @@ internal class DutyStateAddressResolver : BaseAddressResolver
/// Scan for and setup any configured address pointers.
/// </summary>
/// <param name="sig">The signature scanner to facilitate setup.</param>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.ContentDirectorNetworkMessage = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8B D9 49 8B F8 41 0F B7 08");
}

View file

@ -23,12 +23,12 @@ internal sealed class FrameworkAddressResolver : BaseAddressResolver
public IntPtr TickAddress { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.SetupFramework(sig);
}
private void SetupFramework(SigScanner scanner)
private void SetupFramework(ISigScanner scanner)
{
this.DestroyAddress =
scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B 3D ?? ?? ?? ?? 48 8B D9 48 85 FF");

View file

@ -83,7 +83,7 @@ internal sealed class ChatGuiAddressResolver : BaseAddressResolver
*/
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
// PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24D8FEFFFF 4881EC28020000 488B05???????? 4833C4 488985F0000000 4532D2 48894C2448"); LAST PART FOR 5.1???
this.PrintMessage = sig.ScanText("40 55 53 56 41 54 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC 20 02 00 00 48 8B 05");

View file

@ -21,7 +21,7 @@ internal class FlyTextGuiAddressResolver : BaseAddressResolver
public IntPtr CreateFlyText { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.AddFlyText = sig.ScanText("E8 ?? ?? ?? ?? FF C7 41 D1 C7");
this.CreateFlyText = sig.ScanText("40 53 55 41 56 48 83 EC 40 48 63 EA");

View file

@ -58,7 +58,7 @@ internal sealed class GameGuiAddressResolver : BaseAddressResolver
public IntPtr Utf8StringFromSequence { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.SetGlobalBgm = sig.ScanText("4C 8B 15 ?? ?? ?? ?? 4D 85 D2 74 58");
this.HandleItemHover = sig.ScanText("E8 ?? ?? ?? ?? 48 8B 5C 24 ?? 48 89 AE ?? ?? ?? ?? 48 89 AE ?? ?? ?? ??");

View file

@ -11,7 +11,7 @@ internal class PartyFinderAddressResolver : BaseAddressResolver
public IntPtr ReceiveListing { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.ReceiveListing = sig.ScanText("40 53 41 57 48 83 EC 28 48 8B D9");
}

View file

@ -21,7 +21,7 @@ internal class ToastGuiAddressResolver : BaseAddressResolver
public IntPtr ShowErrorToast { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.ShowNormalToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 30 83 3D ?? ?? ?? ?? ??");
this.ShowQuestToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 40 83 3D ?? ?? ?? ?? ??");

View file

@ -28,7 +28,7 @@ internal class SwapChainVtableResolver : BaseAddressResolver, ISwapChainAddressR
public bool IsReshade { get; private set; }
/// <inheritdoc/>
protected override unsafe void Setup64Bit(SigScanner sig)
protected override unsafe void Setup64Bit(ISigScanner sig)
{
Device* kernelDev;
SwapChain* swapChain;

View file

@ -20,7 +20,7 @@ internal sealed class LibcFunctionAddressResolver : BaseAddressResolver
public IntPtr StdStringDeallocate { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
this.StdStringFromCstring = sig.ScanText("48 89 5C 24 08 48 89 74 24 10 57 48 83 EC 20 48 8D 41 22 66 C7 41 20 01 01 48 89 01 49 8B D8");
this.StdStringDeallocate = sig.ScanText("80 79 21 00 75 12 48 8B 51 08 41 B8 33 00 00 00 48 8B 09 E9 ?? ?? ?? 00 C3");

View file

@ -16,7 +16,7 @@ internal sealed class GameNetworkAddressResolver : BaseAddressResolver
public IntPtr ProcessZonePacketUp { get; private set; }
/// <inheritdoc/>
protected override void Setup64Bit(SigScanner sig)
protected override void Setup64Bit(ISigScanner sig)
{
// ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83 EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 7A FF 0F B7 57 02 8D 42 89 3D 5F 02 00 00 0F 87 60 01 00 00 4C 8D 05");
// ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83 EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 73 FF 0F B7 57 02 8D 42 ?? 3D ?? ?? 00 00 0F 87 60 01 00 00 4C 8D 05");

View file

@ -45,7 +45,7 @@ internal class NetworkHandlersAddressResolver : BaseAddressResolver
public nint BuildMarketBoardPurchaseHandlerPacket { get; set; }
/// <inheritdoc />
protected override void Setup64Bit(SigScanner scanner)
protected override void Setup64Bit(ISigScanner scanner)
{
this.CfPopPacketHandler = scanner.ScanText("40 53 57 48 83 EC 78 48 8B D9 48 8D 0D");
this.MarketBoardHistoryPacketHandler = scanner.ScanText(