AssetManager Init

Author: Adsito

Assets/MapEditor/Managers/AssetManager.cs

@@ -9,15 +9,30 @@
 
 public static class AssetManager
 {
+	#region Init
+	[InitializeOnLoadMethod]
+	private static void Init()
+	{
+		EditorApplication.update += OnProjectLoad;
+	}
+
+	private static void OnProjectLoad()
+	{
+		EditorApplication.update -= OnProjectLoad;
+		if (!IsInitialised && SettingsManager.LoadBundleOnLaunch)
+			Initialise(SettingsManager.RustDirectory + SettingsManager.BundlePathExt);
+	}
+	#endregion
+
 	public static class Callbacks
     {
-		public delegate void AssetManagerCallback();
+		public delegate void Bundle();
 
 		/// <summary>Called after Rust Asset Bundles are loaded into the editor. </summary>
-		public static event AssetManagerCallback BundlesLoaded;
+		public static event Bundle BundlesLoaded;
 
 		/// <summary>Called after Rust Asset Bundles are unloaded from the editor. </summary>
-		public static event AssetManagerCallback BundlesDisposed;
+		public static event Bundle BundlesDisposed;
 
 		public static void OnBundlesLoaded() => BundlesLoaded?.Invoke();
 		public static void OnBundlesDisposed() => BundlesDisposed?.Invoke();

Assets/MapEditor/Managers/PathManager.cs

@@ -38,8 +38,6 @@ public enum PathType
         Powerline = 2,
     }
 
-    
-
     public static void SpawnPath(PathData pathData)
     {
         Vector3 averageLocation = Vector3.zero;

Assets/MapEditor/Managers/PrefabManager.cs

@@ -1,10 +1,10 @@
 using UnityEngine;
 using UnityEditor;
-using static WorldSerialization;
 using Unity.EditorCoroutines.Editor;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using static WorldSerialization;
 
 public static class PrefabManager
 {
@@ -20,11 +20,7 @@ private static void OnProjectLoad()
         DefaultPrefab = Resources.Load<GameObject>("Prefabs/DefaultPrefab");
         PrefabParent = GameObject.FindGameObjectWithTag("Prefabs").transform;
         if (DefaultPrefab != null && PrefabParent != null)
-        {
             EditorApplication.update -= OnProjectLoad;
-            if (!AssetManager.IsInitialised && SettingsManager.LoadBundleOnLaunch)
-                AssetManager.Initialise(SettingsManager.RustDirectory + SettingsManager.BundlePathExt);
-        }
     }
     #endregion
 
@@ -245,6 +241,7 @@ public static IEnumerator SpawnPrefabs(PrefabData[] prefabs, int progressID)
                 }
                 Spawn(Load(prefabs[i].id), prefabs[i], GetParent(prefabs[i].category));
             }
+
             Progress.Report(progressID, 0.99f, "Spawned " + prefabs.Length + " prefabs.");
             Progress.Finish(progressID, Progress.Status.Succeeded);
         }
@@ -267,6 +264,7 @@ public static IEnumerator DeletePrefabs(PrefabDataHolder[] prefabs, int progress
                 }
                 GameObject.DestroyImmediate(prefabs[i].gameObject);
             }
+
             Progress.Report(progressID, 0.99f, "Deleted " + prefabs.Length + " prefabs.");
             Progress.Finish(progressID, Progress.Status.Succeeded);
         }
@@ -288,6 +286,7 @@ public static IEnumerator ReplaceWithLoaded(PrefabDataHolder[] prefabs, int prog
                 Spawn(Load(prefabs[i].prefabData.id), prefabs[i].prefabData, GetParent(prefabs[i].prefabData.category));
                 GameObject.DestroyImmediate(prefabs[i].gameObject);
             }
+
             Progress.Report(progressID, 0.99f, "Replaced " + prefabs.Length + " prefabs.");
             Progress.Finish(progressID, Progress.Status.Succeeded);
             IsChangingPrefabs = false;
@@ -310,9 +309,9 @@ public static IEnumerator ReplaceWithDefault(PrefabDataHolder[] prefabs, int pro
                 Spawn(DefaultPrefab, prefabs[i].prefabData, GetParent(prefabs[i].prefabData.category));
                 GameObject.DestroyImmediate(prefabs[i].gameObject);
             }
+
             Progress.Report(progressID, 0.99f, "Replaced " + prefabs.Length + " prefabs.");
             Progress.Finish(progressID, Progress.Status.Succeeded);
-
             IsChangingPrefabs = false;
         }