- tweak: change mirror

* - tweak: change loading handle logic

* - tweak: beautify loading thinks

* - fix: speed thinks while downloading

.github/workflows/publish_manifest.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Set version

.github/workflows/publish_update_resolver.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Create build

.gitignore

@@ -4,4 +4,5 @@ obj/
 riderModule.iml
 /_ReSharper.Caches/
 release/
-publish/
+publish/
+/.vs

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

@@ -8,33 +8,44 @@
         <entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Controls/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/MessageBox/MessageView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/MessageBox/MessageWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/ViewModels/Styles1.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Config/StringConfigurationView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Controls/PlayerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Controls/ServerContainerControl.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ExceptionView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/FileContentEntryView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/MainView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/MainWindow.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/AccountInfoPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/AccountInfoView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/AddFavoriteView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Pages/ConfigurationView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/ContentBrowserView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/FavoriteServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/ServerListPage.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/Pages/ServerListView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Pages/ServerOverviewView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Popup/AddFavoriteView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/Popup/EditServerNameView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <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" />
         <entry key="Nebula.Launcher/Views/Popup/TfaView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <entry key="Nebula.Launcher/Views/ServerCompoundEntryView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ServerContainer.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ServerEntryView.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
         <entry key="Nebula.Launcher/Views/ServerList.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
+        <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>

.idea/.idea.Nebula/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Robust.LoaderApi" vcs="Git" />
   </component>
 </project>

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Nebula.Launcher/bin/Debug/net9.0/Nebula.Launcher.dll",
+            "program": "${workspaceFolder}/Nebula.Launcher/bin/Debug/Nebula.Launcher.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Nebula.Launcher",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

Directory.Build.props

@@ -0,0 +1,6 @@
+<Project>
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
+</Project>

Directory.Packages.props

@@ -0,0 +1,33 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="11.3.11" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.11" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.11" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.11" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.11" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.3.0" />
+    <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.5.0" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageVersion Include="Fluent.Net" Version="1.0.63" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+    <PackageVersion Include="libsodium" Version="1.0.20" />
+    <PackageVersion Include="Robust.Natives" Version="0.2.3" />
+    <PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+    <PackageVersion Include="Lib.Harmony" Version="2.4.2" />
+    <PackageVersion Include="SharpZstd.Interop" Version="1.5.6" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="NUnit" Version="3.14.0" />
+    <PackageVersion Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
+  </ItemGroup>
+</Project>

Nebula.Launcher/App.axaml.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Globalization;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
@@ -8,7 +6,6 @@ using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Microsoft.Extensions.DependencyInjection;
 using Nebula.Launcher.MessageBox;
-using Nebula.Launcher.ViewModels.ContentView;
 using Nebula.Launcher.Views;
 using Nebula.Shared;
 using Nebula.Shared.Services;
@@ -31,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;
         }
@@ -63,7 +62,6 @@ public class App : Application
             services.AddAvaloniaServices();
             services.AddServices();
             services.AddViews();
-            services.AddTransient<DecompilerContentView>();
 
             var serviceProvider = services.BuildServiceProvider();
             

Nebula.Launcher/Assets/Style.axaml

@@ -1,16 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
+    
+    <!-- Base Window Style -->
     <Style Selector="Window">
         <Setter Property="Background" Value="{StaticResource DefaultBackground}" />
     </Style>
+
+    <!-- Common Border Style -->
     <Style Selector="Border">
         <Setter Property="CornerRadius" Value="10" />
     </Style>
+
+    <!-- Common Label Style -->
     <Style Selector="Label">
         <Setter Property="Foreground" Value="#f7f7ff" />
     </Style>
+
+    <!-- Common ItemsControl Style -->
     <Style Selector="ItemsControl">
         <Setter Property="Background" Value="Transparent" />
     </Style>
+
+    <!-- General Button Style -->
     <Style Selector="Button">
         <Setter Property="BorderBrush" Value="#343334" />
         <Setter Property="BorderThickness" Value="0" />
@@ -19,6 +31,7 @@
         <Setter Property="Background" Value="Transparent" />
     </Style>
 
+    <!-- Button State Overrides -->
     <Style Selector="Button:pressed">
         <Setter Property="RenderTransform" Value="{x:Null}" />
         <Setter Property="BorderThickness" Value="0,0,0,2" />
@@ -30,26 +43,33 @@
         <Setter Property="BorderThickness" Value="0,0,0,0" />
     </Style>
 
+    <!-- ViewSelectButton Specialization -->
     <Style Selector="Button.ViewSelectButton">
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Margin" Value="0,0,0,5" />
         <Setter Property="Padding" Value="8" />
-        <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="Button.ViewSelectButton:pressed">
         <Setter Property="BorderThickness" Value="0,0,0,0" />
     </Style>
 
+    <!-- TextBox Styles -->
     <Style Selector="TextBox">
         <Setter Property="Foreground" Value="#f7f7ff" />
         <Setter Property="SelectionForegroundBrush" Value="#f7f7ff" />
-        <Setter Property="BorderThickness" Value="0,0,0,0" />
+        <Setter Property="BorderThickness" Value="0" />
         <Setter Property="BorderBrush" Value="#f7f7ff" />
         <Setter Property="Background" Value="Transparent" />
     </Style>
-    <Style Selector="TextBox" />
 
+    <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="White" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+    </Style>
+
+    <!-- ListBoxItem Styles -->
     <Style Selector="ListBoxItem /template/ ContentPresenter">
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Margin" Value="0,0,0,5" />
@@ -60,29 +80,37 @@
     <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Background">
-            <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
-                <GradientStop Color="#ae4c47" Offset="0.0" />
-                <GradientStop Color="#D95F59" Offset="0.2" />
-                <GradientStop Color="#D95F59" Offset="1.0" />
-            </LinearGradientBrush>
+            <Setter.Value>
+                <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
+                    <GradientStop Color="#ae4c47" Offset="0.0" />
+                    <GradientStop Color="#D95F59" Offset="0.2" />
+                    <GradientStop Color="#D95F59" Offset="1.0" />
+                </LinearGradientBrush>
+            </Setter.Value>
         </Setter>
         <Setter Property="BoxShadow" Value="0 0 15 1 #1212" />
     </Style>
+
     <Style Selector="ListBoxItem:pointerover">
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Margin" Value="0,0,5,0" />
     </Style>
+
     <Style Selector="ListBoxItem:pressed /template/ ContentPresenter">
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Background" Value="{StaticResource DefaultSelected}" />
     </Style>
 
-    <Style Selector="TextBox">
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-    <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="White" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0,0,0,1" />
-    </Style>
+    <!-- Combined ConfigBorder Styles -->
+    <Style Selector="pages|ComplexUnitConfigControl.ConfigBorder, 
+                 pages|ArrayUnitConfigControl.ConfigBorder, 
+                 pages|StringUnitConfigControl.ConfigBorder, 
+                 pages|IntUnitConfigControl.ConfigBorder, 
+                 pages|FloatUnitConfigControl.ConfigBorder">
+    <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

@@ -0,0 +1,74 @@
+tab-account = Account
+tab-servers = Servers
+tab-content = Content
+tab-settings = Settings
+vcruntime-check-error = VC runtime dlls are not present on this computer. Install VC runtime dlls.
+migration-label-task = Migration task, please wait...
+task-cancel = Cancel
+
+popup-edit-name = Edit server name
+popup-add-favorite = Add favorite
+popup-exception = Exception was thrown
+popup-information = Information
+popup-loading = Loading...
+popup-twofa = 2fa
+
+account-profiles = Profiles  
+account-profile-select = Select
+account-profile-delete = Delete
+account-auth-retry = Retry Authentication  
+account-auth-try-another = Or try another account  
+account-auth-login = Enter your login  
+account-auth-password = Enter your password  
+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.  
+auth-error-occured = An error occurred during the authentication process.  
+auth-invalid-credentials = Invalid username or password. Please try again.  
+auth-connection-error = Unable to connect to the authentication server.  
+auth-name-resolution-error = Failed to resolve server address. Check your network or server configuration.  
+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
+
+server-search = Server search
+serverentry-tag = Tag
+serverentry-map = Map
+serverentry-preset = Preset
+
+content-view-server = Server url
+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
+tab-favorite = Favorite
+server-list-loading = Loading server list.. Please wait

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

@@ -0,0 +1,74 @@
+tab-account = Аккаунт
+tab-servers = Серверы
+tab-content = Контент
+tab-settings = Настройки
+vcruntime-check-error = VC runtime dll-библиотеки отсутствуют на этом компьютере. Установите VC runtime dll.
+migration-label-task = Задача миграции, подождите...
+task-cancel = Отмена
+
+popup-edit-name = Изменить имя сервера
+popup-add-favorite = Добавить в избранное
+popup-exception = Произошло исключение
+popup-information = Информация
+popup-loading = Загрузка...
+popup-twofa = 2FA
+
+account-profiles = Профили  
+account-profile-select = Выбрать
+account-profile-delete = Удалить 
+account-auth-retry = Повторить аутентификацию  
+account-auth-try-another = Или попробуйте другой аккаунт  
+account-auth-login = Введите логин  
+account-auth-password = Введите пароль  
+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 = Произошла ошибка аутентификации.  
+auth-error-occured = Во время аутентификации произошла ошибка.  
+auth-invalid-credentials = Неверное имя пользователя или пароль. Попробуйте еще раз.  
+auth-connection-error = Не удается подключиться к серверу аутентификации.  
+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 = Продолжить
+
+server-search = Поиск сервера
+serverentry-tag = Тэги
+serverentry-map = Карта
+serverentry-preset = Режим
+
+content-view-server = Сервер
+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 = Корн. папка
+tab-favorite = Избранное
+server-list-loading = Загрузка списка серверов. Пожалуйста, подождите...

Nebula.Launcher/Assets/svg/pencil.svg

@@ -0,0 +1,7 @@
+<!-- License: Apache. Made by Remix Design: https://github.com/Remix-Design/remixicon -->
+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <path fill="none" d="M0 0h24v24H0z"/>
+        <path fill="white" d="M15.728 9.686l-1.414-1.414L5 17.586V19h1.414l9.314-9.314zm1.414-1.414l1.414-1.414-1.414-1.414-1.414 1.414 1.414 1.414zM7.242 21H3v-4.243L16.435 3.322a1 1 0 0 1 1.414 0l2.829 2.829a1 1 0 0 1 0 1.414L7.243 21z"/>
+    </g>
+</svg>

Nebula.Launcher/Configurations/ArrayUnitConfigControl.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class ArrayUnitConfigControl : Border, IConfigControl
+{
+    private readonly List<IConfigControl> _itemControls = [];
+    private readonly StackPanel _itemsPanel = new StackPanel() { Orientation = Orientation.Vertical };
+    private readonly Button _addButton = new Button() { Content = new Label()
+    {
+        Content = "Add Item"
+    }, Classes = { "ConfigBorder" }};
+    private readonly int _oldCount;
+    private readonly Type _elementType;
+    private readonly StackPanel _panel = new();
+
+    public string ConfigName { get; }
+    public bool Dirty => _itemControls.Any(dirty => dirty.Dirty) || _itemControls.Count != _oldCount;
+
+    public ArrayUnitConfigControl(string name, object value)
+    {
+        Classes.Add("ConfigBorder");
+        _elementType = value.GetType().GetElementType()!;
+        
+        ConfigName = name;
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
+        _itemsPanel.Spacing = 4f;
+
+        _panel.Children.Add(new Label { Content = name });
+        _panel.Children.Add(_itemsPanel);
+        _panel.Children.Add(_addButton);
+
+        _addButton.Click += (_, _) => AddItem(ConfigControlHelper.CreateDefaultValue(_elementType)!);
+        Child = _panel; 
+        SetValue(value);
+        _oldCount = _itemControls.Count;
+    }
+
+    private void AddItem(object value)
+    {
+        var itemPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
+        var control = ConfigControlHelper.GetConfigControl(_itemControls.Count.ToString(), value);
+        var removeButton = new Button { Content = new Label(){ Content = "Remove" }, Classes = { "ConfigBorder" }};
+
+        removeButton.Click += (_, _) =>
+        {
+            _itemControls.Remove(control);
+            _itemsPanel.Children.Remove(itemPanel);
+        };
+        
+        ((Control)control).Margin = new Thickness(5);
+        itemPanel.Children.Add((Control)control);
+        itemPanel.Children.Add(removeButton);
+
+        _itemsPanel.Children.Add(itemPanel);
+        _itemControls.Add(control);
+    }
+
+    public void SetValue(object value)
+    {
+        _itemControls.Clear();
+        _itemsPanel.Children.Clear();
+
+        if (value is IEnumerable list)
+        {
+            foreach (var item in list)
+            {
+                AddItem(item);
+            }
+        }
+    }
+
+    public object GetValue()
+    {
+        return ConvertArray(_itemControls.Select(c => c.GetValue()).ToArray(), _elementType);
+    }
+    
+    public static Array ConvertArray(Array sourceArray, Type targetType)
+    {
+        int length = sourceArray.Length;
+        var newArray = Array.CreateInstance(targetType, length);
+
+        for (int i = 0; i < length; i++)
+        {
+            var value = sourceArray.GetValue(i);
+            var converted = Convert.ChangeType(value, targetType);
+            newArray.SetValue(converted, i);
+        }
+
+        return newArray;
+    }
+}

Nebula.Launcher/Configurations/ComplexConVarBinder.cs

@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Shared.Configurations;
+
+namespace Nebula.Launcher.Configurations;
+
+public abstract class ComplexConVarBinder<T> : INotifyPropertyChanged, INotifyPropertyChanging
+{
+    private readonly ConVarObserver<T> _baseConVar;
+    private readonly Lock _lock = new();
+    private readonly SemaphoreSlim _valueChangeSemaphore = new(1, 1);
+
+    public T? Value
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return _baseConVar.Value;
+            }
+        }
+        set
+        {
+            _ = SetValueAsync(value);
+        }
+    }
+    
+    public bool HasValue
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return _baseConVar.HasValue;
+            }
+        }
+    }
+
+    protected ComplexConVarBinder(ConVarObserver<T> baseConVar)
+    {
+        _baseConVar = baseConVar ?? throw new ArgumentNullException(nameof(baseConVar));
+        _baseConVar.PropertyChanged += BaseConVarOnPropertyChanged;
+        _baseConVar.PropertyChanging += BaseConVarOnPropertyChanging;
+    }
+    
+
+    private async Task SetValueAsync(T? value)
+    {
+        await _valueChangeSemaphore.WaitAsync().ConfigureAwait(false);
+
+        try
+        {
+            var newValue = await OnValueChange(value).ConfigureAwait(false);
+
+            lock (_lock)
+            {
+                _baseConVar.Value = newValue;
+            }
+        }
+        finally
+        {
+            _valueChangeSemaphore.Release();
+        }
+    }
+
+    protected abstract Task<T?> OnValueChange(T? newValue);
+
+    private void BaseConVarOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasValue)));
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+    }
+    
+    private void BaseConVarOnPropertyChanging(object? sender, PropertyChangingEventArgs e)
+    {
+        PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(HasValue)));
+        PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(nameof(Value)));
+    }
+    
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public event PropertyChangingEventHandler? PropertyChanging;
+}

Nebula.Launcher/Configurations/ComplexUnitConfigControl.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class ComplexUnitConfigControl : Border, IConfigControl
+{
+    private readonly List<(PropertyInfo, IConfigControl)> _units = [];
+    
+    private Type _objectType = typeof(object);
+
+    private readonly StackPanel _panel = new();
+    
+    public string ConfigName { get; }
+    public bool Dirty => _units.Any(dirty => dirty.Item2.Dirty);
+
+    public ComplexUnitConfigControl(string name, object obj)
+    {
+        Classes.Add("ConfigBorder");
+        _panel.Orientation = Orientation.Vertical;
+        _panel.Spacing = 4f;
+        ConfigName = name;
+        Child = _panel;
+        SetValue(obj);
+    }
+
+    public void SetValue(object value)
+    {
+        _units.Clear();
+        _panel.Children.Clear();
+        _objectType = value.GetType();
+        
+        _panel.Children.Add(new Label()
+        {
+            Content = ConfigName
+        });
+        
+        foreach (var propInfo in _objectType.GetProperties())
+        {
+            if(propInfo.PropertyType.IsInterface) 
+                continue;
+            
+            var propValue = propInfo.GetValue(value);
+
+            var control = ConfigControlHelper.GetConfigControl(propInfo.Name, propValue!);
+            
+            ((Control)control).Margin = new Thickness(5);
+            _panel.Children.Add((Control)control);
+            _units.Add((propInfo,control));
+        }
+    }
+
+    public object GetValue()
+    {
+        var obj = ConfigControlHelper.CreateDefaultValue(_objectType);
+        foreach (var (fieldInfo, configControl) in _units)
+        {
+            fieldInfo.SetValue(obj, configControl.GetValue());
+        }
+
+        return obj!;
+    }
+}

Nebula.Launcher/Configurations/ConfigControlHelper.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public static class ConfigControlHelper{
+    public static IConfigControl GetConfigControl(string name,object value)
+    {
+        switch (value)
+        {
+            case string stringValue:
+                return new StringUnitConfigControl(name, stringValue);
+            case int intValue:
+                return new IntUnitConfigControl(name, intValue);
+            case float floatValue:
+                return new FloatUnitConfigControl(name, floatValue);
+        }
+        
+        var valueType = value.GetType();
+
+        if (valueType.IsArray)
+            return new ArrayUnitConfigControl(name, value);
+        
+        return new ComplexUnitConfigControl(name, value);
+    }
+
+    public static object? CreateDefaultValue(Type type)
+    {
+        if(type.IsValueType)
+            return Activator.CreateInstance(type);
+        
+        var ctor = type.GetConstructors().First();
+        var parameters = ctor.GetParameters()
+            .Select(p => CreateDefaultValue(p.ParameterType))
+            .ToArray();
+        
+        return ctor.Invoke(parameters);
+    }
+}

Nebula.Launcher/Configurations/FloatUnitConfigControl.cs

@@ -0,0 +1,19 @@
+using System.Globalization;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class FloatUnitConfigControl(string name, float value) : UnitConfigControl<float>(name, value)
+{
+
+    public CultureInfo CultureInfo = CultureInfo.InvariantCulture;
+
+    public override void SetConfValue(float value)
+    {
+        ConfigValue = value.ToString(CultureInfo);
+    }
+
+    public override float GetConfValue()
+    {
+        return float.Parse(ConfigValue, CultureInfo);
+    }
+}

Nebula.Launcher/Configurations/IConfigControl.cs

@@ -0,0 +1,9 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public interface IConfigControl
+{
+    public string ConfigName { get; }
+    public bool Dirty {get;}
+    public abstract void SetValue(object value);
+    public abstract object GetValue();
+}

Nebula.Launcher/Configurations/IntUnitConfigControl.cs

@@ -0,0 +1,14 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class IntUnitConfigControl(string name, int value) : UnitConfigControl<int>(name, value)
+{
+    public override void SetConfValue(int value)
+    {
+        ConfigValue = value.ToString();
+    }
+
+    public override int GetConfValue()
+    {
+        return int.Parse(ConfigValue);
+    }
+}

Nebula.Launcher/Configurations/StringUnitConfigControl.cs

@@ -0,0 +1,14 @@
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public sealed class StringUnitConfigControl(string name, string value) : UnitConfigControl<string>(name, value)
+{
+    public override void SetConfValue(string value)
+    {
+        ConfigValue = value;
+    }
+
+    public override string GetConfValue()
+    {
+        return ConfigValue;
+    }
+}

Nebula.Launcher/Configurations/UnitConfigControl.cs

@@ -0,0 +1,53 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+public abstract class UnitConfigControl<T> : Border, IConfigControl where T : notnull
+{
+    private readonly Label _nameLabel = new();
+    private readonly TextBox _valueLabel = new();
+    private string _originalValue;
+
+    private StackPanel _panel = new();
+    
+    public string ConfigName { get; }
+   
+    public bool Dirty => _originalValue != ConfigValue;
+
+    protected string ConfigValue
+    {
+        get => _valueLabel.Text ?? string.Empty;
+        set => _valueLabel.Text = value;
+    }
+
+    public UnitConfigControl(string name, T value)
+    {
+        Classes.Add("ConfigBorder");
+        ConfigName = name;
+        _panel.Orientation = Orientation.Horizontal;
+        _panel.Children.Add(_nameLabel);
+        _panel.Children.Add(_valueLabel);
+        
+        _nameLabel.Content = name;
+        _nameLabel.VerticalAlignment = VerticalAlignment.Center;
+        Child = _panel;
+        
+        SetConfValue(value);
+        _originalValue = ConfigValue;
+    }
+
+    public abstract void SetConfValue(T value);
+
+    public abstract T GetConfValue();
+    
+    public void SetValue(object value)
+    {
+        SetConfValue((T)value);
+    }
+
+    public object GetValue()
+    {
+        return GetConfValue()!;
+    }
+}

Nebula.Launcher/Controls/FilterBox.cs

@@ -19,13 +19,16 @@ public class FilterBox : UserControl
     
     public Action<FilterBoxChangedEventArgs>? OnFilterChanged {get; set;}
 
-    public string? FilterBoxName {
-        set => filterName.Text = value;
-        get => filterName.Text;
+    public string FilterBoxName {
+        set => filterName.LocalId = value;
+        get => filterName.LocalId;
     }
     
     private StackPanel filterPanel;
-    private TextBox filterName = new TextBox();
+    private LocalizedLabel filterName = new LocalizedLabel()
+    {
+        VerticalAlignment = VerticalAlignment.Center
+    };
     
     public FilterBox()
     {
@@ -34,6 +37,8 @@ public class FilterBox : UserControl
             Orientation = Orientation.Horizontal,
             Spacing = 5,
         };
+
+        filterPanel.Children.Add(filterName);
         
         Content = filterPanel;
     }

Nebula.Launcher/Controls/LocalizedLabel.cs

@@ -0,0 +1,20 @@
+using Avalonia;
+using Avalonia.Controls;
+using Nebula.Launcher.Services;
+
+namespace Nebula.Launcher.Controls;
+
+public class LocalizedLabel : Label
+{
+    public static readonly StyledProperty<string> LocalIdProperty = AvaloniaProperty.Register<LocalizedLabel, string>(nameof(LocalId));
+
+    public string LocalId
+    {
+        get => GetValue(LocalIdProperty);
+        set
+        {
+            SetValue(LocalIdProperty, value);
+            Content = LocalizationService.GetString(value);
+        }
+    }
+}

