WIP

.config/dotnet-tools.json

@@ -3,11 +3,11 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "10.0.1",
+      "version": "9.0.9",
       "commands": [
         "dotnet-ef"
       ],
       "rollForward": false
     }
   }
-}
+}

.run/Agent 1.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="25575,27000,27001" />
+      <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="27002-27006" />
+      <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -6,7 +6,7 @@
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
       <env name="AGENT_KEY_FILE" value="./key" />
-      <env name="ALLOWED_ADDITIONAL_PORTS" value="27007" />
+      <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
       <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
@@ -24,7 +24,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net10.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>

Agent/Phantom.Agent.Minecraft.Tests/Java/JavaPropertiesStreamTests.cs

@@ -1,9 +1,9 @@
 using System.Collections.Immutable;
 using NUnit.Framework;
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Agent.Services.Tests.Java;
+namespace Phantom.Agent.Minecraft.Tests.Java;
 
 [TestFixture]
 public sealed class JavaPropertiesStreamTests {

Agent/Phantom.Agent.Minecraft.Tests/Phantom.Agent.Minecraft.Tests.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Minecraft/Command/MinecraftCommand.cs

@@ -1,6 +1,6 @@
-namespace Phantom.Agent.Services.Games;
+namespace Phantom.Agent.Minecraft.Command;
 
-static class MinecraftCommand {
+public static class MinecraftCommand {
 	public const string SaveOn = "save-on";
 	public const string SaveOff = "save-off";
 	public const string Stop = "stop";

Agent/Phantom.Agent.Minecraft/Instance/InstanceProcess.cs

@@ -2,9 +2,9 @@
 using Phantom.Utils.Processes;
 using Phantom.Utils.Tasks;
 
-namespace Phantom.Agent.Services.Instances.State;
+namespace Phantom.Agent.Minecraft.Instance;
 
-sealed class InstanceProcess : IDisposable {
+public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
 	
 	private readonly RingBuffer<string> outputBuffer = new (100);

Agent/Phantom.Agent.Minecraft/Instance/InstanceProperties.cs

@@ -0,0 +1,17 @@
+using System.Collections.Immutable;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Properties;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Minecraft.Instance;
+
+public sealed record InstanceProperties(
+	Guid InstanceGuid,
+	Guid JavaRuntimeGuid,
+	JvmProperties JvmProperties,
+	ImmutableArray<string> JvmArguments,
+	string InstanceFolder,
+	string ServerVersion,
+	ServerProperties ServerProperties,
+	InstanceLaunchProperties LaunchProperties
+);

Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesFileEditor.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 sealed class JavaPropertiesFileEditor {
 	private readonly Dictionary<string, string> overriddenProperties = new ();
@@ -7,12 +7,6 @@ sealed class JavaPropertiesFileEditor {
 		overriddenProperties[key] = value;
 	}
 	
-	public void SetAll(IDictionary<string, string> values) {
-		foreach ((string key, string value) in values) {
-			Set(key, value);
-		}
-	}
-	
 	public async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
 		if (File.Exists(filePath)) {
 			string tmpFilePath = filePath + ".tmp";

Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesStream.cs

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using Phantom.Utils.Collections;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 static class JavaPropertiesStream {
 	internal static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
@@ -30,7 +30,7 @@ static class JavaPropertiesStream {
 		}
 		
 		public Reader(string path) {
-			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: true, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
+			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: false, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
 		}
 		
 		public async IAsyncEnumerable<KeyValuePair<string, string>> ReadProperties([EnumeratorCancellation] CancellationToken cancellationToken) {

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs

@@ -6,7 +6,7 @@ using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
 using Serilog;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeDiscovery {
 	private static readonly ILogger Logger = PhantomLogger.Create(nameof(JavaRuntimeDiscovery));

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeExecutable.cs

@@ -1,5 +1,5 @@
 using Phantom.Common.Data.Java;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeRepository.cs

@@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Cryptography;
 
-namespace Phantom.Agent.Services.Java;
+namespace Phantom.Agent.Minecraft.Java;
 
 public sealed class JavaRuntimeRepository {
 	private readonly ImmutableDictionary<Guid, JavaRuntimeExecutable> runtimesByGuid;

Agent/Phantom.Agent.Minecraft/Java/JvmArgumentBuilder.cs

@@ -0,0 +1,25 @@
+using System.Collections.ObjectModel;
+
+namespace Phantom.Agent.Minecraft.Java;
+
+sealed class JvmArgumentBuilder(JvmProperties basicProperties) {
+	private readonly List<string> customArguments = [];
+	
+	public void Add(string argument) {
+		customArguments.Add(argument);
+	}
+	
+	public void AddProperty(string key, string value) {
+		customArguments.Add("-D" + key + "=\"" + value + "\""); // TODO test quoting?
+	}
+	
+	public void Build(Collection<string> target) {
+		foreach (var property in customArguments) {
+			target.Add(property);
+		}
+		
+		// In case of duplicate JVM arguments, typically the last one wins.
+		target.Add("-Xms" + basicProperties.InitialHeapMegabytes + "M");
+		target.Add("-Xmx" + basicProperties.MaximumHeapMegabytes + "M");
+	}
+}

Agent/Phantom.Agent.Minecraft/Java/JvmProperties.cs

@@ -0,0 +1,6 @@
+namespace Phantom.Agent.Minecraft.Java;
+
+public sealed record JvmProperties(
+	uint InitialHeapMegabytes,
+	uint MaximumHeapMegabytes
+);

Agent/Phantom.Agent.Minecraft/Launcher/BaseLauncher.cs

@@ -0,0 +1,116 @@
+using System.Text;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Utils.Processes;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public abstract class BaseLauncher : IServerLauncher {
+	private readonly InstanceProperties instanceProperties;
+	
+	protected string MinecraftVersion => instanceProperties.ServerVersion;
+	
+	private protected BaseLauncher(InstanceProperties instanceProperties) {
+		this.instanceProperties = instanceProperties;
+	}
+	
+	public async Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
+		if (!services.JavaRuntimeRepository.TryGetByGuid(instanceProperties.JavaRuntimeGuid, out var javaRuntimeExecutable)) {
+			return new LaunchResult.InvalidJavaRuntime();
+		}
+		
+		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
+		if (vanillaServerJarPath == null) {
+			return new LaunchResult.CouldNotDownloadMinecraftServer();
+		}
+		
+		ServerJarInfo? serverJar;
+		try {
+			serverJar = await PrepareServerJar(logger, vanillaServerJarPath, cancellationToken);
+		} catch (OperationCanceledException) {
+			throw;
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while preparing the server jar.");
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
+		}
+		
+		if (!File.Exists(serverJar.FilePath)) {
+			logger.Error("Missing prepared server or launcher jar: {FilePath}", serverJar.FilePath);
+			return new LaunchResult.CouldNotPrepareMinecraftServerLauncher();
+		}
+		
+		try {
+			await AcceptEula(instanceProperties);
+			await UpdateServerProperties(instanceProperties, cancellationToken);
+		} catch (Exception e) {
+			logger.Error(e, "Caught exception while configuring the server.");
+			return new LaunchResult.CouldNotConfigureMinecraftServer();
+		}
+		
+		var processConfigurator = new ProcessConfigurator {
+			FileName = javaRuntimeExecutable.ExecutablePath,
+			WorkingDirectory = instanceProperties.InstanceFolder,
+			RedirectInput = true,
+			UseShellExecute = false,
+		};
+		
+		var processArguments = processConfigurator.ArgumentList;
+		PrepareJvmArguments(serverJar).Build(processArguments);
+		processArguments.Add("-jar");
+		processArguments.Add(serverJar.FilePath);
+		processArguments.Add("nogui");
+		
+		var process = processConfigurator.CreateProcess();
+		var instanceProcess = new InstanceProcess(instanceProperties, process);
+		
+		try {
+			process.Start();
+		} catch (Exception launchException) {
+			logger.Error(launchException, "Caught exception launching the server process.");
+			
+			try {
+				process.Kill();
+			} catch (Exception killException) {
+				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
+			}
+			
+			return new LaunchResult.CouldNotStartMinecraftServer();
+		}
+		
+		return new LaunchResult.Success(instanceProcess);
+	}
+	
+	private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
+		var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
+		
+		foreach (string argument in instanceProperties.JvmArguments) {
+			builder.Add(argument);
+		}
+		
+		foreach (var argument in serverJar.ExtraArgs) {
+			builder.Add(argument);
+		}
+		
+		CustomizeJvmArguments(builder);
+		return builder;
+	}
+	
+	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
+	
+	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		return Task.FromResult(new ServerJarInfo(serverJarPath));
+	}
+	
+	private static async Task AcceptEula(InstanceProperties instanceProperties) {
+		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
+		await File.WriteAllLinesAsync(eulaFilePath, ["# EULA", "eula=true"], Encoding.UTF8);
+	}
+	
+	private static async Task UpdateServerProperties(InstanceProperties instanceProperties, CancellationToken cancellationToken) {
+		var serverPropertiesEditor = new JavaPropertiesFileEditor();
+		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"), comment: "server.properties", cancellationToken);
+	}
+}

Agent/Phantom.Agent.Minecraft/Launcher/IServerLauncher.cs

@@ -0,0 +1,8 @@
+using Phantom.Agent.Minecraft.Server;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public interface IServerLauncher {
+	Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken);
+}

Agent/Phantom.Agent.Minecraft/Launcher/LaunchResult.cs

@@ -0,0 +1,19 @@
+using Phantom.Agent.Minecraft.Instance;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public abstract record LaunchResult {
+	private LaunchResult() {}
+	
+	public sealed record Success(InstanceProcess Process) : LaunchResult;
+	
+	public sealed record InvalidJavaRuntime : LaunchResult;
+	
+	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
+	
+	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;
+	
+	public sealed record CouldNotConfigureMinecraftServer : LaunchResult;
+	
+	public sealed record CouldNotStartMinecraftServer : LaunchResult;
+}

Agent/Phantom.Agent.Minecraft/Launcher/LaunchServices.cs

@@ -0,0 +1,6 @@
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Server;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+public sealed record LaunchServices(MinecraftServerExecutables ServerExecutables, JavaRuntimeRepository JavaRuntimeRepository);

Agent/Phantom.Agent.Minecraft/Launcher/ServerJarInfo.cs

@@ -0,0 +1,7 @@
+using System.Collections.Immutable;
+
+namespace Phantom.Agent.Minecraft.Launcher;
+
+sealed record ServerJarInfo(string FilePath, ImmutableArray<string> ExtraArgs) {
+	public ServerJarInfo(string filePath) : this(filePath, ImmutableArray<string>.Empty) {}
+}

Agent/Phantom.Agent.Minecraft/Launcher/Types/FabricLauncher.cs

@@ -0,0 +1,54 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Utils.IO;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types;
+
+public sealed class FabricLauncher : BaseLauncher {
+	public FabricLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
+	
+	private protected override async Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
+		var serverJarParentFolderPath = Directory.GetParent(serverJarPath);
+		if (serverJarParentFolderPath == null) {
+			throw new ArgumentException("Could not get parent folder from: " + serverJarPath, nameof(serverJarPath));
+		}
+		
+		var launcherJarPath = Path.Combine(serverJarParentFolderPath.FullName, "fabric.jar");
+		
+		if (!File.Exists(launcherJarPath)) {
+			await DownloadLauncher(logger, launcherJarPath, cancellationToken);
+		}
+		
+		return new ServerJarInfo(launcherJarPath, ["-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)]);
+	}
+	
+	private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {
+		// TODO customizable loader version, probably with a dedicated temporary folder
+		string installerUrl = $"https://meta.fabricmc.net/v2/versions/loader/{MinecraftVersion}/stable/stable/server/jar";
+		logger.Information("Downloading Fabric launcher from: {Url}", installerUrl);
+		
+		using var http = new HttpClient();
+		
+		var response = await http.GetAsync(installerUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+		response.EnsureSuccessStatusCode();
+		
+		try {
+			await using var fileStream = new FileStream(targetFilePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
+			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
+			await responseStream.CopyToAsync(fileStream, cancellationToken);
+		} catch (Exception) {
+			TryDeleteLauncherAfterFailure(logger, targetFilePath);
+			throw;
+		}
+	}
+	
+	private static void TryDeleteLauncherAfterFailure(ILogger logger, string filePath) {
+		if (File.Exists(filePath)) {
+			try {
+				File.Delete(filePath);
+			} catch (Exception e) {
+				logger.Warning(e, "Could not clean up partially downloaded Fabric launcher: {FilePath}", filePath);
+			}
+		}
+	}
+}

Agent/Phantom.Agent.Minecraft/Launcher/Types/InvalidLauncher.cs

@@ -0,0 +1,14 @@
+using Phantom.Agent.Minecraft.Server;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types;
+
+public sealed class InvalidLauncher : IServerLauncher {
+	public static InvalidLauncher Instance { get; } = new ();
+	
+	private InvalidLauncher() {}
+	
+	public Task<LaunchResult> Launch(ILogger logger, LaunchServices services, EventHandler<DownloadProgressEventArgs> downloadProgressEventHandler, CancellationToken cancellationToken) {
+		return Task.FromResult<LaunchResult>(new LaunchResult.CouldNotPrepareMinecraftServerLauncher());
+	}
+}

Agent/Phantom.Agent.Minecraft/Launcher/Types/VanillaLauncher.cs

@@ -0,0 +1,7 @@
+using Phantom.Agent.Minecraft.Instance;
+
+namespace Phantom.Agent.Minecraft.Launcher.Types;
+
+public sealed class VanillaLauncher : BaseLauncher {
+	public VanillaLauncher(InstanceProperties instanceProperties) : base(instanceProperties) {}
+}

Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <InternalsVisibleTo Include="Phantom.Agent.Minecraft.Tests" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
+  </ItemGroup>
+
+</Project>

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperties.cs

@@ -0,0 +1,22 @@
+namespace Phantom.Agent.Minecraft.Properties;
+
+static class MinecraftServerProperties {
+	private sealed class Boolean : MinecraftServerProperty<bool> {
+		public Boolean(string key) : base(key) {}
+		
+		protected override bool Read(string value) => value.Equals("true", StringComparison.OrdinalIgnoreCase);
+		protected override string Write(bool value) => value ? "true" : "false";
+	}
+	
+	private sealed class UnsignedShort : MinecraftServerProperty<ushort> {
+		public UnsignedShort(string key) : base(key) {}
+		
+		protected override ushort Read(string value) => ushort.Parse(value);
+		protected override string Write(ushort value) => value.ToString();
+	}
+	
+	public static readonly MinecraftServerProperty<ushort> ServerPort = new UnsignedShort("server-port");
+	public static readonly MinecraftServerProperty<ushort> RconPort = new UnsignedShort("rcon.port");
+	public static readonly MinecraftServerProperty<bool> EnableRcon = new Boolean("enable-rcon");
+	public static readonly MinecraftServerProperty<bool> SyncChunkWrites = new Boolean("sync-chunk-writes");
+}

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperty.cs

@@ -0,0 +1,18 @@
+using Phantom.Agent.Minecraft.Java;
+
+namespace Phantom.Agent.Minecraft.Properties;
+
+abstract class MinecraftServerProperty<T> {
+	private readonly string key;
+	
+	protected MinecraftServerProperty(string key) {
+		this.key = key;
+	}
+	
+	protected abstract T Read(string value);
+	protected abstract string Write(T value);
+	
+	public void Set(JavaPropertiesFileEditor properties, T value) {
+		properties.Set(key, Write(value));
+	}
+}

Agent/Phantom.Agent.Minecraft/Properties/ServerProperties.cs

@@ -0,0 +1,17 @@
+using Phantom.Agent.Minecraft.Java;
+
+namespace Phantom.Agent.Minecraft.Properties;
+
+public sealed record ServerProperties(
+	ushort ServerPort,
+	ushort RconPort,
+	bool EnableRcon = true,
+	bool SyncChunkWrites = false
+) {
+	internal void SetTo(JavaPropertiesFileEditor properties) {
+		MinecraftServerProperties.ServerPort.Set(properties, ServerPort);
+		MinecraftServerProperties.RconPort.Set(properties, RconPort);
+		MinecraftServerProperties.EnableRcon.Set(properties, EnableRcon);
+		MinecraftServerProperties.SyncChunkWrites.Set(properties, SyncChunkWrites);
+	}
+}

Agent/Phantom.Agent.Minecraft/Server/DownloadProgressEventArgs.cs

@@ -1,10 +1,10 @@
-namespace Phantom.Agent.Services.Downloads;
+namespace Phantom.Agent.Minecraft.Server;
 
-sealed class DownloadProgressEventArgs : EventArgs {
+public sealed class DownloadProgressEventArgs : EventArgs {
 	public ulong DownloadedBytes { get; }
-	public ulong? TotalBytes { get; }
+	public ulong TotalBytes { get; }
 	
-	internal DownloadProgressEventArgs(ulong downloadedBytes, ulong? totalBytes) {
+	internal DownloadProgressEventArgs(ulong downloadedBytes, ulong totalBytes) {
 		DownloadedBytes = downloadedBytes;
 		TotalBytes = totalBytes;
 	}

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloadListener.cs

@@ -0,0 +1,3 @@
+namespace Phantom.Agent.Minecraft.Server;
+
+sealed record MinecraftServerExecutableDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs

@@ -0,0 +1,190 @@
+using System.Security.Cryptography;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Utils.Cryptography;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
+using Phantom.Utils.Runtime;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Server;
+
+sealed class MinecraftServerExecutableDownloader {
+	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutableDownloader>();
+	
+	public Task<string?> Task { get; }
+	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
+	public event EventHandler? Completed;
+	
+	private readonly CancellationTokenSource cancellationTokenSource = new ();
+	
+	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
+	private int listenerCount = 0;
+	
+	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
+		Register(listener);
+		Task = DownloadAndGetPath(fileDownloadInfo, minecraftVersion, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
+		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
+	}
+	
+	public void Register(MinecraftServerExecutableDownloadListener listener) {
+		int newListenerCount;
+		
+		lock (this) {
+			newListenerCount = ++listenerCount;
+			
+			DownloadProgress += listener.DownloadProgressEventHandler;
+			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
+		}
+		
+		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
+	}
+	
+	private void Unregister(object? listenerObject) {
+		int newListenerCount;
+		
+		lock (this) {
+			MinecraftServerExecutableDownloadListener listener = (MinecraftServerExecutableDownloadListener) listenerObject!;
+			DownloadProgress -= listener.DownloadProgressEventHandler;
+			
+			newListenerCount = --listenerCount;
+			if (newListenerCount <= 0) {
+				cancellationTokenSource.Cancel();
+			}
+		}
+		
+		if (newListenerCount <= 0) {
+			Logger.Debug("Unregistered last download listener, cancelling download.");
+		}
+		else {
+			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
+		}
+	}
+	
+	private void ReportDownloadProgress(DownloadProgressEventArgs args) {
+		DownloadProgress?.Invoke(this, args);
+	}
+	
+	private void OnCompleted(Task task) {
+		Logger.Debug("Download task completed.");
+		
+		lock (this) {
+			Completed?.Invoke(this, EventArgs.Empty);
+			Completed = null;
+			DownloadProgress = null;
+			
+			foreach (var registration in listenerCancellationRegistrations) {
+				registration.Dispose();
+			}
+			
+			listenerCancellationRegistrations.Clear();
+			cancellationTokenSource.Dispose();
+		}
+	}
+	
+	private sealed class DownloadProgressCallback {
+		private readonly MinecraftServerExecutableDownloader downloader;
+		
+		public DownloadProgressCallback(MinecraftServerExecutableDownloader downloader) {
+			this.downloader = downloader;
+		}
+		
+		public void ReportProgress(ulong downloadedBytes, ulong totalBytes) {
+			downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
+		}
+	}
+	
+	private static async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
+		string tmpFilePath = filePath + ".tmp";
+		
+		try {
+			Logger.Information("Downloading server version {Version} from: {Url} ({Size})", minecraftVersion, fileDownloadInfo.DownloadUrl, fileDownloadInfo.Size.ToHumanReadable(decimalPlaces: 1));
+			try {
+				using var http = new HttpClient();
+				await FetchServerExecutableFile(http, progressCallback, fileDownloadInfo, tmpFilePath, cancellationToken);
+			} catch (Exception) {
+				TryDeleteExecutableAfterFailure(tmpFilePath);
+				throw;
+			}
+			
+			File.Move(tmpFilePath, filePath, overwrite: true);
+			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
+			
+			return filePath;
+		} catch (OperationCanceledException) {
+			Logger.Information("Download for server version {Version} was cancelled.", minecraftVersion);
+			throw;
+		} catch (StopProcedureException) {
+			return null;
+		} catch (Exception e) {
+			Logger.Error(e, "An unexpected error occurred.");
+			return null;
+		}
+	}
+	
+	private static async Task FetchServerExecutableFile(HttpClient http, DownloadProgressCallback progressCallback, FileDownloadInfo fileDownloadInfo, string filePath, CancellationToken cancellationToken) {
+		Sha1String downloadedFileHash;
+		
+		try {
+			var response = await http.GetAsync(fileDownloadInfo.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+			response.EnsureSuccessStatusCode();
+			
+			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
+			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
+			
+			using var streamCopier = new MinecraftServerDownloadStreamCopier(progressCallback, fileDownloadInfo.Size.Bytes);
+			downloadedFileHash = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
+		} catch (OperationCanceledException) {
+			throw;
+		} catch (Exception e) {
+			Logger.Error(e, "Unable to download server executable.");
+			throw StopProcedureException.Instance;
+		}
+		
+		if (!downloadedFileHash.Equals(fileDownloadInfo.Hash)) {
+			Logger.Error("Downloaded server executable has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", fileDownloadInfo.Hash, downloadedFileHash);
+			throw StopProcedureException.Instance;
+		}
+	}
+	
+	private static void TryDeleteExecutableAfterFailure(string filePath) {
+		if (File.Exists(filePath)) {
+			try {
+				File.Delete(filePath);
+			} catch (Exception e) {
+				Logger.Warning(e, "Could not clean up partially downloaded server executable: {FilePath}", filePath);
+			}
+		}
+	}
+	
+	private sealed class MinecraftServerDownloadStreamCopier : IDisposable {
+		private readonly StreamCopier streamCopier = new ();
+		private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
+		
+		private readonly DownloadProgressCallback progressCallback;
+		private readonly ulong totalBytes;
+		private ulong readBytes;
+		
+		public MinecraftServerDownloadStreamCopier(DownloadProgressCallback progressCallback, ulong totalBytes) {
+			this.progressCallback = progressCallback;
+			this.totalBytes = totalBytes;
+			this.streamCopier.BufferReady += OnBufferReady;
+		}
+		
+		private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
+			sha1.AppendData(args.Buffer.Span);
+			
+			readBytes += (uint) args.Buffer.Length;
+			progressCallback.ReportProgress(readBytes, totalBytes);
+		}
+		
+		public async Task<Sha1String> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
+			await streamCopier.Copy(source, destination, cancellationToken);
+			return Sha1String.FromBytes(sha1.GetHashAndReset());
+		}
+		
+		public void Dispose() {
+			sha1.Dispose();
+			streamCopier.Dispose();
+		}
+	}
+}

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs

@@ -0,0 +1,64 @@
+using System.Text.RegularExpressions;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Utils.IO;
+using Phantom.Utils.Logging;
+using Serilog;
+
+namespace Phantom.Agent.Minecraft.Server;
+
+public sealed partial class MinecraftServerExecutables {
+	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
+	
+	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
+	private static partial Regex SanitizePathRegex();
+	
+	private readonly string basePath;
+	private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
+	
+	public MinecraftServerExecutables(string basePath) {
+		this.basePath = basePath;
+	}
+	
+	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
+		string serverExecutableFolderPath = Path.Combine(basePath, SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion);
+		string serverExecutableFilePath = Path.Combine(serverExecutableFolderPath, "server.jar");
+		
+		if (File.Exists(serverExecutableFilePath)) {
+			return serverExecutableFilePath;
+		}
+		
+		if (fileDownloadInfo == null) {
+			Logger.Error("Unable to download server executable for version {Version} because no download info was provided.", minecraftVersion);
+			return null;
+		}
+		
+		try {
+			Directories.Create(serverExecutableFolderPath, Chmod.URWX_GRX);
+		} catch (Exception e) {
+			Logger.Error(e, "Unable to create folder for server executable: {ServerExecutableFolderPath}", serverExecutableFolderPath);
+			return null;
+		}
+		
+		MinecraftServerExecutableDownloader? downloader;
+		MinecraftServerExecutableDownloadListener listener = new (progressEventHandler, cancellationToken);
+		
+		lock (this) {
+			if (runningDownloadersByVersion.TryGetValue(minecraftVersion, out downloader)) {
+				Logger.Information("A download for server version {Version} is already running, waiting for it to finish...", minecraftVersion);
+				downloader.Register(listener);
+			}
+			else {
+				downloader = new MinecraftServerExecutableDownloader(fileDownloadInfo, minecraftVersion, serverExecutableFilePath, listener);
+				downloader.Completed += (_, _) => {
+					lock (this) {
+						runningDownloadersByVersion.Remove(minecraftVersion);
+					}
+				};
+				
+				runningDownloadersByVersion[minecraftVersion] = downloader;
+			}
+		}
+		
+		return await downloader.Task.WaitAsync(cancellationToken);
+	}
+}

Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs

@@ -5,15 +5,15 @@ using System.Net.Sockets;
 using System.Text;
 using Phantom.Common.Data.Instance;
 
-namespace Phantom.Agent.Services.Games;
+namespace Phantom.Agent.Minecraft.Server;
 
-static class MinecraftServerStatusProtocol {
+public static class ServerStatusProtocol {
 	public static async Task<InstancePlayerCounts> GetPlayerCounts(ushort serverPort, CancellationToken cancellationToken) {
 		using var tcpClient = new TcpClient();
 		await tcpClient.ConnectAsync(IPAddress.Loopback, serverPort, cancellationToken);
 		var tcpStream = tcpClient.GetStream();
 		
-		// https://minecraft.wiki/w/Java_Edition_protocol/Server_List_Ping
+		// https://wiki.vg/Server_List_Ping
 		tcpStream.WriteByte(0xFE);
 		await tcpStream.FlushAsync(cancellationToken);
 		

Agent/Phantom.Agent.Services/AgentFolders.cs

@@ -7,12 +7,12 @@ namespace Phantom.Agent.Services;
 public sealed class AgentFolders {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentFolders>();
 	
-	internal string DataFolderPath { get; }
-	internal string InstancesFolderPath { get; }
-	internal string BackupsFolderPath { get; }
+	public string DataFolderPath { get; }
+	public string InstancesFolderPath { get; }
+	public string BackupsFolderPath { get; }
 	
-	internal string TemporaryFolderPath { get; }
-	internal string ServerExecutableFolderPath { get; }
+	public string TemporaryFolderPath { get; }
+	public string ServerExecutableFolderPath { get; }
 	
 	public string JavaSearchFolderPath { get; }
 	

Agent/Phantom.Agent.Services/AgentRegistrationHandler.cs

@@ -33,7 +33,7 @@ public sealed class AgentRegistrationHandler {
 		foreach (var configureInstanceMessage in configureInstanceMessages) {
 			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
 			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
+				logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
 				return false;
 			}
 		}
@@ -66,7 +66,7 @@ public sealed class AgentRegistrationHandler {
 		foreach (var configureInstanceMessage in configureInstanceMessages) {
 			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
 			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Info.InstanceName, configureInstanceMessage.InstanceGuid);
+				logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
 			}
 		}
 		
@@ -76,8 +76,8 @@ public sealed class AgentRegistrationHandler {
 	private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
 		return new InstanceManagerActor.ConfigureInstanceCommand(
 			configureInstanceMessage.InstanceGuid,
-			configureInstanceMessage.Info,
-			configureInstanceMessage.LaunchRecipe,
+			configureInstanceMessage.Configuration,
+			configureInstanceMessage.LaunchProperties,
 			configureInstanceMessage.LaunchNow,
 			AlwaysReportStatus: true
 		);

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -1,7 +1,7 @@
 using Akka.Actor;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
-using Phantom.Agent.Services.Java;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Utils.Actor;

Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Formats.Tar;
-using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;

Agent/Phantom.Agent.Services/Backups/BackupManager.cs

@@ -1,4 +1,4 @@
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Utils.Logging;
 using Serilog;

Agent/Phantom.Agent.Services/Backups/BackupServerCommandDispatcher.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
-using Phantom.Agent.Services.Games;
-using Phantom.Agent.Services.Instances.State;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.Tasks;
 using Serilog;
 

Agent/Phantom.Agent.Services/Downloads/FileDownloadListener.cs

@@ -1,3 +0,0 @@
-namespace Phantom.Agent.Services.Downloads;
-
-sealed record FileDownloadListener(EventHandler<DownloadProgressEventArgs> DownloadProgressEventHandler, CancellationToken CancellationToken);

Agent/Phantom.Agent.Services/Downloads/FileDownloadManager.cs

@@ -1,52 +0,0 @@
-using Phantom.Common.Data.Agent;
-using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
-using Serilog;
-
-namespace Phantom.Agent.Services.Downloads;
-
-sealed class FileDownloadManager {
-	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloadManager>();
-	
-	private readonly Dictionary<string, FileDownloader> runningDownloadersByPath = new ();
-	
-	public async Task<string?> DownloadAndGetPath(FileDownloadInfo fileDownloadInfo, string filePath, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
-		var fileInfo = new FileInfo(filePath);
-		if (fileInfo.Exists) {
-			return filePath;
-		}
-		
-		filePath = fileInfo.FullName;
-		
-		if (Directory.GetParent(filePath) is {} parentPath) {
-			try {
-				Directories.Create(parentPath.FullName, Chmod.URWX_GRX);
-			} catch (Exception e) {
-				Logger.Error(e, "Unable to create folder: {FolderName}", parentPath.FullName);
-				return null;
-			}
-		}
-		
-		FileDownloader? downloader;
-		FileDownloadListener listener = new (progressEventHandler, cancellationToken);
-		
-		lock (this) {
-			if (runningDownloadersByPath.TryGetValue(filePath, out downloader)) {
-				Logger.Information("A download for {Path} is already running, waiting for it to finish...", filePath);
-				downloader.Register(listener);
-			}
-			else {
-				downloader = new FileDownloader(fileDownloadInfo, filePath, listener);
-				downloader.Completed += (_, _) => {
-					lock (this) {
-						runningDownloadersByPath.Remove(filePath);
-					}
-				};
-				
-				runningDownloadersByPath[filePath] = downloader;
-			}
-		}
-		
-		return await downloader.Task.WaitAsync(cancellationToken);
-	}
-}

Agent/Phantom.Agent.Services/Downloads/FileDownloader.cs

@@ -1,202 +0,0 @@
-using System.Security.Cryptography;
-using Phantom.Common.Data.Agent;
-using Phantom.Utils.Cryptography;
-using Phantom.Utils.IO;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Net;
-using Phantom.Utils.Runtime;
-using Serilog;
-
-namespace Phantom.Agent.Services.Downloads;
-
-sealed class FileDownloader {
-	private static readonly ILogger Logger = PhantomLogger.Create<FileDownloader>();
-	
-	public Task<string?> Task { get; }
-	public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
-	public event EventHandler? Completed;
-	
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	
-	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
-	private int listenerCount = 0;
-	
-	public FileDownloader(FileDownloadInfo fileDownloadInfo, string filePath, FileDownloadListener listener) {
-		Register(listener);
-		Task = DownloadFileAndGetFinalPath(fileDownloadInfo, filePath, new DownloadProgressCallback(this), cancellationTokenSource.Token);
-		Task.ContinueWith(OnCompleted, TaskScheduler.Default);
-	}
-	
-	public void Register(FileDownloadListener listener) {
-		int newListenerCount;
-		
-		lock (this) {
-			newListenerCount = ++listenerCount;
-			
-			DownloadProgress += listener.DownloadProgressEventHandler;
-			listenerCancellationRegistrations.Add(listener.CancellationToken.Register(Unregister, listener));
-		}
-		
-		Logger.Debug("Registered download listener, current listener count: {Listeners}", newListenerCount);
-	}
-	
-	private void Unregister(object? listenerObject) {
-		int newListenerCount;
-		
-		lock (this) {
-			FileDownloadListener listener = (FileDownloadListener) listenerObject!;
-			DownloadProgress -= listener.DownloadProgressEventHandler;
-			
-			newListenerCount = --listenerCount;
-			if (newListenerCount <= 0) {
-				cancellationTokenSource.Cancel();
-			}
-		}
-		
-		if (newListenerCount <= 0) {
-			Logger.Debug("Unregistered last download listener, cancelling download.");
-		}
-		else {
-			Logger.Debug("Unregistered download listener, current listener count: {Listeners}", newListenerCount);
-		}
-	}
-	
-	private void ReportDownloadProgress(DownloadProgressEventArgs args) {
-		DownloadProgress?.Invoke(this, args);
-	}
-	
-	private void OnCompleted(Task task) {
-		Logger.Debug("Download task completed.");
-		
-		lock (this) {
-			Completed?.Invoke(this, EventArgs.Empty);
-			Completed = null;
-			DownloadProgress = null;
-			
-			foreach (var registration in listenerCancellationRegistrations) {
-				registration.Dispose();
-			}
-			
-			listenerCancellationRegistrations.Clear();
-			cancellationTokenSource.Dispose();
-		}
-	}
-	
-	private sealed class DownloadProgressCallback(FileDownloader downloader) {
-		public void ReportProgress(ulong downloadedBytes, ulong? totalBytes) {
-			downloader.ReportDownloadProgress(new DownloadProgressEventArgs(downloadedBytes, totalBytes));
-		}
-	}
-	
-	private static async Task<string?> DownloadFileAndGetFinalPath(FileDownloadInfo fileDownloadInfo, string filePath, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
-		string tmpFilePath = filePath + ".tmp";
-		
-		try {
-			await DownloadFile(tmpFilePath, fileDownloadInfo, progressCallback, cancellationToken);
-			MoveDownloadedFile(filePath, tmpFilePath);
-		} catch (Exception) {
-			TryDeletePartiallyDownloadedFile(tmpFilePath);
-			throw;
-		}
-		
-		return filePath;
-	}
-	
-	private static async Task DownloadFile(string filePath, FileDownloadInfo fileDownloadInfo, DownloadProgressCallback progressCallback, CancellationToken cancellationToken) {
-		string downloadUrl = fileDownloadInfo.Url;
-		
-		DownloadResult result;
-		try {
-			var httpClient = new HttpClient();
-			var response = await httpClient.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
-			response.EnsureSuccessStatusCode();
-			
-			FileSize? fileSize = response.Headers.ContentLength;
-			ulong? fileSizeBytes = fileSize?.Bytes;
-			
-			Logger.Information("Downloading {Url} ({Size})...", downloadUrl, FormatFileSize(fileSize));
-			progressCallback.ReportProgress(downloadedBytes: 0, fileSizeBytes);
-			
-			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
-			await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
-			
-			using var streamCopier = new DownloadStreamCopier(progressCallback, fileSizeBytes);
-			result = await streamCopier.Copy(responseStream, fileStream, cancellationToken);
-		} catch (OperationCanceledException) {
-			Logger.Information("File download was cancelled: {Url}", downloadUrl);
-			throw;
-		} catch (Exception e) {
-			Logger.Error(e, "Could not download file: {Url}", downloadUrl);
-			throw StopProcedureException.Instance;
-		}
-		
-		if (fileDownloadInfo.Hash is {} expectedHash && !result.Hash.Equals(expectedHash)) {
-			Logger.Error("Downloaded file from {Url} has mismatched SHA1 hash. Expected {Expected}, got {Actual}.", downloadUrl, expectedHash, result.Hash);
-			throw StopProcedureException.Instance;
-		}
-		
-		Logger.Information("Finished downloading {Url} ({Size}).", downloadUrl, FormatFileSize(result.Size));
-	}
-	
-	private static string FormatFileSize(FileSize? fileSize) {
-		return fileSize?.ToHumanReadable(decimalPlaces: 1) ?? "unknown size";
-	}
-	
-	private static void MoveDownloadedFile(string filePath, string tmpFilePath) {
-		try {
-			File.Move(tmpFilePath, filePath, overwrite: true);
-		} catch (Exception e) {
-			Logger.Error(e, "Could not move downloaded file from {SourcePath} to {TargetPath}", tmpFilePath, filePath);
-			throw StopProcedureException.Instance;
-		}
-	}
-	
-	private static void TryDeletePartiallyDownloadedFile(string filePath) {
-		if (!File.Exists(filePath)) {
-			return;
-		}
-		
-		try {
-			File.Delete(filePath);
-		} catch (Exception e) {
-			Logger.Warning(e, "Could not clean up partially downloaded file: {FilePath}", filePath);
-		}
-	}
-	
-	private sealed class DownloadStreamCopier : IDisposable {
-		private readonly StreamCopier streamCopier = new ();
-		private readonly IncrementalHash sha1 = IncrementalHash.CreateHash(HashAlgorithmName.SHA1);
-		
-		private readonly DownloadProgressCallback progressCallback;
-		private readonly ulong? totalBytes;
-		private ulong readBytes;
-		
-		public DownloadStreamCopier(DownloadProgressCallback progressCallback, ulong? totalBytes) {
-			this.progressCallback = progressCallback;
-			this.totalBytes = totalBytes;
-			this.streamCopier.BufferReady += OnBufferReady;
-		}
-		
-		private void OnBufferReady(object? sender, StreamCopier.BufferEventArgs args) {
-			sha1.AppendData(args.Buffer.Span);
-			
-			readBytes += (uint) args.Buffer.Length;
-			progressCallback.ReportProgress(readBytes, totalBytes);
-		}
-		
-		public async Task<DownloadResult> Copy(Stream source, Stream destination, CancellationToken cancellationToken) {
-			await streamCopier.Copy(source, destination, cancellationToken);
-			
-			FileSize size = new FileSize(readBytes);
-			Sha1String hash = Sha1String.FromBytes(sha1.GetHashAndReset());
-			return new DownloadResult(size, hash);
-		}
-		
-		public void Dispose() {
-			sha1.Dispose();
-			streamCopier.Dispose();
-		}
-	}
-	
-	private readonly record struct DownloadResult(FileSize Size, Sha1String Hash);
-}

Agent/Phantom.Agent.Services/Instances/InstanceActor.cs

@@ -1,8 +1,7 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Launch;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances.State;
 using Phantom.Agent.Services.Rpc;
-using Phantom.Common.Data.Agent.Instance;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
@@ -83,7 +82,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	
 	public sealed record ReportInstanceStatusCommand : ICommand;
 	
-	public sealed record LaunchInstanceCommand(InstanceInfo Info, InstanceLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
+	public sealed record LaunchInstanceCommand(InstanceConfiguration Configuration, IServerLauncher Launcher, InstanceTicketManager.Ticket Ticket, bool IsRestarting) : ICommand;
 	
 	public sealed record StopInstanceCommand(MinecraftStopStrategy StopStrategy) : ICommand;
 	
@@ -101,14 +100,9 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 	
 	private async Task LaunchInstance(LaunchInstanceCommand command) {
 		if (command.IsRestarting || runningState is null) {
-			var defaultLaunchStatus = command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching;
-			SetAndReportStatus(defaultLaunchStatus);
+			SetAndReportStatus(command.IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
 			
-			void UpdateStatus(IInstanceStatus? newStatus) {
-				SetAndReportStatus(newStatus ?? defaultLaunchStatus);
-			}
-			
-			var newState = await InstanceLaunchProcedure.Run(context, command.Info, command.Launcher, instanceTicketManager, command.Ticket, UpdateStatus, shutdownCancellationToken);
+			var newState = await InstanceLaunchProcedure.Run(context, command.Configuration, command.Launcher, instanceTicketManager, command.Ticket, SetAndReportStatus, shutdownCancellationToken);
 			if (newState is null) {
 				instanceTicketManager.Release(command.Ticket);
 			}

Agent/Phantom.Agent.Services/Instances/InstanceManagerActor.cs

@@ -1,11 +1,12 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Downloads;
-using Phantom.Agent.Services.Instances.Launch;
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Java;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Launcher.Types;
+using Phantom.Agent.Minecraft.Properties;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
@@ -26,11 +27,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	}
 	
 	private readonly AgentState agentState;
-	private readonly AgentFolders agentFolders;
+	private readonly string basePath;
 	
 	private readonly InstanceServices instanceServices;
 	private readonly InstanceTicketManager instanceTicketManager;
-	private readonly Dictionary<Guid, Instance> instances = new ();
+	private readonly Dictionary<Guid, InstanceInfo> instances = new ();
 	
 	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
 	private readonly CancellationToken shutdownCancellationToken;
@@ -39,12 +40,15 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private InstanceManagerActor(Init init) {
 		this.agentState = init.AgentState;
-		this.agentFolders = init.AgentFolders;
-		
-		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, new FileDownloadManager(), init.JavaRuntimeRepository);
+		this.basePath = init.AgentFolders.InstancesFolderPath;
 		this.instanceTicketManager = init.InstanceTicketManager;
 		this.shutdownCancellationToken = shutdownCancellationTokenSource.Token;
 		
+		var minecraftServerExecutables = new MinecraftServerExecutables(init.AgentFolders.ServerExecutableFolderPath);
+		var launchServices = new LaunchServices(minecraftServerExecutables, init.JavaRuntimeRepository);
+		
+		this.instanceServices = new InstanceServices(init.ControllerConnection, init.BackupManager, launchServices);
+		
 		ReceiveAndReply<ConfigureInstanceCommand, Result<ConfigureInstanceResult, InstanceActionFailure>>(ConfigureInstance);
 		ReceiveAndReply<LaunchInstanceCommand, Result<LaunchInstanceResult, InstanceActionFailure>>(LaunchInstance);
 		ReceiveAndReply<StopInstanceCommand, Result<StopInstanceResult, InstanceActionFailure>>(StopInstance);
@@ -52,11 +56,11 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		ReceiveAsync<ShutdownCommand>(Shutdown);
 	}
 	
-	private sealed record Instance(ActorRef<InstanceActor.ICommand> Actor, InstanceInfo Info, InstanceProperties Properties, InstanceLaunchRecipe? LaunchRecipe);
+	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
 	
 	public interface ICommand;
 	
-	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceInfo InstanceInfo, InstanceLaunchRecipe? LaunchRecipe, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
+	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
 	
 	public sealed record LaunchInstanceCommand(Guid InstanceGuid) : ICommand, ICanReply<Result<LaunchInstanceResult, InstanceActionFailure>>;
 	
@@ -68,16 +72,41 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private Result<ConfigureInstanceResult, InstanceActionFailure> ConfigureInstance(ConfigureInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
-		var instanceInfo = command.InstanceInfo;
-		var launchRecipe = command.LaunchRecipe;
+		var configuration = command.Configuration;
+		
+		var instanceFolder = Path.Combine(basePath, instanceGuid.ToString());
+		Directories.Create(instanceFolder, Chmod.URWX_GRX);
+		
+		var heapMegabytes = configuration.MemoryAllocation.InMegabytes;
+		var jvmProperties = new JvmProperties(
+			InitialHeapMegabytes: heapMegabytes / 2,
+			MaximumHeapMegabytes: heapMegabytes
+		);
+		
+		var properties = new InstanceProperties(
+			instanceGuid,
+			configuration.JavaRuntimeGuid,
+			jvmProperties,
+			configuration.JvmArguments,
+			instanceFolder,
+			configuration.MinecraftVersion,
+			new ServerProperties(configuration.ServerPort, configuration.RconPort),
+			command.LaunchProperties
+		);
+		
+		IServerLauncher launcher = configuration.MinecraftServerKind switch {
+			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
+			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
+			_                           => InvalidLauncher.Instance,
+		};
 		
 		if (instances.TryGetValue(instanceGuid, out var instance)) {
 			instances[instanceGuid] = instance with {
-				Info = instanceInfo,
-				LaunchRecipe = launchRecipe,
+				Configuration = configuration,
+				Launcher = launcher,
 			};
 			
-			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
+			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
 			
 			if (command.AlwaysReportStatus) {
 				instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
@@ -85,23 +114,14 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		}
 		else {
 			var instanceLoggerName = PhantomLogger.ShortenGuid(instanceGuid) + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
-			var instanceFolder = Path.Combine(agentFolders.InstancesFolderPath, instanceGuid.ToString());
-			var instanceProperties = new InstanceProperties(instanceGuid, instanceFolder);
 			var instanceInit = new InstanceActor.Init(agentState, instanceGuid, instanceLoggerName, instanceServices, instanceTicketManager, shutdownCancellationToken);
-			instances[instanceGuid] = instance = new Instance(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), instanceInfo, instanceProperties, launchRecipe);
+			instances[instanceGuid] = instance = new InstanceInfo(Context.ActorOf(InstanceActor.Factory(instanceInit), "Instance-" + instanceGuid), configuration, launcher);
 			
-			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", instanceInfo.InstanceName, instanceGuid);
+			Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
 			
 			instance.Actor.Tell(new InstanceActor.ReportInstanceStatusCommand());
 		}
 		
-		try {
-			Directories.Create(instance.Properties.InstanceFolder, Chmod.URWX_GRX);
-		} catch (Exception e) {
-			Logger.Error(e, "Could not create instance folder: {Path}", instance.Properties.InstanceFolder);
-			return ConfigureInstanceResult.CouldNotCreateInstanceFolder;
-		}
-		
 		if (command.LaunchNow) {
 			LaunchInstance(new LaunchInstanceCommand(instanceGuid));
 		}
@@ -111,21 +131,17 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private Result<LaunchInstanceResult, InstanceActionFailure> LaunchInstance(LaunchInstanceCommand command) {
 		var instanceGuid = command.InstanceGuid;
-		if (!instances.TryGetValue(instanceGuid, out var instance)) {
+		if (!instances.TryGetValue(instanceGuid, out var instanceInfo)) {
 			return InstanceActionFailure.InstanceDoesNotExist;
 		}
 		
-		if (instance.LaunchRecipe is not {} launchRecipe) {
-			return LaunchInstanceResult.InvalidConfiguration;
-		}
-		
-		var ticket = instanceTicketManager.Reserve(instance.Info);
+		var ticket = instanceTicketManager.Reserve(instanceInfo.Configuration);
 		if (!ticket) {
 			return ticket.Error;
 		}
 		
-		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var agentInstance)) {
-			var status = agentInstance.Status;
+		if (agentState.InstancesByGuid.TryGetValue(instanceGuid, out var instance)) {
+			var status = instance.Status;
 			if (status.IsRunning()) {
 				return LaunchInstanceResult.InstanceAlreadyRunning;
 			}
@@ -134,12 +150,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 			}
 		}
 		
-		var pathResolver = new InstancePathResolver(agentFolders, instanceServices.JavaRuntimeRepository, instance.Properties);
-		var valueResolver = new InstanceValueResolver(pathResolver);
-		var launcher = new InstanceLauncher(instanceServices.DownloadManager, pathResolver, valueResolver, instance.Properties, launchRecipe);
-		
-		instance.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instance.Info, launcher, ticket.Value, IsRestarting: false));
-		
+		instanceInfo.Actor.Tell(new InstanceActor.LaunchInstanceCommand(instanceInfo.Configuration, instanceInfo.Launcher, ticket.Value, IsRestarting: false));
 		return LaunchInstanceResult.LaunchInitiated;
 	}
 	

Agent/Phantom.Agent.Services/Instances/InstanceProperties.cs

@@ -1,6 +0,0 @@
-namespace Phantom.Agent.Services.Instances;
-
-sealed record InstanceProperties(
-	Guid InstanceGuid,
-	string InstanceFolder
-);

Agent/Phantom.Agent.Services/Instances/InstanceServices.cs

@@ -1,13 +1,7 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Downloads;
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Rpc;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed record InstanceServices(
-	ControllerConnection ControllerConnection,
-	BackupManager BackupManager,
-	FileDownloadManager DownloadManager,
-	JavaRuntimeRepository JavaRuntimeRepository
-);
+sealed record InstanceServices(ControllerConnection ControllerConnection, BackupManager BackupManager, LaunchServices LaunchServices);

Agent/Phantom.Agent.Services/Instances/InstanceTicketManager.cs

@@ -1,8 +1,7 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Rpc;
+using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Agent.Instance;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Logging;
@@ -19,15 +18,17 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 	private readonly HashSet<ushort> usedPorts = [];
 	private RamAllocationUnits usedMemory = new ();
 	
-	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceInfo info) {
-		var memoryAllocation = info.MemoryAllocation;
+	public Result<Ticket, LaunchInstanceResult> Reserve(InstanceConfiguration configuration) {
+		var memoryAllocation = configuration.MemoryAllocation;
+		var serverPort = configuration.ServerPort;
+		var rconPort = configuration.RconPort;
 		
-		if (!agentInfo.AllowedServerPorts.Contains(info.ServerPort)) {
+		if (!agentInfo.AllowedServerPorts.Contains(serverPort)) {
 			return LaunchInstanceResult.ServerPortNotAllowed;
 		}
 		
-		if (info.AdditionalPorts.Any(port => !agentInfo.AllowedAdditionalPorts.Contains(port))) {
-			return LaunchInstanceResult.AdditionalPortNotAllowed;
+		if (!agentInfo.AllowedRconPorts.Contains(rconPort)) {
+			return LaunchInstanceResult.RconPortNotAllowed;
 		}
 		
 		lock (this) {
@@ -39,23 +40,23 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 				return LaunchInstanceResult.MemoryLimitExceeded;
 			}
 			
-			if (usedPorts.Contains(info.ServerPort)) {
+			if (usedPorts.Contains(serverPort)) {
 				return LaunchInstanceResult.ServerPortAlreadyInUse;
 			}
 			
-			if (info.AdditionalPorts.Any(port => usedPorts.Contains(port))) {
-				return LaunchInstanceResult.AdditionalPortAlreadyInUse;
+			if (usedPorts.Contains(rconPort)) {
+				return LaunchInstanceResult.RconPortAlreadyInUse;
 			}
 			
-			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, info.ServerPort, info.AdditionalPorts);
+			var ticket = new Ticket(Guid.NewGuid(), memoryAllocation, serverPort, rconPort);
 			
 			activeTicketGuids.Add(ticket.TicketGuid);
 			usedMemory += memoryAllocation;
-			usedPorts.Add(ticket.ServerPort);
-			usedPorts.UnionWith(ticket.AdditionalPorts);
+			usedPorts.Add(serverPort);
+			usedPorts.Add(rconPort);
 			
 			RefreshAgentStatus();
-			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
+			Logger.Debug("Reserved ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
 			
 			return ticket;
 		}
@@ -75,10 +76,10 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 			
 			usedMemory -= ticket.MemoryAllocation;
 			usedPorts.Remove(ticket.ServerPort);
-			usedPorts.ExceptWith(ticket.AdditionalPorts);
+			usedPorts.Remove(ticket.RconPort);
 			
 			RefreshAgentStatus();
-			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, additional ports [{AdditionalPorts}], memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, string.Join(", ", ticket.AdditionalPorts), ticket.MemoryAllocation.InMegabytes);
+			Logger.Debug("Released ticket {TicketGuid} (server port {ServerPort}, rcon port {RconPort}, memory allocation {MemoryAllocation} MB).", ticket.TicketGuid, ticket.ServerPort, ticket.RconPort, ticket.MemoryAllocation.InMegabytes);
 		}
 	}
 	
@@ -92,5 +93,5 @@ sealed class InstanceTicketManager(AgentInfo agentInfo, ControllerConnection con
 		await reportStatusQueue.Shutdown(TimeSpan.FromSeconds(5));
 	}
 	
-	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ImmutableSortedSet<ushort> AdditionalPorts);
+	public sealed record Ticket(Guid TicketGuid, RamAllocationUnits MemoryAllocation, ushort ServerPort, ushort RconPort);
 }

Agent/Phantom.Agent.Services/Instances/Launch/InstanceLaunchProcedure.cs

@@ -1,66 +0,0 @@
-using Phantom.Agent.Services.Instances.State;
-using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Instance;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-static class InstanceLaunchProcedure {
-	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
-		context.Logger.Information("Session starting...");
-		
-		Result<InstanceProcess, InstanceLaunchFailReason> result;
-		
-		if (ticketManager.IsValid(ticket)) {
-			try {
-				result = await LaunchInstance(context, launcher, reportStatus, cancellationToken);
-			} catch (OperationCanceledException) {
-				reportStatus(InstanceStatus.NotRunning);
-				return null;
-			} catch (Exception e) {
-				context.Logger.Error(e, "Caught exception while launching instance.");
-				result = InstanceLaunchFailReason.UnknownError;
-			}
-		}
-		else {
-			context.Logger.Error("Attempted to launch instance with an invalid ticket!");
-			result = InstanceLaunchFailReason.UnknownError;
-		}
-		
-		if (result) {
-			reportStatus(InstanceStatus.Running);
-			context.ReportEvent(InstanceEvent.LaunchSucceeded);
-			return new InstanceRunningState(context, info, launcher, ticket, result.Value, cancellationToken);
-		}
-		else {
-			reportStatus(InstanceStatus.Failed(result.Error));
-			context.ReportEvent(new InstanceLaunchFailedEvent(result.Error));
-			return null;
-		}
-	}
-	
-	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, InstanceLauncher launcher, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
-		cancellationToken.ThrowIfCancellationRequested();
-		
-		switch (await launcher.Launch(context.Logger, reportStatus, cancellationToken)) {
-			case InstanceLaunchResult.Success launchSuccess:
-				return launchSuccess.Process;
-			
-			case InstanceLaunchResult.CouldNotPrepareServerInstance:
-				context.Logger.Error("Session failed to launch, could not prepare server instance.");
-				return InstanceLaunchFailReason.CouldNotPrepareServerInstance;
-			
-			case InstanceLaunchResult.CouldNotFindServerExecutable:
-				context.Logger.Error("Session failed to launch, could not find server executable.");
-				return InstanceLaunchFailReason.CouldNotFindServerExecutable;
-			
-			case InstanceLaunchResult.CouldNotStartServerExecutable:
-				context.Logger.Error("Session failed to launch, could not start server executable.");
-				return InstanceLaunchFailReason.CouldNotStartServerExecutable;
-			
-			default:
-				context.Logger.Error("Session failed to launch.");
-				return InstanceLaunchFailReason.UnknownError;
-		}
-	}
-}

Agent/Phantom.Agent.Services/Instances/Launch/InstanceLaunchResult.cs

@@ -1,15 +0,0 @@
-using Phantom.Agent.Services.Instances.State;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-abstract record InstanceLaunchResult {
-	private InstanceLaunchResult() {}
-	
-	public sealed record Success(InstanceProcess Process) : InstanceLaunchResult;
-	
-	public sealed record CouldNotPrepareServerInstance : InstanceLaunchResult;
-	
-	public sealed record CouldNotFindServerExecutable : InstanceLaunchResult;
-	
-	public sealed record CouldNotStartServerExecutable : InstanceLaunchResult;
-}

Agent/Phantom.Agent.Services/Instances/Launch/InstanceLauncher.cs

@@ -1,131 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Downloads;
-using Phantom.Agent.Services.Instances.State;
-using Phantom.Agent.Services.Java;
-using Phantom.Common.Data.Agent;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
-using Phantom.Common.Data.Instance;
-using Phantom.Utils.Processes;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-sealed class InstanceLauncher(
-	FileDownloadManager downloadManager,
-	IInstancePathResolver pathResolver,
-	IInstanceValueResolver valueResolver,
-	InstanceProperties instanceProperties,
-	InstanceLaunchRecipe launchRecipe
-) {
-	public async Task<InstanceLaunchResult> Launch(ILogger logger, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) {
-		string? executablePath = launchRecipe.Executable.Resolve(pathResolver);
-		if (executablePath == null) {
-			logger.Error("Could not resolve server executable path: {Path}", launchRecipe.Executable);
-			return new InstanceLaunchResult.CouldNotFindServerExecutable();
-		}
-		
-		var stepExecutor = new StepExecutor(logger, downloadManager, pathResolver, reportStatus, cancellationToken);
-		var steps = launchRecipe.Preparation;
-		
-		for (int stepIndex = 0; stepIndex < steps.Length; stepIndex++) {
-			var step = steps[stepIndex];
-			try {
-				if (await step.Run(stepExecutor)) {
-					continue;
-				}
-			} catch (Exception e) {
-				logger.Error(e, "Failed preparation step {StepIndex} out of {StepCount}: {StepName}", stepIndex, steps.Length, step.GetType().Name);
-			}
-			
-			return new InstanceLaunchResult.CouldNotPrepareServerInstance();
-		}
-		
-		var processConfigurator = new ProcessConfigurator {
-			FileName = executablePath,
-			WorkingDirectory = instanceProperties.InstanceFolder,
-			RedirectInput = true,
-			UseShellExecute = false,
-		};
-		
-		var processArguments = processConfigurator.ArgumentList;
-		
-		foreach (IInstanceValue value in launchRecipe.Arguments) {
-			if (value.Resolve(valueResolver) is {} resolved) {
-				processArguments.Add(resolved);
-			}
-			else {
-				logger.Error("Could not resolve server executable argument: {Value}", value);
-				return new InstanceLaunchResult.CouldNotPrepareServerInstance();
-			}
-		}
-		
-		var process = processConfigurator.CreateProcess();
-		var instanceProcess = new InstanceProcess(instanceProperties, process);
-		
-		try {
-			process.Start();
-		} catch (Exception launchException) {
-			logger.Error(launchException, "Caught exception launching the server process.");
-			
-			try {
-				process.Kill();
-			} catch (Exception killException) {
-				logger.Error(killException, "Caught exception trying to kill the server process after a failed launch.");
-			}
-			
-			return new InstanceLaunchResult.CouldNotStartServerExecutable();
-		}
-		
-		return new InstanceLaunchResult.Success(instanceProcess);
-	}
-	
-	private sealed class StepExecutor(ILogger logger, FileDownloadManager downloadManager, IInstancePathResolver pathResolver, Action<IInstanceStatus?> reportStatus, CancellationToken cancellationToken) : IInstanceLaunchStepExecutor<bool> {
-		public async Task<bool> DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path) {
-			string? filePath = path.Resolve(pathResolver);
-			if (filePath == null) {
-				logger.Error("Could not resolve download file path: {Path}", path);
-				return false;
-			}
-			
-			byte? lastDownloadProgress = null;
-			
-			void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-				byte? progress = args.TotalBytes is not {} totalBytes ? null : (byte) Math.Min(args.DownloadedBytes * 100 / totalBytes, val2: 100);
-				
-				if (lastDownloadProgress != progress) {
-					lastDownloadProgress = progress;
-					reportStatus(InstanceStatus.Downloading(progress));
-				}
-			}
-			
-			if (await downloadManager.DownloadAndGetPath(downloadInfo, filePath, OnDownloadProgress, cancellationToken) == null) {
-				logger.Error("Could not download file: {Url}", downloadInfo.Url);
-				return false;
-			}
-			
-			reportStatus(null);
-			return true;
-		}
-		
-		public async Task<bool> EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues) {
-			string? filePath = path.Resolve(pathResolver);
-			if (filePath == null) {
-				logger.Error("Could not resolve properties file path: {Path}", path);
-				return false;
-			}
-			
-			var editor = new JavaPropertiesFileEditor();
-			editor.SetAll(newValues);
-			
-			try {
-				await editor.EditOrCreate(filePath, comment, cancellationToken);
-			} catch (Exception e) {
-				logger.Error(e, "Could not edit properties file: {Path}", filePath);
-				return false;
-			}
-			
-			return true;
-		}
-	}
-}

Agent/Phantom.Agent.Services/Instances/Launch/InstancePathResolver.cs

@@ -1,40 +0,0 @@
-using System.Buffers;
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Java;
-using Phantom.Common.Data.Agent.Instance;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-sealed class InstancePathResolver(AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, InstanceProperties instanceProperties) : IInstancePathResolver {
-	public string? Global(ImmutableArray<string> segments) {
-		return ValidateAndCombinePath(agentFolders.ServerExecutableFolderPath, segments);
-	}
-	
-	public string? Local(ImmutableArray<string> segments) {
-		return ValidateAndCombinePath(instanceProperties.InstanceFolder, segments);
-	}
-	
-	public string? Runtime(Guid guid) {
-		return javaRuntimeRepository.TryGetByGuid(guid, out var runtime) ? runtime.ExecutablePath : null;
-	}
-	
-	private static readonly SearchValues<char> InvalidPathPartChars = SearchValues.Create([
-		Path.DirectorySeparatorChar,
-		Path.AltDirectorySeparatorChar,
-		..Path.GetInvalidPathChars(),
-	]);
-	
-	private string? ValidateAndCombinePath(string basePath, ImmutableArray<string> pathSegments) {
-		string path = basePath;
-		
-		foreach (string segment in pathSegments) {
-			if (segment == "." || segment == ".." || segment.ContainsAny(InvalidPathPartChars) || Path.IsPathRooted(segment)) {
-				return null;
-			}
-			
-			path = Path.Combine(path, segment);
-		}
-		
-		return Path.GetFullPath(path);
-	}
-}

Agent/Phantom.Agent.Services/Instances/Launch/InstanceValueResolver.cs

@@ -1,9 +0,0 @@
-using Phantom.Common.Data.Agent.Instance;
-
-namespace Phantom.Agent.Services.Instances.Launch;
-
-sealed class InstanceValueResolver(IInstancePathResolver pathResolver) : IInstanceValueResolver {
-	public string? Path(IInstancePath value) {
-		return value.Resolve(pathResolver);
-	}
-}

Agent/Phantom.Agent.Services/Instances/State/InstanceLaunchProcedure.cs

@@ -0,0 +1,86 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Services.Instances.State;
+
+static class InstanceLaunchProcedure {
+	public static async Task<InstanceRunningState?> Run(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager ticketManager, InstanceTicketManager.Ticket ticket, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
+		context.Logger.Information("Session starting...");
+		
+		Result<InstanceProcess, InstanceLaunchFailReason> result;
+		
+		if (ticketManager.IsValid(ticket)) {
+			try {
+				result = await LaunchInstance(context, launcher, reportStatus, cancellationToken);
+			} catch (OperationCanceledException) {
+				reportStatus(InstanceStatus.NotRunning);
+				return null;
+			} catch (Exception e) {
+				context.Logger.Error(e, "Caught exception while launching instance.");
+				result = InstanceLaunchFailReason.UnknownError;
+			}
+		}
+		else {
+			context.Logger.Error("Attempted to launch instance with an invalid ticket!");
+			result = InstanceLaunchFailReason.UnknownError;
+		}
+		
+		if (result) {
+			reportStatus(InstanceStatus.Running);
+			context.ReportEvent(InstanceEvent.LaunchSucceeded);
+			return new InstanceRunningState(context, configuration, launcher, ticket, result.Value, cancellationToken);
+		}
+		else {
+			reportStatus(InstanceStatus.Failed(result.Error));
+			context.ReportEvent(new InstanceLaunchFailedEvent(result.Error));
+			return null;
+		}
+	}
+	
+	private static async Task<Result<InstanceProcess, InstanceLaunchFailReason>> LaunchInstance(InstanceContext context, IServerLauncher launcher, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
+		cancellationToken.ThrowIfCancellationRequested();
+		
+		byte lastDownloadProgress = byte.MaxValue;
+		
+		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, val2: 100);
+			
+			if (lastDownloadProgress != progress) {
+				lastDownloadProgress = progress;
+				reportStatus(InstanceStatus.Downloading(progress));
+			}
+		}
+		
+		switch (await launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken)) {
+			case LaunchResult.Success launchSuccess:
+				return launchSuccess.Process;
+			
+			case LaunchResult.InvalidJavaRuntime:
+				context.Logger.Error("Session failed to launch, invalid Java runtime.");
+				return InstanceLaunchFailReason.JavaRuntimeNotFound;
+			
+			case LaunchResult.CouldNotDownloadMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not download Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotDownloadMinecraftServer;
+			
+			case LaunchResult.CouldNotPrepareMinecraftServerLauncher:
+				context.Logger.Error("Session failed to launch, could not prepare Minecraft server launcher.");
+				return InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher;
+			
+			case LaunchResult.CouldNotConfigureMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not configure Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotConfigureMinecraftServer;
+			
+			case LaunchResult.CouldNotStartMinecraftServer:
+				context.Logger.Error("Session failed to launch, could not start Minecraft server.");
+				return InstanceLaunchFailReason.CouldNotStartMinecraftServer;
+			
+			default:
+				context.Logger.Error("Session failed to launch.");
+				return InstanceLaunchFailReason.UnknownError;
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/State/InstancePlayerCountTracker.cs

@@ -1,5 +1,6 @@
 using System.Net.Sockets;
-using Phantom.Agent.Services.Games;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Messages.Agent.ToController;
@@ -59,9 +60,9 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	
 	private async Task<InstancePlayerCounts?> TryGetPlayerCounts() {
 		try {
-			return await MinecraftServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
-		} catch (MinecraftServerStatusProtocol.ProtocolException e) {
-			Logger.Error("Could not check online player count due to protocol error: {Message}", e.Message);
+			return await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+		} catch (ServerStatusProtocol.ProtocolException e) {
+			Logger.Error("{Message}", e.Message);
 			return null;
 		} catch (SocketException e) {
 			bool waitingForServerStart = e.SocketErrorCode == SocketError.ConnectionRefused && WaitingForFirstDetection;

Agent/Phantom.Agent.Services/Instances/State/InstanceRunningState.cs

@@ -1,6 +1,6 @@
-using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Launch;
-using Phantom.Common.Data.Agent.Instance;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Services.Backups;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
@@ -14,8 +14,8 @@ sealed class InstanceRunningState : IDisposable {
 	internal bool IsStopping { get; set; }
 	
 	private readonly InstanceContext context;
-	private readonly InstanceInfo info;
-	private readonly InstanceLauncher launcher;
+	private readonly InstanceConfiguration configuration;
+	private readonly IServerLauncher launcher;
 	private readonly CancellationToken cancellationToken;
 	
 	private readonly InstanceLogSender logSender;
@@ -24,16 +24,16 @@ sealed class InstanceRunningState : IDisposable {
 	
 	private bool isDisposed;
 	
-	public InstanceRunningState(InstanceContext context, InstanceInfo info, InstanceLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
+	public InstanceRunningState(InstanceContext context, InstanceConfiguration configuration, IServerLauncher launcher, InstanceTicketManager.Ticket ticket, InstanceProcess process, CancellationToken cancellationToken) {
 		this.context = context;
-		this.info = info;
+		this.configuration = configuration;
 		this.launcher = launcher;
 		this.Ticket = ticket;
 		this.Process = process;
 		this.cancellationToken = cancellationToken;
 		
 		this.logSender = new InstanceLogSender(context.Services.ControllerConnection, context.InstanceGuid, context.ShortName);
-		this.playerCountTracker = new InstancePlayerCountTracker(context, process, info.ServerPort);
+		this.playerCountTracker = new InstancePlayerCountTracker(context, process, configuration.ServerPort);
 		
 		this.backupScheduler = new BackupScheduler(context, playerCountTracker);
 		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
@@ -74,7 +74,7 @@ sealed class InstanceRunningState : IDisposable {
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
 			context.ReportEvent(InstanceEvent.Crashed);
-			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(info, launcher, Ticket, IsRestarting: true));
+			context.Actor.Tell(new InstanceActor.LaunchInstanceCommand(configuration, launcher, Ticket, IsRestarting: true));
 		}
 	}
 	

Agent/Phantom.Agent.Services/Instances/State/InstanceStopProcedure.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
-using Phantom.Agent.Services.Games;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 

Agent/Phantom.Agent.Services/Phantom.Agent.Services.csproj

@@ -5,12 +5,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
-  <ItemGroup>
-    <InternalsVisibleTo Include="Phantom.Agent.Services.Tests" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Services/Rpc/ControllerMessageHandlerActor.cs

@@ -26,7 +26,7 @@ public sealed class ControllerMessageHandlerActor : ReceiveActor<IMessageToAgent
 	}
 	
 	private async Task<Result<ConfigureInstanceResult, InstanceActionFailure>> HandleConfigureInstance(ConfigureInstanceMessage message) {
-		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Info, message.LaunchRecipe, message.LaunchNow, AlwaysReportStatus: false));
+		return await agent.InstanceManager.Request(new InstanceManagerActor.ConfigureInstanceCommand(message.InstanceGuid, message.Configuration, message.LaunchProperties, message.LaunchNow, AlwaysReportStatus: false));
 	}
 	
 	private async Task<Result<LaunchInstanceResult, InstanceActionFailure>> HandleLaunchInstance(LaunchInstanceMessage message) {

Agent/Phantom.Agent/Phantom.Agent.csproj

@@ -12,6 +12,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
+    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
   </ItemGroup>
 

Agent/Phantom.Agent/Program.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using Phantom.Agent;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services;
-using Phantom.Agent.Services.Java;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent;

Agent/Phantom.Agent/Variables.cs

@@ -1,4 +1,4 @@
-using Phantom.Agent.Services.Java;
+using Phantom.Agent.Minecraft.Java;
 using Phantom.Common.Data;
 using Phantom.Utils.Logging;
 using Phantom.Utils.Runtime;
@@ -14,7 +14,7 @@ sealed record Variables(
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
-	AllowedPorts AllowedAdditionalPorts,
+	AllowedPorts AllowedRconPorts,
 	ushort MaxConcurrentBackupCompressionTasks
 ) {
 	private static Variables LoadOrThrow() {
@@ -30,7 +30,7 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
 			EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
 			EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
-			EnvironmentVariables.GetString("ALLOWED_ADDITIONAL_PORTS").MapParse(AllowedPorts.FromString).Require,
+			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require,
 			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
 		);
 	}
@@ -43,7 +43,7 @@ sealed record Variables(
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
-			PhantomLogger.Root.Fatal("{Error}", e.Message);
+			PhantomLogger.Root.Fatal(e.Message);
 			throw StopProcedureException.Instance;
 		}
 	}

Common/Phantom.Common.Data.Agent/FileDownloadInfo.cs

@@ -1,25 +0,0 @@
-using MemoryPack;
-using Phantom.Utils.Cryptography;
-
-namespace Phantom.Common.Data.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial class FileDownloadInfo {
-	[MemoryPackOrder(0)]
-	public string Url { get; }
-	
-	[MemoryPackOrder(1)]
-	[MemoryPackInclude]
-	private readonly string? hash;
-	
-	[MemoryPackIgnore]
-	public Sha1String? Hash => hash == null ? null : Sha1String.FromString(hash);
-	
-	public FileDownloadInfo(string url, Sha1String? hash = null) : this(url, hash?.ToString()) {}
-	
-	[MemoryPackConstructor]
-	private FileDownloadInfo(string url, string? hash) {
-		this.Url = url;
-		this.hash = hash;
-	}
-}

Common/Phantom.Common.Data.Agent/Instance/IInstancePath.cs

@@ -1,53 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent.Instance;
-
-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstancePath.Global))]
-[MemoryPackUnion(tag: 1, typeof(InstancePath.Local))]
-[MemoryPackUnion(tag: 2, typeof(InstancePath.Runtime))]
-public partial interface IInstancePath {
-	string? Resolve(IInstancePathResolver resolver);
-}
-
-public static partial class InstancePath {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Global(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Segments
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Global(Segments);
-		}
-		
-		public override string ToString() {
-			return "Global[" + string.Join(separator: '/', Segments) + "]";
-		}
-	}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Local(
-		[property: MemoryPackOrder(0)] ImmutableArray<string> Segments
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Local(Segments);
-		}
-		
-		public override string ToString() {
-			return "Local[" + string.Join(separator: '/', Segments) + "]";
-		}
-	}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Runtime(
-		[property: MemoryPackOrder(0)] Guid Guid
-	) : IInstancePath {
-		public string? Resolve(IInstancePathResolver resolver) {
-			return resolver.Runtime(Guid);
-		}
-		
-		public override string ToString() {
-			return "Runtime[" + Guid + "]";
-		}
-	}
-}

Common/Phantom.Common.Data.Agent/Instance/IInstancePathResolver.cs

@@ -1,9 +0,0 @@
-using System.Collections.Immutable;
-
-namespace Phantom.Common.Data.Agent.Instance;
-
-public interface IInstancePathResolver {
-	string? Global(ImmutableArray<string> segments);
-	string? Local(ImmutableArray<string> segments);
-	string? Runtime(Guid guid);
-}

Common/Phantom.Common.Data.Agent/Instance/IInstanceValue.cs

@@ -1,59 +0,0 @@
-using System.Collections.Immutable;
-using System.Text;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent.Instance;
-
-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceValues.Concatenation))]
-[MemoryPackUnion(tag: 1, typeof(InstanceValues.Text))]
-[MemoryPackUnion(tag: 2, typeof(InstanceValues.Path))]
-public partial interface IInstanceValue {
-	string? Resolve(IInstanceValueResolver resolver);
-}
-
-public static partial class InstanceValues {
-	[MemoryPackable]
-	public sealed partial record Concatenation(ImmutableArray<IInstanceValue> Values) : IInstanceValue {
-		public string? Resolve(IInstanceValueResolver resolver) {
-			var result = new StringBuilder();
-			
-			foreach (IInstanceValue value in Values) {
-				if (value.Resolve(resolver) is {} resolved) {
-					result.Append(resolved);
-				}
-				else {
-					return null;
-				}
-			}
-			
-			return result.ToString();
-		}
-		
-		public override string ToString() {
-			return "Concatenation[" + string.Join(",", Values) + "]";
-		}
-	}
-	
-	[MemoryPackable]
-	public sealed partial record Text(string Value) : IInstanceValue {
-		public string Resolve(IInstanceValueResolver resolver) {
-			return Value;
-		}
-		
-		public override string ToString() {
-			return "Text[" + Value + "]";
-		}
-	}
-	
-	[MemoryPackable]
-	public sealed partial record Path(IInstancePath Value) : IInstanceValue {
-		public string? Resolve(IInstanceValueResolver resolver) {
-			return resolver.Path(Value);
-		}
-		
-		public override string ToString() {
-			return "Path[" + Value + "]";
-		}
-	}
-}

