Changeset 133

Timestamp:

Aug 27, 2014, 3:29:15 AM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (5 diffs)
• 7dtd-server-fixes/src/NetConnections/NetTelnetServer.cs (modified) (6 diffs)
• 7dtd-server-fixes/src/NetConnections/Servers/Web (added)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/MimeType.cs (added)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/PathHandler.cs (added)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/SimpleRedirectHandler.cs (added)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs (added)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs (added)
• assembly-patcher/Main.cs (modified) (2 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/Assembly-CSharp.patched.dll (modified) ( previous)
• server-fixes.userprefs (modified) (1 diff)
• webserver (added)
• webserver/css (added)
• webserver/css/style.css (added)
• webserver/index.html (added)
• webserver/js (added)
• webserver/js/index.js (added)
• webserver/leaflet (added)
• webserver/leaflet/images (added)
• webserver/leaflet/images/layers-2x.png (added)
• webserver/leaflet/images/layers.png (added)
• webserver/leaflet/images/marker-icon-2x.png (added)
• webserver/leaflet/images/marker-icon.png (added)
• webserver/leaflet/images/marker-shadow.png (added)
• webserver/leaflet/leaflet.css (added)
• webserver/leaflet/leaflet.js (added)

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

@@ -10 +10 @@
     <AssemblyName>7dtd-server-fixes</AssemblyName>
     <RootNamespace>AllocsFixes</RootNamespace>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42 +43 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\AllocsNetTelnetServer.cs" />
     <Compile Include="src\AssemblyInfo.cs" />
-    <Compile Include="src\AllocsTelnetConnection.cs" />
     <Compile Include="src\AllocsLogFunctions.cs" />
     <Compile Include="src\AdminToolsStuff.cs" />
@@ -50 +49 @@
     <Compile Include="src\CommandExtensions.cs" />
     <Compile Include="src\CommonMappingFunctions.cs" />
-    <Compile Include="src\ConsoleOutputSeparator.cs" />
     <Compile Include="src\MapRendering\MapRendering.cs" />
     <Compile Include="src\MapRendering\MapRenderBlockBuffer.cs" />
@@ -70 +68 @@
     <Compile Include="src\CustomCommands\Give.cs" />
     <Compile Include="src\CustomCommands\ListItems.cs" />
+    <Compile Include="src\NetConnections\ConsoleOutputSeparator.cs" />
+    <Compile Include="src\NetConnections\NetTelnetServer.cs" />
+    <Compile Include="src\NetConnections\IServer.cs" />
+    <Compile Include="src\NetConnections\IConnection.cs" />
+    <Compile Include="src\NetConnections\Servers\Telnet\Telnet.cs" />
+    <Compile Include="src\NetConnections\Servers\Telnet\TelnetConnection.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\Web.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\PathHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\StaticHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\SimpleRedirectHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\MimeType.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -76 +85 @@
     <Folder Include="src\MapRendering\" />
     <Folder Include="src\CustomCommands\" />
+    <Folder Include="src\NetConnections\" />
+    <Folder Include="src\NetConnections\Servers\" />
+    <Folder Include="src\NetConnections\Servers\Telnet\" />
+    <Folder Include="src\NetConnections\Servers\Web\" />
   </ItemGroup>
 </Project>

binary-improvements/7dtd-server-fixes/src/NetConnections/NetTelnetServer.cs

@@ -6 +6 @@
 using System.Reflection;
 using System.Threading;
+using UnityEngine;
 
 namespace AllocsFixes.NetConnections
@@ -11 +12 @@
         public class NetTelnetServer
         {
-                private static List<IServer> servers = new List<IServer>();
+                private static List<IServer> servers = new List<IServer> ();
 
                 public static void init (int port)
@@ -17 +18 @@
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-                                servers.Add(new Servers.Telnet.Telnet(port));
+                                servers.Add (new Servers.Telnet.Telnet (port));
+
+                                int webPort = GamePrefs.GetInt (EnumGamePrefs.ControlPanelPort);
+                                if (GamePrefs.GetBool (EnumGamePrefs.ControlPanelEnabled) && webPort > 0 && webPort < 65534) {
+                                        if (Directory.Exists (Application.dataPath + "/../webserver")) {
+                                                servers.Add (new Servers.Web.Web (webPort + 2));
+                                        }
+                                }
                         } catch (Exception e) {
-                                Log.Out ("Error in AllocsTelnetServer.init: " + e);
+                                Log.Out ("Error in NetTelnetServer.init: " + e);
                         }
                 }