Nebula.Launcher/Controls/SimpleGraph.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Reactive;
+using Avalonia.Threading;
+
+namespace Nebula.Launcher.Controls;
+
+public class SimpleGraph : Control
+{
+    // Bindable data: list of doubles or points
+    public static readonly StyledProperty<ObservableCollection<double>> ValuesProperty =
+        AvaloniaProperty.Register<SimpleGraph,ObservableCollection<double>>(nameof(Values));
+
+    public static readonly StyledProperty<IBrush> GraphBrushProperty =
+        AvaloniaProperty.Register<SimpleGraph, IBrush>(nameof(GraphBrush), Brushes.CornflowerBlue);
+    
+    public static readonly StyledProperty<IBrush> GridBrushProperty =
+        AvaloniaProperty.Register<SimpleGraph, IBrush>(nameof(GridBrush), Brushes.LightGray);
+
+    static SimpleGraph()
+    {
+        ValuesProperty.Changed.Subscribe(
+            new AnonymousObserver<AvaloniaPropertyChangedEventArgs<ObservableCollection<double>>>(args =>
+            {
+                if (args.Sender is not SimpleGraph g) 
+                    return;
+                
+                g.InvalidateVisual();
+                g.Values.CollectionChanged += g.ValuesOnCollectionChanged;
+            }));
+    }
+    
+    public SimpleGraph()
+    {
+        Values = new ObservableCollection<double>();
+    }
+
+    private void ValuesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        Dispatcher.UIThread.Post(InvalidateVisual);
+    }
+
+    public ObservableCollection<double> Values
+    {
+        get => GetValue(ValuesProperty);
+        set => SetValue(ValuesProperty, value);
+    }
+
+
+    public IBrush GraphBrush
+    {
+        get => GetValue(GraphBrushProperty);
+        set => SetValue(GraphBrushProperty, value);
+    }
+    
+    public IBrush GridBrush
+    {
+        get => GetValue(GridBrushProperty);
+        set => SetValue(GridBrushProperty, value);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        base.Render(context);
+        
+        
+        if (Bounds.Width <= 0 || Bounds.Height <= 0)
+            return;
+        
+        // background grid
+        DrawGrid(context, Bounds);
+        
+        if (Values.Count == 0)
+            return;
+
+
+        var min = Values.Min();
+        var max = Values.Max();
+        if (Math.Abs(min - max) < 0.001)
+        {
+            min -= 1;
+            max += 1;
+        }
+
+
+        var geo = new StreamGeometry();
+        using (var ctx = geo.Open())
+        {
+            if (Values.Count > 1)
+            {
+                Point p0 = Map(0, Values[0]);
+                ctx.BeginFigure(p0, false);
+
+
+                for (int i = 0; i < Values.Count - 1; i++)
+                {
+                    var p1 = Map(i, Values[i]);
+                    var p2 = Map(i + 1, Values[i + 1]);
+
+
+                    // control points for smoothing
+                    var c1 = new Point((p1.X + p2.X) / 2, p1.Y);
+                    var c2 = new Point((p1.X + p2.X) / 2, p2.Y);
+
+
+                    ctx.CubicBezierTo(c1, c2, p2);
+                }
+                ctx.EndFigure(false);
+            }
+        }
+
+
+        // stroke
+        context.DrawGeometry(null, new Pen(GraphBrush, 2), geo);
+        
+        // draw points
+        for (var i = 0; i < Values.Count; i++)
+        {
+            var p = Map(i, Values[i]);
+            context.DrawEllipse(GraphBrush, null, p, 3, 3);
+        }
+
+        return;
+
+        // map data index/value -> point
+        Point Map(int i, double val)
+        {
+            var x = Bounds.X + Bounds.Width * (i / (double)Math.Max(1, Values.Count - 1));
+            var y = Bounds.Y + Bounds.Height - (val - min) / (max - min) * Bounds.Height;
+            return new Point(x, y);
+        }
+    }
+
+    private void DrawGrid(DrawingContext dc, Rect r)
+    {
+        var pen = new Pen(GridBrush, 0.5);
+        var rows = 4;
+        var cols = Math.Max(2, Values?.Count ?? 2);
+        for (var i = 0; i <= rows; i++)
+        {
+            var y = r.Y + i * (r.Height / rows);
+            dc.DrawLine(pen, new Point(r.X, y), new Point(r.Right, y));
+        }
+
+        for (var j = 0; j <= cols; j++)
+        {
+            var x = r.X + j * (r.Width / cols);
+            dc.DrawLine(pen, new Point(x, r.Y), new Point(x, r.Bottom));
+        }
+    }
+}

Nebula.Launcher/Converters/TypeConverters.cs

@@ -1,11 +1,14 @@
-using Avalonia;
-using Avalonia.Controls;
+using System;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
+using Avalonia.Platform;
+using Nebula.Launcher.Utils;
+using Nebula.Launcher.ViewModels.Pages;
+using Color = System.Drawing.Color;
 
 namespace Nebula.Launcher.Converters;
 
