Changeset 107 for binary-improvements/assembly-patcher/Main.cs

Timestamp:

Jul 26, 2014, 4:41:11 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/assembly-patcher/Main.cs (modified) (11 diffs)

binary-improvements/assembly-patcher/Main.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using Mono.Cecil;
@@ -14 +15 @@
                         TypeDefinition type = module.GetType ("GameManager");
                         if (isPatched (type)) {
-                                Console.WriteLine("Assembly already patched");
+                                Console.WriteLine ("Assembly already patched");
                                 return;
                         }
                         markTypePatched (module, type);
 
+                        consoleOutputPatch (module);
                         telnetPatch (module);
                         connectLogPatch (module);
-                        executionLogPatch (module);
                         publicCommandPermissionsPatch (module);
                         playerDataPatch (module);
+
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
+
+                }
+
+                private static void consoleOutputPatch (ModuleDefinition module)
+                {
+                        TypeDefinition type = module.GetType ("ConsoleSdtd");
+                        replaceMethod (type, "ExecuteCmdFromClient", true, 3, typeof(ConsoleOutputSeparator).GetMethod ("C_ExecuteCmdFromClient"));
+                        addHook (type, "Run", true, 0, true, typeof(ConsoleOutputSeparator).GetMethod ("C_Run"));
+                        replaceMethod (type, "SendResult", true, 1, typeof(ConsoleOutputSeparator).GetMethod ("C_SendResult"));
+
                 }
 
@@ -31 +43 @@
                 {
                         TypeDefinition type = module.GetType ("GameManager");
-
                         addHook (type, "SavePlayerData", true, 2, true, typeof(PlayerDataStuff).GetMethod ("GM_SavePlayerData"));
-                        addHook (type, "Awake", true, 0, true, typeof(CommandExtensions).GetMethod("InitCommandExtensions"));
+                        addHook (type, "Awake", true, 0, true, typeof(CommandExtensions).GetMethod ("InitCommandExtensions"));
                 }
 
@@ -39 +50 @@
                 {
                         TypeDefinition type = module.GetType ("AdminTools");
-
                         replaceMethod (type, "GetAllowedCommandsList", true, 1, typeof(AdminToolsStuff).GetMethod ("GetAllowedCommandsList"));
                 }
@@ -46 +56 @@
                 {
                         TypeDefinition type = module.GetType ("GameManager");
-
                         addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsLogFunctions).GetMethod ("RequestToSpawnPlayer"));
-                }
-
-                private static void executionLogPatch (ModuleDefinition module)
-                {
-                        TypeDefinition type = module.GetType ("ConsoleSdtd");
-
-                        addHook (type, "ExecuteCmdFromClient", true, 3, false, typeof(AllocsLogFunctions).GetMethod ("ExecuteCmdFromClient"));
                 }
 
@@ -60 +62 @@
                 {
                         TypeDefinition type = module.GetType ("NetTelnetServer");
-
                         replaceMethod (type, ".ctor", false, 1, typeof(AllocsNetTelnetServer).GetMethod ("init"));
                         replaceMethod (type, "Disconnect", false, 0, typeof(AllocsNetTelnetServer).GetMethod ("Disconnect"));
@@ -76 +77 @@
                         foreach (MethodDefinition method in type.Methods) {
                                 if (method.Name.Equals (methodName)) {
-                                        Console.WriteLine ("Patching " + methodName);
                                         var il = method.Body.GetILProcessor ();
                                         var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod));
@@ -98 +98 @@
                                                 il.InsertBefore (method.Body.Instructions [i++], call);
                                         }
+                                        return;
                                 }
                         }
+                        Console.WriteLine ("ERROR: Did not find " + type.Name + "." + methodName + "()");
                 }
 
@@ -106 +108 @@
                         foreach (MethodDefinition method in type.Methods) {
                                 if (method.Name.Equals (methodName)) {
-                                        Console.WriteLine ("Patching " + methodName);
                                         var il = method.Body.GetILProcessor ();
                                         var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod));
@@ -117 +118 @@
                                         il.InsertBefore (method.Body.Instructions [i++], call);
                                         il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ret));
+                                        return;
                                 }
                         }
+                        Console.WriteLine ("ERROR: Did not find " + type.Name + "." + methodName + "()");
                 }
 
@@ -125 +128 @@
                         foreach (FieldDefinition fd in type.Fields) {
                                 if (fd.Name.Equals ("AllocsPatch")) {
-                                        Console.WriteLine ("\"" + type.Name + "\" is already patched, skipping");
                                         return true;
                                 }
                         }
-                        Console.WriteLine ("Patching \"" + type.Name + "\"");
                         return false;
                 }