fix and cleanup crafting window AscensionGameDev#2541

formatting for previous commit

Author: pandinocoder

Framework/Intersect.Framework.Core/Models/DbList.cs

@@ -0,0 +1,34 @@
+using System.Diagnostics.CodeAnalysis;
+using Intersect.Collections;
+
+namespace Intersect.Models;
+
+public partial class DbList<T> : List<Guid> where T : IDatabaseObject
+{
+    public List<T> GetAll()
+    {
+        var list = new List<T>();
+        foreach (var l in ToArray())
+        {
+            list.Add((T)DatabaseObjectLookup.LookupMap[typeof(T)].Get(l));
+        }
+
+        return list;
+    }
+
+    public T Get(Guid id)
+    {
+        return (T)DatabaseObjectLookup.LookupMap[typeof(T)].Get(id);
+    }
+
+    public bool TryGet(Guid id, [NotNullWhen(true)] out T? value)
+    {
+        if (DatabaseObjectLookup.LookupMap.TryGetValue(typeof(T), out var lookupMap))
+        {
+            return lookupMap.TryGetValue<T>(id, out value);
+        }
+
+        value = default;
+        return false;
+    }
+}

Framework/Intersect.Framework.Core/Models/IDatabaseObject.cs

@@ -1,5 +1,4 @@
-using Intersect.Collections;
-using Intersect.Enums;
+using Intersect.Enums;
 using Newtonsoft.Json;
 
 namespace Intersect.Models;
@@ -27,25 +26,4 @@ public interface IDatabaseObject : INamedObject
 
     void Delete();
 
-}
-
-public partial class DbList<T> : List<Guid>
-{
-
-    public List<T> GetAll()
-    {
-        var list = new List<T>();
-        foreach (var l in ToArray())
-        {
-            list.Add((T) DatabaseObjectLookup.LookupMap[typeof(T)].Get(l));
-        }
-
-        return list;
-    }
-
-    public T Get(Guid id)
-    {
-        return (T) DatabaseObjectLookup.LookupMap[typeof(T)].Get(id);
-    }
-
-}
+}

Intersect.Client.Core/Entities/Entity.cs

@@ -106,7 +106,7 @@ public Guid[] Equipment
     public Guid Id { get; set; }
 
     //Inventory/Spells/Equipment
-    public IItem[] Inventory { get; set; } = new IItem[Options.Instance.Player.MaxInventory];
+    public IItem[] Inventory { get; } = new IItem[Options.Instance.Player.MaxInventory];
 
     IReadOnlyList<IItem> IEntity.Items => [.. Inventory];
 

Intersect.Client.Core/Entities/Player.cs

@@ -33,7 +33,7 @@ namespace Intersect.Client.Entities;
 
 public partial class Player : Entity, IPlayer
 {
-    public delegate void InventoryUpdated();
+    public delegate void InventoryUpdatedEventHandler(Player player, int slotIndex);
 
     private Guid _class;
 
@@ -66,7 +66,19 @@ public Guid Class
 
     public HotbarInstance[] Hotbar { get; set; } = new HotbarInstance[Options.Instance.Player.HotbarSlotCount];
 
-    public InventoryUpdated? InventoryUpdatedDelegate { get; set; }
+    public event InventoryUpdatedEventHandler? InventoryUpdated;
+
+    public void UpdateInventory(
+        int slotIndex,
+        Guid descriptorId,
+        int quantity,
+        Guid? bagId,
+        ItemProperties itemProperties
+    )
+    {
+        Inventory[slotIndex].Load(id: descriptorId, quantity: quantity, bagId: bagId, itemProperties: itemProperties);
+        InventoryUpdated?.Invoke(this, slotIndex);
+    }
 
     IReadOnlyDictionary<Guid, long> IPlayer.ItemCooldowns => ItemCooldowns;
 

Intersect.Client.Core/Interface/Game/Chat/Chatbox.cs

@@ -353,7 +353,7 @@ private void SetChannelToTab(ChatboxTab tab)
     }
 
     //Update
-    public void Update()
+    private void Update()
     {
         var vScrollBar = mChatboxMessages.GetVerticalScrollBar();
         var scrollAmount = vScrollBar.ScrollAmount;