Merge pull request #1722 from Haselnussbomber/inventorypackets

Add InventoryItem packet handlers

Author: wolfcomp

FFXIVClientStructs/FFXIV/Client/Game/Network/InventoryPackets.cs

@@ -0,0 +1,66 @@
+using FFXIVClientStructs.FFXIV.Client.Network;
+
+namespace FFXIVClientStructs.FFXIV.Client.Game.Network;
+
+// TODO: remove with HandleUpdateInventorySlotPacket (replaced by InventoryItemPacket)
+[GenerateInterop]
+[StructLayout(LayoutKind.Explicit, Size = 0x3D)]
+public partial struct UpdateInventorySlotPacket {
+    [FieldOffset(0x00)] public uint ContextId;
+    [FieldOffset(0x08)] public ushort InventoryType;
+    [FieldOffset(0x0A)] public short InventorySlot;
+    [FieldOffset(0x0C)] public int Quantity;
+    [FieldOffset(0x10)] public uint ItemId;
+    [FieldOffset(0x18)] public ulong CrafterContentId;
+    [FieldOffset(0x20)] public byte ItemFlags;
+    [FieldOffset(0x22)] public ushort Condition;
+    [FieldOffset(0x24)] public ushort SpiritbondOrCollectability;
+    [FieldOffset(0x28)] public uint GlamourId;
+    [FieldOffset(0x2C), FixedSizeArray] internal FixedSizeArray5<short> _materia;
+    [FieldOffset(0x36), FixedSizeArray] internal FixedSizeArray5<byte> _materiaGrades;
+    [FieldOffset(0x3B), FixedSizeArray] internal FixedSizeArray2<byte> _stains;
+}
+
+/// <remarks> Packet for <see cref="PacketDispatcher.HandleInventoryItemPacket"/> and <see cref="PacketDispatcher.HandleInventoryItemUpdatePacket"/> </remarks>
+[GenerateInterop]
+[StructLayout(LayoutKind.Explicit, Size = 0x3D)]
+public partial struct InventoryItemPacket {
+    [FieldOffset(0x00)] public uint ContextId;
+    [FieldOffset(0x08)] public ushort InventoryType;
+    [FieldOffset(0x0A)] public ushort Slot;
+    [FieldOffset(0x0C)] public uint Quantity;
+    [FieldOffset(0x10)] public uint ItemId;
+
+    [FieldOffset(0x18)] public ulong CrafterContentId;
+    [FieldOffset(0x20)] public byte ItemFlags;
+
+    [FieldOffset(0x22)] public ushort Condition;
+    [FieldOffset(0x24)] public ushort SpiritbondOrCollectability;
+
+    [FieldOffset(0x28)] public uint GlamourId;
+    [FieldOffset(0x2C), FixedSizeArray] internal FixedSizeArray5<ushort> _materia;
+    [FieldOffset(0x36), FixedSizeArray] internal FixedSizeArray5<byte> _materiaGrades;
+    [FieldOffset(0x3B), FixedSizeArray] internal FixedSizeArray2<byte> _stains;
+}
+
+/// <remarks> Packet for <see cref="PacketDispatcher.HandleInventoryItemCurrencyPacket"/> </remarks>
+[StructLayout(LayoutKind.Explicit, Size = 0x14)]
+public struct InventoryItemCurrencyPacket {
+    [FieldOffset(0x00)] public uint ContextId;
+    [FieldOffset(0x04)] public ushort InventoryType;
+    [FieldOffset(0x06)] public ushort Slot;
+    [FieldOffset(0x08)] public uint Quantity;
+
+    [FieldOffset(0x10)] public uint ItemId;
+}
+
+/// <remarks> Packet for <see cref="PacketDispatcher.HandleInventoryItemSymbolicPacket"/> </remarks>
+[StructLayout(LayoutKind.Explicit, Size = 0x10)]
+public struct InventoryItemSymbolicPacket {
+    [FieldOffset(0x00)] public uint ContextId;
+    [FieldOffset(0x04)] public ushort InventoryType;
+    [FieldOffset(0x06)] public ushort Slot;
+    [FieldOffset(0x08)] public uint Quantity;
+    [FieldOffset(0x0C)] public ushort TargetInventoryType;
+    [FieldOffset(0x0E)] public ushort TargetSlot;
+}

FFXIVClientStructs/FFXIV/Client/Game/Network/UpdateInventorySlotPacket.cs

@@ -45,9 +45,22 @@ public static partial void HandleActorControlPacket(
     [MemberFunction("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 40 B8 00 00 00 E0")]
     public static partial void HandleEventPlayPacket(GameObjectId objectId, EventId eventId, short scene, ulong sceneFlags, uint* sceneData, byte sceneDataCount);
 
+    [Obsolete("Use HandleInventoryItemUpdatePacket")]
     [MemberFunction("48 89 5C 24 ?? 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 44 24 ?? 0F B7 5A")]
     public static partial void HandleUpdateInventorySlotPacket(uint targetId, UpdateInventorySlotPacket* packet);
 
+    [MemberFunction("48 89 5C 24 ?? 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 44 24 ?? 0F B7 5A")]
+    public static partial void HandleInventoryItemUpdatePacket(uint targetId, InventoryItemPacket* packet);
+
+    [MemberFunction("E8 ?? ?? ?? ?? EB ?? 3D ?? ?? ?? ?? 75 ?? 48 8D 53")]
+    public static partial void HandleInventoryItemPacket(uint targetId, InventoryItemPacket* packet);
+
+    [MemberFunction("E8 ?? ?? ?? ?? EB ?? 83 F8 ?? 75 ?? 48 8D 53")]
+    public static partial void HandleInventoryItemCurrencyPacket(uint targetId, InventoryItemCurrencyPacket* packet);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 48 8B 5B ?? 48 85 DB 0F 85 ?? ?? ?? ?? 4D 85 FF")]
+    public static partial void HandleInventoryItemSymbolicPacket(uint targetId, InventoryItemSymbolicPacket* packet);
+
     [MemberFunction("48 89 5C 24 ?? 57 48 81 EC ?? ?? ?? ?? 48 8B DA 8B F9 0F B6 92")]
     public static partial void HandleSpawnPlayerPacket(uint targetId, SpawnPlayerPacket* packet);
 

FFXIVClientStructs/FFXIV/Client/Network/PacketDispatcher.cs

@@ -5972,7 +5972,10 @@ classes:
       0x140B8F8A0: HandleActionEffect24Packet
       0x140B8F920: HandleActionEffect32Packet
       0x140B8F9A0: HandleActorControlPacket
-      0x140B9F040: HandleUpdateInventorySlotPacket
+      0x140B9F040: HandleInventoryItemUpdatePacket
+      0x140B9F240: HandleInventoryItemPacket
+      0x140B9F330: HandleInventoryItemCurrencyPacket
+      0x140B9F3C0: HandleInventoryItemSymbolicPacket
       0x140B9F4E0: HandleInventoryActionAckPacket
       0x140B9F6D0: HandleUpdatePartyPacket
       0x140B9FEB0: HandleUpdateAllianceNormalPacket