-public class TypeConverters
+public static class TypeConverters
 {
     public static FuncValueConverter<string, string?> IconConverter { get; } =
         new(iconKey =>
@@ -13,4 +16,17 @@ 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")));
+        });
+
+    public static FuncValueConverter<string, Avalonia.Media.Color> NameColorRepresentation { get; } =
+        new((str)=>ColorUtils.GetColorFromString(str ?? throw new ArgumentNullException(nameof(str),"Name of color is null!")));
+    
+    public static FuncValueConverter<string, bool> StringIsNotEmpty { get; } =
+        new(iconKey => !string.IsNullOrEmpty(iconKey));
 }

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,29 +1,60 @@
-using Nebula.Launcher.ViewModels.Pages;
+using System.Collections.Generic;
+using System.Globalization;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.Models.Auth;
+using Nebula.Shared.ConfigMigrations;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Configurations.Migrations;
 using Nebula.Shared.Services;
 
 namespace Nebula.Launcher;
 
 public static class LauncherConVar
 {
-    public static readonly ConVar<ProfileAuthCredentials[]> AuthProfiles =
-        ConVarBuilder.Build<ProfileAuthCredentials[]>("auth.profiles.v2", []);
+    public static readonly ConVar<bool> DoMigration =
+        ConVarBuilder.Build("migration.doMigrate", true);
+    
+    public static readonly ConVar<string[]> AuthProfiles =
+        ConVarBuilder.BuildWithMigration<string[]>("auth.profiles.v4", 
+            MigrationQueueBuilder.Instance
+                .With(new ProfileMigrationV2("auth.profiles.v2","auth.profiles.v4"))
+                .With(new ProfileMigrationV3V4("auth.profiles.v3","auth.profiles.v4"))
+                .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", []);
     
-    public static readonly ConVar<AuthServerCredentials[]> AuthServers = ConVarBuilder.Build<AuthServerCredentials[]>("launcher.authServers", [
+    public static readonly ConVar<Dictionary<string,string>> ServerCustomNames = 
+        ConVarBuilder.Build<Dictionary<string,string>>("server.names", []);
+    
+    public static readonly ConVar<AuthServerCredentials[]> AuthServers = 
+        ConVarBuilder.Build<AuthServerCredentials[]>("launcher.authServers", [
         new AuthServerCredentials(
             "WizDen", 
             [
+                "https://feline.durenko.tatar/auth-api/",
                 "https://auth.spacestation14.com/",
-                "https://auth.fallback.spacestation14.com/"
+                "https://auth.fallback.spacestation14.com/",
+            ]),
+        new AuthServerCredentials(
+            "SimpleStation", 
+            [
+                "https://auth.simplestation.org/",
             ])
     ]);
+    
+    public static readonly ConVar<ServerHubRecord[]> Hub = ConVarBuilder.Build<ServerHubRecord[]>("launcher.hub.v2", [
+        new ServerHubRecord("WizDen", "https://feline.durenko.tatar/hub-api/api/servers"),
+        new ServerHubRecord("AltHub","https://hub.singularity14.co.uk/api/servers")
+    ]);
 
-    public static readonly ConVar<string> CurrentLang = ConVarBuilder.Build<string>("launcher.language", "en-US");
+    public static readonly ConVar<string> CurrentLang = ConVarBuilder.Build<string>("launcher.language", CultureInfo.CurrentCulture.Name);
     public static readonly ConVar<string> ILSpyUrl = ConVarBuilder.Build<string>("decompiler.url",
-    "https://github.com/icsharpcode/ILSpy/releases/download/v9.0/ILSpy_binaries_9.0.0.7889-x64.zip");
+    "https://feline.durenko.tatar/ILSpy_selfcontained_10.0.0.8330-x64.zip");
+    
+    public static readonly ConVar<string> ILSpyVersion = ConVarBuilder.Build<string>("dotnet.version", "10");
 }

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,12 @@
+using System.Text.Json.Serialization;
+using System.Windows.Input;
+using Avalonia.Media;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Models.Auth;
+
+public sealed record ProfileEntry(
+    ProfileAuthCredentials Credentials, 
+    string AuthName,
+    [property: JsonIgnore] ICommand OnSelect = default!,
+    [property: JsonIgnore] ICommand OnDelete = default!);

Nebula.Launcher/Models/ContentLogConsumer.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using Nebula.Launcher.ProcessHelper;
+using Nebula.Launcher.ViewModels;
+using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Models;
+
+public sealed class ContentLogConsumer : IProcessLogConsumer
+{
+    private readonly PopupMessageService _popupMessageService;
+    private readonly List<string> _outMessages = [];
+    
+    private LogPopupModelView? _currentLogPopup;
+    
+    public int MaxMessages { get; set; } = 100;
+
+    public ContentLogConsumer(PopupMessageService popupMessageService)
+    {
+        _popupMessageService = popupMessageService;
+    }
+
+    public void Popup()
+    {
+        if(_currentLogPopup is not null) 
+            return;
+        
+        _currentLogPopup = new LogPopupModelView(_popupMessageService);
+        _currentLogPopup.OnDisposing += OnLogPopupDisposing;
+        
+        foreach (var message in _outMessages.ToArray())
+        {
+            _currentLogPopup.Append(message);
+        }
+        
+        _popupMessageService.Popup(_currentLogPopup);
+    }
+
+    private void OnLogPopupDisposing(PopupViewModelBase obj)
+    {
+        if(_currentLogPopup == null) 
+            return;
+        
+        _currentLogPopup.OnDisposing -= OnLogPopupDisposing;
+        _currentLogPopup = null;
+    }
+
+    public void Out(string text)
+    {
+        _outMessages.Add(text);
+        if(_outMessages.Count >= MaxMessages)
+            _outMessages.RemoveAt(0);
+        
+        _currentLogPopup?.Append(text);
+    }
+
+    public void Error(string text)
+    {
+        Out(text);
+    }
+
+    public void Fatal(string text)
+    {
+        _popupMessageService.Popup(new ExceptionCompound("Error while running program", 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/IRunningSignalConsumer.cs

@@ -0,0 +1,6 @@
+namespace Nebula.Launcher.Models;
+
+public interface IRunningSignalConsumer
+{
+    public void ProcessRunningSignal(bool isRunning);
+}

Nebula.Launcher/Models/ListItemTemplate.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Text.Json.Serialization;
+using Nebula.Launcher.ServerListProviders;
+
+namespace Nebula.Launcher.Models;
+
+public record ListItemTemplate(Type ModelType, string IconKey, string Label);
+public record ServerListTabTemplate(IServerListProvider ServerListProvider, string TabName);
+public record ServerHubRecord(
+    [property:JsonPropertyName("name")] string Name,
+    [property:JsonPropertyName("url")] string MainUrl);

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

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -15,33 +14,24 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.3.0"/>
-        <PackageReference Include="Avalonia" Version="11.2.1"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.1"/>
-        <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1"/>
+        <PackageReference Include="AsyncImageLoader.Avalonia"/>
+        <PackageReference Include="Avalonia"/>
+        <PackageReference Include="Avalonia.Desktop"/>
+        <PackageReference Include="Avalonia.Svg.Skia"/>
+        <PackageReference Include="Avalonia.Themes.Fluent"/>
+        <PackageReference Include="Avalonia.Fonts.Inter"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.2.1">
+        <PackageReference Include="Avalonia.Diagnostics">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1"/>
-        <PackageReference Include="Fluent.Net" Version="1.0.63" />
-        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
-        <PackageReference Include="libsodium" Version="1.0.20"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Update="Views\Tabs\ServerListTab.axaml.cs">
-            <DependentUpon>ServerListTab.axaml</DependentUpon>
-            <SubType>Code</SubType>
-        </Compile>
-        <Compile Update="Views\Popup\AddFavoriteView.axaml.cs">
-          <DependentUpon>AddFavoriteView.axaml</DependentUpon>
-          <SubType>Code</SubType>
-        </Compile>
+        <PackageReference Include="CommunityToolkit.Mvvm"/>
+        <PackageReference Include="Fluent.Net"/>
+        <PackageReference Include="JetBrains.Annotations"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
+        <PackageReference Include="libsodium"/>
+        <PackageReference Include="Robust.Natives"/>
+        <PackageReference Include="Avalonia.Controls.ItemsRepeater"/>
     </ItemGroup>
 
     <Target Name="BuildCheck" AfterTargets="AfterBuild">
@@ -49,6 +39,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">
@@ -56,6 +48,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>
@@ -68,5 +62,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Nebula.Shared\Nebula.Shared.csproj"/>
         <ProjectReference Include="..\Nebula.SourceGenerators\Nebula.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+        <ProjectReference Include="..\Nebula.Runner\Nebula.Runner.csproj"
+                          ReferenceOutputAssembly="false" />
     </ItemGroup>
 </Project>

Nebula.Launcher/ProcessHelper/DotnetProcessStartInfoProviderBase.cs

@@ -0,0 +1,26 @@
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+public abstract class DotnetProcessStartInfoProviderBase(DotnetResolverService resolverService) : IProcessStartInfoProvider
+{
+    protected abstract string GetDllPath();
+    
+    public virtual async Task<ProcessStartInfo> GetProcessStartInfo(CancellationToken cancellationToken = default)
+    {
+        return new ProcessStartInfo
+        {
+            FileName = await resolverService.EnsureDotnet(cancellationToken),
+            Arguments = GetDllPath(),
+            CreateNoWindow = true,
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            StandardOutputEncoding = Encoding.UTF8
+        };
+    }
+}

Nebula.Launcher/ProcessHelper/GameProcessStartInfoProvider.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+[ServiceRegister(isSingleton:false)]
+public sealed class GameProcessStartInfoProvider(DotnetResolverService resolverService, AccountInfoViewModel accountInfoViewModel) : 
+    DotnetProcessStartInfoProviderBase(resolverService)
+{
+    private string? _publicKey;
+    private RobustUrl _address = default!;
+    
+    protected override string GetDllPath()
+    {
+        var path = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+        return Path.Join(path, "Nebula.Runner.dll");
+    }
+
+    public GameProcessStartInfoProvider WithBuildInfo(string publicKey, RobustUrl address)
+    {
+        _publicKey = publicKey;
+        _address = address;
+
+        return this;
+    }
+
+    public override async Task<ProcessStartInfo> GetProcessStartInfo(CancellationToken cancellationToken = default)
+    {
+        var baseStart = await base.GetProcessStartInfo(cancellationToken);
+        
+        var authProv = accountInfoViewModel.Credentials.Value;
+        if(authProv is null) 
+            throw new Exception("Client is without selected auth");
+
+        baseStart.EnvironmentVariables["ROBUST_AUTH_USERID"] = authProv.UserId.ToString();
+        baseStart.EnvironmentVariables["ROBUST_AUTH_TOKEN"] = authProv.Token.Token;
+        baseStart.EnvironmentVariables["ROBUST_AUTH_SERVER"] = authProv.AuthServer;
+        baseStart.EnvironmentVariables["AUTH_LOGIN"] = authProv.Login;
+        baseStart.EnvironmentVariables["ROBUST_AUTH_PUBKEY"] = _publicKey;
+        baseStart.EnvironmentVariables["GAME_URL"] = _address.ToString();
+        
+        return baseStart;
+    }
+}

Nebula.Launcher/ProcessHelper/GameRunnerPreparer.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+using Nebula.Shared.Utils;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+[ServiceRegister]
+public sealed class GameRunnerPreparer(IServiceProvider provider, ContentService contentService, EngineService engineService)
+{
+    public async Task<GameProcessStartInfoProvider> GetGameProcessStartInfoProvider(RobustUrl address, ILoadingHandlerFactory loadingHandlerFactory, CancellationToken cancellationToken = default)
+    {
+        var buildInfo = await contentService.GetBuildInfo(address, cancellationToken);
+        
+        var engine = await engineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion, loadingHandlerFactory, cancellationToken);
+
+        if (engine is null)
+            throw new Exception("Engine version not found: " + buildInfo.BuildInfo.Build.EngineVersion);
+
+        var hashApi = await contentService.EnsureItems(buildInfo, loadingHandlerFactory, cancellationToken);
+        
+        if (hashApi.TryOpen("manifest.yml", out var stream))
+        {
+            var modules = ContentManifestParser.ExtractModules(stream);
+
+            foreach (var moduleStr in modules)
+            {
+                var module = await engineService.EnsureEngineModules(moduleStr, loadingHandlerFactory, buildInfo.BuildInfo.Build.EngineVersion);
+                if(module is null) 
+                    throw new Exception("Module not found: " + moduleStr);
+            }
+            
+            await stream.DisposeAsync();
+        }
+
+        return 
+            provider.GetService<GameProcessStartInfoProvider>()!.WithBuildInfo(buildInfo.BuildInfo.Auth.PublicKey,
+                address);
+        
+    }
+}

Nebula.Launcher/ProcessHelper/IProcessConsumerCollection.cs

@@ -0,0 +1,6 @@
+namespace Nebula.Launcher.ProcessHelper;
+
+public interface IProcessConsumerCollection
+{
+    public void RegisterLogger(IProcessLogConsumer consumer);
+}

Nebula.Launcher/ProcessHelper/IProcessLogConsumer.cs

@@ -0,0 +1,8 @@
+namespace Nebula.Launcher.ProcessHelper;
+
+public interface IProcessLogConsumer
+{
+    public void Out(string text);
+    public void Error(string text);
+    public void Fatal(string text);
+}

Nebula.Launcher/ProcessHelper/IProcessRunner.cs

@@ -0,0 +1,10 @@
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+public interface IProcessStartInfoProvider
+{
+    public Task<ProcessStartInfo> GetProcessStartInfo(CancellationToken cancellationToken = default);
+}

Nebula.Launcher/ProcessHelper/ProcessLogConsumerCollection.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+public sealed class ProcessLogConsumerCollection: IProcessLogConsumer, IProcessConsumerCollection
+{
+    private readonly List<IProcessLogConsumer> _consumers = [];
+
+    public void RegisterLogger(IProcessLogConsumer consumer)
+    {
+        _consumers.Add(consumer);
+    }
+
+    public void Out(string text)
+    {
+        foreach (var consumer in _consumers)
+        {
+            consumer.Out(text);
+        }
+    }
+
+    public void Error(string text)
+    {
+        foreach (var consumer in _consumers)
+        {
+            consumer.Error(text);
+        }
+    }
+
+    public void Fatal(string text)
+    {
+        foreach (var consumer in _consumers)
+        {
+            consumer.Fatal(text);
+        }
+    }
+}

Nebula.Launcher/ProcessHelper/ProcessRunHandler.cs

@@ -0,0 +1,213 @@
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Shared.Services;
+using Nebula.Shared.Services.Logging;
+
+namespace Nebula.Launcher.ProcessHelper;
+
+public class ProcessRunHandler : IDisposable
+{
+    private Process? _process;
+    private readonly IProcessLogConsumer _logConsumer;
+    
+    private StringBuilder _lastErrorBuilder = new StringBuilder();
+    
+    public bool IsRunning => _process is not null;
+    public Action<ProcessRunHandler>? OnProcessExited;
+
+    public AsyncValueCache<ProcessStartInfo> ProcessStartInfoProvider { get; }
+    
+    public bool Disposed { get; private set; }
+    
+    public ProcessRunHandler(IProcessStartInfoProvider processStartInfoProvider, IProcessLogConsumer logConsumer)
+    {
+        _logConsumer = logConsumer;
+
+        ProcessStartInfoProvider = new AsyncValueCache<ProcessStartInfo>(processStartInfoProvider.GetProcessStartInfo);
+    }
+
+    private void CheckIfDisposed()
+    {
+        if (!Disposed) return;
+        throw new ObjectDisposedException(nameof(ProcessRunHandler));
+    }
+
+    public void Start()
+    {
+        CheckIfDisposed();
+        if(_process is not null) 
+            throw new InvalidOperationException("Already running");
+        
+        _process = Process.Start(ProcessStartInfoProvider.GetValue());
+        
+        if (_process is null) return;
+        
+        _process.EnableRaisingEvents = true;
+
+        _process.BeginOutputReadLine();
+        _process.BeginErrorReadLine();
+
+        _process.OutputDataReceived += OnOutputDataReceived;
+        _process.ErrorDataReceived += OnErrorDataReceived;
+
+        _process.Exited += OnExited;
+    }
+    
+    public void Stop()
+    {
+        CheckIfDisposed();
+        Dispose();
+    }
+    
+    private void OnExited(object? sender, EventArgs e)
+    {
+        if (_process is null) return;
+
+        _process.OutputDataReceived -= OnOutputDataReceived;
+        _process.ErrorDataReceived -= OnErrorDataReceived;
+        _process.Exited -= OnExited;
+        
+        if (_process.ExitCode != 0)
+            _logConsumer.Fatal(_lastErrorBuilder.ToString());
+        
+        _process.Dispose();
+        _process = null;
+        
+        OnProcessExited?.Invoke(this);
+        Dispose();
+    }
+
+    private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
+    {
+        if (e.Data == null) return;
+
+        if (!e.Data.StartsWith("  "))
+            _lastErrorBuilder.Clear();
+        
+        _lastErrorBuilder.AppendLine(e.Data);
+        _logConsumer.Error(e.Data);
+    }
+
+    private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
+    {
+        if (e.Data != null)
+        {
+            _logConsumer.Out(e.Data);
+        }
+    }
+
+    public void Dispose()
+    {
+        if (_process is not null)
+        {
+            _process.CloseMainWindow();
+            return;
+        }
+        
+        ProcessStartInfoProvider.Invalidate();
+        
+        CheckIfDisposed();
+        
+        Disposed = true;
+    }
+}
+
+public sealed class DebugLoggerBridge : IProcessLogConsumer
+{
+    private ILogger _logger;
+
+    public DebugLoggerBridge(ILogger logger)
+    {
+        _logger = logger;
+    }
+
+    public void Out(string text)
+    {
+        _logger.Log(LoggerCategory.Log, text);
+    }
+
+    public void Error(string text)
+    {
+        _logger.Log(LoggerCategory.Error, text);
+    }
+
+    public void Fatal(string text)
+    {
+        _logger.Log(LoggerCategory.Error, text);
+    }
+}
+
+public class AsyncValueCache<T>
+{
+    private readonly Func<CancellationToken, Task<T>> _valueFactory;
+    private readonly SemaphoreSlim _semaphore = new(1, 1);
+    private readonly CancellationTokenSource _cacheCts = new();
+    
+    private Lazy<Task<T>> _lazyTask = null!;
+    private T _cachedValue = default!;
+    private bool _isCacheValid;
+
+    public AsyncValueCache(Func<CancellationToken, Task<T>> valueFactory)
+    {
+        _valueFactory = valueFactory ?? throw new ArgumentNullException(nameof(valueFactory));
+        ResetLazyTask();
+    }
+
+    public T GetValue()
+    {
+        if (_isCacheValid) return _cachedValue;
+
+        try
+        {
+            _semaphore.Wait();
+            if (_isCacheValid) return _cachedValue;
+
+            _cachedValue = _lazyTask.Value
+                .ConfigureAwait(false)
+                .GetAwaiter()
+                .GetResult();
+            
+            _isCacheValid = true;
+            return _cachedValue;
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    public void Invalidate()
+    {
+        using var cts = new CancellationTokenSource();
+        try
+        {
+            _semaphore.Wait();
+            _isCacheValid = false;
+            _cacheCts.Cancel();
+            _cacheCts.Dispose();
+            ResetLazyTask();
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    private void ResetLazyTask()
+    {
+        _lazyTask = new Lazy<Task<T>>(() => 
+            _valueFactory(_cacheCts.Token)
+                .ContinueWith(t => 
+                {
+                    if (t.IsCanceled || t.IsFaulted)
+                    {
+                        _isCacheValid = false;
+                        throw t.Exception ?? new Exception();
+                    }
+                    return t.Result;
+                }, TaskContinuationOptions.ExecuteSynchronously));
+    }
+}

Nebula.Launcher/ServerListProviders/FavoriteServerListProvider.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Launcher.ViewModels;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+using Nebula.Shared.Utils;
+
+namespace Nebula.Launcher.ServerListProviders;
+
+[ServiceRegister, ConstructGenerator]
+public sealed partial class FavoriteServerListProvider : IServerListProvider
+{
+    [GenerateProperty] private ConfigurationService ConfigurationService { get; }
+    [GenerateProperty] private IServiceProvider ServiceProvider { get; }
+    [GenerateProperty] private ServerViewContainer ServerViewContainer { get; }
+
+    public Action? OnRefreshRequired;
+    
+    private string[] _rawServerLists = [];
+    
+    public void LoadServerList(
+        AvaloniaList<IListEntryModelView> servers, 
+        AvaloniaList<Exception> exceptions)
+    {
+        foreach (var server in _rawServerLists)
+        {
+            var container = ServerViewContainer.Get(server);
+            servers.Add(container);
+        }
+        
+        servers.Add(new AddFavoriteButton(ServiceProvider));
+    }
+
+    public void AddFavorite(RobustUrl robustUrl)
+    {
+        var servers = GetFavoriteEntries();
+        servers.Add(robustUrl.ToString());
+        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
+        if(ServerViewContainer.Get(robustUrl) is IFavoriteEntryModelView favoriteView) favoriteView.IsFavorite = true;
+    }
+
+    public void RemoveFavorite(ServerEntryViewModel entryViewModel)
+    {
+        var servers = GetFavoriteEntries();
+        servers.Remove(entryViewModel.Address.ToString());
+        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
+    }
+    
+    public void RemoveFavorite(RobustUrl url)
+    {
+        var servers = GetFavoriteEntries();
+        servers.Remove(url.ToString());
+        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
+    }
+
+    private List<string> GetFavoriteEntries()
+    {
+        return _rawServerLists.ToList();
+    }
+
+    private void Initialise()
+    {
+        ConfigurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnVarChanged, true);
+    }
+
+    private void OnVarChanged(string[]? value)
+    {
+        if (value == null)
+        {
+            _rawServerLists = [];
+            return;
+        }
+
+        _rawServerLists = value;
+        OnRefreshRequired?.Invoke();
+    }
+
+    private void InitialiseInDesignMode(){}
+}
+
+public sealed class AddFavoriteButton: Border, IListEntryModelView{
+
+    private readonly Button _addFavoriteButton = new();
+    public AddFavoriteButton(IServiceProvider serviceProvider)
+    {
+        Margin = new Thickness(5, 5, 5, 20);
+        Background = new SolidColorBrush(Color.Parse("#222222"));
+        CornerRadius = new CornerRadius(20f);
+        _addFavoriteButton.HorizontalAlignment = HorizontalAlignment.Center;
+        _addFavoriteButton.Click += (sender, args) =>
+        {
+            serviceProvider.GetService<PopupMessageService>()!.Popup(
+                serviceProvider.GetService<AddFavoriteViewModel>()!);
+        };
+        _addFavoriteButton.Content = "Add Favorite";
+        Child = _addFavoriteButton;
+    }
+    public void Dispose(){}
+}

Nebula.Launcher/ServerListProviders/HubServerListProvider.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Threading;
+using Nebula.Launcher.Services;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.ServerListProviders;
+
+[ServiceRegister(null, false), ConstructGenerator]
+public sealed partial class HubServerListProvider : IServerListProvider, IDisposable
+{
+    private CancellationTokenSource? _cts;
+    private readonly SemaphoreSlim _loadLock = new(1, 1);
+    
+    [GenerateProperty] private RestService RestService { get; }
+    [GenerateProperty] private ServerViewContainer ServerViewContainer { get; }
+
+    private string _hubUrl;
+
+    public HubServerListProvider With(string hubUrl)
+    {
+        _hubUrl = hubUrl;
+        return this;
+    }
+
+    public void LoadServerList(
+        AvaloniaList<IListEntryModelView> servers, 
+        AvaloniaList<Exception> exceptions)
+    {
+        servers.Add(new LoadingServerEntry());
+        Task.Run(() => LoadServerListAsync(servers, exceptions));
+    }
+
+    private void SyncServers(List<IListEntryModelView> servers, 
+        AvaloniaList<IListEntryModelView> collection)
+    {
+        collection.Clear();
+        collection.AddRange(servers);
+    }
+
+    private async Task LoadServerListAsync(
+        AvaloniaList<IListEntryModelView> servers, 
+        AvaloniaList<Exception> exceptions)
+    {
+        CancellationTokenSource localCts;
+        
+        await _loadLock.WaitAsync();
+        try
+        {
+            _cts?.Cancel();
+            _cts?.Dispose();
+
+            _cts = new CancellationTokenSource();
+            localCts = _cts;
+        }
+        finally
+        {
+            _loadLock.Release();
+        }
+
+        try
+        {
+            var serversRaw = await RestService.GetAsync<List<ServerHubInfo>>(
+                new Uri(_hubUrl),
+                localCts.Token
+            );
+
+            serversRaw.Sort(new ServerComparer());
+
+            localCts.Token.ThrowIfCancellationRequested();
+
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                var serverList = new List<IListEntryModelView>();
+                
+                foreach (var info in serversRaw)
+                {
+                    serverList.Add(ServerViewContainer.Get(info.Address, info.StatusData));
+                }
+                SyncServers(serverList, servers);
+            });
+        }
+        catch (OperationCanceledException)
+        {
+            // Ignore cancel think
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            exceptions.Add(
+                new Exception(
+                    $"Some error while loading server list from {_hubUrl}. See inner exception",
+                    e
+                )
+            );
+        }
+    }
+    
+    private void Initialise(){}
+    private void InitialiseInDesignMode(){}
+
+    public void Dispose()
+    {
+        _cts?.Dispose();
+    }
+}
+
+public sealed class LoadingServerEntry : Label, IListEntryModelView
+{
+    public LoadingServerEntry()
+    {
+        HorizontalAlignment = HorizontalAlignment.Center;
+        Content = LocalizationService.GetString("server-list-loading");
+    }
+    public void Dispose()
+    {}
+}

Nebula.Launcher/ServerListProviders/IServerListProvider.cs

@@ -0,0 +1,12 @@
+using System;
+using Avalonia.Collections;
+using Nebula.Launcher.ViewModels.Pages;
+
+namespace Nebula.Launcher.ServerListProviders;
+
+public interface IServerListProvider
+{
+    public void LoadServerList(
+        AvaloniaList<IListEntryModelView> servers,
+        AvaloniaList<Exception> exceptions);
+}

Nebula.Launcher/ServerListProviders/TestServerList.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.ObjectModel;
+using Avalonia.Collections;
+using Nebula.Launcher.ViewModels;
+using Nebula.Launcher.ViewModels.Pages;
+
+namespace Nebula.Launcher.ServerListProviders;
+
+public sealed class TestServerList : IServerListProvider
+{
+    public  void LoadServerList(
+        AvaloniaList<IListEntryModelView> servers, 
+        AvaloniaList<Exception> exceptions)
+    {
+        
+        //servers.Add(new ServerEntryViewModel());
+        //servers.Add(new ServerEntryViewModel());
+        
+        exceptions.Add(new Exception("Oh no!"));
+    }
+}

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/DecompilerService.cs

@@ -4,8 +4,10 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.IO.Pipelines;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Shared;
@@ -14,6 +16,8 @@ using Nebula.Shared.FileApis.Interfaces;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
 using Nebula.Shared.Services.Logging;
+using Nebula.Shared.Utils;
+using Nebula.SharedModels;
 
 namespace Nebula.Launcher.Services;
 
@@ -25,35 +29,32 @@ public sealed partial class DecompilerService
     [GenerateProperty] private ViewHelperService ViewHelperService {get;}
     [GenerateProperty] private ContentService ContentService {get;}
     [GenerateProperty] private FileService FileService {get;}
-    [GenerateProperty] private CancellationService CancellationService {get;}
     [GenerateProperty] private EngineService EngineService {get;}
     [GenerateProperty] private DebugService DebugService {get;}
 
-    private HttpClient _httpClient = new HttpClient();
+    private readonly HttpClient _httpClient = new();
     private ILogger _logger;
 
-    private static string fullPath = Path.Join(FileService.RootPath,"ILSpy");
-    private static string executePath = Path.Join(fullPath, "ILSpy.exe");
+    private string FullPath => Path.Join(AppDataPath.RootPath, $"ILSpy.{ConfigurationService.GetConfigValue(LauncherConVar.ILSpyVersion)}");
+    private string ExecutePath => Path.Join(FullPath, "ILSpy.exe");
 
     public async void OpenDecompiler(string arguments){
         await EnsureILSpy();
         var startInfo = new ProcessStartInfo(){
-            FileName = executePath,
+            FileName = ExecutePath,
             Arguments = arguments
         };
         Process.Start(startInfo);
     }
 
-    public async void OpenServerDecompiler(RobustUrl url)
+    public async void OpenServerDecompiler(RobustUrl url, CancellationToken cancellationToken)
     {
         var myTempDir = FileService.EnsureTempDir(out var tmpDir);
 
-        ILoadingHandler loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
-        
+        using var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
         var buildInfo =
-            await ContentService.GetBuildInfo(url, CancellationService.Token);
-        var engine = await EngineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion);
-
+            await ContentService.GetBuildInfo(url, cancellationToken);
+        var engine = await EngineService.EnsureEngine(buildInfo.BuildInfo.Build.EngineVersion, loadingHandler, cancellationToken);
         if (engine is null)
             throw new Exception("Engine version not found: " + buildInfo.BuildInfo.Build.EngineVersion);
 
@@ -63,18 +64,16 @@ public sealed partial class DecompilerService
             myTempDir.Save(file, stream);
             await stream.DisposeAsync();
         }
-
-        var hashApi = await ContentService.EnsureItems(buildInfo.RobustManifestInfo, loadingHandler, CancellationService.Token);
-
-        foreach (var (file, hash) in hashApi.Manifest)
+        
+        var hashApi = await ContentService.EnsureItems(buildInfo, loadingHandler, cancellationToken);
+        
+        foreach (var file in hashApi.AllFiles)
         {
-            if(!file.Contains(".dll") || !hashApi.TryOpen(hash, out var stream)) continue;
+            if(!file.Contains(".dll") || !hashApi.TryOpen(file, out var stream)) continue;
             myTempDir.Save(Path.GetFileName(file), stream);
             await stream.DisposeAsync();
         }
         
-        ((IDisposable)loadingHandler).Dispose();
-        
         _logger.Log("File extracted. " + tmpDir);
         
         OpenDecompiler(string.Join(' ', myTempDir.AllFiles.Select(f=>Path.Join(tmpDir, f))) + " --newinstance");
@@ -87,18 +86,25 @@ public sealed partial class DecompilerService
     private void InitialiseInDesignMode(){}
 
     private async Task EnsureILSpy(){
-        if(!Directory.Exists(fullPath))
+        if(!Directory.Exists(FullPath))
             await Download();
     }
 
     private async Task Download(){
         using var loading = ViewHelperService.GetViewModel<LoadingContextViewModel>();
         loading.LoadingName = "Download ILSpy";
-        loading.SetJobsCount(1);
+        var context = loading.CreateLoadingContext();
         PopupMessageService.Popup(loading);
         using var response = await _httpClient.GetAsync(ConfigurationService.GetConfigValue(LauncherConVar.ILSpyUrl));
-        using var zipArchive = new ZipArchive(await response.Content.ReadAsStreamAsync());
-        Directory.CreateDirectory(fullPath);
-        zipArchive.ExtractToDirectory(fullPath);
+        Console.WriteLine(response.StatusCode);
+        context.SetJobsCount(response.Content.Headers.ContentLength ?? 1000);
+        
+        using var stream = await response.Content.ReadAsStreamAsync();
+        using var memoryStream = new MemoryStream();
+        stream.CopyTo(memoryStream, context);
+        
+        using var zipArchive = new ZipArchive(memoryStream);
+        Directory.CreateDirectory(FullPath);
+        zipArchive.ExtractToDirectory(FullPath);
     }
 }

Nebula.Launcher/Services/GameRunnerService.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.ProcessHelper;
+using Nebula.Launcher.ServerListProviders;
+using Nebula.Launcher.ViewModels;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+using Nebula.Shared.Services.Logging;
+
+namespace Nebula.Launcher.Services;
+
+[ServiceRegister]
+public class GameRunnerService
+{
+    private readonly PopupMessageService _popupMessageService;
+    private readonly ViewHelperService _viewHelperService;
+    private readonly GameRunnerPreparer _gameRunnerPreparer;
+    private readonly InstanceRunningContainer _instanceRunningContainer;
+    private readonly AccountInfoViewModel _accountInfoViewModel;
+    private readonly ServerViewContainer _container;
+    private readonly MainViewModel _mainViewModel;
+    private readonly FavoriteServerListProvider _favoriteServerListProvider;
+    private readonly RestService _restService;
+    private readonly CancellationService _cancellationService;
+    private readonly ILogger _logger;
+    
+    private readonly Dictionary<InstanceKey, RobustUrl> _robustUrls = new();
+    private readonly Dictionary<RobustUrl, InstanceKey> _robustKeys = new();
+
+    public GameRunnerService(PopupMessageService popupMessageService, 
+        DebugService debugService, 
+        ViewHelperService viewHelperService,
+        GameRunnerPreparer gameRunnerPreparer, 
+        InstanceRunningContainer instanceRunningContainer, 
+        AccountInfoViewModel accountInfoViewModel, 
+        ServerViewContainer container, 
+        MainViewModel mainViewModel, 
+        FavoriteServerListProvider favoriteServerListProvider,
+        RestService restService,
+        CancellationService cancellationService)
+    {
+        _popupMessageService = popupMessageService;
+        _viewHelperService = viewHelperService;
+        _gameRunnerPreparer = gameRunnerPreparer;
+        _instanceRunningContainer = instanceRunningContainer;
+        _accountInfoViewModel = accountInfoViewModel;
+        _container = container;
+        _mainViewModel = mainViewModel;
+        _favoriteServerListProvider = favoriteServerListProvider;
+        _restService = restService;
+        _cancellationService = cancellationService;
+
+        _logger = debugService.GetLogger("GameRunnerService");
+        _instanceRunningContainer.IsRunningChanged += IsRunningChanged;
+    }
+
+    private void IsRunningChanged(InstanceKey key, bool isRunning)
+    {
+        _logger.Debug($"IsRunningChanged {key}: {isRunning}");
+        if (!_robustUrls.TryGetValue(key, out var robustUrl)) return;
+        
+        if (_container.Get(robustUrl) is IRunningSignalConsumer signalConsumer)
+        {
+            _logger.Debug($"IsRunningChanged conf {robustUrl}: {isRunning}");
+            signalConsumer.ProcessRunningSignal(isRunning);
+        }
+            
+        if (!isRunning)
+        {
+            _robustKeys.Remove(robustUrl);
+            _robustUrls.Remove(key);
+        }
+    }
+
+    public void StopInstance(RobustUrl robustUrl)
+    {
+        if (_robustKeys.TryGetValue(robustUrl, out var instanceKey))
+        {
+            _instanceRunningContainer.Stop(instanceKey);
+        }
+    }
+
+    public void ReadInstanceLog(RobustUrl robustUrl)
+    {
+        if (_robustKeys.TryGetValue(robustUrl, out var instanceKey))
+        {
+            _instanceRunningContainer.Popup(instanceKey);
+        }
+    }
+    
+    public void OpenContentViewer(RobustUrl robustUrl)
+    {
+        _mainViewModel.RequirePage<ContentBrowserViewModel>().Go(robustUrl, ContentPath.Empty);
+    }
+
+    public void AddFavorite(RobustUrl robustUrl)
+    {
+        _favoriteServerListProvider.AddFavorite(robustUrl);
+    }
+    
+    public void RemoveFavorite(RobustUrl robustUrl)
+    {
+        _favoriteServerListProvider.RemoveFavorite(robustUrl);
+    }
+    
+    public void EditName(RobustUrl robustUrl, string? oldName)
+    {
+        var popup = _viewHelperService.GetViewModel<EditServerNameViewModel>();
+        popup.IpInput = robustUrl.ToString();
+        popup.NameInput = oldName ?? string.Empty;
+        _popupMessageService.Popup(popup);
+    }
+
+    public async Task<InstanceKey?> RunInstanceAsync(ServerEntryViewModel serverEntryViewModel, CancellationToken cancellationToken, bool ignoreLoginCredentials = false)
+    {
+        _logger.Log("Running instance..." + serverEntryViewModel.RealName);
+        if (!ignoreLoginCredentials && _accountInfoViewModel.Credentials.Value is null)
+        {
+            var warningContext = _viewHelperService.GetViewModel<IsLoginCredentialsNullPopupViewModel>()
+                .WithServerEntry(serverEntryViewModel);
+            
+            _popupMessageService.Popup(warningContext);
+            return null;
+        }
+
+        try
+        {
+            using var viewModelLoading = _viewHelperService.GetViewModel<LoadingContextViewModel>();
+            viewModelLoading.LoadingName = "Loading instance...";
+
+            _popupMessageService.Popup(viewModelLoading);
+            var currProcessStartProvider = 
+                await _gameRunnerPreparer.GetGameProcessStartInfoProvider(serverEntryViewModel.Address, viewModelLoading, cancellationToken);
+            _logger.Log("Preparing instance...");
+            var instanceKey = _instanceRunningContainer.RegisterInstance(currProcessStartProvider);
+            _robustUrls.Add(instanceKey, serverEntryViewModel.Address);
+            _robustKeys.Add(serverEntryViewModel.Address, instanceKey);
+            _instanceRunningContainer.Run(instanceKey);
+            _logger.Log($"Starting instance... {instanceKey.Id} " + serverEntryViewModel.RealName);
+            return instanceKey;
+        }
+        catch (Exception e)
+        {
+            var error = new Exception("Error while attempt run instance", e);
+            _logger.Error(error);
+            _popupMessageService.Popup(error);
+            return null;
+        }
+    }
+
+    public ServerEntryViewModel GetServerEntry(RobustUrl url, string customName, ServerStatus serverStatus)
+    {
+        return new ServerEntryViewModel(_restService, _cancellationService, this)
+            .WithData(url, customName, serverStatus);
+    }
+}

Nebula.Launcher/Services/InstanceRunningContainer.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.ProcessHelper;
+using Nebula.Launcher.ViewModels;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Shared;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Services;
+
+[ServiceRegister]
+public sealed class InstanceRunningContainer(
+    PopupMessageService popupMessageService,
+    DebugService debugService
+    )
+{
+    private readonly InstanceKeyPool _keyPool = new();
+    private readonly Dictionary<InstanceKey, ProcessRunHandler> _processCache = new();
+    private readonly Dictionary<InstanceKey, ContentLogConsumer> _contentLoggerCache = new();
+    private readonly Dictionary<ProcessRunHandler, InstanceKey> _keyCache = new();
+
+    public Action<InstanceKey, bool>? IsRunningChanged;
+
+    public InstanceKey RegisterInstance(IProcessStartInfoProvider provider)
+    {
+        var id = _keyPool.Take();
+        
+        var currentContentLogConsumer = new ContentLogConsumer(popupMessageService);
+        var logBridge = new DebugLoggerBridge(debugService.GetLogger("PROCESS_"+id.Id));
+        var logContainer = new ProcessLogConsumerCollection();
+        logContainer.RegisterLogger(currentContentLogConsumer);
+        logContainer.RegisterLogger(logBridge);
+        
+        var handler = new ProcessRunHandler(provider, logContainer);
+        handler.OnProcessExited += OnProcessExited;
+        
+        _processCache[id] = handler;
+        _contentLoggerCache[id] = currentContentLogConsumer;
+        _keyCache[handler] = id;
+        
+        return id;
+    }
+    
+    public void Popup(InstanceKey instanceKey)
+    {
+        if(!_contentLoggerCache.TryGetValue(instanceKey, out var handler)) 
+            return;
+        
+        handler.Popup();
+    }
+
+    public void Run(InstanceKey instanceKey)
+    {
+        if(!_processCache.TryGetValue(instanceKey, out var process)) 
+            return;
+        
+        process.Start();
+        IsRunningChanged?.Invoke(instanceKey, true);
+    }
+
+    public void Stop(InstanceKey instanceKey)
+    {
+        if(!_processCache.TryGetValue(instanceKey, out var process)) 
+            return;
+        
+        process.Stop();
+    }
+
+    public bool IsRunning(InstanceKey instanceKey)
+    {
+        return _processCache.ContainsKey(instanceKey);
+    }
+
+    private void RemoveProcess(ProcessRunHandler handler)
+    {
+        if(handler.Disposed) return;
+        
+        var key = _keyCache[handler];
+        IsRunningChanged?.Invoke(key, false);
+        _processCache.Remove(key);
+        _keyCache.Remove(handler);
+        _contentLoggerCache.Remove(key);
+    }
+
+    private void OnProcessExited(ProcessRunHandler obj)
+    {
+        obj.OnProcessExited -= OnProcessExited;
+        RemoveProcess(obj);
+    }
+}

Nebula.Launcher/Services/LocalisationService.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Avalonia.Platform;
-using Fluent.Net;
-using Nebula.Shared;
-using Nebula.Shared.Services;
-
-namespace Nebula.Launcher.Services;
-
-[ConstructGenerator, ServiceRegister]
-public partial class LocalisationService
-{
-    [GenerateProperty] private ConfigurationService ConfigurationService { get; }
-
-    private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
-    private MessageContext _currentMessageContext;
-    
-    private void Initialise()
-    {
-       // LoadLanguage(CultureInfo.GetCultureInfo(ConfigurationService.GetConfigValue(LauncherConVar.CurrentLang)!));
-    }
-
-    public void LoadLanguage(CultureInfo cultureInfo)
-    {
-        _currentCultureInfo = cultureInfo;
-        using var fs = AssetLoader.Open(new Uri($@"Assets/lang/{_currentCultureInfo.EnglishName}.ftl"));
-        using var sr = new StreamReader(fs);
-        
-        var options = new MessageContextOptions { UseIsolating = false };
-        var mc = new MessageContext(cultureInfo.EnglishName, options);
-        var errors = mc.AddMessages(sr);
-        foreach (var error in errors)
-        {
-            Console.WriteLine(error);
-        }
-
-        _currentMessageContext = mc;
-    }
-
-    private void InitialiseInDesignMode()
-    {
-        Initialise();
-    }
-}
-

Nebula.Launcher/Services/LocalizationService.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using Avalonia.Markup.Xaml;
+using Avalonia.Platform;
+using Fluent.Net;
+using Nebula.Shared;
+using Nebula.Shared.Services;
+
+namespace Nebula.Launcher.Services;
+
+[ConstructGenerator, ServiceRegister]
+public sealed partial class LocalizationService
+{
+    [GenerateProperty] private ConfigurationService ConfigurationService { get; }
+    [GenerateProperty] private DebugService DebugService { get; }
+    
+    private CultureInfo _currentCultureInfo = CultureInfo.CurrentCulture;
+    private static MessageContext? _currentMessageContext;
+
+    private void Initialise()
+    {
+        LoadLanguage(CultureInfo.GetCultureInfo(ConfigurationService.GetConfigValue(LauncherConVar.CurrentLang)!));
+    }
+
+    public void LoadLanguage(CultureInfo cultureInfo)
+    {
+        try
+        {
+            _currentCultureInfo = cultureInfo;
+            using var fs = AssetLoader.Open(new Uri($@"avares://Nebula.Launcher/Assets/lang/{_currentCultureInfo.Name}.ftl"));
+            using var sr = new StreamReader(fs);
+
+            var options = new MessageContextOptions { UseIsolating = false };
+            var mc = new MessageContext(cultureInfo.Name, options);
+            var errors = mc.AddMessages(sr);
+            foreach (var error in errors)
+            {
+                Console.WriteLine(error);
+            }
+
+            _currentMessageContext = mc;
+        } catch (Exception e) {
+            DebugService.GetLogger("localisationService").Error(e);
+            LoadLanguage(CultureInfo.GetCultureInfo("en-US"));
+        }
+    }
+
+    private void InitialiseInDesignMode()
+    {
+        Initialise();
+    }
+
+    public static string GetString(string locale, Dictionary<string, object>? options = null)
+    {
+        if (_currentMessageContext is null)
+        {
+            return locale;
+        }
+        var message = _currentMessageContext.GetMessage(locale);
+        if (message == null) return locale;
+        return _currentMessageContext.Format(message, options ?? []);
+    }
+}
+
+public class LocaledText : MarkupExtension
+{
+    public string Key { get; set; } 
+    public Dictionary<string, object>? Options { get; set; }
+
+    public LocaledText(string key) => Key = key;
+
+    public override object ProvideValue(IServiceProvider serviceProvider)
+    {
+        return LocalizationService.GetString(Key, Options);
+    }
+}

Nebula.Launcher/Utils/ColorUtils.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+using Avalonia.Media;
+
+namespace Nebula.Launcher.Utils;
+
+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/Utils/ExplorerUtils.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace Nebula.Launcher.Utils;
+
+
+public static class ExplorerUtils
+{
+    public static void OpenFolder(string path)
+    {
+        string command;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            command = "explorer.exe";
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            command = "xdg-open";
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            command = "open";
+        else
+            throw new PlatformNotSupportedException("Unsupported OS platform");
+        
+
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = command,
+            Arguments = path,
+            UseShellExecute = false
+        };
+
+        Process.Start(startInfo);
+    }
+}

Nebula.Launcher/Utils/VCRuntimeDllChecker.cs

@@ -0,0 +1,29 @@
+using System;
+using System.IO;
+
+namespace Nebula.Launcher.Utils;
+
+public static class VCRuntimeDllChecker
+{
+    public static bool AreVCRuntimeDllsPresent()
+    {
+        if (!OperatingSystem.IsWindows()) return true;
+        
+        string systemDir = Environment.SystemDirectory;
+        string[] requiredDlls = {
+            "msvcp140.dll",
+            "vcruntime140.dll"
+        };
+
+        foreach (var dll in requiredDlls)
+        {
+            var path = Path.Combine(systemDir, dll);
+            if (!File.Exists(path))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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/ContentView/ContentViewBase.cs

@@ -1,14 +0,0 @@
-using System;
-using System.IO;
-using Nebula.Launcher.ViewModels.Pages;
-
-namespace Nebula.Launcher.ViewModels.ContentView;
-public abstract class ContentViewBase : ViewModelBase, IDisposable
-{
-    public virtual void InitialiseWithData(ContentPath path, Stream stream, ContentEntry contentEntry)
-    {
-    }
-    public virtual void Dispose()
-    {
-    }
-}

Nebula.Launcher/ViewModels/ContentView/DecompilerContentView.cs

@@ -1,26 +0,0 @@
-using System.IO;
-using Nebula.Launcher.Services;
-using Nebula.Launcher.ViewModels.Pages;
-using Nebula.Shared.Utils;
-
-namespace Nebula.Launcher.ViewModels.ContentView;
-
-[ConstructGenerator]
-public sealed partial class DecompilerContentView: ContentViewBase
-{
-    [GenerateProperty] private DecompilerService decompilerService {get;}
-
-    public override void InitialiseWithData(ContentPath path, Stream stream, ContentEntry contentEntry)
-    {
-        base.InitialiseWithData(path, stream, contentEntry);
-        decompilerService.OpenServerDecompiler(contentEntry.ServerName.ToRobustUrl());
-    }
-
-    protected override void Initialise()
-    {
-    }
-
-    protected override void InitialiseInDesignMode()
-    {
-    }
-}

Nebula.Launcher/ViewModels/ExceptionCompound.cs

@@ -0,0 +1,39 @@
+using System;
+using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels;
+
+[ViewModelRegister(typeof(ExceptionView), false)]
+public class ExceptionCompound : ViewModelBase
+{
+    public ExceptionCompound()
+    {
+        Message = "Test exception";
+        StackTrace = "Stack trace";
+    }
+    
+    public ExceptionCompound(string message, string stackTrace)
+    {
+        Message = message;
+        StackTrace = stackTrace;
+    }
+
+    public ExceptionCompound(Exception ex)
+    {
+        Message = ex.Message;
+        StackTrace = ex.StackTrace;
+    }
+
+    public string Message { get; set; }
+    public string? StackTrace { get; set; }
+    
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+}

Nebula.Launcher/ViewModels/InstanceKey.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Nebula.Launcher.ViewModels;
+
+public record struct InstanceKey(int Id):
+    IEquatable<int>,
+    IComparable<InstanceKey>
+{
+    public static implicit operator InstanceKey(int id) => new InstanceKey(id);
+    public static implicit operator int(InstanceKey id) => id.Id;
+    public bool Equals(int other) => Id == other;
+    public int CompareTo(InstanceKey other) => Id.CompareTo(other.Id);
+};

Nebula.Launcher/ViewModels/InstanceKeyPool.cs

@@ -0,0 +1,16 @@
+namespace Nebula.Launcher.ViewModels;
+
+public sealed class InstanceKeyPool
+{
+    private int _nextId = 1;
+
+    public InstanceKey Take()
+    {
+        return new InstanceKey(_nextId++);
+    }
+
+    public void Free(InstanceKey id)
+    {
+        // TODO: make some free logic later
+    }
+}

Nebula.Launcher/ViewModels/MainViewModel.cs

@@ -4,15 +4,17 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.Services;
+using Nebula.Launcher.Utils;
 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;
+using Nebula.SharedModels;
 
 namespace Nebula.Launcher.ViewModels;
 
@@ -22,10 +24,10 @@ public partial class MainViewModel : ViewModelBase
 {
     private readonly List<ListItemTemplate> _templates =
     [
-        new ListItemTemplate(typeof(AccountInfoViewModel), "user", "Account", null),
-        new ListItemTemplate(typeof(ServerListViewModel), "file", "Servers", false),
-        new ListItemTemplate(typeof(ServerListViewModel), "star", "Favorites", true),
-        new ListItemTemplate(typeof(ContentBrowserViewModel), "folder", "Content", null)
+        new ListItemTemplate(typeof(AccountInfoViewModel), "user", "tab-account"),
+        new ListItemTemplate(typeof(ServerOverviewModel), "file", "tab-servers"),
+        new ListItemTemplate(typeof(ContentBrowserViewModel), "folder", "tab-content"),
+        new ListItemTemplate(typeof(ConfigurationViewModel), "settings", "tab-settings")
     ];
 
     private readonly List<PopupViewModelBase> _viewQueue = new();
@@ -39,12 +41,15 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty] private bool _isPopupClosable = true;
     [ObservableProperty] private bool _popup;
     [ObservableProperty] private ListItemTemplate? _selectedListItem;
-
+    [ObservableProperty] private string? _loginText = LocalizationService.GetString("auth-current-login-no-name");
+    
+    [GenerateProperty] private LocalizationService LocalizationService { get; } // Не убирать! Без этой хуйни вся локализация идет в пизду!
+    [GenerateProperty] private AccountInfoViewModel AccountInfoViewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
     [GenerateProperty] private ContentService ContentService { get; } = default!;
     [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
-    [GenerateProperty] private FileService FileService { get; } = default!;
+    [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
 
     private ILogger _logger;
 
@@ -52,12 +57,25 @@ public partial class MainViewModel : ViewModelBase
 
     protected override void InitialiseInDesignMode()
     {
-        Items = new ObservableCollection<ListItemTemplate>(_templates);
+        Items = new ObservableCollection<ListItemTemplate>(_templates.Select(a=>
+        {
+            return a with { Label = LocalizationService.GetString(a.Label) };
+        }
+        ));
         RequirePage<AccountInfoViewModel>();
     }
 
     protected override void Initialise()
     {
+        AccountInfoViewModel.Credentials.PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName is not nameof(AccountInfoViewModel.Credentials.Value)) 
+                return;
+            UpdateCredentialsInfo();
+        };
+
+        UpdateCredentialsInfo();
+
         _logger = DebugService.GetLogger(this);
 
         using var stream = typeof(MainViewModel).Assembly
@@ -72,18 +90,54 @@ public partial class MainViewModel : ViewModelBase
         PopupMessageService.OnCloseRequired += OnPopupCloseRequired;
         
         CheckMigration();
+        
+        var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        loadingHandler.LoadingName = LocalizationService.GetString("migration-config-task");
+        loadingHandler.IsCancellable = false;
+        ConfigurationService.MigrateConfigs(loadingHandler);
+        
+        if (!VCRuntimeDllChecker.AreVCRuntimeDllsPresent())
+        {
+            OnPopupRequired(LocalizationService.GetString("vcruntime-check-error"));
+            Helper.OpenBrowser("https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170");
+        }
+    }
+
+    private void UpdateCredentialsInfo()
+    {
+        if(AccountInfoViewModel.Credentials.HasValue)
+        {
+            LoginText =
+                LocalizationService.GetString("auth-current-login-name",
+                    new Dictionary<string, object>
+                    {
+                        { "login", AccountInfoViewModel.Credentials.Value?.Login ?? "" },
+                        {
+                            "auth_server",
+                            AccountInfoViewModel.GetServerAuthName(AccountInfoViewModel.Credentials.Value?.AuthServer) ?? ""
+                        }
+                    });
+        }
+        else
+        {
+            LoginText =  LocalizationService.GetString("auth-current-login-no-name");
+        }
     }
 
     private void CheckMigration()
     {
+        if (!ConfigurationService.GetConfigValue(LauncherConVar.DoMigration))
+            return;
+
         var loadingHandler = ViewHelperService.GetViewModel<LoadingContextViewModel>();
-        loadingHandler.LoadingName = "Migration task, please wait...";
+        loadingHandler.LoadingName = LocalizationService.GetString("migration-label-task");
         loadingHandler.IsCancellable = false;
 
         if (!ContentService.CheckMigration(loadingHandler))
             return;
-        
+
         OnPopupRequired(loadingHandler);
+        ConfigurationService.SetConfigValue(LauncherConVar.DoMigration, false);
     }
 
     partial void OnSelectedListItemChanged(ListItemTemplate? value)
@@ -92,19 +146,19 @@ public partial class MainViewModel : ViewModelBase
 
         if (!ViewHelperService.TryGetViewModel(value.ModelType, out var vmb)) return;
 
-        OpenPage(vmb, value.args, false);
+        OpenPage(vmb, false);
     }
 
-    public T RequirePage<T>() where T : ViewModelBase, IViewModelPage
+    public T RequirePage<T>() where T : ViewModelBase
     {
         if (CurrentPage is T vam) return vam;
         
         var page = ViewHelperService.GetViewModel<T>();
-        OpenPage(page, null);
+        OpenPage(page);
         return page;
     }
 
-    private void OpenPage(ViewModelBase obj, object? args, bool selectListView = true) 
+    private void OpenPage(ViewModelBase obj, bool selectListView = true) 
     {
         var tabItems = Items.Where(vm => vm.ModelType == obj.GetType());
 
@@ -117,11 +171,6 @@ public partial class MainViewModel : ViewModelBase
             }
         }
         
-        if (obj is IViewModelPage page)
-        {
-            page.OnPageOpen(args);
-        }
-        
         CurrentPage = obj;
     }
 
@@ -152,6 +201,16 @@ public partial class MainViewModel : ViewModelBase
         Popup = true;
     }
 
+    public void OpenAuthPage()
+    {
+        RequirePage<AccountInfoViewModel>();
+    }
+
+    public void OpenRootPath()
+    {
+        ExplorerUtils.OpenFolder(AppDataPath.RootPath);
+    }
+
     public void OpenLink()
     {
         Helper.OpenBrowser("https://durenko.tatar/nebula");
@@ -171,6 +230,11 @@ public partial class MainViewModel : ViewModelBase
             case PopupViewModelBase @base:
                 PopupMessage(@base);
                 break;
+            case ExceptionCompound error:
+                var errViewModel = ViewHelperService.GetViewModel<ExceptionListViewModel>();
+                errViewModel.AppendError(error);
+                PopupMessage(errViewModel);
+                break;
             case Exception error:
                 var err = ViewHelperService.GetViewModel<ExceptionListViewModel>();
                 _logger.Error(error);
@@ -189,16 +253,18 @@ public partial class MainViewModel : ViewModelBase
         else
             _viewQueue.Remove(viewModelBase);
     }
-
-
-    [RelayCommand]
-    private void TriggerPane()
+    
+    public void TriggerPane()
     {
         IsPaneOpen = !IsPaneOpen;
     }
 
-    [RelayCommand]
-    public void ClosePopup()
+    public void CloseCurrentPopup()
+    {
+        CurrentPopup?.Dispose();
+    }
+
+    private void ClosePopup()
     {
         var viewModelBase = _viewQueue.FirstOrDefault();
         if (viewModelBase is null)

Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs

@@ -2,82 +2,74 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text.Json.Serialization;
+using System.Net.Http;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using Nebula.Launcher.Configurations;
+using Nebula.Launcher.Models.Auth;
 using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Popup;
 using Nebula.Launcher.Views.Pages;
-using Nebula.Shared;
+using Nebula.Shared.Configurations;
+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;
 
 [ViewModelRegister(typeof(AccountInfoView))]
 [ConstructGenerator]
-public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
+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 AuthServerCredentials _authItemSelect;
+    [ObservableProperty] private string _authServerName;
 
     private bool _isProfilesEmpty;
-    [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
-    [GenerateProperty] private ConfigurationService ConfigurationService { get; } = default!;
+    [GenerateProperty] private PopupMessageService PopupMessageService { get; }
+    [GenerateProperty] private ConfigurationService ConfigurationService { get; } 
     [GenerateProperty] private DebugService DebugService { get; }
-    [GenerateProperty] private AuthService AuthService { get; } = default!;
-    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
+    [GenerateProperty] private AuthService AuthService { get; } 
+    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } 
 
-    public ObservableCollection<ProfileAuthCredentials> Accounts { get; } = new();
+    public ObservableCollection<ProfileEntry> Accounts { get; } = new();
     public ObservableCollection<AuthServerCredentials> AuthUrls { get; } = new();
 
-    [ObservableProperty] private AuthServerCredentials _authItemSelect;
+    public ComplexConVarBinder<AuthTokenCredentials?> Credentials { get; private set; }
 
     private ILogger _logger;
-
+    
     //Design think
     protected override void InitialiseInDesignMode()
     {
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
-        AddAccount(new AuthLoginPassword("Binka", "12341", ""));
+        AuthUrls.Add(new AuthServerCredentials("Test",["example.com","variant.lab"]));
         
-        AuthUrls.Add(new AuthServerCredentials("Test",["example.com"]));
+        AddAccount(new ProfileAuthCredentials("Binka", "","example.com"));
+        AddAccount(new ProfileAuthCredentials("Vilka","", "variant.lab"));
     }
-
+    
     //Real think
     protected override void Initialise()
     {
         _logger = DebugService.GetLogger(this);
-        ReadAuthConfig();
+        Credentials = new AuthTokenCredentialsVar(this);
+        Task.Run(ReadAuthConfig);
+        Credentials.Value = Credentials.Value;
     }
-
-    public void AuthByProfile(ProfileAuthCredentials credentials)
-    {
-        CurrentLogin = credentials.Login;
-        CurrentPassword = credentials.Password;
-        CurrentAuthServer = credentials.AuthServer;
-        
-        DoAuth();
-    }
-
+    
     public void DoAuth(string? code = null)
     {
         var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
-        message.InfoText = "Auth think, please wait...";
+        message.InfoText = LocalizationService.GetString("auth-processing");
         message.IsInfoClosable = false;
         PopupMessageService.Popup(message);
 
@@ -91,69 +83,131 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
         Task.Run(async () =>
         {
             Exception? exception = null;
+            
             foreach (var server in serverCandidates)
             {
                 try
                 {
-                    await TryAuth(CurrentLogin, CurrentPassword, server,code);
+                    await CatchAuthError(async() =>
+                    {
+                        Credentials.Value = await AuthService.Auth(CurrentLogin, CurrentPassword, server, code);
+                    }, ()=> message.Dispose());        
                     break;
                 }
-                catch (Exception e)
+                catch (Exception ex)
                 {
-                    exception = e;
+                    exception = new Exception(LocalizationService.GetString("auth-error"), ex);
                 }
             }
             
             message.Dispose();
 
-            if (!IsLogged)
+            if (exception != null)
             {
-                PopupMessageService.Popup(new Exception("No one of auth server is available.", exception));
+                PopupMessageService.Popup(new Exception("Error while auth", exception));
             }
         });
     }
 
-    private async Task TryAuth(string login, string password, string authServer,string? code)
+    private async Task CatchAuthError(Func<Task> a, Action? onError)
     {
+        DoRetryAuth = false;
+
         try
         {
-            await AuthService.Auth(new AuthLoginPassword(login, password, authServer), code);
-            CurrentLogin = login;
-            CurrentPassword = password;
-            CurrentAuthServer = authServer;
-            IsLogged = true;
-            ConfigurationService.SetConfigValue(LauncherConVar.AuthCurrent, AuthService.SelectedAuth);
+            await a();
         }
         catch (AuthException e)
         {
+            onError?.Invoke();
             switch (e.Error.Code)
             {
                 case AuthenticateDenyCode.TfaRequired:
                 case AuthenticateDenyCode.TfaInvalid:
                     var p = ViewHelperService.GetViewModel<TfaViewModel>();
-                    p.OnTfaEntered += OnTfaEntered;
                     PopupMessageService.Popup(p);
                     _logger.Log("TFA required");
                     break;
                 case AuthenticateDenyCode.InvalidCredentials:
-                    PopupMessageService.Popup("Invalid Credentials!");
-                    _logger.Error($"Invalid credentials");
+                    PopupError(LocalizationService.GetString("auth-invalid-credentials"), e);
+                    break;
+                case AuthenticateDenyCode.AccountLocked:
+                    PopupError(LocalizationService.GetString("auth-account-locked"), e);
+                    break;
+                case AuthenticateDenyCode.AccountUnconfirmed:
+                    PopupError(LocalizationService.GetString("auth-account-unconfirmed"), e);
+                    break;
+                case AuthenticateDenyCode.None:
+                    PopupError(LocalizationService.GetString("auth-none"),e);
                     break;
                 default:
-                    throw;
+                    PopupError(LocalizationService.GetString("auth-error-fuck"), e);
+                    break;
+            }
+        }
+        catch (HttpRequestException e)
+        {
+            onError?.Invoke();
+            switch (e.HttpRequestError)
+            {
+                case HttpRequestError.ConnectionError:
+                    PopupError(LocalizationService.GetString("auth-connection-error"), e);
+                    DoRetryAuth = true;
+                    break;
+                case HttpRequestError.NameResolutionError:
+                    PopupError(LocalizationService.GetString("auth-name-resolution-error"), e);
+                    DoRetryAuth = true;
+                    break;
+                case HttpRequestError.SecureConnectionError:
+                    PopupError(LocalizationService.GetString("auth-secure-error"), e);
+                    DoRetryAuth = true;
+                    break;
+                case HttpRequestError.UserAuthenticationError:
+                    PopupError(LocalizationService.GetString("auth-user-authentication-error"), e);
+                    break;
+                case HttpRequestError.Unknown:
+                    PopupError(LocalizationService.GetString("auth-unknown"), e);
+                    break;
+                case HttpRequestError.HttpProtocolError:
+                    PopupError(LocalizationService.GetString("auth-http-protocol-error"), e);
+                    break;
+                case HttpRequestError.ExtendedConnectNotSupported:
+                    PopupError(LocalizationService.GetString("auth-extended-connect-not-support"), e);
+                    break;
+                case HttpRequestError.VersionNegotiationError:
+                    PopupError(LocalizationService.GetString("auth-version-negotiation-error"), e);
+                    break;
+                case HttpRequestError.ProxyTunnelError:
+                    PopupError(LocalizationService.GetString("auth-proxy-tunnel-error"), e);
+                    break;
+                case HttpRequestError.InvalidResponse:
+                    PopupError(LocalizationService.GetString("auth-invalid-response"), e);
+                    break;
+                case HttpRequestError.ResponseEnded:
+                    PopupError(LocalizationService.GetString("auth-response-ended"), e);
+                    break;
+                case HttpRequestError.ConfigurationLimitExceeded:
+                    PopupError(LocalizationService.GetString("auth-configuration-limit-exceeded"), e);
+                    break;
+                default:
+                    var authError = new Exception(LocalizationService.GetString("auth-error"), e);
+                    _logger.Error(authError);
+                    PopupMessageService.Popup(authError);
+                    break;
             }
         }
     }
 
-    private void OnTfaEntered(string code)
-    {
-        DoAuth(code);
-    }
-
     public void Logout()
     {
-        IsLogged = false;
-        AuthService.ClearAuth();
+        Credentials.Value = null;
+        CurrentAuthServer = "";
+    }
+
+    public string GetServerAuthName(string? url)
+    {
+        if (url is null) return "";
+        return AuthUrls.FirstOrDefault(p => p.Servers.Contains(url))?.Name ?? "CustomAuth";
     }
 
     private void UpdateAuthMenu()
@@ -164,15 +218,22 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
             AuthViewSpan = 1;
     }
 
-    private void AddAccount(AuthLoginPassword authLoginPassword)
+    private void AddAccount(ProfileAuthCredentials credentials)
     {
-        var onDelete = new DelegateCommand<ProfileAuthCredentials>(OnDeleteProfile);
-        var onSelect = new DelegateCommand<ProfileAuthCredentials>(AuthByProfile);
+        var onDelete = new DelegateCommand<ProfileEntry>(OnDeleteProfile);
+        var onSelect = new DelegateCommand<ProfileEntry>((p) =>
+        {
+            CurrentLogin = p.Credentials.Login;
+            CurrentPassword = p.Credentials.Password;
+            CurrentAuthServer = p.Credentials.AuthServer;
+            DoAuth();
+        });
+        
+        var serverName = GetServerAuthName(credentials.AuthServer);
 
-        var alpm = new ProfileAuthCredentials(
-            authLoginPassword.Login,
-            authLoginPassword.Password,
-            authLoginPassword.AuthServer,
+        var alpm = new ProfileEntry(
+            credentials,
+            serverName, 
             onSelect,
             onDelete);
 
@@ -182,54 +243,100 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
         Accounts.Add(alpm);
     }
 
-    private async void ReadAuthConfig()
+    private async Task ReadAuthConfig()
     {
         var message = ViewHelperService.GetViewModel<InfoPopupViewModel>();
-        message.InfoText = "Read configuration file, please wait...";
+        message.InfoText = LocalizationService.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();
-
+        
+        _logger.Log("Reading auth config");
+        
         AuthUrls.Clear();
         var authUrls = ConfigurationService.GetConfigValue(LauncherConVar.AuthServers)!;
         foreach (var url in authUrls) AuthUrls.Add(url);
         if(authUrls.Length > 0) AuthItemSelect = authUrls[0];
         
-        var currProfile = ConfigurationService.GetConfigValue(LauncherConVar.AuthCurrent);
+        var profileCandidates = new List<string>();
 
-        if (currProfile != null)
+        foreach (var profileRaw in
+                 ConfigurationService.GetConfigValue(LauncherConVar.AuthProfiles)!)
         {
+            _logger.Log($"Decrypting profile...");
             try
             {
-                CurrentLogin = currProfile.Login;
-                CurrentAuthServer = currProfile.AuthServer;
-
-                IsLogged = await AuthService.SetAuth(currProfile);
+                var decoded =
+                    await CryptographicStore.Decrypt<ProfileAuthCredentials>(profileRaw,
+                        CryptographicStore.GetComputerKey());
+            
+                _logger.Log($"Decrypted profile: {decoded.Login}");
+            
+                profileCandidates.Add(profileRaw);
+                AddAccount(decoded);
             }
             catch (Exception e)
             {
-                message.Dispose();
-                PopupMessageService.Popup(e);
+                _logger.Error("Error while decrypting profile");
+                _logger.Error(e);
             }
         }
         
+        ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles, profileCandidates.ToArray());
+
+        if (Accounts.Count == 0) UpdateAuthMenu();
+        
         message.Dispose();
     }
 
-    [RelayCommand]
-    private void OnSaveProfile()
+    public void DoCurrentAuth()
     {
-        AddAccount(new AuthLoginPassword(CurrentLogin, CurrentPassword, CurrentAuthServer));
+        DoAuth();
+    }
+
+    private async Task<AuthTokenCredentials?> CheckOrRenewToken(AuthTokenCredentials? authTokenCredentials)
+    {
+        if(authTokenCredentials is null) 
+            return null;
+
+        var daysLeft = (int)(authTokenCredentials.Token.ExpireTime - DateTime.Now).TotalDays;
+        
+        if(daysLeft >= 4)
+        {
+            _logger.Log("Token " + authTokenCredentials.Login + " is active, "+daysLeft+" days left, undo renewing!");
+            return authTokenCredentials;
+        }
+
+        try
+        {
+            _logger.Log($"Renewing token for {authTokenCredentials.Login}");
+            return await ExceptionHelper.TryRun(() => AuthService.Refresh(authTokenCredentials), 3,
+                (attempt, e) => { _logger.Error(new Exception("Error while renewing, attempts: " + attempt, e)); });
+        }
+        catch (AuthTokenExpiredException e)
+        {
+            _logger.Error(e);
+            return null;
+        }
+        catch (Exception e)
+        {
+            var unexpectedError = new Exception(LocalizationService.GetString("auth-error"), e);
+            _logger.Error(unexpectedError);
+            return authTokenCredentials;
+        }
+    }
+    
+    public void OnSaveProfile()
+    {
+        if(Credentials.Value is null || 
+           string.IsNullOrEmpty(CurrentPassword)) return;
+        
+        AddAccount(new ProfileAuthCredentials(CurrentLogin, CurrentPassword, Credentials.Value.AuthServer));
         _isProfilesEmpty = Accounts.Count == 0;
         UpdateAuthMenu();
         DirtyProfile();
     }
 
-    private void OnDeleteProfile(ProfileAuthCredentials account)
+    private void OnDeleteProfile(ProfileEntry account)
     {
         Accounts.Remove(account);
         _isProfilesEmpty = Accounts.Count == 0;
@@ -237,14 +344,23 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
         DirtyProfile();
     }
 
-    [RelayCommand]
-    private void OnExpandAuthUrl()
+    private void PopupError(string message, Exception e)
+    {
+        message = LocalizationService.GetString("auth-error-occured") + message;
+        _logger.Error(new Exception(message, e));
+
+        var messageView = ViewHelperService.GetViewModel<InfoPopupViewModel>();
+        messageView.InfoText = message;
+        messageView.IsInfoClosable = true;
+        PopupMessageService.Popup(messageView);
+    }
+    
+    public void OnExpandAuthUrl()
     {
         AuthUrlConfigExpand = !AuthUrlConfigExpand;
     }
-
-    [RelayCommand]
-    private void OnExpandAuthView()
+    
+    public void OnExpandAuthView()
     {
         AuthMenuExpand = !AuthMenuExpand;
         UpdateAuthMenu();
@@ -253,22 +369,79 @@ public partial class AccountInfoViewModel : ViewModelBase, IViewModelPage
     private void DirtyProfile()
     {
         ConfigurationService.SetConfigValue(LauncherConVar.AuthProfiles,
-            Accounts.ToArray());
+            Accounts.Select(a => CryptographicStore.Encrypt(a.Credentials, CryptographicStore.GetComputerKey())).ToArray());
     }
-
-    public void OnPageOpen(object? args)
+    
+    public sealed class AuthTokenCredentialsVar(AccountInfoViewModel accountInfoViewModel)
+        : ComplexConVarBinder<AuthTokenCredentials?>(
+            accountInfoViewModel.ConfigurationService.SubscribeVarChanged(LauncherConVar.AuthCurrent))
     {
+        protected override async Task<AuthTokenCredentials?> OnValueChange(AuthTokenCredentials? currProfile)
+        {
+            if (currProfile is null)
+            {
+                accountInfoViewModel.IsLogged = false;
+                accountInfoViewModel._logger.Log("clearing credentials");
+                return null;
+            }
+        
+            var message = accountInfoViewModel.ViewHelperService.GetViewModel<InfoPopupViewModel>();
+            message.InfoText = LocalizationService.GetString("auth-try-auth-config");
+            message.IsInfoClosable = false;
+            accountInfoViewModel.PopupMessageService.Popup(message);
+      
+            accountInfoViewModel._logger.Log($"trying auth with {currProfile.Login}");
+
+            var errorRun = false;
+
+            currProfile = await accountInfoViewModel.CheckOrRenewToken(currProfile);
+
+            if (currProfile is null)
+            {
+                message.Dispose();
+                
+                accountInfoViewModel._logger.Log("profile credentials update required!");
+                
+                accountInfoViewModel.PopupMessageService.Popup("profile credentials update required!");
+                
+                accountInfoViewModel.IsLogged = false;
+                return null;
+            }
+            
+            try
+            {
+                await accountInfoViewModel.CatchAuthError(async () =>
+                {
+                    await accountInfoViewModel.AuthService.EnsureToken(currProfile);
+                }, () =>
+                {
+                    message.Dispose();
+                    errorRun = true;
+                });
+                message.Dispose();
+            }
+            catch (Exception ex)
+            {
+                accountInfoViewModel.CurrentLogin = currProfile.Login;
+                accountInfoViewModel.CurrentAuthServer = currProfile.AuthServer;
+                var unexpectedError = new Exception(LocalizationService.GetString("auth-error"), ex);
+                accountInfoViewModel._logger.Error(unexpectedError);
+                accountInfoViewModel.PopupMessageService.Popup(unexpectedError);
+                errorRun = true;
+            }
+
+            if (errorRun)
+            {
+                accountInfoViewModel.IsLogged = false;
+                return null;
+            }
+        
+            accountInfoViewModel.IsLogged = true;
+
+            accountInfoViewModel.AuthServerName = accountInfoViewModel.GetServerAuthName(currProfile.AuthServer);
+            
+            return currProfile;
+        }
     }
 }
-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
-);
+

