From 7dd4fb3978e0c09390f7a969a1d0137656237187 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Sat, 11 Jan 2025 14:31:57 +0100 Subject: [PATCH] Add AgentInventoryContext::InventoryContextEvent --- .../Client/Game/Event/ShopEventHandler.cs | 6 +++- .../Client/UI/Agent/AgentHousingPlant.cs | 3 +- .../Client/UI/Agent/AgentInventoryContext.cs | 4 +++ ida/data.yml | 31 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/FFXIVClientStructs/FFXIV/Client/Game/Event/ShopEventHandler.cs b/FFXIVClientStructs/FFXIV/Client/Game/Event/ShopEventHandler.cs index 18d6d87b3..a2e5c5ef7 100644 --- a/FFXIVClientStructs/FFXIV/Client/Game/Event/ShopEventHandler.cs +++ b/FFXIVClientStructs/FFXIV/Client/Game/Event/ShopEventHandler.cs @@ -1,11 +1,15 @@ using FFXIVClientStructs.FFXIV.Client.System.String; +using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Common.Component.Excel; using FFXIVClientStructs.FFXIV.Component.GUI; namespace FFXIVClientStructs.FFXIV.Client.Game.Event; +// Client::Game::Event::ShopEventHandler +// Client::Game::Event::EventHandler +// Client::UI::Agent::AgentInventoryContext::InventoryContextEvent [GenerateInterop] -[Inherits] +[Inherits, Inherits] [StructLayout(LayoutKind.Explicit, Size = 0x32F0)] public unsafe partial struct ShopEventHandler { // 0x210: second base class, related to context menu integration for selling items diff --git a/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHousingPlant.cs b/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHousingPlant.cs index 9fd9ec750..6c089301e 100644 --- a/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHousingPlant.cs +++ b/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentHousingPlant.cs @@ -5,9 +5,10 @@ namespace FFXIVClientStructs.FFXIV.Client.UI.Agent; // Client::UI::Agent::AgentHousingPlant // Client::UI::Agent::AgentInterface // Component::GUI::AtkModuleInterface::AtkEventInterface +// Client::UI::Agent::AgentInventoryContext::InventoryContextEvent [Agent(AgentId.HousingPlant)] [GenerateInterop] -[Inherits] +[Inherits, Inherits] [StructLayout(LayoutKind.Explicit, Size = 0x950)] public unsafe partial struct AgentHousingPlant { [FieldOffset(0x40)] public uint ContextAddonId; diff --git a/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentInventoryContext.cs b/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentInventoryContext.cs index ddf333696..0ec0b3d72 100644 --- a/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentInventoryContext.cs +++ b/FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentInventoryContext.cs @@ -60,4 +60,8 @@ public bool IsContextItemDisabled(int index) { [MemberFunction("E8 ?? ?? ?? ?? 48 83 C4 ?? 5B C3 8B 83")] public partial void LowerItemQuality(InventoryItem* itemSlot, InventoryType inventory, int slot, uint addonId); + + [GenerateInterop(isInherited: true)] + [StructLayout(LayoutKind.Explicit, Size = 0x8)] + public partial struct InventoryContextEvent; // contains 2 vfs } diff --git a/ida/data.yml b/ida/data.yml index 5e4299170..35a6c56af 100644 --- a/ida/data.yml +++ b/ida/data.yml @@ -4934,6 +4934,8 @@ classes: vtbls: - ea: 0x141F38A88 base: Client::UI::Agent::AgentInterface + - ea: 0x141F38B00 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x1402E2BF0: ctor 0x1402E2CF0: Finalizer @@ -4941,6 +4943,10 @@ classes: vtbls: - ea: 0x141F38E98 base: Client::UI::Agent::AgentInterface + - ea: 0x141F38F10 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent + - ea: 0x141F38F20 + base: Client::UI::Info::InfoEventHandlerInterface funcs: 0x1403005B0: ctor 0x140300770: Finalizer # inlined @ 0x1403CD9F0 @@ -9009,6 +9015,9 @@ classes: base: Client::UI::Agent::AgentInterface funcs: 0x140A828F0: ctor + Client::UI::Agent::AgentInventoryContext::InventoryContextEvent: + vtbls: + - ea: 0x141F36778 Client::UI::Agent::AgentInventoryContext: vtbls: - ea: 0x141F36788 @@ -9113,6 +9122,8 @@ classes: vtbls: - ea: 0x141F9ED58 base: Client::UI::Agent::AgentInterface + - ea: 0x141F9EDD0 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x140AA69B0: ctor 0x140AA6A80: Finalizer @@ -9260,6 +9271,8 @@ classes: vtbls: - ea: 0x141F9D650 base: Client::UI::Agent::AgentInterface + - ea: 0x141F9D6C8 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x140A68450: ctor 0x140A68650: Finalizer @@ -9536,6 +9549,12 @@ classes: vtbls: - ea: 0x1420801F0 base: Client::UI::Agent::AgentInterface + - ea: 0x142080268 + base: Client::UI::Agent::AgentContext::AgentContextUpdateChecker + - ea: 0x142080270 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent + - ea: 0x141F382A8 + base: Client::UI::Info::InfoEventHandlerInterface funcs: 0x14149F440: ctor 0x14149FC60: Finalizer @@ -9567,6 +9586,8 @@ classes: vtbls: - ea: 0x142080518 base: Client::UI::Agent::AgentInterface + - ea: 0x142080590 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x1414C1F80: ctor Client::UI::Agent::AgentPersonalRoomPortal: @@ -9598,6 +9619,8 @@ classes: vtbls: - ea: 0x142080698 base: Client::UI::Agent::AgentInterface + - ea: 0x142080710 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x1414C65A0: ctor Client::UI::Agent::AgentTreasureHunt: @@ -9673,6 +9696,8 @@ classes: vtbls: - ea: 0x141F9D740 base: Client::UI::Agent::AgentInterface + - ea: 0x141F9D7B8 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x140A6FF30: ctor 0x140A70040: Finalizer @@ -9702,6 +9727,8 @@ classes: vtbls: - ea: 0x141F9EDE0 base: Client::UI::Agent::AgentInterface + - ea: 0x141F9EE58 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x140AA7BB0: ctor Client::UI::Agent::AgentRelicSphereUpgrade: @@ -12377,6 +12404,8 @@ classes: vtbls: - ea: 0x142083C78 base: Client::Game::Event::EventHandler + - ea: 0x1420844E0 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent funcs: 0x141591F80: ctor 0x141592310: CreateInstance @@ -12506,6 +12535,8 @@ classes: vtbls: - ea: 0x142085670 base: Client::Game::Event::EventHandler + - ea: 0x142085ED8 + base: Client::UI::Agent::AgentInventoryContext::InventoryContextEvent Client::Game::InstanceContent::ContentTalkEventHandler: vtbls: - ea: 0x14211D2A8