chore: bump to 1.7.2
This commit is contained in:
parent
9d7b099b14
commit
e9a250bf57
|
@ -8,14 +8,14 @@ using System.Runtime.InteropServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Dalamud.Game.Text.SeStringHandling;
|
using Dalamud.Game.Text.SeStringHandling;
|
||||||
using Dalamud.Memory;
|
using Dalamud.Memory;
|
||||||
using Siggingway;
|
using Dalamud.Utility.Signatures;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.System.Framework;
|
||||||
using XIVChatCommon.Message;
|
using XIVChatCommon.Message;
|
||||||
using XIVChatCommon.Message.Server;
|
using XIVChatCommon.Message.Server;
|
||||||
|
|
||||||
namespace XIVChatPlugin {
|
namespace XIVChatPlugin {
|
||||||
internal class GameFunctions : IDisposable {
|
internal unsafe class GameFunctions : IDisposable {
|
||||||
private static class Signatures {
|
private static class Signatures {
|
||||||
internal const string GetUiModule = "E8 ?? ?? ?? ?? 48 83 7F ?? 00 48 8B F0";
|
|
||||||
internal const string ProcessChat = "48 89 5C 24 ?? 57 48 83 EC 20 48 8B FA 48 8B D9 45 84 C9";
|
internal const string ProcessChat = "48 89 5C 24 ?? 57 48 83 EC 20 48 8B FA 48 8B D9 45 84 C9";
|
||||||
internal const string Input = "80 B9 ?? ?? ?? ?? ?? 0F 9C C0";
|
internal const string Input = "80 B9 ?? ?? ?? ?? ?? 0F 9C C0";
|
||||||
internal const string InputAfk = "E8 ?? ?? ?? ?? 0F 28 74 24 ?? 0F B6 F0";
|
internal const string InputAfk = "E8 ?? ?? ?? ?? 0F 28 74 24 ?? 0F B6 F0";
|
||||||
|
@ -30,8 +30,6 @@ namespace XIVChatPlugin {
|
||||||
internal const string ChannelNameChange = "E8 ?? ?? ?? ?? BA ?? ?? ?? ?? 48 8D 4D B0 48 8B F8 E8 ?? ?? ?? ?? 41 8B D6";
|
internal const string ChannelNameChange = "E8 ?? ?? ?? ?? BA ?? ?? ?? ?? 48 8D 4D B0 48 8B F8 E8 ?? ?? ?? ?? 41 8B D6";
|
||||||
internal const string XivStringCtor = "E8 ?? ?? ?? ?? 44 2B F7";
|
internal const string XivStringCtor = "E8 ?? ?? ?? ?? 44 2B F7";
|
||||||
internal const string XivStringDtor = "E8 ?? ?? ?? ?? B0 6E";
|
internal const string XivStringDtor = "E8 ?? ?? ?? ?? B0 6E";
|
||||||
internal const string UiModule = "48 8B 0D ?? ?? ?? ?? 48 8D 54 24 ?? 48 83 C1 10 E8";
|
|
||||||
internal const string ColourHandler = "48 8B 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8B 0D ?? ?? ?? ?? 48 85 C9 0F 84 ?? ?? ?? ?? 66 85 DB 0F 94 C2 E8 ?? ?? ?? ?? E9";
|
|
||||||
internal const string ColourLookup = "48 8D 0D ?? ?? ?? ?? 8B 14 ?? 85 D2 7E ?? 48 8B 0D ?? ?? ?? ?? 48 83 C1 10 E8 ?? ?? ?? ?? 8B 70 ?? 41 8D 4D";
|
internal const string ColourLookup = "48 8D 0D ?? ?? ?? ?? 8B 14 ?? 85 D2 7E ?? 48 8B 0D ?? ?? ?? ?? 48 83 C1 10 E8 ?? ?? ?? ?? 8B 70 ?? 41 8D 4D";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,8 +37,6 @@ namespace XIVChatPlugin {
|
||||||
|
|
||||||
#region Delegates
|
#region Delegates
|
||||||
|
|
||||||
private delegate IntPtr GetUiModuleDelegate(IntPtr basePtr);
|
|
||||||
|
|
||||||
private delegate void EasierProcessChatBoxDelegate(IntPtr uiModule, IntPtr message, IntPtr unused, byte a4);
|
private delegate void EasierProcessChatBoxDelegate(IntPtr uiModule, IntPtr message, IntPtr unused, byte a4);
|
||||||
|
|
||||||
private delegate byte IsInputDelegate(IntPtr a1);
|
private delegate byte IsInputDelegate(IntPtr a1);
|
||||||
|
@ -94,9 +90,6 @@ namespace XIVChatPlugin {
|
||||||
|
|
||||||
#region Functions
|
#region Functions
|
||||||
|
|
||||||
[Signature(Signatures.GetUiModule)]
|
|
||||||
private readonly GetUiModuleDelegate? _getUiModule;
|
|
||||||
|
|
||||||
[Signature(Signatures.ProcessChat)]
|
[Signature(Signatures.ProcessChat)]
|
||||||
private readonly EasierProcessChatBoxDelegate? _easierProcessChatBox;
|
private readonly EasierProcessChatBoxDelegate? _easierProcessChatBox;
|
||||||
|
|
||||||
|
@ -116,12 +109,6 @@ namespace XIVChatPlugin {
|
||||||
|
|
||||||
#region Pointers
|
#region Pointers
|
||||||
|
|
||||||
[Signature(Signatures.UiModule, ScanType = ScanType.StaticAddress)]
|
|
||||||
private IntPtr UiModulePtr { get; init; }
|
|
||||||
|
|
||||||
[Signature(Signatures.ColourHandler, ScanType = ScanType.StaticAddress)]
|
|
||||||
private IntPtr ColourHandler { get; init; }
|
|
||||||
|
|
||||||
[Signature(Signatures.ColourLookup, ScanType = ScanType.StaticAddress)]
|
[Signature(Signatures.ColourLookup, ScanType = ScanType.StaticAddress)]
|
||||||
private IntPtr ColourLookup { get; init; }
|
private IntPtr ColourLookup { get; init; }
|
||||||
|
|
||||||
|
@ -165,6 +152,8 @@ namespace XIVChatPlugin {
|
||||||
|
|
||||||
internal GameFunctions(Plugin plugin) {
|
internal GameFunctions(Plugin plugin) {
|
||||||
this.Plugin = plugin;
|
this.Plugin = plugin;
|
||||||
|
|
||||||
|
SignatureHelper.Initialise(this);
|
||||||
|
|
||||||
this._friendListHook?.Enable();
|
this._friendListHook?.Enable();
|
||||||
this._formatHook?.Enable();
|
this._formatHook?.Enable();
|
||||||
|
@ -210,7 +199,7 @@ namespace XIVChatPlugin {
|
||||||
//
|
//
|
||||||
// If this function would ever return 0, it returns null instead.
|
// If this function would ever return 0, it returns null instead.
|
||||||
internal uint? GetChannelColour(ChatCode channel) {
|
internal uint? GetChannelColour(ChatCode channel) {
|
||||||
if (this._getColourInfo == null || this.ColourLookup == IntPtr.Zero || this.ColourHandler == IntPtr.Zero) {
|
if (this._getColourInfo == null || this.ColourLookup == IntPtr.Zero) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -228,9 +217,11 @@ namespace XIVChatPlugin {
|
||||||
return channel.DefaultColour();
|
return channel.DefaultColour();
|
||||||
}
|
}
|
||||||
|
|
||||||
var lookupResult = (uint) Marshal.ReadInt32(this.ColourLookup, (int) parent * 4);
|
var framework = (IntPtr) Framework.Instance();
|
||||||
var info = this._getColourInfo(Marshal.ReadIntPtr(this.ColourHandler) + 16, lookupResult);
|
|
||||||
var rgb = (uint) Marshal.ReadInt32(info, 32) & 0xFFFFFF;
|
var lookupResult = *(uint*) (this.ColourLookup + (int) parent * 4);
|
||||||
|
var info = this._getColourInfo(framework + 16, lookupResult);
|
||||||
|
var rgb = *(uint*) (info + 32) & 0xFFFFFF;
|
||||||
|
|
||||||
if (rgb == 0) {
|
if (rgb == 0) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -240,23 +231,19 @@ namespace XIVChatPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void ProcessChatBox(string message) {
|
internal void ProcessChatBox(string message) {
|
||||||
if (this._easierProcessChatBox == null || this._getUiModule == null || this.UiModulePtr == IntPtr.Zero) {
|
if (this._easierProcessChatBox == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.HadInput = InputSetters.Normal | InputSetters.Afk;
|
this.HadInput = InputSetters.Normal | InputSetters.Afk;
|
||||||
|
|
||||||
var uiModule = this._getUiModule(Marshal.ReadIntPtr(this.UiModulePtr));
|
var uiModule = Framework.Instance()->GetUiModule();
|
||||||
|
|
||||||
if (uiModule == IntPtr.Zero) {
|
|
||||||
throw new ArgumentException("pointer was null", nameof(uiModule));
|
|
||||||
}
|
|
||||||
|
|
||||||
using var payload = new ChatPayload(message);
|
using var payload = new ChatPayload(message);
|
||||||
var mem1 = Marshal.AllocHGlobal(400);
|
var mem1 = Marshal.AllocHGlobal(400);
|
||||||
Marshal.StructureToPtr(payload, mem1, false);
|
Marshal.StructureToPtr(payload, mem1, false);
|
||||||
|
|
||||||
this._easierProcessChatBox(uiModule, mem1, IntPtr.Zero, 0);
|
this._easierProcessChatBox((IntPtr) uiModule, mem1, IntPtr.Zero, 0);
|
||||||
|
|
||||||
Marshal.FreeHGlobal(mem1);
|
Marshal.FreeHGlobal(mem1);
|
||||||
}
|
}
|
||||||
|
@ -278,7 +265,7 @@ namespace XIVChatPlugin {
|
||||||
return this._chatChannelChangeHook!.Original(a1, channel);
|
return this._chatChannelChangeHook!.Original(a1, channel);
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe IntPtr ChangeChatChannelNameDetour(IntPtr a1) {
|
private IntPtr ChangeChatChannelNameDetour(IntPtr a1) {
|
||||||
// Last ShB patch
|
// Last ShB patch
|
||||||
// +0x40 = chat channel (byte or uint?)
|
// +0x40 = chat channel (byte or uint?)
|
||||||
// channel is 17 (maybe 18?) for tells
|
// channel is 17 (maybe 18?) for tells
|
||||||
|
@ -385,7 +372,7 @@ namespace XIVChatPlugin {
|
||||||
goto Return;
|
goto Return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Marshal.ReadByte(data + 0xc) != 2 || Marshal.ReadInt16(data + 0x8) != 0) {
|
if (*(byte*) (data + 0xc) != 2 || *(ushort*) (data + 0x8) != 0) {
|
||||||
goto Return;
|
goto Return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -429,7 +416,7 @@ namespace XIVChatPlugin {
|
||||||
private readonly ulong unk2;
|
private readonly ulong unk2;
|
||||||
|
|
||||||
internal ChatPayload(string text) {
|
internal ChatPayload(string text) {
|
||||||
byte[] stringBytes = Encoding.UTF8.GetBytes(text);
|
var stringBytes = Encoding.UTF8.GetBytes(text);
|
||||||
this.textPtr = Marshal.AllocHGlobal(stringBytes.Length + 30);
|
this.textPtr = Marshal.AllocHGlobal(stringBytes.Length + 30);
|
||||||
Marshal.Copy(stringBytes, 0, this.textPtr, stringBytes.Length);
|
Marshal.Copy(stringBytes, 0, this.textPtr, stringBytes.Length);
|
||||||
Marshal.WriteByte(this.textPtr + stringBytes.Length, 0);
|
Marshal.WriteByte(this.textPtr + stringBytes.Length, 0);
|
||||||
|
@ -473,7 +460,7 @@ namespace XIVChatPlugin {
|
||||||
private readonly byte[] fc;
|
private readonly byte[] fc;
|
||||||
|
|
||||||
private static string? HandleString(IEnumerable<byte> bytes) {
|
private static string? HandleString(IEnumerable<byte> bytes) {
|
||||||
byte[] nonNull = bytes.TakeWhile(b => b != 0).ToArray();
|
var nonNull = bytes.TakeWhile(b => b != 0).ToArray();
|
||||||
return nonNull.Length == 0 ? null : Encoding.UTF8.GetString(nonNull);
|
return nonNull.Length == 0 ? null : Encoding.UTF8.GetString(nonNull);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ namespace XIVChatPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
// PluginLog.Log($"start: {start.ToInt64():x}");
|
// PluginLog.Log($"start: {start.ToInt64():x}");
|
||||||
|
|
||||||
foreach (var offset in offsets) {
|
foreach (var offset in offsets) {
|
||||||
start = Marshal.ReadIntPtr(start + offset);
|
start = Marshal.ReadIntPtr(start + offset);
|
||||||
// PluginLog.Log($" + {offset}: {start.ToInt64():x}");
|
// PluginLog.Log($" + {offset}: {start.ToInt64():x}");
|
||||||
|
|
|
@ -5,16 +5,22 @@
|
||||||
<TargetFramework>net5-windows</TargetFramework>
|
<TargetFramework>net5-windows</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<Version>1.7.1</Version>
|
<Version>1.7.2</Version>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Dalamud">
|
<Reference Include="Dalamud">
|
||||||
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="FFXIVClientStructs">
|
||||||
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="ImGui.NET">
|
<Reference Include="ImGui.NET">
|
||||||
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
|
<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
|
@ -33,13 +39,12 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
|
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
|
||||||
<PackageReference Include="DalamudPackager" Version="2.1.5"/>
|
<PackageReference Include="DalamudPackager" Version="2.1.6"/>
|
||||||
<PackageReference Include="MessagePack" Version="2.3.85"/>
|
<PackageReference Include="MessagePack" Version="2.3.85"/>
|
||||||
<PackageReference Include="Siggingway" Version="1.1.0"/>
|
|
||||||
<PackageReference Include="Sodium.Core" Version="1.2.3"/>
|
<PackageReference Include="Sodium.Core" Version="1.2.3"/>
|
||||||
<PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
|
<PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
|
||||||
<PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1"/>
|
<PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1"/>
|
||||||
<PackageReference Include="XivCommon" Version="4.0.0"/>
|
<PackageReference Include="XivCommon" Version="5.0.1-alpha.1"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\XIVChatCommon\XIVChatCommon.csproj"/>
|
<ProjectReference Include="..\XIVChatCommon\XIVChatCommon.csproj"/>
|
||||||
|
|
Loading…
Reference in New Issue