Nebula.Launcher/ViewModels/Pages/ConfigurationViewModel.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.IO.Compression;
+using System.Threading.Tasks;
+using Nebula.Launcher.Services;
+using Nebula.Launcher.Utils;
+using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Launcher.Views.Pages;
+using Nebula.Shared;
+using Nebula.Shared.Configurations;
+using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
+using Nebula.SharedModels;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+[ViewModelRegister(typeof(ConfigurationView))]
+[ConstructGenerator]
+public partial class ConfigurationViewModel : ViewModelBase
+{
+    public ObservableCollection<IConfigControl> ConfigurationVerbose { get; } = new();
+    
+    [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!;
+
+
+    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));
+    }
+
+    public void InvokeUpdateConfiguration()
+    {
+        for (int i = 0; i < ConfigurationVerbose.Count; i++)
+        {
+            var conVarControl = ConfigurationVerbose[i];
+            if(!conVarControl.Dirty) 
+                continue;
+            
+            var conVar = _conVarList[i];
+            var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
+            methodInfo.Invoke(ConfigurationService, [conVar.Item1, conVarControl.GetValue()]);
+        }
+    }
+
+    public void ResetConfig()
+    {
+        foreach (var conVar in _conVarList)
+        {
+            var methodInfo = ConfigurationService.GetType().GetMethod("SetConfigValue")!.MakeGenericMethod(conVar.Item2);
+            methodInfo.Invoke(ConfigurationService, [conVar.Item1, null]);
+        }
+        
+        _conVarList.Clear();
+        ConfigurationVerbose.Clear();
+
+        InitConfiguration();
+        
+        PopupService.Popup("Configuration has been reset.");
+    }
+
+    public void OpenDataFolder()
+    {
+        ExplorerUtils.OpenFolder(AppDataPath.RootPath);
+    }
+
+    public void ExportLogs()
+    {
+        var logPath = Path.Join(AppDataPath.RootPath, "log");
+        var path = Path.Combine(Path.GetTempPath(), "tempThink"+Path.GetRandomFileName());
+        Directory.CreateDirectory(path);
+        
+        ZipFile.CreateFromDirectory(logPath, Path.Join(path, DateTime.Now.ToString("yyyy-MM-dd") + ".zip"));
+        ExplorerUtils.OpenFolder(path);
+    }
+
+    public void RemoveAllContent()
+    {
+        Task.Run(() =>
+        {
+            using var loader = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+            loader.LoadingName = "Removing content";
+            PopupService.Popup(loader);
+            ContentService.RemoveAllContent(loader.CreateLoadingContext(), CancellationService.Token);
+        });
+    }
+
+    private void InitConfiguration()
+    {
+        AddCvarConf(LauncherConVar.ILSpyUrl);
+        AddCvarConf(LauncherConVar.Hub);
+        AddCvarConf(LauncherConVar.AuthServers);
+        AddCvarConf(CurrentConVar.EngineManifestUrl);
+        AddCvarConf(CurrentConVar.RobustAssemblyName);
+        AddCvarConf(CurrentConVar.ManifestDownloadProtocolVersion);
+    }
+    
+    protected override void InitialiseInDesignMode()
+    {
+        InitConfiguration();
+    }
+
+    protected override void Initialise()
+    {
+        InitConfiguration();
+    }
+}