Common/Phantom.Common.Data.Agent/Instance/IInstanceValueResolver.cs

@@ -1,5 +0,0 @@
-namespace Phantom.Common.Data.Agent.Instance;
-
-public interface IInstanceValueResolver {
-	string? Path(IInstancePath value);
-}

Common/Phantom.Common.Data.Agent/Instance/InstanceInfo.cs

@@ -1,12 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent.Instance;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstanceInfo(
-	[property: MemoryPackOrder(0)] string InstanceName,
-	[property: MemoryPackOrder(1)] ushort ServerPort,
-	[property: MemoryPackOrder(2)] ImmutableSortedSet<ushort> AdditionalPorts,
-	[property: MemoryPackOrder(3)] RamAllocationUnits MemoryAllocation
-);

Common/Phantom.Common.Data.Agent/Instance/Launch/IInstanceLaunchStep.cs

@@ -1,34 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent.Instance.Launch;
-
-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceLaunchStep.DownloadFile))]
-[MemoryPackUnion(tag: 1, typeof(InstanceLaunchStep.EditPropertiesFile))]
-public partial interface IInstanceLaunchStep {
-	Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor);
-}
-
-public static partial class InstanceLaunchStep {
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record DownloadFile(
-		[property: MemoryPackOrder(0)] FileDownloadInfo DownloadInfo,
-		[property: MemoryPackOrder(1)] IInstancePath Path
-	) : IInstanceLaunchStep {
-		public Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor) {
-			return executor.DownloadFile(DownloadInfo, Path);
-		}
-	}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record EditPropertiesFile(
-		[property: MemoryPackOrder(0)] InstancePath.Local Path,
-		[property: MemoryPackOrder(1)] string Comment,
-		[property: MemoryPackOrder(2)] ImmutableDictionary<string, string> NewValues
-	) : IInstanceLaunchStep {
-		public Task<TResult> Run<TResult>(IInstanceLaunchStepExecutor<TResult> executor) {
-			return executor.EditPropertiesFile(Path, Comment, NewValues);
-		}
-	}
-}

