From 44dd0805e2adbc95a4e6841b69bffeb12ccdeff2 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Sun, 9 Oct 2022 17:54:36 +0700 Subject: [PATCH] get rid of old ci files --- CHANGELOG.md | 33 --- Jenkins/get-version.ps1 | 5 - Jenkins/jenkins-grab-se.ps1 | 26 --- Jenkinsfile | 55 ----- Setup (run before opening solution).bat | 13 -- Torch.Client.Tests/Properties/AssemblyInfo.cs | 17 -- Torch.Client.Tests/Torch.Client.Tests.csproj | 51 ----- .../TorchClientReflectionTest.cs | 94 --------- Torch.Client.Tests/app.config | 11 - .../Manager/MultiplayerManagerClient.cs | 32 --- .../Manager/MultiplayerManagerLobby.cs | 95 --------- Torch.Client/Program.cs | 194 ------------------ Torch.Client/Properties/AssemblyInfo.cs | 17 -- Torch.Client/Properties/Resources.Designer.cs | 63 ------ Torch.Client/Properties/Resources.resx | 117 ----------- Torch.Client/Properties/Settings.Designer.cs | 26 --- Torch.Client/Properties/Settings.settings | 7 - Torch.Client/Torch.Client.csproj | 122 ----------- Torch.Client/TorchClient.cs | 92 --------- Torch.Client/TorchClientConfig.cs | 34 --- Torch.Client/TorchConsoleScreen.cs | 63 ------ Torch.Client/TorchSettingsScreen.cs | 38 ---- Torch.Client/UI/TorchMainMenuScreen.cs | 56 ----- Torch.Client/UI/TorchNavScreen.cs | 49 ----- Torch.Client/UI/TorchSettingsScreen.cs | 25 --- Torch.Client/app.config | 11 - Torch.Client/torchicon.ico | Bin 16958 -> 0 bytes Torch.sln | 1 - TransformOnBuild.targets | 9 - appveyor.yml | 65 ------ 30 files changed, 1421 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100644 Jenkins/get-version.ps1 delete mode 100644 Jenkins/jenkins-grab-se.ps1 delete mode 100644 Jenkinsfile delete mode 100644 Setup (run before opening solution).bat delete mode 100644 Torch.Client.Tests/Properties/AssemblyInfo.cs delete mode 100644 Torch.Client.Tests/Torch.Client.Tests.csproj delete mode 100644 Torch.Client.Tests/TorchClientReflectionTest.cs delete mode 100644 Torch.Client.Tests/app.config delete mode 100644 Torch.Client/Manager/MultiplayerManagerClient.cs delete mode 100644 Torch.Client/Manager/MultiplayerManagerLobby.cs delete mode 100644 Torch.Client/Program.cs delete mode 100644 Torch.Client/Properties/AssemblyInfo.cs delete mode 100644 Torch.Client/Properties/Resources.Designer.cs delete mode 100644 Torch.Client/Properties/Resources.resx delete mode 100644 Torch.Client/Properties/Settings.Designer.cs delete mode 100644 Torch.Client/Properties/Settings.settings delete mode 100644 Torch.Client/Torch.Client.csproj delete mode 100644 Torch.Client/TorchClient.cs delete mode 100644 Torch.Client/TorchClientConfig.cs delete mode 100644 Torch.Client/TorchConsoleScreen.cs delete mode 100644 Torch.Client/TorchSettingsScreen.cs delete mode 100644 Torch.Client/UI/TorchMainMenuScreen.cs delete mode 100644 Torch.Client/UI/TorchNavScreen.cs delete mode 100644 Torch.Client/UI/TorchSettingsScreen.cs delete mode 100644 Torch.Client/app.config delete mode 100644 Torch.Client/torchicon.ico delete mode 100644 TransformOnBuild.targets delete mode 100644 appveyor.yml diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 73b7085..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,33 +0,0 @@ -# Torch 1.1.229.265 -* Features - - Added more lenient version parsing for plugins (v#.# should work) - - Added countdown option to restart command (!restart [seconds]) -* Fixes - - General fixes to work with the latest SE version - - Fixed config changes not saving - - (hopefully) Fixed issue causing crashes on servers using the Windows Classic theme - -# Torch 1.1.207.7 -* Notes - - This release makes significant changes to TorchConfig.xml. It has been renamed to Torch.cfg and has different options. -* Features - - Plugins, Torch, and the DS can now all update automatically - - Changed command prefix to ! - - Added manual save command (thanks to Maldark) - - Added restart command - - Improved instance creation: now creates an entire skeleton instance with blank config - - Added instance name to console title -* Fixes - - Optimized UI so it's snappier and freezes less often - - Fixed NetworkManager.RaiseEvent overload that had an off-by-one bug - - Fixed chat window so it automatically scrolls down - -# Torch 1.0.182.329 - * Improved logging, logs now to go the Logs folder and aren't deleted on start - * Fixed chat tab not enabling with -autostart - * Fixed player list - * Watchdog time-out is now configurable in TorchConfig.xml - * Fixed infinario log spam - * Fixed crash when sending empty message from chat tab - * Fixed permissions on Torch commands - * Changed plugin StoragePath to the current instance path (per-instance configs) \ No newline at end of file diff --git a/Jenkins/get-version.ps1 b/Jenkins/get-version.ps1 deleted file mode 100644 index 8650739..0000000 --- a/Jenkins/get-version.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -$buildSalt = $Env:BUILD_NUMBER -$branchName = $Env:BRANCH_NAME -$gitSimpleVersion = git describe --tags --abbrev=0 -$simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value} -Write-Host "$simpleVersionStandard.$buildSalt" \ No newline at end of file diff --git a/Jenkins/jenkins-grab-se.ps1 b/Jenkins/jenkins-grab-se.ps1 deleted file mode 100644 index ea820af..0000000 --- a/Jenkins/jenkins-grab-se.ps1 +++ /dev/null @@ -1,26 +0,0 @@ -pushd - -$steamData = "C:/Steam/Data/" -$steamCMDPath = "C:/Steam/steamcmd/" -$steamCMDZip = "C:/Steam/steamcmd.zip" - -if (!(Test-Path $steamData)) { - mkdir "$steamData" -} -if (!(Test-Path $steamCMDPath)) { - if (!(Test-Path $steamCMDZip)) { - Invoke-WebRequest -OutFile $steamCMDZip https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip - } - Expand-Archive $steamCMDZip -DestinationPath $steamCMDPath -} -& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit" - -$dataPath = $steamData.Replace("/", "\"); -$contentPath = "$dataPath\Content"; -if (Test-Path $contentPath) { - Remove-Item -LiteralPath $contentPath -Force -Recurse -} - -cmd /S /C mklink /J .\GameBinaries $dataPath\DedicatedServer64 - -popd diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 39ae44a..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,55 +0,0 @@ -def packageAndArchive(buildMode, packageName) { - zipFile = "bin\\${packageName}.zip" - packageDir = "publish" - - bat 'powershell -Command { Compress-Archive -Path ${packageDir}\\* -DestinationPath ${zipFile} }' - archiveArtifacts artifacts: zipFile, caseSensitive: false, onlyIfSuccessful: true -} - -node('windows') { - stage('Checkout') { - checkout scm - bat 'git pull https://github.com/TorchAPI/Torch/ ${env.BRANCH_NAME} --tags' - } - - stage('Acquire SE') { - bat 'powershell -File Jenkins/jenkins-grab-se.ps1' - } - - stage('Build') { - dotnetVersion = bat(returnStdout: true, script: '@powershell -NonInteractive -NoLogo -NoProfile -File Jenkins/get-version.ps1').trim() - infoVersion = "${dotnetVersion}-${env.BRANCH_NAME}" - currentBuild.description = infoVersion - - bat 'dotnet publish .\\Torch.Server\\Torch.Server.csproj -p:PackageVersion=${dotnetVersion} -p:InformationalVersion=${infoVersion} --self-contained -f net6-windows -r win-x64 -c Release -o .\\publish\\' - } - - stage('Archive') { - //archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true - - packageAndArchive(buildMode, "torch-server") - - /*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/ - } - - /* Disabled because they fail builds more often than they detect actual problems - stage('Test') { - bat 'IF NOT EXIST reports MKDIR reports' - bat "\"packages/xunit.runner.console.2.2.0/tools/xunit.console.exe\" \"bin-test/x64/${buildMode}/Torch.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Server.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Client.Tests.dll\" -parallel none -xml \"reports/Torch.Tests.xml\"" - - step([ - $class: 'XUnitBuilder', - thresholdMode: 1, - thresholds: [[$class: 'FailedThreshold', failureThreshold: '1']], - tools: [[ - $class: 'XUnitDotNetTestType', - deleteOutputFiles: true, - failIfNotNew: true, - pattern: 'reports/*.xml', - skipNoTestFiles: false, - stopProcessingIfError: true - ]] - ]) - } - */ -} diff --git a/Setup (run before opening solution).bat b/Setup (run before opening solution).bat deleted file mode 100644 index 38c267e..0000000 --- a/Setup (run before opening solution).bat +++ /dev/null @@ -1,13 +0,0 @@ -:: This script creates a symlink to the game binaries to account for different installation directories on different systems. - -@echo off -set /p path="Please enter the folder location of your SpaceEngineersDedicated.exe: " -cd %~dp0 -mklink /J GameBinaries "%path%" -if errorlevel 1 goto Error -echo Done! You can now open the Torch solution without issue. -goto End -:Error -echo An error occured creating the symlink. -:End -pause diff --git a/Torch.Client.Tests/Properties/AssemblyInfo.cs b/Torch.Client.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 137a623..0000000 --- a/Torch.Client.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Torch Client Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Torch")] -[assembly: AssemblyCopyright("Copyright © Torch API 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif \ No newline at end of file diff --git a/Torch.Client.Tests/Torch.Client.Tests.csproj b/Torch.Client.Tests/Torch.Client.Tests.csproj deleted file mode 100644 index cf64ce4..0000000 --- a/Torch.Client.Tests/Torch.Client.Tests.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - net461 - 1591,0649 - Torch Client Tests - Torch - Copyright © Torch API 2017 - false - MinimumRecommendedRules.ruleset - $(SolutionDir)\bin-test\$(Platform)\$(Configuration)\ - - - full - - - pdbonly - $(SolutionDir)\bin-test\$(Platform)\$(Configuration)\Torch.Client.Tests.xml - - - - - - - - - - - - - all - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Torch.Client.Tests/TorchClientReflectionTest.cs b/Torch.Client.Tests/TorchClientReflectionTest.cs deleted file mode 100644 index 80cb47f..0000000 --- a/Torch.Client.Tests/TorchClientReflectionTest.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Collections.Generic; -using Torch.Client; -using Torch.Tests; -using Torch.Utils; -using Xunit; - -namespace Torch.Client.Tests -{ - public class TorchClientReflectionTest - { - static TorchClientReflectionTest() - { - TestUtils.Init(); - } - - private static ReflectionTestManager _manager; - - private static ReflectionTestManager Manager() - { - if (_manager != null) - return _manager; - - return _manager = new ReflectionTestManager().Init(typeof(TorchClient).Assembly); - } - - public static IEnumerable Getters => Manager().Getters; - - public static IEnumerable Setters => Manager().Setters; - - public static IEnumerable Invokers => Manager().Invokers; - - public static IEnumerable MemberInfo => Manager().MemberInfo; - - public static IEnumerable Events => Manager().Events; - - #region Binding - [Theory] - [MemberData(nameof(Getters))] - public void TestBindingGetter(ReflectionTestManager.FieldRef field) - { - if (field.Field == null) - return; - Assert.True(ReflectedManager.Process(field.Field)); - if (field.Field.IsStatic) - Assert.NotNull(field.Field.GetValue(null)); - } - - [Theory] - [MemberData(nameof(Setters))] - public void TestBindingSetter(ReflectionTestManager.FieldRef field) - { - if (field.Field == null) - return; - Assert.True(ReflectedManager.Process(field.Field)); - if (field.Field.IsStatic) - Assert.NotNull(field.Field.GetValue(null)); - } - - [Theory] - [MemberData(nameof(Invokers))] - public void TestBindingInvoker(ReflectionTestManager.FieldRef field) - { - if (field.Field == null) - return; - Assert.True(ReflectedManager.Process(field.Field)); - if (field.Field.IsStatic) - Assert.NotNull(field.Field.GetValue(null)); - } - - [Theory] - [MemberData(nameof(MemberInfo))] - public void TestBindingMemberInfo(ReflectionTestManager.FieldRef field) - { - if (field.Field == null) - return; - Assert.True(ReflectedManager.Process(field.Field)); - if (field.Field.IsStatic) - Assert.NotNull(field.Field.GetValue(null)); - } - - [Theory] - [MemberData(nameof(Events))] - public void TestBindingEvents(ReflectionTestManager.FieldRef field) - { - if (field.Field == null) - return; - Assert.True(ReflectedManager.Process(field.Field)); - if (field.Field.IsStatic) - ((Func)field.Field.GetValue(null)).Invoke(); - } - #endregion - } -} diff --git a/Torch.Client.Tests/app.config b/Torch.Client.Tests/app.config deleted file mode 100644 index a73892d..0000000 --- a/Torch.Client.Tests/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Torch.Client/Manager/MultiplayerManagerClient.cs b/Torch.Client/Manager/MultiplayerManagerClient.cs deleted file mode 100644 index 3cfc519..0000000 --- a/Torch.Client/Manager/MultiplayerManagerClient.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Sandbox.Engine.Multiplayer; -using Torch.API; -using Torch.API.Managers; -using Torch.Managers; - -namespace Torch.Client.Manager -{ - public class MultiplayerManagerClient : MultiplayerManagerBase, IMultiplayerManagerClient - { - /// - public MultiplayerManagerClient(ITorchBase torch) : base(torch) { } - - /// - public override void Attach() - { - base.Attach(); - MyMultiplayer.Static.ClientJoined += RaiseClientJoined; - } - - /// - public override void Detach() - { - MyMultiplayer.Static.ClientJoined -= RaiseClientJoined; - base.Detach(); - } - } -} diff --git a/Torch.Client/Manager/MultiplayerManagerLobby.cs b/Torch.Client/Manager/MultiplayerManagerLobby.cs deleted file mode 100644 index 2b5ad11..0000000 --- a/Torch.Client/Manager/MultiplayerManagerLobby.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Sandbox.Engine.Multiplayer; -using Sandbox.Game.World; -using Torch.API; -using Torch.API.Managers; -using Torch.Managers; -using VRage.Game.ModAPI; - -namespace Torch.Client.Manager -{ - public class MultiplayerManagerLobby : MultiplayerManagerBase, IMultiplayerManagerServer - { - /// - public IReadOnlyList BannedPlayers => new List(); - - /// - public MultiplayerManagerLobby(ITorchBase torch) : base(torch) { } - - /// - public void KickPlayer(ulong steamId) => Torch.Invoke(() => MyMultiplayer.Static.KickClient(steamId)); - - /// - public void BanPlayer(ulong steamId, bool banned = true) => Torch.Invoke(() => MyMultiplayer.Static.BanClient(steamId, banned)); - - /// - public void PromoteUser(ulong steamId) - { - Torch.Invoke(() => - { - var p = MySession.Static.GetUserPromoteLevel(steamId); - if (p < MyPromoteLevel.Admin) //cannot promote to owner by design - MySession.Static.SetUserPromoteLevel(steamId, p + 1); - }); - } - - /// - public void DemoteUser(ulong steamId) - { - Torch.Invoke(() => - { - var p = MySession.Static.GetUserPromoteLevel(steamId); - if (p > MyPromoteLevel.None && p < MyPromoteLevel.Owner) //owner cannot be demoted by design - MySession.Static.SetUserPromoteLevel(steamId, p - 1); - }); - } - - /// - public MyPromoteLevel GetUserPromoteLevel(ulong steamId) - { - return MySession.Static.GetUserPromoteLevel(steamId); - } - - /// - public bool IsBanned(ulong steamId) => false; - - /// - public event Action PlayerKicked - { - add => throw new NotImplementedException(); - remove => throw new NotImplementedException(); - } - - /// - public event Action PlayerBanned - { - add => throw new NotImplementedException(); - remove => throw new NotImplementedException(); - } - - /// - public event Action PlayerPromoted - { - add => throw new NotImplementedException(); - remove => throw new NotImplementedException(); - } - - /// - public override void Attach() - { - base.Attach(); - MyMultiplayer.Static.ClientJoined += RaiseClientJoined; - } - - /// - public override void Detach() - { - MyMultiplayer.Static.ClientJoined -= RaiseClientJoined; - base.Detach(); - } - } -} diff --git a/Torch.Client/Program.cs b/Torch.Client/Program.cs deleted file mode 100644 index 678823d..0000000 --- a/Torch.Client/Program.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading; -using System.Windows; -using System.Windows.Forms; -using NLog; -using Torch.Utils; -using MessageBox = System.Windows.MessageBox; - -namespace Torch.Client -{ - public static class Program - { - public const string SpaceEngineersBinaries = "Bin64"; - private static string _spaceEngInstallAlias = null; - - public static string SpaceEngineersInstallAlias - { - get - { - // ReSharper disable once ConvertIfStatementToNullCoalescingExpression - if (_spaceEngInstallAlias == null) - { - // ReSharper disable once AssignNullToNotNullAttribute - _spaceEngInstallAlias = Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location), - "SpaceEngineersAlias"); - } - return _spaceEngInstallAlias; - } - } - - private const string _steamSpaceEngineersDirectory = @"steamapps\common\SpaceEngineers\"; - private const string _spaceEngineersVerifyFile = SpaceEngineersBinaries + @"\SpaceEngineers.exe"; - - public const string ConfigName = "Torch.cfg"; - - private static Logger _log = LogManager.GetLogger("Torch"); - -#if DEBUG - [DllImport("kernel32.dll")] - private static extern void AllocConsole(); - [DllImport("kernel32.dll")] - private static extern void FreeConsole(); -#endif - public static void Main(string[] args) - { -#if DEBUG - try - { - AllocConsole(); -#endif - if (!TorchLauncher.IsTorchWrapped()) - { - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - - // Early config: Resolve SE install directory. - if (!File.Exists(Path.Combine(SpaceEngineersInstallAlias, _spaceEngineersVerifyFile))) - SetupSpaceEngInstallAlias(); - - TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, - Path.Combine(SpaceEngineersInstallAlias, SpaceEngineersBinaries)); - return; - } - - RunClient(); -#if DEBUG - } - finally - { - FreeConsole(); - } -#endif - } - - private static void SetupSpaceEngInstallAlias() - { - string spaceEngineersDirectory = null; - - // TODO look at Steam/config/Config.VDF? Has alternate directories. - var steamDir = - Microsoft.Win32.Registry.GetValue("HKEY_CURRENT_USER\\SOFTWARE\\Valve\\Steam", "SteamPath", - null) as string; - if (steamDir != null) - { - spaceEngineersDirectory = Path.Combine(steamDir, _steamSpaceEngineersDirectory); - // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression - if (File.Exists(Path.Combine(spaceEngineersDirectory, _spaceEngineersVerifyFile))) - _log.Debug("Found Space Engineers in {0}", spaceEngineersDirectory); - else - { - _log.Debug("Couldn't find Space Engineers in {0}", spaceEngineersDirectory); - spaceEngineersDirectory = null; - } - } - if (spaceEngineersDirectory == null) - { - var dialog = new System.Windows.Forms.FolderBrowserDialog - { - Description = "Please select the SpaceEngineers installation folder" - }; - do - { - if (dialog.ShowDialog() != DialogResult.OK) - { - var ex = new FileNotFoundException( - "Unable to find the Space Engineers install directory, aborting"); - _log.Fatal(ex); - LogManager.Flush(); - throw ex; - } - spaceEngineersDirectory = dialog.SelectedPath; - if (File.Exists(Path.Combine(spaceEngineersDirectory, _spaceEngineersVerifyFile))) - break; - if (MessageBox.Show( - $"Unable to find {0} in {1}. Are you sure it's the Space Engineers install directory?", - "Invalid Space Engineers Directory", MessageBoxButton.YesNo) == MessageBoxResult.Yes) - break; - } while (true); // Repeat until they confirm. - } - if (!JunctionLink(SpaceEngineersInstallAlias, spaceEngineersDirectory)) - { - var ex = new IOException( - $"Failed to create junction link {SpaceEngineersInstallAlias} => {spaceEngineersDirectory}. Aborting."); - _log.Fatal(ex); - LogManager.Flush(); - throw ex; - } - string junctionVerify = Path.Combine(SpaceEngineersInstallAlias, _spaceEngineersVerifyFile); - if (!File.Exists(junctionVerify)) - { - var ex = new FileNotFoundException( - $"Junction link is not working. File {junctionVerify} does not exist"); - _log.Fatal(ex); - LogManager.Flush(); - throw ex; - } - } - - private static bool JunctionLink(string linkName, string targetDir) - { - var junctionLinkProc = new ProcessStartInfo("cmd.exe", $"/c mklink /J \"{linkName}\" \"{targetDir}\"") - { - WorkingDirectory = Directory.GetCurrentDirectory(), - UseShellExecute = false, - RedirectStandardOutput = true, - StandardOutputEncoding = Encoding.ASCII - }; - Process cmd = Process.Start(junctionLinkProc); - // ReSharper disable once PossibleNullReferenceException - while (!cmd.HasExited) - { - string line = cmd.StandardOutput.ReadLine(); - if (!string.IsNullOrWhiteSpace(line)) - _log.Info(line); - Thread.Sleep(100); - } - if (cmd.ExitCode != 0) - _log.Error("Unable to create junction link {0} => {1}", linkName, targetDir); - return cmd.ExitCode == 0; - } - - private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - var ex = (Exception) e.ExceptionObject; - _log.Error(ex); - LogManager.Flush(); - MessageBox.Show(ex.StackTrace, ex.Message); - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private static void RunClient() - { - var client = new TorchClient(); - - try - { - client.Init(); - } - catch (Exception e) - { - _log.Fatal("Torch encountered an error trying to initialize the game."); - _log.Fatal(e); - return; - } - - client.Start(); - } - } -} \ No newline at end of file diff --git a/Torch.Client/Properties/AssemblyInfo.cs b/Torch.Client/Properties/AssemblyInfo.cs deleted file mode 100644 index 0610f70..0000000 --- a/Torch.Client/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Torch Client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Torch")] -[assembly: AssemblyCopyright("Copyright © Torch API 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif \ No newline at end of file diff --git a/Torch.Client/Properties/Resources.Designer.cs b/Torch.Client/Properties/Resources.Designer.cs deleted file mode 100644 index 426fa93..0000000 --- a/Torch.Client/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Torch.Client.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Torch.Client.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/Torch.Client/Properties/Resources.resx b/Torch.Client/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Torch.Client/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Torch.Client/Properties/Settings.Designer.cs b/Torch.Client/Properties/Settings.Designer.cs deleted file mode 100644 index 79f9adf..0000000 --- a/Torch.Client/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Torch.Client.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Torch.Client/Properties/Settings.settings b/Torch.Client/Properties/Settings.settings deleted file mode 100644 index 033d7a5..0000000 --- a/Torch.Client/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj deleted file mode 100644 index 3aac86a..0000000 --- a/Torch.Client/Torch.Client.csproj +++ /dev/null @@ -1,122 +0,0 @@ - - - WinExe - net461 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - Torch Client - Torch - Copyright © Torch API 2017 - false - MinimumRecommendedRules.ruleset - $(SolutionDir)\bin\$(Platform)\$(Configuration)\ - true - true - copy "$(SolutionDir)NLog.config" "$(TargetDir)" - - copy "$(SolutionDir)NLog.config" "$(TargetDir)" - - copy "$(SolutionDir)NLog.config" "$(TargetDir)" - - - - full - - - pdbonly - $(SolutionDir)\bin\$(Platform)\$(Configuration)\Torch.Client.xml - 1591 - - - torchicon.ico - - - copy "$(SolutionDir)NLog.config" "$(TargetDir)" - - - - - - - - - - ..\GameBinaries\Sandbox.Common.dll - False - False - - - ..\GameBinaries\Sandbox.Game.dll - False - - - ..\GameBinaries\Sandbox.Graphics.dll - False - False - - - ..\GameBinaries\SpaceEngineers.Game.dll - False - - - - - - - - ..\GameBinaries\VRage.dll - False - - - ..\GameBinaries\VRage.Game.dll - False - - - ..\GameBinaries\VRage.Game.XmlSerializers.dll - False - - - ..\GameBinaries\VRage.Input.dll - False - False - - - ..\GameBinaries\VRage.Library.dll - False - - - ..\GameBinaries\VRage.Math.dll - False - False - - - ..\GameBinaries\VRage.Render.dll - False - - - ..\GameBinaries\VRage.Render11.dll - False - - - ..\GameBinaries\VRage.Steam.dll - False - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Torch.Client/TorchClient.cs b/Torch.Client/TorchClient.cs deleted file mode 100644 index 441e33e..0000000 --- a/Torch.Client/TorchClient.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Windows; -using Sandbox; -using Sandbox.Engine.Multiplayer; -using Sandbox.Engine.Networking; -using Sandbox.Engine.Platform; -using Sandbox.Game; -using SpaceEngineers.Game; -using VRage.Steam; -using Torch.API; -using Torch.API.Managers; -using Torch.API.Session; -using Torch.Client.Manager; -using Torch.Client.UI; -using Torch.Session; -using VRage; -using VRage.FileSystem; -using VRage.GameServices; -using VRageRender; -using VRageRender.ExternalApp; - -namespace Torch.Client -{ - public class TorchClient : TorchBase, ITorchClient - { - protected override uint SteamAppId => 244850; - protected override string SteamAppName => "SpaceEngineers"; - - public TorchClient() - { - Config = new TorchClientConfig(); - var sessionManager = Managers.GetManager(); - sessionManager.AddFactory((x) => MyMultiplayer.Static is MyMultiplayerLobby - ? new MultiplayerManagerLobby(this) - : null); - sessionManager.AddFactory((x) => MyMultiplayer.Static is MyMultiplayerClientBase - ? new MultiplayerManagerClient(this) - : null); - } - - public override void Init() - { - Directory.SetCurrentDirectory(Program.SpaceEngineersInstallAlias); - MyFileSystem.ExePath = Path.Combine(Program.SpaceEngineersInstallAlias, Program.SpaceEngineersBinaries); - Log.Info("Initializing Torch Client"); - Config.InstancePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - SteamAppName); - base.Init(); - OverrideMenus(); - SetRenderWindowTitle($"Space Engineers v{GameVersion} with Torch v{TorchVersion}"); - } - - private void OverrideMenus() - { - var credits = new MyCreditsDepartment("Torch Developed By") - { - Persons = new List - { - new MyCreditsPerson("THE TORCH TEAM"), - new MyCreditsPerson("http://github.com/TorchSE"), - } - }; - MyPerGameSettings.Credits.Departments.Insert(0, credits); - - MyPerGameSettings.GUI.MainMenu = typeof(TorchMainMenuScreen); - } - - private void SetRenderWindowTitle(string title) - { - MyRenderThread renderThread = MySandboxGame.Static?.GameRenderComponent?.RenderThread; - if (renderThread == null) - return; - FieldInfo renderWindowField = typeof(MyRenderThread).GetField("m_renderWindow", - BindingFlags.Instance | BindingFlags.NonPublic); - if (renderWindowField == null) - return; - var window = - renderWindowField.GetValue(MySandboxGame.Static.GameRenderComponent.RenderThread) as - System.Windows.Forms.Form; - if (window != null) - renderThread.Invoke(() => { window.Text = title; }); - } - - public override void Restart() - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/Torch.Client/TorchClientConfig.cs b/Torch.Client/TorchClientConfig.cs deleted file mode 100644 index ba6e5b3..0000000 --- a/Torch.Client/TorchClientConfig.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Torch.Client -{ - public class TorchClientConfig : ITorchConfig - { - // How do we want to handle client side config? It's radically different than the server. - public bool GetPluginUpdates { get; set; } = false; - public bool GetTorchUpdates { get; set; } = false; - public string InstanceName { get; set; } = "TorchClient"; - public string InstancePath { get; set; } - public bool NoUpdate { get; set; } = true; - public List Plugins { get; set; } - public bool ShouldUpdatePlugins { get; } = false; - public bool ShouldUpdateTorch { get; } = false; - public int TickTimeout { get; set; } - public bool Autostart { get; set; } = false; - public bool ForceUpdate { get; set; } = false; - public bool NoGui { get; set; } = false; - public bool RestartOnCrash { get; set; } = false; - public string WaitForPID { get; set; } = null; - public string ChatName { get; set; } - public string ChatColor { get; set; } - - public bool Save(string path = null) - { - return true; - } - } -} diff --git a/Torch.Client/TorchConsoleScreen.cs b/Torch.Client/TorchConsoleScreen.cs deleted file mode 100644 index ea06993..0000000 --- a/Torch.Client/TorchConsoleScreen.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using Sandbox.Graphics; -using Sandbox.Graphics.GUI; -using Sandbox.Gui; -using VRage.Utils; -using VRageMath; - -namespace Torch.Client -{ - public class TorchConsoleScreen : MyGuiScreenBase - { - private MyGuiControlTextbox _textBox; - - public override string GetFriendlyName() - { - return "Torch Console"; - } - - public TorchConsoleScreen() : base(isTopMostScreen: true) - { - BackgroundColor = new Vector4(0, 0, 0, 0.5f); - Size = new Vector2(0.5f); - RecreateControls(true); - } - - public sealed override void RecreateControls(bool constructor) - { - Elements.Clear(); - Elements.Add(new MyGuiControlLabel - { - Text = "Torch Console", - OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_RIGHT_AND_VERTICAL_TOP, - Position = MyGuiManager.ComputeFullscreenGuiCoordinate(MyGuiDrawAlignEnum.HORISONTAL_RIGHT_AND_VERTICAL_TOP) - }); - - Controls.Clear(); - _textBox = new MyGuiControlTextbox - { - BorderEnabled = false, - Enabled = true, - OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP, - Position = new Vector2(-0.5f) - }; - Controls.Add(_textBox); - - var pistonBtn = new MyGuiControlImageButton - { - Name = "TorchButton", - Text = "Torch", - HighlightType = MyGuiControlHighlightType.WHEN_CURSOR_OVER, - Visible = true, - OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP - }; - - Controls.Add(pistonBtn); - } - } -} diff --git a/Torch.Client/TorchSettingsScreen.cs b/Torch.Client/TorchSettingsScreen.cs deleted file mode 100644 index 629360e..0000000 --- a/Torch.Client/TorchSettingsScreen.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Sandbox.Graphics; -using Sandbox.Graphics.GUI; -using VRage.Utils; -using VRageMath; - -namespace Torch.Client -{ - public class TorchSettingsScreen : MyGuiScreenBase - { - public override string GetFriendlyName() => "Torch Settings"; - - public TorchSettingsScreen() : base(new Vector2(0.5f), null, Vector2.One, true) - { - RecreateControls(true); - } - - public sealed override void RecreateControls(bool constructor) - { - base.RecreateControls(constructor); - AddCaption(MyStringId.GetOrCompute("Torch Settings"), null, new Vector2(0, 0), 1.2f); - var pluginList = new MyGuiControlListbox - { - VisibleRowsCount = 10, - }; - - foreach (var plugin in TorchBase.Instance.Plugins) - { - pluginList.Items.Add(new MyGuiControlListbox.Item(new StringBuilder(plugin.Name))); - } - Controls.Add(pluginList); - } - } -} diff --git a/Torch.Client/UI/TorchMainMenuScreen.cs b/Torch.Client/UI/TorchMainMenuScreen.cs deleted file mode 100644 index 2ccbfe6..0000000 --- a/Torch.Client/UI/TorchMainMenuScreen.cs +++ /dev/null @@ -1,56 +0,0 @@ -#pragma warning disable 618 -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Sandbox.Engine.Networking; -using Sandbox.Engine.Utils; -using Sandbox.Game; -using Sandbox.Game.Gui; -using Sandbox.Graphics; -using Sandbox.Graphics.GUI; -using Sandbox.Gui; -using SpaceEngineers.Game.GUI; -using Torch.Utils; -using VRage.Game; -using VRage.Utils; -using VRageMath; - -namespace Torch.Client.UI -{ - public class TorchMainMenuScreen : MyGuiScreenMainMenu - { -#pragma warning disable 169 - [ReflectedGetter(Name = "m_elementGroup")] - private static Func _elementsGroup; -#pragma warning restore 169 - - public TorchMainMenuScreen() : this(false) - { - } - - public TorchMainMenuScreen(bool pauseGame) - : base(pauseGame) - { - } - /// - public override void RecreateControls(bool constructor) - { - base.RecreateControls(constructor); - - Vector2 minSizeGui = MyGuiControlButton.GetVisualStyle(MyGuiControlButtonStyleEnum.Default).NormalTexture.MinSizeGui; - Vector2 value = MyGuiManager.ComputeFullscreenGuiCoordinate(MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_BOTTOM, 54, 54) + new Vector2(minSizeGui.X / 2f, 0f) + new Vector2(15f, 0f) / MyGuiConstants.GUI_OPTIMAL_SIZE; - - MyGuiControlButton myGuiControlButton = MakeButton(value - 9 * MyGuiConstants.MENU_BUTTONS_POSITION_DELTA, - MyStringId.GetOrCompute("Torch"), TorchButtonClicked, MyCommonTexts.ToolTipExitToWindows); - Controls.Add(myGuiControlButton); - _elementsGroup.Invoke(this).Add(myGuiControlButton); - } - - private void TorchButtonClicked(MyGuiControlButton obj) - { - MyGuiSandbox.AddScreen(MyGuiSandbox.CreateScreen()); - } - } -} diff --git a/Torch.Client/UI/TorchNavScreen.cs b/Torch.Client/UI/TorchNavScreen.cs deleted file mode 100644 index 9b657a2..0000000 --- a/Torch.Client/UI/TorchNavScreen.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Sandbox; -using Sandbox.Game.Gui; -using Sandbox.Graphics.GUI; -using VRage; -using VRage.Game; -using VRage.Utils; -using VRageMath; - -namespace Torch.Client.UI -{ - public class TorchNavScreen : MyGuiScreenBase - { - private MyGuiControlElementGroup _elementGroup; - - public TorchNavScreen() : base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, new Vector2(0.35875f, 0.558333337f)) - { - EnabledBackgroundFade = true; - RecreateControls(true); - } - - public override void RecreateControls(bool constructor) - { - base.RecreateControls(constructor); - _elementGroup = new MyGuiControlElementGroup(); - _elementGroup.HighlightChanged += ElementGroupHighlightChanged; - AddCaption(MyCommonTexts.ScreenCaptionOptions, null, null); - var value = new Vector2(0f, -m_size.Value.Y / 2f + 0.146f); - var num = 0; - var myGuiControlButton = new MyGuiControlButton(value + num++ * MyGuiConstants.MENU_BUTTONS_POSITION_DELTA, MyGuiControlButtonStyleEnum.Default, null, null, MyGuiDrawAlignEnum.HORISONTAL_CENTER_AND_VERTICAL_CENTER, null, MyTexts.Get(MyCommonTexts.ScreenOptionsButtonGame), 0.8f, MyGuiDrawAlignEnum.HORISONTAL_CENTER_AND_VERTICAL_CENTER, MyGuiControlHighlightType.WHEN_ACTIVE, delegate(MyGuiControlButton sender) - { - MyGuiSandbox.AddScreen(MyGuiSandbox.CreateScreen()); - }, GuiSounds.MouseClick, 1f, null); - Controls.Add(myGuiControlButton); - _elementGroup.Add(myGuiControlButton); - CloseButtonEnabled = true; - } - - private void ElementGroupHighlightChanged(MyGuiControlElementGroup obj) - { - foreach (MyGuiControlBase current in _elementGroup) - if (current.HasFocus && obj.SelectedElement != current) - FocusedControl = obj.SelectedElement; - } - - public override string GetFriendlyName() => "Torch"; - - public void OnBackClick(MyGuiControlButton sender) => CloseScreen(); - } -} diff --git a/Torch.Client/UI/TorchSettingsScreen.cs b/Torch.Client/UI/TorchSettingsScreen.cs deleted file mode 100644 index 07f4726..0000000 --- a/Torch.Client/UI/TorchSettingsScreen.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Sandbox.Graphics.GUI; -using VRageMath; - -namespace Torch.Client.UI -{ - public class TorchSettingsScreen : MyGuiScreenBase - { - public TorchSettingsScreen() : base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, - new Vector2(0.35875f, 0.558333337f)) - { - EnabledBackgroundFade = true; - RecreateControls(true); - } - - /// - public override string GetFriendlyName() => "Torch Settings"; - - public void OnBackClick(MyGuiControlButton sender) => CloseScreen(); - } -} diff --git a/Torch.Client/app.config b/Torch.Client/app.config deleted file mode 100644 index a73892d..0000000 --- a/Torch.Client/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Torch.Client/torchicon.ico b/Torch.Client/torchicon.ico deleted file mode 100644 index 4563964572400f7337a29a5dc0921e76befa40b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16958 zcmd6u>3daGmd4{#AL>I_6_$)5h%(3!0wDx4fDooIh9u08K*A)GfXrhc5N423L1x7P z6)bAdawywibyfFA{)PGv?2rASpI*IwYoB%Q$;rJ4qE^APIk`9Yp0nR~z3W|T?{mn@ zdrJRSROIQuFXRmvpO@DqFE4L^4t*=HSqJaipNeq!IsdJ$s;bb@tm9tI%$W~#NNsg> z7&SFg>qFn;chP6=Mc?@+%=pRJnK@&|(>nJ?#Q|QKrTAvo*2Cd-K3b7a89dg*t4 zg>?S&Ytr@0-SX^T4odg0kLa;Q`rY0kgRiWYk|WDx`s`|1IDfwJ!#SLfh>M$gox-0E z$>W__aii~6=0?mse&fcDlY+rRrBCmdr2E=&((zBr6!!+h-TmvM(zEqVdEq~9N$0Knh8yhN_D)gkA?9G~{`Ij0_D`hGfBi{%|L5AROjE#BHoId*r4-40|&>rnRkx` z<%)f|#(lkX{bHBu{E+nc=Bzyb?Ny8Ui+{gk*k42ge|ulwzox%GXF1XB%RS1$a^+x9 ze9o6gkC7$y^)U}{j^>z)a!~W*MK|}E;G3AkKmLU_$?yIzWnvEY7mEv|<45(<>9aM` z<@2o;)9$M8o~`F2{I}%AzungHk&X{7{^0M~`i4BG8hG}rX60=EocvLH8>|&VR8}@f)RWKyVqZD*lRox{agICCXfSNKHqE_da-y&o9l4hM#aChp~1AkoY3QJ)urackH$fS z{X6o^^-c~huB(^)K?QB*n^vvu-pQ&qcb6%H+ul`B@rvc^VfSiIPLfqWo0BTslDU-Y;;cKmmVUWe;V z96zz$e8AtgPk+_^RP((UKi>D%e#LdzwB6&IGs?kv%XR7?InQg}NBhrSz&PGk)RN zwZ?J5`~|WK4wfx5PpFGH@Lc#I&WD%cb)N5Newku_MfFxWv9itenGd61-vL_t2T0d5 z;9qX~w_fjyZKh>3Kn;WgG)}C2@S6AeJ>HM@@&C^1ADvYH#J|V7iFOS*PI54^xJ1^i zS(D))$_4WS&D+PV3#$7XYMlGLVOPzAeeLSiG9cl30k>lxXuVIsulcY3N6&|byJ`)f z{{frn;4g<2?~#ZLJ?d-T57?Wc*l*SEZ#4g-hw6H!*3J*lj3fut#F&F97w|;l7uCi` z>JQxS@DTC{pT}eInKg=i-kf=H>^9hKHp}TtiM%l z2ObV6=7V7nbJYjGNB3P-GhII4WZ&haaeyD-QN)cp zO&lN94_)_Y2fw4ntXRHW)~s43>({N5NfUzh9Xs=2KFn)C|3NzPrPqoItAE6d{wHW) zQ^dhe^EKn)%O>-MZXCg_euqv1cFlX$4j$6+(^vF-OQrk1X?6`b&c?y|S6`J4I?yQb zB5w2t#1RkwzC6&_S13=$7uvz=@zqtYydtlzT`R9`+$bd@g9n9}J9cmnl7R#AZS*fM z()lj2m=QbjH^aeJ#kW1esd3ic;DtkrrO%pb8Bje=k5$t1)Z$3@>okXm{c<~B&-D}R z{9G#=2jsw}*Iu(Y5w8{QhZ;xnfSgtiDsuUu{;n0C;0xa1&vIV91#NBJyjib5Sap}l zcaOVcXAMAK@ZA3CI_E~6yJ{f8LCA&8<_Yx0_R~Ovavm0{%?*s;SM& z>yB;P5Z@U`~t}@9;W^OqTmBD2Wulg*kJJuTxgD~KlEyuFGGhE+Hfx5p+|GI z#lF+qbB$N{Wn|-^ylk}W+`e75Y}#b;vOLh-C5OpnayrsLVVVQW`>4kw_V@=rvJTyE z*kHWw+PTv_CzI-lYk5$t3-9}yO z7a0eEhoFanl_kb!!QdfnIB@PmE`*xUw0E!U+OflOm7Gm$z zJisUUkd1?+7c}qNCwq49mhGCWcp(}vA5cA0%M-Pr(ebPH@44^M+oBhAL%p-Sk79qI zxmhMon3VAPkc;Rp7j|$I4J(q~nYW<+E>p&H}3i5{XUI-%fW-%W3Pzu zXLL`#4>9i!9v0#rum>!|i;Cs>1Jjj*MLOytE}V~gd(Hd3H%}HmJG|&&9FPZrgNzsE zTTMLN(jxm+1H07+wy6)GUvx|zL)ZAA=K%Os`xR)P_gFW?+K=izUV^7I@82(n4;_+2 zdVYEw>R?;^)UJ@PXg-a-czCglC>|ltADkvn|9-yw_V)`E^TN!~*H7!{y}43~hmXk0 z0r`}v4ekXQ4dDMr4j&eDidW%T=ocN+!{F)U0C^tu#1)FanV)%&-|-nfo78@jp6j5V z^XQQya_Zzssj03>U@vGB`wVt;KiqJD2kaw?M@sR_rPB3swPKwcjd_`$@6C}unl7$qZ1q_AqVbhuZmV^(7Dx>owF9dDn5FXsRr z(Nm}iK?B+F*Db1-6UUB8oCBJ-TeTnBs5#(ufW9W_0qT7Z@B`KfanIwquirJ_*L*_v zocqk_)AGiJ3z{o+=0VB4PsX171$&5n2775qsqX8SY93Tdhu_WAQ5}t$@*90!ST#!V zmn1mA3yRzLVdxFo*Mg=!d*$Sb6B?gGmao(S^MH*T%>!5ycrO&KiP#^B`+e}Q#QPF; zFPZx%j~|z_XU@o*Z@gg~jH{TCL;G!Y?{NorSt+AT1}`2fzxiZ(o6+&c6ypYs@EyyS z$P3zPpnVQ-kKp{-vzDJn-2=Q1Dt`LmvEwX0Y4^-0AadUj%xiGLD5u`e;*2mEDHURExn%FE@~pG?s)HH^DcWZ;Ui#t)y% za6le-J;!(i1G4&~{g9#7xK47W(8$FKK0PvglgFjmD(DQBrzxEJl z$noQS;Jw&O54=wUO_Knn$g7?UTdl*q4`;8TQemMoE`T6Xe%-D|Jk=pWy{< zd~f)?D#`H%$@^7WXj~Ja`~;dit`nE(QGPKdOO`il2LUzSo0CxFY{bK)9|HuEXUb!Ogy#2O(@c#R9 z_s$*NcW!(v{~Ix-T>Wm8#oe*P4fP>+{OVa}T>rHG$Ll_NU#TuoCag0DIc| zv|oHk{adzlnZ1(G2Ts&KJUv_eOZGqP_t~D0_doQ1(YlxZ=Xj$3!EbKf zxFPSo`>uTS;fGSG_kc6?udN4C$CGuy>mYbDBN=zE|6cpr_dnbVzkcny#Q-hRlhB*c zqs0ABY7ON5&mygL-v4O-pLOl)`yQ+#@sSo?SK=$wSLzIY<2B&ynX_5fKDqke(vlL> zI6NdrsQF3k8Q;fOy#J-wK#T9*x@EafEa*wkXm3u8h!uMk^sd(bvIf?evX70%>2=Y( z#{OP%{p0&y>=)24_?{nmgvZiXol5jT@Xoa-=)FMS?@4MPz5YQ1VT67NyvgCe_ufC# z_q471TeoaA-@$)O`=0wz??bHOJpiqJ#Bw$3pJ*Q}u?N!3`Zrkv>5toY%Qy0l{JWw)6l*v{Y7O}P`yaj@3Tq-?6K9UR zA7bwPZYJ*NYI5ad(>yhY*pq*8-A`&?V}=egA`)gPlL*fvA1BQMEM>K^+Qz7LM}?2$oq8c zlfJJprN@cto<2{P+5d(IeQo#q@rLvsxM?8r0elthTR*6I!1Y;oq&Ywr;eJ-|M9&Au z<~;b(-{;6@;f+0|dVS6YKJh!^9%I*fN4-af=#l*?uX%WOI`*l(?>6^8BK+~a&xPFk zOlrV=K+lV|xQ^|Ikq4T0XW0`%F-jMGP`2HBU!U)=S+>Y6C!`+PORaWO%XQ3^} z{-$Cl=UI;)SDvZ&coS>&9npHv^PZaTdp^GA*I2i^{}pl2>U*JRfc*g557OSjYJuMe zA`djrxGr%f25{gyz?WE)vNjJKBzXw?#7RE*IgH?+a7Ir7UVNVQ4f$o7ckEHl)0b24 z%=5HY;~p(~wLR}>y_1T4*887H4fuW_8nFFf?gK`9Vw|6zke&$6V-8dYmJ8|!7qu5< zKPuc83HL_QT!1nA7-BvDiQ^~YnA2mi=7L|>Jbq``$$8C5{F!=Zx>vp0eLwDhtLIzZ zNB6%q_7z~w^#>pD`vLUHe4l+|&PP4u833yXX$~|O@F6^rbqMzc!u^48Z!FCPd}JR5 z=3~Sj-1rK5XKe?+Aa)jM>H?tQJxv%2c>?ead&gW{(a*z^MoUt~JaT)+?TMEXPW!S78v4{0vK{VVQawH@qXqjTa-PY-Tl&bouXgS9Q1 zGtFzV9JIy*L(VT%LD2q9CBZjy#x9p=fHA7{Q%FUE|7h8_e|aXbDchO`fAOVvgRqH%)Jg7SUv^dG&01xaj`g z128-a)?A;7IQR}7!GYz1`T?FuU0|;O&mj)fUFJr8V9mrmVt-DK=fyJ5jJ4$iZbpw9 zV|dAJ?l)4;S$D&w<3?xf%i-~?O}I}>9PlR3_XPGw_Pboz{e9)&1$00zxF1kgsEzQB zFS-_(8$6(g8eJ3lbHVTsxZv5b@cfu_!g0{R@azt8CXc{OPN69{1vmcAJ{~bg@9bv~ z2lx3zzCUr?9lIaVfezz<{)pO0e*o|FiOhvL!2_|u8^{a#pgz6B|B2w3=EHg6xKwin z?QC((n&0RgZINe&TlL2NgvDI>C)b$^af!U{N5}3Qa8wR%QX9!H&j+*s56lT3$Varv zeEEL@_+FBOTtD+{5!?}H!>q9;x8M|R!HwR~9cx+q2)z>zwD~CgO%lrw{aHDvp-1AH zT$?$tW^x|TB=cmx%)4qv`~SO;i-W?U!&TD_#-Cx<+=5fMP2x_)oLqmb`u;<)`}g#E zNlr3f=VEs4tVh-X+zc-oA=C7EPR>Eifm@F^*Ft~jkeD+UpV!ZQ z)N5DhXk{+&fF8&T^9R)gT%c7j;1^}3^hIs|uUJ|O{k0zOe;@rE9O2e-JcGNHYyaGM zb6rp8QmEsm#=~-v_&68L9Sqb?kKxqGQ|!L+FztC6^uFvRPn<9@))G8=tjV=Ry#Hlz zr};kF$v6<>@~n|DBiDf#dzWykBsHSv~wO$FU;+!?Blr%szOZ*ZRR` zj!%V;>lglymw9>n{b*m;6WG`F1bP+zbnxRp>}B3B{dhmm{`|s^&EfS^xsKu2|Ga;5 z&CB1vAEp-L`A2yDOFudfesrFkH|Noh78U~2%!!ou`y4e6b^;Bc$I0X7ag5`tAGA1! Gxc@(CkrRjj diff --git a/Torch.sln b/Torch.sln index 093e776..fdb00e5 100644 --- a/Torch.sln +++ b/Torch.sln @@ -12,7 +12,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AD02A71-1D4C-48F9-A8C1-789A5512424F}" ProjectSection(SolutionItems) = preProject NLog.config = NLog.config - Jenkinsfile = Jenkinsfile EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.Tests", "Torch.Tests\Torch.Tests.csproj", "{C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}" diff --git a/TransformOnBuild.targets b/TransformOnBuild.targets deleted file mode 100644 index 063e4aa..0000000 --- a/TransformOnBuild.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 0a1b88e..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,65 +0,0 @@ -version: 1.0.{build}-{branch} -pull_requests: - do_not_increment_build_number: true -branches: - only: - - master -skip_tags: true -image: Visual Studio 2022 -configuration: Release -platform: x64 -shallow_clone: true -assembly_info: - patch: true - file: '**\AssemblyVersion.*' - assembly_version: '{version}' - assembly_file_version: '{version}' - assembly_informational_version: v{version} -install: -- pwsh: >- - $steamData = "c:/steam/dedi/" - - $steamCMDPath = "c:/steam/cmd/" - - $steamCMDZip = "steamcmd.zip" - - if (!(Test-Path $steamData)) { - mkdir "$steamData" - } - - if (!(Test-Path $steamCMDPath)) { - if (!(Test-Path $steamCMDZip)) { - Invoke-WebRequest -OutFile $steamCMDZip https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip - } - Expand-Archive $steamCMDZip -DestinationPath $steamCMDPath - } - - - & "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit" - - $dataPath = $steamData.Replace("/", "\"); - $contentPath = "$dataPath\Content"; - if (Test-Path $contentPath) { - Remove-Item -LiteralPath $contentPath -Force -Recurse - } - - cmd /S /C mklink /J .\GameBinaries $dataPath\DedicatedServer64 -cache: -- c:\steam\dedi\ -- c:\steam\cmd\ -build_script: -- pwsh: >- - dotnet publish .\Torch.Server\Torch.Server.csproj --self-contained -f net6-windows -r win-x64 -c Release -o .\publish\ - - Compress-Archive -Path .\publish\* -DestinationPath .\torch-server.zip -artifacts: -- path: torch-server.zip -deploy: -- provider: GitHub - tag: v$(appveyor_build_version) - release: Torch - v$(appveyor_build_version) - auth_token: - secure: IOhwzgIpj85iHitQBiH4chKPL9fXAinEnqUcbZk0ANhfTmdUFh74ko7Bt7LoSJFy - artifact: torch-server.zip - on: - branch: master