Globals.ContentManager? => GameContentManager.Current

Author: WeylonSantana

Intersect.Client.Core/Interface/Game/Bag/BagItem.cs

@@ -217,7 +217,7 @@ public override void Update()
             return;
         }
 
-        var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
+        var itemTexture = GameContentManager.Current.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
         if (itemTexture != default)
         {
             Icon.Texture = itemTexture;

Intersect.Client.Core/Interface/Game/Bank/BankItem.cs

@@ -249,7 +249,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
 
     #endregion
 
-    public new void Update()
+    public override void Update()
     {
         if (Globals.Me == default)
         {
@@ -282,7 +282,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             return;
         }
 
-        var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
+        var itemTexture = GameContentManager.Current.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
         if (itemTexture != default)
         {
             Icon.Texture = itemTexture;

Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs

@@ -242,7 +242,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
         return false;
     }
 
-    public void Update()
+    public override void Update()
     {
         if (Globals.Me == null || Controls.ActiveControls == null)
         {
@@ -412,7 +412,7 @@ public void Update()
             if (_currentItem != null)
             {
                 Icon.IsVisibleInTree = !isDragging;
-                Icon.Texture = Globals.ContentManager.GetTexture(
+                Icon.Texture = GameContentManager.Current.GetTexture(
                     Framework.Content.TextureType.Item, _currentItem.Icon
                 );
 

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

@@ -536,7 +536,7 @@ public override void Update()
             return;
         }
 
-        var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
+        var itemTexture = GameContentManager.Current.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
         if (itemTexture != null)
         {
             Icon.Texture = itemTexture;

Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs

@@ -222,7 +222,7 @@ public override void Update()
 
         if (Path.GetFileName(Icon.Texture?.Name) != spell.Icon)
         {
-            var spellIconTexture = Globals.ContentManager?.GetTexture(TextureType.Spell, spell.Icon);
+            var spellIconTexture = GameContentManager.Current.GetTexture(TextureType.Spell, spell.Icon);
             if (spellIconTexture != null)
             {
                 Icon.Texture = spellIconTexture;