Common/Phantom.Common.Data.Agent/Instance/Launch/IInstanceLaunchStepExecutor.cs

@@ -1,8 +0,0 @@
-using System.Collections.Immutable;
-
-namespace Phantom.Common.Data.Agent.Instance.Launch;
-
-public interface IInstanceLaunchStepExecutor<TResult> {
-	Task<TResult> DownloadFile(FileDownloadInfo downloadInfo, IInstancePath path);
-	Task<TResult> EditPropertiesFile(InstancePath.Local path, string comment, ImmutableDictionary<string, string> newValues);
-}

Common/Phantom.Common.Data.Agent/Instance/Launch/InstanceLaunchRecipe.cs

@@ -1,11 +0,0 @@
-using System.Collections.Immutable;
-using MemoryPack;
-
-namespace Phantom.Common.Data.Agent.Instance.Launch;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstanceLaunchRecipe(
-	[property: MemoryPackOrder(0)] ImmutableArray<IInstanceLaunchStep> Preparation,
-	[property: MemoryPackOrder(1)] IInstancePath Executable,
-	[property: MemoryPackOrder(2)] ImmutableArray<IInstanceValue> Arguments
-);

Common/Phantom.Common.Data.Agent/Phantom.Common.Data.Agent.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="MemoryPack" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
-  </ItemGroup>
-
-</Project>

