Prep for RC

Author: SignatureBeef

Binaries/OTA.Commands.dll

@@ -22,6 +22,18 @@
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.1.38.0" newVersion="1.1.38.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

Binaries/OTA.Patcher.exe

@@ -1,7 +1,7 @@
 @echo off
 cls
 :start
-TerrariaServer.exe -config serverconfig.txt
+TerrariaServer.exe -config server.config
 @echo.
 @echo Restarting server...
 @echo.

Binaries/OTA.Patcher.pdb

@@ -8,7 +8,7 @@ set AutoRestart=1
 :: ~~~~ END USER EDIT ~~~~
 
 :start
-TerrariaServer.exe -config serverconfig.txt
+TerrariaServer.exe -config server.config
 
 if %AutoRestart%==1 (
 	echo.

Binaries/OTA.dll

@@ -1,7 +1,7 @@
 #!/bin/bash
 while true
 do
-	mono TerrariaServer.exe -config serverconfig.txt
+	mono TerrariaServer.exe -config server.config
 	echo "Restarting server..."
 	sleep 1
 done

Binaries/OTA.pdb

@@ -1,27 +1,44 @@
-using System;
-using System.Threading;
-
-/// <summary>
-/// Mono specific code
-/// </summary>
+using Mono.Unix;
 using Mono.Unix.Native;
-using Mono.Unix;
 using OTA;
+using System.Threading;
 
 namespace TDSM.Core.Mono
 {
     /// <summary>
-    /// This is a Mono specific implementation to check for termination events
+    /// This is a Mono specific implementation to check for termination events.
     /// </summary>
     public static class Sigterm
     {
-        private static bool _attached;
-        private static Thread signal_thread;
-
         [TDSMComponent(ComponentEvent.ReadyForCommands)]
         public static void Attach(Entry plugin)
         {
             if (Tools.RuntimePlatform != OTA.Misc.RuntimePlatform.Microsoft)
+            {
+                MonoSigterm.Attach(plugin);
+            }
+        }
+
+        [TDSMComponent(ComponentEvent.ServerStopping)]
+        public static void Detach(Entry plugin)
+        {
+            if (Tools.RuntimePlatform != OTA.Misc.RuntimePlatform.Microsoft)
+            {
+                MonoSigterm.Detach(plugin);
+            }
+        }
+
+        /// <summary>
+        /// This class is used to isolate the mono specific code into it's own container.
+        /// The Sigterm class is used to check what platform is running with triggering
+        /// a load of the Mono.Posix dll.
+        /// </summary>
+        internal static class MonoSigterm
+        {
+            private static bool _attached;
+            private static Thread signal_thread;
+
+            public static void Attach(Entry plugin)
             {
                 try
                 {
@@ -37,24 +54,24 @@ public static void Attach(Entry plugin)
                         };
 
                         (signal_thread = new Thread(delegate ()
+                        {
+                            System.Threading.Thread.CurrentThread.Name = "SIG";
+                            while (!Terraria.Netplay.disconnect && _attached)
                             {
-                                System.Threading.Thread.CurrentThread.Name = "SIG";
-                                while (!Terraria.Netplay.disconnect && _attached)
-                                {
-                                    // Wait for a signal to be delivered
-                                    var index = UnixSignal.WaitAny(signals, -1);
-                                    var signal = signals[index].Signum;
+                                // Wait for a signal to be delivered
+                                var index = UnixSignal.WaitAny(signals, -1);
+                                var signal = signals[index].Signum;
 
-                                    if (!Terraria.Netplay.disconnect && _attached)
-                                    {
-                                        _attached = false;
-                                        OTA.Logging.ProgramLog.Log("Server received Exit Signal");
+                                if (!Terraria.Netplay.disconnect && _attached)
+                                {
+                                    _attached = false;
+                                    OTA.Logging.ProgramLog.Log("Server received Exit Signal");
 
-                                        Terraria.IO.WorldFile.saveWorld(false);
-                                        Terraria.Netplay.disconnect = true;
-                                    }
+                                    Terraria.IO.WorldFile.saveWorld(false);
+                                    Terraria.Netplay.disconnect = true;
                                 }
-                            })).Start();
+                            }
+                        })).Start();
                     }
 
                     OTA.Logging.ProgramLog.Log("Server can accept SIGTERM");
@@ -64,12 +81,8 @@ public static void Attach(Entry plugin)
                     OTA.Logging.ProgramLog.Log("Failed to attatch SIGTERM listener");
                 }
             }
-        }
 
-        [TDSMComponent(ComponentEvent.ServerStopping)]
-        public static void Detach(Entry plugin)
-        {
-            if (Tools.RuntimePlatform != OTA.Misc.RuntimePlatform.Microsoft)
+            public static void Detach(Entry plugin)
             {
                 _attached = false;
                 try

Binaries/Plugins/OTA.Commands.dll

@@ -15,6 +15,11 @@ public static void ExampleExtension(this OTA.Patcher.Injector injector)
 
     class MainClass
     {
+        static void ReplaceTextInFile(string filepath, string search, string replacement)
+        {
+            File.WriteAllText(filepath, File.ReadAllText(filepath).Replace(search, replacement));
+        }
+
         public static void Main(string[] args)
         {
             //Debugging :)
@@ -132,6 +137,10 @@ public static void Main(string[] args)
                 File.Copy(file.FullName, target);
             }
 
+            ReplaceTextInFile(Path.Combine(pathToBinaries.FullName, "start-server.bat"), "serverconfig.txt", "server.config");
+            ReplaceTextInFile(Path.Combine(pathToBinaries.FullName, "start-server.cmd"), "serverconfig.txt", "server.config");
+            ReplaceTextInFile(Path.Combine(pathToBinaries.FullName, "start-server.sh"), "serverconfig.txt", "server.config");
+
             OTAPatcher.PromptUserToRun(OTAPatcher.OutputName + ".exe", Type.GetType("Mono.Runtime") != null);
 
             //            var isMono = Type.GetType("Mono.Runtime") != null;