Publictest (#335)

* Fix compiler errors

* Fix Jenkins

* Build public test as Release

* Fix more things

* Oops

* Remove obsolete code

* Fix GameStatePatchShim

Author: rexxar-tc

Jenkins/jenkins-grab-se.ps1

@@ -1,6 +1,6 @@
 pushd
 
-$steamData = "C:/Steam/Data/"
+$steamData = "C:/Steam/Data-playtest/"
 $steamCMDPath = "C:/Steam/steamcmd/"
 $steamCMDZip = "C:/Steam/steamcmd.zip"
 
@@ -17,6 +17,6 @@ if (!(Test-Path $steamCMDPath)) {
 }
 
 cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
+& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate" "+quit"
 
 popd

Jenkinsfile

@@ -22,7 +22,7 @@ node {
 	stage('Acquire SE') {
 		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
 		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'		
+		bat 'mklink /J GameBinaries "C:/Steam/Data-playtest/DedicatedServer64/"'		
 	}
 
 	stage('Acquire NuGet Packages') {
@@ -31,7 +31,7 @@ node {
 
 	stage('Build') {
 		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron") {
+		if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron" || env.BRANCH_NAME == "publictest") {
 			buildMode = "Release"
 		} else {
 			buildMode = "Debug"

Torch.API/WebAPI/JenkinsQuery.cs

@@ -30,9 +30,6 @@ private JenkinsQuery()
 
         public async Task<Job> GetLatestVersion(string branch)
         {
-#if DEBUG
-            branch = "master";
-#endif
             var h = await _client.GetAsync(string.Format(BRANCH_QUERY, branch));
             if (!h.IsSuccessStatusCode)
             {

Torch.Server/Initializer.cs

@@ -31,7 +31,7 @@ public class Initializer
 
         private const string RUNSCRIPT = @"force_install_dir ../
 login anonymous
-app_update 298740
+app_update 298740 -beta publictest -betapassword nt8WuDw9kdvE validate
 quit";
 
         private TorchConfig _config;

Torch.Server/Managers/InstanceManager.cs

@@ -198,16 +198,6 @@ private void ImportWorldConfig(bool modsOnly = true)
 
         public void SaveConfig()
         {
-            var cf = Torch.Config as TorchConfig;
-            if (cf?.ReservedPlayers?.Count > 0)
-            {
-                foreach (var res in cf.ReservedPlayers)
-                {
-                    if (!DedicatedConfig.Reserved.Contains(res))
-                        DedicatedConfig.Reserved.Add(res);
-                }
-            }
-
             DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
             Log.Info("Saved dedicated config.");
 

Torch.Server/Patches/WorldLoadExceptionPatch.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using NLog;
+using Sandbox;
+using Torch.Managers.PatchManager;
+using Torch.Managers.PatchManager.MSIL;
+
+namespace Torch.Patches
+{
+    /// <summary>
+    /// Patches MySandboxGame.InitQuickLaunch to rethrow exceptions caught during session load.
+    /// </summary>
+    [PatchShim]
+    public static class WorldLoadExceptionPatch
+    {
+        private static readonly ILogger _log = LogManager.GetCurrentClassLogger();
+        
+        public static void Patch(PatchContext ctx)
+        {
+            ctx.GetPattern(typeof(MySandboxGame).GetMethod("InitQuickLaunch", BindingFlags.Instance | BindingFlags.NonPublic))
+               .Transpilers.Add(typeof(WorldLoadExceptionPatch).GetMethod(nameof(Transpile), BindingFlags.Static | BindingFlags.NonPublic));
+        }
+
+        private static IEnumerable<MsilInstruction> Transpile(IEnumerable<MsilInstruction> method)
+        {
+            var msil = method.ToList();
+            for (var i = 0; i < msil.Count; i++)
+            {
+                if (msil[i].TryCatchOperations.All(x => x.Type != MsilTryCatchOperationType.BeginClauseBlock))
+                    continue;
+
+                for (; i < msil.Count; i++)
+                {
+                    if (msil[i].OpCode != OpCodes.Leave)
+                        continue;
+
+                    msil[i] = new MsilInstruction(OpCodes.Rethrow);
+                    break;
+                }
+            }
+            return msil;
+        }
+    }
+}

Torch.Server/Torch.Server.csproj

@@ -208,15 +208,8 @@
       <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -257,6 +250,7 @@
     <Compile Include="NativeMethods.cs" />
     <Compile Include="Initializer.cs" />
     <Compile Include="Patches\PromotePatch.cs" />
+    <Compile Include="Patches\WorldLoadExceptionPatch.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TorchConfig.cs" />

Torch.Server/TorchConfig.cs

@@ -109,10 +109,6 @@ public string InstancePath
 
         public string LastUsedTheme { get; set; } = "Torch Theme";
 
-        //TODO: REMOVE ME BY JULY 2019
-        [Obsolete("Use vanilla reserved slot config")]
-        public HashSet<ulong> ReservedPlayers { get; set; } = new HashSet<ulong>();
-
         //Prevent reserved players being written to disk, but allow it to be read
         //remove this when ReservedPlayers is removed
         private bool ShouldSerializeReservedPlayers() => false;

Torch.Server/TorchServer.cs

@@ -27,6 +27,7 @@
 using VRage.Dedicated;
 using VRage.Dedicated.RemoteAPI;
 using VRage.GameServices;
+using VRage.Scripting;
 using VRage.Steam;
 using Timer = System.Threading.Timer;