soarqin/DSP_Mods
1
0
Fork 0
mirror of https://github.com/soarqin/DSP_Mods.git synced 2026-08-05 09:30:13 +08:00
Code Activity

refactor(UXAssist): split Util into focused helpers with forwarding facade

Browse Source
This commit is contained in:
soarqin
2026-06-23 08:04:58 +08:00
parent f4b163fae9
commit ed916ebe7f
4 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UXAssist/Common/Util.cs
+21 -54
View File
@@ -1,78 +1,45 @@
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using UnityEngine;
using UXAssist.Common.Utils;
namespace UXAssist.Common;
public static class Util
{
/// <summary>
/// Returns all types from the assembly matching the predicate, tolerating partially loadable assemblies.
/// </summary>
[Obsolete("Use ReflectionUtil.GetTypesFiltered")]
public static Type[] GetTypesFiltered(Assembly assembly, Func<Type, bool> predicate)
{
try
{
return [.. assembly.GetTypes().Where(predicate)];
}
catch (ReflectionTypeLoadException ex)
{
return [.. ex.Types.Where(t => t != null).Where(predicate)];
}
}
=> ReflectionUtil.GetTypesFiltered(assembly, predicate);
public static Type[] GetTypesInNamespace(Assembly assembly, string nameSpace) => GetTypesFiltered(assembly, t => string.Equals(t.Namespace, nameSpace, StringComparison.Ordinal));
[Obsolete("Use ReflectionUtil.GetTypesInNamespace")]
public static Type[] GetTypesInNamespace(Assembly assembly, string nameSpace)
=> ReflectionUtil.GetTypesInNamespace(assembly, nameSpace);
[Obsolete("Use ReflectionUtil.GetTypesInNamespacePrefix")]
public static Type[] GetTypesInNamespacePrefix(Assembly assembly, string prefix)
{
return GetTypesFiltered(assembly, t =>
t.Namespace != null &&
(t.Namespace == prefix || t.Namespace.StartsWith(prefix + ".", StringComparison.Ordinal)));
}
=> ReflectionUtil.GetTypesInNamespacePrefix(assembly, prefix);
[Obsolete("Use ResourceUtil.LoadEmbeddedResource")]
public static byte[] LoadEmbeddedResource(string path, Assembly assembly = null)
{
if (assembly == null)
{
assembly = Assembly.GetCallingAssembly();
}
var info = assembly.GetName();
var name = info.Name;
using var stream = assembly.GetManifestResourceStream($"{name}.{path.Replace('/', '.')}")!;
var buffer = new byte[stream.Length];
_ = stream.Read(buffer, 0, buffer.Length);
return buffer;
}
=> ResourceUtil.LoadEmbeddedResource(path, assembly);
[Obsolete("Use ResourceUtil.LoadTexture")]
public static Texture2D LoadTexture(string path)
{
var fileData = File.ReadAllBytes(path);
var tex = new Texture2D(2, 2);
tex.LoadImage(fileData);
return tex;
}
=> ResourceUtil.LoadTexture(path);
[Obsolete("Use ResourceUtil.LoadSprite")]
public static Sprite LoadSprite(string path)
{
var tex = LoadTexture(path);
return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
}
=> ResourceUtil.LoadSprite(path);
[Obsolete("Use ResourceUtil.LoadEmbeddedTexture")]
public static Texture2D LoadEmbeddedTexture(string path, Assembly assembly = null)
{
var fileData = LoadEmbeddedResource(path, assembly);
var tex = new Texture2D(2, 2);
tex.LoadImage(fileData);
return tex;
}
=> ResourceUtil.LoadEmbeddedTexture(path, assembly);
[Obsolete("Use ResourceUtil.LoadEmbeddedSprite")]
public static Sprite LoadEmbeddedSprite(string path, Assembly assembly = null)
{
var tex = LoadEmbeddedTexture(path, assembly);
return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
}
=> ResourceUtil.LoadEmbeddedSprite(path, assembly);
public static string PluginFolder(Assembly assembly = null) => Path.GetDirectoryName((assembly == null ? Assembly.GetCallingAssembly() : assembly).Location);
[Obsolete("Use PathUtil.PluginFolder")]
public static string PluginFolder(Assembly assembly = null)
=> PathUtil.PluginFolder(assembly);
}
UXAssist/Common/Util/PathUtil.cs
+9
View File
@@ -0,0 +1,9 @@
using System.IO;
using System.Reflection;
namespace UXAssist.Common.Utils;
public static class PathUtil
{
public static string PluginFolder(Assembly assembly = null) => Path.GetDirectoryName((assembly == null ? Assembly.GetCallingAssembly() : assembly).Location);
}
UXAssist/Common/Util/ReflectionUtil.cs
+32
View File
@@ -0,0 +1,32 @@
using System;
using System.Linq;
using System.Reflection;
namespace UXAssist.Common.Utils;
public static class ReflectionUtil
{
/// <summary>
/// Returns all types from the assembly matching the predicate, tolerating partially loadable assemblies.
/// </summary>
public static Type[] GetTypesFiltered(Assembly assembly, Func<Type, bool> predicate)
{
try
{
return [.. assembly.GetTypes().Where(predicate)];
}
catch (ReflectionTypeLoadException ex)
{
return [.. ex.Types.Where(t => t != null).Where(predicate)];
}
}
public static Type[] GetTypesInNamespace(Assembly assembly, string nameSpace) => GetTypesFiltered(assembly, t => string.Equals(t.Namespace, nameSpace, StringComparison.Ordinal));
public static Type[] GetTypesInNamespacePrefix(Assembly assembly, string prefix)
{
return GetTypesFiltered(assembly, t =>
t.Namespace != null &&
(t.Namespace == prefix || t.Namespace.StartsWith(prefix + ".", StringComparison.Ordinal)));
}
}
UXAssist/Common/Util/ResourceUtil.cs
+50
View File
@@ -0,0 +1,50 @@
using System.IO;
using System.Reflection;
using UnityEngine;
namespace UXAssist.Common.Utils;
public static class ResourceUtil
{
public static byte[] LoadEmbeddedResource(string path, Assembly assembly = null)
{
if (assembly == null)
{
assembly = Assembly.GetCallingAssembly();
}
var info = assembly.GetName();
var name = info.Name;
using var stream = assembly.GetManifestResourceStream($"{name}.{path.Replace('/', '.')}")!;
var buffer = new byte[stream.Length];
_ = stream.Read(buffer, 0, buffer.Length);
return buffer;
}
public static Texture2D LoadTexture(string path)
{
var fileData = File.ReadAllBytes(path);
var tex = new Texture2D(2, 2);
tex.LoadImage(fileData);
return tex;
}
public static Sprite LoadSprite(string path)
{
var tex = LoadTexture(path);
return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
}
public static Texture2D LoadEmbeddedTexture(string path, Assembly assembly = null)
{
var fileData = LoadEmbeddedResource(path, assembly);
var tex = new Texture2D(2, 2);
tex.LoadImage(fileData);
return tex;
}
public static Sprite LoadEmbeddedSprite(string path, Assembly assembly = null)
{
var tex = LoadEmbeddedTexture(path, assembly);
return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
}
}