UUH 2.1.0.0

Recoded quite a bit, and added arguments.

Author: UserR00T

HookAttribute/AddMethodAttribute.cs

@@ -1,22 +1,18 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace HookAttribute
+namespace UniversalUnityHooks
 {
-	[AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
 	public sealed class AddMethodAttribute : Attribute
 	{
-		string FullName { get; set; }
-		string MethodName { get; set; }
-		public AddMethodAttribute(string fullName, string methodName)
+        private string FullName { get; }
+
+        private string MethodName { get; }
+
+        public AddMethodAttribute(string fullName, string methodName)
 		{
 			FullName = fullName;
 			MethodName = methodName;
 		}
-		public string GetName() => FullName;
-		public string GetMethodName() => MethodName;
 	}
 }

HookAttribute/HookAttribute.cs

@@ -1,22 +1,18 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace HookAttribute
+namespace UniversalUnityHooks
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
     public sealed class HookAttribute : Attribute
     {
-        bool AddToEnd { get; set; }
-        string FullName { get; set; }
+        private bool AddToEnd { get; }
+
+        private string FullName { get; }
+
         public HookAttribute(string fullName, bool addToEnd = false)
         {
             FullName = fullName;
             AddToEnd = addToEnd;
         }
-        public string GetName() => FullName;
-        public bool PlaceAtEnd() => AddToEnd;
     }
 }

HookAttribute/Properties/AssemblyInfo.cs