Common/Phantom.Common.Data.Web/Agent/Agent.cs

@@ -1,5 +1,6 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Agent;
 
 namespace Phantom.Common.Data.Web.Agent;
 
@@ -8,10 +9,10 @@ public sealed partial record Agent(
 	[property: MemoryPackOrder(0)] Guid AgentGuid,
 	[property: MemoryPackOrder(1)] AgentConfiguration Configuration,
 	[property: MemoryPackOrder(2)] ImmutableArray<byte> ConnectionKey,
-	[property: MemoryPackOrder(3)] AgentRuntimeInfo RuntimeInfo,
+	[property: MemoryPackOrder(3)] AgentRuntimeInfo? RuntimeInfo,
 	[property: MemoryPackOrder(4)] AgentStats? Stats,
 	[property: MemoryPackOrder(5)] IAgentConnectionStatus ConnectionStatus
 ) {
 	[MemoryPackIgnore]
-	public RamAllocationUnits? AvailableMemory => RuntimeInfo.MaxMemory - Stats?.RunningInstanceMemory;
+	public RamAllocationUnits? AvailableMemory => RuntimeInfo?.MaxMemory - Stats?.RunningInstanceMemory;
 }

Common/Phantom.Common.Data.Web/Agent/AgentRuntimeInfo.cs

