Optim: Union Mod Reload pipeline

Author: inmny

services/ModReloadService.cs

@@ -6,8 +6,14 @@
 
 namespace NeoModLoader.services;
 
-internal static class ModReloadService
+/// <summary>
+/// Coordinates mod hot-reload workflows.
+/// </summary>
+public static class ModReloadService
 {
+    /// <summary>
+    /// Recompiles and patches a reloadable mod.
+    /// </summary>
     public static bool HotfixMethods(IReloadable pMod, ModDeclare pModDeclare)
     {
         if (!ModReloadUtils.Prepare(pMod, pModDeclare)) return false;
@@ -16,6 +22,30 @@ public static bool HotfixMethods(IReloadable pMod, ModDeclare pModDeclare)
         return true;
     }
 
+    /// <summary>
+    /// Recompiles, patches and invokes the reload callback of a mod.
+    /// </summary>
+    public static bool ReloadMod(IReloadable pMod, ModDeclare pModDeclare)
+    {
+        if (!HotfixMethods(pMod, pModDeclare)) return false;
+        if (pMod is IMod mod)
+        {
+            try
+            {
+                if (!ReloadResources(mod)) return false;
+                ReloadLocales(mod);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+        return ModReloadUtils.Reload();
+    }
+
+    /// <summary>
+    /// Rebuilds mod resources from disk.
+    /// </summary>
     public static bool ReloadResources(IMod pMod)
     {
         MasterBuilder Builder = new();
@@ -26,9 +56,12 @@ public static bool ReloadResources(IMod pMod)
         Builder.AddBuilders(builders);
         Builder.AddBuilders(builders2);
         Builder.BuildAll();
-        return false;
+        return true;
     }
 
+    /// <summary>
+    /// Reloads locale files from disk and applies them.
+    /// </summary>
     public static void ReloadLocales(IMod pMod)
     {
         ModCompileLoadService.LoadLocales(pMod, pMod.GetDeclaration(), true, true);

ui/ModListWindow.cs

@@ -425,30 +425,11 @@ public override void Setup(IMod mod)
             reload_button.onClick.RemoveAllListeners();
             reload_button.onClick.AddListener(() =>
             {
-                if (!ModReloadUtils.Prepare(reloadable, mod_declare))
-                {
-                    LogService.LogWarning($"Failed to prepare mod {mod_declare.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.CompileNew())
-                {
-                    LogService.LogWarning($"Failed to compile new mod {mod_declare.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.PatchHotfixMethodsNT())
-                {
-                    LogService.LogWarning(
-                        $"Failed to patch hotfix methods of mod {mod_declare.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.Reload())
+                if (!ModReloadService.ReloadMod(reloadable, mod_declare))
                 {
                     LogService.LogWarning($"Failed to reload mod {mod_declare.Name}.");
                 }
             });
         }
     }
-}
+}

ui/NewModListWindow.cs

@@ -324,26 +324,7 @@ private void ReloadSelectedMod()
         {
             if (mod.GetDeclaration() == CurrentSelected && mod is IReloadable reloadable)
             {
-                if (!ModReloadUtils.Prepare(reloadable, CurrentSelected))
-                {
-                    LogService.LogWarning($"Failed to prepare mod {CurrentSelected.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.CompileNew())
-                {
-                    LogService.LogWarning($"Failed to compile new mod {CurrentSelected.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.PatchHotfixMethodsNT())
-                {
-                    LogService.LogWarning(
-                        $"Failed to patch hotfix methods of mod {CurrentSelected.Name} for reloading.");
-                    return;
-                }
-
-                if (!ModReloadUtils.Reload())
+                if (!ModReloadService.ReloadMod(reloadable, CurrentSelected))
                 {
                     LogService.LogWarning($"Failed to reload mod {CurrentSelected.Name}.");
                 }
@@ -377,4 +358,4 @@ private enum DisplayType
         Mod,
         Resource
     }
-}
+}

utils/ModReloadUtils.cs

@@ -41,7 +41,7 @@ internal static class ModReloadUtils
     private static readonly List<object> _generated_wrapper_delegates = new();
     private static readonly List<Type> _generated_wrapper_types = new();
 
-    public static bool Prepare(IReloadable pMod, ModDeclare pModDeclare)
+    internal static bool Prepare(IReloadable pMod, ModDeclare pModDeclare)
     {
         _mod = pMod;
         _mod_declare = pModDeclare;
@@ -91,7 +91,7 @@ public static bool Prepare(IReloadable pMod, ModDeclare pModDeclare)
         return true;
     }
 
-    public static bool CompileNew()
+    internal static bool CompileNew()
     {
         if (!ModCompileLoadService.TryCompileModAtRuntime(_mod_declare, true)) return false;
         foreach (var type in EnumerateTypesRecursive(_old_assembly_definition.MainModule.Types))
@@ -950,7 +950,7 @@ private static void InitializeOpcodeMap()
         _op_code_map.Add(Mono.Cecil.Cil.OpCodes.Tail, OpCodes.Tailcall);
     }
 
-    public static bool PatchHotfixMethodsNT()
+    internal static bool PatchHotfixMethodsNT()
     {
         if (_op_code_map.Count == 0)
         {
@@ -1550,7 +1550,7 @@ private static void EmitMethodBody(MethodDefinition methodDefinition, ILGenerato
         }
     }
 
-    public static bool Reload()
+    internal static bool Reload()
     {
         try
         {