- add: multiauth

.idea/.idea.Nebula/.idea/avalonia.xml

@@ -33,6 +33,7 @@
         <entry key="Nebula.Launcher/Views/Popup/ExceptionListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/InfoPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/LoadingContextView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/LogPopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Popup/MessagePopupView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
@@ -44,6 +45,7 @@
         <entry key="Nebula.Launcher/Views/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Tabs/AccountInfoTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Tabs/ServerListTab.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/VisualErrorView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.UpdateResolver/App.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
         <entry key="Nebula.UpdateResolver/MainWindow.axaml" value="Nebula.UpdateResolver/Nebula.UpdateResolver.csproj" />
       </map>

Nebula.Launcher/App.axaml.cs

@@ -28,14 +28,16 @@ public class App : Application
             {
                 case IClassicDesktopStyleApplicationLifetime desktop:
                     DisableAvaloniaDataAnnotationValidation();
-                    desktop.MainWindow = new MessageWindow(out provider);
+                    desktop.MainWindow = (Window)(provider = new MessageWindow());
                     break;
                 case ISingleViewApplicationLifetime singleViewPlatform:
-                    singleViewPlatform.MainView = new MessageView(out provider);
+                    singleViewPlatform.MainView = (Control)(provider = new MessageView());
                     break;
             }
             
-            provider?.ShowMessage("Launcher is already running.","hey shithead!");
+            provider?.ShowMessage(
+                "Error: An instance of the application is already running. Please close the existing instance before launching a new one.", 
+                "Duplicate instance detected.");
             
             return;
         }

Nebula.Launcher/Assets/Style.axaml

@@ -107,10 +107,10 @@
                  pages|StringUnitConfigControl.ConfigBorder, 
                  pages|IntUnitConfigControl.ConfigBorder, 
                  pages|FloatUnitConfigControl.ConfigBorder">
-    <Setter Property="Background" Value="#333333" />
-    <Setter Property="CornerRadius" Value="5"/>
-    <Setter Property="BorderThickness" Value="1,0,1,2" />
-    <Setter Property="BorderBrush" Value="Azure" />
+    <Setter Property="Background" Value="#33333355" />
+    <Setter Property="CornerRadius" Value="0"/>
+    <Setter Property="BorderThickness" Value="1,0,0,2" />
+    <Setter Property="BorderBrush" Value="#3f3f3f5f" />
 </Style>
 
 </Styles>

Nebula.Launcher/Assets/lang/en-US.ftl

@@ -24,7 +24,10 @@ account-auth-server = Authentication Server
 account-auth-button = Authenticate  
 account-auth-save = Save Profile  
 account-auth-hello = Hello,  
+account-auth-current-server = Current server auth:
 account-auth-logout = Log out  
+auth-current-login-name = Current login {$auth_server}: {$login}
+auth-current-login-no-name = Profile not selected
 
 auth-processing = Processing authentication request...  
 auth-error = An authentication error has occurred.  
@@ -35,16 +38,20 @@ auth-name-resolution-error = Failed to resolve server address. Check your networ
 auth-secure-error = Failed to cinnect to the server using SSL
 auth-config-read = Reading authentication configuration...  
 auth-try-auth-config = Attempting to authenticate using saved configuration.
+auth-try-auth-profile = Attempting to authenticate using profile
 
 config-export-logs = Export logs
 config-open-data = Open data path
 config-reset = Reset to default
 config-save = Save changes
+config-remove-content-all = Remove all content
 
 filter-roleplay = Roleplay
 filter-language = Language
 favorite-add = Add to favorites
+popup-add-favorite-invalid-ip = Please enter a valid IP
 servername-set = Set server name
+servername-clear = Clear server name
 twofa-enabled = You have two-factor authentication enabled. Please enter the code.
 twofa-set = Proceed
 
@@ -54,4 +61,12 @@ serverentry-map = Map
 serverentry-preset = Preset
 
 content-view-server = Server url
-content-view-path = Path
+content-view-path = Path
+
+popup-login-credentials-warning = Warning! No credentials provided!
+popup-login-credentials-warning-label = Warning! No credentials provided! The servers will not be able to let you in due to lack of authorization. Please keep this in mind.
+popup-login-credentials-warning-go-auth = Go to auth page
+popup-login-credentials-warning-cancel = Cancel
+popup-login-credentials-warning-proceed = Proceed
+
+goto-path-home = Root folder

Nebula.Launcher/Assets/lang/ru-RU.ftl

@@ -24,7 +24,10 @@ account-auth-server = Сервер аутентификации
 account-auth-button = Аутентифицировать  
 account-auth-save = Сохранить профиль  
 account-auth-hello = Привет,  
+account-auth-current-server = Текущий сервер авторизации:
 account-auth-logout = Выйти  
+auth-current-login-name = Текущий профиль {$auth_server}: {$login}
+auth-current-login-no-name = Профиль не выбран
 
 auth-processing = Обработка запроса аутентификации...  
 auth-error = Произошла ошибка аутентификации.  
@@ -35,16 +38,20 @@ auth-name-resolution-error = Не удалось разрешить адрес
 auth-secure-error = Не удалось подключиться к серверу по SSL. Проверьте сетевые настройки.
 auth-config-read = Чтение конфигурации аутентификации...  
 auth-try-auth-config = Попытка аутентификации с использованием сохраненной конфигурации.
+auth-try-auth-profile = Попытка аутентификации с использованием профиля
 
 config-export-logs = Экспортировать логи
 config-open-data = Открыть путь данных
 config-reset = Сбросить к значениям по умолчанию
 config-save = Сохранить изменения
+config-remove-content-all = Удалить весь контент
 
 filter-roleplay = Ролевая игра
 filter-language = Язык
 favorite-add = Добавить в избранное
+popup-add-favorite-invalid-ip = Пожалуйста, введите валидный адрес
 servername-set = Установить имя сервера
+servername-clear = Очистить
 twofa-enabled = У вас включена двухфакторная аутентификация. Введите код.
 twofa-set = Продолжить
 
@@ -54,4 +61,12 @@ serverentry-map = Карта
 serverentry-preset = Режим
 
 content-view-server = Сервер
-content-view-path = Путь
+content-view-path = Путь
+
+popup-login-credentials-warning = Предупреждение! Учетные данные не указаны!
+popup-login-credentials-warning-label = Предупреждение! Учетные данные не указаны! Серверы не смогут пропустить вас из-за отсутствия авторизации. Пожалуйста, имейте это в виду.
+popup-login-credentials-warning-go-auth = Перейти на страницу авторизации
+popup-login-credentials-warning-cancel = Отмена
+popup-login-credentials-warning-proceed = Продолжить
+
+goto-path-home = Корн. папка

Nebula.Launcher/Controls/ServerListView.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.ServerListProviders;
 using Nebula.Launcher.ViewModels;
 using Nebula.Launcher.ViewModels.Pages;

Nebula.Launcher/Converters/TypeConverters.cs

@@ -1,11 +1,11 @@
-using Avalonia;
-using Avalonia.Controls;
+using System;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
+using Avalonia.Platform;
 
 namespace Nebula.Launcher.Converters;
 
-public class TypeConverters
+public static class TypeConverters
 {
     public static FuncValueConverter<string, string?> IconConverter { get; } =
         new(iconKey =>
@@ -13,4 +13,11 @@ public class TypeConverters
             if (iconKey == null) return null;
             return $"/Assets/svg/{iconKey}.svg";
         });
+    
+    public static FuncValueConverter<string, IImage?> ImageConverter { get; } =
+        new(iconKey =>
+        {
+            if (iconKey == null) return null;
+            return new Avalonia.Media.Imaging.Bitmap(AssetLoader.Open(new Uri($"avares://Nebula.Launcher/Assets/error_presentation/{iconKey}.png")));
+        });
 }

Nebula.Launcher/GlobalUsing.cs

@@ -1,2 +1 @@
-global using Nebula.Shared.Attributes;
-global using Nebula.Launcher.ViewHelper;
+global using Nebula.Shared.Attributes;

Nebula.Launcher/LauncherConVar.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Nebula.Launcher.Models;
-using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.Models.Auth;
+using Nebula.Shared.ConfigMigrations;
 using Nebula.Shared.Services;
 
 namespace Nebula.Launcher;
@@ -10,11 +11,16 @@ public static class LauncherConVar
 {
     public static readonly ConVar<bool> DoMigration =
         ConVarBuilder.Build("migration.doMigrate", true);
-    public static readonly ConVar<ProfileAuthCredentials[]> AuthProfiles =
-        ConVarBuilder.Build<ProfileAuthCredentials[]>("auth.profiles.v2", []);
+    
+    public static readonly ConVar<AuthTokenCredentials[]> AuthProfiles =
+        ConVarBuilder.BuildWithMigration<AuthTokenCredentials[]>("auth.profiles.v3", 
+            MigrationQueueBuilder.Instance
+                .With(new ProfileMigrationV2("auth.profiles.v2","auth.profiles.v3"))
+                .Build(), 
+            []);
 
-    public static readonly ConVar<CurrentAuthInfo?> AuthCurrent =
-        ConVarBuilder.Build<CurrentAuthInfo?>("auth.current.v2");
+    public static readonly ConVar<AuthTokenCredentials?> AuthCurrent =
+        ConVarBuilder.Build<AuthTokenCredentials?>("auth.current.v2");
     
     public static readonly ConVar<string[]> Favorites =
         ConVarBuilder.Build<string[]>("server.favorites", []);
@@ -28,7 +34,13 @@ public static class LauncherConVar
             "WizDen", 
             [
                 "https://harpy.durenko.tatar/auth-api/",
+                "https://auth.spacestation14.com/",
                 "https://auth.fallback.spacestation14.com/",
+            ]),
+        new AuthServerCredentials(
+            "SimpleStation", 
+            [
+                "https://auth.simplestation.org/",
             ])
     ]);
     

Nebula.Launcher/MessageBox/MessageView.axaml

@@ -2,16 +2,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:views="clr-namespace:Nebula.Launcher.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             Width="600"
-             Height="400"
+            
              x:Class="Nebula.Launcher.MessageBox.MessageView">
-    <Grid RowDefinitions="50,*" ColumnDefinitions="*">
-        <Border Grid.Column="0" Background="#222222" Padding="10" BorderBrush="#444444" BorderThickness="0,0,0,3">
-            <Label VerticalAlignment="Center" x:Name="Title">Text</Label>
-        </Border>
-        <Panel Margin="5" Grid.Row="1">
-            <Label x:Name="Message">Message</Label>
-        </Panel>
-    </Grid>
+    <views:VisualErrorView x:Name="ErrorView"/>
 </UserControl>

Nebula.Launcher/MessageBox/MessageView.axaml.cs

@@ -1,21 +1,22 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Nebula.Launcher.ViewModels;
 
 namespace Nebula.Launcher.MessageBox;
 
 public partial class MessageView : UserControl, IMessageContainerProvider
 {
-    public MessageView(out IMessageContainerProvider provider)
+    private readonly VisualErrorViewModel _context;
+    public MessageView()
     {
         InitializeComponent();
-        provider = this;
+        _context = new VisualErrorViewModel();
+        ErrorView.Content = _context;
     }
 
     public void ShowMessage(string message, string title)
     {
-        Title.Content = title;
-        Message.Content = message;
+        _context.Title = title;
+        _context.Description = message;
     }
 }
 

Nebula.Launcher/MessageBox/MessageWindow.axaml

@@ -3,10 +3,52 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:messageBox="clr-namespace:Nebula.Launcher.MessageBox"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        SystemDecorations="BorderOnly"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="260"
         Width="600"
-        Height="400"
+        Height="260"
+        CanResize="False"
         x:Class="Nebula.Launcher.MessageBox.MessageWindow"
         Title="MessageWindow">
-    
+     <Grid ColumnDefinitions="*" RowDefinitions="30,*">
+            <messageBox:MessageView
+                Grid.Column="0"
+                Grid.Row="0"
+                Grid.RowSpan="2"
+                x:Name="MessageView" />
+            <Border
+                
+                BorderThickness="0,0,0,2"
+                CornerRadius="0"
+                Grid.Column="0"
+                Grid.Row="0">
+                <Border.BorderBrush>
+                    <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
+                        <GradientStop Color="#222222" Offset="0.0" />
+                        <GradientStop Color="#442222" Offset="1.0" />
+                    </LinearGradientBrush>
+                </Border.BorderBrush>
+                <Panel
+                    Height="30"
+                    PointerPressed="InputElement_OnPointerPressed">
+                    <TextBlock
+                        FontSize="10"
+                        Foreground="White"
+                        IsVisible="False"
+                        Margin="15,0"
+                        Text="Nebula Launcher"
+                        VerticalAlignment="Center" />
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        Margin="5,0,5,0"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <Button
+                            Click="Close_Click"
+                            Content="🗙"
+                            Foreground="Azure" />
+                    </StackPanel>
+                </Panel>
+            </Border>
+        </Grid>
 </Window>

Nebula.Launcher/MessageBox/MessageWindow.axaml.cs

@@ -1,12 +1,28 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace Nebula.Launcher.MessageBox;
 
-public partial class MessageWindow : Window
+public partial class MessageWindow : Window, IMessageContainerProvider
 { 
-    public MessageWindow(out IMessageContainerProvider provider)
+    public MessageWindow()
     {
         InitializeComponent();
-        Content = new MessageView(out provider);
+    }
+
+    public void ShowMessage(string message, string title)
+    {
+        MessageView.ShowMessage(message, title);
+    }
+    
+    private void Close_Click(object? sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+
+    private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        BeginMoveDrag(e);
     }
 }

Nebula.Launcher/Models/Auth/AuthServerCredentials.cs

@@ -0,0 +1,6 @@
+namespace Nebula.Launcher.Models.Auth;
+
+public sealed record AuthServerCredentials(
+    string Name, 
+    string[] Servers
+);

Nebula.Launcher/Models/Auth/ProfileAuthCredentials.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using System.Windows.Input;
+using Avalonia.Media;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Models.Auth;
+
+public sealed record ProfileAuthCredentials(
+    AuthTokenCredentials Credentials, 
+    string AuthName,
+    Color Color,
+    [property: JsonIgnore] ICommand OnSelect = default!,
+    [property: JsonIgnore] ICommand OnDelete = default!);

Nebula.Launcher/Models/ContentLogConsumer.cs

