Use the new Patcher API so that the mod can be fully disabled

KSP2Community · Jan 12, 2024 · 5a16591 · 5a16591
1 parent 5703a98
commit 5a16591
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/PatchManager.PreloadPatcher/Directory.Build.props b/src/PatchManager.PreloadPatcher/Directory.Build.props
diff --git a/src/PatchManager.PreloadPatcher/PatchManager.PreloadPatcher.csproj b/src/PatchManager.PreloadPatcher/PatchManager.PreloadPatcher.csproj
@@ -5,5 +5,6 @@
         <PackageReference Include="BepInEx.BaseLib" Version="5.4.21"/>
         <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All"/>
         <PackageReference Include="Mono.Cecil" Version="0.11.4"/>
+        <PackageReference Include="SpaceWarp" Version="1.8.0"/>
     </ItemGroup>
 </Project>
diff --git a/src/PatchManager.PreloadPatcher/Patcher.cs b/src/PatchManager.PreloadPatcher/Patcher.cs
@@ -1,23 +1,23 @@
 using BepInEx;
-using BepInEx.Logging;
 using JetBrains.Annotations;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using SpaceWarp.Preload.API;
 
 namespace PatchManager.PreloadPatcher;
 
 /// <summary>
 /// Preload patcher for the game's AssetProvider.
 /// </summary>
-public static class Patcher
+[UsedImplicitly]
+internal class Patcher : BasePatcher
 {
-    [UsedImplicitly]
-    public static IEnumerable<string> TargetDLLs { get; } = new[]
+    public override IEnumerable<string> DLLsToPatch { get; } = new[]
     {
         "Assembly-CSharp.dll"
     };
 
-    private static MethodReference MakeGeneric(this MethodReference method, params GenericParameter[] args)
+    private static MethodReference MakeGeneric(MethodReference method, params GenericParameter[] args)
     {
         if (args.Length == 0)
         {
@@ -43,8 +43,7 @@ private static MethodReference MakeGeneric(this MethodReference method, params G
     /// </summary>
     /// <param name="assemblyDefinition">Game assembly containing the AssetProvider class.</param>
     /// <exception cref="Exception">Thrown if the assembly with the replacement method cannot be found.</exception>
-    [UsedImplicitly]
-    public static void Patch(ref AssemblyDefinition assemblyDefinition)
+    public override void ApplyPatch(ref AssemblyDefinition assemblyDefinition)
     {
         // Now we need to get the assembly with the replacement method
         AssemblyDefinition coreAssembly = null;
@@ -67,14 +66,14 @@ public static void Patch(ref AssemblyDefinition assemblyDefinition)
         // Remove every single instruction from the body of the methods
         // Emit call to our extracted method
         var methodInModule = targetMethod.Module.ImportReference(extractedMethod);
-        var generic = methodInModule.MakeGeneric(targetMethod.GenericParameters.ToArray());
+        var generic = MakeGeneric(methodInModule, targetMethod.GenericParameters.ToArray());
         targetMethod.Body.Instructions.Clear();
         targetMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_1));
         targetMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_2));
         targetMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_3));
         targetMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Call, generic));
         targetMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
 
-        Logger.CreateLogSource("Patch Manager Preload").LogInfo("Pre-patching complete!");
+        Logger.LogInfo("Pre-patching complete!");
     }
 }