Merge all client projects (launcher, symbiote, switcher) into one.

.vscode/launch.json

@@ -38,7 +38,7 @@
       "program": "${workspaceFolder}/out/bin/src/server/daemon/debug/arised.dll"
     },
     {
-      "name": ".NET: Launch Switcher",
+      "name": ".NET: Launch Client",
       "presentation": {
         "group": "arise"
       },
@@ -52,8 +52,8 @@
         "searchNuGetOrgSymbolServer": true
       },
       "console": "internalConsole",
-      "cwd": "${workspaceFolder}/src/client/switcher",
-      "program": "${workspaceFolder}/out/bin/src/client/switcher/debug/arise.dll",
+      "cwd": "${workspaceFolder}/src/client",
+      "program": "${workspaceFolder}/out/bin/src/client/debug/arise.dll",
       "args": [
         "--Launcher:GameConsole",
         "true"

README.md

@@ -2,7 +2,8 @@
 
 <div align="center">
     <img src="arise.png"
-         width="128" />
+         width="128"
+         alt="TERA Arise" />
 </div>
 
 <div align="center">

arise.proj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.Build.Traversal">
     <ItemGroup>
-        <ProjectReference Include="src/*/*/*.*proj" />
+        <ProjectReference Include="src/**/*.csproj" />
     </ItemGroup>
 </Project>

src/client/symbiote/Data/TeraDataCenterLoader.cs → src/client/Game/Data/TeraDataCenterLoader.cs

@@ -1,10 +1,10 @@
+using Arise.Client.Game.Memory;
+using Arise.Client.Game.Net;
 using Arise.Client.Memory;
-using Arise.Client.Net;
 using static Iced.Intel.AssemblerRegisters;
 
-namespace Arise.Client.Data;
+namespace Arise.Client.Game.Data;
 
-[RegisterSingleton<TeraDataCenterLoader>]
 internal sealed unsafe class TeraDataCenterLoader : IHostedService
 {
     private readonly CodeManager _codeManager;

src/client/symbiote/GameApplicationHost.cs → src/client/Game/GameApplicationHost.cs

@@ -1,6 +1,6 @@
-using Arise.Client.Net;
+using Arise.Client.Game.Net;
 
-namespace Arise.Client;
+namespace Arise.Client.Game;
 
 internal sealed class GameApplicationHost : IHostedService
 {

src/client/Game/GameOptions.cs

@@ -0,0 +1,14 @@
+namespace Arise.Client.Game;
+
+internal sealed class GameOptions : IOptions<GameOptions>
+{
+    public bool Console { get; set; }
+
+    public Uri WorldServerUri { get; set; } = new("arise://localhost:7801");
+
+    public string AccountName { get; set; } = "arise@localhost";
+
+    public string SessionTicket { get; set; } = "bc8d0fc43b795e0634fa5934a2d3b14d5348da9f13fa26ae57acefaf337f5731";
+
+    GameOptions IOptions<GameOptions>.Value => this;
+}

src/client/symbiote/Launcher/TeraLauncherProxyManager.cs → src/client/Game/Launcher/TeraLauncherProxyManager.cs

@@ -1,17 +1,16 @@
-using Arise.Client.Memory;
+using Arise.Client.Game.Memory;
 
-namespace Arise.Client.Launcher;
+namespace Arise.Client.Game.Launcher;
 
-[RegisterSingleton<TeraLauncherProxyManager>]
 internal sealed unsafe partial class TeraLauncherProxyManager : IHostedService
 {
     private readonly Queue<FunctionHook> _hooks = new();
 
-    private readonly IOptions<SymbioteOptions> _options;
+    private readonly IOptions<GameOptions> _options;
 
     private readonly CodeManager _codeManager;
 
-    public TeraLauncherProxyManager(IOptions<SymbioteOptions> options, CodeManager codeManager)
+    public TeraLauncherProxyManager(IOptions<GameOptions> options, CodeManager codeManager)
     {
         _options = options;
         _codeManager = codeManager;

src/client/symbiote/Memory/TeraMemory.cs → src/client/Game/Memory/TeraMemory.cs

@@ -1,4 +1,4 @@
-namespace Arise.Client.Memory;
+namespace Arise.Client.Game.Memory;
 
 internal static unsafe class TeraMemory
 {

src/client/symbiote/Net/GameClient.cs → src/client/Game/Net/GameClient.cs

@@ -1,9 +1,7 @@
-using Arise.Client.Net.Sessions;
-using Arise.Server.Net.Sessions;
+using Arise.Client.Game.Net.Sessions;
 
-namespace Arise.Client.Net;
+namespace Arise.Client.Game.Net;
 
-[RegisterSingleton<GameClient>]
 internal sealed partial class GameClient : IHostedService
 {
     private static partial class Log
@@ -35,7 +33,7 @@ public static partial void ArisePacketReceived(
 
     private readonly IHostApplicationLifetime _hostLifetime;
 
-    private readonly IOptions<SymbioteOptions> _options;
+    private readonly IOptions<GameOptions> _options;
 
     private readonly ILogger<GameClient> _logger;
 
@@ -47,7 +45,7 @@ public static partial void ArisePacketReceived(
 
     public GameClient(
         IHostApplicationLifetime hostLifetime,
-        IOptions<SymbioteOptions> options,
+        IOptions<GameOptions> options,
         ILogger<GameClient> logger,
         ObjectPoolProvider objectPoolProvider,
         GameClientSessionDispatcher sessionDispatcher,

src/client/symbiote/Net/Handlers/GameClientPacketHandler.Security.cs → src/client/Game/Net/Handlers/GameClientPacketHandler.Security.cs

@@ -1,6 +1,6 @@
-using Arise.Client.Net.Sessions;
+using Arise.Client.Game.Net.Sessions;
 
-namespace Arise.Client.Net.Handlers;
+namespace Arise.Client.Game.Net.Handlers;
 
 internal sealed partial class GameClientPacketHandler
 {

src/client/symbiote/Net/Handlers/GameClientPacketHandler.cs → src/client/Game/Net/Handlers/GameClientPacketHandler.cs

@@ -1,4 +1,4 @@
-namespace Arise.Client.Net.Handlers;
+namespace Arise.Client.Game.Net.Handlers;
 
 internal sealed partial class GameClientPacketHandler
 {

src/client/symbiote/Net/Sessions/GameClientSession.cs → src/client/Game/Net/Sessions/GameClientSession.cs

@@ -1,4 +1,4 @@
-namespace Arise.Client.Net.Sessions;
+namespace Arise.Client.Game.Net.Sessions;
 
 internal sealed class GameClientSession : GameSession
 {

src/client/symbiote/Net/Sessions/GameClientSessionDispatcher.cs → src/client/Game/Net/Sessions/GameClientSessionDispatcher.cs

@@ -1,9 +1,7 @@
-using Arise.Client.Net.Handlers;
-using Arise.Client.Net.Sessions;
+using Arise.Client.Game.Net.Handlers;
 
-namespace Arise.Server.Net.Sessions;
+namespace Arise.Client.Game.Net.Sessions;
 
-[RegisterSingleton<GameClientSessionDispatcher>]
 internal sealed partial class GameClientSessionDispatcher :
     GameSessionDispatcher<GameClientSession, GameClientPacketHandler>
 {

src/client/symbiote/Net/TeraConnectionManager.cs → src/client/Game/Net/TeraConnectionManager.cs

@@ -1,6 +1,5 @@
-namespace Arise.Client.Net;
+namespace Arise.Client.Game.Net;
 
-[RegisterSingleton<TeraConnectionManager>]
 internal sealed unsafe partial class TeraConnectionManager : IHostedService
 {
     private enum State

src/client/launcher/Gateway/GatewayClient.cs → src/client/Gateway/GatewayClient.cs

@@ -1,4 +1,4 @@
-namespace Arise.Client.Launcher.Gateway;
+namespace Arise.Client.Gateway;
 
 internal sealed class GatewayClient
 {
@@ -18,10 +18,4 @@ public GatewayClient(HttpClient client)
             client, new RefitSettings(new SystemTextJsonContentSerializer(IGatewayClient.JsonContext.Options)));
         _client = client;
     }
-
-    [RegisterServices]
-    internal static void Register(IServiceCollection services)
-    {
-        _ = services.AddHttpClient<GatewayClient>();
-    }
 }

src/client/Launcher/Controllers/MainController.cs

@@ -0,0 +1,24 @@
+using Arise.Client.Launcher.Media;
+
+namespace Arise.Client.Launcher.Controllers;
+
+internal sealed class MainController : LauncherController
+{
+    private readonly MusicPlayer? _musicPlayer;
+
+    public MainController(IServiceProvider services)
+        : base(services)
+    {
+        _musicPlayer = services.GetService<MusicPlayer>(); // Not available in the Avalonia designer.
+
+        this.WhenActivated((CompositeDisposable disposable) =>
+        {
+            if (_musicPlayer is not { } player)
+                return;
+
+            player.Play();
+
+            disposable.Add(Disposable.Create(player, static player => player.Stop()));
+        });
+    }
+}

src/client/launcher/LauncherApplication.axaml.cs → src/client/Launcher/LauncherApplication.axaml.cs

@@ -8,12 +8,9 @@ internal sealed partial class LauncherApplication : Application
 {
     private readonly IServiceProvider _services;
 
-    private readonly IHostApplicationLifetime _hostLifetime;
-
-    public LauncherApplication(IServiceProvider services, IHostApplicationLifetime hostLifetime)
+    public LauncherApplication(IServiceProvider services)
     {
         _services = services;
-        _hostLifetime = hostLifetime;
     }
 
     public override void Initialize()
@@ -25,21 +22,25 @@ public override void Initialize()
 
     public override void OnFrameworkInitializationCompleted()
     {
-        var lifetime = Unsafe.As<IClassicDesktopStyleApplicationLifetime>(ApplicationLifetime!);
+        if (Design.IsDesignMode)
+            return;
+
+        var hostLifetime = _services.GetRequiredService<IHostApplicationLifetime>();
+        var avaloniaLifetime = Unsafe.As<IClassicDesktopStyleApplicationLifetime>(ApplicationLifetime!);
 
         // Ensure that Ctrl-C in the console works as expected.
-        _ = _hostLifetime.ApplicationStopping.UnsafeRegister(
-            static lifetime =>
+        _ = hostLifetime.ApplicationStopping.UnsafeRegister(
+            static avaloniaLifetime =>
                 Dispatcher.UIThread.Post(
-                    () => Unsafe.As<IClassicDesktopStyleApplicationLifetime>(lifetime!).Shutdown(),
+                    () => Unsafe.As<IClassicDesktopStyleApplicationLifetime>(avaloniaLifetime!).Shutdown(),
                     DispatcherPriority.MaxValue),
-            state: lifetime);
+            state: avaloniaLifetime);
 
         var window = ActivatorUtilities.CreateInstance<MainWindow>(_services);
 
         window.DataContext = ActivatorUtilities.CreateInstance<MainController>(_services);
 
-        lifetime.MainWindow = window;
+        avaloniaLifetime.MainWindow = window;
 
         base.OnFrameworkInitializationCompleted();
     }

src/client/launcher/LauncherApplicationHost.cs → src/client/Launcher/LauncherApplicationHost.cs

@@ -1,8 +1,7 @@
-using Arise.Client.Launcher.Logging;
+using Arise.Client.Logging;
 
 namespace Arise.Client.Launcher;
 
-[RegisterSingleton<LauncherApplicationHost>]
 internal sealed class LauncherApplicationHost : IHostedService
 {
     private readonly IServiceProvider _services;
@@ -29,12 +28,8 @@ Task IHostedService.StartAsync(CancellationToken cancellationToken)
 
             try
             {
-                _ = AppBuilder
-                    .Configure(() => ActivatorUtilities.CreateInstance<LauncherApplication>(@this._services))
-                    .UseWin32()
-                    .UseSkia()
-                    .UseReactiveUI()
-                    .WithInterFont()
+                _ = Program
+                    .BuildAvaloniaApp(@this._services)
                     .StartWithClassicDesktopLifetime([], ShutdownMode.OnMainWindowClose);
             }
             finally

src/client/launcher/LauncherOptions.cs → src/client/Launcher/LauncherOptions.cs

@@ -5,12 +5,4 @@ internal sealed class LauncherOptions : IOptions<LauncherOptions>
     public bool GameConsole { get; set; }
 
     LauncherOptions IOptions<LauncherOptions>.Value => this;
-
-    [RegisterServices]
-    public static void Register(IServiceCollection services)
-    {
-        _ = services
-            .AddOptions<LauncherOptions>()
-            .BindConfiguration("Launcher");
-    }
 }

src/client/launcher/Media/MusicPlayer.cs → src/client/Launcher/Media/MusicPlayer.cs

@@ -1,6 +1,5 @@
 namespace Arise.Client.Launcher.Media;
 
-[RegisterSingleton<MusicPlayer>]
 internal sealed class MusicPlayer : IDisposable
 {
     private readonly WasapiOut _wasapi = new();

src/client/launcher/Styles/Window.axaml → src/client/Launcher/Styles/Window.axaml

@@ -5,7 +5,7 @@
     <Style Selector="Window">
         <Setter Property="WindowStartupLocation" Value="CenterScreen" />
         <Setter Property="Title" Value="{Binding Title}" />
-        <Setter Property="Icon" Value="../arise.png" />
+        <Setter Property="Icon" Value="../../arise.png" />
         <Setter Property="CanResize" Value="False" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="25" />

src/client/launcher/Windows/MainWindow.axaml → src/client/Launcher/Windows/MainWindow.axaml

@@ -6,10 +6,10 @@
         Width="1280"
         Height="720">
     <Window.Background>
-        <ImageBrush Source="{Binding Background}"
+        <ImageBrush Source="../../image_background.webp"
                     Stretch="Fill" />
     </Window.Background>
 
-    <Image Source="{Binding Logo}"
+    <Image Source="../../image_logo.webp"
            Stretch="Uniform" />
 </Window>

src/client/launcher/Windows/MainWindow.axaml.cs → src/client/Launcher/Windows/MainWindow.axaml.cs

@@ -2,7 +2,6 @@
 
 namespace Arise.Client.Launcher.Windows;
 
-[RegisterTransient<MainWindow>]
 internal sealed partial class MainWindow : LauncherWindow<MainController>
 {
     public MainWindow()

src/client/launcher/Logging/AvaloniaLogSink.cs → src/client/Logging/AvaloniaLogSink.cs

@@ -1,6 +1,5 @@
-namespace Arise.Client.Launcher.Logging;
+namespace Arise.Client.Logging;
 
-[RegisterSingleton<AvaloniaLogSink>]
 [SuppressMessage("", "CA1848")]
 [SuppressMessage("", "CA2254")]
 internal sealed class AvaloniaLogSink : ILogSink

src/client/launcher/NativeMethods.txt → src/client/NativeMethods.txt

@@ -1,3 +1,4 @@
+AllocConsole
 AttachConsole
 
 ATTACH_PARENT_PROCESS