JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues Pull Requests Actions Releases 28 Activity

- Update broken delegates

Browse Source 
- Replace hardcoded offsets with CS version
This commit is contained in:
Infi
2024-07-03 20:06:00 +02:00
parent c8e11ecb9b
commit c031739650
4 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/ChatTwo.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Version>1.27.1</Version> <Version>1.27.2</Version>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
ChatTwo/GameFunctions/Chat.cs
+15 -22
View File
@@ -36,7 +36,7 @@ internal sealed unsafe class Chat : IDisposable
private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ushort, byte, int, byte, void> PrintTellNative = null!; private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ushort, byte, int, byte, void> PrintTellNative = null!;
[Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 01")] [Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 01")]
private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, byte, ulong, bool> SendTellNative = null!; private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, bool> SendTellNative = null!;
// Client::UI::AddonChatLog.OnRefresh // Client::UI::AddonChatLog.OnRefresh
[Signature("40 53 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 49 8B F0 8B FA", DetourName = nameof(ChatLogRefreshDetour))] [Signature("40 53 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 49 8B F0 8B FA", DetourName = nameof(ChatLogRefreshDetour))]
@@ -396,14 +396,8 @@ internal sealed unsafe class Chat : IDisposable
private byte* ChangeChannelNameDetour(AgentChatLog* agent) private byte* ChangeChannelNameDetour(AgentChatLog* agent)
{ {
// Last ShB patch
// +0x40 = chat channel (byte or uint?)
// channel is 17 (maybe 18?) for tells
// +0x48 = pointer to channel name string
// +0xDA = player name string for tells
// +0x120 = player world id for tells
var ret = ChangeChannelNameHook.Original(agent); var ret = ChangeChannelNameHook.Original(agent);
if ((nint) agent == nint.Zero) if (agent == null)
return ret; return ret;
var channel = (uint) RaptureShellModule.Instance()->ChatType; var channel = (uint) RaptureShellModule.Instance()->ChatType;
@@ -425,8 +419,8 @@ internal sealed unsafe class Chat : IDisposable
ushort worldId = 0; ushort worldId = 0;
if (channel == (uint) InputChannel.Tell) if (channel == (uint) InputChannel.Tell)
{ {
playerName = MemoryHelper.ReadStringNullTerminated((nint) agent + 0xDA); playerName = SeString.Parse(agent->TellPlayerName).TextValue;
worldId = *(ushort*) (agent + 0x120); worldId = agent->TellWorldId;
Plugin.Log.Debug($"Detected tell target '{playerName}'@{worldId}"); Plugin.Log.Debug($"Detected tell target '{playerName}'@{worldId}");
} }
@@ -448,13 +442,13 @@ internal sealed unsafe class Chat : IDisposable
ReplyInSelectedChatModeHook!.Original(agent); ReplyInSelectedChatModeHook!.Original(agent);
} }
private bool SetChatLogTellTargetDetour(RaptureShellModule* a1, Utf8String* name, Utf8String* a3, ushort world, ulong contentId, ushort reason, bool a7) private bool SetChatLogTellTargetDetour(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType)
{ {
if (name != null) if (playerName != null)
{ {
try try
{ {
var target = new TellTarget(name->ToString(), world, contentId, (TellReason) reason); var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason);
Activated?.Invoke(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell)) Activated?.Invoke(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
{ {
TellReason = (TellReason) reason, TellReason = (TellReason) reason,
@@ -467,10 +461,10 @@ internal sealed unsafe class Chat : IDisposable
} }
} }
return SetChatLogTellTargetHook!.Original(a1, name, a3, world, contentId, reason, a7); return SetChatLogTellTargetHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason, setChatType);
} }
private void EurekaContextMenuTell(RaptureShellModule* param1, Utf8String* playerName, Utf8String* worldName, ushort world, ulong id, ushort param6) private void EurekaContextMenuTell(RaptureShellModule* param1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason)
{ {
if (!UsesTellTempChannel) if (!UsesTellTempChannel)
{ {
@@ -478,8 +472,8 @@ internal sealed unsafe class Chat : IDisposable
PreviousChannel = Channel.Channel; PreviousChannel = Channel.Channel;
} }
RaptureShellModule.Instance()->SetTellTargetInForay(playerName, worldName, world, id, param6, false); RaptureShellModule.Instance()->SetTellTargetInForay(playerName, worldName, worldId, accountId, contentId, reason, false);
EurekaContextMenuTellHook!.Original(param1, playerName, worldName, world, id, param6); EurekaContextMenuTellHook!.Original(param1, playerName, worldName, worldId, accountId, contentId, reason);
} }
internal static void SetChannel(InputChannel channel, string? tellTarget = null) internal static void SetChannel(InputChannel channel, string? tellTarget = null)
@@ -501,7 +495,7 @@ internal sealed unsafe class Chat : IDisposable
target->Dtor(true); target->Dtor(true);
} }
internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong objectId, ushort param6, bool param7) internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong accountId, ulong objectId, ushort reason, bool setChatType)
{ {
// param6 is 0 for contentId and 1 for objectId // param6 is 0 for contentId and 1 for objectId
// param7 is always 0 ? // param7 is always 0 ?
@@ -515,7 +509,7 @@ internal sealed unsafe class Chat : IDisposable
var utfName = Utf8String.FromString(name); var utfName = Utf8String.FromString(name);
var utfWorld = Utf8String.FromString(worldName); var utfWorld = Utf8String.FromString(worldName);
RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, objectId, param6, param7); RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, accountId, objectId, reason, setChatType);
utfName->Dtor(true); utfName->Dtor(true);
utfWorld->Dtor(true); utfWorld->Dtor(true);
@@ -532,7 +526,6 @@ internal sealed unsafe class Chat : IDisposable
private Keybind? GetKeybind(string id) private Keybind? GetKeybind(string id)
{ {
var agent = (nint) AgentModule.Instance()->GetAgentByInternalId(AgentId.Configkey); var agent = (nint) AgentModule.Instance()->GetAgentByInternalId(AgentId.Configkey);
var a1 = *(void**) (agent + 0x78); var a1 = *(void**) (agent + 0x78);
if (a1 == null) if (a1 == null)
return null; return null;
@@ -585,7 +578,7 @@ internal sealed unsafe class Chat : IDisposable
var logModule = RaptureLogModule.Instance(); var logModule = RaptureLogModule.Instance();
var networkModule = Framework.Instance()->GetNetworkModuleProxy()->NetworkModule; var networkModule = Framework.Instance()->GetNetworkModuleProxy()->NetworkModule;
var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (byte) reason, homeWorld); var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (ushort) reason, homeWorld);
if (ok) if (ok)
PrintTellNative(logModule, 33, uName, &decodedUtf8String, contentId, homeWorld, 255, 0, 0); PrintTellNative(logModule, 33, uName, &decodedUtf8String, contentId, homeWorld, 255, 0, 0);
else else
@@ -596,7 +589,7 @@ internal sealed unsafe class Chat : IDisposable
uMessage->Dtor(true); uMessage->Dtor(true);
} }
private byte[] EncodeMessage(string str) { private static byte[] EncodeMessage(string str) {
using var input = new Utf8String(str); using var input = new Utf8String(str);
using var ouput = new Utf8String(); using var ouput = new Utf8String();
ChatTwo/GameFunctions/GameFunctions.cs
+7 -28
View File
@@ -46,15 +46,6 @@ internal unsafe class GameFunctions : IDisposable
Marshal.FreeHGlobal(PlaceholderNamePtr); Marshal.FreeHGlobal(PlaceholderNamePtr);
} }
internal nint GetInfoProxyByIndex(InfoProxyId proxyId)
{
var infoModule = InfoModule.Instance();
if (infoModule == null)
return nint.Zero;
return (nint) infoModule->GetInfoProxyById(proxyId);
}
internal void SendFriendRequest(string name, ushort world) internal void SendFriendRequest(string name, ushort world)
{ {
ListCommand(name, world, "friendlist"); ListCommand(name, world, "friendlist");
@@ -114,31 +105,19 @@ internal unsafe class GameFunctions : IDisposable
if (agent == null || addon == null) if (agent == null || addon == null)
return; return;
var agentPtr = (nint) agent; agent->ItemKind = itemKind == ItemPayload.ItemKind.EventItem ? ItemDetailKind.ChatEventItem : ItemDetailKind.ChatItem;
// addresses mentioned here are 7.0 agent->TypeOrId = id;
// see the call near the end of AgentItemDetail.Update agent->Index = 0;
// offsets valid as of 7.0 agent->Flag1 &= 0xEF;
// Switch goes down to default, which is what we want
*(byte*) (agentPtr + 0x118) = itemKind == ItemPayload.ItemKind.EventItem ? (byte)8 : (byte)1;
// Item id when hovering over item in chat
*(uint*) (agentPtr + 0x11C) = id;
// Always 0 when hovering over item in chat
*(uint*) (agentPtr + 0x120) = 0;
// Skips a check to do with inventory
*(byte*) (agentPtr + 0x128) &= 0xEF;
// Is also set to the ID of the item when in chat
agent->ItemId = id; agent->ItemId = id;
// When set to 1, lets everything continue (one frame) agent->Flag2 = 1;
*(byte*) (agentPtr + 0x1B2) = 1; agent->Flag3 = 0;
// Skips early return
*(byte*) (agentPtr + 0x1B6) = 0;
// This just probably needs to be set // This just probably needs to be set
agent->AddonId = addon->Id; agent->AddonId = addon->Id;
// Skips early return // Skips early return
*(byte*) ((nint) atkStage + 0x2B4) |= 2; atkStage->TooltipManager.Flag1 |= 2;
addon->Show(false, 15); addon->Show(false, 15);
} }
ChatTwo/PayloadHandler.cs
+1 -1
View File
@@ -555,7 +555,7 @@ public sealed class PayloadHandler {
} }
else if (validContentId) else if (validContentId)
{ {
LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Name.ToString(), (ushort) world.RowId, chunk.Message!.ContentId, 0, false); LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false);
} }
LogWindow.Activate = true; LogWindow.Activate = true;