Changeset 115

Timestamp:

Aug 13, 2014, 4:52:22 PM (10 years ago)

Author:

alloc

Message:

Fixes: Changed to a single solution for both patcher + fixes

Location:

binary-improvements

Files:

• 7dtd-binaries (added)
• 7dtd-binaries/README.txt (added)
• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (3 diffs)
• 7dtd-server-fixes/7dtd-server-fixes.userprefs (modified) (1 diff)
• 7dtd-server-fixes/bin (deleted)
• 7dtd-server-fixes/src/AllocsNetTelnetServer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/ConsoleOutputSeparator.cs (modified) (1 diff)
• Mono.Cecil license.txt (added)
• NOTICE.txt (added)
• NamePatcher (deleted)
• assembly-patcher/Assembly-Patcher.csproj (modified) (3 diffs)
• assembly-patcher/Assembly-Patcher.userprefs (modified) (2 diffs)
• assembly-patcher/Main.cs (modified) (2 diffs)
• bin (added)
• bin/Release (added)
• bin/Release/7dtd-fixer.exe (added)
• bin/Release/7dtd-server-fixes.dll (added)
• bin/Release/Assembly-CSharp.patched.dll (added)
• server-fixes.sln (added)
• server-fixes.userprefs (added)

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

@@ -14 +14 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -23 +23 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30 +30 @@
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\assembly-patcher\bin\Release\Assembly-CSharp.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>..\assembly-patcher\bin\Release\UnityEngine.dll</HintPath>
+      <HintPath>..\7dtd-binaries\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="SteamworksManaged">
-      <HintPath>bin\Release\SteamworksManaged.dll</HintPath>
+      <HintPath>..\7dtd-binaries\SteamworksManaged.dll</HintPath>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\7dtd-binaries\Assembly-CSharp.deobf.dll</HintPath>
     </Reference>
   </ItemGroup>

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

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/AdminToolsStuff.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="src/AllocsLogFunctions.cs">
     <Files>
-      <File FileName="src/AssemblyInfo.cs" Line="20" Column="40" />
-      <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" />
+      <File FileName="src/AllocsNetTelnetServer.cs" Line="166" Column="29" />
+      <File FileName="src/AllocsTelnetConnection.cs" Line="5" Column="36" />
+      <File FileName="src/AllocsLogFunctions.cs" Line="29" Column="3" />
+      <File FileName="src/CommonMappingFunctions.cs" Line="121" Column="5" />
+      <File FileName="src/CommandExtensions.cs" Line="20" Column="26" />
+      <File FileName="src/TelnetCommands/PrivateMassageConnections.cs" Line="15" Column="26" />
+      <File FileName="src/ConsoleOutputSeparator.cs" Line="52" Column="47" />
     </Files>
   </MonoDevelop.Ide.Workbench>

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

@@ -153 +153 @@
                         }
                 } catch (Exception e) {
-                        Log.Out ("Error in AllocsTelnetServer.RemvoeClosedConnections: " + e);
+                        Log.Out ("Error in AllocsTelnetServer.RemoveClosedConnections: " + e);
                 }
         }
@@ -169 +169 @@
         }
 
-        public static void WriteToClient (string line, AllocsTelnetConnection client)
+        public static void WriteToClient_Single (string line, AllocsTelnetConnection client)
         {
                 if (line == null) {

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

@@ -50 +50 @@
                 } else {
                         if (console.telnetServer != null && issuerOfCurrentTelnetCommand != null)
-                                AllocsNetTelnetServer.WriteToClient (_line, issuerOfCurrentTelnetCommand);
+                                AllocsNetTelnetServer.WriteToClient_Single (_line, issuerOfCurrentTelnetCommand);
                         else if (ControlPanel.IsStarted ())
                                 ControlPanel.AddTextToOutputBuffer (_line);

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

@@ -15 +15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
-    <Externalconsole>true</Externalconsole>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -33 +33 @@
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Private>False</Private>
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="7dtd-server-fixes">
-      <HintPath>..\7dtd-server-fixes\bin\Release\7dtd-server-fixes.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Mono.Cecil">
+      <HintPath>..\Mono.Cecil.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -47 +42 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\7dtd-server-fixes\7dtd-server-fixes.csproj">
+      <Project>{81DA7F87-1A66-4920-AADA-6EAF1971F8D0}</Project>
+      <Name>7dtd-server-fixes</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

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

@@ -3 +3 @@
   <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
     <Files>
-      <File FileName="Main.cs" Line="20" Column="4" />
+      <File FileName="Main.cs" Line="74" Column="71" />
       <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
     </Files>
@@ -10 +10 @@
         <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 name="References" expanded="True" selected="True" />
           </Node>
         </State>

binary-improvements/assembly-patcher/Main.cs

@@ -26 +26 @@
                         playerDataPatch (module);
 
-                        module.Write ("Assembly-CSharp.dll");
+                        module.Write ("Assembly-CSharp.patched.dll");
                         Console.WriteLine ("Done");
 
@@ -37 +37 @@
                         addHook (type, "Run", true, 0, true, typeof(ConsoleOutputSeparator).GetMethod ("C_Run"));
                         replaceMethod (type, "SendResult", true, 1, typeof(ConsoleOutputSeparator).GetMethod ("C_SendResult"));
-
                 }