@@ -0,0 +1,32 @@
+using Nebula.Launcher.ProcessHelper;
+using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Models;
+
+public sealed class ContentLogConsumer : IProcessLogConsumer
+{
+    private readonly LogPopupModelView _currLog;
+    private readonly PopupMessageService _popupMessageService;
+
+    public ContentLogConsumer(LogPopupModelView currLog, PopupMessageService popupMessageService)
+    {
+        _currLog = currLog;
+        _popupMessageService = popupMessageService;
+    }
+
+    public void Out(string text)
+    {
+        _currLog.Append(text);
+    }
+
+    public void Error(string text)
+    {
+        _currLog.Append(text);
+    }
+
+    public void Fatal(string text)
+    {
+        _popupMessageService.Popup("Fatal error while stop instance:" + text);
+    }
+}

Nebula.Launcher/Models/IFilterConsumer.cs

@@ -0,0 +1,8 @@
+using Nebula.Launcher.ViewModels.Pages;
+
+namespace Nebula.Launcher.Models;
+
+public interface IFilterConsumer
+{
+    public void ProcessFilter(ServerFilter? serverFilter);
+}

Nebula.Launcher/Models/LogInfo.cs

@@ -0,0 +1,40 @@
+using System.Text.RegularExpressions;
+using Avalonia.Media;
+
+namespace Nebula.Launcher.Models;
+
+public sealed class LogInfo
+{
+    public string Category { get; set; } = "LOG";
+    public IBrush CategoryColor { get; set; } = Brush.Parse("#424242");
+    public string Message { get; set; } = "";
+
+    public static LogInfo FromString(string input)
+    {
+        var matches = Regex.Matches(input, @"(\[(?<c>.*)\] (?<m>.*))|(?<m>.*)");
+        var category = "All";
+
+        if (matches[0].Groups.TryGetValue("c", out var c)) category = c.Value;
+
+        var color = Brush.Parse("#444444");
+
+        switch (category)
+        {
+            case "DEBG":
+                color = Brush.Parse("#2436d4");
+                break;
+            case "ERRO":
+                color = Brush.Parse("#d42436");
+                break;
+            case "INFO":
+                color = Brush.Parse("#0ab3c9");
+                break;
+        }
+
+        var message = matches[0].Groups["m"].Value;
+        return new LogInfo
+        {
+            Category = category, Message = message, CategoryColor = color
+        };
+    }
+}

Nebula.Launcher/Nebula.Launcher.csproj

@@ -54,6 +54,8 @@
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(OutDir)"/>
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(OutDir)"/>
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(OutDir)"/>
+
+        <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\0Harmony.dll" DestinationFolder="$(OutDir)"/>
     </Target>
 
     <Target Name="PublishCheck" AfterTargets="Publish">
@@ -61,6 +63,8 @@
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.pdb" DestinationFolder="$(PublishDir)"/>
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.deps.json" DestinationFolder="$(PublishDir)"/>
         <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\Nebula.Runner.runtimeconfig.json" DestinationFolder="$(PublishDir)"/>
+
+        <Copy SourceFiles="..\Nebula.Runner\bin\$(Configuration)\$(TargetFramework)\0Harmony.dll" DestinationFolder="$(PublishDir)"/>
     </Target>
 
     <ItemGroup>

Nebula.Launcher/ProcessHelper/GameProcessStartInfoProvider.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
@@ -10,7 +11,7 @@ using Nebula.Shared.Services;
 namespace Nebula.Launcher.ProcessHelper;
 
 [ServiceRegister(isSingleton:false)]
-public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AuthService authService) : 
+public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AccountInfoViewModel accountInfoViewModel) : 
     DotnetProcessStartInfoProviderBase(resolverService)
 {
     private string? _publicKey;
@@ -34,7 +35,7 @@ public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverS
     {
         var baseStart = await base.GetProcessStartInfo();
         
-        var authProv = authService.SelectedAuth;
+        var authProv = accountInfoViewModel.Credentials;
         if(authProv is null) 
             throw new Exception("Client is without selected auth");
 

Nebula.Launcher/ProcessHelper/GameRunnerPreparer.cs

@@ -9,7 +9,7 @@ using Nebula.Shared.Services;
 namespace Nebula.Launcher.ProcessHelper;
 
 [ServiceRegister]
-public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService, DebugService debugService)
+public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService)
 {
     public async Task<ProcessRunHandler<GameProcessStartInfoProvider>> GetGameProcessStartInfoProvider(RobustUrl address, ILoadingHandler loadingHandler, CancellationToken cancellationToken = default)
     {

Nebula.Launcher/ServiceCollectionExtensions.cs

@@ -7,6 +7,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher;
 

Nebula.Launcher/Services/LocalisationService.cs

@@ -14,7 +14,8 @@ namespace Nebula.Launcher.Services;
 public partial class LocalisationService
 {
     [GenerateProperty] private ConfigurationService ConfigurationService { get; }
-
+    [GenerateProperty] private DebugService DebugService { get; }
+    
     private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
     private static MessageContext? _currentMessageContext;
 
@@ -42,6 +43,7 @@ public partial class LocalisationService
 
             _currentMessageContext = mc;
         } catch (Exception e) {
+            DebugService.GetLogger("localisationService").Error(e);
             LoadLanguage(CultureInfo.GetCultureInfo("en-US"));
         }
     }
@@ -51,16 +53,15 @@ public partial class LocalisationService
         Initialise();
     }
 
-    public static string GetString(string locale)
+    public static string GetString(string locale, Dictionary<string, object>? options = null)
     {
         if (_currentMessageContext is null)
         {
-            Console.WriteLine("ERROR SHIT BITHC!");
             return locale;
         }
         var message = _currentMessageContext.GetMessage(locale);
         if (message == null) return locale;
-        return _currentMessageContext.Format(message, new Dictionary<string, object>());
+        return _currentMessageContext.Format(message, options ?? []);
     }
 }
 

Nebula.Launcher/ViewHelper/ViewModelRegisterAttribute.cs

@@ -1,16 +0,0 @@
-using System;
-
-namespace Nebula.Launcher.ViewHelper;
-
-[AttributeUsage(AttributeTargets.Class)]
-public class ViewModelRegisterAttribute : Attribute
-{
-    public ViewModelRegisterAttribute(Type? type = null, bool isSingleton = true)
-    {
-        Type = type;
-        IsSingleton = isSingleton;
-    }
-
-    public Type? Type { get; }
-    public bool IsSingleton { get; }
-}

Nebula.Launcher/ViewLocator.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Nebula.Launcher.ViewModels;
 using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher;
 

Nebula.Launcher/ViewModels/MainViewModel.cs

@@ -10,10 +10,10 @@ using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views;
-using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels;
 
@@ -41,7 +41,17 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty] private bool _popup;
     [ObservableProperty] private ListItemTemplate? _selectedListItem;
 
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
+    public bool IsLoggedIn => AccountInfoViewModel.Credentials is not null;
+    
+    public string LoginText => LocalisationService.GetString("auth-current-login-name", 
+        new Dictionary<string, object>
+    {
+        { "login", AccountInfoViewModel.Credentials?.Login ?? "" },
+        { "auth_server", AccountInfoViewModel.CurrentAuthServerName}
+    });
+
+    [GenerateProperty] private LocalisationService LocalisationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ContentService ContentService { get; } = default!;
@@ -56,7 +66,7 @@ public partial class MainViewModel : ViewModelBase
     {
         Items = new ObservableCollection<ListItemTemplate>(_templates.Select(a=>
         {
-            return new ListItemTemplate(a.ModelType, a.IconKey, LocalisationService.GetString(a.Label));
+            return a with { Label = LocalisationService.GetString(a.Label) };
         }
         ));
         RequirePage<AccountInfoViewModel>();
@@ -64,6 +74,15 @@ public partial class MainViewModel : ViewModelBase
 
     protected override void Initialise()
     {
+        AccountInfoViewModel.PropertyChanged += (sender, args) =>
+        {
+            if (args.PropertyName != nameof(AccountInfoViewModel.Credentials)) 
+                return;
+            
+            OnPropertyChanged(nameof(LoginText));
+            OnPropertyChanged(nameof(IsLoggedIn));
+        };
+        
         _logger = DebugService.GetLogger(this);
 
         using var stream = typeof(MainViewModel).Assembly
@@ -79,6 +98,11 @@ public partial class MainViewModel : ViewModelBase
         
         CheckMigration();
         
+        var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        loadingHandler.LoadingName = LocalisationService.GetString("migration-config-task");
+        loadingHandler.IsCancellable = false;
+        ConfigurationService.MigrateConfigs(loadingHandler);
+        
         if (!VCRuntimeDllChecker.AreVCRuntimeDllsPresent())
         {
             OnPopupRequired(LocalisationService.GetString("vcruntime-check-error"));
@@ -163,6 +187,16 @@ public partial class MainViewModel : ViewModelBase
         Popup = true;
     }
 
+    public void OpenAuthPage()
+    {
+        RequirePage<AccountInfoViewModel>();
+    }
+
+    public void OpenRootPath()
+    {
+        ExplorerHelper.OpenFolder(FileService.RootPath);
+    }
+
     public void OpenLink()
     {
         Helper.OpenBrowser("https://durenko.tatar/nebula");

Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs

@@ -3,17 +3,21 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.Http;
-using System.Text.Json.Serialization;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Input;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Nebula.Launcher.Models.Auth;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
+using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Pages;
 
@@ -22,22 +26,17 @@ namespace Nebula.Launcher.ViewModels.Pages;
 public partial class AccountInfoViewModel : ViewModelBase
 {
     [ObservableProperty] private bool _authMenuExpand;
-
     [ObservableProperty] private bool _authUrlConfigExpand;
-
     [ObservableProperty] private int _authViewSpan = 1;
-
     [ObservableProperty] private string _currentAuthServer = string.Empty;
-
     [ObservableProperty] private string _currentLogin = string.Empty;
-
     [ObservableProperty] private string _currentPassword = string.Empty;
-
     [ObservableProperty] private bool _isLogged;
     [ObservableProperty] private bool _doRetryAuth;
+    [ObservableProperty] private AuthTokenCredentials? _credentials;
+    [ObservableProperty] private AuthServerCredentials _authItemSelect;
 
     private bool _isProfilesEmpty;
-    [GenerateProperty] private LocalisationService LocalisationService { get; }
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; }
@@ -46,18 +45,22 @@ public partial class AccountInfoViewModel : ViewModelBase
 
     public ObservableCollection<ProfileAuthCredentials> Accounts { get; } = new();
     public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
-
-    [ObservableProperty] private AuthServerCredentials _authItemSelect;
+    public string CurrentAuthServerName => GetServerAuthName(Credentials);
 
     private ILogger _logger;
+    
+    partial void OnCredentialsChanged(AuthTokenCredentials? value)
+    {
+        OnPropertyChanged(nameof(CurrentAuthServerName));
+    }
 
     //Design think
     protected override void InitialiseInDesignMode()
     {
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
-        
         AuthUrls.Add(new AuthServerCredentials("Test",["example.com"]));
+        
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", "example.com"));
+        AddAccount(new AuthTokenCredentials(Guid.Empty, LoginToken.Empty, "Binka", ""));
     }
 
     //Real think
@@ -67,13 +70,31 @@ public partial class AccountInfoViewModel : ViewModelBase
         Task.Run(ReadAuthConfig);
     }
 
-    public void AuthByProfile(ProfileAuthCredentials credentials)
+    public async void AuthByProfile(ProfileAuthCredentials credentials)
     {
-        CurrentLogin = credentials.Login;
-        CurrentPassword = credentials.Password;
-        CurrentAuthServer = credentials.AuthServer;
+        var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
+        message.InfoText = LocalisationService.GetString("auth-try-auth-profile");
+        message.IsInfoClosable = false;
+        PopupMessageService.Popup(message);
         
-        DoAuth();
+        try
+        {
+            await CatchAuthError(async () => await TryAuth(credentials.Credentials), () => message.Dispose());
+        }
+        catch (Exception ex)
+        {
+            CurrentLogin = credentials.Credentials.Login;
+            CurrentAuthServer = credentials.Credentials.AuthServer;
+            
+            var unexpectedError = new Exception(LocalisationService.GetString("auth-error"), ex);
+            _logger.Error(unexpectedError);
+            PopupMessageService.Popup(unexpectedError);
+            return;
+        }
+        
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
+        
+        message.Dispose();
     }
 
     public void DoAuth(string? code = null)
@@ -117,22 +138,28 @@ public partial class AccountInfoViewModel : ViewModelBase
         });
     }
 
-    private async Task TryAuth(CurrentAuthInfo currentAuthInfo)
+    private async Task TryAuth(AuthTokenCredentials authTokenCredentials)
     {
-        CurrentLogin = currentAuthInfo.Login;
-        CurrentAuthServer = currentAuthInfo.AuthServer;
-        await AuthService.SetAuth(currentAuthInfo);
+        CurrentLogin = authTokenCredentials.Login;
+        CurrentAuthServer = authTokenCredentials.AuthServer;
+        await SetAuth(authTokenCredentials);
         IsLogged = true;
     }
 
+    private async Task SetAuth(AuthTokenCredentials authTokenCredentials)
+    {
+        await AuthService.EnsureToken(authTokenCredentials);
+        Credentials = authTokenCredentials;
+    }
+
     private async Task TryAuth(string login, string password, string authServer, string? code)
     {
-        await AuthService.Auth(new AuthLoginPassword(login, password, authServer), code);
+        Credentials = await AuthService.Auth(login, password, authServer, code);
         CurrentLogin = login;
         CurrentPassword = password;
         CurrentAuthServer = authServer;
         IsLogged = true;
-        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, AuthService.SelectedAuth);
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, Credentials);
     }
 
     private async Task CatchAuthError(Func<Task> a, Action? onError)
@@ -199,7 +226,14 @@ public partial class AccountInfoViewModel : ViewModelBase
     public void Logout()
     {
         IsLogged = false;
-        AuthService.ClearAuth();
+        Credentials = null;
+        CurrentAuthServer = "";
+    }
+
+    public string GetServerAuthName(AuthTokenCredentials? credentials)
+    {
+        if (credentials is null) return "";
+        return AuthUrls.FirstOrDefault(p => p.Servers.Contains(credentials.AuthServer))?.Name ?? "CustomAuth";
     }
 
     private void UpdateAuthMenu()
@@ -210,15 +244,17 @@ public partial class AccountInfoViewModel : ViewModelBase
             AuthViewSpan = 1;
     }
 
