UPM release 3.2.1

Author: git-upm-publisher

CHANGELOG.md

@@ -19,6 +19,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 
 
+## [3.2.1] - 2023-12-27
+
+### Fixed
+- Prevent `Scene GUID to path map file not found!` errors and null reference exceptions in `SceneAssetPostprocessor` if the scene GUID to path map file is missing.
+- Prevent null reference exceptions at project launch due to addressables settings not being loaded yet.
+- Ensure map files are always generated at editor startup, even if they are empty.
+
+
+
 ## [3.2.0] - 2023-11-20
 
 ### Added

Editor/MapGeneratorTriggers/AddressablesChangeListener.cs

@@ -1,54 +1,16 @@
 #if ESR_ADDRESSABLES
 
-using Eflatun.SceneReference.Editor.Utility;
-using System.Linq;
 using UnityEditor;
-using UnityEditor.AddressableAssets;
 using UnityEditor.AddressableAssets.Settings;
-using UnityEngine;
 
 namespace Eflatun.SceneReference.Editor.MapGeneratorTriggers
 {
     [InitializeOnLoad]
     internal class AddressablesChangeListener : AssetPostprocessor
     {
-        private static bool _isSubscribed;
-
         static AddressablesChangeListener()
         {
-            if (AddressableAssetSettingsDefaultObject.SettingsExists)
-            {
-                if (!_isSubscribed)
-                {
-                    AddressableAssetSettingsDefaultObject.Settings.OnModification += OnAddressablesChange;
-                    _isSubscribed = true;
-                }
-            }
-            else
-            {
-                EditorLogger.Warn("Addressables settings not found. Skipping subscribing to addressables changes.");
-            }
-        }
-
-        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
-        {
-            if (AddressableAssetSettingsDefaultObject.SettingsExists)
-            {
-                if (!_isSubscribed)
-                {
-                    EditorLogger.Debug("Found addressables settings. Subscribing to addressables changes.");
-                    AddressableAssetSettingsDefaultObject.Settings.OnModification += OnAddressablesChange;
-                    _isSubscribed = true;
-                }
-            }
-            else
-            {
-                if (_isSubscribed)
-                {
-                    EditorLogger.Warn("Lost addressables settings. Unsubscribing from addressables changes.");
-                    _isSubscribed = false;
-                }
-            }
+            AddressableAssetSettings.OnModificationGlobal += OnAddressablesChange;
         }
 
         private static void OnAddressablesChange(AddressableAssetSettings s, AddressableAssetSettings.ModificationEvent e, object o)

Editor/MapGeneratorTriggers/SceneAssetPostprocessor.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using Eflatun.SceneReference.Editor.Utility;
 using UnityEditor;
 
@@ -8,9 +9,7 @@ internal class SceneAssetPostprocessor : AssetPostprocessor
     {
         private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
         {
-            var createdAssets = importedAssets.Except(SceneGuidToPathMapProvider.SceneGuidToPathMap.Values);
-
-            var hasSceneChange = createdAssets
+            var hasSceneChange = GetCreatedAssets(importedAssets)
                 .Concat(deletedAssets)
                 .Concat(movedAssets)
                 .Concat(movedFromAssetPaths)
@@ -28,5 +27,12 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
                 }
             }
         }
+
+        private static IEnumerable<string> GetCreatedAssets(string[] importedAssets)
+        {
+            // If we don't have a map, then we should treat all imported assets as created assets.
+            var sceneGuidToPathMap = SceneGuidToPathMapProvider.GetSceneGuidToPathMap(false);
+            return sceneGuidToPathMap == null ? importedAssets : importedAssets.Except(sceneGuidToPathMap.Values);
+        }
     }
 }

Editor/ScaffoldingEnsurer.cs

@@ -0,0 +1,12 @@
+using UnityEditor;
+
+namespace Eflatun.SceneReference.Editor.Packages.com.eflatun.scenereference.Editor
+{
+    internal class ScaffoldingEnsurer : AssetPostprocessor
+    {
+        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        {
+            SceneDataMapsGenerator.EnsureScaffolding();
+        }
+    }
+}

Editor/ScaffoldingEnsurer.cs.meta

@@ -5,6 +5,8 @@
 using Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
+using System;
+using UnityEngine.Scripting;
 
 #if ESR_ADDRESSABLES
 using UnityEditor.AddressableAssets;
@@ -33,7 +35,7 @@ public static void Run()
             {
                 EditorLogger.Debug("Generating scene data maps.");
 
-                WriteScaffolding();
+                EnsureScaffolding();
 
                 var allSceneGuids = AssetDatabase.FindAssets("t:Scene");
 
@@ -49,10 +51,22 @@ public static void Run()
             }
         }
 
-        private static void WriteScaffolding()
+        internal static void EnsureScaffolding()
         {
             Directory.CreateDirectory(Paths.Absolute.SceneDataMapsFolder.PlatformPath);
             File.WriteAllText(Paths.Absolute.SceneDataMapsDotKeepFile.PlatformPath, DotKeepFileContent);
+
+            if (!File.Exists(Paths.Absolute.SceneGuidToPathMapFile.PlatformPath))
+            {
+                File.WriteAllText(Paths.Absolute.SceneGuidToPathMapFile.PlatformPath, "{}");
+            }
+
+#if ESR_ADDRESSABLES
+            if (!File.Exists(Paths.Absolute.SceneGuidToAddressMapFile.PlatformPath))
+            {
+                File.WriteAllText(Paths.Absolute.SceneGuidToAddressMapFile.PlatformPath, "{}");
+            }
+#endif // ESR_ADDRESSABLES
         }
 
         private static Dictionary<string, string> GenerateSceneGuidToPathMap(string[] allSceneGuids)