@@ -30 +38 @@
                 {
                         foreach (IServer s in servers)
-                                s.Disconnect();
+                                s.Disconnect ();
                 }
 
@@ -39 +47 @@
                         }
                         foreach (IServer s in servers)
-                                s.WriteToClient(line);
+                                s.WriteToClient (line);
                 }
 
@@ -48 +56 @@
                         }
                         foreach (IServer s in servers)
-                                s.WriteToClient_Single(line, client);
+                                s.WriteToClient_Single (line, client);
                 }
         }

binary-improvements/assembly-patcher/Main.cs

@@ -41 +41 @@
                 {
                         TypeDefinition type = module.GetType ("ConsoleSdtd");
-                        replaceMethod (type, "ExecuteCmdFromClient", true, 3, typeof(AllocsFixes.ConsoleOutputSeparator).GetMethod ("C_ExecuteCmdFromClient"));
-                        addHook (type, "Run", true, 0, true, typeof(AllocsFixes.ConsoleOutputSeparator).GetMethod ("C_Run"));
-                        replaceMethod (type, "SendResult", true, 1, typeof(AllocsFixes.ConsoleOutputSeparator).GetMethod ("C_SendResult"));
+                        replaceMethod (type, "ExecuteCmdFromClient", true, 3, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_ExecuteCmdFromClient"));
+                        addHook (type, "Run", true, 0, true, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_Run"));
+                        replaceMethod (type, "SendResult", true, 1, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_SendResult"));
                 }
 
@@ -68 +68 @@
                 {
                         TypeDefinition type = module.GetType ("NetTelnetServer");
-                        replaceMethod (type, ".ctor", false, 1, typeof(AllocsFixes.AllocsNetTelnetServer).GetMethod ("init"));
-                        replaceMethod (type, "Disconnect", false, 0, typeof(AllocsFixes.AllocsNetTelnetServer).GetMethod ("Disconnect"));
-                        replaceMethod (type, "SetConsole", false, 1, typeof(AllocsFixes.AllocsNetTelnetServer).GetMethod ("SetConsole"));
-                        replaceMethod (type, "WriteToClient", false, 1, typeof(AllocsFixes.AllocsNetTelnetServer).GetMethod ("WriteToClient"));
+                        replaceMethod (type, ".ctor", false, 1, typeof(AllocsFixes.NetConnections.NetTelnetServer).GetMethod ("init"));
+                        replaceMethod (type, "Disconnect", false, 0, typeof(AllocsFixes.NetConnections.NetTelnetServer).GetMethod ("Disconnect"));
+                        replaceMethod (type, "SetConsole", false, 1, typeof(AllocsFixes.NetConnections.NetTelnetServer).GetMethod ("SetConsole"));
+                        replaceMethod (type, "WriteToClient", false, 1, typeof(AllocsFixes.NetConnections.NetTelnetServer).GetMethod ("WriteToClient"));
                 }
 

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/TelnetCommands/RenderMap.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs">
     <Files>
-      <File FileName="assembly-patcher/Main.cs" Line="37" Column="101" />
-      <File FileName="7dtd-server-fixes/src/AllocsNetTelnetServer.cs" Line="1" Column="1" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs" Line="52" Column="1" />
-      <File FileName="7dtd-server-fixes/src/CommandExtensions.cs" Line="18" Column="4" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs" Line="45" Column="5" />
-      <File FileName="7dtd-server-fixes/src/PlayerDataStuff.cs" Line="93" Column="48" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/RenderMap.cs" Line="1" Column="18" />
-      <File FileName="7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs" Line="40" Column="1" />
-      <File FileName="7dtd-server-fixes/src/MapRendering/MapRendering.cs" Line="246" Column="1" />
-      <File FileName="7dtd-server-fixes/src/MapRendering/Constants.cs" Line="5" Column="1" />
+      <File FileName="assembly-patcher/Main.cs" Line="73" Column="85" />
+      <File FileName="7dtd-server-fixes/src/NetConnections/NetTelnetServer.cs" Line="28" Column="27" />
+      <File FileName="7dtd-server-fixes/src/NetConnections/IServer.cs" Line="7" Column="21" />
+      <File FileName="7dtd-server-fixes/src/NetConnections/Servers/Telnet/Telnet.cs" Line="31" Column="1" />
+      <File FileName="7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs" Line="5" Column="52" />
+      <File FileName="7dtd-server-fixes/src/MapRendering/MapRendering.cs" Line="75" Column="18" />
+      <File FileName="7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs" Line="53" Column="1" />
     </Files>
+    <Pads>
+      <Pad Id="ClassPad">
+        <State expanded="True" selected="True" />
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>