Changeset 93

Timestamp:

Jul 20, 2014, 8:50:13 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/AllocsNetTelnetServer.cs (modified) (7 diffs)
• 7dtd-server-fixes/src/PlayerDataStuff.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs (added)
• NamePatcher/NamePatcher.cs (modified) (1 diff)
• assembly-patcher/Assembly-Patcher.userprefs (modified) (1 diff)
• assembly-patcher/Main.cs (modified) (5 diffs)

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

@@ -48 +48 @@
     <Compile Include="src\TelnetCommands\SetTimeReal.cs" />
     <Compile Include="src\AdminToolsStuff.cs" />
+    <Compile Include="src\TelnetCommands\ShowInventory.cs" />
+    <Compile Include="src\PlayerDataStuff.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -4 +4 @@
     <Files>
       <File FileName="src/AssemblyInfo.cs" Line="20" Column="40" />
-      <File FileName="src/AllocsNetTelnetServer.cs" Line="33" Column="1" />
+      <File FileName="src/AllocsNetTelnetServer.cs" Line="93" Column="50" />
       <File FileName="src/AllocsTelnetConnection.cs" Line="44" Column="42" />
       <File FileName="src/AllocsLogFunctions.cs" Line="27" Column="42" />
-      <File FileName="src/TelnetCommands/GetGamePrefs.cs" Line="71" Column="3" />
-      <File FileName="src/TelnetCommands/ListPlayersExtended.cs" Line="49" Column="17" />
+      <File FileName="src/TelnetCommands/GetGamePrefs.cs" Line="77" Column="1" />
+      <File FileName="src/TelnetCommands/ListPlayersExtended.cs" Line="64" Column="31" />
       <File FileName="src/TelnetCommands/SayToPlayer.cs" Line="75" Column="33" />
       <File FileName="src/AdminToolsStuff.cs" Line="30" Column="54" />

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

@@ -14 +14 @@
         private static bool closed = false;
         private static bool authEnabled = false;
-        private static List<AllocsTelnetConnection> conns = new List<AllocsTelnetConnection> ();
+        private static List<AllocsTelnetConnection> connections = new List<AllocsTelnetConnection> ();
 
         public static void init (int port)
@@ -38 +38 @@
                                 if (listener.Pending ()) {
                                         AllocsTelnetConnection c = new AllocsTelnetConnection (listener.AcceptTcpClient (), authEnabled);
-                                        conns.Add (c);
+                                        connections.Add (c);
                                         Log.Out ("Telnet connection from: " + c.GetEndPoint ());
                                         if (authEnabled) {
@@ -47 +47 @@
                                 }
 
-                                foreach (AllocsTelnetConnection c in conns) {
+                                foreach (AllocsTelnetConnection c in connections) {
                                         if (c.IsClosed ()) {
                                                 c.Close ();
-                                                conns.Remove (c);
+                                                connections.Remove (c);
                                                 break;
                                         }
@@ -70 +70 @@
                                                                 Log.Out ("Telnet connection closed by client: " + c.GetEndPoint ());
                                                                 c.Close ();
-                                                                conns.Remove (c);
+                                                                connections.Remove (c);
                                                                 break;
                                                         }
@@ -124 +124 @@
                         listener.Stop ();
                 }
-                foreach (AllocsTelnetConnection c in conns) {
+                foreach (AllocsTelnetConnection c in connections) {
                         c.Close ();
                 }
@@ -139 +139 @@
                 console.AddCommand(new SayToPlayer(console));
                 console.AddCommand(new SetTimeReal(console));
+                console.AddCommand(new ShowInventory(console));
         }
 
         private static void RemoveClosedConnections ()
         {
-                foreach (AllocsTelnetConnection c in conns) {
+                foreach (AllocsTelnetConnection c in connections) {
                         if (c.IsClosed ()) {
                                 c.Close ();
@@ -156 +157 @@
                 }
                 RemoveClosedConnections ();
-                foreach (AllocsTelnetConnection c in conns) {
+                foreach (AllocsTelnetConnection c in connections) {
                         if (c.IsAuthenticated ())
                                 c.WriteLine (line);

binary-improvements/NamePatcher/NamePatcher.cs

@@ -58 +58 @@
                 static void applyManualPatches (ModuleDefinition mainModule)
                 {
+                        NameNormalizer.setName (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");
+
+                        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;

binary-improvements/assembly-patcher/Assembly-Patcher.userprefs

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
     <Files>
-      <File FileName="Main.cs" Line="28" Column="4" />
+      <File FileName="Main.cs" Line="53" Column="57" />
       <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
     </Files>

binary-improvements/assembly-patcher/Main.cs

@@ -11 +11 @@
                 {
                         ModuleDefinition module = ModuleDefinition.ReadModule ("Assembly-CSharp.dll");
+
+                        TypeDefinition type = module.GetType ("GameManager");
+                        if (isPatched (type)) {
+                                Console.WriteLine("Assembly already patched");
+                                return;
+                        }
+                        markTypePatched (module, type);
+
                         telnetPatch (module);
                         connectLogPatch (module);
-                        executionLogPatch( module);
+                        executionLogPatch (module);
                         publicCommandPermissionsPatch (module);
+                        playerDataPatch (module);
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
+                }
+
+                private static void playerDataPatch (ModuleDefinition module)
+                {
+                        TypeDefinition type = module.GetType ("GameManager");
+
+                        addHook (type, "SavePlayerData", true, 2, true, typeof(PlayerDataStuff).GetMethod ("GM_SavePlayerData"));
                 }
 
@@ -23 +39 @@
                         TypeDefinition type = module.GetType ("AdminTools");
 
-                        if (isPatched (type)) {
-                                return;
-                        }
-
-                        markTypePatched (module, type);
                         replaceMethod (type, "GetAllowedCommandsList", true, 1, typeof(AdminToolsStuff).GetMethod ("GetAllowedCommandsList"));
                 }
@@ -35 +46 @@
                         TypeDefinition type = module.GetType ("GameManager");
 
-                        if (isPatched (type)) {
-                                return;
-                        }
-
-                        markTypePatched (module, type);
                         addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsLogFunctions).GetMethod ("RequestToSpawnPlayer"));
                 }
@@ -47 +53 @@
                         TypeDefinition type = module.GetType ("ConsoleSdtd");
 
-                        if (isPatched (type)) {
-                                return;
-                        }
-
-                        markTypePatched (module, type);
                         addHook (type, "ExecuteCmdFromClient", true, 3, false, typeof(AllocsLogFunctions).GetMethod ("ExecuteCmdFromClient"));
                 }
@@ -59 +60 @@
                         TypeDefinition type = module.GetType ("NetTelnetServer");
 
-                        if (isPatched (type)) {
-                                return;
-                        }
-
-                        markTypePatched (module, type);
                         replaceMethod (type, ".ctor", false, 1, typeof(AllocsNetTelnetServer).GetMethod ("init"));
                         replaceMethod (type, "Disconnect", false, 0, typeof(AllocsNetTelnetServer).GetMethod ("Disconnect"));