make explicit context menu as possible null (bcuz hotbar) and not null where it exists

WeylonSantana · WeylonSantana · commit a5baa4be93d2 · 2025-03-12T16:55:50.000-03:00
diff --git a/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs b/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs
@@ -60,7 +60,7 @@ public BagItem(BagWindow bagWindow, Base parent, int index, ContextMenu contextM
 
         LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _withdrawContextItem = _contextMenu.AddItem(Strings.BagContextMenu.Withdraw);
         _withdrawContextItem.Clicked += _withdrawMenuItem_Clicked;
         _contextMenu.LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
@@ -81,7 +81,7 @@ public override void OpenContextMenu()
         }
 
         // Clear the context menu and add the withdraw item with updated item name
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _withdrawContextItem.SetText(Strings.BagContextMenu.Withdraw.ToString(item.Name));
         _contextMenu.AddChild(_withdrawContextItem);
         base.OpenContextMenu();
diff --git a/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs b/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs
@@ -63,7 +63,7 @@ public BankItem(BankWindow bankWindow, Base parent, int index, ContextMenu conte
 
         LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _withdrawContextItem = _contextMenu.AddItem(Strings.BankContextMenu.Withdraw);
         _withdrawContextItem.Clicked += _withdrawMenuItem_Clicked;
         _contextMenu.LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
@@ -82,7 +82,7 @@ public void OpenContextMenu()
         }
 
         // Clear the context menu and add the withdraw item with updated item name
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _withdrawContextItem.SetText(Strings.BankContextMenu.Withdraw.ToString(item.Name));
         _contextMenu.AddChild(_withdrawContextItem);
 