@@ -1,12 +1,18 @@
 using MemoryPack;
+using Phantom.Common.Data.Agent;
 
 namespace Phantom.Common.Data.Web.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentRuntimeInfo(
-	[property: MemoryPackOrder(0)] AgentVersionInfo? VersionInfo = null,
-	[property: MemoryPackOrder(1)] ushort? MaxInstances = null,
-	[property: MemoryPackOrder(2)] RamAllocationUnits? MaxMemory = null,
-	[property: MemoryPackOrder(3)] AllowedPorts? AllowedServerPorts = null,
-	[property: MemoryPackOrder(4)] AllowedPorts? AllowedAdditionalPorts = null
-);
+	[property: MemoryPackOrder(0)] ushort ProtocolVersion,
+	[property: MemoryPackOrder(1)] string BuildVersion,
+	[property: MemoryPackOrder(2)] ushort MaxInstances,
+	[property: MemoryPackOrder(3)] RamAllocationUnits MaxMemory,
+	[property: MemoryPackOrder(4)] AllowedPorts? AllowedServerPorts = null,
+	[property: MemoryPackOrder(5)] AllowedPorts? AllowedRconPorts = null
+) {
+	public static AgentRuntimeInfo From(AgentInfo agentInfo) {
+		return new AgentRuntimeInfo(agentInfo.ProtocolVersion, agentInfo.BuildVersion, agentInfo.MaxInstances, agentInfo.MaxMemory, agentInfo.AllowedServerPorts, agentInfo.AllowedRconPorts);
+	}
+}

