Changeset 107

Timestamp:

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

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 7dtd-server-fixes/7dtd-server-fixes.userprefs (modified) (1 diff)
• 7dtd-server-fixes/bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• 7dtd-server-fixes/bin/Release/Assembly-CSharp.dll (modified) ( previous)
• 7dtd-server-fixes/src/AdminToolsStuff.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/AllocsLogFunctions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/AllocsNetTelnetServer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/CommandExtensions.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/CommonMappingFunctions.cs (added)
• 7dtd-server-fixes/src/ConsoleOutputSeparator.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/GetTime.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs (modified) (2 diffs)
• NamePatcher/ManualPatches.cs (added)
• NamePatcher/NamePatcher.cs (modified) (3 diffs)
• NamePatcher/NamePatcher.csproj (modified) (1 diff)
• NamePatcher/NamePatcher.userprefs (modified) (2 diffs)
• assembly-patcher/Main.cs (modified) (11 diffs)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -55 +55 @@
     <Compile Include="src\CommandExtensions.cs" />
     <Compile Include="src\CommonMappingFunctions.cs" />
+    <Compile Include="src\ConsoleOutputSeparator.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/PlayerDataStuff.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="src/AdminToolsStuff.cs">
     <Files>
       <File FileName="src/AssemblyInfo.cs" Line="20" Column="40" />
-      <File FileName="src/AllocsNetTelnetServer.cs" Line="136" Column="1" />
-      <File FileName="src/AllocsTelnetConnection.cs" Line="44" Column="42" />
-      <File FileName="src/AllocsLogFunctions.cs" Line="27" Column="42" />
-      <File FileName="src/AdminToolsStuff.cs" Line="30" Column="54" />
-      <File FileName="src/PlayerDataStuff.cs" Line="30" Column="27" />
-      <File FileName="src/CommandExtensions.cs" Line="12" Column="73" />
+      <File FileName="src/AllocsNetTelnetServer.cs" Line="155" Column="65" />
+      <File FileName="src/AllocsTelnetConnection.cs" Line="50" Column="3" />
+      <File FileName="src/AllocsLogFunctions.cs" Line="27" Column="43" />
+      <File FileName="src/AdminToolsStuff.cs" Line="33" Column="1" />
+      <File FileName="src/PlayerDataStuff.cs" Line="59" Column="40" />
+      <File FileName="src/TelnetCommands/SayToPlayer.cs" Line="23" Column="49" />
+      <File FileName="src/CommonMappingFunctions.cs" Line="149" Column="1" />
+      <File FileName="src/CommandExtensions.cs" Line="34" Column="28" />
     </Files>
   </MonoDevelop.Ide.Workbench>

binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

@@ -25 +25 @@
                                 }
                         }
+
+                        if (tmpInfo.PermissionLevel <= 0) {
+                                List<ConsoleCommand> commands = console.commands;
+                                foreach (ConsoleCommand c in commands) {
+                                        if (!allowed.Contains (c.Names () [0])) {
+                                                if (!hasPermissionLevel (admTools, c.Names () [0])) {
+                                                        addAllowed (console, allowed, c.Names () [0]);
+                                                }
+                                        }
+                                }
+                        }
                 } catch (Exception e) {
                         Log.Out ("Error in GetAllowedCommandsList: " + e);
@@ -33 +44 @@
         }
 
+        private static bool hasPermissionLevel (AdminTools admTools, string cmd)
+        {
+                List<AdminToolsCommandPermissions> perms = admTools.commandPermissions;
+
+                foreach (AdminToolsCommandPermissions atcp in perms) {
+                        foreach (string ccName in getAlternativeNames(cmd)) {
+                                if (atcp.Command.ToLower ().Equals (ccName)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+
         private static void addAllowed (ConsoleSdtd console, List<string> list, string cmd)
         {
-                ConsoleCommand cc = console.getCommand (cmd);
+                foreach (string ccName in getAlternativeNames(cmd)) {
+                        if (!list.Contains (ccName)) {
+                                list.Add (ccName);
+                        }
+                }
+        }
+
+        private static string[] getAlternativeNames (string cmd)
+        {
+                ConsoleCommand cc = CommonMappingFunctions.GetGameManager ().m_GUIConsole.getCommand (cmd);
                 if (cc != null) {
-                        foreach (string ccName in cc.Names()) {
-                                if (!list.Contains (ccName)) {
-                                        list.Add (ccName);
-                                }
-                        }
+                        return cc.Names ();
                 } else {
-                        list.Add (cmd);
+                        return new string[0];
                 }
         }

binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs

@@ -28 +28 @@
                 }
         }
-
-        public static void ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command)
-        {
-                Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
-        }
 }

binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs

@@ -78 +78 @@
                                                         }
                                                         Log.Out ("Telnet executed \"" + line + "\" from: " + c.GetEndPoint ());
-                                                        console.md000f (line);
+                                                        ConsoleOutputSeparator.QueueTelnetCommand (line, c);
                                                 }
                                         }
@@ -168 +168 @@
                 }
         }
+
+        public static void WriteToClient (string line, AllocsTelnetConnection client)
+        {
+                if (line == null) {
+                        return;
+                }
+                RemoveClosedConnections ();
+                foreach (AllocsTelnetConnection c in connections) {
+                        if (c.IsAuthenticated () && (c == client))
+                                c.WriteLine (line);
+                }
+        }
 }

binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 
 public class CommandExtensions
@@ -5 +6 @@
         public static void InitCommandExtensions (GameManager manager)
         {
-                manager.m_GUIConsole.AddCommand(new GetGamePrefs(manager.m_GUIConsole));
-                manager.m_GUIConsole.AddCommand(new GetTime(manager.m_GUIConsole));
-                manager.m_GUIConsole.AddCommand(new ListPlayersExtended(manager.m_GUIConsole));
-                manager.m_GUIConsole.AddCommand(new SayToPlayer(manager.m_GUIConsole));
-                manager.m_GUIConsole.AddCommand(new SetTimeReal(manager.m_GUIConsole));
-                manager.m_GUIConsole.AddCommand(new ShowInventory(manager.m_GUIConsole));
+                try {
+                        manager.m_GUIConsole.AddCommand (new GetGamePrefs (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new SayToPlayer (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new SetTimeReal (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new ShowInventory (manager.m_GUIConsole));
+                } catch (Exception e) {
+                        Log.Out ("Error registering custom commands: " + e);
+                }
+                /*
+                try {
+                        List<ConsoleCommand> commands = manager.m_GUIConsole.commands;
+                        foreach (ConsoleCommand c in commands) {
+                                string name = string.Empty;
+                                foreach (string cname in c.Names()) {
+                                        if (cname.Length > 0) {
+                                                if (name.Length > 0)
+                                                        name += ", ";
+                                                name += cname;
+                                        }
+                                }
+                                name += " => " + c.Description();
+                                Log.Out (name);
+                        }
+                } catch (Exception e) {
+                        Log.Out ("Error listing commands: " + e);
+                }
+                */
         }
 }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs

@@ -65 +65 @@
                                 }
                                 foreach (string s in sortedList.Keys) {
-                                        m_Console.md000a (sortedList [s]);
+                                        m_Console.SendResult (sortedList [s]);
                                 }
                         } else {
                                 if (prefAccessAllowed (enumGamePrefs))
-                                        m_Console.md000a (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
+                                        m_Console.SendResult (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
                                 else
-                                        m_Console.md000a ("Access to requested preference is forbidden");
+                                        m_Console.SendResult ("Access to requested preference is forbidden");
                         }
                 } catch (Exception e) {

binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetTime.cs

@@ -28 +28 @@
                         }
                         int min = (int)(time % 1000) * 60 / 1000;
-                        m_Console.md000a (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min));
+                        m_Console.SendResult (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min));
                 } catch (Exception e) {
                         Log.Out ("Error in GetTime.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

@@ -29 +29 @@
                                         ip = ci.networkPlayer.ipAddress;
                                 }
-                                m_Console.md000a (string.Concat (new object[]
+                                m_Console.SendResult (string.Concat (new object[]
                         {
                                 string.Empty,
@@ -63 +63 @@
                                 );
                         }
-                        m_Console.md000a ("Total of " + w.playerEntities.list.Count + " in the game");
+                        m_Console.SendResult ("Total of " + w.playerEntities.list.Count + " in the game");
                 } catch (Exception e) {
                         Log.Out ("Error in ListPlayersExtended.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs

@@ -23 +23 @@
                                 new object[] { _message, -1, _sender + " (PM)", true    });
                 string receiverName = CommonMappingFunctions.GetPlayerName (_receiver);
-                m_Console.md000a ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\"");
+                m_Console.SendResult ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\"");
         }
 
@@ -29 +29 @@
         {
                 if (_params.Length < 2) {
-                        m_Console.md000a ("Usage: sayplayer <playername|entityid> <message>");
+                        m_Console.SendResult ("Usage: sayplayer <playername|entityid> <message>");
                         return;
                 }
@@ -42 +42 @@
                         SendMessage (ci, _sender, message);
                 } else {
-                        m_Console.md000a ("Playername or entity ID not found.");
+                        m_Console.SendResult ("Playername or entity ID not found.");
                 }
         }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs

@@ -21 +21 @@
                 try {
                         if (_params.Length != 3) {
-                                m_Console.md000a ("Usage: settimereal <day> <hour> <min>");
+                                m_Console.SendResult ("Usage: settimereal <day> <hour> <min>");
                                 return;
                         }
@@ -27 +27 @@
                         int day, hour, min;
                         if (!int.TryParse (_params [0], out day)) {
-                                m_Console.md000a ("Could not parse day number \"" + _params [0] + "\"");
+                                m_Console.SendResult ("Could not parse day number \"" + _params [0] + "\"");
                                 return;
                         }
                         if (day < 1) {
-                                m_Console.md000a ("Day must be >= 1");
+                                m_Console.SendResult ("Day must be >= 1");
                                 return;
                         }
                         if (!int.TryParse (_params [1], out hour)) {
-                                m_Console.md000a ("Could not parse hour \"" + _params [1] + "\"");
+                                m_Console.SendResult ("Could not parse hour \"" + _params [1] + "\"");
                                 return;
                         }
                         if (hour > 23) {
-                                m_Console.md000a ("Hour must be <= 23");
+                                m_Console.SendResult ("Hour must be <= 23");
                                 return;
                         }
                         if (!int.TryParse (_params [2], out min)) {
-                                m_Console.md000a ("Could not parse minute \"" + _params [2] + "\"");
+                                m_Console.SendResult ("Could not parse minute \"" + _params [2] + "\"");
                                 return;
                         }
                         if (min > 59) {
-                                m_Console.md000a ("Minute must be <= 59");
+                                m_Console.SendResult ("Minute must be <= 59");
                                 return;
                         }
                         if ((day < 1) || (hour < 8 && day < 1)) {
-                                m_Console.md000a ("Time may not be prior to day 1, 8:00");
+                                m_Console.SendResult ("Time may not be prior to day 1, 8:00");
                                 return;
                         }
@@ -57 +57 @@
                         ulong time = ((ulong)(day - 1) * 24000) + ((ulong)hour * 1000) + ((ulong)min * 1000 / 60) - 8000;
                         m_Console.gameManager.World.gameTime = time;
-                        m_Console.md000a (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time));
+                        m_Console.SendResult (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time));
                 } catch (Exception e) {
                         Log.Out ("Error in SetTimeReal.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs

@@ -25 +25 @@
                 try {
                         if (_params.Length < 1) {
-                                m_Console.md000a ("Usage: showinventory <playername|entityid>");
+                                m_Console.SendResult ("Usage: showinventory <playername|entityid>");
                                 return;
                         }
@@ -47 +47 @@
 
                         if (items == null) {
-                                m_Console.md000a ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
+                                m_Console.SendResult ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
                                 return;
                         }
 
-                        m_Console.md000a ("Belt of player:");
+                        m_Console.SendResult ("Belt of player:");
                         foreach (KeyValuePair<string, int> kvp in items.belt) {
-                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                                m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
                         }
-                        m_Console.md000a (string.Empty);
-                        m_Console.md000a ("Bagpack of player:");
+                        m_Console.SendResult (string.Empty);
+                        m_Console.SendResult ("Bagpack of player:");
                         foreach (KeyValuePair<string, int> kvp in items.bag) {
-                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                                m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
                         }
-                        m_Console.md000a (string.Empty);
+                        m_Console.SendResult (string.Empty);
                 } catch (Exception e) {
                         Log.Out ("Error in ShowInventory.Run: " + e);

binary-improvements/NamePatcher/NamePatcher.cs

@@ -8 +8 @@
 namespace NamePatcher
 {
+
         class NamePatcher
         {
@@ -56 +57 @@
                 }
 
-                static void applyManualPatches (ModuleDefinition mainModule)
-                {
-                        NameNormalizer.setName (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");
-
-                        foreach (FieldDefinition fd in mainModule.GetType ("Authenticator").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fdType.FullName.Contains ("Dictionary") && fdType.FullName.Contains ("System.String")) {
-                                        Console.WriteLine ("Renaming and making public Authenticator field -> usersToIDs");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "usersToIDs");
-                                }
-                        }
-
-                        foreach (FieldDefinition fd in mainModule.GetType("PlayerDataFile").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fd.Name.Equals ("inventory") && fdType.IsArray) {
-                                        foreach (FieldDefinition fd2 in fdType.Resolve().Fields) {
-                                                TypeReference fd2Type = fd2.FieldType;
-                                                if (fd2Type.FullName.Equals ("System.Int32")) {
-                                                        Console.WriteLine ("Renaming inventory field field -> count");
-                                                        NameNormalizer.setName (fd2, "count");
-                                                }
-                                                if (fd2Type.FullName.Equals ("ItemValue")) {
-                                                        Console.WriteLine ("Renaming inventory field field -> itemValue");
-                                                        NameNormalizer.setName (fd2, "itemValue");
-                                                }
-                                        }
-                                        Console.WriteLine ("Renaming inventory field class -> InventoryField");
-                                        NameNormalizer.setName (fdType.Resolve (), "InventoryField");
-                                }
-                        }
-
-                        foreach (FieldDefinition fd in mainModule.GetType ("AdminTools").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fdType.FullName.Contains ("List") && fdType.FullName.Contains ("AdminToolsCommandPermissions")) {
-                                        Console.WriteLine ("Renaming and making public admin tools field -> commandPermissions");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "commandPermissions");
-                                }
-                        }
-
-                        foreach (FieldDefinition fd in mainModule.GetType ("World").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fdType.FullName.Equals ("System.UInt64")) {
-                                        Console.WriteLine ("Renaming world field -> gameTime");
-                                        NameNormalizer.setName (fd, "gameTime");
-                                }
-                        }
-
-                        foreach (FieldDefinition fd in mainModule.GetType ("GameManager").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fdType.FullName.Equals ("ConnectionManager")) {
-                                        Console.WriteLine ("Renaming and making public GameMananger field -> connectionManager");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "connectionManager");
-                                }
-                        }
-
-                        foreach (FieldDefinition fd in mainModule.GetType ("ConnectionManager").Fields) {
-                                TypeReference fdType = fd.FieldType;
-                                if (fdType.FullName.Equals ("GameManager")) {
-                                        Console.WriteLine ("Renaming and making public ConnectionManager field -> gameManager");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "gameManager");
-                                }
-                                if (fdType.FullName.Contains ("Dictionary") && fdType.FullName.Contains ("ClientInfo")) {
-                                        Console.WriteLine ("Renaming and making public ConnectionManager field -> connectedClients");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "connectedClients");
-                                }
-                                if (fdType.FullName.Contains ("Dictionary") && fdType.FullName.Contains ("System.Int32,System.Int32")) {
-                                        Console.WriteLine ("Renaming and making public ConnectionManager field -> mapClientToEntity");
-                                        fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                        NameNormalizer.setName (fd, "mapClientToEntity");
-                                }
-                        }
-
-                        string consoleTypeName = string.Empty;
-                        TypeDefinition typeTelnetServer = mainModule.GetType ("NetTelnetServer");
-                        foreach (FieldDefinition fd in typeTelnetServer.Fields) {
-                                if (NameNormalizer.makeValidName (fd.FieldType.Name) != null) {
-                                        Console.WriteLine ("Renaming console class -> ConsoleSdtd");
-                                        consoleTypeName = fd.FieldType.Name;
-                                        NameNormalizer.setName (fd.FieldType.Resolve (), "ConsoleSdtd");
-                                        NameNormalizer.setName (fd, "console");
-                                }
-                        }
-
-                        if (consoleTypeName.Length > 0) {
-                                TypeDefinition typeConsole = mainModule.GetType (consoleTypeName);
-                                string consoleCommandTypeName = string.Empty;
-                                foreach (MethodDefinition md in typeConsole.Methods) {
-                                        if (!md.IsConstructor) {
-                                                if (md.Parameters.Count == 3 && md.Parameters [0].ParameterType.Name.Equals ("NetworkPlayer")) {
-                                                        Console.WriteLine ("Renaming console method -> ExecuteCmdFromClient");
-                                                        NameNormalizer.setName (md, "ExecuteCmdFromClient");
-                                                }
-                                        }
-                                }
-                                foreach (FieldDefinition fd in typeConsole.Fields) {
-                                        TypeReference fdType = fd.FieldType;
-                                        if (fdType.FullName.Contains ("Generic.List")) {
-                                                if (fdType.IsGenericInstance) {
-                                                        GenericInstanceType genType = (GenericInstanceType)fdType;
-                                                        TypeReference genRef = genType.GenericArguments [0];
-                                                        if (genRef.Name.Length < 2) {
-                                                                Console.WriteLine ("Renaming console command class -> ConsoleCommand");
-                                                                NameNormalizer.setName (genRef.Resolve (), "ConsoleCommand");
-                                                                NameNormalizer.setName (fd, "commands");
-                                                                consoleCommandTypeName = genRef.Name;
-                                                        }
-                                                }
-                                        }
-                                        if (fdType.FullName.Equals ("GameManager")) {
-                                                Console.WriteLine ("Renaming and making public console field -> gameManager");
-                                                fd.Attributes = fd.Attributes & (~Mono.Cecil.FieldAttributes.Private) | Mono.Cecil.FieldAttributes.Public;
-                                                NameNormalizer.setName (fd, "gameManager");
-                                        }
-                                }
-
-                                if (consoleCommandTypeName.Length > 0) {
-                                        foreach (MethodDefinition md in typeConsole.Methods) {
-                                                if (!md.IsConstructor) {
-                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.Name.Equals (consoleCommandTypeName)) {
-                                                                Console.WriteLine ("Renaming console method -> AddCommand");
-                                                                NameNormalizer.setName (md, "AddCommand");
-                                                        }
-                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.FullName.Equals ("System.String") && md.ReturnType.FullName.Equals (consoleCommandTypeName)) {
-                                                                Console.WriteLine ("Renaming console method -> getCommand");
-                                                                NameNormalizer.setName (md, "getCommand");
-                                                        }
-                                                }
-                                        }
-
-                                        TypeDefinition typeConsoleCommand = mainModule.GetType (consoleCommandTypeName);
-                                        foreach (MethodDefinition md in typeConsoleCommand.Methods) {
-                                                if (!md.IsConstructor) {
-                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.Name.Equals (consoleTypeName)) {
-                                                                Console.WriteLine ("Renaming console command method -> Help");
-                                                                NameNormalizer.setName (md, "Help");
-                                                        }
-                                                        if (md.Parameters.Count == 0 && md.ReturnType.Name.Equals ("Int32")) {
-                                                                Console.WriteLine ("Renaming console command method -> Timeout");
-                                                                NameNormalizer.setName (md, "Timeout");
-                                                        }
-                                                        if (md.Parameters.Count == 0 && md.ReturnType.Name.Equals ("String[]")) {
-                                                                Console.WriteLine ("Renaming console command method -> Names");
-                                                                NameNormalizer.setName (md, "Names");
-                                                        }
-                                                        if (md.Parameters.Count == 0 && md.ReturnType.Name.Equals ("String")) {
-                                                                Console.WriteLine ("Renaming console command method -> Description");
-                                                                NameNormalizer.setName (md, "Description");
-                                                        }
-                                                        if (md.Parameters.Count == 1 && md.Parameters [0].ParameterType.IsArray) {
-                                                                Console.WriteLine ("Renaming console command method -> Run");
-                                                                NameNormalizer.setName (md, "Run");
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                }
-
                 static void Main (string[] args)
                 {
-                        Console.WriteLine ("NamePatcher for 7dtd's Assembly-CSharp.dll [by DerPopo, modified by Alloc] for Dedi build 320404");
+                        Console.WriteLine ("NamePatcher for 7dtd's Assembly-CSharp.dll [by DerPopo, modified by Alloc]");
                         if (!TryArgs (args)) {
                                 DrawUsage ();
@@ -247 +85 @@
 
 
-                        applyManualPatches (input.MainModule);
+                        ManualPatches.applyManualPatches (input.MainModule);
 
 

binary-improvements/NamePatcher/NamePatcher.csproj

@@ -44 +44 @@
     <Compile Include="NamePatcher.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ManualPatches.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

binary-improvements/NamePatcher/NamePatcher.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="NamePatcher.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="ManualPatches.cs">
     <Files>
-      <File FileName="NamePatcher.cs" Line="64" Column="92" />
+      <File FileName="NamePatcher.cs" Line="5" Column="1" />
       <File FileName="NameNormalizer.cs" Line="188" Column="1" />
+      <File FileName="ManualPatches.cs" Line="120" Column="1" />
     </Files>
     <Pads>
@@ -11 +12 @@
           <Node name="NamePatcher" expanded="True">
             <Node name="Properties" expanded="True" />
-            <Node name="NamePatcher.cs" selected="True" />
+            <Node name="ManualPatches.cs" selected="True" />
           </Node>
         </State>

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;
                 }