@@ -1,36 +1,16 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("HookAttribute")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("This dll is required for your attributes. reference and add 'using UniversalUnityHooks;'.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HookAttribute")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("UniversalUnityHooks")]
+[assembly: AssemblyCopyright("Copyright © UserR00T 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1c514f24-0478-4e3f-a5ea-e52e0314b9b0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

README.md

@@ -66,6 +66,24 @@ It'd compile it like this:
   }
 ```
 
+## Arguments
+The following arguments are allowed:
+``UniversalUnityHooks.exe --help``
+```
+  -t, --target    Set the target assembly file to be injected.
+
+  -i, --input     Set the input assemblies to be injected.
+
+  -o, --output    Set the output directory for assemblies to be copied to. NOTE: This will also be the search
+                  directory. Recommended to keep default.
+
+  -w, --wait      Waits for input before continuing.
+
+  --help          Display this help screen.
+
+  --version       Display version information.
+```
+
 ## License
 
 This code is licenced under the MIT Licence, [Information can be found here.](https://github.com/UserR00T/UniversalUnityHooks/blob/master/LICENSE)
@@ -79,4 +97,11 @@ Unfortunately there are some limitations;
 
 Ardivaba: https://github.com/Ardivaba
 
-DeathByKorea: https://github.com/DeathByKorea
+DeathByKorea: https://github.com/DeathByKorea
+
+### Dependencies:
+[commandline](https://github.com/commandlineparser/commandline)
+
+[NetChalker](https://github.com/UserR00T/NetChalker)
+
+[Fody.Costura](https://github.com/Fody/Costura)

TestProject/Core.cs

@@ -1,36 +1,34 @@
-using HookAttribute;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System;
+using UniversalUnityHooks;
 
 namespace TestProject
 {
-	public class Core
-	{
-		[HookAttribute.Hook("Injected.Method3")]
-		public static bool InjectedMethod_M(Injected instance)
-		{
+#pragma warning disable RCS1163, IDE0060, RCS1102
+    public class Core
+    {
+		[Hook("Injected.Method3")]
+        public static bool InjectedMethod_M(Injected instance)
+        {
 			return true;
 		}
-		[HookAttribute.Hook("Injected.Method2")]
+
+		[Hook("Injected.Method2")]
 		public static void InjectedMethod2_M(Injected instance)
 		{
 			Console.WriteLine("InjectedMethod2_M called");
 		}
 
-
 		[AddMethod(nameof(Injected), "TestMethod")]
-		public static void OnTestMethod(Injected instance)
-		{
+        public static void OnTestMethod(Injected instance)
+        {
 			Console.WriteLine("OnTestMethod Called");
 		}
+
 		[AddMethod(nameof(StaticInjected), "StaticTestMethod")]
 		public static void OnStaticTestMethod()
 		{
 			Console.WriteLine("OnStaticTestMethod Called");
 		}
-	}
+    }
+#pragma warning restore RCS1102, IDE0060, RCS1163
 }

TestProject/Injected.cs

@@ -1,26 +1,25 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TestProject
 {
-	public class Injected
+    public class Injected
 	{
 		public void Method1()
 		{
 			Console.WriteLine("Magic v1");
 		}
+
 		public void Method2()
 		{
 			Console.WriteLine("Magic v2");
 		}
+
 		public bool Method3()
 		{
 			Console.WriteLine("Magic v3");
 			return true;
 		}
+
 		public bool Method4()
 		{
 			Console.WriteLine("Magic v4");
@@ -31,23 +30,26 @@ public static void StaticMethod1()
 		{
 			Console.WriteLine("Magic v1");
 		}
+
 		public static void StaticMethod2()
 		{
 			Console.WriteLine("Magic v2");
 		}
+
 		public static bool StaticMethod3()
 		{
 			Console.WriteLine("Magic v3");
 			return true;
 		}
+
 		public static bool StaticMethod4()
 		{
 			Console.WriteLine("Magic v4");
 			return false;
 		}
 	}
+
 	public static class StaticInjected
 	{
-
 	}
 }

UniversalUnityHooks/Assemblies.cs

@@ -0,0 +1,51 @@
+using Mono.Cecil;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace UniversalUnityHooks
+{
+    public class AssemblyHelper
+    {
+        public string AssemblyDirectory { get; }
+
+        public AssemblyHelper(string directory)
+        {
+            AssemblyDirectory = directory;
+        }
+
+        public void FetchAndLoadAll()
+        {
+            try
+            {
+                foreach (var file in Directory.GetFiles(AssemblyDirectory, "*.dll"))
+                {
+                    Program.Chalker.WriteWait($"Loading in assembly {Path.GetFileName(file)}..");
+                    var timer = new OperationTimer();
+                    try
+                    {
+                        var assembly = AssemblyDefinition.ReadAssembly(Path.GetFullPath(file));
+                        var allAttributes = Program.AttributesHelper.FindInAssembly(assembly);
+						var filteredAttributes = Program.AttributesHelper.InstantiateAndInvoke(allAttributes, timer);
+						foreach (var keyValuePair in filteredAttributes)
+							Program.Attributes.Add(keyValuePair.Key, keyValuePair.Value);
+						timer.Stop();
+                        Program.Chalker.WriteSuccess($"Loaded in assembly and {filteredAttributes.Sum(x=>x.Value.Count)} attribute(s) in {timer.GetElapsedMs}ms\r\n");
+                    }
+                    catch (Exception ex)
+                    {
+						Program.Chalker.WriteError(ex.InnerException.StackTrace);
+						timer.Stop();
+                        Program.Chalker.WriteError($"Could not load in assembly after {timer.GetElapsedMs}ms.");
+                        Program.Chalker.WriteError($"Message: {ex.Message}");
+                        Program.Chalker.WriteError(ex.StackTrace);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Program.Chalker.WriteError($"{ex.Message}\r\nStackTrace:{ex.StackTrace}");
+            }
+        }
+    }
+}

UniversalUnityHooks/AssemblyHelper.cs

@@ -0,0 +1,25 @@
+using Mono.Cecil;
+
+namespace UniversalUnityHooks
+{
+    public class AttributeData
+    {
+        public AttributeData(TypeDefinition type, MethodDefinition method, CustomAttribute attribute, AssemblyDefinition assembly)
+        {
+            Type = type;
+            Method = method;
+            Attribute = attribute;
+            Assembly = assembly;
+        }
+
+        public Cecil.ReturnData TargetData { get; set; }
+
+        public AssemblyDefinition Assembly { get; set; }
+
+        public TypeDefinition Type { get; set; }
+
+        public MethodDefinition Method { get; set; }
+
+        public CustomAttribute Attribute { get; set; }
+    }
+}