Merge pull request #42 from Subversionary/Hell

Shake bootstrap until the antivirus gestapo fucks off

MarseyLoader.sln

@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Launcher", "SS14.Launc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Launcher.Tests", "SS14.Launcher.Tests\SS14.Launcher.Tests.csproj", "{AC4AA63C-DFC5-4C8A-B802-8135956BCAD9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Launcher.Bootstrap", "SS14.Launcher.Bootstrap\SS14.Launcher.Bootstrap.csproj", "{505C4E21-0B62-4F1E-82C6-8FDBA914757A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Launcher.Strap", "SS14.Launcher.Strap\SS14.Launcher.Strap.csproj", "{505C4E21-0B62-4F1E-82C6-8FDBA914757A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{12BB41B7-34BA-44EF-9ECA-434A276D83BD}"
 ProjectSection(SolutionItems) = preProject

SS14.Launcher.Strap/Program.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace SS14.Launcher.Strap;
+
+public static class Program
+{
+    public static void Main(string[] args)
+    {
+        string ourDir = GetAssemblyDirectory();
+        string dotnetDir = Path.Combine(ourDir, "dotnet");
+        string exeDir = Path.Combine(ourDir, "bin", "SS14.Launcher.exe");
+
+        SetEnvironmentVariable("DOTNET_ROOT", dotnetDir);
+        StartProcess(exeDir);
+    }
+
+    private static string GetAssemblyDirectory()
+    {
+        string path = typeof(Program).Assembly.Location;
+        return Path.GetDirectoryName(path);
+    }
+
+    private static void SetEnvironmentVariable(string variable, string value)
+    {
+        Environment.SetEnvironmentVariable(variable, value);
+    }
+
+    private static void StartProcess(string filePath)
+    {
+        Process.Start(new ProcessStartInfo(filePath));
+    }
+}

SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj → SS14.Launcher.Strap/SS14.Launcher.Strap.csproj

@@ -4,9 +4,10 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net45</TargetFramework>
-    <TargetName>Space Station 14 Launcher</TargetName>
+    <TargetName>Marseyloader</TargetName>
     <ApplicationIcon>../SS14.Launcher/Assets/icon.ico</ApplicationIcon>
     <LangVersion>11</LangVersion>
+    <RootNamespace>SS14.Launcher.Strap</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

SS14.Launcher/ConfigConstants.cs

@@ -28,7 +28,7 @@ public static class ConfigConstants
 
     public static readonly string AuthUrl = "https://auth.spacestation14.com/";
     public static readonly Uri[] DefaultHubUrls = { new("https://cdn.spacestationmultiverse.com/wizden-hub-mirror/") };
-    public const string DiscordUrl = "https://discord.ss14.io/";
+    public const string DiscordUrl = "https://discord.gg/xHtZXybKeh";
     public const string AccountBaseUrl = "https://account.spacestation14.com/Identity/Account/";
     public const string AccountManagementUrl = $"{AccountBaseUrl}Manage";
     public const string AccountRegisterUrl = $"{AccountBaseUrl}Register";

publish_windows.sh

@@ -23,8 +23,8 @@ mkdir -p bin/publish/Windows/Marsey/Mods
 mkdir -p bin/publish/Windows/Marsey/ResourcePacks
 
 cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
-cp "SS14.Launcher.Bootstrap/bin/Release/net45/publish/Space Station 14 Launcher.exe" bin/publish/Windows
-cp "SS14.Launcher.Bootstrap/console.bat" bin/publish/Windows
+cp "SS14.Launcher.Strap/bin/Release/net45/publish/Marseyloader.exe" bin/publish/Windows
+cp "SS14.Launcher.Strap/console.bat" bin/publish/Windows
 cp SS14.Launcher/bin/Release/net8.0/win-x64/publish/* bin/publish/Windows/bin
 cp SS14.Loader/bin/Release/net8.0/win-x64/publish/* bin/publish/Windows/bin/loader