add hooks back in

ToniMacaroni · Feb 29, 2024 · a85179e · a85179e
1 parent 7e4c345
commit a85179e
Show file tree

Hide file tree

Showing 6 changed files with 886 additions and 885 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,4 +2,5 @@
 - Added `playcutscene` command back.
 - Fixed `dump` command (except for prefabs).
 - Automatically rename Reshade dll to be able to be loaded by Redloader.
-- Log harmony exceptions
+- Log harmony exceptions.
+- Added hooks back in.
diff --git a/Dependencies/Il2CppAssemblyGenerator/Packages/Il2CppInterop.cs b/Dependencies/Il2CppAssemblyGenerator/Packages/Il2CppInterop.cs
@@ -53,7 +53,7 @@ internal override bool Execute()
                 Il2CppPrefixMode = GeneratorOptions.PrefixMode.OptIn,
             };
 
-            //opts.AddPass<HookGenPass>();
+            opts.AddPass<HookGenPass>();
 
             //Inform cecil of the unity base libs
             var trusted = (string) AppDomain.CurrentDomain.GetData("TRUSTED_PLATFORM_ASSEMBLIES");
@@ -95,37 +95,37 @@ internal override bool Execute()
         }
     }
 
-    // internal class HookGenPass : ICustomPass
-    // {
-    //     public void DoPass(RewriteGlobalContext context)
-    //     {
-    //         //var depsDirs = new List<string> { LoaderEnvironment.Il2CppAssembliesDirectory, Path.Combine(LoaderEnvironment.LoaderDirectory, "net6") };
-    //         // foreach (var assembly in assemblies)
-    //         // {
-    //         //     GenerateHookAssembly(Path.Combine(LoaderEnvironment.Il2CppAssembliesDirectory, assembly + ".dll"), 
-    //         //         Path.Combine(LoaderEnvironment.HooksDirectory, "HK_" + assembly + ".dll"), depsDirs);
-    //         // }
-    //
-    //         foreach (var assembly in context.Assemblies)
-    //         {
-    //             var name = assembly.OriginalAssembly.Name.Name;
-    //             if(!name.Contains("Sons") && !name.Contains("Endnight"))
-    //                 continue;
-    //             
-    //             RLog.Msg($"Generating hooks for {assembly.OriginalAssembly.Name.Name}");
-    //             var gen = new HookGeneratorV2(assembly.OriginalAssembly.MainModule, assembly.NewAssembly.MainModule);
-    //             
-    //             try
-    //             {
-    //                 gen.Generate();
-    //             }
-    //             catch (Exception e)
-    //             {
-    //                 Console.WriteLine($"Error while processing {name}: \n {e}");
-    //             }
-    //         }
-    //     }
-    // }
+    internal class HookGenPass : ICustomPass
+    {
+        public void DoPass(RewriteGlobalContext context)
+        {
+            //var depsDirs = new List<string> { LoaderEnvironment.Il2CppAssembliesDirectory, Path.Combine(LoaderEnvironment.LoaderDirectory, "net6") };
+            // foreach (var assembly in assemblies)
+            // {
+            //     GenerateHookAssembly(Path.Combine(LoaderEnvironment.Il2CppAssembliesDirectory, assembly + ".dll"), 
+            //         Path.Combine(LoaderEnvironment.HooksDirectory, "HK_" + assembly + ".dll"), depsDirs);
+            // }
+
+            foreach (var assembly in context.Assemblies)
+            {
+                var name = assembly.OriginalAssembly.Name.Name;
+                if(!name.Contains("Sons") && !name.Contains("Endnight"))
+                    continue;
+
+                RLog.Msg($"Generating hooks for {assembly.OriginalAssembly.Name.Name}");
+                var gen = new HookGeneratorV2(assembly.OriginalAssembly.MainModule, assembly.NewAssembly.MainModule);
+
+                try
+                {
+                    gen.Generate();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine($"Error while processing {name}: \n {e}");
+                }
+            }
+        }
+    }
 
     internal class InteropLogger : ILogger
     {