Cleanup

Dalamud/Game/Inventory/GameInventory.cs

@@ -9,8 +9,6 @@ using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
 using Dalamud.Plugin.Services;
 
-using FFXIVClientStructs.FFXIV.Client.Game;
-
 using Serilog.Events;
 
 namespace Dalamud.Game.Inventory;
@@ -94,22 +92,6 @@ internal class GameInventory : IDisposable, IServiceType, IGameInventory
         this.framework.Update -= this.OnFrameworkUpdate;
     }
 
-    /// <summary>
-    /// Gets a <see cref="Span{T}"/> view of <see cref="InventoryItem"/>s, wrapped as <see cref="GameInventoryItem"/>.
-    /// </summary>
-    /// <param name="type">The inventory type.</param>
-    /// <returns>The span.</returns>
-    private static unsafe ReadOnlySpan<GameInventoryItem> GetItemsForInventory(GameInventoryType type)
-    {
-        var inventoryManager = InventoryManager.Instance();
-        if (inventoryManager is null) return default;
-
-        var inventory = inventoryManager->GetInventoryContainer((InventoryType)type);
-        if (inventory is null) return default;
-
-        return new ReadOnlySpan<GameInventoryItem>(inventory->Items, (int)inventory->Size);
-    }
-
     private static void InvokeSafely(
         IGameInventory.InventoryChangelogDelegate? cb,
         IReadOnlyCollection<InventoryEventArgs> data)
@@ -140,7 +122,7 @@ internal class GameInventory : IDisposable, IServiceType, IGameInventory
     {
         for (var i = 0; i < this.inventoryTypes.Length; i++)
         {
-            var newItems = GetItemsForInventory(this.inventoryTypes[i]);
+            var newItems = GameInventoryItem.GetReadOnlySpanOfInventory(this.inventoryTypes[i]);
             if (newItems.IsEmpty)
                 continue;
 

Dalamud/Game/Inventory/GameInventoryItem.cs

@@ -106,6 +106,28 @@ public unsafe struct GameInventoryItem : IEquatable<GameInventoryItem>
     public ReadOnlySpan<ushort> MateriaGrade =>
         new(Unsafe.AsPointer(ref Unsafe.AsRef(in this.InternalItem.MateriaGrade[0])), 5);
 
+    /// <summary>
+    /// Gets the address of native inventory item in the game.<br />
+    /// Can be 0 if this instance of <see cref="GameInventoryItem"/> does not point to a valid set of container type and slot.
+    /// </summary>
+    public nint NativeAddress
+    {
+        get
+        {
+            var s = GetReadOnlySpanOfInventory(this.ContainerType);
+            if (s.IsEmpty)
+                return 0;
+
+            foreach (ref readonly var i in s)
+            {
+                if (i.InventorySlot == this.InventorySlot)
+                    return (nint)Unsafe.AsPointer(ref Unsafe.AsRef(in i));
+            }
+
+            return 0;
+        }
+    }
+
     /// <summary>
     /// Gets the color used for this item.
     /// </summary>
@@ -160,4 +182,20 @@ public unsafe struct GameInventoryItem : IEquatable<GameInventoryItem>
         this.IsEmpty
             ? "empty"
             : $"item({this.ItemId}@{this.ContainerType}#{this.InventorySlot})";
+
+    /// <summary>
+    /// Gets a <see cref="Span{T}"/> view of <see cref="InventoryItem"/>s, wrapped as <see cref="GameInventoryItem"/>.
+    /// </summary>
+    /// <param name="type">The inventory type.</param>
+    /// <returns>The span.</returns>
+    internal static ReadOnlySpan<GameInventoryItem> GetReadOnlySpanOfInventory(GameInventoryType type)
+    {
+        var inventoryManager = InventoryManager.Instance();
+        if (inventoryManager is null) return default;
+
+        var inventory = inventoryManager->GetInventoryContainer((InventoryType)type);
+        if (inventory is null) return default;
+
+        return new ReadOnlySpan<GameInventoryItem>(inventory->Items, (int)inventory->Size);
+    }
 }

Dalamud/Game/Inventory/InventoryChangeArgsTypes/InventoryItemMovedArgs.cs

@@ -15,9 +15,6 @@ public sealed class InventoryItemMovedArgs : InventoryComplexEventArgs
     {
     }
 
-    // /// <inheritdoc/>
-    // public override string ToString() => $"{this.Type}({this.SourceEvent}, {this.TargetEvent})";
-
     /// <inheritdoc/>
     public override string ToString() =>
         $"{this.Type}(item({this.Item.ItemId}) from {this.SourceInventory}#{this.SourceSlot} to {this.TargetInventory}#{this.TargetSlot})";

Dalamud/Interface/Internal/Windows/ConsoleWindow.cs

@@ -679,6 +679,9 @@ internal class ConsoleWindow : Window, IDisposable
 
     private bool IsFilterApplicable(LogEntry entry)
     {
+        if (this.regexError)
+            return false;
+
         try
         {
             // If this entry is below a newly set minimum level, fail it

Dalamud/Plugin/Services/IGameInventory.cs

@@ -26,7 +26,11 @@ public interface IGameInventory
     public delegate void InventoryChangedDelegate(GameInventoryEvent type, InventoryEventArgs data);
 
     /// <summary>
-    /// Event that is fired when the inventory has been changed.
+    /// Event that is fired when the inventory has been changed.<br />
+    /// Note that some events, such as <see cref="ItemAdded"/>, <see cref="ItemRemoved"/>, and <see cref="ItemChanged"/>
+    /// currently is subject to reinterpretation as <see cref="ItemMoved"/>, <see cref="ItemMerged"/>, and
+    /// <see cref="ItemSplit"/>.<br />
+    /// Use <see cref="InventoryChangedRaw"/> if you do not want such reinterpretation.
     /// </summary>
     public event InventoryChangelogDelegate InventoryChanged;
 
@@ -34,7 +38,7 @@ public interface IGameInventory
     /// Event that is fired when the inventory has been changed, without trying to interpret two inventory slot changes
     /// as a move event as appropriate.<br />
     /// In other words, <see cref="GameInventoryEvent.Moved"/>, <see cref="GameInventoryEvent.Merged"/>, and
-    /// <see cref="GameInventoryEvent.Split"/> do not fire in this event.
+    /// <see cref="GameInventoryEvent.Split"/> currently do not fire in this event.
     /// </summary>
     public event InventoryChangelogDelegate InventoryChangedRaw;