From 439d74c817de01cfc6a0a57d3ce522c958ae760b Mon Sep 17 00:00:00 2001
From: Soar Qin <soarchin@gmail.com>
Date: Tue, 23 Jun 2026 08:09:53 +0800
Subject: [PATCH] fix(UXAssist): preserve calling assembly semantics in Util
 facade

---
 UXAssist/Common/Util.cs                           | 8 ++++----
 UXAssist/Common/{Util => Utils}/PathUtil.cs       | 0
 UXAssist/Common/{Util => Utils}/ReflectionUtil.cs | 0
 UXAssist/Common/{Util => Utils}/ResourceUtil.cs   | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename UXAssist/Common/{Util => Utils}/PathUtil.cs (100%)
 rename UXAssist/Common/{Util => Utils}/ReflectionUtil.cs (100%)
 rename UXAssist/Common/{Util => Utils}/ResourceUtil.cs (100%)

diff --git a/UXAssist/Common/Util.cs b/UXAssist/Common/Util.cs
index 08f7c8e..0a5ce9f 100644
--- a/UXAssist/Common/Util.cs
+++ b/UXAssist/Common/Util.cs
@@ -21,7 +21,7 @@ public static class Util
 
     [Obsolete("Use ResourceUtil.LoadEmbeddedResource")]
     public static byte[] LoadEmbeddedResource(string path, Assembly assembly = null)
-        => ResourceUtil.LoadEmbeddedResource(path, assembly);
+        => ResourceUtil.LoadEmbeddedResource(path, assembly ?? Assembly.GetCallingAssembly());
 
     [Obsolete("Use ResourceUtil.LoadTexture")]
     public static Texture2D LoadTexture(string path)
@@ -33,13 +33,13 @@ public static class Util
 
     [Obsolete("Use ResourceUtil.LoadEmbeddedTexture")]
     public static Texture2D LoadEmbeddedTexture(string path, Assembly assembly = null)
-        => ResourceUtil.LoadEmbeddedTexture(path, assembly);
+        => ResourceUtil.LoadEmbeddedTexture(path, assembly ?? Assembly.GetCallingAssembly());
 
     [Obsolete("Use ResourceUtil.LoadEmbeddedSprite")]
     public static Sprite LoadEmbeddedSprite(string path, Assembly assembly = null)
-        => ResourceUtil.LoadEmbeddedSprite(path, assembly);
+        => ResourceUtil.LoadEmbeddedSprite(path, assembly ?? Assembly.GetCallingAssembly());
 
     [Obsolete("Use PathUtil.PluginFolder")]
     public static string PluginFolder(Assembly assembly = null)
-        => PathUtil.PluginFolder(assembly);
+        => PathUtil.PluginFolder(assembly ?? Assembly.GetCallingAssembly());
 }
diff --git a/UXAssist/Common/Util/PathUtil.cs b/UXAssist/Common/Utils/PathUtil.cs
similarity index 100%
rename from UXAssist/Common/Util/PathUtil.cs
rename to UXAssist/Common/Utils/PathUtil.cs
diff --git a/UXAssist/Common/Util/ReflectionUtil.cs b/UXAssist/Common/Utils/ReflectionUtil.cs
similarity index 100%
rename from UXAssist/Common/Util/ReflectionUtil.cs
rename to UXAssist/Common/Utils/ReflectionUtil.cs
diff --git a/UXAssist/Common/Util/ResourceUtil.cs b/UXAssist/Common/Utils/ResourceUtil.cs
similarity index 100%
rename from UXAssist/Common/Util/ResourceUtil.cs
rename to UXAssist/Common/Utils/ResourceUtil.cs