Common/Phantom.Common.Data.Web/Agent/AgentVersionInfo.cs

@@ -1,9 +0,0 @@
-using MemoryPack;
-
-namespace Phantom.Common.Data.Web.Agent;
-
-[MemoryPackable(GenerateType.VersionTolerant)]
-public readonly partial record struct AgentVersionInfo(
-	[property: MemoryPackOrder(0)] ushort ProtocolVersion,
-	[property: MemoryPackOrder(1)] string BuildVersion
-);

Common/Phantom.Common.Data.Web/Instance/CreateOrUpdateInstanceResult.cs

@@ -5,19 +5,19 @@ public enum CreateOrUpdateInstanceResult : byte {
 	Success,
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
-	MinecraftVersionNotFound,
+	MinecraftVersionDownloadInfoNotFound,
 	AgentNotFound,
 }
 
 public static class CreateOrUpdateInstanceResultExtensions {
 	public static string ToSentence(this CreateOrUpdateInstanceResult reason) {
 		return reason switch {
-			CreateOrUpdateInstanceResult.Success                     => "Success.",
-			CreateOrUpdateInstanceResult.InstanceNameMustNotBeEmpty  => "Instance name must not be empty.",
-			CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero => "Memory must not be 0 MB.",
-			CreateOrUpdateInstanceResult.MinecraftVersionNotFound    => "Minecraft version not found.",
-			CreateOrUpdateInstanceResult.AgentNotFound               => "Agent not found.",
-			_                                                        => "Unknown error.",
+			CreateOrUpdateInstanceResult.Success                              => "Success.",
+			CreateOrUpdateInstanceResult.InstanceNameMustNotBeEmpty           => "Instance name must not be empty.",
+			CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero          => "Memory must not be 0 MB.",
+			CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound => "Could not find download information for the selected Minecraft version.",
+			CreateOrUpdateInstanceResult.AgentNotFound                        => "Agent not found.",
+			_                                                                 => "Unknown error.",
 		};
 	}
 }

