Fix not patching plugin loading

Corrected to run right before Load is called Now patches HacknetChainloader with ILManipulator instead Actually compile the Pathfinder.Meta.Load namespace Made EventAttribute able to function on Types as well If an EventAttribute is on a type, checks type for any applicable event methods Valid methods are static void methods whose only parameter is of type PathfinderEvent Can ignore specific events for a auto-register with IgnoreEventAttribute Renamed Meta.Load.ComputerExecutor to ComputerExecutorAttribute
Arkhist · Nov 5, 2021 · 3cf0f1c · 3cf0f1c
1 parent d35e48f
commit 3cf0f1c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 11 deletions.
diff --git a/PathfinderAPI/Meta/Load/AttributeManager.cs b/PathfinderAPI/Meta/Load/AttributeManager.cs
@@ -2,17 +2,27 @@
 using System.Reflection;
 using BepInEx.Hacknet;
 using HarmonyLib;
+using Mono.Cecil.Cil;
+using MonoMod.Cil;
 
 namespace Pathfinder.Meta.Load
 {
     [HarmonyPatch]
     internal static class AttributeManager
     {
-        [HarmonyPrefix]
-        [HarmonyPatch(typeof(HacknetPlugin), nameof(HacknetPlugin.Load))]
-        private static void OnPluginLoad(ref HacknetPlugin __instance)
+        [HarmonyILManipulator]
+        [HarmonyPatch(typeof(HacknetChainloader), nameof(HacknetChainloader.LoadPlugin))]
+        private static void OnPluginLoadIL(ILContext il)
         {
-            ReadAttributesFor(__instance);
+            var c = new ILCursor(il);
+
+            c.GotoNext(
+                x => x.MatchLdloc(1),
+                x => x.MatchCallvirt(AccessTools.Method(typeof(HacknetPlugin), nameof(HacknetPlugin.Load)))
+            );
+
+            c.Emit(OpCodes.Ldloc, 1);
+            c.Emit(OpCodes.Call, AccessTools.Method(typeof(AttributeManager), nameof(ReadAttributesFor)));
         }
 
         public static void ReadAttributesFor(HacknetPlugin plugin)

diff --git a/PathfinderAPI/Meta/Load/ComputerExecutor.cs → ...PI/Meta/Load/ComputerExecutorAttribute.cs b/PathfinderAPI/Meta/Load/ComputerExecutor.cs → ...PI/Meta/Load/ComputerExecutorAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using BepInEx.Hacknet;
 using Pathfinder.Replacements;
@@ -7,12 +7,12 @@
 namespace Pathfinder.Meta.Load
 {
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public class ComputerExecutor : BaseAttribute
+    public class ComputerExecutorAttribute : BaseAttribute
     {
         public string Element { get; }
         public ParseOption ParseOptions { get; set; }
 
-        public ComputerExecutor(string element, ParseOption parseOptions = ParseOption.None)
+        public ComputerExecutorAttribute(string element, ParseOption parseOptions = ParseOption.None)
         {
             Element = element;
             ParseOptions = parseOptions;

diff --git a/PathfinderAPI/Meta/Load/EventAttribute.cs b/PathfinderAPI/Meta/Load/EventAttribute.cs
@@ -6,7 +6,7 @@
 
 namespace Pathfinder.Meta.Load
 {
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = true)]
     public class EventAttribute : BaseAttribute
     {
         private EventHandlerOptions eventHandlerOptions;
@@ -44,11 +44,35 @@ public EventAttribute(bool continueOnCancel = false, bool continueOnThrow = fals
             };
         }
 
+        private void CallOn(HacknetPlugin plugin, MethodInfo info)
+        {
+            var eventType = info.GetParameters().FirstOrDefault()?.ParameterType;
+            EventManager.AddHandler(eventType, info);
+        }
+
+        private void CallOn(HacknetPlugin plugin, Type type)
+        {
+            foreach(var method in type.GetMethods(
+                BindingFlags.Public
+                | BindingFlags.NonPublic
+                | BindingFlags.Static
+            ))
+            {
+                if(method.GetCustomAttribute<IgnoreEventAttribute>() != null)
+                    continue;
+                var parameter = method.GetParameters().FirstOrDefault();
+                if(method.ReturnType == typeof(void)
+                    && (parameter?.ParameterType?.IsSubclassOf(typeof(PathfinderEvent)) ?? false))
+                    CallOn(plugin, method);
+            }
+        }
+
         protected internal override void CallOn(HacknetPlugin plugin, MemberInfo targettedInfo)
         {
-            var methodInfo = (MethodInfo)targettedInfo;
-            var eventType = methodInfo.GetParameters().FirstOrDefault()?.ParameterType;
-            EventManager.AddHandler(eventType, methodInfo);
+            if(targettedInfo is MethodInfo method)
+                CallOn(plugin, method);
+            else
+                CallOn(plugin, (Type) targettedInfo);
         }
     }
 }
diff --git a/PathfinderAPI/Meta/Load/IgnoreEventAttribute.cs b/PathfinderAPI/Meta/Load/IgnoreEventAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+namespace Pathfinder.Meta.Load
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class IgnoreEventAttribute : System.Attribute
+    {
+    }
+}
diff --git a/PathfinderAPI/PathfinderAPI.csproj b/PathfinderAPI/PathfinderAPI.csproj
@@ -110,6 +110,26 @@
     <Compile Include="Executable\ExecutableManager.cs" />
     <Compile Include="GUI\ArbitraryCodeWarning.cs" />
     <Compile Include="GUI\PFButton.cs" />
+    <Compile Include="Meta\Load\ActionAttribute.cs" />
+    <Compile Include="Meta\Load\AdministratorAttribute.cs" />
+    <Compile Include="Meta\Load\AttributeManager.cs" />
+    <Compile Include="Meta\Load\BaseAttribute.cs" />
+    <Compile Include="Meta\Load\CommandAttribute.cs" />
+    <Compile Include="Meta\Load\ComputerExecutorAttribute.cs" />
+    <Compile Include="Meta\Load\ConditionAttribute.cs" />
+    <Compile Include="Meta\Load\DaemonAttribute.cs" />
+    <Compile Include="Meta\Load\EventAttribute.cs" />
+    <Compile Include="Meta\Load\ExecutableAttribute.cs" />
+    <Compile Include="Meta\Load\ExtensionInfoAttribute.cs" />
+    <Compile Include="Meta\Load\GoalAttribute.cs" />
+    <Compile Include="Meta\Load\HacknetPluginExtensions.cs" />
+    <Compile Include="Meta\Load\IgnoreEventAttribute.cs" />
+    <Compile Include="Meta\Load\IgnorePluginAttribute.cs" />
+    <Compile Include="Meta\Load\MissionExecutorAttribute.cs" />
+    <Compile Include="Meta\Load\OptionAttribute.cs" />
+    <Compile Include="Meta\Load\OptionsTabAttribute.cs" />
+    <Compile Include="Meta\Load\PortAttribute.cs" />
+    <Compile Include="Meta\Load\SaveExecutorAttribute.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="MiscPatches.cs" />
     <Compile Include="Mission\GoalManager.cs" />