com.wallstop-studios.unity-helpers 2.0.0-rc80.2 → 2.0.0-rc80.4

package/Runtime/Core/Attributes/ScriptableSingletonPathAttribute.cs

@@ -0,0 +1,15 @@
+namespace WallstopStudios.UnityHelpers.Core.Attributes
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    public sealed class ScriptableSingletonPathAttribute : Attribute
+    {
+        public readonly string resourcesPath;
+
+        public ScriptableSingletonPathAttribute(string resourcesPath)
+        {
+            this.resourcesPath = resourcesPath ?? string.Empty;
+        }
+    }
+}

package/Runtime/Core/Attributes/ScriptableSingletonPathAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f6e7e461ef354d009ce229352104d4db
+timeCreated: 1758580433

package/Runtime/Core/Helper/Partials/ObjectHelpers.cs

@@ -56,7 +56,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         {
             if (ObjectsByTag.TryGetValue(tag, out Object value))
             {
-                if (value != null && value is T typed)
+                if (value is T typed && typed != null)
                 {
                     return typed;
                 }
@@ -166,7 +166,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
             for (int i = 0; i < transform.childCount; ++i)
             {
                 Transform child = transform.GetChild(i);
-                EnableRecursively<T>(child, enabled, exclude);
+                EnableRecursively(child, enabled, exclude);
             }
         }
 
@@ -188,10 +188,14 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
                 behavior.enabled = enabled;
             }
 
-            Transform transform = component as Transform ?? component.transform;
+            Transform transform = component as Transform;
             if (transform == null)
             {
-                return;
+                transform = component.transform;
+                if (transform == null)
+                {
+                    return;
+                }
             }
 
             for (int i = 0; i < transform.childCount; ++i)
@@ -280,7 +284,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static void DestroyAllChildrenGameObjectsImmediately(this GameObject gameObject) =>
-            InternalDestroyAllChildrenGameObjects(gameObject, Object.DestroyImmediate);
+            InternalDestroyAllChildrenGameObjects(gameObject, go => Object.DestroyImmediate(go));
 
         public static void PlayDestroyAllChildrenGameObjects(this GameObject gameObject) =>
             InternalDestroyAllChildrenGameObjects(gameObject, go => go.Destroy());
@@ -301,9 +305,17 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 
         public static bool IsPrefab(this GameObject gameObject)
         {
+            if (gameObject == null)
+            {
+                return false;
+            }
+
             Scene scene = gameObject.scene;
 #if UNITY_EDITOR
-            if (scene.rootCount == 1 && string.Equals(scene.name, gameObject.name))
+            if (
+                scene.rootCount == 1
+                && string.Equals(scene.name, gameObject.name, StringComparison.Ordinal)
+            )
             {
                 return true;
             }
@@ -321,6 +333,11 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 
         public static bool IsPrefab(this Component component)
         {
+            if (component == null)
+            {
+                return false;
+            }
+
             return IsPrefab(component.gameObject);
         }
 

package/Runtime/Utils/ScriptableObjectSingleton.cs

@@ -2,6 +2,8 @@ namespace WallstopStudios.UnityHelpers.Utils
 {
     using System;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Attributes;
+    using WallstopStudios.UnityHelpers.Core.Helper;
 #if ODIN_INSPECTOR
     using Sirenix.OdinInspector;
 #endif
@@ -14,9 +16,46 @@ namespace WallstopStudios.UnityHelpers.Utils
 #endif
         where T : ScriptableObjectSingleton<T>
     {
+        private static string GetResourcesPath()
+        {
+            Type type = typeof(T);
+            ScriptableSingletonPathAttribute attribute =
+                ReflectionHelpers.GetAttributeSafe<ScriptableSingletonPathAttribute>(type);
+            if (attribute != null && !string.IsNullOrWhiteSpace(attribute.resourcesPath))
+            {
+                return attribute.resourcesPath;
+            }
+
+            return type.Name;
+        }
+
         protected static readonly Lazy<T> LazyInstance = new(() =>
         {
-            T[] instances = Resources.LoadAll<T>(string.Empty);
+            string path = GetResourcesPath();
+            T[] instances = Resources.LoadAll<T>(path);
+
+            if (instances == null || instances.Length == 0)
+            {
+                T named = Resources.Load<T>(typeof(T).Name);
+                if (named != null)
+                {
+                    instances = new[] { named };
+                }
+            }
+
+            if (instances == null || instances.Length == 0)
+            {
+                instances = Resources.LoadAll<T>(string.Empty);
+            }
+
+            if (instances == null)
+            {
+                Debug.LogError(
+                    $"Failed to find ScriptableSingleton of {typeof(T).Name} - null instances."
+                );
+                return default;
+            }
+
             switch (instances.Length)
             {
                 case 1:
@@ -25,7 +64,9 @@ namespace WallstopStudios.UnityHelpers.Utils
                 }
                 case 0:
                 {
-                    Debug.LogError($"Failed to find ScriptableSingleton of type {typeof(T).Name}.");
+                    Debug.LogError(
+                        $"Failed to find ScriptableSingleton of type {typeof(T).Name} - empty instances."
+                    );
                     return null;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc80.2",
+  "version": "2.0.0-rc80.4",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -54,5 +54,7 @@
 
 
 
+
+