chore: InventoryWindow cleanup

Author: pandinocoder

Intersect.Client.Core/Interface/Game/Inventory/InventoryWindow.cs

@@ -4,7 +4,9 @@
 using Intersect.Client.Framework.Gwen.Control;
 using Intersect.Client.General;
 using Intersect.Client.Localization;
+using Intersect.Core;
 using Intersect.GameObjects;
+using Microsoft.Extensions.Logging;
 
 namespace Intersect.Client.Interface.Game.Inventory;
 
@@ -108,7 +110,7 @@ public void OpenContextMenu(int slot)
                 {
                     mUseItemContextItem.SetText(Strings.ItemContextMenu.Equip.ToString(item.Name));
                 }
-                
+
                 break;
         }
 
@@ -207,35 +209,70 @@ public void Update()
 
         mInventoryWindow.IsClosable = Globals.CanCloseInventory;
 
-        for (var i = 0; i < Options.Instance.Player.MaxInventory; i++)
+        if (Globals.Me?.Inventory is not { } inventory)
+        {
+            return;
+        }
+
+        var slotCount = Math.Min(Options.Instance.Player.MaxInventory, Items.Count);
+        for (var slotIndex = 0; slotIndex < slotCount; slotIndex++)
         {
-            var item = ItemBase.Get(Globals.Me.Inventory[i].ItemId);
-            if (item != null)
+            var slotComponent = Items[slotIndex];
+            var slotLabel = mValues[slotIndex];
+
+            var inventorySlot = inventory[slotIndex];
+            if (!ItemBase.TryGet(inventorySlot.ItemId, out var itemDescriptor))
             {
-                Items[i].Pnl.IsHidden = false;
-                if (item.IsStackable)
+                if (inventorySlot.ItemId != default)
                 {
-                    mValues[i].IsHidden = Globals.Me.Inventory[i].Quantity <= 1;
-                    mValues[i].Text = Strings.FormatQuantityAbbreviated(Globals.Me.Inventory[i].Quantity);
+                    ApplicationContext.CurrentContext.Logger.LogWarning(
+                        "Inventory slot {SlotIndex} refers to missing Item descriptor {DescriptorId}",
+                        slotIndex,
+                        inventorySlot.ItemId
+                    );
                 }
-                else
+
+                if (slotComponent.Pnl.IsVisible)
                 {
-                    mValues[i].IsHidden = true;
+                    slotComponent.Pnl.IsHidden = true;
                 }
 
-                if (Items[i].IsDragging)
+                if (slotLabel.IsVisible)
                 {
-                    Items[i].Pnl.IsHidden = true;
-                    mValues[i].IsHidden = true;
+                    slotLabel.IsHidden = true;
                 }
+                continue;
+            }
+
+            if (slotComponent.Pnl.IsHidden)
+            {
+                slotComponent.Pnl.IsVisible = true;
+            }
 
-                Items[i].Update();
+            var shouldHideLabel = !itemDescriptor.IsStackable || inventorySlot.Quantity <= 1;
+            if (shouldHideLabel)
+            {
+                if (slotLabel.IsVisible)
+                {
+                    slotLabel.IsVisible = false;
+                }
             }
             else
             {
-                Items[i].Pnl.IsHidden = true;
-                mValues[i].IsHidden = true;
+                if (slotLabel.IsHidden)
+                {
+                    slotLabel.IsVisible = true;
+                }
+                slotLabel.Text = Strings.FormatQuantityAbbreviated(inventorySlot.Quantity);
             }
+
+            if (slotComponent.IsDragging)
+            {
+                slotComponent.Pnl.IsHidden = true;
+                slotLabel.IsHidden = true;
+            }
+
+            slotComponent.Update();
         }
     }