get other patches

Aurora-Modders · Oct 15, 2023 · 74432e4 · 74432e4
1 parent 15838d1
commit 74432e4
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 14 deletions.
diff --git a/AuroraPatch/AuroraPatchForm.cs b/AuroraPatch/AuroraPatchForm.cs
@@ -12,11 +12,11 @@ public partial class AuroraPatchForm : Form
         private readonly Loader Loader;
         private readonly List<Patch> Patches;
 
-        internal AuroraPatchForm(Loader loader) : base()
+        internal AuroraPatchForm() : base()
         {
             InitializeComponent();
 
-            Loader = loader;
+            Loader = Program.Loader;
             try
             {
                 Patches = Loader.FindPatches();
@@ -49,8 +49,7 @@ private void ButtonStart_Click(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                Program.Logger.LogCritical($"Failed to start Aurora. {ex}");
-                MessageBox.Show("Failed to start Aurora.");
+                Program.Logger.LogCritical($"Failed to start Aurora. {ex}", true);
             }
         }
 

diff --git a/AuroraPatch/Loader.cs b/AuroraPatch/Loader.cs
@@ -26,7 +26,6 @@ internal Loader(string exe, string checksum)
 
         internal List<Patch> FindPatches()
         {
-            var patches = new List<Patch>();
             string patchesDirectory = Path.Combine(Path.GetDirectoryName(AuroraExecutablePath), "Patches");
             Directory.CreateDirectory(patchesDirectory);
 
@@ -53,6 +52,9 @@ internal List<Patch> FindPatches()
                 }
             }
 
+            var patches = new List<Patch>();
+            var names = new HashSet<string>();
+
             foreach (var assembly in assemblies)
             {
                 Program.Logger.LogInfo($"Trying to retrieve types from assembly {Path.GetFileName(assembly.Location)}");
@@ -61,12 +63,18 @@ internal List<Patch> FindPatches()
                 {
                     foreach (var type in assembly.GetTypes())
                     {
+                        if (names.Contains(type.Name))
+                        {
+                            continue;
+                        }
+
                         if (typeof(Patch).IsAssignableFrom(type))
                         {
                             Program.Logger.LogInfo($"Found patch {type.Name}");
                             var patch = (Patch)Activator.CreateInstance(type);
                             patch.Loader = this;
                             patches.Add(patch);
+                            names.Add(type.Name);
                         }
                     }
                 }

diff --git a/AuroraPatch/Patch.cs b/AuroraPatch/Patch.cs
@@ -30,19 +30,34 @@ public abstract class Patch
         internal Loader Loader { get; set; }
 
         /// <summary>
-        /// Get one of your dependencies.
+        /// Get one of your dependencies. Deprecated, use TryGetPatch instead.
         /// </summary>
-        public T GetDependency<T>(string name) where T : Patch
+        public T GetDependency<T>(string name = null) where T : Patch
         {
-            try
+            if (TryGetPatch<T>(out var patch))
             {
-                return (T)Loader.LoadedPatches.Single(p => p.Name == name);
+                return patch;
             }
-            catch (Exception e)
+            else
             {
-                LogError($"Failed to get dependency {name}. {e}");
+                return default;
+            }
+        }
 
-                return null;
+        /// <summary>
+        /// Get another loaded patch.
+        /// </summary>
+        public bool TryGetPatch<T>(out T patch) where T : Patch
+        {
+            patch = (T)Loader.LoadedPatches.SingleOrDefault(x => x.Name == typeof(T).Name);
+
+            if (patch != default)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
             }
         }
 

diff --git a/AuroraPatch/Program.cs b/AuroraPatch/Program.cs
@@ -10,6 +10,7 @@ namespace AuroraPatch
     internal static class Program
     {
         internal static readonly Logger Logger = new Logger();
+        internal static Loader Loader { get; private set; }
 
         /// <summary>
         /// The main entry point for the application.
@@ -39,7 +40,7 @@ static void Main(string[] args)
             Logger.LogInfo($"Found Aurora at {exe}");
 
             var checksum = GetChecksum(File.ReadAllBytes(exe));
-            var loader = new Loader(exe, checksum);
+            Loader = new Loader(exe, checksum);
 
             AppDomain.CurrentDomain.AssemblyResolve += (sender, a) =>
             {
@@ -54,7 +55,7 @@ static void Main(string[] args)
                 return null;
             };
 
-            var form = new AuroraPatchForm(loader);
+            var form = new AuroraPatchForm();
             form.Show();
 
             Application.Run();