-    private void AddAccount(AuthLoginPassword authLoginPassword)
+    private void AddAccount(AuthTokenCredentials credentials)
     {
         var onDelete = new DelegateCommand<ProfileAuthCredentials>(OnDeleteProfile);
         var onSelect = new DelegateCommand<ProfileAuthCredentials>(AuthByProfile);
+        
+        var serverName = GetServerAuthName(credentials);
 
         var alpm = new ProfileAuthCredentials(
-            authLoginPassword.Login,
-            authLoginPassword.Password,
-            authLoginPassword.AuthServer,
+            credentials,
+            serverName, 
+            ColorUtils.GetColorFromString(credentials.AuthServer),
             onSelect,
             onDelete);
 
@@ -234,16 +270,18 @@ public partial class AccountInfoViewModel : ViewModelBase
         message.InfoText = LocalisationService.GetString("auth-config-read");
         message.IsInfoClosable = false;
         PopupMessageService.Popup(message);
-        foreach (var profile in
-                 ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
-            AddAccount(new AuthLoginPassword(profile.Login, profile.Password, profile.AuthServer));
-
-        if (Accounts.Count == 0) UpdateAuthMenu();
-
+        
         AuthUrls.Clear();
         var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!;
         foreach (var url in authUrls) AuthUrls.Add(url);
         if(authUrls.Length > 0) AuthItemSelect = authUrls[0];
+        
+        foreach (var profile in
+                 ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
+            AddAccount(profile);
+
+        if (Accounts.Count == 0) UpdateAuthMenu();
+        
         message.Dispose();
 
         DoCurrentAuth();
@@ -279,7 +317,9 @@ public partial class AccountInfoViewModel : ViewModelBase
     [RelayCommand]
     private void OnSaveProfile()
     {
-        AddAccount(new AuthLoginPassword(CurrentLogin, CurrentPassword, CurrentAuthServer));
+        if(Credentials is null) return;
+        
+        AddAccount(Credentials);
         _isProfilesEmpty = Accounts.Count == 0;
         UpdateAuthMenu();
         DirtyProfile();
@@ -320,18 +360,20 @@ public partial class AccountInfoViewModel : ViewModelBase
     private void DirtyProfile()
     {
         ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
-            Accounts.ToArray());
+            Accounts.Select(a => a.Credentials).ToArray());
     }
 }
 
-public sealed record ProfileAuthCredentials(
-    string Login,
-    string Password,
-    string AuthServer,
-    [property: JsonIgnore] ICommand OnSelect = default!,
-    [property: JsonIgnore] ICommand OnDelete = default!);
-    
-public sealed record AuthServerCredentials(
-    string Name, 
-    string[] Servers
-);
+public static class ColorUtils
+{
+    public static Color GetColorFromString(string input)
+    {
+        var hash = MD5.HashData(Encoding.UTF8.GetBytes(input));
+        
+        var r = byte.Clamp(hash[0], 10, 200);
+        var g = byte.Clamp(hash[1], 10, 100);
+        var b = byte.Clamp(hash[2], 10, 100);
+
+        return Color.FromArgb(Byte.MaxValue, r, g, b);
+    }
+}

Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs

@@ -7,13 +7,16 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;
 using Nebula.Launcher.Services;
+using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Pages;
 
@@ -26,14 +29,18 @@ public partial class ConfigurationViewModel : ViewModelBase
     [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupService { get; } = default!;
     [GenerateProperty] private FileService FileService { get; set; } = default!;
+    [GenerateProperty] private ContentService ContentService { get; set; } = default!;
+    [GenerateProperty] private CancellationService CancellationService { get; set; } = default!;
+    [GenerateProperty] private ViewHelperService ViewHelperService { get; set; } = default!;
 
-    public List<(object, Type)> ConVarList = new();
+
+    private readonly List<(object, Type)> _conVarList = new();
 
     public void AddCvarConf<T>(ConVar<T> cvar)
     {
         ConfigurationVerbose.Add(
-            ConfigControlHelper.GetConfigControl(cvar.Name, ConfigurationService.GetConfigValue(cvar)));
-        ConVarList.Add((cvar, cvar.Type));
+            ConfigControlHelper.GetConfigControl(cvar.Name, ConfigurationService.GetConfigValue(cvar)!));
+        _conVarList.Add((cvar, cvar.Type));
     }
 
     public void InvokeUpdateConfiguration()
@@ -44,7 +51,7 @@ public partial class ConfigurationViewModel : ViewModelBase
             if(!conVarControl.Dirty) 
                 continue;
             
-            var conVar = ConVarList[i];
+            var conVar = _conVarList[i];
             var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
             methodInfo.Invoke(ConfigurationService, [conVar.Item1, conVarControl.GetValue()]);
         }
@@ -52,13 +59,13 @@ public partial class ConfigurationViewModel : ViewModelBase
 
     public void ResetConfig()
     {
-        foreach (var conVar in ConVarList)
+        foreach (var conVar in _conVarList)
         {
             var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
             methodInfo.Invoke(ConfigurationService, [conVar.Item1, null]);
         }
         
-        ConVarList.Clear();
+        _conVarList.Clear();
         ConfigurationVerbose.Clear();
 
         InitConfiguration();
@@ -80,7 +87,18 @@ public partial class ConfigurationViewModel : ViewModelBase
         ZipFile.CreateFromDirectory(logPath, Path.Join(path, DateTime.Now.ToString("yyyy-MM-dd") + ".zip"));
         ExplorerHelper.OpenFolder(path);
     }
-    
+
+    public void RemoveAllContent()
+    {
+        Task.Run(() =>
+        {
+            using var loader = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+            loader.LoadingName = "Removing content";
+            PopupService.Popup(loader);
+            ContentService.RemoveAllContent(loader, CancellationService.Token);
+        });
+    }
+
     private void InitConfiguration()
     {
         AddCvarConf(LauncherConVar.ILSpyUrl);
@@ -176,7 +194,7 @@ public sealed class ComplexUnitConfigControl : Border, IConfigControl
             
             var propValue = propInfo.GetValue(value);
 
-            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue);
+            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue!);
             
             ((Control)control).Margin = new Thickness(5);
             _panel.Children.Add((Control)control);
@@ -192,7 +210,7 @@ public sealed class ComplexUnitConfigControl : Border, IConfigControl
             fieldInfo.SetValue(obj, configControl.GetValue());
         }
 
-        return obj;
+        return obj!;
     }
 }
 

Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs

@@ -18,6 +18,7 @@ using Nebula.Shared.FileApis;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Pages;
 

Nebula.Launcher/ViewModels/Pages/ServerOverviewModel.cs

@@ -14,6 +14,7 @@ using Nebula.Launcher.Views.Pages;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Pages;
 
@@ -28,8 +29,7 @@ public partial class ServerOverviewModel : ViewModelBase
     [ObservableProperty] private ServerListView _currentServerList = new();
     
     public readonly ServerFilter CurrentFilter = new();
-    
-    public Action? OnSearchChange;
+
     [GenerateProperty] private IServiceProvider ServiceProvider { get; }
     [GenerateProperty] private ConfigurationService ConfigurationService { get; }
     [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
@@ -71,13 +71,11 @@ public partial class ServerOverviewModel : ViewModelBase
         Items = new ObservableCollection<ServerListTabTemplate>(tempItems);
         
         SelectedItem = Items[0];
-        
-        OnSearchChange += SearchChangeEvent;
     }
 
-    private void SearchChangeEvent()
+    partial void OnSearchTextChanged(string value)
     {
-        CurrentFilter.SearchText = SearchText;
+        CurrentFilter.SearchText = value;
         ApplyFilter();
     }
 
@@ -318,6 +316,4 @@ public sealed class ServerFilter
     {
         return IsMatchByName(name) && IsMatchByTags(itemTags);
     }
-}
-
-public sealed record ServerCustomNameEntry(string Url, string Name);
+}

Nebula.Launcher/ViewModels/Popup/AddFavoriteViewModel.cs

@@ -7,6 +7,7 @@ using Nebula.Launcher.Views.Pages;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
 using AddFavoriteView = Nebula.Launcher.Views.Popup.AddFavoriteView;
 
 namespace Nebula.Launcher.ViewModels.Popup;
@@ -41,6 +42,9 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
     {
         try
         {
+            if(string.IsNullOrWhiteSpace(IpInput))
+                throw new Exception(LocalisationService.GetString("popup-add-favorite-invalid-ip"));
+            
             var uri = IpInput.ToRobustUrl();
             FavoriteServerListProvider.AddFavorite(uri);
             Dispose();

Nebula.Launcher/ViewModels/Popup/EditServerNameViewModel.cs

@@ -2,6 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 
@@ -24,8 +25,7 @@ public sealed partial class EditServerNameViewModel : PopupViewModelBase
 
         if (string.IsNullOrWhiteSpace(NameInput))
         {
-            RemoveServerName();
-            Dispose();
+            OnClear();
             return;
         }
         
@@ -33,6 +33,12 @@ public sealed partial class EditServerNameViewModel : PopupViewModelBase
         Dispose();
     }
 
+    public void OnClear()
+    {
+        RemoveServerName();
+        Dispose();
+    }
+
     private void AddServerName()
     {
         var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;

Nebula.Launcher/ViewModels/Popup/ExceptionListViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 

Nebula.Launcher/ViewModels/Popup/InfoPopupViewModel.cs

@@ -2,6 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 

Nebula.Launcher/ViewModels/Popup/IsLoginCredentialsNullPopup.cs

@@ -0,0 +1,50 @@
+using Nebula.Launcher.Services;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.Views.Popup;
+using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels.Popup;
+
+[ConstructGenerator, ViewModelRegister(typeof(IsLoginCredentialsNullPopupView))]
+public partial class IsLoginCredentialsNullPopupViewModel : PopupViewModelBase
+{
+    private ServerEntryModelView _entry;
+    
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+
+    public IsLoginCredentialsNullPopupViewModel WithServerEntry(ServerEntryModelView entryModelView)
+    {
+        _entry = entryModelView;
+        return this;
+    }
+
+    public void Proceed()
+    {
+        _entry.RunInstanceIgnoreAuth();
+        Dispose();
+    }
+
+    public void Cancel()
+    {
+        Dispose();
+    }
+
+    public void GotoAuthPage()
+    {
+        ViewHelperService.GetViewModel<MainViewModel>().RequirePage<AccountInfoViewModel>();
+        Dispose();
+    }
+    
+    public override string Title => LocalisationService.GetString("popup-login-credentials-warning");
+    public override bool IsClosable => true;
+}

Nebula.Launcher/ViewModels/Popup/LoadingContextViewModel.cs

@@ -3,6 +3,7 @@ using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 
@@ -14,8 +15,8 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
     [GenerateProperty] public CancellationService CancellationService { get; }
     
     [ObservableProperty] private int _currJobs;
-
     [ObservableProperty] private int _resolvedJobs;
+    [ObservableProperty] private string _message = string.Empty;
 
     public string LoadingName { get; set; } = LocalisationService.GetString("popup-loading");
     public bool IsCancellable { get; set; } = true;
@@ -43,6 +44,11 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
         return ResolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        Message = message + "\n" + Message;
+    }
+
     public void Cancel(){
         if(!IsCancellable) return;
         CancellationService.Cancel();
@@ -55,5 +61,30 @@ public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadi
 
     protected override void InitialiseInDesignMode()
     {
+        SetJobsCount(5);
+        SetResolvedJobsCount(2);
+        string[] debugMessages = {
+            "Debug: Starting phase 1...",
+            "Debug: Loading assets...",
+            "Debug: Connecting to server...",
+            "Debug: Fetching user data...",
+            "Debug: Applying configurations...",
+            "Debug: Starting phase 2...",
+            "Debug: Rendering UI...",
+            "Debug: Preparing scene...",
+            "Debug: Initializing components...",
+            "Debug: Running diagnostics...",
+            "Debug: Checking dependencies...",
+            "Debug: Verifying files...",
+            "Debug: Cleaning up cache...",
+            "Debug: Finalizing setup...",
+            "Debug: Setup complete.",
+            "Debug: Ready for launch."
+        };
+
+        foreach (string message in debugMessages)
+        {
+            SetLoadingMessage(message);
+        }
     }
 }

Nebula.Launcher/ViewModels/Popup/LogPopupModelView.cs

@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
-using System.Text.RegularExpressions;
-using Avalonia.Media;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 
@@ -42,40 +42,4 @@ public sealed partial class LogPopupModelView : PopupViewModelBase
     {
         Logs.Clear();
     }
-}
-
-public sealed class LogInfo
-{
-    public string Category { get; set; } = "LOG";
-    public IBrush CategoryColor { get; set; } = Brush.Parse("#424242");
-    public string Message { get; set; } = "";
-
-    public static LogInfo FromString(string input)
-    {
-        var matches = Regex.Matches(input, @"(\[(?<c>.*)\] (?<m>.*))|(?<m>.*)");
-        var category = "All";
-
-        if (matches[0].Groups.TryGetValue("c", out var c)) category = c.Value;
-
-        var color = Brush.Parse("#444444");
-
-        switch (category)
-        {
-            case "DEBG":
-                color = Brush.Parse("#2436d4");
-                break;
-            case "ERRO":
-                color = Brush.Parse("#d42436");
-                break;
-            case "INFO":
-                color = Brush.Parse("#0ab3c9");
-                break;
-        }
-
-        var message = matches[0].Groups["m"].Value;
-        return new LogInfo
-        {
-            Category = category, Message = message, CategoryColor = color
-        };
-    }
 }

Nebula.Launcher/ViewModels/Popup/TfaViewModel.cs

@@ -2,6 +2,7 @@ using System;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 

Nebula.Launcher/ViewModels/ServerCompoundEntryModelView.cs

@@ -6,11 +6,13 @@ using Avalonia.Media;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.Extensions.DependencyInjection;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.ServerListProviders;
 using Nebula.Launcher.ViewModels.Pages;
 using Nebula.Launcher.Views;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 using BindingFlags = System.Reflection.BindingFlags;
 
 namespace Nebula.Launcher.ViewModels;
@@ -27,6 +29,8 @@ public sealed partial class ServerCompoundEntryViewModel :
     [ObservableProperty] private bool _loading = true;
     
     private string? _name;
