com.wallstop-studios.unity-helpers 2.0.0-rc73.4 → 2.0.0-rc73.6

package/Editor/AnimationCopier.cs

@@ -437,7 +437,10 @@
                     string sourceRelPath = AssetDatabase.GUIDToAssetPath(guid);
                     if (
                         string.IsNullOrWhiteSpace(sourceRelPath)
-                        || !sourceRelPath.StartsWith(_animationSourcePathRelative)
+                        || !sourceRelPath.StartsWith(
+                            _animationSourcePathRelative,
+                            StringComparison.OrdinalIgnoreCase
+                        )
                     )
                     {
                         continue;
@@ -506,7 +509,10 @@
                     else
                     {
                         string destHash = CalculateFileHash(destFullPath);
-                        if (string.IsNullOrEmpty(sourceInfo.Hash) || string.IsNullOrEmpty(destHash))
+                        if (
+                            string.IsNullOrWhiteSpace(sourceInfo.Hash)
+                            || string.IsNullOrWhiteSpace(destHash)
+                        )
                         {
                             this.LogWarn(
                                 $"Could not compare '{sourceInfo.FileName}' due to hashing error. Treating as 'Changed'."
@@ -594,8 +600,32 @@
 
             int successCount = 0;
             int errorCount = 0;
-            AssetDatabase.StartAssetEditing();
+            foreach (AnimationFileInfo animInfo in animationsToCopy)
+            {
+                string destinationAssetPath = animInfo.DestinationRelativePath;
+                string destDirectory = Path.GetDirectoryName(destinationAssetPath).SanitizePath();
+
+                if (
+                    string.IsNullOrWhiteSpace(destDirectory)
+                    || AssetDatabase.IsValidFolder(destDirectory)
+                )
+                {
+                    continue;
+                }
 
+                try
+                {
+                    EnsureDirectoryExists(destDirectory);
+                }
+                catch (Exception ex)
+                {
+                    this.LogError(
+                        $"Failed to create destination directory '{destDirectory}' for animation '{animInfo.FileName}'. Error: {ex.Message}. Skipping."
+                    );
+                }
+            }
+
+            AssetDatabase.StartAssetEditing();
             try
             {
                 for (int i = 0; i < animationsToCopy.Count; i++)
@@ -616,28 +646,6 @@
 
                     string sourceAssetPath = animInfo.RelativePath;
                     string destinationAssetPath = animInfo.DestinationRelativePath;
-                    string destDirectory = Path.GetDirectoryName(destinationAssetPath)
-                        .SanitizePath();
-
-                    if (
-                        !string.IsNullOrEmpty(destDirectory)
-                        && !AssetDatabase.IsValidFolder(destDirectory)
-                    )
-                    {
-                        try
-                        {
-                            EnsureDirectoryExists(destDirectory);
-                        }
-                        catch (Exception ex)
-                        {
-                            this.LogError(
-                                $"Failed to create destination directory '{destDirectory}' for animation '{animInfo.FileName}'. Error: {ex.Message}. Skipping."
-                            );
-                            errorCount++;
-                            continue;
-                        }
-                    }
-
                     bool copySuccessful = AssetDatabase.CopyAsset(
                         sourceAssetPath,
                         destinationAssetPath
@@ -868,28 +876,28 @@
             return string.Empty;
         }
 
-        private static string CalculateFileHash(string filePath)
+        private string CalculateFileHash(string filePath)
         {
             try
             {
-                using (MD5 md5 = MD5.Create())
-                using (FileStream stream = File.OpenRead(filePath))
-                {
-                    byte[] hashBytes = md5.ComputeHash(stream);
-                    return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
-                }
+                using MD5 md5 = MD5.Create();
+                using FileStream stream = File.OpenRead(filePath);
+                byte[] hashBytes = md5.ComputeHash(stream);
+                return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
             }
             catch (IOException ioEx)
             {
-                Debug.LogError(
-                    $"[AnimationCopierWindow] IO Error calculating hash for {filePath}: {ioEx.Message}"
+                this.LogError(
+                    $"[AnimationCopierWindow] IO Error calculating hash for {filePath}.",
+                    ioEx
                 );
                 return string.Empty;
             }
             catch (Exception ex)
             {
-                Debug.LogError(
-                    $"[AnimationCopierWindow] Error calculating hash for {filePath}: {ex.Message}"
+                this.LogError(
+                    $"[AnimationCopierWindow] Error calculating hash for {filePath}.",
+                    ex
                 );
                 return string.Empty;
             }
@@ -901,6 +909,7 @@
             {
                 return;
             }
+
             if (!relativeDirectoryPath.StartsWith("Assets/"))
             {
                 if (relativeDirectoryPath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
@@ -923,15 +932,14 @@
             }
 
             string parentPath = Path.GetDirectoryName(relativeDirectoryPath).SanitizePath();
-
             if (
-                string.IsNullOrEmpty(parentPath)
+                string.IsNullOrWhiteSpace(parentPath)
                 || parentPath.Equals("Assets", StringComparison.OrdinalIgnoreCase)
             )
             {
                 string folderNameToCreate = Path.GetFileName(relativeDirectoryPath);
                 if (
-                    !string.IsNullOrEmpty(folderNameToCreate)
+                    !string.IsNullOrWhiteSpace(folderNameToCreate)
                     && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
                 )
                 {
@@ -941,10 +949,9 @@
             }
 
             EnsureDirectoryExists(parentPath);
-
             string currentFolderName = Path.GetFileName(relativeDirectoryPath);
             if (
-                !string.IsNullOrEmpty(currentFolderName)
+                !string.IsNullOrWhiteSpace(currentFolderName)
                 && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
             )
             {

package/Editor/AnimationCreator.cs

@@ -7,8 +7,10 @@
     using System.IO;
     using System.Linq;
     using System.Text.RegularExpressions;
+    using Core.Helper;
     using UnityEditor;
     using UnityEngine;
+    using Utils;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -25,6 +27,8 @@
 
     public sealed class AnimationCreatorWindow : EditorWindow
     {
+        private static readonly char[] WhiteSpaceSplitters = { ' ', '\t', '\n', '\r' };
+
         private SerializedObject _serializedObject;
         private SerializedProperty _animationDataProp;
         private SerializedProperty _animationSourcesProp;
@@ -87,7 +91,7 @@
             else if (
                 _animationSourcesProp.arraySize == 0
                 || _animationSourcesProp.FindPropertyRelative("Array.size").intValue == 0
-                || animationSources.TrueForAll(s => s == null)
+                || animationSources.TrueForAll(Objects.Null)
             )
             {
                 EditorGUILayout.HelpBox(
@@ -205,10 +209,7 @@
             int listSize = _animationDataProp.arraySize;
             string[] searchTerms = string.IsNullOrWhiteSpace(_searchString)
                 ? Array.Empty<string>()
-                : _searchString.Split(
-                    new[] { ' ', '\t', '\n', '\r' },
-                    StringSplitOptions.RemoveEmptyEntries
-                );
+                : _searchString.Split(WhiteSpaceSplitters, StringSplitOptions.RemoveEmptyEntries);
 
             List<int> matchingIndices = new();
             for (int i = 0; i < listSize; ++i)
@@ -245,7 +246,7 @@
 
             if (_animationDataIsExpanded)
             {
-                EditorGUI.indentLevel++;
+                using GUIIndentScope indent = new();
                 if (matchCount > 0)
                 {
                     foreach (int index in matchingIndices)
@@ -273,8 +274,6 @@
                         MessageType.Info
                     );
                 }
-
-                EditorGUI.indentLevel--;
             }
         }
 
@@ -439,14 +438,14 @@
             }
 
             EditorGUILayout.Space();
-            using (new EditorGUI.DisabledScope(animationData == null || animationData.Count == 0))
+            using (new EditorGUI.DisabledScope(animationData is not { Count: > 0 }))
             {
                 if (GUILayout.Button("Create Animations"))
                 {
                     CreateAnimations();
                 }
             }
-            if (animationData == null || animationData.Count == 0)
+            if (animationData is not { Count: > 0 })
             {
                 EditorGUILayout.HelpBox(
                     "Add Animation Data entries before creating.",
@@ -457,7 +456,7 @@
 
         private void CreateAnimations()
         {
-            if (animationData is not { Count: not 0 })
+            if (animationData is not { Count: > 0 })
             {
                 this.LogError($"No animation data to create.");
                 return;
@@ -532,7 +531,7 @@
                     }
 
                     List<Sprite> frames = data.frames;
-                    if (frames is not { Count: not 0 })
+                    if (frames is not { Count: > 0 })
                     {
                         this.LogWarn(
                             $"Ignoring animation '{animationName}' because it has no frames."
@@ -659,7 +658,7 @@
             _matchedSpriteCount = 0;
             _unmatchedSpriteCount = 0;
 
-            if (animationSources is not { Count: not 0 } || _compiledRegex == null)
+            if (animationSources is not { Count: > 0 } || _compiledRegex == null)
             {
                 if (_compiledRegex == null && !string.IsNullOrWhiteSpace(spriteNameRegex))
                 {
@@ -667,7 +666,7 @@
                         $"Cannot find sprites, regex pattern '{spriteNameRegex}' is invalid."
                     );
                 }
-                else if (animationSources is not { Count: not 0 })
+                else if (animationSources is not { Count: > 0 })
                 {
                     this.LogWarn($"Cannot find sprites, no animation sources specified.");
                 }
@@ -675,13 +674,8 @@
             }
 
             List<string> searchPaths = new();
-            foreach (Object source in animationSources)
+            foreach (Object source in animationSources.Where(Objects.NotNull))
             {
-                if (source == null)
-                {
-                    continue;
-                }
-
                 string path = AssetDatabase.GetAssetPath(source);
                 if (!string.IsNullOrWhiteSpace(path) && AssetDatabase.IsValidFolder(path))
                 {

package/Editor/AnimationEventEditor.cs

@@ -9,6 +9,7 @@
     using UnityEngine;
     using Core.Attributes;
     using Core.Helper;
+    using Utils;
     using WallstopStudios.UnityHelpers.Utils;
 
     // https://gist.githubusercontent.com/yujen/5e1cd78e2a341260b38029de08a449da/raw/ac60c1002e0e14375de5b2b0a167af00df3f74b4/SeniaAnimationEventEditor.cs
@@ -172,16 +173,15 @@
 
                 DrawSpritePreview(item);
 
-                EditorGUI.indentLevel++;
-                RenderAnimationEventItem(item, frame, frameRate);
-
-                if (i != stateCopy.Count - 1)
+                using (new GUIIndentScope())
                 {
-                    DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
-                    EditorGUILayout.Space();
+                    RenderAnimationEventItem(item, frame, frameRate);
+                    if (i != stateCopy.Count - 1)
+                    {
+                        DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
+                        EditorGUILayout.Space();
+                    }
                 }
-
-                EditorGUI.indentLevel--;
             }
 
             EditorGUILayout.EndScrollView();
@@ -320,8 +320,7 @@
         private void RenderAnimationEventItem(AnimationEventItem item, int frame, float frameRate)
         {
             int index = _state.IndexOf(item);
-            EditorGUILayout.BeginHorizontal();
-            try
+            using (new GUIHorizontalScope())
             {
                 if (
                     1 <= index
@@ -369,10 +368,6 @@
                     return;
                 }
             }
-            finally
-            {
-                EditorGUILayout.EndHorizontal();
-            }
 
             IReadOnlyDictionary<Type, IReadOnlyList<MethodInfo>> lookup = FilterLookup(item);
 
@@ -541,7 +536,7 @@
             ParameterInfo[] arrayParameterInfo = item.selectedMethod.GetParameters();
             if (arrayParameterInfo.Length == 1)
             {
-                EditorGUI.indentLevel++;
+                using GUIIndentScope indent = new();
 
                 Type paramType = arrayParameterInfo[0].ParameterType;
                 if (paramType == typeof(int))
@@ -602,8 +597,6 @@
                         true
                     );
                 }
-
-                EditorGUI.indentLevel--;
             }
         }
 
@@ -686,8 +679,7 @@
             }
             else if (!item.isTextureReadable && !string.IsNullOrEmpty(spriteName))
             {
-                EditorGUILayout.BeginHorizontal();
-                try
+                using (new GUIHorizontalScope())
                 {
                     GUILayout.Label($"Sprite '{spriteName}' required \"Read/Write\" enabled");
                     if (item.sprite != null && GUILayout.Button("Fix"))
@@ -711,10 +703,6 @@
                         EditorUtility.SetDirty(item.sprite);
                     }
                 }
-                finally
-                {
-                    EditorGUILayout.EndHorizontal();
-                }
             }
             else if (item.isInvalidTextureRect && !string.IsNullOrEmpty(spriteName))
             {

package/Editor/FitTextureSizeWindow.cs

@@ -40,7 +40,7 @@
                 nameof(_textureSourcePaths)
             );
 
-            if (_textureSourcePaths != null && _textureSourcePaths.Count != 0)
+            if (_textureSourcePaths is { Count: > 0 })
             {
                 return;
             }

package/Editor/PrefabChecker.cs

@@ -12,6 +12,7 @@
     using Core.Attributes;
     using Core.Extension;
     using Core.Helper;
+    using Utils;
     using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
@@ -148,23 +149,16 @@
             GUI.enabled = wasEnabled && _checkNullObjectReferences;
             try
             {
-                EditorGUI.indentLevel++;
-                try
-                {
-                    DrawAndAlign(
-                        new GUIContent(
-                            "Only if [ValidateAssignment]",
-                            "Only report null object references if the field has the [ValidateAssignment] attribute."
-                        ),
-                        () => _onlyCheckNullObjectsWithAttribute,
-                        v => _onlyCheckNullObjectsWithAttribute = v,
-                        true
-                    );
-                }
-                finally
-                {
-                    EditorGUI.indentLevel--;
-                }
+                using GUIIndentScope indent = new();
+                DrawAndAlign(
+                    new GUIContent(
+                        "Only if [ValidateAssignment]",
+                        "Only report null object references if the field has the [ValidateAssignment] attribute."
+                    ),
+                    () => _onlyCheckNullObjectsWithAttribute,
+                    v => _onlyCheckNullObjectsWithAttribute = v,
+                    true
+                );
             }
             finally
             {
@@ -374,7 +368,7 @@
 
         private void RunChecks()
         {
-            if (_assetPaths == null || _assetPaths.Count == 0)
+            if (_assetPaths is not { Count: > 0 })
             {
                 this.LogError($"No asset paths specified. Add folders containing prefabs.");
                 return;

package/Editor/SpriteAtlasGenerator.cs

@@ -45,7 +45,7 @@
                 {
                     foreach (Sprite sprite in Sprites)
                     {
-                        if (sprite != null && sprite.rect is { width: > 0, height: > 0 })
+                        if (sprite is { rect: { width: > 0, height: > 0 } })
                         {
                             TotalArea += (long)(sprite.rect.width * sprite.rect.height);
                         }
@@ -249,7 +249,7 @@
                     Application.dataPath,
                     ""
                 );
-                if (!string.IsNullOrEmpty(absPath))
+                if (!string.IsNullOrWhiteSpace(absPath))
                 {
                     if (absPath.StartsWith(Application.dataPath, StringComparison.Ordinal))
                     {
@@ -295,16 +295,12 @@
             try
             {
                 float total = _sourceFolders.Length;
-                foreach (Object obj in _sourceFolders)
+                foreach (Object obj in _sourceFolders.Where(Objects.NotNull))
                 {
-                    if (obj == null)
-                    {
-                        continue;
-                    }
-
                     string folderPath = AssetDatabase.GetAssetPath(obj);
                     if (
-                        string.IsNullOrEmpty(folderPath) || !AssetDatabase.IsValidFolder(folderPath)
+                        string.IsNullOrWhiteSpace(folderPath)
+                        || !AssetDatabase.IsValidFolder(folderPath)
                     )
                     {
                         this.LogWarn($"Skipping invalid or null source folder entry.");
@@ -312,7 +308,7 @@
                     }
 
                     string[] guids = AssetDatabase.FindAssets("t:Sprite", new[] { folderPath });
-                    for (int i = 0; i < guids.Length; i++)
+                    for (int i = 0; i < guids.Length; ++i)
                     {
                         EditorUtility.DisplayProgressBar(
                             Name,
@@ -329,14 +325,8 @@
                             continue;
                         }
 
-                        IEnumerable<Sprite> sprites = assets.OfType<Sprite>();
-                        foreach (Sprite sp in sprites)
+                        foreach (Sprite sp in assets.OfType<Sprite>().Where(Objects.NotNull))
                         {
-                            if (sp == null)
-                            {
-                                continue;
-                            }
-
                             _totalCount++;
                             if (regex.IsMatch(sp.name))
                             {
@@ -369,11 +359,7 @@
                     return;
                 }
 
-                if (
-                    _sourceFolders == null
-                    || _sourceFolders.Length == 0
-                    || _sourceFolders.All(f => f == null)
-                )
+                if (_sourceFolders == null || Array.TrueForAll(_sourceFolders, Objects.Null))
                 {
                     this.LogError($"No valid source folders specified.");
                     EditorUtility.ClearProgressBar();
@@ -386,7 +372,10 @@
                     {
                         string parent = Path.GetDirectoryName(_outputFolder);
                         string newFolderName = Path.GetFileName(_outputFolder);
-                        if (string.IsNullOrEmpty(parent) || string.IsNullOrEmpty(newFolderName))
+                        if (
+                            string.IsNullOrWhiteSpace(parent)
+                            || string.IsNullOrWhiteSpace(newFolderName)
+                        )
                         {
                             this.LogError($"Output folder path '{_outputFolder}' is invalid.");
                             EditorUtility.ClearProgressBar();
@@ -415,7 +404,7 @@
                 string[] existing = AssetDatabase
                     .FindAssets("t:SpriteAtlas", new[] { _outputFolder })
                     .Select(AssetDatabase.GUIDToAssetPath)
-                    .Where(p => !string.IsNullOrEmpty(p))
+                    .Where(path => !string.IsNullOrWhiteSpace(path))
                     .ToArray();
 
                 if (existing.Length > 0)
@@ -439,7 +428,7 @@
                 Regex regex;
                 try
                 {
-                    regex = new(_nameRegex);
+                    regex = new Regex(_nameRegex);
                 }
                 catch (ArgumentException ex)
                 {
@@ -455,13 +444,8 @@
                     _sourceFolders.Length > 0 ? 0.2f / _sourceFolders.Length : 0f;
                 float sourceFolderProgress = 0.1f;
 
-                foreach (Object sourceDirectory in _sourceFolders)
+                foreach (Object sourceDirectory in _sourceFolders.Where(Objects.NotNull))
                 {
-                    if (sourceDirectory == null)
-                    {
-                        continue;
-                    }
-
                     string folderPath = AssetDatabase.GetAssetPath(sourceDirectory);
                     if (!AssetDatabase.IsValidFolder(folderPath))
                     {
@@ -485,7 +469,7 @@
                     )
                     {
                         string assetPath = AssetDatabase.GUIDToAssetPath(assetGuid);
-                        if (string.IsNullOrEmpty(assetPath))
+                        if (string.IsNullOrWhiteSpace(assetPath))
                         {
                             continue;
                         }
@@ -496,13 +480,8 @@
                             continue;
                         }
 
-                        foreach (Sprite sub in allAssets.OfType<Sprite>())
+                        foreach (Sprite sub in allAssets.OfType<Sprite>().Where(Objects.NotNull))
                         {
-                            if (sub == null)
-                            {
-                                continue;
-                            }
-
                             string assetName = sub.name;
                             if (!regex.IsMatch(assetName))
                             {
@@ -518,14 +497,13 @@
 
                 int totalChunks = 0;
                 Dictionary<string, List<List<Sprite>>> groupChunks = new();
-
                 EditorUtility.DisplayProgressBar(Name, "Calculating chunks...", 0.3f);
-
                 foreach (KeyValuePair<string, List<Sprite>> kv in groups)
                 {
                     List<Sprite> spritesInGroup = kv
-                        .Value.Where(s => s != null && s.rect is { width: > 0, height: > 0 })
-                        .OrderByDescending(s => s.rect.width * s.rect.height)
+                        .Value.Where(Objects.NotNull)
+                        .Where(sprite => sprite.rect is { width: > 0, height: > 0 })
+                        .OrderByDescending(sprite => sprite.rect.width * sprite.rect.height)
                         .ToList();
                     if (!spritesInGroup.Any())
                     {
@@ -599,7 +577,7 @@
                         ) in groupChunks
                     )
                     {
-                        for (int i = 0; i < chunksForThisGroup.Count; i++)
+                        for (int i = 0; i < chunksForThisGroup.Count; ++i)
                         {
                             if (!chunksForThisGroup[i].Any())
                             {
@@ -621,21 +599,21 @@
                     }
 
                     allInitialCandidates = allInitialCandidates
-                        .OrderByDescending(c => c.TotalArea)
-                        .ThenBy(c => c.CandidateName, StringComparer.Ordinal)
+                        .OrderByDescending(candidate => candidate.TotalArea)
+                        .ThenBy(candidate => candidate.CandidateName, StringComparer.Ordinal)
                         .ToList();
 
                     List<MergeableAtlas> workingAtlases = allInitialCandidates
-                        .Select(c => new MergeableAtlas(
-                            c.OriginalGroupKey,
-                            c.Sprites,
-                            c.CandidateName,
-                            c.TotalArea
+                        .Select(candidate => new MergeableAtlas(
+                            candidate.OriginalGroupKey,
+                            candidate.Sprites,
+                            candidate.CandidateName,
+                            candidate.TotalArea
                         ))
                         .ToList();
                     int passNumber = 0;
-                    float mergeOptimizationProgressStart = 0.30f;
-                    float mergeOptimizationProgressRange = 0.50f;
+                    const float mergeOptimizationProgressStart = 0.3f;
+                    const float mergeOptimizationProgressRange = 0.5f;
 
                     while (true)
                     {
@@ -643,7 +621,7 @@
                         bool mergedInThisPass = false;
                         float currentPassProgress =
                             mergeOptimizationProgressStart
-                            + passNumber * (mergeOptimizationProgressRange / 15.0f);
+                            + passNumber * (mergeOptimizationProgressRange / 15f);
                         EditorUtility.DisplayProgressBar(
                             Name,
                             $"Optimizing atlas count (Pass {passNumber}, {workingAtlases.Count} atlases)...",
@@ -654,13 +632,16 @@
                         );
 
                         workingAtlases = workingAtlases
-                            .OrderByDescending(a => a.TotalArea)
-                            .ThenBy(a => a.RepresentativeInitialName, StringComparer.Ordinal)
+                            .OrderByDescending(atlas => atlas.TotalArea)
+                            .ThenBy(
+                                atlas => atlas.RepresentativeInitialName,
+                                StringComparer.Ordinal
+                            )
                             .ToList();
 
                         bool[] isSubsumed = new bool[workingAtlases.Count];
 
-                        for (int i = 0; i < workingAtlases.Count; i++)
+                        for (int i = 0; i < workingAtlases.Count; ++i)
                         {
                             if (isSubsumed[i])
                             {
@@ -669,14 +650,14 @@
 
                             MergeableAtlas baseAtlas = workingAtlases[i];
                             string baseRepresentativeKey = baseAtlas
-                                .OriginalGroupKeys.OrderBy(k => k, StringComparer.Ordinal)
+                                .OriginalGroupKeys.OrderBy(key => key, StringComparer.Ordinal)
                                 .First();
 
                             int bestPartnerIndex = -1;
                             MergeableAtlas bestPartnerObject = null;
                             int currentMinLevenshtein = int.MaxValue;
 
-                            for (int j = i + 1; j < workingAtlases.Count; j++)
+                            for (int j = i + 1; j < workingAtlases.Count; ++j)
                             {
                                 if (isSubsumed[j])
                                 {
@@ -693,7 +674,7 @@
                                 }
 
                                 string partnerRepresentativeKey = potentialPartner
-                                    .OriginalGroupKeys.OrderBy(k => k, StringComparer.Ordinal)
+                                    .OriginalGroupKeys.OrderBy(key => key, StringComparer.Ordinal)
                                     .First();
                                 int distance = baseRepresentativeKey.LevenshteinDistance(
                                     partnerRepresentativeKey
@@ -754,8 +735,8 @@
                     }
 
                     finalAtlasesData = workingAtlases
-                        .Select(a => (Name: a.GenerateFinalName(), Sprites: a.Sprites))
-                        .OrderBy(a => a.Name)
+                        .Select(atlas => (Name: atlas.GenerateFinalName(), atlas.Sprites))
+                        .OrderBy(atlas => atlas.Name, StringComparer.Ordinal)
                         .ToList();
                 }
                 else
@@ -766,7 +747,7 @@
                             string prefix = chunk.Key;
                             List<List<Sprite>> chunks = chunk.Value;
                             List<(string, List<Sprite>)> finalChunks = new();
-                            for (int i = 0; i < chunks.Count; i++)
+                            for (int i = 0; i < chunks.Count; ++i)
                             {
                                 string atlasName = chunks.Count > 1 ? $"{prefix}_{i}" : prefix;
                                 finalChunks.Add((atlasName, chunks[i]));
@@ -775,15 +756,15 @@
                         })
                         .ToList();
                     int chunkIndex = 0;
-                    float atlasCreationProgressStart = 0.45f;
-                    float atlasCreationProgressRange = 0.5f;
+                    const float atlasCreationProgressStart = 0.45f;
+                    const float atlasCreationProgressRange = 0.5f;
 
                     foreach ((string prefix, List<List<Sprite>> chunks) in groupChunks)
                     {
-                        for (int i = 0; i < chunks.Count; i++)
+                        for (int i = 0; i < chunks.Count; ++i)
                         {
                             List<Sprite> chunk = chunks[i];
-                            if (chunk == null || chunk.Count == 0)
+                            if (chunk is not { Count: > 0 })
                             {
                                 continue;
                             }

package/Editor/SpriteCropper.cs

@@ -30,7 +30,7 @@
         private const float AlphaThreshold = 0.01f;
 
         [SerializeField]
-        private Object[] _inputDirectories;
+        private List<Object> _inputDirectories = new();
 
         [SerializeField]
         private bool _onlyNecessary;
@@ -44,12 +44,56 @@
         {
             GUILayout.Label("Drag folders below", EditorStyles.boldLabel);
             SerializedObject so = new(this);
+            so.Update();
             SerializedProperty dirs = so.FindProperty(nameof(_inputDirectories));
             EditorGUILayout.PropertyField(dirs, true);
             SerializedProperty onlyNecessary = so.FindProperty(nameof(_onlyNecessary));
             EditorGUILayout.PropertyField(onlyNecessary, true);
             so.ApplyModifiedProperties();
 
+            if (GUILayout.Button("Select Input Folder"))
+            {
+                string path = EditorUtility.OpenFolderPanel(
+                    "Select Sprite Input Folder",
+                    Application.dataPath,
+                    ""
+                );
+                if (!string.IsNullOrWhiteSpace(path))
+                {
+                    if (path.StartsWith(Application.dataPath, StringComparison.Ordinal))
+                    {
+                        path = "Assets" + path.Substring(Application.dataPath.Length);
+                        if (
+                            !_inputDirectories
+                                .Select(AssetDatabase.GetAssetPath)
+                                .Any(directory =>
+                                    string.Equals(
+                                        directory,
+                                        path,
+                                        StringComparison.OrdinalIgnoreCase
+                                    )
+                                )
+                        )
+                        {
+                            Object folder = AssetDatabase.LoadAssetAtPath<Object>(path);
+                            if (folder == null)
+                            {
+                                return;
+                            }
+                            _inputDirectories.Add(folder);
+                        }
+                    }
+                    else
+                    {
+                        EditorUtility.DisplayDialog(
+                            "Invalid Folder",
+                            "Please select a folder inside the project's Assets directory.",
+                            "OK"
+                        );
+                    }
+                }
+            }
+
             if (GUILayout.Button("Find Sprites To Process"))
             {
                 FindFilesToProcess();
@@ -79,7 +123,7 @@
         private void FindFilesToProcess()
         {
             _filesToProcess = new List<string>();
-            if (_inputDirectories == null || _inputDirectories.Length == 0)
+            if (_inputDirectories is not { Count: > 0 })
             {
                 this.LogWarn($"No input directories selected.");
                 return;
@@ -118,7 +162,7 @@
 
         private void ProcessFoundSprites()
         {
-            if (_filesToProcess == null || _filesToProcess.Count == 0)
+            if (_filesToProcess is not { Count: > 0 })
             {
                 this.LogWarn($"No files found or selected for processing.");
                 return;
@@ -209,7 +253,7 @@
             }
 
             TextureImporter importer = AssetImporter.GetAtPath(assetPath) as TextureImporter;
-            if (importer == null || !importer.textureType.Equals(TextureImporterType.Sprite))
+            if (importer is not { textureType: TextureImporterType.Sprite })
             {
                 return;
             }
@@ -233,7 +277,7 @@
             }
 
             TextureImporter importer = AssetImporter.GetAtPath(assetPath) as TextureImporter;
-            if (importer == null || !importer.textureType.Equals(TextureImporterType.Sprite))
+            if (importer is not { textureType: TextureImporterType.Sprite })
             {
                 return null;
             }

package/Editor/SpriteSettingsApplier.cs

@@ -10,6 +10,7 @@ namespace WallstopStudios.UnityHelpers.Editor
     using System.Linq;
     using UnityEditor;
     using UnityEngine;
+    using Utils;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -203,9 +204,10 @@ namespace WallstopStudios.UnityHelpers.Editor
                         valuePropHeight
                     );
 
-                    EditorGUI.indentLevel++;
-                    EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
-                    EditorGUI.indentLevel--;
+                    using (new GUIIndentScope())
+                    {
+                        EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
+                    }
 
                     currentRect.y += valueRect.height + EditorGUIUtility.standardVerticalSpacing;
                 }

package/Editor/Utils/GUIIndentScope.cs

@@ -0,0 +1,20 @@
+namespace WallstopStudios.UnityHelpers.Editor.Utils
+{
+#if UNITY_EDITOR
+    using System;
+    using UnityEditor;
+
+    public sealed class GUIIndentScope : IDisposable
+    {
+        public GUIIndentScope()
+        {
+            EditorGUI.indentLevel++;
+        }
+
+        public void Dispose()
+        {
+            EditorGUI.indentLevel--;
+        }
+    }
+#endif
+}

package/Editor/Utils/GUIIndentScope.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ba7be1ee2025494c963d393c9b5e5c2f
+timeCreated: 1746811930

package/package.json

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