Nebula.Launcher/ViewModels/Pages/ContentBrowserViewModel.cs

@@ -1,397 +1,476 @@
 using System;
-using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.Services;
-using Nebula.Launcher.ViewModels.ContentView;
+using Nebula.Launcher.Utils;
 using Nebula.Launcher.ViewModels.Popup;
+using Nebula.Launcher.Views;
 using Nebula.Launcher.Views.Pages;
-using Nebula.Shared.FileApis;
 using Nebula.Shared.Models;
 using Nebula.Shared.Services;
-using Nebula.Shared.Services.Logging;
 using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
+using Robust.LoaderApi;
 
 namespace Nebula.Launcher.ViewModels.Pages;
 
 [ViewModelRegister(typeof(ContentBrowserView))]
 [ConstructGenerator]
-public sealed partial class ContentBrowserViewModel : ViewModelBase , IViewModelPage
+public sealed partial class ContentBrowserViewModel : ViewModelBase, IContentHolder
 {
-    private readonly List<ContentEntry> _root = new();
-
-    private readonly List<string> _history = new();
-
-    [ObservableProperty] private string _message = "";
-    [ObservableProperty] private string _searchText = "";
-
-    private ContentEntry? _selectedEntry;
-    private ILogger _logger;
+    [ObservableProperty] private IContentEntry _currentEntry;
     [ObservableProperty] private string _serverText = "";
-    [ObservableProperty] private ContentViewBase? _contentView;
-    public bool IsCustomContenView => ContentView != null;
-
-
+    [ObservableProperty] private string _searchText = "";
     [GenerateProperty] private ContentService ContentService { get; } = default!;
-    [GenerateProperty] private CancellationService CancellationService { get; } = default!;
     [GenerateProperty] private FileService FileService { get; } = default!;
-    [GenerateProperty] private DebugService DebugService { get; } = default!;
     [GenerateProperty] private PopupMessageService PopupService { get; } = default!;
-    [GenerateProperty] private HubService HubService { get; } = default!;
-    [GenerateProperty] private IServiceProvider ServiceProvider {get;}
+    [GenerateProperty] private IServiceProvider ServiceProvider { get; }
+    [GenerateProperty] private CancellationService CancellationService { get; set; } = default!;
     [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; } = default!;
 
-    public ObservableCollection<ContentEntry> Entries { get; } = new();
-
-    private Dictionary<string, Type> _contentContainers = new();
-
-    public ContentEntry? SelectedEntry
-    {
-        get => _selectedEntry;
-        set
-        {
-            var oldSearchText = SearchText;
-            SearchText = value?.GetPath().ToString() ?? "";
-
-            ContentView = null;
-            Entries.Clear();
-            _selectedEntry = value;
-
-            if (value == null) return;
-
-            if(value.TryOpen(out var stream, out var item)){
-
-                var ext = Path.GetExtension(item.Value.Path);
-                var myTempFile = Path.Combine(Path.GetTempPath(), "tempie" + ext);
-
-                if(TryGetContentViewer(ext, out var contentViewBase)){
-                    _logger.Debug($"Opening custom context:{item.Value.Path}");
-                    contentViewBase.InitialiseWithData(value.GetPath(), stream, value);
-                    stream.Dispose();
-                    ContentView = contentViewBase;
-                    return;
-                }
-
-                var sw = new FileStream(myTempFile, FileMode.Create, FileAccess.Write, FileShare.None);
-                stream.CopyTo(sw);
-
-                sw.Dispose();
-                stream.Dispose();
-
-                var startInfo = new ProcessStartInfo(myTempFile)
-                {
-                    UseShellExecute = true
-                };
-
-                
-                _logger.Log("Opening " + myTempFile);
-                Process.Start(startInfo);
-
-                return;
-            }
-            
-            if(SearchText.Length > oldSearchText.Length) 
-                AppendHistory(oldSearchText);
-
-            foreach (var entryCh in value.Childs) Entries.Add(entryCh);
-        }
-    }
-
-    private bool TryGetContentViewer(string type,[NotNullWhen(true)] out ContentViewBase? contentViewBase){
-        contentViewBase = null;
-        if(!_contentContainers.TryGetValue(type, out var contentViewType) || 
-           !contentViewType.IsAssignableTo(typeof(ContentViewBase))) 
-            return false;
-        
-        contentViewBase = (ContentViewBase)ServiceProvider.GetService(contentViewType)!;
-        return true;
-    }
-
-
-    protected override void InitialiseInDesignMode()
-    {
-        var a = new ContentEntry(this, "A:", "A", "", default!);
-        var b = new ContentEntry(this, "B", "B", "", default!);
-        a.TryAddChild(b);
-        Entries.Add(a);
-    }
-
-    protected override void Initialise()
-    {
-        _logger = DebugService.GetLogger(this);
-        FillRoot(HubService.ServerList);
-
-        HubService.HubServerChangedEventArgs += HubServerChangedEventArgs;
-        HubService.HubServerLoaded += GoHome;
-
-        if (!HubService.IsUpdating) GoHome();
-
-        _contentContainers.Add(".dll",typeof(DecompilerContentView));
-    }
-
-    private void GoHome()
-    {
-        SelectedEntry = null;
-        foreach (var entry in _root) Entries.Add(entry);
-    }
-
-    private void HubServerChangedEventArgs(HubServerChangedEventArgs obj)
-    {
-        if (obj.Action == HubServerChangeAction.Clear) _root.Clear();
-        if (obj.Action == HubServerChangeAction.Add) FillRoot(obj.Items);
-    }
-
-    private void FillRoot(IEnumerable<ServerHubInfo> infos)
-    {
-        foreach (var info in infos) 
-            _root.Add(new ContentEntry(this, info.StatusData.Name, info.Address, info.Address, default!));
-    }
-
-    public void Go(string server, ContentPath path)
-    {
-        ServerText = server;
-        Go(path);
-    }
-
-    public async void Go(ContentPath path)
-    {
-        if (path.Pathes.Count > 0 && (path.Pathes[0].StartsWith("ss14://") || path.Pathes[0].StartsWith("ss14s://")))
-        {
-            ServerText = path.Pathes[0];
-            path = new ContentPath("");
-        }
-
-        if (string.IsNullOrEmpty(ServerText))
-        {
-            SearchText = "";
-            GoHome();
-            return;
-        }
-
-        if (ServerText != SelectedEntry?.ServerName) SelectedEntry = await CreateEntry(ServerText);
-
-        _logger.Debug("Going to:" + path.Path);
-
-        var oriPath = path.Clone();
-        try
-        {
-            if (SelectedEntry == null || !SelectedEntry.GetRoot().TryGetEntry(path, out var centry))
-                throw new Exception("Not found! " + oriPath.Path);
-
-            SelectedEntry = centry;
-        }
-        catch (Exception e)
-        {
-            PopupService.Popup(e);
-        }
-    }
-
 
     public void OnBackEnter()
     {
-        Go(new ContentPath(GetHistory()));
-    }
-
-    public void OnGoEnter()
-    {
-        Go(new ContentPath(SearchText));
+        if (CurrentEntry.Parent is null)
+        {
+            SetHubRoot();
+            return;
+        }
+        CurrentEntry.Parent?.GoCurrent();
     }
 
     public void OnUnpack()
     {
-        if (SelectedEntry == null) return;
+        if(CurrentEntry is not ServerFolderContentEntry serverEntry) 
+            return;
+        
         var myTempDir = FileService.EnsureTempDir(out var tmpDir);
         
         var loading = ViewHelperService.GetViewModel<LoadingContextViewModel>();
         loading.LoadingName = "Unpacking entry";
         PopupService.Popup(loading);
 
-        Task.Run(() => ContentService.Unpack(SelectedEntry.FileApi, myTempDir, loading));
-        var startInfo = new ProcessStartInfo(){
-            FileName = "explorer.exe",
-            Arguments = tmpDir,
-        };
-        _logger.Log("Opening " + tmpDir);
-        Process.Start(startInfo);
+        Task.Run(() =>
+        {
+            ContentService.Unpack(serverEntry.FileApi, myTempDir, loading.CreateLoadingContext());
+            loading.Dispose();
+        });
+        ExplorerUtils.OpenFolder(tmpDir);
     }
 
-    private async Task<ContentEntry> CreateEntry(string serverUrl)
+    public void OnGoEnter()
     {
-        var loading = ViewHelperService.GetViewModel<LoadingContextViewModel>();
-        loading.LoadingName = "Loading entry";
-        PopupService.Popup(loading);
-
-        var rurl = serverUrl.ToRobustUrl();
-        var info = await ContentService.GetBuildInfo(rurl, CancellationService.Token);
-        var hashApi = await ContentService.EnsureItems(info.RobustManifestInfo, loading,
-            CancellationService.Token);
-
-        var rootEntry = new ContentEntry(this, "", "", serverUrl, hashApi);
-
-        foreach (var item in hashApi.Manifest.Values)
+        if (string.IsNullOrWhiteSpace(ServerText))
         {
-            var path = new ContentPath(item.Path);
-            rootEntry.CreateItem(path, item);
+            SetHubRoot();
+            SearchText = string.Empty;
+            return;
         }
 
-        loading.Dispose();
-
-        return rootEntry;
+        try
+        {
+            var cur = ServiceProvider.GetService<ServerFolderContentEntry>()!;
+            cur.Init(this, ServerText.ToRobustUrl());
+            var curContent = cur.Go(new ContentPath(SearchText), CancellationService.Token);
+            CurrentEntry = curContent ?? throw new NullReferenceException($"{SearchText} not found in {ServerText}");
+        }
+        catch (Exception e)
+        {
+            PopupService.Popup(e);
+            ServerText = string.Empty;
+            SearchText = string.Empty;
+            SetHubRoot();
+        }
     }
 
-    private void AppendHistory(string str)
+    partial void OnCurrentEntryChanged(IContentEntry value)
     {
-        if (_history.Count >= 10) _history.RemoveAt(9);
-        _history.Insert(0, str);
+        SearchText = value.FullPath.ToString();
+        if (value.GetRoot() is ServerFolderContentEntry serverEntry)
+        {
+            ServerText = serverEntry.ServerUrl.ToString();
+        }
+    }
+    
+    protected override void InitialiseInDesignMode()
+    {
+        var root = ViewHelperService.GetViewModel<FolderContentEntry>();
+        root.Init(this);
+        var child = root.AddFolder("Biba");
+        child.AddFolder("Boba");
+        child.AddFolder("Buba");
+        CurrentEntry = root;
     }
 
-    private string GetHistory()
+    protected override void Initialise()
     {
-        if (_history.Count == 0) return "";
-        var h = _history[0];
-        _history.RemoveAt(0);
-        return h;
+        SetHubRoot();
     }
 
-    public void OnPageOpen(object? args)
+    public void SetHubRoot()
     {
+        ServerText = string.Empty;
+        SearchText = string.Empty;
+        var root = ViewHelperService.GetViewModel<ServerListContentEntry>();
+        root.InitHubList(this);
+        CurrentEntry = root;
+    }
+
+    public void Go(RobustUrl url, ContentPath path)
+    {
+        ServerText = url.ToString();
+        SearchText = path.ToString();
+        OnGoEnter();
     }
 }
 
-public class ContentEntry
+public interface IContentHolder
 {
-    private readonly Dictionary<string, ContentEntry> _childs = new();
+    public IContentEntry CurrentEntry { get; set; }
+}
+
+public interface IContentEntry
+{
+    public IContentHolder Holder { get; }
     
-    private readonly ContentBrowserViewModel _viewModel;
-    public readonly HashApi FileApi;
-    public readonly RobustManifestItem? Item;
-
-    internal ContentEntry(ContentBrowserViewModel viewModel, string name, string pathName, string serverName, HashApi fileApi, RobustManifestItem? item = null)
+    public IContentEntry? Parent { get; set; }
+    public string? Name { get; }
+    public string IconPath { get; }
+    public ContentPath FullPath => Parent?.FullPath.With(Name) ?? new ContentPath(Name);
+    
+    public IContentEntry? Go(ContentPath path, CancellationToken cancellationToken);
+    
+    public void GoCurrent()
     {
+        var entry = Go(ContentPath.Empty, CancellationToken.None);
+        if(entry is not null) Holder.CurrentEntry = entry;
+    }
+    
+    public IContentEntry GetRoot()
+    {
+        if (Parent is null) return this;
+        return Parent.GetRoot();
+    }
+}
+
+
+public sealed class LazyContentEntry : IContentEntry
+{
+    public IContentHolder Holder { get; set; }
+    public IContentEntry? Parent { get; set; }
+    public string? Name { get; }
+    public string IconPath { get; }
+
+    private readonly IContentEntry _lazyEntry;
+    private readonly Action _lazyEntryInit;
+
+    public LazyContentEntry (IContentHolder holder,string name, IContentEntry entry, Action lazyEntryInit)
+    {
+        Holder = holder;
         Name = name;
-        ServerName = serverName;
-        PathName = pathName;
-        _viewModel = viewModel;
-        FileApi = fileApi;
-        Item = item;
+        IconPath = entry.IconPath;
+        _lazyEntry = entry;
+        _lazyEntryInit = lazyEntryInit;
     }
-
-    public bool IsDirectory => Item == null;
-
-    public string Name { get; private set; }
-    public string PathName { get; }
-    public string ServerName { get; }
-    public string IconPath { get; set; } = "/Assets/svg/folder.svg";
-
-    public ContentEntry? Parent { get; private set; }
-    public bool IsRoot => Parent == null;
-
-    //TODO: Remove LINQ later...
-    public IReadOnlyList<ContentEntry> Childs => _childs.Values.OrderBy(v => v,new ContentComparer()).ToList();
-
-    public bool TryOpen([NotNullWhen(true)] out Stream? stream,[NotNullWhen(true)] out RobustManifestItem? item){
-        stream = null;
-        item = null;
-        if(Item is null || !FileApi.TryOpen(Item.Value, out stream))
-            return false;
-
-        item = Item;
-        return true;
-    }
-
-    public bool TryGetChild(string name, [NotNullWhen(true)] out ContentEntry? child)
+    public IContentEntry? Go(ContentPath path, CancellationToken cancellationToken)
     {
-        return _childs.TryGetValue(name, out child);
+        _lazyEntryInit?.Invoke();
+        return _lazyEntry;
+    }
+}
+
+public sealed class ExtContentExecutor
+{
+    public ServerFolderContentEntry _root;
+    private DecompilerService _decompilerService;
+
+    public ExtContentExecutor(ServerFolderContentEntry root, DecompilerService decompilerService)
+    {
+        _root = root;
+        _decompilerService = decompilerService;
     }
 
-    public bool TryAddChild(ContentEntry contentEntry)
+    public bool TryExecute(IFileApi api, ContentPath path, CancellationToken cancellationToken)
     {
-        if (_childs.TryAdd(contentEntry.PathName, contentEntry))
+        var ext = Path.GetExtension(path.GetName());
+
+        if (ext == ".dll")
         {
-            contentEntry.Parent = this;
+            _decompilerService.OpenServerDecompiler(_root.ServerUrl, cancellationToken);
             return true;
         }
 
         return false;
     }
+}
 
-    public ContentPath GetPath()
+
+public sealed partial class FileContentEntry : IContentEntry
+{
+    public IContentHolder Holder { get; set; } = default!;
+    public IContentEntry? Parent { get; set; }
+    public string? Name { get; set; }
+    public string IconPath => "/Assets/svg/file.svg";
+    
+    private IFileApi _fileApi = default!;
+    private ExtContentExecutor _extContentExecutor = default!;
+
+    public void Init(IContentHolder holder, IFileApi api, string fileName, ExtContentExecutor executor)
     {
-        if (Parent != null)
+        Holder = holder;
+        Name = fileName;
+        _fileApi = api;
+        _extContentExecutor = executor;
+    }
+    
+    public IContentEntry? Go(ContentPath path, CancellationToken cancellationToken)
+    {
+        var fullPath = ((IContentEntry)this).FullPath;
+        if (_extContentExecutor.TryExecute(_fileApi, fullPath, cancellationToken)) 
+            return null;
+        
+        var ext = Path.GetExtension(fullPath.GetName());
+        
+        try
         {
-            var path = Parent.GetPath();
-            path.Pathes.Add(PathName);
-            return path;
+            if (!_fileApi.TryOpen(fullPath.Path, out var stream))
+                return null;
+
+            var myTempFile = Path.Combine(Path.GetTempPath(), "tempie" + ext);
+
+            var sw = new FileStream(myTempFile, FileMode.Create, FileAccess.Write, FileShare.None);
+            stream.CopyTo(sw);
+
+            sw.Dispose();
+            stream.Dispose();
+
+            var startInfo = new ProcessStartInfo(myTempFile)
+            {
+                UseShellExecute = true
+            };
+
+            Process.Start(startInfo);
         }
-
-        return new ContentPath([PathName]);
-    }
-
-    public ContentEntry GetOrCreateDirectory(ContentPath rootPath)
-    {
-        if (rootPath.Pathes.Count == 0) return this;
-
-        var fName = rootPath.GetNext();
-
-        if (!TryGetChild(fName, out var child))
+        catch (Exception e)
         {
-            child = new ContentEntry(_viewModel, fName, fName, ServerName, FileApi);
-            TryAddChild(child);
+            _extContentExecutor._root.PopupService.Popup(e);
         }
-
-        return child.GetOrCreateDirectory(rootPath);
-    }
-
-    public ContentEntry GetRoot()
-    {
-        if (Parent == null) return this;
-        return Parent.GetRoot();
-    }
-
-    public ContentEntry CreateItem(ContentPath path, RobustManifestItem item)
-    {
-        var dir = path.GetDirectory();
-        var dirEntry = GetOrCreateDirectory(dir);
-
-        var name = path.GetName();
-        var entry = new ContentEntry(_viewModel, name, name, ServerName, FileApi, item);
-
-        dirEntry.TryAddChild(entry);
-        entry.IconPath = "/Assets/svg/file.svg";
-        return entry;
-    }
-
-    public bool TryGetEntry(ContentPath path, out ContentEntry? entry)
-    {
-        entry = null;
-
-        if (path.Pathes.Count == 0)
-        {
-            entry = this;
-            return true;
-        }
-
-        var fName = path.GetNext();
-
-        if (!TryGetChild(fName, out var child)) return false;
-
-        return child.TryGetEntry(path, out entry);
-    }
-
-    public void OnPathGo()
-    {
-        _viewModel.Go(GetPath());
+        return null;
     }
 }
 