diff --git a/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs b/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs
@@ -97,7 +97,7 @@ public InventoryItem(InventoryWindow inventoryWindow, Base parent, int index, Co
 
         LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _useItemMenuItem = _contextMenu.AddItem(Strings.ItemContextMenu.Use);
         _useItemMenuItem.Clicked += _useItemContextItem_Clicked;
         _dropItemMenuItem = _contextMenu.AddItem(Strings.ItemContextMenu.Drop);
@@ -117,7 +117,7 @@ public InventoryItem(InventoryWindow inventoryWindow, Base parent, int index, Co
     public override void OpenContextMenu()
     {
         // Clear out the old options since we might not show all of them
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
 
         if (Globals.Me?.Inventory[SlotIndex] is not { } inventorySlot)
         {
diff --git a/Intersect.Client.Core/Interface/Game/Shop/ShopItem.cs b/Intersect.Client.Core/Interface/Game/Shop/ShopItem.cs
@@ -34,7 +34,7 @@ public ShopItem(ShopWindow shopWindow, Base parent, int index, ContextMenu conte
         LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
         //TODO: Is this a memory leak?
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _buyMenuItem = _contextMenu.AddItem(Strings.ShopContextMenu.Buy);
         _buyMenuItem.Clicked += _buyMenuItem_Clicked;
         _contextMenu.LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
diff --git a/Intersect.Client.Core/Interface/Game/SlotItem.cs b/Intersect.Client.Core/Interface/Game/SlotItem.cs
@@ -7,9 +7,9 @@ public partial class SlotItem : ImagePanel
 {
     public readonly int SlotIndex;
     protected readonly ImagePanel _iconImage;
-    protected readonly ContextMenu _contextMenu;
+    protected readonly ContextMenu? _contextMenu;
 
-    public SlotItem(Base parent, string name, int index, ContextMenu contextMenu) : base(parent, name)
+    public SlotItem(Base parent, string name, int index, ContextMenu? contextMenu) : base(parent, name)
     {
         SlotIndex = index;
 
@@ -35,7 +35,7 @@ public virtual void Update()
     public virtual void OpenContextMenu()
     {
         // Display our menu... If we have anything to display.
-        if (_contextMenu.Children.Count > 0)
+        if (_contextMenu?.Children.Count > 0)
         {
             _contextMenu.Open(Pos.None);
         }
diff --git a/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs b/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs
@@ -61,7 +61,7 @@ public SpellItem(SpellsWindow spellWindow, Base parent, int index, ContextMenu c
 
         LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
         _useSpellMenuItem = _contextMenu.AddItem(Strings.SpellContextMenu.Cast.ToString());
         _useSpellMenuItem.Clicked += _useSpellMenuItem_Clicked;
         _forgetSpellMenuItem = _contextMenu.AddItem(Strings.SpellContextMenu.Forget.ToString());
@@ -74,7 +74,7 @@ public SpellItem(SpellsWindow spellWindow, Base parent, int index, ContextMenu c
     public void OpenContextMenu()
     {
         // Clear out the old options.
-        _contextMenu.ClearChildren();
+        _contextMenu!.ClearChildren();
 
         if (Globals.Me?.Spells is not { Length: > 0 } spellSlots)
         {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public InventoryItem(InventoryWindow inventoryWindow, Base parent, int index, Co`
`97`	`97`
`98`	`98`	`LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());`
`99`	`99`
`100`		`- _contextMenu.ClearChildren();`
	`100`	`+ _contextMenu!.ClearChildren();`
`101`	`101`	`_useItemMenuItem = _contextMenu.AddItem(Strings.ItemContextMenu.Use);`
`102`	`102`	`_useItemMenuItem.Clicked += _useItemContextItem_Clicked;`
`103`	`103`	`_dropItemMenuItem = _contextMenu.AddItem(Strings.ItemContextMenu.Drop);`
`@@ -117,7 +117,7 @@ public InventoryItem(InventoryWindow inventoryWindow, Base parent, int index, Co`
`117`	`117`	`public override void OpenContextMenu()`
`118`	`118`	`{`
`119`	`119`	`// Clear out the old options since we might not show all of them`
`120`		`- _contextMenu.ClearChildren();`
	`120`	`+ _contextMenu!.ClearChildren();`
`121`	`121`
`122`	`122`	`if (Globals.Me?.Inventory[SlotIndex] is not { } inventorySlot)`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public partial class SlotItem : ImagePanel`
`7`	`7`	`{`
`8`	`8`	`public readonly int SlotIndex;`
`9`	`9`	`protected readonly ImagePanel _iconImage;`
`10`		`- protected readonly ContextMenu _contextMenu;`
	`10`	`+ protected readonly ContextMenu? _contextMenu;`
`11`	`11`
`12`		`- public SlotItem(Base parent, string name, int index, ContextMenu contextMenu) : base(parent, name)`
	`12`	`+ public SlotItem(Base parent, string name, int index, ContextMenu? contextMenu) : base(parent, name)`
`13`	`13`	`{`
`14`	`14`	`SlotIndex = index;`
`15`	`15`
`@@ -35,7 +35,7 @@ public virtual void Update()`
`35`	`35`	`public virtual void OpenContextMenu()`
`36`	`36`	`{`
`37`	`37`	`// Display our menu... If we have anything to display.`
`38`		`- if (_contextMenu.Children.Count > 0)`
	`38`	`+ if (_contextMenu?.Children.Count > 0)`
`39`	`39`	`{`
`40`	`40`	`_contextMenu.Open(Pos.None);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public SpellItem(SpellsWindow spellWindow, Base parent, int index, ContextMenu c`
`61`	`61`
`62`	`62`	`LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());`
`63`	`63`
`64`		`- _contextMenu.ClearChildren();`
	`64`	`+ _contextMenu!.ClearChildren();`
`65`	`65`	`_useSpellMenuItem = _contextMenu.AddItem(Strings.SpellContextMenu.Cast.ToString());`
`66`	`66`	`_useSpellMenuItem.Clicked += _useSpellMenuItem_Clicked;`
`67`	`67`	`_forgetSpellMenuItem = _contextMenu.AddItem(Strings.SpellContextMenu.Forget.ToString());`
`@@ -74,7 +74,7 @@ public SpellItem(SpellsWindow spellWindow, Base parent, int index, ContextMenu c`
`74`	`74`	`public void OpenContextMenu()`
`75`	`75`	`{`
`76`	`76`	`// Clear out the old options.`
`77`		`- _contextMenu.ClearChildren();`
	`77`	`+ _contextMenu!.ClearChildren();`
`78`	`78`
`79`	`79`	`if (Globals.Me?.Spells is not { Length: > 0 } spellSlots)`
`80`	`80`	`{`