Common/Phantom.Common.Data/Agent/AgentInfo.cs

@@ -9,5 +9,5 @@ public sealed partial record AgentInfo(
 	[property: MemoryPackOrder(2)] ushort MaxInstances,
 	[property: MemoryPackOrder(3)] RamAllocationUnits MaxMemory,
 	[property: MemoryPackOrder(4)] AllowedPorts AllowedServerPorts,
-	[property: MemoryPackOrder(5)] AllowedPorts AllowedAdditionalPorts
+	[property: MemoryPackOrder(5)] AllowedPorts AllowedRconPorts
 );

Common/Phantom.Common.Data/Agent/AgentStats.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Web.Agent;
+namespace Phantom.Common.Data.Agent;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentStats(

Common/Phantom.Common.Data/Instance/IInstanceStatus.cs

@@ -25,7 +25,7 @@ public sealed partial record InstanceIsInvalid([property: MemoryPackOrder(0)] st
 public sealed partial record InstanceIsNotRunning : IInstanceStatus;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte? Progress) : IInstanceStatus;
+public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte Progress) : IInstanceStatus;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsLaunching : IInstanceStatus;
@@ -55,7 +55,7 @@ public static class InstanceStatus {
 	public static readonly IInstanceStatus Stopping = new InstanceIsStopping();
 	
 	public static IInstanceStatus Invalid(string reason) => new InstanceIsInvalid(reason);
-	public static IInstanceStatus Downloading(byte? progress) => new InstanceIsDownloading(progress);
+	public static IInstanceStatus Downloading(byte progress) => new InstanceIsDownloading(progress);
 	public static IInstanceStatus Failed(InstanceLaunchFailReason reason) => new InstanceIsFailed(reason);
 	
 	public static bool IsLaunching(this IInstanceStatus status) {

Common/Phantom.Common.Data/Instance/InstanceConfiguration.cs

@@ -1,8 +1,8 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 
-namespace Phantom.Common.Data.Web.Instance;
+namespace Phantom.Common.Data.Instance;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceConfiguration(

Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs

@@ -1,8 +1,10 @@
 namespace Phantom.Common.Data.Instance;
 
 public enum InstanceLaunchFailReason : byte {
-	UnknownError                  = 0,
-	CouldNotPrepareServerInstance = 1,
-	CouldNotFindServerExecutable  = 2,
-	CouldNotStartServerExecutable = 3,
+	UnknownError                           = 0,
+	JavaRuntimeNotFound                    = 5,
+	CouldNotDownloadMinecraftServer        = 6,
+	CouldNotConfigureMinecraftServer       = 7,
+	CouldNotPrepareMinecraftServerLauncher = 8,
+	CouldNotStartMinecraftServer           = 9,
 }

Common/Phantom.Common.Data/Instance/InstanceLaunchProperties.cs

@@ -0,0 +1,9 @@
+using MemoryPack;
+using Phantom.Common.Data.Minecraft;
+
+namespace Phantom.Common.Data.Instance;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record InstanceLaunchProperties(
+	[property: MemoryPackOrder(0)] FileDownloadInfo? ServerDownloadInfo
+);

Common/Phantom.Common.Data/Minecraft/FileDownloadInfo.cs

@@ -0,0 +1,30 @@
+using MemoryPack;
+using Phantom.Utils.Cryptography;
+using Phantom.Utils.IO;
+
+namespace Phantom.Common.Data.Minecraft;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial class FileDownloadInfo {
+	[MemoryPackOrder(0)]
+	public string DownloadUrl { get; }
+	
+	[MemoryPackOrder(1)]
+	[MemoryPackInclude]
+	private readonly string hash;
+	
+	[MemoryPackIgnore]
+	public Sha1String Hash => Sha1String.FromString(hash);
+	
+	[MemoryPackOrder(2)]
+	public FileSize Size { get; }
+	
+	public FileDownloadInfo(string downloadUrl, Sha1String hash, FileSize size) : this(downloadUrl, hash.ToString(), size) {}
+	
+	[MemoryPackConstructor]
+	private FileDownloadInfo(string downloadUrl, string hash, FileSize size) {
+		this.DownloadUrl = downloadUrl;
+		this.hash = hash;
+		this.Size = size;
+	}
+}

Common/Phantom.Common.Data/Minecraft/MinecraftServerKind.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 public enum MinecraftServerKind : ushort {
 	Vanilla = 1,

Common/Phantom.Common.Data/Minecraft/MinecraftVersion.cs

@@ -1,6 +1,6 @@
 using MemoryPack;
 
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record MinecraftVersion(

Common/Phantom.Common.Data/Minecraft/MinecraftVersionType.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace Phantom.Common.Data.Web.Minecraft;
+namespace Phantom.Common.Data.Minecraft;
 
 public enum MinecraftVersionType : ushort {
 	Other = 0,

Common/Phantom.Common.Data/Replies/ConfigureInstanceResult.cs

@@ -1,16 +1,14 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum ConfigureInstanceResult : byte {
-	Success                      = 0,
-	CouldNotCreateInstanceFolder = 1,
+	Success,
 }
 
 public static class ConfigureInstanceResultExtensions {
 	public static string ToSentence(this ConfigureInstanceResult reason) {
 		return reason switch {
-			ConfigureInstanceResult.Success                      => "Success.",
-			ConfigureInstanceResult.CouldNotCreateInstanceFolder => "Could not create instance folder.",
-			_                                                    => "Unknown error.",
+			ConfigureInstanceResult.Success => "Success.",
+			_                               => "Unknown error.",
 		};
 	}
 }

Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs

@@ -1,14 +1,13 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum LaunchInstanceResult : byte {
-	LaunchInitiated            = 1,
-	InstanceAlreadyLaunching   = 2,
-	InstanceAlreadyRunning     = 3,
-	InstanceLimitExceeded      = 4,
-	MemoryLimitExceeded        = 5,
-	ServerPortNotAllowed       = 6,
-	ServerPortAlreadyInUse     = 7,
-	AdditionalPortNotAllowed   = 8,
-	AdditionalPortAlreadyInUse = 9,
-	InvalidConfiguration       = 10,
+	LaunchInitiated          = 1,
+	InstanceAlreadyLaunching = 2,
+	InstanceAlreadyRunning   = 3,
+	InstanceLimitExceeded    = 4,
+	MemoryLimitExceeded      = 5,
+	ServerPortNotAllowed     = 6,
+	ServerPortAlreadyInUse   = 7,
+	RconPortNotAllowed       = 8,
+	RconPortAlreadyInUse     = 9,
 }

Common/Phantom.Common.Data/Result.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using MemoryPack;
+using Phantom.Utils.Monads;
 using Phantom.Utils.Result;
 
 namespace Phantom.Common.Data;
@@ -24,6 +25,9 @@ public sealed partial class Result<TValue, TError> {
 	[MemoryPackIgnore]
 	public TError Error => !hasValue ? error! : throw new InvalidOperationException("Attempted to get error from a success result.");
 	
+	[MemoryPackIgnore]
+	public Either<TValue, TError> AsEither => hasValue ? Either.Left(value!) : Either.Right(error!);
+	
 	private Result(bool hasValue, TValue? value, TError? error) {
 		this.hasValue = hasValue;
 		this.value = value;
@@ -34,11 +38,6 @@ public sealed partial class Result<TValue, TError> {
 		return hasValue && EqualityComparer<TValue>.Default.Equals(value, expectedValue);
 	}
 	
-	[return: NotNullIfNotNull(nameof(valueIfError))]
-	public TValue? OrElse(TValue? valueIfError) {
-		return hasValue ? Value : valueIfError;
-	}
-	
 	public TOutput Into<TOutput>(Func<TValue, TOutput> valueConverter, Func<TError, TOutput> errorConverter) {
 		return hasValue ? valueConverter(value!) : errorConverter(error!);
 	}

Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Phantom.Common.Data.Agent\Phantom.Common.Data.Agent.csproj" />
+    <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" />
     <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" />
   </ItemGroup>

Common/Phantom.Common.Messages.Agent/ToAgent/ConfigureInstanceMessage.cs

@@ -1,7 +1,6 @@
 using MemoryPack;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Agent.Instance;
-using Phantom.Common.Data.Agent.Instance.Launch;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Actor;
 
@@ -10,7 +9,7 @@ namespace Phantom.Common.Messages.Agent.ToAgent;
 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ConfigureInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
-	[property: MemoryPackOrder(1)] InstanceInfo Info,
-	[property: MemoryPackOrder(2)] InstanceLaunchRecipe? LaunchRecipe,
+	[property: MemoryPackOrder(1)] InstanceConfiguration Configuration,
+	[property: MemoryPackOrder(2)] InstanceLaunchProperties LaunchProperties,
 	[property: MemoryPackOrder(3)] bool LaunchNow = false
 ) : IMessageToAgent, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;

Common/Phantom.Common.Messages.Web/ToController/CreateOrUpdateInstanceMessage.cs

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using MemoryPack;
 using Phantom.Common.Data;
+using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Web.Instance;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Utils.Actor;

Common/Phantom.Common.Messages.Web/ToController/GetMinecraftVersionsMessage.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 using MemoryPack;
-using Phantom.Common.Data.Web.Minecraft;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Utils.Actor;
 
 namespace Phantom.Common.Messages.Web.ToController;

Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs

@@ -1,12 +1,12 @@
 using System.Collections.Immutable;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Java;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Data.Web.Agent;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
 using Phantom.Common.Data.Web.Instance;
-using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Common.Messages.Web.ToWeb;

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228053557_AgentFieldNullability.Designer.cs

@@ -1,356 +0,0 @@
-// <auto-generated />
-using System;
-using System.Text.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20251228053557_AgentFieldNullability")]
-    partial class AgentFieldNullability
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
-                {
-                    b.Property<Guid>("AgentGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<byte[]>("AuthSecret")
-                        .HasMaxLength(12)
-                        .HasColumnType("bytea");
-
-                    b.Property<string>("BuildVersion")
-                        .HasColumnType("text");
-
-                    b.Property<int?>("MaxInstances")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("MaxMemory")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("ProtocolVersion")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AgentGuid");
-
-                    b.ToTable("Agents", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGuid");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
-                {
-                    b.Property<Guid>("EventGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid?>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("EventGuid");
-
-                    b.ToTable("EventLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
-                {
-                    b.Property<Guid>("InstanceGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("InstanceName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("JavaRuntimeGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("JvmArguments")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("LaunchAutomatically")
-                        .HasColumnType("boolean");
-
-                    b.Property<int>("MemoryAllocation")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("MinecraftServerKind")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("MinecraftVersion")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("RconPort")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ServerPort")
-                        .HasColumnType("integer");
-
-                    b.HasKey("InstanceGuid");
-
-                    b.ToTable("Instances", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid");
-
-                    b.ToTable("Roles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("RolePermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "AgentGuid");
-
-                    b.HasIndex("AgentGuid");
-
-                    b.ToTable("UserAgentAccess", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PasswordHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("Users", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("UserPermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "RoleGuid");
-
-                    b.HasIndex("RoleGuid");
-
-                    b.ToTable("UserRoles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
-                        .WithMany()
-                        .HasForeignKey("AgentGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228053557_AgentFieldNullability.cs

@@ -1,98 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class AgentFieldNullability : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<int>(
-                name: "ProtocolVersion",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "MaxMemory",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "MaxInstances",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "BuildVersion",
-                schema: "agents",
-                table: "Agents",
-                type: "text",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "text");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<int>(
-                name: "ProtocolVersion",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "MaxMemory",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "MaxInstances",
-                schema: "agents",
-                table: "Agents",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "BuildVersion",
-                schema: "agents",
-                table: "Agents",
-                type: "text",
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true);
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228211902_AgentAuthSecretNullability.Designer.cs

@@ -1,357 +0,0 @@
-// <auto-generated />
-using System;
-using System.Text.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Phantom.Controller.Database;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20251228211902_AgentAuthSecretNullability")]
-    partial class AgentAuthSecretNullability
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
-                {
-                    b.Property<Guid>("AgentGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<byte[]>("AuthSecret")
-                        .IsRequired()
-                        .HasMaxLength(12)
-                        .HasColumnType("bytea");
-
-                    b.Property<string>("BuildVersion")
-                        .HasColumnType("text");
-
-                    b.Property<int?>("MaxInstances")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("MaxMemory")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("ProtocolVersion")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AgentGuid");
-
-                    b.ToTable("Agents", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid?>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGuid");
-
-                    b.ToTable("AuditLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
-                {
-                    b.Property<Guid>("EventGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid?>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<JsonDocument>("Data")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectId")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("SubjectType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("UtcTime")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("EventGuid");
-
-                    b.ToTable("EventLog", "system");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
-                {
-                    b.Property<Guid>("InstanceGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("InstanceName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid>("JavaRuntimeGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("JvmArguments")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<bool>("LaunchAutomatically")
-                        .HasColumnType("boolean");
-
-                    b.Property<int>("MemoryAllocation")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("MinecraftServerKind")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("MinecraftVersion")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("RconPort")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ServerPort")
-                        .HasColumnType("integer");
-
-                    b.HasKey("InstanceGuid");
-
-                    b.ToTable("Instances", "agents");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Permissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid");
-
-                    b.ToTable("Roles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("RoleGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("RolePermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("AgentGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "AgentGuid");
-
-                    b.HasIndex("AgentGuid");
-
-                    b.ToTable("UserAgentAccess", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PasswordHash")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("Users", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PermissionId")
-                        .HasColumnType("text");
-
-                    b.HasKey("UserGuid", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("UserPermissions", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.Property<Guid>("UserGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<Guid>("RoleGuid")
-                        .HasColumnType("uuid");
-
-                    b.HasKey("UserGuid", "RoleGuid");
-
-                    b.HasIndex("RoleGuid");
-
-                    b.ToTable("UserRoles", "identity");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserAgentAccessEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.AgentEntity", null)
-                        .WithMany()
-                        .HasForeignKey("AgentGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
-                {
-                    b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
-                        .WithMany()
-                        .HasForeignKey("UserGuid")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Role");
-
-                    b.Navigation("User");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/20251228211902_AgentAuthSecretNullability.cs

@@ -1,42 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Phantom.Controller.Database.Postgres.Migrations
-{
-    /// <inheritdoc />
-    public partial class AgentAuthSecretNullability : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<byte[]>(
-                name: "AuthSecret",
-                schema: "agents",
-                table: "Agents",
-                type: "bytea",
-                maxLength: 12,
-                nullable: false,
-                defaultValue: new byte[0],
-                oldClrType: typeof(byte[]),
-                oldType: "bytea",
-                oldMaxLength: 12,
-                oldNullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<byte[]>(
-                name: "AuthSecret",
-                schema: "agents",
-                table: "Agents",
-                type: "bytea",
-                maxLength: 12,
-                nullable: true,
-                oldClrType: typeof(byte[]),
-                oldType: "bytea",
-                oldMaxLength: 12);
-        }
-    }
-}

Controller/Phantom.Controller.Database.Postgres/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -30,24 +30,24 @@ namespace Phantom.Controller.Database.Postgres.Migrations
                         .HasColumnType("uuid");
 
                     b.Property<byte[]>("AuthSecret")
-                        .IsRequired()
                         .HasMaxLength(12)
                         .HasColumnType("bytea");
 
                     b.Property<string>("BuildVersion")
+                        .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<int?>("MaxInstances")
+                    b.Property<int>("MaxInstances")
                         .HasColumnType("integer");
 
-                    b.Property<int?>("MaxMemory")
+                    b.Property<int>("MaxMemory")
                         .HasColumnType("integer");
 
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<int?>("ProtocolVersion")
+                    b.Property<int>("ProtocolVersion")
                         .HasColumnType("integer");
 
                     b.HasKey("AgentGuid");

Controller/Phantom.Controller.Database/ApplicationDbContext.cs

@@ -2,9 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Phantom.Common.Data;
+using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Web.AuditLog;
 using Phantom.Common.Data.Web.EventLog;
-using Phantom.Common.Data.Web.Minecraft;
 using Phantom.Controller.Database.Converters;
 using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Database.Factories;

Controller/Phantom.Controller.Database/Entities/AgentEntity.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using Phantom.Common.Data;
-using Phantom.Common.Data.Web.Agent;
 using Phantom.Utils.Rpc;
 
 namespace Phantom.Controller.Database.Entities;
@@ -14,22 +13,17 @@ public sealed class AgentEntity {
 	public Guid AgentGuid { get; init; }
 	
 	public string Name { get; set; }
-	public ushort? ProtocolVersion { get; set; }
-	public string? BuildVersion { get; set; }
-	public ushort? MaxInstances { get; set; }
-	public RamAllocationUnits? MaxMemory { get; set; }
+	public ushort ProtocolVersion { get; set; }
+	public string BuildVersion { get; set; }
+	public ushort MaxInstances { get; set; }
+	public RamAllocationUnits MaxMemory { get; set; }
 	
 	[MaxLength(AuthSecret.Length)]
-	public AuthSecret AuthSecret { get; set; }
-	
-	public AgentConfiguration Configuration => new (Name);
-	public AgentVersionInfo? VersionInfo => ProtocolVersion is {} protocolVersion && BuildVersion is {} buildVersion ? new AgentVersionInfo(protocolVersion, buildVersion) : null;
-	public AgentRuntimeInfo RuntimeInfo => new (VersionInfo, MaxInstances, MaxMemory);
+	public AuthSecret? AuthSecret { get; set; }
 	
 	internal AgentEntity(Guid agentGuid) {
 		AgentGuid = agentGuid;
 		Name = null!;
 		BuildVersion = null!;
-		AuthSecret = null!;
 	}
 }