-public struct ContentPath
+[ViewModelRegister(typeof(FileContentEntryView), false), ConstructGenerator]
+public sealed partial class FolderContentEntry : BaseFolderContentEntry
 {
+    [GenerateProperty, DesignConstruct] public override ViewHelperService ViewHelperService { get; } = default!;
+    
+    public FolderContentEntry AddFolder(string folderName)
+    {
+        var folder = ViewHelperService.GetViewModel<FolderContentEntry>();
+        folder.Init(Holder, folderName);
+        return AddChild(folder);
+    }
+
+    protected override void InitialiseInDesignMode() { }
+    protected override void Initialise() { }
+}
+
+[ViewModelRegister(typeof(FileContentEntryView), false), ConstructGenerator]
+public sealed partial class ServerFolderContentEntry : BaseFolderContentEntry
+{
+    [GenerateProperty, DesignConstruct] public override ViewHelperService ViewHelperService { get; } = default!;
+    [GenerateProperty] public ContentService ContentService { get; } = default!;
+    [GenerateProperty] public CancellationService CancellationService { get; } = default!;
+    [GenerateProperty] public PopupMessageService PopupService { get; } = default!;
+    [GenerateProperty] public DecompilerService DecompilerService { get; } = default!;
+    
+    public RobustUrl ServerUrl { get; private set; }
+
+    public IFileApi FileApi { get; private set; } = default!;
+    
+    private ExtContentExecutor _contentExecutor = default!;
+    
+    public void Init(IContentHolder holder, RobustUrl serverUrl)
+    {
+        base.Init(holder);
+        _contentExecutor = new ExtContentExecutor(this, DecompilerService);
+        IsLoading = true;
+        var loading = ViewHelperService.GetViewModel<LoadingContextViewModel>();
+        loading.LoadingName = "Loading entry";
+        PopupService.Popup(loading);
+        ServerUrl = serverUrl;
+
+        Task.Run(async () =>
+        {
+            var buildInfo = await ContentService.GetBuildInfo(serverUrl, CancellationService.Token);
+            FileApi = await ContentService.EnsureItems(buildInfo, loading,
+                CancellationService.Token);
+
+            foreach (var path in FileApi.AllFiles)
+            {
+                CreateContent(new ContentPath(path));
+            }
+            
+            IsLoading = false;
+            loading.Dispose();
+        });
+    }
+
+    public FileContentEntry CreateContent(ContentPath path)
+    {
+        var pathDir = path.GetDirectory();
+        BaseFolderContentEntry parent = this;
+        
+        while (pathDir.TryNext(out var dirPart))
+        {
+            if (!parent.TryGetChild(dirPart, out var folderContentEntry))
+            {
+                folderContentEntry = ViewHelperService.GetViewModel<FolderContentEntry>();
+                ((FolderContentEntry)folderContentEntry).Init(Holder, dirPart);
+                parent.AddChild(folderContentEntry);
+            }
+            
+            parent = folderContentEntry as BaseFolderContentEntry ?? throw new InvalidOperationException();
+        }
+        
+        var manifestContent = new FileContentEntry();
+        manifestContent.Init(Holder, FileApi, path.GetName(), _contentExecutor);
+        
+        parent.AddChild(manifestContent);
+        
+        return manifestContent;
+    }
+    
+    protected override void InitialiseInDesignMode() { }
+    protected override void Initialise() { }
+}
+
+[ViewModelRegister(typeof(FileContentEntryView), false), ConstructGenerator]
+public sealed partial class ServerListContentEntry : BaseFolderContentEntry
+{
+    [GenerateProperty, DesignConstruct] public override ViewHelperService ViewHelperService { get; } = default!;
+    [GenerateProperty] public ConfigurationService ConfigurationService { get; } = default!;
+    [GenerateProperty] public IServiceProvider ServiceProvider { get; } = default!;
+    [GenerateProperty] public RestService RestService { get; } = default!;
+
+    
+    public void InitHubList(IContentHolder holder)
+    {
+        base.Init(holder);
+
+        var servers = ConfigurationService.GetConfigValue(LauncherConVar.Hub)!;
+
+        foreach (var server in servers)
+        {
+            var serverFolder = ServiceProvider.GetService<ServerListContentEntry>()!;
+            var serverLazy = new LazyContentEntry(Holder, server.Name , serverFolder, () => serverFolder.InitServerList(Holder, server));
+            AddChild(serverLazy);
+        }
+    }
+
+    public async void InitServerList(IContentHolder holder, ServerHubRecord hubRecord)
+    {
+        base.Init(holder, hubRecord.Name);
+
+        IsLoading = true;
+        var servers =
+            await RestService.GetAsync<List<ServerHubInfo>>(new Uri(hubRecord.MainUrl), CancellationToken.None);
+
+        foreach (var server in servers)
+        {
+            var serverFolder = ServiceProvider.GetService<ServerFolderContentEntry>()!;
+            var serverLazy = new LazyContentEntry(Holder, server.StatusData.Name , serverFolder, () => serverFolder.Init(Holder, server.Address.ToRobustUrl()));
+            AddChild(serverLazy);
+        }
+
+        IsLoading = true;
+    }
+
+  
+
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+}
+
+public abstract class BaseFolderContentEntry : ViewModelBase, IContentEntry
+{
+    public bool IsLoading { get; set; } = false;
+    public abstract ViewHelperService ViewHelperService { get; }
+    
+    public ObservableCollection<IContentEntry> Entries { get; } = [];
+
+    private Dictionary<string, IContentEntry> _childs = [];
+
+    public string IconPath => "/Assets/svg/folder.svg";
+    
+    private IContentHolder? _holder = null;
+    public IContentHolder Holder
+    {
+        get
+        {
+            if(_holder == null) 
+                throw new InvalidOperationException(
+                    GetType().Name + " was not initialised! Call Init(IContentHolder holder, string? name = null) before using it.");
+            
+            return _holder;
+        }
+    }
+
+    public IContentEntry? Parent { get; set; }
+    public string? Name { get; private set; }
+    
+    public IContentEntry? Go(ContentPath path, CancellationToken cancellationToken)
+    {
+        if (path.IsEmpty()) return this;
+        if (_childs.TryGetValue(path.GetNext(), out var child)) 
+            return child.Go(path, cancellationToken);
+        
+        return null;
+    }
+
+    public void Init(IContentHolder holder, string? name = null)
+    {
+        Name = name;
+        _holder = holder;
+    }
+
+    public T AddChild<T>(T child) where T: IContentEntry
+    {
+        if(child.Name is null) throw new InvalidOperationException();
+        
+        child.Parent = this;
+        
+        _childs.Add(child.Name, child);
+        Entries.Add(child);
+
+        return child;
+    }
+
+    public bool TryGetChild(string name,[NotNullWhen(true)] out IContentEntry? child)
+    {
+        return _childs.TryGetValue(name, out child);
+    }
+}
+
+
+public struct ContentPath : IEquatable<ContentPath>
+{
+    public static readonly ContentPath Empty = new();
+    
     public List<string> Pathes { get; }
 
     public ContentPath()
@@ -404,17 +483,23 @@ public struct ContentPath
         Pathes = pathes;
     }
 
-    public ContentPath(string path)
+    public ContentPath(string? path)
     {
         Pathes = string.IsNullOrEmpty(path)
             ? new List<string>()
-            : path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            : path.Split(['/'], StringSplitOptions.RemoveEmptyEntries).ToList();
+    }
+
+    public ContentPath With(string? name)
+    {
+        if (name != null) return new ContentPath([..Pathes, name]);
+        return new ContentPath(Pathes);
     }
 
     public ContentPath GetDirectory()
     {
         if (Pathes.Count == 0)
-            return this; // Root remains root when getting the directory.
+            return this;
 
         var directoryPathes = Pathes.Take(Pathes.Count - 1).ToList();
         return new ContentPath(directoryPathes);
@@ -439,6 +524,14 @@ public struct ContentPath
         return string.IsNullOrWhiteSpace(nextName) ? GetNext() : nextName;
     }
 
+    public bool TryNext([NotNullWhen(true)]out string? part)
+    {
+        part = null;
+        if (Pathes.Count == 0) return false;
+        part = GetNext();
+        return true;
+    }
+
     public ContentPath Clone()
     {
         return new ContentPath(new List<string>(Pathes));
@@ -450,19 +543,35 @@ public struct ContentPath
     {
         return Path;
     }
+
+    public bool IsEmpty()
+    {
+        return Pathes.Count == 0;
+    }
+
+    public bool Equals(ContentPath other)
+    {
+        return Pathes.Equals(other.Pathes);
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is ContentPath other && Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        return Pathes.GetHashCode();
+    }
 }
 
-public sealed class ContentComparer : IComparer<ContentEntry>
+public sealed class ContentComparer : IComparer<IContentEntry>
 {
-    public int Compare(ContentEntry? x, ContentEntry? y)
+    public int Compare(IContentEntry? x, IContentEntry? y)
     {
         if (ReferenceEquals(x, y)) return 0;
         if (y is null) return 1;
         if (x is null) return -1;
-        var iconComparison = string.Compare(x.IconPath, y.IconPath, StringComparison.Ordinal);
-        if (iconComparison != 0) return -iconComparison;
-        var nameComparison = string.Compare(x.Name, y.Name, StringComparison.Ordinal);
-        if (nameComparison != 0) return nameComparison;
-        return string.Compare(x.ServerName, y.ServerName, StringComparison.Ordinal);
+        return string.Compare(x.Name, y.Name, StringComparison.Ordinal);
     }
 }

Nebula.Launcher/ViewModels/Pages/IViewModelPage.cs

@@ -1,6 +0,0 @@
-namespace Nebula.Launcher.ViewModels.Pages;
-
-public interface IViewModelPage
-{
-    public void OnPageOpen(object? args);
-}

Nebula.Launcher/ViewModels/Pages/ServerListViewModel.Favorite.cs

@@ -1,60 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using Nebula.Shared.Models;
-using Nebula.Shared.Services;
-using Nebula.Shared.Utils;
-
-namespace Nebula.Launcher.ViewModels.Pages;
-
-public partial class ServerListViewModel
-{
-    [GenerateProperty] private ConfigurationService ConfigurationService { get; }
-    [GenerateProperty] private RestService RestService { get; }
-    
-    public ObservableCollection<ServerEntryModelView> FavoriteServers { get; } = [];
-    
-    private void UpdateFavoriteEntries()
-    {
-        foreach(var fav in FavoriteServers.ToList()){
-            FavoriteServers.Remove(fav);
-        }
-        
-        var servers = ConfigurationService.GetConfigValue(LauncherConVar.Favorites);
-        if (servers is null || servers.Length == 0)
-        {
-            return;
-        }
-        
-        foreach (var server in servers)
-        {
-            var s =  ServerViewContainer.Get(server.ToRobustUrl());
-            s.IsFavorite = true;
-            FavoriteServers.Add(s);
-        }
-        
-        ApplyFilter();
-    }
-
-    public void AddFavorite(ServerEntryModelView entryModelView)
-    {
-        entryModelView.IsFavorite = true;
-        AddFavorite(entryModelView.Address);
-    }
-
-    public void AddFavorite(RobustUrl robustUrl)
-    {
-        var servers = (ConfigurationService.GetConfigValue(LauncherConVar.Favorites) ?? []).ToList();
-        servers.Add(robustUrl.ToString());
-        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
-        UpdateFavoriteEntries();
-    }
-
-    public void RemoveFavorite(ServerEntryModelView entryModelView)
-    {
-        var servers = (ConfigurationService.GetConfigValue(LauncherConVar.Favorites) ?? []).ToList();
-        servers.Remove(entryModelView.Address.ToString());
-        ConfigurationService.SetConfigValue(LauncherConVar.Favorites, servers.ToArray());
-        entryModelView.IsFavorite = false;
-        UpdateFavoriteEntries();
-    }
-}

Nebula.Launcher/ViewModels/Pages/ServerListViewModel.cs

@@ -1,252 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Nebula.Launcher.Controls;
-using Nebula.Launcher.Services;
-using Nebula.Launcher.ViewModels.Popup;
-using Nebula.Launcher.Views;
-using Nebula.Launcher.Views.Pages;
-using Nebula.Shared.Models;
-using Nebula.Shared.Services;
-using Nebula.Shared.Utils;
-
-namespace Nebula.Launcher.ViewModels.Pages;
-
-[ViewModelRegister(typeof(ServerListView))]
-[ConstructGenerator]
-public partial class ServerListViewModel : ViewModelBase, IViewModelPage
-{
-    [ObservableProperty] private string _searchText = string.Empty;
-
-    [ObservableProperty] private bool _isFavoriteMode;
-    
-    [ObservableProperty] private bool _isFilterVisible;
-    
-    public ObservableCollection<ServerEntryModelView> Servers { get; }= new();
-    public ObservableCollection<Exception> HubErrors { get; } = new();
-    public readonly ServerFilter CurrentFilter = new ServerFilter();
-    
-    public Action? OnSearchChange;
-    [GenerateProperty] private HubService HubService { get; }
-    [GenerateProperty] private PopupMessageService PopupMessageService { get; }
-    [GenerateProperty] private CancellationService CancellationService { get; }
-    [GenerateProperty] private DebugService DebugService { get; }
-    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
-    
-    private ServerViewContainer ServerViewContainer { get; set; } 
-    
-    private List<ServerHubInfo> UnsortedServers { get; } = new();
-
-    //Design think
-    protected override void InitialiseInDesignMode()
-    {
-        ServerViewContainer = new ServerViewContainer(this, ViewHelperService);
-        HubErrors.Add(new Exception("UVI"));
-    }
-
-    //real think
-    protected override void Initialise()
-    {
-        ServerViewContainer = new ServerViewContainer(this, ViewHelperService);
-        
-        foreach (var info in HubService.ServerList) UnsortedServers.Add(info);
-
-        HubService.HubServerChangedEventArgs += HubServerChangedEventArgs;
-        HubService.HubServerLoaded += UpdateServerEntries;
-        HubService.HubServerLoadingError += HubServerLoadingError;
-        OnSearchChange += OnChangeSearch;
-
-        if (!HubService.IsUpdating) UpdateServerEntries();
-        UpdateFavoriteEntries();
-    }
-    
-    public void ApplyFilter()
-    {
-        foreach (var entry in ServerViewContainer.Items)
-        {
-            entry.ProcessFilter(CurrentFilter);
-        }
-    }
-    
-    public void OnFilterChanged(FilterBoxChangedEventArgs args)
-    {
-        if (args.Checked)
-            CurrentFilter.Tags.Add(args.Tag);
-        else
-            CurrentFilter.Tags.Remove(args.Tag);
-        ApplyFilter();
-    }
-
-    private void HubServerLoadingError(Exception obj)
-    {
-        HubErrors.Add(obj);
-    }
-
-    private void UpdateServerEntries()
-    {
-        foreach(var fav in Servers.ToList()){
-            Servers.Remove(fav);
-        }
-        
-        Task.Run(() =>
-        {
-            UnsortedServers.Sort(new ServerComparer());
-            foreach (var info in UnsortedServers)
-            {
-                var view = ServerViewContainer.Get(info.Address.ToRobustUrl(), info.StatusData);
-                Servers.Add(view);
-            }
-            ApplyFilter();
-        });
-    }
-
-    private void OnChangeSearch()
-    {
-        CurrentFilter.SearchText = SearchText;
-        ApplyFilter();
-    }
-
-    private void HubServerChangedEventArgs(HubServerChangedEventArgs obj)
-    {
-        if (obj.Action == HubServerChangeAction.Add)
-            foreach (var info in obj.Items)
-                UnsortedServers.Add(info);
-        if (obj.Action == HubServerChangeAction.Remove)
-            foreach (var info in obj.Items)
-                UnsortedServers.Remove(info);
-        if (obj.Action == HubServerChangeAction.Clear)
-        {
-            UnsortedServers.Clear();
-            ServerViewContainer.Clear();
-            UpdateFavoriteEntries();
-        }
-    }
-
-    public void FilterRequired()
-    {
-        IsFilterVisible = !IsFilterVisible;
-    }
-
-    public void AddFavoriteRequired()
-    {
-        var p = ViewHelperService.GetViewModel<AddFavoriteViewModel>();
-        PopupMessageService.Popup(p);
-    }
-
-    public void UpdateRequired()
-    {
-        HubErrors.Clear();
-        Task.Run(HubService.UpdateHub);
-    }
-
-    public void OnPageOpen(object? args)
-    {
-        if (args is bool fav)
-        {
-            IsFavoriteMode = fav;
-        }
-    }
-}
-
-public class ServerViewContainer(
-    ServerListViewModel serverListViewModel,
-    ViewHelperService viewHelperService
-    )
-{
-    private readonly Dictionary<string, ServerEntryModelView> _entries = new();
-    
-    public ICollection<ServerEntryModelView> Items => _entries.Values;
-
-    public void Clear()
-    {
-        _entries.Clear();
-    }
-
-    public ServerEntryModelView Get(RobustUrl url, ServerStatus? serverStatus = null)
-    {
-        ServerEntryModelView? entry;
-        
-        lock (_entries)
-        {
-            if (_entries.TryGetValue(url.ToString(), out entry))
-            {
-                return entry;
-            }
-
-            entry = viewHelperService.GetViewModel<ServerEntryModelView>().WithData(url, serverStatus);
-            
-            _entries.Add(url.ToString(), entry);
-        }
-        
-        entry.OnFavoriteToggle += () =>
-        {
-            if (entry.IsFavorite) serverListViewModel.RemoveFavorite(entry);
-            else serverListViewModel.AddFavorite(entry);
-        };
-        
-        return entry;
-    }
-}
-
-public class ServerComparer : IComparer<ServerHubInfo>, IComparer<ServerStatus>, IComparer<(RobustUrl,ServerStatus)>
-{
-    public int Compare(ServerHubInfo? x, ServerHubInfo? y)
-    {
-        if (ReferenceEquals(x, y))
-            return 0;
-        if (ReferenceEquals(null, y))
-            return 1;
-        if (ReferenceEquals(null, x))
-            return -1;
-
-        return Compare(x.StatusData, y.StatusData);
-    }
-
-    public int Compare(ServerStatus? x, ServerStatus? y)
-    {
-        if (ReferenceEquals(x, y))
-            return 0;
-        if (ReferenceEquals(null, y))
-            return 1;
-        if (ReferenceEquals(null, x))
-            return -1;
-
-        return y.Players.CompareTo(x.Players);
-    }
-
-    public int Compare((RobustUrl, ServerStatus) x, (RobustUrl, ServerStatus) y)
-    {
-        return Compare(x.Item2, y.Item2);
-    }
-}
-
-public sealed class ServerFilter
-{
-    public string SearchText { get; set; } = "";
-    public HashSet<string> Tags { get; } = new();
-    public bool IsMatchByName(string name)
-    {
-        if (string.IsNullOrWhiteSpace(SearchText))
-            return true;
-
-        return name.Contains(SearchText, StringComparison.OrdinalIgnoreCase);
-    }
-
-    public bool IsMatchByTags(IEnumerable<string> itemTags)
-    {
-        if (Tags.Count == 0)
-            return true;
-        
-        var itemTagSet = new HashSet<string>(itemTags);
-        return Tags.All(tag => itemTagSet.Contains(tag));
-    }
-
-    public bool IsMatch(string name, IEnumerable<string> itemTags)
-    {
-        return IsMatchByName(name) && IsMatchByTags(itemTags);
-    }
-}

Nebula.Launcher/ViewModels/Pages/ServerOverviewModel.cs