+    private RobustUrl? _url;
+    private ServerFilter? _currentFilter;
 
     public string? Name
     {
@@ -58,14 +62,16 @@ public sealed partial class ServerCompoundEntryViewModel :
     {
         Task.Run(async () =>
         {
+            _url = url;
             try
             {
                 Message = "Loading server entry...";
-                var status = await RestService.GetAsync<ServerStatus>(url.StatusUri, cancellationToken);
+                var status = await RestService.GetAsync<ServerStatus>(_url.StatusUri, cancellationToken);
                 
-                CurrentEntry = ServiceProvider.GetService<ServerEntryModelView>()!.WithData(url,name, status);
+                CurrentEntry = ServiceProvider.GetService<ServerEntryModelView>()!.WithData(_url,name, status);
                 CurrentEntry.IsFavorite = IsFavorite;
                 CurrentEntry.Loading = false;
+                CurrentEntry.ProcessFilter(_currentFilter);
                 Loading = false;
             }
             catch (Exception e)
@@ -79,12 +85,20 @@ public sealed partial class ServerCompoundEntryViewModel :
 
     public void ToggleFavorites()
     {
+        if (CurrentEntry is null && _url is not null)
+        {
+            IsFavorite = !IsFavorite;
+            if(IsFavorite) FavoriteServerListProvider.AddFavorite(_url);
+            else FavoriteServerListProvider.RemoveFavorite(_url);
+        }
+     
         CurrentEntry?.ToggleFavorites();
     }
     
     
     public void ProcessFilter(ServerFilter? serverFilter)
     {
+        _currentFilter = serverFilter;
         if(CurrentEntry is IFilterConsumer filterConsumer) 
             filterConsumer.ProcessFilter(serverFilter);
     }

Nebula.Launcher/ViewModels/ServerEntryModelView.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.ProcessHelper;
 using Nebula.Launcher.ServerListProviders;
 using Nebula.Launcher.Services;
@@ -16,6 +17,7 @@ using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels;
 
@@ -45,7 +47,7 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
 
     public LogPopupModelView CurrLog;
     public RobustUrl Address { get; private set; }
-    [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private CancellationService CancellationService { get; } = default!;
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
@@ -161,11 +163,26 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
     public void RunInstance()
     { 
         CurrLog.Clear();
-        Task.Run(RunInstanceAsync);
+        Task.Run(async ()=> await RunInstanceAsync());
     }
 
-    private async void RunInstanceAsync()
+    public void RunInstanceIgnoreAuth()
     {
+        CurrLog.Clear();
+        Task.Run(async ()=> await RunInstanceAsync(true));
+    }
+
+    private async Task RunInstanceAsync(bool ignoreLoginCredentials = false)
+    {
+        if (!ignoreLoginCredentials && AccountInfoViewModel.Credentials is null)
+        {
+            var warningContext = ViewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
+                .WithServerEntry(this);
+            
+            PopupMessageService.Popup(warningContext);
+            return;
+        }
+        
         using var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>();
         loadingContext.LoadingName = "Loading instance...";
         ((ILoadingHandler)loadingContext).AppendJob();
@@ -217,35 +234,6 @@ public partial class ServerEntryModelView : ViewModelBase, IFilterConsumer, ILis
     }
 }
 
-public sealed class ContentLogConsumer : IProcessLogConsumer
-{
-    private readonly LogPopupModelView _currLog;
-    private readonly PopupMessageService _popupMessageService;
-
-    public ContentLogConsumer(LogPopupModelView currLog, PopupMessageService popupMessageService)
-    {
-        _currLog = currLog;
-        _popupMessageService = popupMessageService;
-    }
-
-    public void Out(string text)
-    {
-        _currLog.Append(text);
-    }
-
-    public void Error(string text)
-    {
-        _currLog.Append(text);
-    }
-
-    public void Fatal(string text)
-    {
-        _popupMessageService.Popup("Fatal error while stop instance:" + text);
-    }
-}
-
-
-
 public class LinkGoCommand : ICommand
 {
     public LinkGoCommand()
@@ -265,9 +253,4 @@ public class LinkGoCommand : ICommand
     }
 
     public event EventHandler? CanExecuteChanged;
-}
-
-public interface IFilterConsumer
-{
-    public void ProcessFilter(ServerFilter? serverFilter);
 }

Nebula.Launcher/ViewModels/VisualErrorViewModel.cs

@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels;
+
+
+[ViewModelRegister(typeof(VisualErrorView))]
+public partial class VisualErrorViewModel : ViewModelBase
+{
+    [ObservableProperty] private string _imgPath = "cinka";
+    [ObservableProperty] private string _title = "Error";
+    [ObservableProperty] private string _description = "This is an error.";
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+}

Nebula.Launcher/Views/FileContentEntryView.axaml.cs

@@ -1,22 +1,11 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Nebula.Launcher.ViewModels.Pages;
 
 namespace Nebula.Launcher.Views;
 
 public partial class FileContentEntryView : UserControl
 {
-    // This constructor is used when the view is created by the XAML Previewer
     public FileContentEntryView()
     {
         InitializeComponent();
     }
-
-    // This constructor is used when the view is created via dependency injection
-    public FileContentEntryView(FolderContentEntry viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/MainView.axaml

@@ -8,10 +8,10 @@
     xmlns:converters="clr-namespace:Nebula.Launcher.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:Nebula.Shared.Models;assembly=Nebula.Shared"
     xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:models1="clr-namespace:Nebula.Launcher.Models">
+    xmlns:models1="clr-namespace:Nebula.Launcher.Models"
+    xmlns:services="clr-namespace:Nebula.Launcher.Services">
     <Design.DataContext>
         <viewModels:MainViewModel />
     </Design.DataContext>
@@ -121,7 +121,40 @@
                                 https://durenko.tatar/nebula/
                             </TextBlock>
                         </Button>
-                        <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center" Text="{Binding VersionInfo}"/>
+                        <StackPanel Spacing="5" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                            <Button 
+                                Margin="0" 
+                                Padding="0" 
+                                CornerRadius="0"
+                                Command="{Binding OpenAuthPage}">
+                                <StackPanel Spacing="5" Orientation="Horizontal">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/user.svg"
+                                        Width="10" />
+                                    <Panel>
+                                        <TextBlock Foreground="#777777" IsVisible="{Binding IsLoggedIn}" Text="{Binding LoginText}"/>
+                                        <TextBlock Foreground="#777777" IsVisible="{Binding !IsLoggedIn}" Text="{services:LocaledText auth-current-login-no-name}"/>
+                                    </Panel>
+                                </StackPanel>
+                            </Button>
+                            <TextBlock>|</TextBlock>
+                            <Button 
+                                Margin="0" 
+                                Padding="0" 
+                                CornerRadius="0"
+                                Command="{Binding OpenRootPath}">
+                                <StackPanel Orientation="Horizontal" Spacing="5">
+                                    <Svg
+                                        Height="40"
+                                        Path="/Assets/svg/folder.svg"
+                                        Width="10" />
+                                    <TextBlock Foreground="#777777" Text="{services:LocaledText goto-path-home}"/>
+                                </StackPanel>
+                            </Button>
+                            <TextBlock>|</TextBlock>
+                            <TextBlock Text="{Binding VersionInfo}"/>
+                        </StackPanel>
                     </Panel>
                 </Label>
             </Border>

Nebula.Launcher/Views/MainView.axaml.cs

@@ -1,20 +1,11 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels;
 
 namespace Nebula.Launcher.Views;
 
 public partial class MainView : UserControl
 {
-    // This constructor is used when the view is created by the XAML Previewer
     public MainView()
     {
         InitializeComponent();
     }
-
-    // This constructor is used when the view is created via dependency injection
-    public MainView(MainViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Pages/AccountInfoView.axaml

@@ -1,6 +1,6 @@
 <UserControl
     d:DesignHeight="450"
-    d:DesignWidth="800"
+    d:DesignWidth="1000"
     mc:Ignorable="d"
     x:Class="Nebula.Launcher.Views.Pages.AccountInfoView"
     x:DataType="pages:AccountInfoViewModel"
@@ -9,7 +9,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:auth="clr-namespace:Nebula.Launcher.Models.Auth">
     <Design.DataContext>
         <pages:AccountInfoViewModel />
     </Design.DataContext>
@@ -37,40 +38,57 @@
                     ItemsSource="{Binding Accounts}"
                     Padding="0">
                     <ItemsControl.ItemTemplate>
-                        <DataTemplate DataType="{x:Type pages:ProfileAuthCredentials}">
-                            <Border
-                                BoxShadow="0 1 15 -2 #121212"
-                                CornerRadius="0,10,0,10"
-                                Margin="5,5,5,0"
-                                VerticalAlignment="Center">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="50%,100%" StartPoint="50%,0%">
-                                        <GradientStop Color="#292222" Offset="0.0" />
-                                        <GradientStop Color="#222222" Offset="1.0" />
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Panel>
-                                    <StackPanel Margin="10,5,5,5" Orientation="Horizontal">
+                        <DataTemplate DataType="{x:Type auth:ProfileAuthCredentials}">
+                            <Grid ColumnDefinitions="4*,*">
+                                <Border 
+                                    BoxShadow="0 1 15 -2 #121212"
+                                    CornerRadius="0,10,0,10"
+                                    Margin="5,5,5,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
+                                            <GradientStop Color="{Binding Color}" Offset="0.0" />
+                                            <GradientStop Color="#222222" Offset="1.0" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <Label>
+                                        <TextBlock Text="{Binding AuthName}" Margin="5"/>
+                                    </Label>
+                                </Border>
+                                <Border Grid.Column="0"
+                                    CornerRadius="0,10,0,10"
+                                    Margin="5,5,5,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
+                                            <GradientStop Color="#aa222222" Offset="0.0" />
+                                            <GradientStop Color="#222222" Offset="0.4" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <Button 
+                                        HorizontalAlignment="Stretch" 
+                                        Command="{Binding OnSelect}">
                                         <Label>
-                                            <TextBlock Text="{Binding Login}" />
+                                            <TextBlock Text="{Binding Credentials.Login}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,5,0"/>
                                         </Label>
-                                    </StackPanel>
-                                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                        <Button
-                                            Command="{Binding OnSelect}"
-                                            CornerRadius="0,0,0,10"
-                                            Padding="5">
-                                            <customControls:LocalizedLabel LocalId="account-profile-select"/>
-                                        </Button>
-                                        <Button
-                                            Command="{Binding OnDelete}"
-                                            CornerRadius="0,10,0,0"
-                                            Padding="5">
-                                            <customControls:LocalizedLabel LocalId="account-profile-delete"/>
-                                        </Button>
-                                    </StackPanel>
-                                </Panel>
-                            </Border>
+                                    </Button>
+                                </Border>
+                                <Border 
+                                    BoxShadow="0 1 15 -2 #121212"
+                                    CornerRadius="0,10,0,10"
+                                    Margin="0,5,5,0" Grid.Column="1" Padding="0">
+                                    <Border.Background>
+                                        <LinearGradientBrush EndPoint="100%,50%" StartPoint="20%,50%">
+                                            <GradientStop Color="#292222" Offset="1.0" />
+                                            <GradientStop Color="#222222" Offset="1.0" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <Button Command="{Binding OnDelete}" CornerRadius="0,10,0,10" HorizontalAlignment="Stretch">
+                                        <Svg
+                                            Height="15"
+                                            Path="/Assets/svg/delete.svg"
+                                            Width="15" />
+                                    </Button>
+                                </Border>
+                            </Grid>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
@@ -155,14 +173,6 @@
                                 <customControls:LocalizedLabel LocalId="account-auth-button"/>
                             </Button>
                         </Border>
-                        <Border BoxShadow="{StaticResource DefaultShadow}">
-                            <Button 
-                                Command="{Binding SaveProfileCommand}" 
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center">
-                                <customControls:LocalizedLabel LocalId="account-auth-save"/>
-                            </Button>
-                        </Border>
                         <Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
                             <Label>
                                 >
@@ -176,9 +186,15 @@
                             Margin="0,0,0,20"
                             Path="/Assets/svg/user.svg" />
                         <Label>
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                <customControls:LocalizedLabel LocalId="account-auth-hello"/>
-                                <TextBlock Text="{Binding CurrentLogin}" />
+                            <StackPanel>
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+                                    <customControls:LocalizedLabel LocalId="account-auth-hello"/>
+                                    <TextBlock Text="{Binding CurrentLogin}" />
+                                </StackPanel>
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+                                    <customControls:LocalizedLabel LocalId="account-auth-current-server"/>
+                                    <TextBlock Text="{Binding CurrentAuthServerName}" />
+                                </StackPanel>
                             </StackPanel>
                         </Label>
                         <StackPanel

Nebula.Launcher/Views/Pages/AccountInfoView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using AccountInfoViewModel = Nebula.Launcher.ViewModels.Pages.AccountInfoViewModel;
 
 namespace Nebula.Launcher.Views.Pages;
 
@@ -9,10 +8,4 @@ public partial class AccountInfoView : UserControl
     {
         InitializeComponent();
     }
-
-    public AccountInfoView(AccountInfoViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Pages/ConfigurationView.axaml

@@ -22,7 +22,8 @@
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
             </ItemsControl>
-            <StackPanel Orientation="Horizontal" Spacing="5">
+            
+            <WrapPanel Orientation="Horizontal">
                 <Button 
                     Classes="ConfigBorder"
                     VerticalAlignment="Bottom" 
@@ -60,7 +61,17 @@
                     Command="{Binding ExportLogs}">
                     <customControls:LocalizedLabel LocalId="config-export-logs"/>
                 </Button>
-            </StackPanel>
+                
+                <Button 
+                    Classes="ConfigBorder"
+                    VerticalAlignment="Bottom" 
+                    HorizontalAlignment="Stretch" 
+                    Padding="5"
+                    Margin="5"
+                    Command="{Binding RemoveAllContent}">
+                    <customControls:LocalizedLabel LocalId="config-remove-content-all"/>
+                </Button>
+            </WrapPanel>
         </StackPanel>
     </ScrollViewer>
 </UserControl>

Nebula.Launcher/Views/Pages/ConfigurationView.axaml.cs

@@ -1,7 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Nebula.Launcher.ViewModels.Pages;
 
 namespace Nebula.Launcher.Views.Pages;
 
@@ -11,10 +8,4 @@ public partial class ConfigurationView : UserControl
     {
         InitializeComponent();
     }
-
-    public ConfigurationView(ConfigurationViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Pages/ContentBrowserView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using ContentBrowserViewModel = Nebula.Launcher.ViewModels.Pages.ContentBrowserViewModel;
 
 namespace Nebula.Launcher.Views.Pages;
 
@@ -9,10 +8,4 @@ public partial class ContentBrowserView : UserControl
     {
         InitializeComponent();
     }
-
-    public ContentBrowserView(ContentBrowserViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Pages/ServerOverviewView.axaml

@@ -71,7 +71,6 @@
             <TextBox
                 Margin="25,0,0,0"
                 Text="{Binding SearchText}"
-                TextChanged="TextBox_OnTextChanged"
                 VerticalAlignment="Center"
                 Watermark="{services:LocaledText 'server-search'}" />
             <Button

Nebula.Launcher/Views/Pages/ServerOverviewView.axaml.cs

@@ -1,11 +1,9 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels.Pages;
 
 namespace Nebula.Launcher.Views.Pages;
 
 public partial class ServerOverviewView : UserControl
 {
-    // This constructor is used when the view is created by the XAML Previewer
     public ServerOverviewView()
     {
         InitializeComponent();
@@ -19,17 +17,4 @@ public partial class ServerOverviewView : UserControl
         LanguageFilters.AddFilter("RU","lang:ru");
         LanguageFilters.AddFilter("EN","lang:en");
     }
-
-    // This constructor is used when the view is created via dependency injection
-    public ServerOverviewView(ServerOverviewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
-
-    private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
-    {
-        var context = (ServerOverviewModel?)DataContext;
-        context?.OnSearchChange?.Invoke();
-    }
 }

Nebula.Launcher/Views/Popup/AddFavoriteView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels.Popup;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -9,10 +8,4 @@ public partial class AddFavoriteView : UserControl
     {
         InitializeComponent();
     }
-
-    public AddFavoriteView(AddFavoriteViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Popup/EditServerNameView.axaml

@@ -23,5 +23,10 @@
                 <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-set"/> 
             </Button>
         </Border>
+        <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+            <Button Command="{Binding OnClear}" HorizontalAlignment="Stretch">
+                <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-clear"/> 
+            </Button>
+        </Border>
     </StackPanel>
 </UserControl>

Nebula.Launcher/Views/Popup/EditServerNameView.axaml.cs

@@ -1,7 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Nebula.Launcher.ViewModels.Popup;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -11,10 +8,4 @@ public partial class EditServerNameView : UserControl
     {
         InitializeComponent();
     }
-
-    public EditServerNameView(EditServerNameViewModel viewModel)
-        : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Popup/ExceptionListView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels.Popup;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -9,9 +8,4 @@ public partial class ExceptionListView : UserControl
     {
         InitializeComponent();
     }
-
-    public ExceptionListView(ExceptionListViewModel listViewModel) : this()
-    {
-        DataContext = listViewModel;
-    }
 }

Nebula.Launcher/Views/Popup/InfoPopupView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using InfoPopupViewModel = Nebula.Launcher.ViewModels.Popup.InfoPopupViewModel;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -9,9 +8,4 @@ public partial class InfoPopupView : UserControl
     {
         InitializeComponent();
     }
-
-    public InfoPopupView(InfoPopupViewModel viewModel) : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml

@@ -0,0 +1,35 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
+             xmlns:controls="clr-namespace:Nebula.Launcher.Controls"
+             xmlns:services="clr-namespace:Nebula.Launcher.Services"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Nebula.Launcher.Views.Popup.IsLoginCredentialsNullPopupView"
+             x:DataType="popup:IsLoginCredentialsNullPopupViewModel">
+    <Design.DataContext>
+        <popup:IsLoginCredentialsNullPopupViewModel />
+    </Design.DataContext>
+    
+    <StackPanel Margin="15" Orientation="Vertical" Spacing="15">
+        <TextBlock HorizontalAlignment="Center" Text="{services:LocaledText popup-login-credentials-warning-label}" TextWrapping="Wrap"/>
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding GotoAuthPage}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-go-auth}"/>
+                </Button>
+            </Border>
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding Cancel}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-cancel}"/>
+                </Button>
+            </Border>
+            <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                <Button Command="{Binding Proceed}">
+                    <TextBlock Text="{services:LocaledText popup-login-credentials-warning-proceed}"/>
+                </Button>
+            </Border>
+        </StackPanel>
+    </StackPanel>
+</UserControl>

Nebula.Launcher/Views/Popup/IsLoginCredentialsNullPopupView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views.Popup;
+
+public partial class IsLoginCredentialsNullPopupView : UserControl
+{
+    public IsLoginCredentialsNullPopupView()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Launcher/Views/Popup/LoadingContextView.axaml

@@ -33,5 +33,10 @@
                 <customControls:LocalizedLabel LocalId="task-cancel"/> 
             </Button>
         </Panel>
+        <Panel>
+            <Border Background="{StaticResource DefaultForeground}" MinHeight="210">
+                <TextBlock TextWrapping="Wrap" Text="{Binding Message}" MaxLines="10" Margin="15"/>
+            </Border>
+        </Panel>
     </StackPanel>
 </UserControl>

Nebula.Launcher/Views/Popup/LoadingContextView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using LoadingContextViewModel = Nebula.Launcher.ViewModels.Popup.LoadingContextViewModel;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -9,9 +8,4 @@ public partial class LoadingContextView : UserControl
     {
         InitializeComponent();
     }
-
-    public LoadingContextView(LoadingContextViewModel viewModel) : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Popup/LogPopupView.axaml

@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
              xmlns:popup="clr-namespace:Nebula.Launcher.ViewModels.Popup"
+             xmlns:models="clr-namespace:Nebula.Launcher.Models"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Nebula.Launcher.Views.Popup.LogPopupView"
              x:DataType="popup:LogPopupModelView">
@@ -17,7 +18,7 @@
             ItemsSource="{Binding Logs}"
             Padding="0">
             <ItemsControl.ItemTemplate>
-                <DataTemplate DataType="{x:Type popup:LogInfo}">
+                <DataTemplate DataType="{x:Type models:LogInfo}">
                     <Border CornerRadius="5" Margin="0,0,0,5">
                         <StackPanel Orientation="Horizontal" Spacing="5" Margin="0">
                             <Border MinWidth="100"

Nebula.Launcher/Views/Popup/LogPopupView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels.Popup;
 
 namespace Nebula.Launcher.Views.Popup;
 
@@ -9,9 +8,4 @@ public partial class LogPopupView : UserControl
     {
         InitializeComponent();
     }
-
-    public LogPopupView(LogPopupModelView viewModel) : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/Popup/TfaView.axaml.cs

@@ -1,11 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Nebula.Launcher.ViewModels.Popup;
 
 namespace Nebula.Launcher.Views.Popup;
@@ -88,11 +85,6 @@ public partial class TfaView : UserControl
         return (TextBox)box.Child!;
     }
 
-    public TfaView(TfaViewModel tfaViewModel) : this()
-    {
-        DataContext = tfaViewModel;
-    }
-
     private void Button_OnClick(object? sender, RoutedEventArgs e)
     {
         CheckupCode();

Nebula.Launcher/Views/ServerCompoundEntryView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Nebula.Launcher.ViewModels;
 
 namespace Nebula.Launcher.Views;
 
@@ -9,9 +8,4 @@ public partial class ServerCompoundEntryView : UserControl
     {
         InitializeComponent();
     }
-
-    public ServerCompoundEntryView(ServerCompoundEntryViewModel viewModel) : this()
-    {
-        DataContext = viewModel;
-    }
 }

Nebula.Launcher/Views/ServerEntryView.axaml.cs

@@ -22,10 +22,7 @@ public partial class ServerEntryView : UserControl
         StartAutoScrolling();
     }
     
-    public ServerEntryView(ServerEntryModelView modelView) : this()
-    {
-        DataContext = modelView;
-    }
+
     
     private void StartAutoScrolling()
     {

Nebula.Launcher/Views/VisualErrorView.axaml

@@ -0,0 +1,39 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
+             xmlns:converters="clr-namespace:Nebula.Launcher.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="viewModels:VisualErrorViewModel"
+             x:Class="Nebula.Launcher.Views.VisualErrorView">
+    <Design.DataContext>
+        <viewModels:VisualErrorViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="30,*" ColumnDefinitions="200,*">
+        <Border Grid.Row="1" Grid.Column="0" 
+                CornerRadius="10,0,0,10" 
+                BorderThickness="0,0,2,0" 
+                BorderBrush="{StaticResource DefaultForeground}">
+            <Image Source="{Binding ImgPath, Converter={x:Static converters:TypeConverters.ImageConverter}}" Width="200" Height="200"/>
+        </Border>
+        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" CornerRadius="10,10,0,0">
+            <Border.Background>
+                <LinearGradientBrush EndPoint="100%,50%" StartPoint="10%,20%">
+                    <GradientStop Color="#FF6B6B" Offset="0.0" />
+                    <GradientStop Color="#FF8E53" Offset="0.3" />
+                    <GradientStop Color="#FF5E3A" Offset="0.6" />
+                    <GradientStop Color="#FF5e5e" Offset="1.0" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Label HorizontalAlignment="Center"><TextBlock Text="{Binding Title}"/></Label>
+        </Border>
+        <TextBlock 
+            Grid.Row="1" 
+            Grid.Column="1" 
+            Margin="15" 
+            HorizontalAlignment="Center" 
+            TextWrapping="Wrap"
+            Text="{Binding Description}"/>
+    </Grid>
+</UserControl>

Nebula.Launcher/Views/VisualErrorView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Nebula.Launcher.Views;
+
+public partial class VisualErrorView : UserControl
+{
+    public VisualErrorView()
+    {
+        InitializeComponent();
+    }
+}

Nebula.Runner/App.cs

@@ -1,3 +1,4 @@
+using Nebula.Runner.Services;
 using Nebula.Shared;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
@@ -27,21 +28,14 @@ public sealed class App(RunnerService runnerService, ContentService contentServi
 
         var args = new List<string>
         {
-            // Pass username to launched client.
-            // We don't load username from client_config.toml when launched via launcher.
             "--username", login,
-
-            // Tell game we are launcher
             "--cvar", "launch.launcher=true"
         };
 
         var connectionString = url.ToString();
         if (!string.IsNullOrEmpty(buildInfo.BuildInfo.ConnectAddress))
             connectionString = buildInfo.BuildInfo.ConnectAddress;
-
-        // We are using the launcher. Don't show main menu etc..
-        // Note: --launcher also implied --connect.
-        // For this reason, content bundles do not set --launcher.
+        
         args.Add("--launcher");
 
         args.Add("--connect-address");
@@ -53,65 +47,3 @@ public sealed class App(RunnerService runnerService, ContentService contentServi
         await runnerService.Run(args.ToArray(), buildInfo, this, new ConsoleLoadingHandler(), cancelTokenSource.Token);
     }
 }
-
-public sealed class ConsoleLoadingHandler : ILoadingHandler
-{
-    private int _currJobs;
-
-    private float _percent;
-    private int _resolvedJobs;
-
-    public void SetJobsCount(int count)
-    {
-        _currJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetJobsCount()
-    {
-        return _currJobs;
-    }
-
-    public void SetResolvedJobsCount(int count)
-    {
-        _resolvedJobs = count;
-
-        UpdatePercent();
-        Draw();
-    }
-
-    public int GetResolvedJobsCount()
-    {
-        return _resolvedJobs;
-    }
-
-    private void UpdatePercent()
-    {
-        if (_currJobs == 0)
-        {
-            _percent = 0;
-            return;
-        }
-
-        if (_resolvedJobs > _currJobs) return;
-
-        _percent = _resolvedJobs / (float)_currJobs;
-    }
-
-    private void Draw()
-    {
-        var barCount = 10;
-        var fullCount = (int)(barCount * _percent);
-        var emptyCount = barCount - fullCount;
-
-        Console.Write("\r");
-
-        for (var i = 0; i < fullCount; i++) Console.Write("#");
-
-        for (var i = 0; i < emptyCount; i++) Console.Write(" ");
-
-        Console.Write($"\t {_resolvedJobs}/{_currJobs}");
-    }
-}

Nebula.Runner/Nebula.Runner.csproj

@@ -12,6 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Lib.Harmony" Version="2.3.6" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
         <PackageReference Include="SharpZstd.Interop" Version="1.5.6"/>
     </ItemGroup>

Nebula.Runner/Program.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Nebula.Shared;
-using Nebula.Shared.Services;
 
 namespace Nebula.Runner;
 

Nebula.Runner/Services/HarmonyService.cs

@@ -0,0 +1,54 @@
+using System.Data;
+using HarmonyLib;
+using Nebula.Shared;
+
+namespace Nebula.Runner.Services;
+
+[ServiceRegister]
+public class HarmonyService(ReflectionService reflectionService)
+{
+    private HarmonyInstance? _instance;
+
+    public HarmonyInstance Instance
+    {
+        get
+        {
+            if (_instance is null) 
+                CreateInstance();
+            return _instance!;
+        }
+    }
+
+    public void CreateInstance()
+    {
+        if (_instance is not null) 
+            throw new Exception();
+        
+        _instance = new HarmonyInstance();
+        UnShittyWizard();
+    }
+
+    /// <summary>
+    /// Я помню пенис большой,Я помню пенис большой, Я помню пенис большой, я помню....
+    /// </summary>
+    private void UnShittyWizard()
+    {
+        var method = reflectionService.GetType("Robust.Client.GameController").TypeInitializer;
+        _instance!.Harmony.Patch(method, new HarmonyMethod(Prefix));
+    }
+    
+    static bool Prefix()
+    {
+        return false;
+    }
+}
+
+public class HarmonyInstance
+{
+    public readonly Harmony Harmony;
+
+    internal HarmonyInstance()
+    {
+        Harmony = new Harmony("ru.cinka.patch");
+    }
+}

Nebula.Runner/Services/ReflectionService.cs

@@ -0,0 +1,59 @@
+using System.Reflection;
+using Nebula.Shared;
+using Nebula.Shared.FileApis;
+using Nebula.Shared.Services;
+
+namespace Nebula.Runner.Services;
+
+[ServiceRegister]
+public class ReflectionService(AssemblyService assemblyService)
+{
+    private Dictionary<string, Assembly> _typeCache = new();
+
+    public void RegisterAssembly(Assembly robustAssembly)
+    {
+        _typeCache.Add(robustAssembly.GetName().Name!, robustAssembly);
+    }
+
+    public void RegisterRobustAssemblies(AssemblyApi engine)
+    {
+        RegisterAssembly(GetRobustAssembly("Robust.Shared", engine));
+        RegisterAssembly(GetRobustAssembly("Robust.Client", engine));
+    }
+
+    private Assembly GetRobustAssembly(string assemblyName, AssemblyApi engine)
+    {
+        if(!assemblyService.TryOpenAssembly(assemblyName, engine, out var assembly))
+            throw new Exception($"Unable to locate {assemblyName}.dll in engine build!");
+        return assembly;
+    }
+
+    public Type? GetTypeImp(string name)
+    {
+        foreach (var (prefix,assembly) in _typeCache)
+        {
+            string appendedName = prefix + name;
+            var theType = assembly.GetType(appendedName);
+            if (theType != null)
+            {
+                return theType;
+            }
+        }
+
+        return null;
+    }
+
+    public Type GetType(string name)
+    {
+        var prefix = ExtrackPrefix(name);
+        return !_typeCache.TryGetValue(prefix, out var assembly)
+            ? GetTypeImp(name)!
+            : assembly.GetType(name)!;
+    }
+
+    private string ExtrackPrefix(string path)
+    {
+        var sp = path.Split(".");
+        return sp[0] + "." + sp[1];
+    }
+}

Nebula.Runner/Services/RunnerService.cs

@@ -1,8 +1,14 @@
-using Nebula.Shared.Models;
+using System.Globalization;
+using System.Reflection;
+using System.Reflection.Emit;
+using HarmonyLib;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
 using Robust.LoaderApi;
 
-namespace Nebula.Shared.Services;
+namespace Nebula.Runner.Services;
 
 [ServiceRegister]
 public sealed class RunnerService(
@@ -10,9 +16,12 @@ public sealed class RunnerService(
     DebugService debugService,
     ConfigurationService varService,
     EngineService engineService,
-    AssemblyService assemblyService)
+    AssemblyService assemblyService, 
+    ReflectionService reflectionService, 
+    HarmonyService harmonyService)
 {
     private ILogger _logger = debugService.GetLogger("RunnerService");
+    private bool MetricEnabled = false; //TODO: ADD METRIC THINKS LATER
 
     public async Task Run(string[] runArgs, RobustBuildInfo buildInfo, IRedialApi redialApi,
         ILoadingHandler loadingHandler,
@@ -52,11 +61,81 @@ public sealed class RunnerService(
         if (!assemblyService.TryOpenAssembly(varService.GetConfigValue(CurrentConVar.RobustAssemblyName)!, engine,
                 out var clientAssembly))
             throw new Exception("Unable to locate Robust.Client.dll in engine build!");
-
+        
         if (!assemblyService.TryGetLoader(clientAssembly, out var loader))
             return;
+        
+        if(!assemblyService.TryOpenAssembly("Prometheus.NetStandard", engine, out var prometheusAssembly))
+            return;
+        
+        reflectionService.RegisterRobustAssemblies(engine);
+        harmonyService.CreateInstance();
+        
+        IDisposable? metricServer = null;
 
+        if (MetricEnabled)
+        {
+            MetricsEnabledPatcher.ApplyPatch(reflectionService, harmonyService);
+            metricServer = RunHelper.RunMetric(prometheusAssembly);
+        }
+       
+        
         await Task.Run(() => loader.Main(args), cancellationToken);
+        
+        metricServer?.Dispose();
+    }
+}
+
+public static class MetricsEnabledPatcher
+{
+    public static void ApplyPatch(ReflectionService reflectionService, HarmonyService harmonyService)
+    {
+        var harmony = harmonyService.Instance.Harmony;
+        
+        var targetType = reflectionService.GetType("Robust.Shared.GameObjects.EntitySystemManager");
+        var targetMethod = targetType.GetProperty("MetricsEnabled").GetGetMethod();
+        
+        var prefix = typeof(MetricsEnabledPatcher).GetMethod(nameof(MetricsEnabledGetterPrefix),
+            BindingFlags.Static | BindingFlags.NonPublic);
+        
+        var prefixMethod = new HarmonyMethod(prefix);
+        
+        harmony.Patch(targetMethod, prefix: prefixMethod);
+    }
+    
+    private static bool MetricsEnabledGetterPrefix(ref bool __result)
+    {
+        __result = true;
+        return false; // Skip original method
+    }
+}
+
+public static class RunHelper
+{
+    public static IDisposable RunMetric(Assembly prometheusAssembly)
+    {
+        var metricServerType = prometheusAssembly.GetType("Prometheus.MetricServer");
+        var collectorRegistryType = prometheusAssembly.GetType("Prometheus.CollectorRegistry");
+        
+        var ctor = metricServerType!.GetConstructor(new Type[]
+        {
+            typeof(string),
+            typeof(int),
+            typeof(string),
+            collectorRegistryType!,
+            typeof(bool)
+        });
+        
+        var hostname = "localhost";
+        var port = 51235;
+        var url = "metrics/";
+        object? registry = null; 
+        var useHttps = false;
+        
+        var metricServerInstance = ctor!.Invoke(new object[] { hostname, port, url, registry!, useHttps });
+        metricServerType.GetMethod("Start")!.Invoke(metricServerInstance, BindingFlags.Default, null, null, CultureInfo.CurrentCulture);
+
+        return (IDisposable)metricServerInstance;
     }
 }
 

Nebula.Shared/ConfigMigrations/ProfileMigration.cs

@@ -0,0 +1,39 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Shared.ConfigMigrations;
+
+public class ProfileMigrationV2(string oldName, string newName)
+    : BaseConfigurationMigration<ProfileAuthCredentialsV2[], AuthTokenCredentials[]>(oldName, newName)
+{
+    protected override async Task<AuthTokenCredentials[]> Migrate(IServiceProvider serviceProvider, ProfileAuthCredentialsV2[] oldValue, ILoadingHandler loadingHandler)
+    {
+        loadingHandler.SetLoadingMessage("Migrating Profile V2 -> V3");
+        var list = new List<AuthTokenCredentials>();
+        var authService = serviceProvider.GetRequiredService<AuthService>();
+        var logger = serviceProvider.GetRequiredService<DebugService>().GetLogger("ProfileMigrationV2");
+        foreach (var oldCredentials in oldValue)
+        {
+            try
+            {
+                loadingHandler.SetLoadingMessage($"Migrating {oldCredentials.Login}");
+                var newCred = await authService.Auth(oldCredentials.Login, oldCredentials.Password, oldCredentials.AuthServer);
+                list.Add(newCred);
+            }
+            catch (Exception e)
+            {
+                logger.Error(e);
+                loadingHandler.SetLoadingMessage(e.Message);
+            }
+        }
+
+        loadingHandler.SetLoadingMessage("Migration done!");
+        return list.ToArray();
+    }
+}
+
+public sealed record ProfileAuthCredentialsV2(
+    string Login,
+    string Password,
+    string AuthServer);

Nebula.Shared/CurrentConVar.cs

@@ -28,6 +28,8 @@ public static class CurrentConVar
         ConVarBuilder.Build<Dictionary<string, EngineVersionInfo>>("engine.manifest.backup");
     public static readonly ConVar<ModulesInfo> ModuleManifestBackup =
         ConVarBuilder.Build<ModulesInfo>("module.manifest.backup");
+    public static readonly ConVar<Dictionary<string, string>> ServerManifestHash = 
+        ConVarBuilder.Build<Dictionary<string, string>>("server.manifest.hash",[]);
     
     public static readonly ConVar<Dictionary<string,string>> DotnetUrl = ConVarBuilder.Build<Dictionary<string,string>>("dotnet.url",
         new(){

Nebula.Shared/FileApis/FtpFileApi.cs

@@ -1,74 +0,0 @@
-using System.Net;
-using FluentFTP;
-using Nebula.Shared.FileApis.Interfaces;
-
-namespace Nebula.Shared.FileApis;
-
-public class FtpFileApi : IWriteFileApi, IDisposable
-{
-    private readonly string _ftpHost;
-    private readonly string _username;
-    private readonly string _password;
-
-    private readonly FtpClient Client;
-
-    public FtpFileApi(string ftpHost, string username, string password)
-    {
-        _ftpHost = ftpHost;
-        _username = username;
-        _password = password;
-        Client = CreateClient();
-        Client.AutoConnect();
-    }
-
-    public bool Save(string path, Stream input)
-    {
-        try
-        {
-            var result = Client.UploadStream(input, path, FtpRemoteExists.Overwrite, true);
-            return result == FtpStatus.Success;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    public bool Remove(string path)
-    {
-        try
-        {
-            Client.DeleteFile(path);
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    public bool Has(string path)
-    {
-        try
-        {
-            return Client.FileExists(path);
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    private FtpClient CreateClient()
-    {
-        var client = new FtpClient(_ftpHost, _username, _password);
-        client.Config.EncryptionMode = FtpEncryptionMode.None;
-        client.Config.ValidateAnyCertificate = true; 
-        return client;
-    }
-
-    public void Dispose()
-    {
-        Client.Dispose();
-    }
-}

Nebula.Shared/FileApis/HashApi.cs

@@ -55,6 +55,11 @@ public class HashApi : IFileApi
         return _fileApi.Has(GetManifestPath(item));
     }
 
+    public bool Remove(RobustManifestItem item)
+    {
+        return _fileApi.Remove(GetManifestPath(item));
+    }
+
     private string GetManifestPath(RobustManifestItem item){
         return GetManifestPath(item.Hash);
     }

Nebula.Shared/Models/Auth/LoginToken.cs

@@ -1,3 +1,6 @@
 namespace Nebula.Shared.Models.Auth;
 
-public sealed record LoginToken(string Token, DateTimeOffset ExpireTime);
+public sealed record LoginToken(string Token, DateTimeOffset ExpireTime)
+{
+    public static LoginToken Empty = new(string.Empty, DateTimeOffset.Now);
+}

Nebula.Shared/Models/ILoadingHandler.cs

@@ -7,6 +7,7 @@ public interface ILoadingHandler
 
     public void SetResolvedJobsCount(int count);
     public int GetResolvedJobsCount();
+    public void SetLoadingMessage(string message);
 
     public void AppendJob(int count = 1)
     {

Nebula.Shared/Models/RobustServerEntry.cs

@@ -36,7 +36,7 @@ public sealed record ServerInfo(
     [property: JsonPropertyName("auth")] AuthInfo Auth,
     [property: JsonPropertyName("build")] BuildInfo Build,
     [property: JsonPropertyName("desc")] string Desc,
-    [property: JsonPropertyName("links")] List<ServerLink> Links);
+    [property: JsonPropertyName("links")] List<ServerLink>? Links);
 
 public sealed record EngineVersionInfo(
     [property: JsonPropertyName("insecure")]

Nebula.Shared/Nebula.Shared.csproj

@@ -11,7 +11,6 @@
         <EmbeddedResource Include="Utils\runtime.json">
             <LogicalName>Utility.runtime.json</LogicalName>
         </EmbeddedResource>
-        <PackageReference Include="FluentFTP" Version="52.1.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
         <PackageReference Include="Robust.Natives" Version="0.1.1" />
         <PackageReference Include="SharpZstd.Interop" Version="1.5.6" />

Nebula.Shared/Services/AuthService.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Http.Headers;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using Nebula.Shared.Models.Auth;
 using Nebula.Shared.Services.Logging;
@@ -15,15 +14,10 @@ public class AuthService(
     CancellationService cancellationService)
 {
     private readonly HttpClient _httpClient = new();
-    public CurrentAuthInfo? SelectedAuth { get; private set; }
     private readonly ILogger _logger = debugService.GetLogger("AuthService");
 
-    public async Task Auth(AuthLoginPassword authLoginPassword, string? code = null)
+    public async Task<AuthTokenCredentials> Auth(string login, string password, string authServer, string? code = null)
     {
-        var authServer = authLoginPassword.AuthServer;
-        var login = authLoginPassword.Login;
-        var password = authLoginPassword.Password;
-
         _logger.Debug($"Auth to {authServer}api/auth/authenticate {login}");
 
         var authUrl = new Uri($"{authServer}api/auth/authenticate");
@@ -34,8 +28,8 @@ public class AuthService(
                 await restService.PostAsync<AuthenticateResponse, AuthenticateRequest>(
                     new AuthenticateRequest(login, null, password, code), authUrl, cancellationService.Token);
 
-            SelectedAuth = new CurrentAuthInfo(result.UserId,
-                new LoginToken(result.Token, result.ExpireTime), authLoginPassword.Login, authLoginPassword.AuthServer);
+            return new AuthTokenCredentials(result.UserId,
+                new LoginToken(result.Token, result.ExpireTime), login, authServer);
         }
         catch (RestRequestException e)
         {
@@ -48,32 +42,17 @@ public class AuthService(
         }
     }
 
-    public void ClearAuth()
+    public async Task EnsureToken(AuthTokenCredentials tokenCredentials)
     {
-        SelectedAuth = null;
-    }
-
-    public async Task SetAuth(CurrentAuthInfo info)
-    {
-        SelectedAuth = info;
-        await EnsureToken();
-    }
-
-    public async Task EnsureToken()
-    {
-        if (SelectedAuth is null) throw new Exception("Auth info is not set!");
-
-        var authUrl = new Uri($"{SelectedAuth.AuthServer}api/auth/ping");
+        var authUrl = new Uri($"{tokenCredentials.AuthServer}api/auth/ping");
 
         using var requestMessage = new HttpRequestMessage(HttpMethod.Get, authUrl);
-        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", SelectedAuth.Token.Token);
+        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("SS14Auth", tokenCredentials.Token.Token);
         using var resp = await _httpClient.SendAsync(requestMessage, cancellationService.Token);
     }
 }
 
-public sealed record CurrentAuthInfo(Guid UserId, LoginToken Token, string Login, string AuthServer);
-
-public record AuthLoginPassword(string Login, string Password, string AuthServer);
+public sealed record AuthTokenCredentials(Guid UserId, LoginToken Token, string Login, string AuthServer);
 
 public sealed record AuthDenyError(string[] Errors, AuthenticateDenyCode Code);
 

Nebula.Shared/Services/ConfigurationService.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using Microsoft.Extensions.DependencyInjection;
 using Nebula.Shared.FileApis.Interfaces;
+using Nebula.Shared.Models;
 using Nebula.Shared.Services.Logging;
 using Robust.LoaderApi;
 
@@ -30,23 +32,116 @@ public static class ConVarBuilder
 
         return new ConVar<T>(name, defaultValue);
     }
+
+    public static ConVar<T> BuildWithMigration<T>(string name, IConfigurationMigration migration, T? defaultValue = default)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("ConVar name cannot be null or whitespace.", nameof(name));
+        
+        ConfigurationService.AddConfigurationMigration(migration);
+
+        return new ConVar<T>(name, defaultValue);
+    }
+}
+
+public interface IConfigurationMigration
+{
+    public Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler);
+}
+
+public abstract class BaseConfigurationMigration<T1,T2> : IConfigurationMigration
+{
+    protected ConVar<T1> OldConVar;
+    protected ConVar<T2> NewConVar;
+    
+    public BaseConfigurationMigration(string oldName, string newName)
+    {
+        OldConVar = ConVarBuilder.Build<T1>(oldName);
+        NewConVar = ConVarBuilder.Build<T2>(newName);
+    }
+
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider, ILoadingHandler loadingHandler)
+    {
+        var oldValue = configurationService.GetConfigValue(OldConVar);
+        if(oldValue == null) return;
+        
+        var newValue = await Migrate(serviceProvider, oldValue, loadingHandler);
+        configurationService.SetConfigValue(NewConVar, newValue);
+        configurationService.ClearConfigValue(OldConVar);
+    }
+
+    protected abstract Task<T2> Migrate(IServiceProvider serviceProvider, T1 oldValue, ILoadingHandler loadingHandler);
+}
+
+public class MigrationQueue(List<IConfigurationMigration> migrations) : IConfigurationMigration
+{
+    public async Task DoMigrate(ConfigurationService configurationService, IServiceProvider serviceProvider , ILoadingHandler loadingHandler)
+    {
+        foreach (var migration in migrations)
+        {
+            await migration.DoMigrate(configurationService, serviceProvider, loadingHandler);
+        }
+    }
+}
+
+public class MigrationQueueBuilder
+{
+    public static MigrationQueueBuilder Instance => new();
+    
+    private readonly List<IConfigurationMigration> _migrations = [];
+
+    public MigrationQueueBuilder With(IConfigurationMigration migration)
+    {
+        _migrations.Add(migration);
+        return this;
+    }
+
+    public MigrationQueue Build()
+    {
+        return new MigrationQueue(_migrations);
+    }
 }
 
 [ServiceRegister]
 public class ConfigurationService
 {
+    private readonly IServiceProvider _serviceProvider;
+    private static List<IConfigurationMigration> _migrations = [];
+
+    public static void AddConfigurationMigration(IConfigurationMigration configurationMigration)
+    {
+        _migrations.Add(configurationMigration);
+    }
+    
     public delegate void OnConfigurationChangedDelegate<in T>(T value);
     
-    public IReadWriteFileApi ConfigurationApi { get; init; }
+    public IReadWriteFileApi ConfigurationApi { get; }
     
     private readonly ILogger _logger;
 
-    public ConfigurationService(FileService fileService, DebugService debugService)
+    public ConfigurationService(FileService fileService, DebugService debugService, IServiceProvider serviceProvider)
     {
+        _serviceProvider = serviceProvider;
         _logger = debugService.GetLogger(this);
         ConfigurationApi = fileService.CreateFileApi("config");
     }
 
+    public void MigrateConfigs(ILoadingHandler loadingHandler)
+    {
+        Task.Run(async () =>
+        {
+            foreach (var migration in _migrations)
+            {
+                await migration.DoMigrate(this, _serviceProvider, loadingHandler);
+            }
+
+            if (loadingHandler is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+        });
+    }
+
     public ConfigChangeSubscriberDisposable<T> SubscribeVarChanged<T>(ConVar<T> convar, OnConfigurationChangedDelegate<T?> @delegate, bool invokeNow = false)
     {
         convar.OnValueChanged += @delegate;
@@ -112,12 +207,17 @@ public class ConfigurationService
         return false;
     }
 
-    public void SetConfigValue<T>(ConVar<T> conVar, T value)
+    public void ClearConfigValue<T>(ConVar<T> conVar)
+    {
+        ConfigurationApi.Remove(GetFileName(conVar));
+        conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
+    }
+
+    public void SetConfigValue<T>(ConVar<T> conVar, T? value)
     {
         if (value == null)
         {
-            ConfigurationApi.Remove(GetFileName(conVar));
-            conVar.OnValueChanged?.Invoke(conVar.DefaultValue);
+            ClearConfigValue(conVar);
             return;
         }
 

Nebula.Shared/Services/ContentService.Download.cs

@@ -13,10 +13,24 @@ public partial class ContentService
 {
     public readonly IReadWriteFileApi ContentFileApi = fileService.CreateFileApi("content");
     public readonly IReadWriteFileApi ManifestFileApi = fileService.CreateFileApi("manifest");
-    
-    public bool CheckManifestExist(RobustManifestItem item)
+
+    public void SetServerHash(string address, string hash)
     {
-        return ContentFileApi.Has(item.Hash);
+        var dict = varService.GetConfigValue(CurrentConVar.ServerManifestHash)!;
+        if (dict.TryGetValue(address, out var oldHash))
+        {
+            if(oldHash == hash) return;
+            
+            ManifestFileApi.Remove(oldHash);
+        }
+        
+        dict[address] = hash;
+        varService.SetConfigValue(CurrentConVar.ServerManifestHash, dict);
+    }
+    
+    public HashApi CreateHashApi(List<RobustManifestItem> manifestItems)
+    {
+        return new HashApi(manifestItems, ContentFileApi);
     }
 
     public async Task<HashApi> EnsureItems(ManifestReader manifestReader, Uri downloadUri,
@@ -34,10 +48,11 @@ public partial class ContentService
             allItems.Add(item.Value);
         }
 
-        var hashApi = new HashApi(allItems, ContentFileApi);
+        var hashApi = CreateHashApi(allItems);
 
         items = allItems.Where(a=> !hashApi.Has(a)).ToList();
 
+        loadingHandler.SetLoadingMessage("Download Count:" + items.Count);
         _logger.Log("Download Count:" + items.Count);
         await Download(downloadUri, items, hashApi, loadingHandler, cancellationToken);
 
@@ -48,14 +63,18 @@ public partial class ContentService
         CancellationToken cancellationToken)
     {
         _logger.Log("Getting manifest: " + info.Hash);
+        loadingHandler.SetLoadingMessage("Getting manifest: " + info.Hash);
 
         if (ManifestFileApi.TryOpen(info.Hash, out var stream))
         {
             _logger.Log("Loading manifest from: " + info.Hash);
             return await EnsureItems(new ManifestReader(stream), info.DownloadUri, loadingHandler, cancellationToken);
         }
+        
+        SetServerHash(info.ManifestUri.ToString(), info.Hash);
 
         _logger.Log("Fetching manifest from: " + info.ManifestUri);
+        loadingHandler.SetLoadingMessage("Fetching manifest from: " + info.ManifestUri);
 
         var response = await _http.GetAsync(info.ManifestUri, cancellationToken);
         if (!response.IsSuccessStatusCode) throw new Exception();
@@ -111,6 +130,7 @@ public partial class ContentService
 
         var downloadJobWatch = loadingHandler.GetQueryJob();
 
+        loadingHandler.SetLoadingMessage("Downloading from: " + contentCdn);
         _logger.Log("Downloading from: " + contentCdn);
 
         var requestBody = new byte[toDownload.Count * 4];
@@ -135,7 +155,7 @@ public partial class ContentService
 
         if (cancellationToken.IsCancellationRequested)
         {
-            _logger.Log("Downloading is cancelled!");
+            _logger.Log("Downloading cancelled!");
             return;
         }
 
@@ -185,7 +205,7 @@ public partial class ContentService
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    _logger.Log("Downloading is cancelled!");
+                    _logger.Log("Downloading cancelled!");
                     decompressContext?.Dispose();
                     compressContext?.Dispose();
                     return;

Nebula.Shared/Services/ContentService.Migration.cs

@@ -9,7 +9,7 @@ public partial class ContentService
     {
         _logger.Log("Checking migration...");
 
-        var migrationList = ContentFileApi.AllFiles.Where(f => !f.Contains("\\")).ToList();
+        var migrationList = ContentFileApi.AllFiles.Where(f => !f.Contains('\\')).ToList();
         if(migrationList.Count == 0) return false;
         
         _logger.Log($"Found {migrationList.Count} migration files. Starting migration...");

Nebula.Shared/Services/ContentService.cs

@@ -1,5 +1,4 @@
-using System.Data;
-using Nebula.Shared.Models;
+using Nebula.Shared.Models;
 using Nebula.Shared.Services.Logging;
 
 namespace Nebula.Shared.Services;
@@ -28,4 +27,10 @@ public partial class ContentService(
 
         return info;
     }
+
+    public void RemoveAllContent(ILoadingHandler loadingHandler, CancellationToken cancellationToken)
+    {
+        fileService.RemoveAllFiles("content", loadingHandler, cancellationToken);
+        fileService.RemoveAllFiles("manifest", loadingHandler, cancellationToken);
+    }
 }

Nebula.Shared/Services/FileService.cs

@@ -1,8 +1,8 @@
 using System.IO.Compression;
-using System.Runtime.InteropServices;
 using Nebula.Shared.FileApis;
 using Nebula.Shared.FileApis.Interfaces;
 using Nebula.Shared.Models;
+using Nebula.Shared.Services.Logging;
 using Robust.LoaderApi;
 
 namespace Nebula.Shared.Services;
@@ -10,14 +10,14 @@ namespace Nebula.Shared.Services;
 [ServiceRegister]
 public class FileService
 {
-    public static readonly string RootPath = Path.Join(Environment.GetFolderPath(
+    public static string RootPath = Path.Join(Environment.GetFolderPath(
         Environment.SpecialFolder.ApplicationData), "Datum");
 
-    private readonly DebugService _debugService;
+    private readonly ILogger _logger;
     
     public FileService(DebugService debugService)
     {
-        _debugService = debugService;
+        _logger = debugService.GetLogger(this);
 
         if(!Directory.Exists(RootPath)) 
             Directory.CreateDirectory(RootPath);
@@ -25,6 +25,7 @@ public class FileService
     
     public IReadWriteFileApi CreateFileApi(string path)
     {
+        _logger.Debug($"Creating file api for {path}");
         return new FileApi(Path.Join(RootPath, path));
     }
     
@@ -32,6 +33,7 @@ public class FileService
     {
         path = Path.Combine(Path.GetTempPath(), "tempThink"+Path.GetRandomFileName());
         Directory.CreateDirectory(path);
+        _logger.Debug($"Ensuring temp directory for {path}");
         return new FileApi(path);
     }
 
@@ -53,6 +55,38 @@ public class FileService
             throw;
         }
     }
+    
+    public void RemoveAllFiles(string fileApiName,ILoadingHandler loadingHandler, CancellationToken cancellationToken)
+    {
+        _logger.Debug($"Deleting files from {fileApiName}");
+        var path = Path.Combine(RootPath, fileApiName);
+        
+        var di = new DirectoryInfo(path);
+
+        var files = di.GetFiles();
+        var dirs = di.GetDirectories();
+        
+        loadingHandler.AppendJob(files.Length);
+        loadingHandler.AppendJob(dirs.Length);
+        
+        if(cancellationToken.IsCancellationRequested)
+            return;
+        
+        foreach (var file in files)
+        {
+            if(cancellationToken.IsCancellationRequested)
+                return;
+            file.Delete(); 
+            loadingHandler.AppendResolvedJob();
+        }
+        foreach (var dir in dirs)
+        {
+            if(cancellationToken.IsCancellationRequested)
+                return;
+            dir.Delete(true); 
+            loadingHandler.AppendResolvedJob();
+        }
+    }
 }
 
 public sealed class ConsoleLoadingHandler : ILoadingHandler
@@ -88,6 +122,11 @@ public sealed class ConsoleLoadingHandler : ILoadingHandler
         return _resolvedJobs;
     }
 
+    public void SetLoadingMessage(string message)
+    {
+        
+    }
+
     private void UpdatePercent()
     {
         if (_currJobs == 0)

Nebula.Shared/Services/RestService.cs

@@ -11,7 +11,7 @@ namespace Nebula.Shared.Services;
 [ServiceRegister]
 public class RestService
 {
-    private readonly HttpClient _client = new();
+    private readonly HttpClient _client;
     private readonly ILogger _logger;
 
     private readonly JsonSerializerOptions _serializerOptions = new()
@@ -20,8 +20,9 @@ public class RestService
         WriteIndented = true
     };
 
-    public RestService(DebugService debug)
+    public RestService(DebugService debug, HttpClient? client = null)
     {
+        _client = client ?? new HttpClient();
         _logger = debug.GetLogger(this);
     }
 

Nebula.Shared/Utils/Manifest.cs

@@ -94,8 +94,16 @@ public class ManifestReader : StreamReader
     {
         var line = ReadLine();
         if (line == null) return null;
-        var splited = line.Split(" ");
-        return new RobustManifestItem(splited[0], line.Substring(splited[0].Length + 1), CurrentId++);
+
+        var firstSpaceIndex = line.IndexOf(' ');
+        if (firstSpaceIndex == -1)
+            return new RobustManifestItem(line, string.Empty, CurrentId++);
+
+        var span = line.AsSpan();
+        var firstPart = span.Slice(0, firstSpaceIndex);
+        var secondPart = span.Slice(firstSpaceIndex + 1);
+
+        return new RobustManifestItem(firstPart.ToString(), secondPart.ToString(), CurrentId++);
     }
 
     public bool TryReadItem([NotNullWhen(true)] out RobustManifestItem? item)

Nebula.Shared/ViewHelper/ViewModelRegisterAttribute.cs

@@ -0,0 +1,8 @@
+namespace Nebula.Shared.ViewHelper;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class ViewModelRegisterAttribute(Type? type = null, bool isSingleton = true) : Attribute
+{
+    public Type? Type { get; } = type;
+    public bool IsSingleton { get; } = isSingleton;
+}

Nebula.SourceGenerators/DependencyAutoGenerator.cs

@@ -71,7 +71,7 @@ partial class {className}
             ";
 
             // Add the source code to the compilation.
-            context.AddSource($"{className}.g.cs", SourceText.From(code, Encoding.UTF8));
+            context.AddSource($"{className}_dependencyAuto.g.cs", SourceText.From(code, Encoding.UTF8));
         }
     }
 

Nebula.SourceGenerators/SourceHelper.cs

@@ -7,24 +7,6 @@ namespace Nebula.SourceGenerators;
 
 public static class SourceHelper
 {
-    public static void GenerateAttribute(string attributeName, string usage,
-        IncrementalGeneratorInitializationContext context)
-    {
-        var attributeSourceCode = $@"// <auto-generated/>
-
-namespace SourceGen
-{{
-    [System.AttributeUsage(System.AttributeTargets.{usage})]
-    public class {attributeName} : System.Attribute
-    {{
-    }}
-}}";
-
-        context.RegisterPostInitializationOutput(ctx => ctx.AddSource(
-            $"{attributeName}.g.cs",
-            SourceText.From(attributeSourceCode, Encoding.UTF8)));
-    }
-    
     public static bool HasAttribute(ISymbol type, string attributeName)
     {
         foreach (var attribute in type.GetAttributes())

Nebula.SourceGenerators/ViewConstructGenerator.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Immutable;
+using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -6,53 +8,82 @@ using Microsoft.CodeAnalysis.Text;
 
 namespace Nebula.SourceGenerators;
 
-//[Generator]
-public class ViewConstructGenerator : IIncrementalGenerator
+
+[Generator]
+public class ViewConstructorGenerator : IIncrementalGenerator
 {
-    public static string ViewForModelAttributeName = "ViewForModelAttribute";
-    
+    private static readonly string ViewModelAttribute = "Nebula.Shared.ViewHelper.ViewModelRegisterAttribute";
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
         var provider = context.SyntaxProvider
             .CreateSyntaxProvider(
-                (s, _) => s is ClassDeclarationSyntax, (ctx, _) =>
-                    SourceHelper.GetClassDeclarationForSourceGen(ctx,ViewForModelAttributeName)
-            )
+                (s, _) => s is ClassDeclarationSyntax,
+                (ctx, _) => SourceHelper.GetClassDeclarationForSourceGen(ctx,ViewModelAttribute))
             .Where(t => t.reportAttributeFound)
-            .Select((t,_) => t.Item1);
-        
-        context.RegisterSourceOutput(context.CompilationProvider.Combine(provider.Collect()), (ctx,t)=> GenerateCode(ctx, t.Left, t.Right));
+            .Select((t, _) => t.Item1);
+
+        context.RegisterSourceOutput(context.CompilationProvider.Combine(provider.Collect()),
+            (ctx, t) => GenerateCode(ctx, t.Left, t.Right));
     }
 
-    private void GenerateCode(SourceProductionContext context, Compilation compilation, ImmutableArray<ClassDeclarationSyntax> syntaxes)
+    private void GenerateCode(SourceProductionContext context, Compilation compilation,
+        ImmutableArray<ClassDeclarationSyntax> classDeclarations)
     {
-        foreach (var classDeclarationSyntax in syntaxes)
+        foreach (var classDeclarationSyntax in classDeclarations)
         {
             var semanticModel = compilation.GetSemanticModel(classDeclarationSyntax.SyntaxTree);
-            if(semanticModel.GetDeclaredSymbol(classDeclarationSyntax) is not INamedTypeSymbol classSymbol)
+            if (semanticModel.GetDeclaredSymbol(classDeclarationSyntax) is not INamedTypeSymbol classSymbol)
                 continue;
             
-            var namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
-            var className = classDeclarationSyntax.Identifier.Text;
+            var viewModelName = classSymbol.Name;
+            var viewModelNamespace = classSymbol.ContainingNamespace.ToDisplayString();
             
-            var code = $@"// <auto-generated/>
+            var viewModelRegisterAttr = classSymbol.GetAttributes()
+                .FirstOrDefault(attr => attr.AttributeClass?.ToDisplayString() == ViewModelAttribute);
 
-using System;
-using System.Collections.Generic;
+            var viewTypeArg = viewModelRegisterAttr?.ConstructorArguments.FirstOrDefault();
+            if (viewTypeArg?.Value is not INamedTypeSymbol viewTypeSymbol)
+                continue;
 
-namespace {namespaceName};
-
-partial class {className}
+            try
+            {
+                var viewName = viewTypeSymbol.Name;
+                var viewNamespace = viewTypeSymbol.ContainingNamespace.ToDisplayString();
+            
+                var code = $@"
+namespace {viewNamespace}
 {{
-    public {className}() : base(){{
-
-     
+    public partial class {viewName}
+    {{
+       public {viewName}({viewModelNamespace}.{viewModelName} viewModel)
+        : this()
+        {{
+            DataContext = viewModel;
+        }}
     }}
-}}
-            ";
+}}";
+            
+                // Add the source code to the compilation.
+                context.AddSource($"{viewName}_viewConstructAuto.g.cs", SourceText.From(code, Encoding.UTF8));
+            }
+            catch (Exception e)
+            {
+                var coder1 = $@"
+// <auto-generated/>
+// Error!
+namespace {viewModelNamespace}
+{{
+    public partial class {viewModelName}
+    {{
+        // {e.Message}
+    }}
+}}";
 
-            // Add the source code to the compilation.
-            context.AddSource($"{className}.g.cs", SourceText.From(code, Encoding.UTF8));
+                // Add the source code to the compilation.
+                context.AddSource($"{viewModelName}_viewError.g.cs", SourceText.From(coder1, Encoding.UTF8));
+            }
         }
     }
+
+
 }

Nebula.UnitTest/Nebula.UnitTest.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="Moq" Version="4.20.72" />
+        <PackageReference Include="NUnit" Version="3.14.0"/>
+        <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="NUnit.Framework"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Nebula.Packager\Nebula.Packager.csproj" />
+      <ProjectReference Include="..\Nebula.Shared\Nebula.Shared.csproj" />
+    </ItemGroup>
+
+</Project>

Nebula.UnitTest/NebulaSharedTests/BaseSharedTest.cs

@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Nebula.UnitTest.NebulaSharedTests;
+
+public abstract class BaseSharedTest
+{
+    protected SharedUnit _sharedUnit = default!;
+    
+    public abstract void BeforeServiceBuild(IServiceCollection services);
+    
+    public virtual void Setup()
+    {
+        _sharedUnit = TestServiceHelper.GetSharedUnit(BeforeServiceBuild);
+    }
+}
+

Nebula.UnitTest/NebulaSharedTests/ConfigurationServiceTests.cs

@@ -0,0 +1,90 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Services;
+
+namespace Nebula.UnitTest.NebulaSharedTests;
+
+[TestFixture]
+[TestOf(typeof(ConfigurationService))]
+public sealed class ConfigurationServiceTests: BaseSharedTest
+{
+    private ConfigurationService _conVarService;
+
+    public override void BeforeServiceBuild(IServiceCollection services)
+    {
+        TestServiceHelper.InitFileServiceTest();
+    }
+
+    [SetUp]
+    public override void Setup()
+    {
+        base.Setup();
+        _conVarService = _sharedUnit.GetService<ConfigurationService>();
+    }
+
+    [Test]
+    public void GetDefaultConVarTest()
+    {
+        var value = _conVarService.GetConfigValue(TestConVar.SimpleConvar);
+        Assert.NotNull(value);
+        Assert.That(value, Is.EqualTo(TestConVar.SimpleConvar.DefaultValue));
+    }
+
+    [Test]
+    public void GetNullConVarTest()
+    {
+        var value = _conVarService.GetConfigValue(TestConVar.NullConvar);
+        Assert.Null(value);
+    }
+
+    [Test]
+    public void WriteConVarTest()
+    {
+        var value = _conVarService.GetConfigValue(TestConVar.SimpleConvar);
+        Assert.That(value, Is.EqualTo(TestConVar.SimpleConvar.DefaultValue));
+        
+        _conVarService.SetConfigValue(TestConVar.SimpleConvar, "notdefault");
+        value = _conVarService.GetConfigValue(TestConVar.SimpleConvar);
+        Assert.That(value, Is.Not.EqualTo(TestConVar.SimpleConvar.DefaultValue));
+        Assert.That(value, Is.EqualTo("notdefault"));
+        
+        _conVarService.SetConfigValue(TestConVar.SimpleConvar, null);
+        
+        value = _conVarService.GetConfigValue(TestConVar.SimpleConvar);
+        Assert.That(value, Is.EqualTo(TestConVar.SimpleConvar.DefaultValue));
+    }
+
+    [Test]
+    public void WriteComplexConvarTest()
+    {
+        var testVar = new TestVarObject("Alex", 2);
+        _conVarService.SetConfigValue(TestConVar.TestVarObject, testVar);
+        var value = _conVarService.GetConfigValue(TestConVar.TestVarObject);
+        Assert.That(value, Is.EqualTo(testVar));
+        
+        _conVarService.SetConfigValue(TestConVar.TestVarObject, default);
+    }
+
+    [Test]
+    public void WriteArrayConvarTest()
+    {
+        var testVarArr = new[] { new TestVarObject("Alex", 2), new TestVarObject("Vitya", 3) };
+        _conVarService.SetConfigValue(TestConVar.TestVarArray, testVarArr);
+        var value = _conVarService.GetConfigValue(TestConVar.TestVarArray);
+        Assert.NotNull(value);
+        Assert.That(testVarArr.SequenceEqual(value));
+        _conVarService.SetConfigValue(TestConVar.TestVarArray, null);
+    }
+    
+    
+}
+
+public static class TestConVar
+{
+    public static ConVar<string> SimpleConvar = ConVarBuilder.Build("test.convarsimple", "test");
+    public static ConVar<string?> NullConvar = ConVarBuilder.Build<string?>("test.convarsimplenull");
+    
+    public static ConVar<TestVarObject> TestVarObject = ConVarBuilder.Build<TestVarObject>("test.convarobject", default);
+    public static ConVar<TestVarObject[]> TestVarArray = ConVarBuilder.Build<TestVarObject[]>("test.convarobject.array");
+}
+
+public record struct TestVarObject(string Name, int Count);

Nebula.UnitTest/NebulaSharedTests/FileServiceTests.cs

@@ -0,0 +1,123 @@
+using System.IO.Compression;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+using Robust.LoaderApi;
+
+namespace Nebula.UnitTest.NebulaSharedTests;
+
+[TestFixture]
+[TestOf(typeof(FileService))]
+public class FileServiceTests : BaseSharedTest
+{
+    private FileService _fileService = default!;
+
+    public override void BeforeServiceBuild(IServiceCollection services)
+    {
+        TestServiceHelper.InitFileServiceTest();
+    }
+
+    [SetUp]
+    public override void Setup()
+    {
+        base.Setup();
+        _fileService = _sharedUnit.GetService<FileService>();
+    }
+
+    [Test]
+    public void CreateFileApi_CreatesCorrectPath()
+    {
+        var subPath = "test-folder";
+        var fileApi = _fileService.CreateFileApi(subPath);
+
+        using (var stream = new MemoryStream("test"u8.ToArray()))
+        {
+            fileApi.Save("test.txt", stream);
+        }
+        
+        var expectedPath = Path.Combine(FileService.RootPath, subPath);
+
+        Assert.That(Directory.Exists(expectedPath), Is.True, $"Expected path to be created: {expectedPath}");
+    }
+
+    [Test]
+    public void EnsureTempDir_CreatesDirectoryAndReturnsApi()
+    {
+        var api = _fileService.EnsureTempDir(out var path);
+
+        Assert.That(Directory.Exists(path), Is.True);
+        Assert.That(api, Is.Not.Null);
+    }
+
+    [Test]
+    public void OpenZip_ReturnsZipFileApi_WhenValid()
+    {
+        var testZipPath = Path.Combine(FileService.RootPath, "test.zip");
+        using (var archive = ZipFile.Open(testZipPath, ZipArchiveMode.Create))
+        {
+            var entry = archive.CreateEntry("test.txt");
+            using var streamWriter = new StreamWriter(entry.Open());
+            streamWriter.Write(testZipPath);
+            streamWriter.Flush();
+        }
+        
+        IDisposable? streamDisposable = null;
+
+        var mockFileApi = new Mock<IFileApi>();
+        mockFileApi
+            .Setup(x => x.TryOpen(testZipPath, out It.Ref<Stream>.IsAny))
+            .Returns((string _, out Stream stream) =>
+            {
+                stream = File.OpenRead(testZipPath);
+                streamDisposable = stream;
+                return true;
+            });
+
+        var zipApi = _fileService.OpenZip(testZipPath, mockFileApi.Object);
+        Assert.That(zipApi, Is.Not.Null);
+        
+        Assert.That(zipApi.TryOpen("test.txt", out var textStream), Is.True);
+
+        using (var reader = new StreamReader(textStream!))
+        {
+            Assert.That(reader.ReadToEnd(), Is.EqualTo(testZipPath));
+        }
+        
+        textStream!.Dispose();
+        streamDisposable?.Dispose();
+
+        File.Delete(testZipPath);
+    }
+
+    [Test]
+    public void RemoveAllFiles_DeletesAllFilesAndDirectories()
+    {
+        var testDir = Path.Combine(FileService.RootPath, "cleanup-test");
+        Directory.CreateDirectory(testDir);
+
+        File.WriteAllText(Path.Combine(testDir, "test1.txt"), "data");
+        Directory.CreateDirectory(Path.Combine(testDir, "subdir"));
+
+        var mockHandler = new Mock<ILoadingHandler>();
+        mockHandler.Setup(x => x.AppendJob(It.IsAny<int>())).Verifiable();
+        mockHandler.Setup(x => x.AppendResolvedJob(It.IsAny<int>())).Verifiable();
+
+        _fileService.RemoveAllFiles("cleanup-test", mockHandler.Object, CancellationToken.None);
+
+        Assert.That(Directory.Exists(testDir), Is.True);
+        Assert.That(Directory.GetFiles(testDir).Length, Is.EqualTo(0));
+        Assert.That(Directory.GetDirectories(testDir).Length, Is.EqualTo(0));
+    }
+
+    [Test]
+    public void OpenZip_ThrowsException_WhenFileApiFails()
+    {
+        var mockFileApi = new Mock<IFileApi>();
+        mockFileApi.Setup(x => x.TryOpen(It.IsAny<string>(), out It.Ref<Stream>.IsAny))
+                   .Returns(false);
+
+        var result = _fileService.OpenZip("invalid.zip", mockFileApi.Object);
+        Assert.That(result, Is.Null);
+    }
+}

Nebula.UnitTest/NebulaSharedTests/PopupMessageServiceTests.cs

@@ -0,0 +1,42 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared.Services;
+
+namespace Nebula.UnitTest.NebulaSharedTests;
+
+[TestFixture]
+[TestOf(nameof(PopupMessageService))]
+public class PopupMessageServiceTests : BaseSharedTest
+{
+    public override void BeforeServiceBuild(IServiceCollection services)
+    {
+    }
+
+    [SetUp]
+    public override void Setup()
+    {
+        base.Setup();
+        
+        var popupService = _sharedUnit.GetService<PopupMessageService>();
+        
+        popupService.OnCloseRequired = (popup) => ((IDisposable)popup).Dispose();
+    }
+
+    [Test]
+    public void DisposeTest()
+    {
+        var popup = new TestPopup();
+        var popupService = _sharedUnit.GetService<PopupMessageService>();
+        popupService.ClosePopup(popup);
+        Assert.That(popup.Disposed, Is.True);
+    }
+
+    private sealed class TestPopup : IDisposable
+    {
+        public bool Disposed { get; private set; }
+        
+        public void Dispose()
+        {
+            Disposed = true;
+        }
+    }
+}