Merge pull request #4 from Jadams505/AsyncLoading

Prefer async loading

Author: emyhrberg

Core/Features/Items/ItemElement.cs

@@ -1,5 +1,6 @@
 using ChatPlus.Core.UI;
 using Microsoft.Xna.Framework.Graphics;
+using ReLogic.Content;
 using Terraria;
 using Terraria.GameContent;
 using Terraria.ModLoader.UI;
@@ -25,6 +26,11 @@ public override void Draw(SpriteBatch sb)
             var dims = GetDimensions();
             Vector2 pos = dims.Position();
 
+            if (TextureAssets.Item[item.ID] is var asset && asset.State == AssetState.NotLoaded)
+            {
+                Main.Assets.Request<Texture2D>(asset.Name);
+            }
+
             // Render tag
             string tag = item.Tag;
             float scale = 1.1f;

Core/Features/ModIcons/ModIconSnippet.cs

@@ -162,13 +162,13 @@ private static bool TryGetModIcon(string name, out Texture2D tex)
         // Priority: icon_small.* -> icon.*
         if (mod.FileExists("icon_small.png") || mod.FileExists("icon_small.rawimg"))
         {
-            tex = mod.Assets.Request<Texture2D>("icon_small", AssetRequestMode.ImmediateLoad).Value;
+            tex = mod.Assets.Request<Texture2D>("icon_small").Value;
             return tex != null;
         }
 
         if (mod.FileExists("icon.png"))
         {
-            tex = mod.Assets.Request<Texture2D>("icon", AssetRequestMode.ImmediateLoad).Value;
+            tex = mod.Assets.Request<Texture2D>("icon").Value;
             return tex != null;
         }
 

Core/Features/Stats/ModStats/ModInfoDrawer.cs

@@ -180,11 +180,11 @@ private static void DrawBigModIcon(SpriteBatch sb, Vector2 pos, int W, Mod mod)
 
         // Priority: icon_workshop
         if (mod.FileExists("icon_workshop.rawimg"))
-            tex = mod.Assets.Request<Texture2D>("icon_workshop", AssetRequestMode.ImmediateLoad).Value;
+            tex = mod.Assets.Request<Texture2D>("icon_workshop").Value;
         else if (mod.FileExists("icon.png"))
-            tex = mod.Assets.Request<Texture2D>("icon", AssetRequestMode.ImmediateLoad).Value;
+            tex = mod.Assets.Request<Texture2D>("icon").Value;
         else if (mod.FileExists("icon_small.rawimg"))
-            tex = mod.Assets.Request<Texture2D>("icon_small", AssetRequestMode.ImmediateLoad).Value;
+            tex = mod.Assets.Request<Texture2D>("icon_small").Value;
 
         if (tex != null)
         {