Changeset 84

Timestamp:

Jul 19, 2014, 12:47:32 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (2 diffs)
• 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 (added)
• 7dtd-server-fixes/src/AllocsNetTelnetServer.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/GetTime.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs (added)
• NamePatcher/NamePatcher.cs (modified) (1 diff)
• NamePatcher/NamePatcher.userprefs (modified) (1 diff)
• assembly-patcher/Assembly-Patcher.userprefs (modified) (1 diff)
• assembly-patcher/Main.cs (modified) (4 diffs)

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

@@ -31 +31 @@
     <Reference Include="System" />
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\NamePatcher\bin\Release\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\assembly-patcher\bin\Release\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
@@ -46 +46 @@
     <Compile Include="src\TelnetCommands\SayToPlayer.cs" />
     <Compile Include="src\AllocsLogFunctions.cs" />
+    <Compile Include="src\TelnetCommands\SetTimeReal.cs" />
+    <Compile Include="src\AdminToolsStuff.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -137 +137 @@
                 console.AddCommand(new ListPlayersExtended(console));
                 console.AddCommand(new SayToPlayer(console));
+                console.AddCommand(new SetTimeReal(console));
         }
 

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

@@ -26 +26 @@
                         hour -= 24;
                 }
-                int sec = (int)(time % 1000) * 60 / 1000;
-                m_Console.md000a (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, sec));
+                int min = (int)(time % 1000) * 60 / 1000;
+                m_Console.md000a (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min));
         }
 }

binary-improvements/NamePatcher/NamePatcher.cs

@@ -58 +58 @@
                 static void applyManualPatches (ModuleDefinition mainModule)
                 {
+                        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;

binary-improvements/NamePatcher/NamePatcher.userprefs

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="NamePatcher.cs">
     <Files>
-      <File FileName="NamePatcher.cs" Line="165" Column="120" />
+      <File FileName="NamePatcher.cs" Line="109" Column="57" />
       <File FileName="NameNormalizer.cs" Line="188" Column="1" />
     </Files>

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

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
     <Files>
-      <File FileName="Main.cs" Line="48" Column="3" />
+      <File FileName="Main.cs" Line="29" Column="54" />
       <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
     </Files>
+    <Pads>
+      <Pad Id="ProjectPad">
+        <State expanded="True">
+          <Node name="Assembly-Patcher" expanded="True">
+            <Node name="References" expanded="True">
+              <Node name="/home/ci/Schreibtisch/7dtd-svn/binary-improvements/7dtd-server-fixes/bin/Release/7dtd-server-fixes.dll" selected="True" />
+            </Node>
+          </Node>
+        </State>
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

binary-improvements/assembly-patcher/Main.cs

@@ -14 +14 @@
                         connectLogPatch (module);
                         executionLogPatch( module);
+                        publicCommandPermissionsPatch (module);
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
+                }
+
+                private static void publicCommandPermissionsPatch (ModuleDefinition module)
+                {
+                        TypeDefinition type = module.GetType ("AdminTools");
+
+                        if (isPatched (type)) {
+                                return;
+                        }
+
+                        markTypePatched (module, type);
+                        replaceMethod (type, "GetAllowedCommandsList", true, 1, typeof(AdminToolsStuff).GetMethod ("GetAllowedCommandsList"));
                 }
 
@@ -51 +64 @@
 
                         markTypePatched (module, type);
-                        replaceMethod (type, ".ctor", 1, typeof(AllocsNetTelnetServer).GetMethod ("init"));
-                        replaceMethod (type, "Disconnect", 0, typeof(AllocsNetTelnetServer).GetMethod ("Disconnect"));
-                        replaceMethod (type, "SetConsole", 1, typeof(AllocsNetTelnetServer).GetMethod ("SetConsole"));
-                        replaceMethod (type, "WriteToClient", 1, typeof(AllocsNetTelnetServer).GetMethod ("WriteToClient"));
+                        replaceMethod (type, ".ctor", false, 1, typeof(AllocsNetTelnetServer).GetMethod ("init"));
+                        replaceMethod (type, "Disconnect", false, 0, typeof(AllocsNetTelnetServer).GetMethod ("Disconnect"));
+                        replaceMethod (type, "SetConsole", false, 1, typeof(AllocsNetTelnetServer).GetMethod ("SetConsole"));
+                        replaceMethod (type, "WriteToClient", false, 1, typeof(AllocsNetTelnetServer).GetMethod ("WriteToClient"));
                 }
 
@@ -92 +105 @@
                 }
 
-                private static void replaceMethod (TypeDefinition type, string methodName, int opCount, MethodBase targetMethod)
+                private static void replaceMethod (TypeDefinition type, string methodName, bool addThisRef, int opCount, MethodBase targetMethod)
                 {
                         foreach (MethodDefinition method in type.Methods) {
@@ -100 +113 @@
                                         var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod));
                                         var i = 0;
+                                        if (addThisRef)
+                                                il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, 0));
                                         for (int op = 0; op < opCount; op++) {
                                                 il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1));