ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix esc menu

Browse source
This commit is contained in:
Kaz Wolfe 2024-06-28 08:40:49 -07:00
parent 8d0b3b1e28
commit d0ced2ed63
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
1 changed files with 12 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Dalamud/Game/Internal/DalamudAtkTweaks.cs
View file

@ -1,5 +1,3 @@
using System.Runtime.InteropServices;
using CheapLoc; using CheapLoc;
using Dalamud.Configuration.Internal; using Dalamud.Configuration.Internal;
using Dalamud.Game.Text; using Dalamud.Game.Text;
@ -22,8 +20,6 @@ namespace Dalamud.Game.Internal;
[ServiceManager.EarlyLoadedService] [ServiceManager.EarlyLoadedService]
internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
{ {
private readonly AtkValueChangeType atkValueChangeType;
private readonly AtkValueSetString atkValueSetString;
private readonly Hook<AgentHudOpenSystemMenuPrototype> hookAgentHudOpenSystemMenu; private readonly Hook<AgentHudOpenSystemMenuPrototype> hookAgentHudOpenSystemMenu;
// TODO: Make this into events in Framework.Gui // TODO: Make this into events in Framework.Gui
@ -49,12 +45,6 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
this.hookAgentHudOpenSystemMenu = Hook<AgentHudOpenSystemMenuPrototype>.FromAddress(openSystemMenuAddress, this.AgentHudOpenSystemMenuDetour); this.hookAgentHudOpenSystemMenu = Hook<AgentHudOpenSystemMenuPrototype>.FromAddress(openSystemMenuAddress, this.AgentHudOpenSystemMenuDetour);
var atkValueChangeTypeAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 45 84 F6 48 8D 4C 24 ??");
this.atkValueChangeType = Marshal.GetDelegateForFunctionPointer<AtkValueChangeType>(atkValueChangeTypeAddress);
var atkValueSetStringAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 41 03 ED");
this.atkValueSetString = Marshal.GetDelegateForFunctionPointer<AtkValueSetString>(atkValueSetStringAddress);
var uiModuleRequestMainCommandAddress = sigScanner.ScanText("40 53 56 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 48 8B 01 8B DA 48 8B F1 FF 90 ?? ?? ?? ??"); var uiModuleRequestMainCommandAddress = sigScanner.ScanText("40 53 56 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 48 8B 01 8B DA 48 8B F1 FF 90 ?? ?? ?? ??");
this.hookUiModuleRequestMainCommand = Hook<UiModuleRequestMainCommand>.FromAddress(uiModuleRequestMainCommandAddress, this.UiModuleRequestMainCommandDetour); this.hookUiModuleRequestMainCommand = Hook<UiModuleRequestMainCommand>.FromAddress(uiModuleRequestMainCommandAddress, this.UiModuleRequestMainCommandDetour);
@ -76,10 +66,6 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
private delegate void AgentHudOpenSystemMenuPrototype(void* thisPtr, AtkValue* atkValueArgs, uint menuSize); private delegate void AgentHudOpenSystemMenuPrototype(void* thisPtr, AtkValue* atkValueArgs, uint menuSize);
private delegate void AtkValueChangeType(AtkValue* thisPtr, ValueType type);
private delegate void AtkValueSetString(AtkValue* thisPtr, byte* bytes);
private delegate void UiModuleRequestMainCommand(void* thisPtr, int commandId); private delegate void UiModuleRequestMainCommand(void* thisPtr, int commandId);
private delegate IntPtr AtkUnitBaseReceiveGlobalEvent(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* a5); private delegate IntPtr AtkUnitBaseReceiveGlobalEvent(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* a5);
@ -166,10 +152,10 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
return; return;
} }
// the max size (hardcoded) is 0x11/17, but the system menu currently uses 0xC/12 // the max size (hardcoded) is 0x12/18, but the system menu currently uses 0xC/12
// this is a just in case that doesnt really matter // this is a just in case that doesnt really matter
// see if we can add 2 entries // see if we can add 2 entries
if (menuSize >= 0x11) if (menuSize >= 0x12)
{ {
this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize); this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
return; return;
@ -181,8 +167,8 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
// reference the original function for more details :) // reference the original function for more details :)
// step 1) move all the current menu items down so we can put Dalamud at the top like it deserves // step 1) move all the current menu items down so we can put Dalamud at the top like it deserves
this.atkValueChangeType(&atkValueArgs[menuSize + 5], ValueType.Int); // currently this value has no type, set it to int (&atkValueArgs[menuSize + 5])->ChangeType(ValueType.Int); // currently this value has no type, set it to int
this.atkValueChangeType(&atkValueArgs[menuSize + 5 + 1], ValueType.Int); (&atkValueArgs[menuSize + 5 + 1])->ChangeType(ValueType.Int);
for (var i = menuSize + 2; i > 1; i--) for (var i = menuSize + 2; i > 1; i--)
{ {
@ -201,10 +187,11 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
// step 3) create strings for them // step 3) create strings for them
// since the game first checks for strings in the AtkValue argument before pulling them from the exd, if we create strings we dont have to worry // since the game first checks for strings in the AtkValue argument before pulling them from the exd, if we create strings we dont have to worry
// about hooking the exd reader, thank god // about hooking the exd reader, thank god
var firstStringEntry = &atkValueArgs[5 + 17]; var firstStringEntry = &atkValueArgs[5 + 18];
this.atkValueChangeType(firstStringEntry, ValueType.String); firstStringEntry->ChangeType(ValueType.String);
var secondStringEntry = &atkValueArgs[6 + 17];
this.atkValueChangeType(secondStringEntry, ValueType.String); var secondStringEntry = &atkValueArgs[6 + 18];
secondStringEntry->ChangeType(ValueType.String);
const int color = 539; const int color = 539;
var strPlugins = new SeString().Append(new UIForegroundPayload(color)) var strPlugins = new SeString().Append(new UIForegroundPayload(color))
@ -215,19 +202,9 @@ internal sealed unsafe class DalamudAtkTweaks : IInternalDisposableService
.Append($"{SeIconChar.BoxedLetterD.ToIconString()} ") .Append($"{SeIconChar.BoxedLetterD.ToIconString()} ")
.Append(new UIForegroundPayload(0)) .Append(new UIForegroundPayload(0))
.Append(this.locDalamudSettings).Encode(); .Append(this.locDalamudSettings).Encode();
// do this the most terrible way possible since im lazy firstStringEntry->SetManagedString(strPlugins);
var bytes = stackalloc byte[strPlugins.Length + 1]; secondStringEntry->SetManagedString(strSettings);
Marshal.Copy(strPlugins, 0, new IntPtr(bytes), strPlugins.Length);
bytes[strPlugins.Length] = 0x0;
this.atkValueSetString(firstStringEntry, bytes); // this allocs the string properly using the game's allocators and copies it, so we dont have to worry about memory fuckups
var bytes2 = stackalloc byte[strSettings.Length + 1];
Marshal.Copy(strSettings, 0, new IntPtr(bytes2), strSettings.Length);
bytes2[strSettings.Length] = 0x0;
this.atkValueSetString(secondStringEntry, bytes2);
// open menu with new size // open menu with new size
var sizeEntry = &atkValueArgs[4]; var sizeEntry = &atkValueArgs[4];