Rename AssemblyLoader back to AssemblyPatcher; make preloader patcher internal

BepInEx/BepInEx.csproj

@@ -59,7 +59,7 @@
     <Compile Include="Bootstrap\Entrypoint.cs" />
     <Compile Include="Bootstrap\UnityPatches.cs" />
     <Compile Include="Contract\Attributes.cs" />
-    <Compile Include="Bootstrap\AssemblyLoader.cs" />
+    <Compile Include="Bootstrap\AssemblyPatcher.cs" />
     <Compile Include="Bootstrap\Preloader.cs" />
     <Compile Include="Config.cs" />
     <Compile Include="ConfigWrapper.cs" />

BepInEx/Bootstrap/AssemblyLoader.cs

@@ -13,12 +13,12 @@ namespace BepInEx.Bootstrap
     /// Delegate used in patching assemblies.
     /// </summary>
     /// <param name="assembly">The assembly that is being patched.</param>
-    public delegate void AssemblyPatcherDelegate(ref AssemblyDefinition assembly);
+    internal delegate void AssemblyPatcherDelegate(ref AssemblyDefinition assembly);
 
     /// <summary>
     /// A single assembly patcher.
     /// </summary>
-    public class AssemblyPatcher
+    internal class PatcherPlugin
     {
         /// <summary>
         /// Target assemblies to patch.
@@ -49,9 +49,9 @@ namespace BepInEx.Bootstrap
     /// <summary>
     /// Worker class which is used for loading and patching entire folders of assemblies, or alternatively patching and loading assemblies one at a time.
     /// </summary>
-    public static class AssemblyLoader
+    internal static class AssemblyPatcher
     {
-        private static List<AssemblyPatcher> patchers = new List<AssemblyPatcher>();
+        private static List<PatcherPlugin> patchers = new List<PatcherPlugin>();
 
         /// <summary>
         /// Configuration value of whether assembly dumping is enabled or not.
@@ -62,7 +62,7 @@ namespace BepInEx.Bootstrap
         /// Adds a single assembly patcher to the pool of applicable patches.
         /// </summary>
         /// <param name="patcher">Patcher to apply.</param>
-        public static void AddPatcher(AssemblyPatcher patcher)
+        public static void AddPatcher(PatcherPlugin patcher)
         {
             patchers.Add(patcher);
         }
@@ -72,12 +72,12 @@ namespace BepInEx.Bootstrap
         /// </summary>
         /// <param name="directory">Directory to search patcher DLLs from.</param>
         /// <param name="patcherLocator">A function that locates assembly patchers in a given managed assembly.</param>
-        public static void AddPatchersFromDirectory(string directory, Func<Assembly, List<AssemblyPatcher>> patcherLocator)
+        public static void AddPatchersFromDirectory(string directory, Func<Assembly, List<PatcherPlugin>> patcherLocator)
         {
             if (!Directory.Exists(directory))
                 return;
 
-            var sortedPatchers = new SortedDictionary<string, AssemblyPatcher>();
+            var sortedPatchers = new SortedDictionary<string, PatcherPlugin>();
 
             foreach (string assemblyPath in Directory.GetFiles(directory, "*.dll"))
                 try

BepInEx/Bootstrap/Preloader.cs

@@ -58,12 +58,12 @@ namespace BepInEx.Bootstrap
 
 				string entrypointAssembly = Config.GetEntry("entrypoint-assembly", "UnityEngine.dll", "Preloader");
 
-                AssemblyLoader.AddPatcher(new AssemblyPatcher { TargetDLLs = new []{ entrypointAssembly }, Patcher = PatchEntrypoint});
-                AssemblyLoader.AddPatchersFromDirectory(Paths.PatcherPluginPath, GetPatcherMethods);
+                AssemblyPatcher.AddPatcher(new PatcherPlugin { TargetDLLs = new []{ entrypointAssembly }, Patcher = PatchEntrypoint});
+		        AssemblyPatcher.AddPatchersFromDirectory(Paths.PatcherPluginPath, GetPatcherMethods);
 
-		        AssemblyLoader.PatchAndLoad(Paths.ManagedPath);
+		        AssemblyPatcher.PatchAndLoad(Paths.ManagedPath);
 
-		        AssemblyLoader.DisposePatchers();
+		        AssemblyPatcher.DisposePatchers();
 			}
 			catch (Exception ex)
 			{
@@ -96,9 +96,9 @@ namespace BepInEx.Bootstrap
 		/// </summary>
 		/// <param name="assembly">The assembly to scan.</param>
 		/// <returns>A list of assembly patchers that were found in the assembly.</returns>
-		public static List<AssemblyPatcher> GetPatcherMethods(Assembly assembly)
+		public static List<PatcherPlugin> GetPatcherMethods(Assembly assembly)
 		{
-			var patcherMethods = new List<AssemblyPatcher>();
+			var patcherMethods = new List<PatcherPlugin>();
 		    var flags = BindingFlags.Public | BindingFlags.Static | BindingFlags.IgnoreCase;
 
             foreach (var type in assembly.GetExportedTypes())
@@ -133,7 +133,7 @@ namespace BepInEx.Bootstrap
 					if (targetsProperty == null || !targetsProperty.CanRead || patcher == null)
 						continue;
 
-                    var assemblyPatcher = new AssemblyPatcher();
+                    var assemblyPatcher = new PatcherPlugin();
 
 				    assemblyPatcher.Name = $"{assembly.GetName().Name}{type.FullName}";
                     assemblyPatcher.Patcher = (ref AssemblyDefinition ass) =>