From 49ac51f0396598c09ac2978c1bf5dff0bc6ebb4f Mon Sep 17 00:00:00 2001 From: XtraCube <72575280+XtraCube@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:48:54 -0400 Subject: [PATCH] fix sprite tools assembly issues --- MiraAPI/Utilities/Assets/LoadableResourceAsset.cs | 7 +++++-- MiraAPI/Utilities/Assets/SpriteTools.cs | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MiraAPI/Utilities/Assets/LoadableResourceAsset.cs b/MiraAPI/Utilities/Assets/LoadableResourceAsset.cs index 2111e1d..70f20ef 100644 --- a/MiraAPI/Utilities/Assets/LoadableResourceAsset.cs +++ b/MiraAPI/Utilities/Assets/LoadableResourceAsset.cs @@ -1,9 +1,12 @@ -using UnityEngine; +using System.Reflection; +using UnityEngine; namespace MiraAPI.Utilities.Assets; public class LoadableResourceAsset(string path) : LoadableAsset { + private readonly Assembly _assembly = Assembly.GetCallingAssembly(); + public override Sprite LoadAsset() { if (LoadedAsset != null) @@ -13,7 +16,7 @@ public class LoadableResourceAsset(string path) : LoadableAsset try { - return LoadedAsset = SpriteTools.LoadSpriteFromPath(path); + return LoadedAsset = SpriteTools.LoadSpriteFromPath(path, _assembly); } catch { diff --git a/MiraAPI/Utilities/Assets/SpriteTools.cs b/MiraAPI/Utilities/Assets/SpriteTools.cs index cfb04aa..a3fde44 100644 --- a/MiraAPI/Utilities/Assets/SpriteTools.cs +++ b/MiraAPI/Utilities/Assets/SpriteTools.cs @@ -32,10 +32,9 @@ public static class SpriteTools /// The path to the resource. /// A sprite made from the resource /// The resource cannot be found. - public static Sprite LoadSpriteFromPath(string resourcePath) + public static Sprite LoadSpriteFromPath(string resourcePath, Assembly assembly) { var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false); - var assembly = Assembly.GetExecutingAssembly(); var myStream = assembly.GetManifestResourceStream(resourcePath); if (myStream != null) {