@@ -0,0 +1,389 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using Nebula.Launcher.Controls;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.ServerListProviders;
+using Nebula.Launcher.Services;
+using Nebula.Launcher.Views.Pages;
+using Nebula.Shared;
+using Nebula.Shared.Models;
+using Nebula.Shared.Services;
+using Nebula.Shared.Utils;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels.Pages;
+
+[ViewModelRegister(typeof(ServerOverviewView))]
+[ConstructGenerator]
+public partial class ServerOverviewModel : ViewModelBase
+{
+    [ObservableProperty] private string _searchText = string.Empty;
+    [ObservableProperty] private bool _isFilterVisible;
+    [GenerateProperty] private IServiceProvider ServiceProvider { get; }
+    [GenerateProperty] private ConfigurationService ConfigurationService { get; }
+    [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
+    
+    [ObservableProperty] private ServerListTabTemplate _selectedItem;
+    [GenerateProperty, DesignConstruct] private ServerViewContainer ServerViewContainer { get; } 
+    [GenerateProperty, DesignConstruct] public ServerListViewModel CurrentServerList { get; }
+    
+    public ServerFilter CurrentFilter { get; } = new();
+    public ObservableCollection<ServerListTabTemplate> Items { get; private set; }
+    
+
+    //Design think
+    protected override void InitialiseInDesignMode()
+    {
+        Items = new ObservableCollection<ServerListTabTemplate>([
+            new ServerListTabTemplate(new TestServerList(), "Test think"),
+            new ServerListTabTemplate(new TestServerList(), "Test think2")
+        ]);
+        SelectedItem = Items[0];
+    }
+
+    //real think
+    protected override void Initialise()
+    {
+        FavoriteServerListProvider.OnRefreshRequired += OnFavoriteRefreshRequired;
+        ConfigurationService.SubscribeVarChanged(LauncherConVar.Hub, OnHubListChanged, true);
+    }
+
+    private void OnFavoriteRefreshRequired()
+    {
+        if(CurrentServerList.Provider is FavoriteServerListProvider favoriteServerListProvider)
+        {
+            RefreshProvider();
+        }
+    }
+
+    private void OnHubListChanged(ServerHubRecord[]? value)
+    {
+        var tempItems = new List<ServerListTabTemplate>();
+        
+        foreach (var record in value ?? [])
+        {
+            tempItems.Add(new ServerListTabTemplate(ServiceProvider.GetService<HubServerListProvider>()!.With(record.MainUrl), record.Name));
+        }
+        
+        tempItems.Add(new ServerListTabTemplate(FavoriteServerListProvider, LocalizationService.GetString("tab-favorite")));
+        
+        Items = new ObservableCollection<ServerListTabTemplate>(tempItems);
+        
+        SelectedItem = Items[0];
+    }
+
+    partial void OnSearchTextChanged(string value)
+    {
+        CurrentFilter.SearchText = value;
+        ApplyFilter();
+    }
+
+    private void ApplyFilter()
+    {
+        ServerViewContainer.ApplyFilter(CurrentFilter);
+    }
+    
+    public void OnFilterChanged(FilterBoxChangedEventArgs args)
+    {
+        if (args.Checked)
+            CurrentFilter.Tags.Add(args.Tag);
+        else
+            CurrentFilter.Tags.Remove(args.Tag);
+        ApplyFilter();
+    }
+    
+    public void FilterRequired()
+    {
+        IsFilterVisible = !IsFilterVisible;
+    }
+
+    public void UpdateRequired()
+    {
+        ServerViewContainer.Clear();
+        RefreshProvider();
+    }
+    
+    private void RefreshProvider()
+    {
+        CurrentServerList.ClearProvider();
+        CurrentServerList.RefreshFromProvider();
+    }
+
+    partial void OnSelectedItemChanged(ServerListTabTemplate value)
+    {
+        CurrentServerList.ClearProvider();
+        CurrentServerList.SetProvider(value.ServerListProvider);
+        ApplyFilter();
+    }
+}
+
+[ServiceRegister]
+public sealed class ServerViewContainer
+{
+    private readonly ViewHelperService _viewHelperService;
+    private readonly List<string> _favorites = [];
+    private readonly Dictionary<string, string> _customNames = [];
+
+    private readonly Dictionary<string, WeakReference<IListEntryModelView>> _entries = new();
+    private ServerFilter? _currentFilter;
+
+    public ICollection<IListEntryModelView> Items =>
+        _entries.Values
+            .Select(wr => wr.TryGetTarget(out var target) ? target : null)
+            .Where(t => t != null)
+            .ToList()!;
+
+    public ServerViewContainer()
+    {
+        _viewHelperService = new ViewHelperService();
+    }
+
+    [UsedImplicitly]
+    public ServerViewContainer(ViewHelperService viewHelperService, ConfigurationService configurationService)
+    {
+        _viewHelperService = viewHelperService;
+        configurationService.SubscribeVarChanged(LauncherConVar.Favorites, OnFavoritesChange, true);
+        configurationService.SubscribeVarChanged(LauncherConVar.ServerCustomNames, OnCustomNamesChanged, true);
+    }
+
+    public void Clear()
+    {
+        foreach (var (_, weakRef) in _entries)
+        {
+            if (weakRef.TryGetTarget(out var value) && value is IDisposable disposable)
+                disposable.Dispose();
+        }
+
+        _entries.Clear();
+    }
+
+    public IListEntryModelView Get(string url, ServerStatus? serverStatus = null) => Get(url.ToRobustUrl(), serverStatus);
+
+    public IListEntryModelView Get(RobustUrl url, ServerStatus? serverStatus = null)
+    {
+        var key = url.ToString();
+        IListEntryModelView? entry;
+
+        lock (_entries)
+        {
+            if (_entries.TryGetValue(key, out var weakEntry)
+                && weakEntry.TryGetTarget(out entry))
+            {
+                return entry;
+            }
+
+            entry = Create(url, serverStatus);
+
+            _entries[key] = new WeakReference<IListEntryModelView>(entry);
+        }
+
+        return entry;
+    }
+    
+    private IListEntryModelView Create(RobustUrl url, ServerStatus? serverStatus = null)
+    {
+        IListEntryModelView? entry;
+        var key = url.ToString();
+        
+        _customNames.TryGetValue(key, out var customName);
+        
+        if (serverStatus is not null)
+        {
+            entry = _viewHelperService
+                .GetViewModel<ServerEntryViewModel>()
+                .WithData(url, customName, serverStatus);
+        }
+        else
+        {
+            entry = _viewHelperService
+                .GetViewModel<ServerCompoundEntryViewModel>()
+                .LoadServerEntry(url, customName, CancellationToken.None);
+        }
+
+        if (entry is IFavoriteEntryModelView fav)
+        {
+            fav.IsFavorite = _favorites.Contains(key);
+        }
+
+        if (entry is IFilterConsumer filterConsumer)
+        {
+            filterConsumer.ProcessFilter(_currentFilter);
+        }
+        
+        return entry;
+    }
+    
+    public void ApplyFilter(ServerFilter? filter)
+    {
+        _currentFilter = filter;
+        
+        foreach (var serverView in Items)
+        {
+            if(serverView is IFilterConsumer filterConsumer)
+                filterConsumer.ProcessFilter(filter);
+        }
+    }
+
+    private void OnFavoritesChange(string[]? value)
+    {
+        _favorites.Clear();
+        if (value == null) return;
+
+        foreach (var favorite in value)
+        {
+            _favorites.Add(favorite);
+            if (_entries.TryGetValue(favorite, out var weak)
+                && weak.TryGetTarget(out var entry)
+                && entry is IFavoriteEntryModelView fav)
+            {
+                fav.IsFavorite = true;
+            }
+        }
+    }
+
+    private void OnCustomNamesChanged(Dictionary<string, string>? value)
+    {
+        var oldNames = _customNames.ToDictionary(x => x.Key, x => x.Value);
+        _customNames.Clear();
+
+        if (value == null)
+        {
+            foreach (var (ip, _) in oldNames)
+            {
+                ResetName(ip);
+            }
+
+            return;
+        }
+
+        foreach (var (oldIp, oldName) in oldNames)
+        {
+            if (value.TryGetValue(oldIp, out var newName))
+            {
+                if (oldName == newName)
+                    value.Remove(newName);
+
+                continue;
+            }
+
+            ResetName(oldIp);
+        }
+
+        foreach (var (ip, name) in value)
+        {
+            _customNames.Add(ip, name);
+
+            if (_entries.TryGetValue(ip, out var weak)
+                && weak.TryGetTarget(out var entry)
+                && entry is IEntryNameHolder holder)
+            {
+                holder.Name = name;
+            }
+        }
+    }
+
+    private void ResetName(string ip)
+    {
+        if (_entries.TryGetValue(ip, out var weak)
+            && weak.TryGetTarget(out var entry)
+            && entry is IEntryNameHolder holder)
+        {
+            holder.Name = null;
+        }
+    }
+}
+
+public interface IListEntryModelView 
+{
+    
+}
+
+public sealed class ExampleEntry : StackPanel, IListEntryModelView
+{
+    public ExampleEntry(string name)
+    {
+        Children.Add(new Label { Content = name });
+    }
+    
+    public void Dispose()
+    {
+        
+    }
+}
+
+public interface IFavoriteEntryModelView
+{
+    public bool IsFavorite { get; set; }
+}
+
+public interface IEntryNameHolder
+{
+    public string? Name { get; set; }
+}
+
+public class ServerComparer : IComparer<ServerHubInfo>, IComparer<ServerStatus>, IComparer<(RobustUrl,ServerStatus)>
+{
+    public int Compare(ServerHubInfo? x, ServerHubInfo? y)
+    {
+        if (ReferenceEquals(x, y))
+            return 0;
+        if (ReferenceEquals(null, y))
+            return 1;
+        if (ReferenceEquals(null, x))
+            return -1;
+
+        return Compare(x.StatusData, y.StatusData);
+    }
+
+    public int Compare(ServerStatus? x, ServerStatus? y)
+    {
+        if (ReferenceEquals(x, y))
+            return 0;
+        if (ReferenceEquals(null, y))
+            return 1;
+        if (ReferenceEquals(null, x))
+            return -1;
+
+        return y.Players.CompareTo(x.Players);
+    }
+
+    public int Compare((RobustUrl, ServerStatus) x, (RobustUrl, ServerStatus) y)
+    {
+        return Compare(x.Item2, y.Item2);
+    }
+}
+
+public sealed class ServerFilter
+{
+    public string SearchText { get; set; } = "";
+    public HashSet<string> Tags { get; } = new();
+    public bool IsMatchByName(string name)
+    {
+        if (string.IsNullOrWhiteSpace(SearchText))
+            return true;
+
+        return name.Contains(SearchText, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public bool IsMatchByTags(IEnumerable<string> itemTags)
+    {
+        if (Tags.Count == 0)
+            return true;
+        
+        var itemTagSet = new HashSet<string>(itemTags);
+        return Tags.All(tag => itemTagSet.Contains(tag));
+    }
+
+    public bool IsMatch(string name, IEnumerable<string> itemTags)
+    {
+        return IsMatchByName(name) && IsMatchByTags(itemTags);
+    }
+}

Nebula.Launcher/ViewModels/Popup/AddFavoriteViewModel.cs

@@ -1,10 +1,13 @@
 using System;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Nebula.Launcher.ServerListProviders;
+using Nebula.Launcher.Services;
 using Nebula.Launcher.ViewModels.Pages;
 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;
@@ -26,9 +29,10 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
 
     [GenerateProperty] 
     public override PopupMessageService PopupMessageService { get; }
-    [GenerateProperty] private ServerListViewModel ServerListViewModel { get; }
+    [GenerateProperty] private ServerOverviewModel ServerOverviewModel { get; }
     [GenerateProperty] private DebugService DebugService { get; }
-    public override string Title => "Add to favorite";
+    [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
+    public override string Title => LocalizationService.GetString("popup-add-favorite");
     public override bool IsClosable => true;
 
     [ObservableProperty] private string _ipInput;
@@ -38,8 +42,11 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
     {
         try
         {
+            if(string.IsNullOrWhiteSpace(IpInput))
+                throw new Exception(LocalizationService.GetString("popup-add-favorite-invalid-ip"));
+            
             var uri = IpInput.ToRobustUrl();
-            ServerListViewModel.AddFavorite(uri);
+            FavoriteServerListProvider.AddFavorite(uri);
             Dispose();
         }
         catch (Exception e)
@@ -48,4 +55,10 @@ public partial class AddFavoriteViewModel : PopupViewModelBase
             _logger.Error(e);
         }
     }
+
+    protected override void OnDispose()
+    {
+        base.OnDispose();
+        _logger.Dispose();
+    }
 }

Nebula.Launcher/ViewModels/Popup/EditServerNameViewModel.cs

@@ -0,0 +1,63 @@
+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;
+
+[ViewModelRegister(typeof(EditServerNameView), false)]
+[ConstructGenerator]
+public sealed partial class EditServerNameViewModel : PopupViewModelBase
+{
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty] public ConfigurationService ConfigurationService { get; }
+    public override string Title => LocalizationService.GetString("popup-edit-name");
+    public override bool IsClosable => true;
+    
+    [ObservableProperty] private string _ipInput;
+    [ObservableProperty] private string _nameInput;
+    
+    public void OnEnter()
+    {
+        if(string.IsNullOrWhiteSpace(IpInput)) 
+            return;
+
+        if (string.IsNullOrWhiteSpace(NameInput))
+        {
+            OnClear();
+            return;
+        }
+        
+        AddServerName();
+        Dispose();
+    }
+
+    public void OnClear()
+    {
+        RemoveServerName();
+        Dispose();
+    }
+
+    private void AddServerName()
+    {
+        var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;
+        currentNames.Add(IpInput, NameInput);
+        ConfigurationService.SetConfigValue(LauncherConVar.ServerCustomNames, currentNames);
+    }
+
+    private void RemoveServerName()
+    {
+        var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;
+        currentNames.Remove(IpInput);
+        ConfigurationService.SetConfigValue(LauncherConVar.ServerCustomNames, currentNames);
+    }
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+}

Nebula.Launcher/ViewModels/Popup/ExceptionListViewModel.cs

@@ -1,7 +1,9 @@
 using System;
 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;
 
@@ -10,10 +12,10 @@ namespace Nebula.Launcher.ViewModels.Popup;
 public sealed partial class ExceptionListViewModel : PopupViewModelBase
 {
     [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
-    public override string Title => "Exception was thrown";
+    public override string Title => LocalizationService.GetString("popup-exception");
     public override bool IsClosable => true;
 
-    public ObservableCollection<Exception> Errors { get; } = new();
+    public ObservableCollection<ExceptionCompound> Errors { get; } = new();
 
     protected override void Initialise()
     {
@@ -21,13 +23,18 @@ public sealed partial class ExceptionListViewModel : PopupViewModelBase
 
     protected override void InitialiseInDesignMode()
     {
-        var e = new Exception("TEST");
+        var e = new ExceptionCompound("TEST", "thrown in design mode");
         AppendError(e);
     }
 
+    public void AppendError(ExceptionCompound exception)
+    {
+        Errors.Add(exception);
+    }
+
     public void AppendError(Exception exception)
     {
-        Errors.Add(exception);
+        AppendError(new ExceptionCompound(exception));
         if (exception.InnerException != null)
             AppendError(exception.InnerException);
     }

Nebula.Launcher/ViewModels/Popup/InfoPopupViewModel.cs

@@ -1,6 +1,8 @@
 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;
 
@@ -12,7 +14,7 @@ public partial class InfoPopupViewModel : PopupViewModelBase
 
     [ObservableProperty] private string _infoText = "Test";
 
-    public override string Title => "Info";
+    public override string Title => LocalizationService.GetString("popup-information");
     public bool IsInfoClosable { get; set; } = true;
     public override bool IsClosable => IsInfoClosable;
 

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 ServerEntryViewModel _entryView;
+    
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty, DesignConstruct] private ViewHelperService ViewHelperService { get; }
+    
+    protected override void InitialiseInDesignMode()
+    {
+    }
+
+    protected override void Initialise()
+    {
+    }
+
+    public IsLoginCredentialsNullPopupViewModel WithServerEntry(ServerEntryViewModel entryViewModel)
+    {
+        _entryView = entryViewModel;
+        return this;
+    }
+
+    public void Proceed()
+    {
+        _entryView.RunInstanceIgnoreAuth();
+        Dispose();
+    }
+
+    public void Cancel()
+    {
+        Dispose();
+    }
+
+    public void GotoAuthPage()
+    {
+        ViewHelperService.GetViewModel<MainViewModel>().RequirePage<AccountInfoViewModel>();
+        Dispose();
+    }
+    
+    public override string Title => LocalizationService.GetString("popup-login-credentials-warning");
+    public override bool IsClosable => true;
+}

Nebula.Launcher/ViewModels/Popup/LoadingContextViewModel.cs

@@ -1,58 +1,131 @@
+using System;
+using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
+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;
 
 [ViewModelRegister(typeof(LoadingContextView), false)]
 [ConstructGenerator]
-public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadingHandler
+public sealed partial class LoadingContextViewModel : PopupViewModelBase, ILoadingHandlerFactory, IConnectionSpeedHandler
 {
+    public ObservableCollection<LoadingContext> LoadingContexts { get;  } = [];
+    public ObservableCollection<double> Values { get; } = [];
+    [ObservableProperty] private string _speedText = "";
+    [ObservableProperty] private bool _showSpeed;
+    [ObservableProperty] private int _loadingColumnSize = 2;
     [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
     [GenerateProperty] public CancellationService CancellationService { get; }
-    
-    [ObservableProperty] private int _currJobs;
 
-    [ObservableProperty] private int _resolvedJobs;
-
-    public string LoadingName { get; set; } = "Loading...";
+    public string LoadingName { get; set; } = LocalizationService.GetString("popup-loading");
     public bool IsCancellable { get; set; } = true;
     public override bool IsClosable => false;
 
-    public override string Title => LoadingName;
+    public override string Title => LocalizationService.GetString("popup-loading");
 
-    public void SetJobsCount(int count)
+    public void Cancel()
     {
-        CurrJobs = count;
-    }
-
-    public int GetJobsCount()
-    {
-        return CurrJobs;
-    }
-
-    public void SetResolvedJobsCount(int count)
-    {
-        ResolvedJobs = count;
-    }
-
-    public int GetResolvedJobsCount()
-    {
-        return ResolvedJobs;
-    }
-
-    public void Cancel(){
-        if(!IsCancellable) return;
+        if (!IsCancellable) return;
         CancellationService.Cancel();
         Dispose();
     }
 
+    public void PasteSpeed(int speed)
+    {
+        if (Values.Count == 0)
+        {
+            ShowSpeed = true;
+            LoadingColumnSize = 1;
+        }
+        SpeedText = FileLoadingFormater.FormatBytes(speed) + " / s";
+        Values.Add(speed);
+        if(Values.Count > 10) Values.RemoveAt(0);
+    }
+
+    public ILoadingHandler CreateLoadingContext(ILoadingFormater? loadingFormater = null)
+    {
+        var instance = new LoadingContext(this, loadingFormater ?? DefaultLoadingFormater.Instance);
+        LoadingContexts.Add(instance);
+        return instance;
+    }
+
+    public void RemoveContextInstance(LoadingContext loadingContext)
+    {
+        LoadingContexts.Remove(loadingContext);
+    }
+
     protected override void Initialise()
     {
     }
 
     protected override void InitialiseInDesignMode()
     {
+        var context = CreateLoadingContext();
+        context.SetJobsCount(5);
+        context.SetResolvedJobsCount(2);
+        context.SetLoadingMessage("message");
+
+        var ctx1 = CreateLoadingContext(new FileLoadingFormater());
+        ctx1.SetJobsCount(1020120);
+        ctx1.SetResolvedJobsCount(12331);
+        ctx1.SetLoadingMessage("File data");
+        
+        for (var i = 0; i < 14; i++)
+        {
+            PasteSpeed(Random.Shared.Next(10000000));
+        }
     }
-}
+}
+
+public sealed partial class LoadingContext : ObservableObject, ILoadingHandler
+{
+    private readonly LoadingContextViewModel _master;
+    private readonly ILoadingFormater _loadingFormater;
+    public string LoadingText => _loadingFormater.Format(this);
+    
+    [ObservableProperty] private string _message = string.Empty;
+    [ObservableProperty] private long _currJobs;
+    [ObservableProperty] private long _resolvedJobs;
+
+    public LoadingContext(LoadingContextViewModel master, ILoadingFormater loadingFormater)
+    {
+        _master = master;
+        _loadingFormater = loadingFormater;
+    }
+
+    public void SetJobsCount(long count)
+    {
+        CurrJobs = count;
+        OnPropertyChanged(nameof(LoadingText));
+    }
+
+    public long GetJobsCount()
+    {
+        return CurrJobs;
+    }
+
+    public void SetResolvedJobsCount(long count)
+    {
+        ResolvedJobs = count;
+        OnPropertyChanged(nameof(LoadingText));
+    }
+
+    public long GetResolvedJobsCount()
+    {
+        return ResolvedJobs;
+    }
+
+    public void SetLoadingMessage(string message)
+    {
+        Message = message;
+    }
+
+    public void Dispose()
+    {
+        _master.RemoveContextInstance(this);
+    }
+}

Nebula.Launcher/ViewModels/Popup/LogPopupModelView.cs

@@ -1,6 +1,8 @@
 using System.Collections.ObjectModel;
+using Nebula.Launcher.Models;
 using Nebula.Launcher.Views.Popup;
 using Nebula.Shared.Services;
+using Nebula.Shared.ViewHelper;
 
 namespace Nebula.Launcher.ViewModels.Popup;
 
@@ -35,4 +37,9 @@ public sealed partial class LogPopupModelView : PopupViewModelBase
     {
         Logs.Add(LogInfo.FromString(str));
     }
+
+    public void Clear()
+    {
+        Logs.Clear();
+    }
 }

Nebula.Launcher/ViewModels/Popup/PopupViewModelBase.cs

@@ -9,9 +9,14 @@ public abstract class PopupViewModelBase : ViewModelBase, IDisposable
 
     public abstract string Title { get; }
     public abstract bool IsClosable { get; }
+    public Action<PopupViewModelBase>? OnDisposing;
 
     public void Dispose()
     {
+        OnDispose();
+        OnDisposing?.Invoke(this);
         PopupMessageService.ClosePopup(this);
     }
+
+    protected virtual void OnDispose(){}
 }

Nebula.Launcher/ViewModels/Popup/TfaViewModel.cs

@@ -1,13 +1,19 @@
 using System;
