Load assets from addressables at the correct place, cache the total patch count and error count

Author: cheese3660

Runtime/Core/Assets/PatchingManager.cs

@@ -350,6 +350,11 @@ bool killLoadingBarTips
             }
 
             InjectPatchManagerTips = !killLoadingBarTips;
+            if (killLoadingBarTips)
+            {
+                CacheManager.SetTotalPatchCount(TotalPatchCount);
+                CacheManager.SetTotalErrorCount(TotalErrorCount);
+            }
             resolve();
         }
     }

Runtime/Core/Cache/CacheManager.cs

@@ -82,6 +82,16 @@ public static void InvalidateCache()
             CreateCacheFolderIfNotExists();
         }
 
+        public static void SetTotalPatchCount(int count)
+        {
+            Inventory.PatchCount = count;
+        }
+        
+        public static void SetTotalErrorCount(int count)
+        {
+            Inventory.ErrorCount = count;
+        }
+        
         public static void SaveInventory()
         {
             Inventory.Save(InventoryPath);

Runtime/Core/Cache/Json/Inventory.cs

@@ -31,6 +31,9 @@ public sealed class Inventory
         [JsonProperty("patch_hashes", Required = Required.Always)]
         public PatchHashes Patches { get; internal set; }
 
+        [JsonProperty("patch_count")] public int PatchCount { get; internal set; } = 0;
+        [JsonProperty("error_count")] public int ErrorCount { get; internal set; } = 0;
+
         /// <summary>
         /// Get a <see cref="CacheEntry"/> by its label.
         /// </summary>

Runtime/Core/CoreModule.cs

@@ -15,6 +15,7 @@
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
 using UnityEngine.UIElements;
 using FlowAction = PatchManager.Core.Flow.FlowAction;
 
@@ -76,11 +77,14 @@ public override void Init()
             if (!isValid)
             {
                 _wasCacheInvalidated = true;
-                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(0,
+                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(0, () => new FlowAction("Patch Manager: loading Patches from Addressables",
+                    LoadPatchesFromAddressables));
+                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(0, () => new FlowAction("Patch Manager: Registering all patches", RegisterAllPatches));
+                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(2,
                     () => new FlowAction("Patch Manager: Creating New Assets", PatchingManager.CreateNewAssets));
-                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(1,
+                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(3,
                     () => new FlowAction("Patch Manager: Rebuilding Cache", PatchingManager.RebuildAllCache));
-                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(2,
+                SpaceWarp.API.Loading.Loading.GeneralLoadingActions.Insert(4,
                     () => new FlowAction("Patch Manager: Registering Resource Locator", RegisterResourceLocator));
             }
             else
@@ -90,6 +94,24 @@ public override void Init()
             }
         }
 
+        private static void RegisterAllPatches(Action resolve, Action<string> reject)
+        {
+            PatchingManager.RegisterPatches();
+            resolve();
+        }
+
+        private static void LoadPatchesFromAddressables(Action resolve, Action<string> reject)
+        {
+            var handle = GameManager.Instance.Assets.LoadAssetsAsync<TextAsset>(PATCH_LABEL, asset => { PatchingManager.ImportAssetPatch(asset, REDUX_MOD_ID); });
+            handle.Completed += result =>
+            {
+                if (result.Status == AsyncOperationStatus.Succeeded)
+                    resolve();
+                else
+                    reject("Failed to load patch assets!");
+            };
+        }
+
         /// <inheritdoc />
         public override void PreLoad()
         {
@@ -123,16 +145,6 @@ public override void PreLoad()
                     .Replace("\\", "-")
             ).ToHashSet());
 
-            var handle = GameManager.Instance.Assets.LoadAssetsAsync<TextAsset>(PATCH_LABEL, asset =>
-            {
-                PatchingManager.ImportAssetPatch(asset, REDUX_MOD_ID);
-            });
-            handle.Completed += _ =>
-            {
-                Addressables.Release(handle);
-            };
-            handle.WaitForCompletion();
-
             foreach (var modFolder in modFolders)
             {
                 Logging.LogInfo($"Loading patchers from {modFolder.Folder}");
@@ -144,8 +156,6 @@ public override void PreLoad()
             {
                 PatchingManager.ImportSinglePatch(standalonePatch);
             }
-
-            PatchingManager.RegisterPatches();
         }
 
         /// <summary>
@@ -177,12 +187,13 @@ public override VisualElement GetDetails()
             if (_wasCacheInvalidated)
             {
                 text.text += $"Total amount of patches: {PatchingManager.TotalPatchCount}\n";
+                text.text += $"Total amount of errors: {PatchingManager.TotalErrorCount}\n";
             }
             else
             {
-                text.text += "Total amount of patches: Unknown (loaded from cache)\n";
+                text.text += $"Total amount of patches: {CacheManager.Inventory.PatchCount}\n";
+                text.text += $"Total amount of errors: {CacheManager.Inventory.ErrorCount}\n";
             }
-            text.text += $"Total amount of errors: {PatchingManager.TotalErrorCount}\n";
 
             text.text += "Patched labels:";
             foreach (var label in PatchingManager.Universe.LoadedLabels)