+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(TfaView))]
 public partial class TfaViewModel : PopupViewModelBase
 {
-    public Action<string>? OnTfaEntered;
+    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
+    [GenerateProperty] public AccountInfoViewModel AccountInfo { get; }
+    public override string Title => LocalizationService.GetString("popup-twofa");
+    public override bool IsClosable => true;
     
     protected override void InitialiseInDesignMode()
     {
@@ -19,11 +25,7 @@ public partial class TfaViewModel : PopupViewModelBase
 
     public void OnTfaEnter(string code)
     {
-        OnTfaEntered?.Invoke(code);
+        AccountInfo.DoAuth(code);
         Dispose();
     }
-
-    [GenerateProperty] public override PopupMessageService PopupMessageService { get; }
-    public override string Title => "2fa";
-    public override bool IsClosable => true;
 }

Nebula.Launcher/ViewModels/ServerCompoundEntryModelView.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+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;
+
+namespace Nebula.Launcher.ViewModels;
+
+[ViewModelRegister(typeof(ServerCompoundEntryView), false)]
+[ConstructGenerator]
+public sealed partial class ServerCompoundEntryViewModel : 
+    ViewModelBase, IFavoriteEntryModelView, IFilterConsumer, IListEntryModelView, IEntryNameHolder
+{
+    [ObservableProperty] private string _message = "Loading server entry...";
+    [ObservableProperty] private bool _isFavorite;
+    [ObservableProperty] private bool _loading = true;
+    
+    private string? _name;
+    private RobustUrl? _url;
+    private ServerFilter? _currentFilter;
+
+    public ServerEntryViewModel? CurrentEntry
+    {
+        get;
+        set
+        {
+            if (value == field) return;
+
+            field = value;
+
+            if (field != null)
+            {
+                field.IsFavorite = IsFavorite;
+                field.Name = Name;
+                field.ProcessFilter(_currentFilter);
+            }
+
+            Loading = field == null;
+
+            OnPropertyChanged();
+        }
+    }
+
+    public string? Name
+    {
+        get => _name;
+        set
+        {
+            _name = value;
+            OnPropertyChanged();
+            
+            if (CurrentEntry != null) 
+                CurrentEntry.Name = value;
+        }
+    }
+    
+    [GenerateProperty] private RestService RestService { get; }
+    [GenerateProperty] private IServiceProvider ServiceProvider{ get; }
+    [GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
+    
+    protected override void InitialiseInDesignMode()
+    {
+        Name = "TEST.TEST";
+    }
+
+    protected override void Initialise()
+    {
+    }
+
+    public ServerCompoundEntryViewModel LoadWithEntry(ServerEntryViewModel? entry)
+    {
+        CurrentEntry = entry;
+        return this;
+    }
+
+    public ServerCompoundEntryViewModel LoadServerEntry(RobustUrl url, string? name, CancellationToken cancellationToken)
+    {
+        _url = url;
+        _name = name; 
+        Task.Run(LoadServer, cancellationToken);
+        return this;
+    }
+
+    private async Task LoadServer()
+    {
+        if (_url is null)
+        {
+            Message = "Url is not set";
+            return;
+        }
+        
+        try
+        {
+            Message = "Loading server entry...";
+            var status = await RestService.GetAsync<ServerStatus>(_url.StatusUri, CancellationToken.None);
+                
+            CurrentEntry = ServiceProvider.GetService<ServerEntryViewModel>()!.WithData(_url, null, status);
+            
+            Loading = false;
+        }
+        catch (Exception e)
+        {
+            Message = "Error while fetching data from " + _url + " : " + e.Message;
+        }
+    }
+
+    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

@@ -1,375 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Avalonia.Controls;
-using Avalonia.Media;
-using CommunityToolkit.Mvvm.ComponentModel;
-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;
-
-namespace Nebula.Launcher.ViewModels;
-
-[ViewModelRegister(typeof(ServerEntryView), false)]
-[ConstructGenerator]
-public partial class ServerEntryModelView : ViewModelBase
-{
-    [ObservableProperty] private string _description = "Fetching info...";
-    [ObservableProperty] private bool _expandInfo;
-    [ObservableProperty] private bool _isFavorite;
-    [ObservableProperty] private bool _isVisible;
-
-    private string _lastError = "";
-    private Process? _p;
-    private ILogger _logger;
-    private ILogger? _processLogger;
-
-    private ServerInfo? _serverInfo;
-    [ObservableProperty] private bool _tagDataVisible;
-
-    public LogPopupModelView CurrLog;
-    public Action? OnFavoriteToggle;
-    public RobustUrl Address { get; private set; }
-
-    [GenerateProperty] private AuthService AuthService { get; } = default!;
-    [GenerateProperty] private ContentService ContentService { get; } = default!;
-    [GenerateProperty] private CancellationService CancellationService { get; } = default!;
-    [GenerateProperty] private DebugService DebugService { get; } = default!;
-    [GenerateProperty] private RunnerService RunnerService { get; } = default!;
-    [GenerateProperty] private PopupMessageService PopupMessageService { get; } = default!;
-    [GenerateProperty] private ViewHelperService ViewHelperService { get; } = default!;
-    [GenerateProperty] private RestService RestService { get; } = default!;
-    [GenerateProperty] private MainViewModel MainViewModel { get; } = default!;
-
-    public ServerStatus Status { get; private set; } =
-        new(
-            "Fetching data...",
-            "Loading...", [],
-            "",
-            -1,
-            -1,
-            -1,
-            false,
-            DateTime.Now,
-            -1
-        );
-
-    public ObservableCollection<ServerLink> Links { get; } = new();
-    public bool RunVisible => Process == null;
-
-    public ObservableCollection<string> Tags { get; } = [];
-
-    public ICommand OnLinkGo { get; } = new LinkGoCommand();
-
-    private Process? Process
-    {
-        get => _p;
-        set
-        {
-            _p = value;
-            OnPropertyChanged(nameof(RunVisible));
-        }
-    }
-
-    public async Task<ServerInfo?> GetServerInfo()
-    {
-        if (_serverInfo == null)
-            try
-            {
-                _serverInfo = await RestService.GetAsync<ServerInfo>(Address.InfoUri, CancellationService.Token);
-            }
-            catch (Exception e)
-            {
-                Description = e.Message;
-                _logger.Error(e);
-            }
-
-        return _serverInfo;
-    }
-
-    protected override void InitialiseInDesignMode()
-    {
-        Description = "Server of meow girls! Nya~ \nNyaMeow\nOOOINK!!";
-        Links.Add(new ServerLink("Discord", "discord", "https://cinka.ru"));
-        Status = new ServerStatus("Ameba",
-            "Locala meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow ",
-            ["rp:hrp", "18+"],
-            "Antag", 15, 5, 1, false
-            , DateTime.Now, 100);
-        Address = "ss14://localhost".ToRobustUrl();
-    }
-
-    protected override void Initialise()
-    {
-        _logger = DebugService.GetLogger(this);
-        CurrLog = ViewHelperService.GetViewModel<LogPopupModelView>();
-    }
-
-    public void ProcessFilter(ServerFilter serverFilter)
-    {
-        IsVisible = serverFilter.IsMatch(Status.Name, Tags);
-    }
-
-    public void SetStatus(ServerStatus serverStatus)
-    {
-        Status = serverStatus;
-        Tags.Clear();
-        foreach (var tag in Status.Tags) Tags.Add(tag);
-        OnPropertyChanged(nameof(Status));
-    }
-
-    public ServerEntryModelView WithData(RobustUrl url, ServerStatus? serverStatus)
-    {
-        Address = url;
-        if (serverStatus is not null)
-            SetStatus(serverStatus);
-        else
-            FetchStatus();
-
-        return this;
-    }
-
-    private async void FetchStatus()
-    {
-        try
-        {
-            SetStatus(await RestService.GetAsync<ServerStatus>(Address.StatusUri, CancellationService.Token));
-        }
-        catch (Exception e)
-        {
-            _logger.Error(e);
-            Status = new ServerStatus("ErrorLand", $"ERROR: {e.Message}", [], "", -1, -1, -1, false,
-                DateTime.Now,
-                -1);
-        }
-    }
-
-    public void OpenContentViewer()
-    {
-        MainViewModel.RequirePage<ContentBrowserViewModel>().Go(Address.ToString(), new ContentPath());
-    }
-
-    public void ToggleFavorites()
-    {
-        OnFavoriteToggle?.Invoke();
-    }
-
-    public void RunInstance()
-    {
-        Task.Run(RunAsync);
-    }
-
-    public async Task RunAsync()
-    {
-        try
-        {
-            var authProv = AuthService.SelectedAuth;
-
-            var buildInfo =
-                await ContentService.GetBuildInfo(Address, CancellationService.Token);
-
-            using (var loadingContext = ViewHelperService.GetViewModel<LoadingContextViewModel>())
-            {
-                loadingContext.LoadingName = "Loading instance...";
-                ((ILoadingHandler)loadingContext).AppendJob();
-
-                PopupMessageService.Popup(loadingContext);
-
-                await RunnerService.PrepareRun(buildInfo, loadingContext, CancellationService.Token);
-
-                var path = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-
-                Process = Process.Start(new ProcessStartInfo
-                {
-                    FileName = "dotnet.exe",
-                    Arguments = Path.Join(path, "Nebula.Runner.dll"),
-                    Environment =
-                    {
-                        { "ROBUST_AUTH_USERID", authProv?.UserId.ToString() },
-                        { "ROBUST_AUTH_TOKEN", authProv?.Token.Token },
-                        { "ROBUST_AUTH_SERVER", authProv?.AuthServer },
-                        { "ROBUST_AUTH_PUBKEY", buildInfo.BuildInfo.Auth.PublicKey },
-                        { "GAME_URL", Address.ToString() },
-                        { "AUTH_LOGIN", authProv?.Login }
-                    },
-                    CreateNoWindow = true,
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    StandardOutputEncoding = Encoding.UTF8
-                });
-
-                ((ILoadingHandler)loadingContext).AppendResolvedJob();
-            }
-
-            if (Process is null) return;
-            
-            _processLogger = DebugService.GetLogger($"PROCESS_{Process.Id}");
-
-            Process.EnableRaisingEvents = true;
-
-            Process.BeginOutputReadLine();
-            Process.BeginErrorReadLine();
-
-            Process.OutputDataReceived += OnOutputDataReceived;
-            Process.ErrorDataReceived += OnErrorDataReceived;
-
-            Process.Exited += OnExited;
-        }
-        catch (TaskCanceledException e)
-        {
-            PopupMessageService.Popup("Task canceled: " + e.Message);
-            _logger.Error("Task canceled");
-            _logger.Error(e);
-        }
-        catch (Exception e)
-        {
-            PopupMessageService.Popup(e);
-        }
-    }
-
-    private void OnExited(object? sender, EventArgs e)
-    {
-        if (Process is null) return;
-
-        Process.OutputDataReceived -= OnOutputDataReceived;
-        Process.ErrorDataReceived -= OnErrorDataReceived;
-        Process.Exited -= OnExited;
-
-        _processLogger?.Log("PROCESS EXIT WITH CODE " + Process.ExitCode);
-
-        if (Process.ExitCode != 0)
-            PopupMessageService.Popup($"Game exit with code {Process.ExitCode}.\nReason: {_lastError}");
-
-        _processLogger?.Dispose();
-        
-        Process.Dispose();
-        Process = null;
-    }
-
-    private void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
-    {
-        if (e.Data != null)
-        {
-            _lastError = e.Data;
-            _processLogger?.Error(e.Data);
-            CurrLog.Append(e.Data);
-        }
-    }
-
-    private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
-    {
-        if (e.Data != null)
-        {
-            _processLogger?.Log(e.Data);
-            CurrLog.Append(e.Data);
-        }
-    }
-
-    public void ReadLog()
-    {
-        PopupMessageService.Popup(CurrLog);
-    }
-
-    public void StopInstance()
-    {
-        Process?.CloseMainWindow();
-    }
-
-    public async void ExpandInfoRequired()
-    {
-        ExpandInfo = !ExpandInfo;
-        if (Design.IsDesignMode) return;
-
-        var info = await GetServerInfo();
-        if (info == null) return;
-
-        Description = info.Desc;
-
-        Links.Clear();
-        if (info.Links is null) return;
-        foreach (var link in info.Links) Links.Add(link);
-    }
-
-    private static string FindDotnetPath()
-    {
-        var pathEnv = Environment.GetEnvironmentVariable("PATH");
-        var paths = pathEnv?.Split(Path.PathSeparator);
-        if (paths != null)
-            foreach (var path in paths)
-            {
-                var dotnetPath = Path.Combine(path, "dotnet");
-                if (File.Exists(dotnetPath)) return dotnetPath;
-            }
-
-        return "dotnet";
-    }
-}
-
-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
-        };
-    }
-}
-
-public class LinkGoCommand : ICommand
-{
-    public LinkGoCommand()
-    {
-        CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-    }
-
-    public bool CanExecute(object? parameter)
-    {
-        return true;
-    }
-
-    public void Execute(object? parameter)
-    {
-        if (parameter is not string str) return;
-        Helper.SafeOpenBrowser(str);
-    }
-
-    public event EventHandler? CanExecuteChanged;
-}

Nebula.Launcher/ViewModels/ServerEntryViewModel.cs

@@ -0,0 +1,209 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.ServerListProviders;
+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.Utils;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels;
+
+[ViewModelRegister(typeof(ServerEntryView), false)]
+public sealed partial class ServerEntryViewModel(
+    RestService restService, 
+    CancellationService cancellationService, 
+    GameRunnerService gameRunnerService
+    ) : 
+    ViewModelBase, 
+    IFilterConsumer,
+    IListEntryModelView, 
+    IFavoriteEntryModelView,
+    IEntryNameHolder, 
+    IRunningSignalConsumer
+{
+    [ObservableProperty] private string _description = "Fetching info...";
+    [ObservableProperty] private bool _expandInfo;
+    [ObservableProperty] private bool _isFavorite;
+    [ObservableProperty] private bool _isVisible;
+    [ObservableProperty] private bool _runVisible = true;
+    [ObservableProperty] private string _realName = string.Empty;
+    
+    public string? Name
+    {
+        get => RealName;
+        set => RealName = value ?? Status.Name;
+    }
+    
+    private ServerInfo? _serverInfo;
+
+    public RobustUrl Address { get; private set; }
+
+    public ServerStatus Status { get; private set; } =
+        new(
+            "Fetching data...",
+            "Loading...", [],
+            "",
+            -1,
+            -1,
+            -1,
+            false,
+            DateTime.Now,
+            -1
+        );
+
+    public ObservableCollection<ServerLink> Links { get; } = new();
+    public ObservableCollection<string> Tags { get; } = [];
+    public ICommand OnLinkGo { get; } = new LinkGoCommand();
+
+    public async Task<ServerInfo?> GetServerInfo()
+    {
+        if (_serverInfo != null) 
+            return _serverInfo;
+        
+        try
+        {
+            _serverInfo = await restService.GetAsync<ServerInfo>(Address.InfoUri, cancellationService.Token);
+        }
+        catch (Exception e)
+        {
+            Description = e.Message;
+        }
+
+        return _serverInfo;
+    }
+
+    protected override void InitialiseInDesignMode()
+    {
+        IsVisible = true;
+        RealName = "TEST.TEST";
+        Description = "Server of meow girls! Nya~ \nNyaMeow\nOOOINK!!";
+        Links.Add(new ServerLink("Discord", "discord", "https://cinka.ru"));
+        Status = new ServerStatus("Ameba",
+            "Locala meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow meow ",
+            ["rp:hrp", "18+"],
+            "Antag", 15, 5, 1, false
+            , DateTime.Now, 100);
+        Address = "ss14://localhost";
+    }
+
+    protected override void Initialise()
+    {
+    }
+    
+    public void ProcessFilter(ServerFilter? serverFilter)
+    {
+        if (serverFilter == null)
+        {
+            IsVisible = true;
+            return;
+        }
+        
+        IsVisible = serverFilter.IsMatch(Status.Name, Tags);
+    }
+
+    public void SetStatus(ServerStatus serverStatus)
+    {
+        Status = serverStatus;
+        Tags.Clear();
+        foreach (var tag in Status.Tags) Tags.Add(tag);
+        OnPropertyChanged(nameof(Status));
+    }
+    
+    public ServerEntryViewModel WithData(RobustUrl url, string? name, ServerStatus serverStatus)
+    {
+        Address = url;
+        SetStatus(serverStatus);
+        Name = name;
+        return this;
+    }
+
+    public void OpenContentViewer()
+    {
+        gameRunnerService.OpenContentViewer(Address);
+    }
+
+    public void ToggleFavorites()
+    {
+        IsFavorite = !IsFavorite;
+        if(IsFavorite)
+            gameRunnerService.AddFavorite(Address);
+        else
+            gameRunnerService.RemoveFavorite(Address);
+    }
+
+    public void RunInstance()
+    { 
+        Task.Run(async ()=> await gameRunnerService.RunInstanceAsync(this, cancellationService.Token));
+    }
+
+    public void RunInstanceIgnoreAuth()
+    {
+        Task.Run(async ()=> await gameRunnerService.RunInstanceAsync(this, cancellationService.Token, true));
+    }
+
+    public void StopInstance()
+    {
+        gameRunnerService.StopInstance(Address);
+    }
+    
+    public void ReadLog()
+    {
+        gameRunnerService.ReadInstanceLog(Address);
+    }
+
+    public void EditName()
+    {
+        gameRunnerService.EditName(Address, Name);
+    }
+
+    public async void ExpandInfoRequired()
+    {
+        ExpandInfo = !ExpandInfo;
+        if (Design.IsDesignMode) return;
+
+        var info = await GetServerInfo();
+        if (info == null) return;
+
+        Description = info.Desc;
+
+        Links.Clear();
+        if (info.Links is null) return;
+        foreach (var link in info.Links) Links.Add(link);
+    }
+    
+
+    public void ProcessRunningSignal(bool isRunning)
+    {
+        RunVisible = !isRunning;
+    }
+}
+
+public sealed class LinkGoCommand : ICommand
+{
+    public LinkGoCommand()
+    {
+        CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+    }
+
+    public bool CanExecute(object? parameter)
+    {
+        return true;
+    }
+
+    public void Execute(object? parameter)
+    {
+        if (parameter is not string str) return;
+        Helper.SafeOpenBrowser(str);
+    }
+
+    public event EventHandler? CanExecuteChanged;
+}

Nebula.Launcher/ViewModels/ServerListViewModel.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.ObjectModel;
+using Avalonia.Collections;
+using Nebula.Launcher.ServerListProviders;
+using Nebula.Launcher.ViewModels.Pages;
+using Nebula.Launcher.Views;
+using Nebula.Shared.ViewHelper;
+
+namespace Nebula.Launcher.ViewModels;
+
+[ViewModelRegister(typeof(ServerListView), false)]
+public class ServerListViewModel : ViewModelBase
+{
+    public AvaloniaList<IListEntryModelView> ServerList { get; private set; } = new();
+    public AvaloniaList<Exception> ErrorList { get; private set; } = new();
+    public IServerListProvider? Provider { get; private set; }
+
+    public void ClearProvider()
+    {
+        foreach (var serverEntry in ServerList)
+        {
+            if (serverEntry is IDisposable disposable)
+            {
+                disposable.Dispose();  
+            }
+        }
+        
+        ServerList.Clear();
+        ErrorList.Clear();
+        GC.Collect();
+        GC.WaitForPendingFinalizers();
+    }
+
+    public void SetProvider(IServerListProvider provider)
+    {
+        Provider = provider;
+        
+        OnPropertyChanged(nameof(ServerList));
+        OnPropertyChanged(nameof(ErrorList));
+        
+        RefreshFromProvider();
+    }
+    
+    public void RefreshFromProvider()
+    {
+        Provider?.LoadServerList(ServerList, ErrorList);
+    }
+    
+    protected override void InitialiseInDesignMode()
+    {
+        SetProvider(new TestServerList());
+    }
+
+    protected override void Initialise()
+    {
+    }
+}

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/ExceptionView.axaml

@@ -3,14 +3,14 @@
     d:DesignWidth="800"
     mc:Ignorable="d"
     x:Class="Nebula.Launcher.Views.ExceptionView"
-    x:DataType="system:Exception"
+    x:DataType="viewModels:ExceptionCompound"
     xmlns="https://github.com/avaloniaui"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:system="clr-namespace:System;assembly=System.Runtime"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels">
     <Design.DataContext>
-        <system:Exception />
+        <viewModels:ExceptionCompound />
     </Design.DataContext>
     <Border
         BoxShadow="{StaticResource DefaultShadow}"

Nebula.Launcher/Views/ExceptionView.axaml.cs

@@ -2,6 +2,8 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Nebula.Launcher.Models;
+using Nebula.Launcher.ViewModels;
 
 namespace Nebula.Launcher.Views;
 
@@ -14,6 +16,6 @@ public partial class ExceptionView : UserControl
 
     public ExceptionView(Exception exception): this()
     {
-        DataContext = exception;
+        DataContext = new ExceptionCompound(exception);
     }
 }

Nebula.Launcher/Views/FileContentEntryView.axaml

@@ -0,0 +1,52 @@
+<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:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="pages:FolderContentEntry"
+             x:Class="Nebula.Launcher.Views.FileContentEntryView">
+    <Design.DataContext>
+        <pages:FolderContentEntry/>
+    </Design.DataContext>
+    
+    <ScrollViewer
+        Grid.Column="0"
+        Grid.ColumnSpan="4"
+        Grid.Row="1"
+        Margin="0,0,0,5">
+        <ItemsControl ItemsSource="{Binding Entries}" Padding="0,0,0,0">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate DataType="{x:Type pages:IContentEntry}">
+                    <Button
+                        Command="{Binding GoCurrent}"
+                        CornerRadius="0"
+                        Height="30"
+                        HorizontalAlignment="Stretch">
+                           
+                        <StackPanel Orientation="Horizontal" Spacing="15">
+                            <Border
+                                Background="#00000000"
+                                BorderThickness="0,0,2,0"
+                                CornerRadius="0">
+                                <Svg
+                                    Height="15"
+                                    Margin="10,0,10,0"
+                                    Path="{Binding IconPath}" />
+                                <Border.BorderBrush>
+                                    <LinearGradientBrush EndPoint="100%,50%" StartPoint="0%,50%">
+                                        <GradientStop Color="#442222" Offset="0.0" />
+                                        <GradientStop Color="#222222" Offset="1.0" />
+                                    </LinearGradientBrush>
+                                </Border.BorderBrush>
+                            </Border>
+                            <Label>
+                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
+                            </Label>
+                        </StackPanel>
+                    </Button>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+    </ScrollViewer>
+</UserControl>

Nebula.Launcher/Views/FileContentEntryView.axaml.cs

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

Nebula.Launcher/Views/MainView.axaml

@@ -8,9 +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:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:models1="clr-namespace:Nebula.Launcher.Models"
+    xmlns:services="clr-namespace:Nebula.Launcher.Services">
     <Design.DataContext>
         <viewModels:MainViewModel />
     </Design.DataContext>
@@ -63,7 +64,7 @@
                                 Padding="0"
                                 SelectedItem="{Binding SelectedListItem}">
                                 <ListBox.ItemTemplate>
-                                    <DataTemplate DataType="{x:Type models:ListItemTemplate}">
+                                    <DataTemplate DataType="{x:Type models1:ListItemTemplate}">
                                         <StackPanel Orientation="Horizontal" Spacing="19">
                                             <Svg
                                                 Height="40"
@@ -76,7 +77,7 @@
                             </ListBox>
                             <Button
                                 Classes="ViewSelectButton"
-                                Command="{Binding TriggerPaneCommand}"
+                                Command="{Binding TriggerPane}"
                                 Grid.Row="1"
                                 HorizontalAlignment="Stretch"
                                 Padding="5,0,5,0"
@@ -120,7 +121,41 @@
                                 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" 
+                                            Text="{Binding LoginText}"/>
+                                    </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>
@@ -143,7 +178,7 @@
                                 <Label Content="{Binding CurrentTitle}" VerticalAlignment="Center" />
                             </StackPanel>
                             <Button
-                                Command="{Binding ClosePopupCommand}"
+                                Command="{Binding CloseCurrentPopup}"
                                 Content="X"
                                 CornerRadius="0,10,0,0"
                                 HorizontalAlignment="Right"

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/MainWindow.axaml

@@ -3,9 +3,9 @@
     ExtendClientAreaChromeHints="NoChrome"
     ExtendClientAreaTitleBarHeightHint="-1"
     ExtendClientAreaToDecorationsHint="True"
-    Height="500"
+    Height="550"
     Icon="/Assets/nebula.ico"
-    MinHeight="500"
+    MinHeight="550"
     MinWidth="800"
     SystemDecorations="BorderOnly"
     Title="Nebula.Launcher"

Nebula.Launcher/Views/Pages/AccountInfoView.axaml

@@ -1,14 +1,17 @@
 <UserControl
     d:DesignHeight="450"
-    d:DesignWidth="800"
+    d:DesignWidth="1000"
     mc:Ignorable="d"
     x:Class="Nebula.Launcher.Views.Pages.AccountInfoView"
     x:DataType="pages:AccountInfoViewModel"
     xmlns="https://github.com/avaloniaui"
+    xmlns:customControls="clr-namespace:Nebula.Launcher.Controls"
     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"
+    xmlns:converters="clr-namespace:Nebula.Launcher.Converters">
     <Design.DataContext>
         <pages:AccountInfoViewModel />
     </Design.DataContext>
@@ -28,7 +31,7 @@
                         <GradientStop Color="#292222" Offset="1.0" />
                     </LinearGradientBrush>
                 </Border.Background>
-                <Label HorizontalAlignment="Center">Profiles:</Label>
+                <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="account-profiles"/>
             </Border>
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <ItemsControl
@@ -36,44 +39,58 @@
                     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:ProfileEntry}">
+                            <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 Credentials.AuthServer, 
+                                            Converter={x:Static converters:TypeConverters.NameColorRepresentation}}" 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">
-                                            <Label>
-                                                Select
-                                            </Label>
-                                        </Button>
-                                        <Button
-                                            Command="{Binding OnDelete}"
-                                            CornerRadius="0,10,0,0"
-                                            Padding="5">
-                                            <Label>
-                                                Delete
-                                            </Label>
-                                        </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>
@@ -102,23 +119,28 @@
                             Margin="0,0,0,20"
                             Path="/Assets/svg/user.svg" />
                         <StackPanel HorizontalAlignment="Center">
+                            <StackPanel IsVisible="{Binding DoRetryAuth}">
+                                <Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
+                                    <Button
+                                        Command="{Binding DoCurrentAuth}"
+                                        HorizontalAlignment="Stretch"
+                                        HorizontalContentAlignment="Center">
+                                        <customControls:LocalizedLabel LocalId="account-auth-retry"/>
+                                    </Button>
+                                </Border>
+                                <customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="account-auth-try-another"/>
+                            </StackPanel>
                             <StackPanel Orientation="Horizontal">
-                                <Label VerticalAlignment="Center">
-                                    Login:
-                                </Label>
+                                <customControls:LocalizedLabel VerticalAlignment="Center" LocalId="account-auth-login"/>
                                 <TextBox Text="{Binding CurrentLogin}" MinWidth="200" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
-                                <Label HorizontalAlignment="Left" VerticalAlignment="Center">
-                                    Password:
-                                </Label>
+                                <customControls:LocalizedLabel HorizontalAlignment="Left" VerticalAlignment="Center" LocalId="account-auth-password"/>
                                 <TextBox PasswordChar="#" MinWidth="200" Text="{Binding CurrentPassword}" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
-                                <Label VerticalAlignment="Center">
-                                    Auth server:
-                                </Label>
-                                <Button Command="{Binding ExpandAuthUrlCommand}" VerticalAlignment="Stretch">
+                                <customControls:LocalizedLabel VerticalAlignment="Center" LocalId="account-auth-server"/>
+                                <Button Command="{Binding OnExpandAuthUrl}" VerticalAlignment="Stretch">
                                     <Label>+</Label>
                                 </Button>
                             </StackPanel>
@@ -150,18 +172,10 @@
                                 Command="{Binding DoAuth}"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Center">
-                                <Label>Auth</Label>
+                                <customControls:LocalizedLabel LocalId="account-auth-button"/>
                             </Button>
                         </Border>
-                        <Border BoxShadow="{StaticResource DefaultShadow}">
-                            <Button 
-                                Command="{Binding SaveProfileCommand}" 
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center">
-                                <Label>Save profile</Label>
-                            </Button>
-                        </Border>
-                        <Button Command="{Binding ExpandAuthViewCommand}" HorizontalAlignment="Right">
+                        <Button Command="{Binding OnExpandAuthView}" HorizontalAlignment="Right">
                             <Label>
                                 >
                             </Label>
@@ -174,9 +188,15 @@
                             Margin="0,0,0,20"
                             Path="/Assets/svg/user.svg" />
                         <Label>
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                <TextBlock>Hello,</TextBlock>
-                                <TextBlock Text="{Binding CurrentLogin}" />
+                            <StackPanel Spacing="15">
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+                                    <customControls:LocalizedLabel LocalId="account-auth-hello"/>
+                                    <TextBlock Text="{Binding Credentials.Value.Login}" />
+                                </StackPanel>
+                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="5">
+                                    <customControls:LocalizedLabel LocalId="account-auth-current-server"/>
+                                    <TextBlock Text="{Binding AuthServerName}" />
+                                </StackPanel>
                             </StackPanel>
                         </Label>
                         <StackPanel
@@ -186,12 +206,14 @@
                             Spacing="5">
                             <Border BoxShadow="{StaticResource DefaultShadow}">
                                 <Button Command="{Binding Logout}">
-                                    <Label>Logout</Label>
+                                    <customControls:LocalizedLabel LocalId="account-auth-logout"/>
                                 </Button>
                             </Border>
-                            <Border BoxShadow="{StaticResource DefaultShadow}">
-                                <Button Command="{Binding SaveProfileCommand}">
-                                    <Label>Save profile</Label>
+                            <Border BoxShadow="{StaticResource DefaultShadow}" 
+                                    IsVisible="{Binding CurrentPassword, 
+                                        Converter={x:Static converters:TypeConverters.StringIsNotEmpty}}">
+                                <Button Command="{Binding OnSaveProfile}">
+                                    <customControls:LocalizedLabel LocalId="account-auth-save"/>
                                 </Button>
                             </Border>
                         </StackPanel>