From b781806fab048beec7b18011a2e225329c295b99 Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Sun, 23 Feb 2025 18:58:27 +0300
Subject: [PATCH 01/10] wip auth for license minecraft support and removing
 unnecesary nugets

---
 Launcher-Core/Launcher-Core.csproj |  7 +++---
 Launcher-Core/Launcher.cs          |  2 ++
 Launcher-Core/Program.cs           |  6 ++++-
 Launcher-Core/Utils.cs             | 35 +++++++++++++++++++++++++-----
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Launcher-Core/Launcher-Core.csproj b/Launcher-Core/Launcher-Core.csproj
index 839f8a6..c4ab723 100644
--- a/Launcher-Core/Launcher-Core.csproj
+++ b/Launcher-Core/Launcher-Core.csproj
@@ -8,16 +8,17 @@
     <PublishSingleFile>true</PublishSingleFile>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
 
-    <IsAotCompatible>false</IsAotCompatible>
+    <PublishTrimmed>false</PublishTrimmed>
 
   </PropertyGroup>
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CmlLib.Core" Version="4.0.4" />
-    <PackageReference Include="SharpCompress" Version="0.39.0" />
+    <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.2.2" />
+    <PackageReference Include="XboxAuthNet.Game.Msal" Version="0.1.2" />
   </ItemGroup>
 
-  
+
 
 </Project>
diff --git a/Launcher-Core/Launcher.cs b/Launcher-Core/Launcher.cs
index 511dcc3..16b2cdd 100644
--- a/Launcher-Core/Launcher.cs
+++ b/Launcher-Core/Launcher.cs
@@ -4,7 +4,9 @@ using System.Runtime.InteropServices;
 using System.Security.AccessControl;
 using CmlLib.Core;
 using CmlLib.Core.Auth;
+using CmlLib.Core.Auth.Microsoft;
 using CmlLib.Core.ProcessBuilder;
+using XboxAuthNet.Game.Msal;
 
 namespace Plombir;
 
diff --git a/Launcher-Core/Program.cs b/Launcher-Core/Program.cs
index 7a3ff86..c48c13e 100644
--- a/Launcher-Core/Program.cs
+++ b/Launcher-Core/Program.cs
@@ -2,8 +2,12 @@ namespace Plombir;
 
 sealed class Program
 {
-    public static void Main()
+    public static async Task Main()
     {
         Console.WriteLine("init: launcher");
+        // var ln = new Launcher("test", "1.20.1");
+        // var s = await Utils.GetLicensedSession();
+
+        // Console.WriteLine(s.CheckIsValid());
     }
 }
diff --git a/Launcher-Core/Utils.cs b/Launcher-Core/Utils.cs
index 86cf813..dc57163 100644
--- a/Launcher-Core/Utils.cs
+++ b/Launcher-Core/Utils.cs
@@ -1,11 +1,9 @@
-using System.IO.Compression;
 using System;
 using System.IO;
-using SharpCompress.Archives;
-using SharpCompress.Common;
-using SharpCompress.Readers;
-using System.Diagnostics;
 using CmlLib.Core;
+using CmlLib.Core.Auth;
+using XboxAuthNet.Game.Msal;
+using CmlLib.Core.Auth.Microsoft;
 
 namespace Plombir;
 
@@ -27,6 +25,31 @@ static public class Utils
 
     }
 
+    /*
+        Method is working, but we need to wait for client-id approval.
+    */
+    public static async Task<MSession>? GetLicensedSession()
+    {
+        try
+        {
+            var app = await MsalClientHelper.BuildApplicationWithCache(
+                "d87c436c-aad0-46ea-b392-b53b3ed787b1"
+            );
+            var loginHandler = JELoginHandlerBuilder.BuildDefault();
 
-
+            var authenticator = loginHandler.CreateAuthenticatorWithNewAccount(default);
+            authenticator.AddMsalOAuth(app, msal => msal.DeviceCode(deviceCode =>
+            {
+                Console.WriteLine(deviceCode.Message);
+                return Task.CompletedTask;
+            }));
+            authenticator.AddXboxAuthForJE(xbox => xbox.Basic());
+            authenticator.AddJEAuthenticator();
+            return await authenticator.ExecuteForLauncherAsync();
+        }
+        catch (Exception e)
+        {
+            throw new Exception($"Failed to authentificate! {e}");
+        }
+    }
 }

From cdd2bcfb69b4ee178c7f7897b5dc3e05cbbaa3c1 Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Tue, 25 Feb 2025 18:31:43 +0300
Subject: [PATCH 02/10] Project cleanup

Rearranging sprites + removing redundant files
---
 Launcher-UI/Assets/Sprites/account-logo.png       | Bin 0 -> 570 bytes
 Launcher-UI/Assets/{ => Sprites}/background.jpg   | Bin
 Launcher-UI/Assets/{ => Sprites}/cog.png          | Bin
 Launcher-UI/Assets/{ => Sprites}/gitlab-logo.png  | Bin
 Launcher-UI/Assets/{ => Sprites}/icon.png         | Bin
 Launcher-UI/Assets/{ => Sprites}/title.png        | Bin
 Launcher-UI/Assets/{ => Sprites}/toml-paper.png   | Bin
 Launcher-UI/ViewModels/SettingsWindowViewModel.cs |   6 ------
 .../ViewModels/VersionSelectorWindowViewModel.cs  |  10 ----------
 Launcher-UI/Views/LoadingWindow.axaml             |   2 +-
 Launcher-UI/Views/SettingsWindow.axaml            |   8 ++++----
 Launcher-UI/Views/VersionSelectorWindow.axaml     |   6 +++---
 12 files changed, 8 insertions(+), 24 deletions(-)
 create mode 100644 Launcher-UI/Assets/Sprites/account-logo.png
 rename Launcher-UI/Assets/{ => Sprites}/background.jpg (100%)
 rename Launcher-UI/Assets/{ => Sprites}/cog.png (100%)
 rename Launcher-UI/Assets/{ => Sprites}/gitlab-logo.png (100%)
 rename Launcher-UI/Assets/{ => Sprites}/icon.png (100%)
 rename Launcher-UI/Assets/{ => Sprites}/title.png (100%)
 rename Launcher-UI/Assets/{ => Sprites}/toml-paper.png (100%)
 delete mode 100644 Launcher-UI/ViewModels/SettingsWindowViewModel.cs
 delete mode 100644 Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs

diff --git a/Launcher-UI/Assets/Sprites/account-logo.png b/Launcher-UI/Assets/Sprites/account-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4aeee240313502247353d2fbbb63d1b47005db5
GIT binary patch
literal 570
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&U}E%iaSW-L^Y-pRUnWO}wu@II
z7S~2JsB>@NpM7Qb%n7QD`({4eYurAyX66s}GD|+7Mr5$#!P0#V)m8t0SpB|qzdG(X
z>+*a5=f6K+9q;~Z>pq5gvl%=&Crn}R%r$lrlaNWby=qX%G)YK7lMzU)RCPb$*8F%)
zZhNONNDWxw-mBsT&bxW~CSJV1?McI*^PC=D4NF+4Oq5l*yniuq>u#HE<=w|W_E|7O
z?B<+s#q9r`yf4gcxBnSD>_9jQ=z2FX2{nIH3%5CN*JRBWEIRr?VrErK&l@8jB=KK@
zn_leLu{HO27s3QzQzx+>zplKQ_Pc62LNrzR$b*U*E0O(w_FG3>^W$%B?_ZkCZ?J?r
zEX2}@r|+D};Ugr5$ErQ*DJA?(zg^@G_r5HUVNy|Z2x4MEj=*)F*uxBTo-dzXzY!$t
M>FVdQ&MBb@0G0CD*#H0l

literal 0
HcmV?d00001

diff --git a/Launcher-UI/Assets/background.jpg b/Launcher-UI/Assets/Sprites/background.jpg
similarity index 100%
rename from Launcher-UI/Assets/background.jpg
rename to Launcher-UI/Assets/Sprites/background.jpg
diff --git a/Launcher-UI/Assets/cog.png b/Launcher-UI/Assets/Sprites/cog.png
similarity index 100%
rename from Launcher-UI/Assets/cog.png
rename to Launcher-UI/Assets/Sprites/cog.png
diff --git a/Launcher-UI/Assets/gitlab-logo.png b/Launcher-UI/Assets/Sprites/gitlab-logo.png
similarity index 100%
rename from Launcher-UI/Assets/gitlab-logo.png
rename to Launcher-UI/Assets/Sprites/gitlab-logo.png
diff --git a/Launcher-UI/Assets/icon.png b/Launcher-UI/Assets/Sprites/icon.png
similarity index 100%
rename from Launcher-UI/Assets/icon.png
rename to Launcher-UI/Assets/Sprites/icon.png
diff --git a/Launcher-UI/Assets/title.png b/Launcher-UI/Assets/Sprites/title.png
similarity index 100%
rename from Launcher-UI/Assets/title.png
rename to Launcher-UI/Assets/Sprites/title.png
diff --git a/Launcher-UI/Assets/toml-paper.png b/Launcher-UI/Assets/Sprites/toml-paper.png
similarity index 100%
rename from Launcher-UI/Assets/toml-paper.png
rename to Launcher-UI/Assets/Sprites/toml-paper.png
diff --git a/Launcher-UI/ViewModels/SettingsWindowViewModel.cs b/Launcher-UI/ViewModels/SettingsWindowViewModel.cs
deleted file mode 100644
index 3848b0f..0000000
--- a/Launcher-UI/ViewModels/SettingsWindowViewModel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace LauncherGUI.ViewModels;
-
-public partial class SettingsWindowViewModel : ViewModelBase
-{
-    // I save launcher data mostly in MainWindowViewModel.
-}
diff --git a/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs b/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs
deleted file mode 100644
index 5c26947..0000000
--- a/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using Plombir;
-using LauncherGUI.ViewModels;
-
-namespace LauncherGUI.ViewModels;
-
-public partial class VersionSelectorWindowViewModel : ViewModelBase
-{
-    // I save launcher data mostly in MainWindowViewModel.
-}
diff --git a/Launcher-UI/Views/LoadingWindow.axaml b/Launcher-UI/Views/LoadingWindow.axaml
index 4c287ab..468abbd 100644
--- a/Launcher-UI/Views/LoadingWindow.axaml
+++ b/Launcher-UI/Views/LoadingWindow.axaml
@@ -9,7 +9,7 @@
     d:DesignHeight="200"
     x:Class="LauncherGUI.Views.LoadingWindow"
     x:DataType="vm:LoadingWindowViewModel"
-    Icon="/Assets/icon.png"
+    Icon="/Assets/Sprites/icon.png"
     Title="Loading"
     RequestedThemeVariant="Dark"
     Width="400"
diff --git a/Launcher-UI/Views/SettingsWindow.axaml b/Launcher-UI/Views/SettingsWindow.axaml
index 6b0fddd..f96f1c2 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml
+++ b/Launcher-UI/Views/SettingsWindow.axaml
@@ -1,15 +1,15 @@
 <Window
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:LauncherGUI.ViewModels"
+    
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     d:DesignWidth="500"
     d:DesignHeight="400"
     x:Class="LauncherGUI.Views.SettingsWindow"
-    x:DataType="vm:SettingsWindowViewModel"
-    Icon="/Assets/icon.png"
+
+    Icon="/Assets/Sprites/icon.png"
     Title="Launcher tweaks"
     RequestedThemeVariant="Dark"
     Width="500"
@@ -43,7 +43,7 @@
         </StackPanel>
 
         <StackPanel Grid.Row="2" Grid.Column="1">
-            <Image Source="/Assets/toml-paper.png" 
+            <Image Source="/Assets/Sprites/toml-paper.png" 
                 Stretch="Uniform"/>
 
             
diff --git a/Launcher-UI/Views/VersionSelectorWindow.axaml b/Launcher-UI/Views/VersionSelectorWindow.axaml
index f55f812..781d8b1 100644
--- a/Launcher-UI/Views/VersionSelectorWindow.axaml
+++ b/Launcher-UI/Views/VersionSelectorWindow.axaml
@@ -1,12 +1,12 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:LauncherGUI.ViewModels"
+
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="200"
         x:Class="LauncherGUI.Views.VersionSelectorWindow"
-        x:DataType="vm:VersionSelectorWindowViewModel"
-        Icon="/Assets/icon.png"
+
+        Icon="/Assets/Sprites/icon.png"
         Title="Select version"
         RequestedThemeVariant="Dark"
         Width="600" Height="500"

From d1c235c1b5a2c294e3d65e8ec04e7e8373530e48 Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Tue, 25 Feb 2025 18:32:10 +0300
Subject: [PATCH 03/10] Licensed session support

---
 Launcher-Core/Launcher.cs | 2 +-
 Launcher-Core/Utils.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Launcher-Core/Launcher.cs b/Launcher-Core/Launcher.cs
index 16b2cdd..3a36263 100644
--- a/Launcher-Core/Launcher.cs
+++ b/Launcher-Core/Launcher.cs
@@ -43,7 +43,7 @@ public class Launcher
             DownloadProgress = (int)(args.ProgressedBytes * 100 / args.TotalBytes);
         };
 
-        DownloadStatus = "Installing minecraft...";
+        DownloadStatus = "Getting the assets from Mojang...";
         Console.WriteLine(DownloadStatus);
         await _mcLauncher.InstallAsync(_version);
         DownloadStatus = "Finished!";
diff --git a/Launcher-Core/Utils.cs b/Launcher-Core/Utils.cs
index dc57163..8308af8 100644
--- a/Launcher-Core/Utils.cs
+++ b/Launcher-Core/Utils.cs
@@ -26,7 +26,7 @@ static public class Utils
     }
 
     /*
-        Method is working, but we need to wait for client-id approval.
+        ID is approved, we are so ready.
     */
     public static async Task<MSession>? GetLicensedSession()
     {

From 1e725f593313e3e0d3b5fcbc992a5859594f7acf Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Tue, 25 Feb 2025 18:32:24 +0300
Subject: [PATCH 04/10] UI update for better session control support

---
 Launcher-UI/Views/MainWindow.axaml    | 99 +++++++++++++++++----------
 Launcher-UI/Views/MainWindow.axaml.cs |  8 ++-
 2 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/Launcher-UI/Views/MainWindow.axaml b/Launcher-UI/Views/MainWindow.axaml
index 20ea829..c714306 100644
--- a/Launcher-UI/Views/MainWindow.axaml
+++ b/Launcher-UI/Views/MainWindow.axaml
@@ -6,7 +6,7 @@
         mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="500"
         x:Class="LauncherGUI.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Icon="/Assets/icon.png"
+        Icon="/Assets/Sprites/icon.png"
         Title="PlombirLauncher"
         RequestedThemeVariant="Dark"
         Width="750" Height="500"
@@ -14,14 +14,8 @@
         MaxWidth="750" MaxHeight="500">
 
     <Window.Background>
-        <ImageBrush Source="/Assets/background.jpg" Stretch="UniformToFill"/>
+        <ImageBrush Source="/Assets/Sprites/background.jpg" Stretch="UniformToFill"/>
     </Window.Background>
-
-    <Design.DataContext>
-        <!-- This only sets the DataContext for the previewer in an IDE,
-             to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
-        <vm:MainWindowViewModel/>
-    </Design.DataContext>
     
     <Grid>
         <Grid.RowDefinitions>
@@ -33,7 +27,7 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
     
-       
+       <!-- Title area  -->
         <StackPanel
             HorizontalAlignment="Center"
             Grid.Row="0" Grid.ColumnSpan="3" >
@@ -43,13 +37,15 @@
                 Padding="10" Margin="3"
                 CornerRadius="10">
 
-                <Image Source="/Assets/title.png" 
+                <Image Source="/Assets/Sprites/title.png" 
                     Stretch="Uniform"/>
 
             </Border>
             <TextBlock FontFamily="{StaticResource QuicksandFont}" 
                 HorizontalAlignment="Right" Text="v1.1.0 - nullmax17"/>
         </StackPanel>
+
+        <!-- Settings for launcher -->
         <Canvas Grid.Row="0" Grid.Column="1">
             <Border
                 Background="#353535" 
@@ -59,62 +55,93 @@
 
                 <Image 
                     Height="60"
-                    Source="/Assets/cog.png" 
+                    Source="/Assets/Sprites/cog.png" 
                     Stretch="Uniform" 
                     PointerPressed="OnCogPressed" />
 
             </Border>
             
         </Canvas>
-        
 
+        <!-- Title area end -->
             
-        
+        <!-- Center-left stack panel with minecraft stuff -->
         <StackPanel 
             VerticalAlignment="Center" 
             HorizontalAlignment="Center"
             Grid.Row="1" Grid.Column="0">
+            
+            <!-- Session managment -->
             <Border
                 Background="#353535"
                 HorizontalAlignment="Center"
-                Width="150"
                 CornerRadius="10"
                 Padding="15">
-
-                <Button FontFamily="{StaticResource QuicksandFont}" Content="Launch MC" Click="OnLaunchMinecraftClick" HorizontalAlignment="Center"/>
-
-            </Border>
-            
-            <Border
-                Background="#353535"
-                HorizontalAlignment="Center"
-                Width="250"
-                CornerRadius="10"
-                Padding="15" Margin="15">
-                <StackPanel>
+                <!-- <StackPanel>
                     <TextBlock 
                         HorizontalAlignment="Center" 
                         Text="Insert username:"
                         FontFamily="{StaticResource QuicksandFont}"/>
                     <TextBox Margin="5" Text="{Binding Usernick, Mode=TwoWay}" Width="200" />
 
-                </StackPanel>
+                </StackPanel> -->
+
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                <Button 
+                    Grid.ColumnSpan="2"
+                    FontFamily="{StaticResource QuicksandFont}" 
+                    Content="Launch MC" 
+                    Click="OnLaunchMinecraftClick" 
+                    HorizontalAlignment="Center"/>
+
+
+                <Button
+                    Grid.Column="1"
+                    Grid.Row="1"
+                    FontFamily="{StaticResource QuicksandFont}"
+                    Content="Choose version"
+                    Click="OnChooseVersionClick"
+                    HorizontalAlignment="Center"/>
+
+                <Image 
+                    Height="60"
+                    Width="60"
+                    Grid.Column="0"
+                    Grid.Row="1"
+                    Source="/Assets/Sprites/account-logo.png" 
+                    Stretch="Uniform" 
+                    PointerPressed="OnAccountSettingsPressed" />
+
+                </Grid>
+ 
+
             </Border>
 
-            <Border
+
+            <!-- Version selection -->
+            <!-- <Border
                 Background="#353535"
                 HorizontalAlignment="Center"
                 Width="150"
                 CornerRadius="10"
                 Padding="10">
 
-                <Button
-                    FontFamily="{StaticResource QuicksandFont}"
-                    Content="Choose version"
-                    Click="OnChooseVersionClick"
-                    HorizontalAlignment="Center"/>
-            </Border>
+                
+            </Border> -->
         </StackPanel>
+
+        <!-- Minecraft area end -->
+
+        <!-- Instruction panel in center-right -->
         <StackPanel Height="300" Grid.Row="1" Grid.Column="2">
             <Border
                 Background="#353535"
@@ -136,7 +163,7 @@
             <Canvas>
                 <Image 
                     Height="60"
-                    Source="/Assets/gitlab-logo.png" 
+                    Source="/Assets/Sprites/gitlab-logo.png" 
                     Stretch="Uniform" 
                     PointerPressed="OnGitlabPressed" 
                     Canvas.Left="290"
@@ -144,6 +171,8 @@
             </Canvas>
 
         </StackPanel>
+        <!-- Instruction panel end -->
+
     </Grid>
     
 </Window>
diff --git a/Launcher-UI/Views/MainWindow.axaml.cs b/Launcher-UI/Views/MainWindow.axaml.cs
index 3e22395..32195e6 100644
--- a/Launcher-UI/Views/MainWindow.axaml.cs
+++ b/Launcher-UI/Views/MainWindow.axaml.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using Plombir;
-using CmlLib.Core.VersionMetadata;
 using LauncherGUI.ViewModels;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -86,4 +83,9 @@ public partial class MainWindow : Window
         }
     }
 
+    private void OnAccountSettingsPressed(object sender, RoutedEventArgs e)
+    {
+        //todo: account managment window
+    }
+
 }

From 45ffb1dfbb3457a3d96862f2426b3782b5086a5e Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Tue, 25 Feb 2025 22:42:41 +0300
Subject: [PATCH 05/10] Licensed auth WIP

Slowly adding methods and variables to build licensed minecraft instance
---
 Launcher-Core/Utils.cs                        |   4 +-
 Launcher-UI/LauncherUtils.cs                  |   5 +
 Launcher-UI/ViewModels/MainWindowViewModel.cs |  17 +++
 Launcher-UI/Views/MainWindow.axaml.cs         |   7 +-
 .../Views/SessionManagmentWindow.axaml        | 144 ++++++++++++++++++
 .../Views/SessionManagmentWindow.axaml.cs     |  40 +++++
 6 files changed, 214 insertions(+), 3 deletions(-)
 create mode 100644 Launcher-UI/Views/SessionManagmentWindow.axaml
 create mode 100644 Launcher-UI/Views/SessionManagmentWindow.axaml.cs

diff --git a/Launcher-Core/Utils.cs b/Launcher-Core/Utils.cs
index 8308af8..13db5d3 100644
--- a/Launcher-Core/Utils.cs
+++ b/Launcher-Core/Utils.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+
 using CmlLib.Core;
 using CmlLib.Core.Auth;
 using XboxAuthNet.Game.Msal;
@@ -43,6 +42,7 @@ static public class Utils
                 Console.WriteLine(deviceCode.Message);
                 return Task.CompletedTask;
             }));
+            authenticator.AddMsalOAuth(app, msal => msal.Silent());
             authenticator.AddXboxAuthForJE(xbox => xbox.Basic());
             authenticator.AddJEAuthenticator();
             return await authenticator.ExecuteForLauncherAsync();
diff --git a/Launcher-UI/LauncherUtils.cs b/Launcher-UI/LauncherUtils.cs
index dc0dd1f..0fb7874 100644
--- a/Launcher-UI/LauncherUtils.cs
+++ b/Launcher-UI/LauncherUtils.cs
@@ -24,4 +24,9 @@ public class LauncherUtils
         await loading.RunMinecraft();
         return;
     }
+
+    private static async Task CreateLicensedMinecraftInstance()
+    {
+
+    }
 }
diff --git a/Launcher-UI/ViewModels/MainWindowViewModel.cs b/Launcher-UI/ViewModels/MainWindowViewModel.cs
index f334bfd..bcde692 100644
--- a/Launcher-UI/ViewModels/MainWindowViewModel.cs
+++ b/Launcher-UI/ViewModels/MainWindowViewModel.cs
@@ -15,4 +15,21 @@ public partial class MainWindowViewModel : ViewModelBase
 
     private string? _runtimeLocation = ConfigManager.ReadConfig("runtime-path");
     public string? RuntimeLocation { get => _runtimeLocation; set { _runtimeLocation = value; OnPropertyChanged(nameof(RuntimeLocation)); } }
+
+    // Session information
+    private string? _loginMethod = ConfigManager.ReadConfig("login-method");
+    public string? LoginMethod { get => _loginMethod; set { _loginMethod = value; OnPropertyChanged(nameof(LoginMethod)); } }
+
+    private string? _accsessToken = ConfigManager.ReadConfig("accsess-token");
+    public string? AccsesToken { get => _accsessToken; set { _accsessToken = value; OnPropertyChanged(nameof(AccsesToken)); } }
+
+    private string? _clientToken = ConfigManager.ReadConfig("client-token");
+    public string? ClientToken { get => _clientToken; set { _clientToken = value; OnPropertyChanged(nameof(ClientToken)); } }
+
+    private string? _uuid = ConfigManager.ReadConfig("uuid");
+    public string? UUID { get => _uuid; set { _uuid = value; OnPropertyChanged(nameof(UUID)); } }
+
+    // Tweaks managment
+    private string? _tweaksVersion = ConfigManager.ReadConfig("tweaks-version");
+    public string? TweaksVersion { get => _tweaksVersion; set { _tweaksVersion = value; OnPropertyChanged(nameof(TweaksVersion)); } }
 }
diff --git a/Launcher-UI/Views/MainWindow.axaml.cs b/Launcher-UI/Views/MainWindow.axaml.cs
index 32195e6..5b28613 100644
--- a/Launcher-UI/Views/MainWindow.axaml.cs
+++ b/Launcher-UI/Views/MainWindow.axaml.cs
@@ -85,7 +85,12 @@ public partial class MainWindow : Window
 
     private void OnAccountSettingsPressed(object sender, RoutedEventArgs e)
     {
-        //todo: account managment window
+        if (sender is not Image img) return;
+
+        if (img.GetVisualRoot() is not MainWindow root) return;
+
+        SessionManagmentWindow sessionManager = new(DataContext as MainWindowViewModel);
+        sessionManager.Show(root);
     }
 
 }
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml b/Launcher-UI/Views/SessionManagmentWindow.axaml
new file mode 100644
index 0000000..6682519
--- /dev/null
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml
@@ -0,0 +1,144 @@
+<Window
+    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"
+    mc:Ignorable="d"
+    d:DesignWidth="500"
+    d:DesignHeight="400"
+    x:Class="LauncherGUI.Views.SessionManagmentWindow"
+    Icon="/Assets/Sprites/icon.png"
+    Title="Account manager"
+    RequestedThemeVariant="Dark"
+    Width="500"
+    Height="400"
+    MinWidth="500"
+    MinHeight="400"
+    MaxWidth="500"
+    MaxHeight="400"
+    Background="#353535"
+>
+
+    <StackPanel>
+        <Border
+            Width="500"
+            Background="#94a285"
+            Padding="10"
+            HorizontalAlignment="Center"
+        >
+            <StackPanel>
+
+                <TextBlock
+                    Text="Current session info"
+                    FontFamily="{StaticResource QuicksandFont}"
+                    HorizontalAlignment="Center"
+                />
+
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        Text="Session nickname: "
+                        FontFamily="{StaticResource QuicksandFont}"
+                    />
+                    <TextBlock x:Name="currentNickname" />
+                </StackPanel>
+
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        Text="Session login method: "
+                        FontFamily="{StaticResource QuicksandFont}"
+                    />
+                    <TextBlock x:Name="loginMethod" />
+                </StackPanel>
+
+            </StackPanel>
+
+        </Border>
+
+        <!-- This is quite junky, but It should look simillar. -->
+        <Border
+            Width="500"
+            Background="#504254"
+            Padding="10"
+            HorizontalAlignment="Center"
+        >
+            <TextBlock
+                Text="OFFLINE METHOD"
+                FontFamily="{StaticResource QuicksandFont}"
+                HorizontalAlignment="Center"
+            />
+        </Border>
+
+        <Border
+            Width="500"
+            Background="#504254"
+            Padding="10"
+            HorizontalAlignment="Center"
+        >
+            <StackPanel HorizontalAlignment="Center">
+
+                <TextBlock
+                    Text="Insert username:"
+                    FontFamily="{StaticResource QuicksandFont}"
+                />
+                <TextBox
+                    x:Name="inputNickname"
+                    Width="200"
+                    HorizontalAlignment="Left"
+                />
+
+
+            </StackPanel>
+        </Border>
+
+        <Border
+            Width="500"
+            Background="#542434"
+            Padding="10"
+            HorizontalAlignment="Center"
+        >
+
+            <TextBlock
+                Text="LICENSED METHOD"
+                FontFamily="{StaticResource QuicksandFont}"
+                HorizontalAlignment="Center"
+            />
+        </Border>
+
+        <Border
+            Width="500"
+            Background="#542434"
+            Padding="10"
+            HorizontalAlignment="Center"
+        >
+
+            <StackPanel
+                Grid.Row="1"
+                Grid.Column="0"
+                Orientation="Horizontal"
+                HorizontalAlignment="Center"
+            >
+                <Image
+                    Height="30"
+                    Width="30"
+                    Source="/Assets/Sprites/microsoft-logo.png"
+                    Stretch="Uniform"
+                />
+
+                <Button
+                    Content="Login with Microsoft"
+                    Click="OnMicrosoftLoginClick"
+                />
+            </StackPanel>
+
+        </Border>
+
+        <Button
+            FontFamily="{StaticResource QuicksandFont}"
+            Content="Save"
+            HorizontalAlignment="Center"
+            Click="OnSaveButtonClick"
+        />
+
+    </StackPanel>
+
+</Window>
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml.cs b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
new file mode 100644
index 0000000..77e1d75
--- /dev/null
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
@@ -0,0 +1,40 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using LauncherGUI.ViewModels;
+
+namespace LauncherGUI.Views;
+using Plombir;
+
+public partial class SessionManagmentWindow : Window
+{
+    private MainWindowViewModel _mainWindowVM;
+    public SessionManagmentWindow(MainWindowViewModel mainWindowVM)
+    {
+        InitializeComponent();
+        _mainWindowVM = mainWindowVM;
+        inputNickname.Text = _mainWindowVM.Usernick; // setting default nickname.
+        currentNickname.Text = _mainWindowVM.Usernick;
+        loginMethod.Text = _mainWindowVM.LoginMethod;
+    }
+
+    private void OnSaveButtonClick(object sender, RoutedEventArgs e)
+    {
+        if (sender is not Button button) return;
+
+        _mainWindowVM.Usernick = inputNickname.Text;
+        Console.WriteLine($"Changing nickname to {inputNickname.Text}");
+
+        button.Content = "Saved!";
+    }
+
+    async private void OnMicrosoftLoginClick(object sender, RoutedEventArgs e)
+    {
+        var session = await Utils.GetLicensedSession();
+        _mainWindowVM.LoginMethod = "microsoft";
+        _mainWindowVM.Usernick = session.Username;
+        _mainWindowVM.UUID = session.UUID;
+        _mainWindowVM.AccsesToken = session.AccessToken;
+        _mainWindowVM.ClientToken = session.ClientToken;
+    }
+}

From d5c8d36d61499a0f8cd99845691fe89109c1a833 Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Tue, 25 Feb 2025 22:43:25 +0300
Subject: [PATCH 06/10] Config Manager update

Auto fix for broken and outdated configs and base for work in future
---
 Launcher-UI/Assets/Sprites/microsoft-logo.png | Bin 0 -> 543 bytes
 Launcher-UI/ConfigManager.cs                  |  62 ++++++++++++++++--
 Launcher-UI/Views/SettingsWindow.axaml        |  51 ++++++++------
 Launcher-UI/Views/SettingsWindow.axaml.cs     |   1 +
 4 files changed, 90 insertions(+), 24 deletions(-)
 create mode 100644 Launcher-UI/Assets/Sprites/microsoft-logo.png

diff --git a/Launcher-UI/Assets/Sprites/microsoft-logo.png b/Launcher-UI/Assets/Sprites/microsoft-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdce9c16975509f854a9b494fb570ce0d04b7628
GIT binary patch
literal 543
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&V0`B3;uumf=k3jnxlE1%4uK9O
z55zb!nhv;H6uUX5ylc4AczXepI5X>wP16#-)_#byIhgTf>!p`r+CU>17#iHS%E|tz
zu#HLA+azHB?(5%wpKjl|eE(I+ADOId<7&Yl-3*?b6Q&GSBKQ4_SpVCPKJK`xps%3G
zI7tXZNd4ome1AXf-NuOc-QIf-?Jtp<^O*@EC8V&j`d>@T^4yIwi|Z}!WPJ#Wa|mKm
gQ601d3nZ2_^UfUODeDzkvlPVlboFyt=akR{00g$AR{#J2

literal 0
HcmV?d00001

diff --git a/Launcher-UI/ConfigManager.cs b/Launcher-UI/ConfigManager.cs
index 5a3e796..4d17fad 100644
--- a/Launcher-UI/ConfigManager.cs
+++ b/Launcher-UI/ConfigManager.cs
@@ -6,25 +6,43 @@ namespace Plombir;
 
 public class ConfigManager
 {
+    static private readonly string defaultRuntime = "./runtime";
+    static private readonly string defaultVersion = "1.20.1";
+    static private readonly string defaultNickname = "slugcat";
+
+    static private readonly string currentTweaksVersion = "1.2.0";
+
+    static private readonly string defaultLoginType = "offline";
+    static private readonly string defaultUuid = "offline";
+    static private readonly string defaultAccsessToken = "offline";
+    static private readonly string defaultClientToken = "offline";
+
     public static void BuildDefault()
     {
         TomlTable toml = new TomlTable
         {
             ["title"] = "Launcher tweaks file!",
+            ["tweaks-version"] = currentTweaksVersion,
 
             ["runtime-path"] = new TomlString
             {
-                Value = "./runtime",
+                Value = defaultRuntime,
                 Comment = "Path to folder that will hold all minecraft versions"
             },
 
             ["last-version-launched"] = new TomlString
             {
-                Value = "1.20.1",
+                Value = defaultVersion,
                 Comment = "Saving last launched version to use it after launch"
             },
 
-            ["nickname"] = "slugcat"
+            ["nickname"] = defaultNickname,
+            ["login-method"] = defaultLoginType,
+            ["uuid"] = defaultUuid,
+            ["accsess-token"] = defaultAccsessToken,
+            ["client-token"] = defaultClientToken,
+
+
         };
 
         using (StreamWriter writer = File.CreateText("tweaks.toml"))
@@ -45,7 +63,43 @@ public class ConfigManager
         {
             TomlTable table = TOML.Parse(reader);
 
-            return table[key];
+            // If config don't contains it means it's oudated or broken.
+            if (!table.TryGetNode(key, out var node))
+            {
+                WriteInConfig(key, "NaN");
+            }
+
+            // In case if config is fine return its value
+            if (table[key].ToString() != "NaN")
+            {
+                if ((key == "tweaks-version") & (table[key] != currentTweaksVersion))
+                {
+                    Console.WriteLine("Warning! Tweaks version mismatch!");
+                }
+                return table[key];
+            }
+
+            // Handling out-dated or broken toml files by filling with defaults
+            switch (key)
+            {
+                case "runtime-path": { WriteInConfig(key, defaultRuntime); return defaultRuntime; }
+                case "last-version-launched": { WriteInConfig(key, defaultVersion); return defaultVersion; }
+                case "nickname": { WriteInConfig(key, defaultNickname); return defaultNickname; }
+
+                case "accsess-token": { WriteInConfig(key, defaultAccsessToken); return defaultAccsessToken; }
+                case "client-token": { WriteInConfig(key, defaultClientToken); return defaultClientToken; }
+                case "uuid": { WriteInConfig(key, defaultUuid); return defaultUuid; }
+                case "login-method": { WriteInConfig(key, defaultLoginType); return defaultLoginType; }
+                case "tweaks-version":
+                    {
+                        WriteInConfig(key, currentTweaksVersion);
+                        Console.WriteLine("Warning! Can't locate tweaks version! Attempting auto recovery...");
+                        return "possibly broken";
+                    }
+            }
+
+            return null;
+
         }
     }
 
diff --git a/Launcher-UI/Views/SettingsWindow.axaml b/Launcher-UI/Views/SettingsWindow.axaml
index f96f1c2..eab1ae2 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml
+++ b/Launcher-UI/Views/SettingsWindow.axaml
@@ -1,14 +1,12 @@
 <Window
     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"
     mc:Ignorable="d"
     d:DesignWidth="500"
     d:DesignHeight="400"
     x:Class="LauncherGUI.Views.SettingsWindow"
-
     Icon="/Assets/Sprites/icon.png"
     Title="Launcher tweaks"
     RequestedThemeVariant="Dark"
@@ -16,37 +14,50 @@
     Height="400"
     MinWidth="500"
     MinHeight="400"
+    MaxWidth="500"
+    MaxHeight="400"
     Background="#353535"
 >
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
+        <StackPanel Grid.Row="0" Grid.ColumnSpan="2">
+            <TextBlock
+                HorizontalAlignment="Center"
+                Text="All tweaks can be found in TOML near executable."
+                FontFamily="{StaticResource QuicksandFont}"
+            />
+
+            <TextBlock
+                HorizontalAlignment="Center"
+                x:Name="tweaksVersion"
+                FontFamily="{StaticResource QuicksandFont}"
+            />
+
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.Column="0">
+
+            <Button
+                Margin="5"
+                Content="Select minecraft folder"
+                Click="OnFilePickerClick"
+            />
 
-        <TextBlock
-            Grid.Row="0" Grid.ColumnSpan="2"
-            HorizontalAlignment="Center" 
-            Text="All tweaks can be found in TOML near executable."
-            FontFamily="{StaticResource QuicksandFont}" />
-        <StackPanel
-            Grid.Row="1" Grid.Column="0">
-            
-            <Button Margin="5" Content="Select minecraft folder" Click="OnFilePickerClick" />
-        
         </StackPanel>
 
         <StackPanel Grid.Row="2" Grid.Column="1">
-            <Image Source="/Assets/Sprites/toml-paper.png" 
-                Stretch="Uniform"/>
+            <Image Source="/Assets/Sprites/toml-paper.png" Stretch="Uniform" />
+
 
-            
         </StackPanel>
 
     </Grid>
diff --git a/Launcher-UI/Views/SettingsWindow.axaml.cs b/Launcher-UI/Views/SettingsWindow.axaml.cs
index 572dbe5..adf4795 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml.cs
+++ b/Launcher-UI/Views/SettingsWindow.axaml.cs
@@ -14,6 +14,7 @@ public partial class SettingsWindow : Window
     {
         InitializeComponent();
         _mainWindowVM = mainWindowVM;
+        tweaksVersion.Text = $"Current tweaks version: {_mainWindowVM.TweaksVersion}";
     }
 
     private async void OnFilePickerClick(object sender, RoutedEventArgs args)

From 7a8d262aed50a3f09c8b355b48284bebfc18b33f Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Wed, 26 Feb 2025 16:04:13 +0300
Subject: [PATCH 07/10] Feature done: Licensed minecraft support

---
 Launcher-Core/Launcher.cs                     | 24 ++++++++++++++-----
 Launcher-UI/ConfigManager.cs                  |  5 +---
 Launcher-UI/LauncherUtils.cs                  | 18 ++++++++++----
 Launcher-UI/ViewModels/MainWindowViewModel.cs |  3 ---
 Launcher-UI/Views/LoadingWindow.axaml.cs      | 15 ++++++++----
 .../Views/SessionManagmentWindow.axaml        | 22 +++++++++++------
 .../Views/SessionManagmentWindow.axaml.cs     | 19 ++++++++++++++-
 7 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/Launcher-Core/Launcher.cs b/Launcher-Core/Launcher.cs
index 3a36263..fcf7170 100644
--- a/Launcher-Core/Launcher.cs
+++ b/Launcher-Core/Launcher.cs
@@ -17,17 +17,15 @@ namespace Plombir;
 public class Launcher
 {
     private readonly string _version;
-    private readonly string _nickname;
     static private MinecraftPath? _mcPath;
     static private MinecraftLauncher? _mcLauncher;
 
     public int DownloadProgress;
     public string? DownloadStatus;
 
-    public Launcher(string userName, string version, string? location = null)
+    public Launcher(string version, string? location = null)
     {
         _version = version;
-        _nickname = userName;
         _mcPath = new($"{location}/{version}/minecraft");
         _mcLauncher = new(_mcPath);
     }
@@ -51,15 +49,29 @@ public class Launcher
         return;
     }
 
-    async public Task RunLauncher()
+    public MSession CreateOfflineSession(string nickname)
+    {
+        var s = MSession.CreateOfflineSession(nickname);
+        if (s is null) throw new NullReferenceException("Tried creating offline session, but it's resulted in null!");
+        return s;
+    }
+
+    public MSession CreateLicensedSession(string uuid, string accsessToken, string nickname)
+    {
+        var s = new MSession(nickname, accsessToken, uuid);
+        if (s is null) throw new NullReferenceException("Tried creating licensed session, but it's resulted in null!");
+        return s;
+    }
+
+    async public Task RunLauncher(MSession session)
     {
         if (_mcLauncher is null)
             throw new NullReferenceException("Failed to run launcher! Launcher is null!");
 
         var process = await _mcLauncher.BuildProcessAsync(_version, new MLaunchOption
         {
-
-            Session = MSession.CreateOfflineSession(_nickname),
+            // Passing session, to support offline and licensed login methods.
+            Session = session,
             MaximumRamMb = 4096,
 
         }) ?? throw new Exception("Failed to start minecraft process!");
diff --git a/Launcher-UI/ConfigManager.cs b/Launcher-UI/ConfigManager.cs
index 4d17fad..8d07037 100644
--- a/Launcher-UI/ConfigManager.cs
+++ b/Launcher-UI/ConfigManager.cs
@@ -10,12 +10,11 @@ public class ConfigManager
     static private readonly string defaultVersion = "1.20.1";
     static private readonly string defaultNickname = "slugcat";
 
-    static private readonly string currentTweaksVersion = "1.2.0";
+    static private readonly string currentTweaksVersion = "1.2.1";
 
     static private readonly string defaultLoginType = "offline";
     static private readonly string defaultUuid = "offline";
     static private readonly string defaultAccsessToken = "offline";
-    static private readonly string defaultClientToken = "offline";
 
     public static void BuildDefault()
     {
@@ -40,7 +39,6 @@ public class ConfigManager
             ["login-method"] = defaultLoginType,
             ["uuid"] = defaultUuid,
             ["accsess-token"] = defaultAccsessToken,
-            ["client-token"] = defaultClientToken,
 
 
         };
@@ -87,7 +85,6 @@ public class ConfigManager
                 case "nickname": { WriteInConfig(key, defaultNickname); return defaultNickname; }
 
                 case "accsess-token": { WriteInConfig(key, defaultAccsessToken); return defaultAccsessToken; }
-                case "client-token": { WriteInConfig(key, defaultClientToken); return defaultClientToken; }
                 case "uuid": { WriteInConfig(key, defaultUuid); return defaultUuid; }
                 case "login-method": { WriteInConfig(key, defaultLoginType); return defaultLoginType; }
                 case "tweaks-version":
diff --git a/Launcher-UI/LauncherUtils.cs b/Launcher-UI/LauncherUtils.cs
index 0fb7874..90befe0 100644
--- a/Launcher-UI/LauncherUtils.cs
+++ b/Launcher-UI/LauncherUtils.cs
@@ -10,18 +10,23 @@ public class LauncherUtils
 {
     public async static Task CreateMinecraftInstance(MainWindowViewModel vm, Window windowCaller)
     {
+        var licenseStatus = ConfigManager.ReadConfig("login-method");
+
         if (vm.Usernick is null) throw new NullReferenceException("Failed to create minecraft instance! Nickname is null!");
         if (vm.SelectedVersion is null) throw new NullReferenceException("Failed to create minecraft instance! Selected version is null!");
 
         System.Console.WriteLine($"Creating minecraft instance for {vm.Usernick}, {vm.SelectedVersion} in {vm.RuntimeLocation}");
-        LoadingWindow loading = new(vm.Usernick, vm.SelectedVersion, vm.RuntimeLocation);
-        ConfigManager.WriteInConfig("last-version-launched", vm.SelectedVersion);
-        ConfigManager.WriteInConfig("nickname", vm.Usernick);
+        LoadingWindow loading = new(vm);
+
+        SaveCurrentVariablesToConfig(vm);
 
         loading.Show();
         await loading.InitLoading();
         loading.Close();
-        await loading.RunMinecraft();
+
+        if (licenseStatus == "microsoft") await loading.RunMinecraft(true);
+        else                              await loading.RunMinecraft(false);
+        
         return;
     }
 
@@ -29,4 +34,9 @@ public class LauncherUtils
     {
 
     }
+
+    private static void SaveCurrentVariablesToConfig(MainWindowViewModel vm)
+    {
+        ConfigManager.WriteInConfig("last-version-launched", vm.SelectedVersion);
+    }
 }
diff --git a/Launcher-UI/ViewModels/MainWindowViewModel.cs b/Launcher-UI/ViewModels/MainWindowViewModel.cs
index bcde692..f700160 100644
--- a/Launcher-UI/ViewModels/MainWindowViewModel.cs
+++ b/Launcher-UI/ViewModels/MainWindowViewModel.cs
@@ -23,9 +23,6 @@ public partial class MainWindowViewModel : ViewModelBase
     private string? _accsessToken = ConfigManager.ReadConfig("accsess-token");
     public string? AccsesToken { get => _accsessToken; set { _accsessToken = value; OnPropertyChanged(nameof(AccsesToken)); } }
 
-    private string? _clientToken = ConfigManager.ReadConfig("client-token");
-    public string? ClientToken { get => _clientToken; set { _clientToken = value; OnPropertyChanged(nameof(ClientToken)); } }
-
     private string? _uuid = ConfigManager.ReadConfig("uuid");
     public string? UUID { get => _uuid; set { _uuid = value; OnPropertyChanged(nameof(UUID)); } }
 
diff --git a/Launcher-UI/Views/LoadingWindow.axaml.cs b/Launcher-UI/Views/LoadingWindow.axaml.cs
index 1f9aeac..53d317c 100644
--- a/Launcher-UI/Views/LoadingWindow.axaml.cs
+++ b/Launcher-UI/Views/LoadingWindow.axaml.cs
@@ -13,12 +13,14 @@ public partial class LoadingWindow : Window
 {
     private Launcher ln;
     private Task? _buildingTask;
+    private readonly MainWindowViewModel _mainWindowVM;
 
     // Tokens for controlling download task.
     CancellationTokenSource tokenSource = new CancellationTokenSource();
-    public LoadingWindow(string nickname, string? version = null, string? location = null)
+    public LoadingWindow(MainWindowViewModel mainWindowVM)
     {
-        ln = new Launcher(nickname, version ?? "1.20.1", location ?? "./runtime");
+        _mainWindowVM = mainWindowVM;
+        ln = new Launcher(_mainWindowVM.SelectedVersion ?? "1.20.1", _mainWindowVM.RuntimeLocation ?? "./runtime");
         InitializeComponent();
         DataContext = new LoadingWindowViewModel();
     }
@@ -52,9 +54,14 @@ public partial class LoadingWindow : Window
 
     }
 
-    public async Task RunMinecraft()
+    public async Task RunMinecraft(bool IsLicensed)
     {
-        await ln.RunLauncher();
+        var session = ln.CreateOfflineSession(_mainWindowVM.Usernick);
+        if (IsLicensed)
+        {
+            session = ln.CreateLicensedSession(_mainWindowVM.UUID, _mainWindowVM.AccsesToken, _mainWindowVM.Usernick);
+        }
+        await ln.RunLauncher(session);
     }
 
     private void onStopDownloadClick(object sender, RoutedEventArgs e)
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml b/Launcher-UI/Views/SessionManagmentWindow.axaml
index 6682519..388e954 100644
--- a/Launcher-UI/Views/SessionManagmentWindow.axaml
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml
@@ -50,6 +50,14 @@
                     <TextBlock x:Name="loginMethod" />
                 </StackPanel>
 
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        Text="Session uuid: "
+                        FontFamily="{StaticResource QuicksandFont}"
+                    />
+                    <TextBlock x:Name="currentUuid" />
+                </StackPanel>
+
             </StackPanel>
 
         </Border>
@@ -86,6 +94,13 @@
                     HorizontalAlignment="Left"
                 />
 
+                <Button
+                    FontFamily="{StaticResource QuicksandFont}"
+                    Content="Save"
+                    HorizontalAlignment="Center"
+                    Click="OnSaveButtonClick"
+                />
+
 
             </StackPanel>
         </Border>
@@ -132,13 +147,6 @@
 
         </Border>
 
-        <Button
-            FontFamily="{StaticResource QuicksandFont}"
-            Content="Save"
-            HorizontalAlignment="Center"
-            Click="OnSaveButtonClick"
-        />
-
     </StackPanel>
 
 </Window>
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml.cs b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
index 77e1d75..75f0e28 100644
--- a/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
@@ -13,9 +13,15 @@ public partial class SessionManagmentWindow : Window
     {
         InitializeComponent();
         _mainWindowVM = mainWindowVM;
+        PopulateInfo();
+    }
+
+    private void PopulateInfo()
+    {
         inputNickname.Text = _mainWindowVM.Usernick; // setting default nickname.
         currentNickname.Text = _mainWindowVM.Usernick;
         loginMethod.Text = _mainWindowVM.LoginMethod;
+        currentUuid.Text = _mainWindowVM.UUID;
     }
 
     private void OnSaveButtonClick(object sender, RoutedEventArgs e)
@@ -26,6 +32,8 @@ public partial class SessionManagmentWindow : Window
         Console.WriteLine($"Changing nickname to {inputNickname.Text}");
 
         button.Content = "Saved!";
+        SaveSessionInfo();
+        PopulateInfo();
     }
 
     async private void OnMicrosoftLoginClick(object sender, RoutedEventArgs e)
@@ -35,6 +43,15 @@ public partial class SessionManagmentWindow : Window
         _mainWindowVM.Usernick = session.Username;
         _mainWindowVM.UUID = session.UUID;
         _mainWindowVM.AccsesToken = session.AccessToken;
-        _mainWindowVM.ClientToken = session.ClientToken;
+        SaveSessionInfo();
+        PopulateInfo();
+    }
+
+    private void SaveSessionInfo()
+    {
+        ConfigManager.WriteInConfig("nickname", _mainWindowVM.Usernick);
+        ConfigManager.WriteInConfig("login-method", _mainWindowVM.LoginMethod);
+        ConfigManager.WriteInConfig("uuid", _mainWindowVM.UUID);
+        ConfigManager.WriteInConfig("accsess-token", _mainWindowVM.AccsesToken);
     }
 }

From 6bd8cab129a5db7324948dc085f3b1ea6abb04bf Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Wed, 26 Feb 2025 16:32:14 +0300
Subject: [PATCH 08/10] Settings overhaul

---
 Launcher-UI/Assets/Sprites/toml-paper.png | Bin 911 -> 1546 bytes
 Launcher-UI/Views/SettingsWindow.axaml    |  60 ++++++++++++----------
 Launcher-UI/Views/SettingsWindow.axaml.cs |   2 +
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Launcher-UI/Assets/Sprites/toml-paper.png b/Launcher-UI/Assets/Sprites/toml-paper.png
index bff43123749e8fb3e19648f12cc1639552b9689d..a3e0067fd44a8d60f814f19689ebb36a8e8435a6 100644
GIT binary patch
literal 1546
zcmeAS@N?(olHy`uVBq!ia0y~yV9Wqv4mO}j)zieQK#C>Z(btiIVPik{pF~z5pRqW|
z-HGw$Nu7EiM<LlG$QP(oje((|g@NH0P^jSr14F3+1H-EX1_rAc3=HB0b9M#V043Ox
zyxm<G{)6Cxy~`&9MK}vQB8wRqxP?KOkzv*x37{Z*iKnkC`%5M%UNLU#%-^*P46J^h
zE{-7;x8B}8=&Nlg(Hh9URJGhea6=L=>p`p47np>&vleg)__pY3s1?rW{M%oAPN<Vz
zYMx!>u1_gbi|?s29NPJbgMmegp^;4>14uh8U__!D*&uu{jZlO~F<22$6E4M=CX%n1
zQnvy<N{q)ECa$q%n)d45H>)%6H{IO#tN8&7ufhce4ig3@-VG9~=X^ewtT4&r@%=kJ
zofeMFU}2!NOM=RhnLyFYk3ZkL{!Tvc(4V?vE^`n8bMB;vhw;UH4k^CECQvAY18j$g
zo71_ZDdBC~B>0y9;W@le7-UI<1IX0>8^3Wp$X~iq?^5sKOA^@@B?xT~B+NNyo=NAu
z_Ww@Y{`n6taKfXrVg4PJl!~Q^>rzfdh-V7?`SatGdpVLu1!YC`m!;Vo%3f%%lzsN>
zpXA;+$1bp?5FZ|w;EZe$GymFC1@szF2<(^`E@j1T(U+q0_fCn^{q^bFJNtGdE$ot<
zlBZ4_UU*&#;zDpJC+LC0X~B}~&-u3n{QlXz_t=qJju+NCs)G_8Bt88*?CW%BrR)c<
zEcd-0=A3(tM1Yde2x_?2(_(V@(YLrS;oVX!zz~Ba(vAZj9^u9O6%*|yUr^`}HUWke
z*yRo(Zcag7$@TvfkR1MD_QVNkQFlHSXA6Msg(RRpW1&l-ZwoA*-k&|&5hMXkqYX=q
zg@pXN7xDvR4VF~&W&%y9+RG(^B=+O1$BD=uBaW)A8h)T;0daz|k<g`{*)6cN0u&Tz
zo;YDjkk{<DuYn07Z~f|h<)?mx|GKBy(}(25f;(Ez_k5OE5o#^dcj&bnQreK1IJ;#|
z%Bf!G1Dw!Y+Q_EBX3m+JHpTGbTPIl30{Us%IbfKyITs*8DdW5c2hb&ugv10-z2K07
zg&2f}r8Wc&NeEC)NQz*o0i57bOm1+fW`QSLI@kt@aUz|DPx15byiR#nv#**|9RU`$
N44$rjF6*2UngFb?$YlTk

literal 911
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&U=H(iaSW-L^Y*S|pK!QH>qE9y
z#*Pgf%Q!kEXD3YC(66J)?fGp|<dPI|mR82*6vn!>HZh|A*Pps?o>O{T_3Oo{{c(3c
z9cBia$G~tP(srf(gKPWhe&wE?|9|uK(l-xY{lB|8{Qb8*eZKRqi65vHb_inf@M7?s
zyR2o-ikLUKFE=GIO%j3$?rqTt)~oyTaC!Iqzn@;8KRDGUON+Z&Tv&L*6b6W@R})m9
zNc-7N(^ORM>g4qBVesTs&}398T_&`t<l&6c?xam0ZOe4k)Ifr&4NF)iTq*y``e%CY
zZn<`2E#~gIGkQ+lyPA591tJMFHR_*A%GcojRSIYJ<(Jl;kJ~%@)HF_z3&G}Y4dJwW
zwC?x|=YMOC=55|}OMd_V%8#4P-`i^`uJMPd`SUh{Kk(rW*PS<h+lobJ%}4T)>_e55
zm%;tYbsz4}o-DxU4b`%=C8s3+XiA91y!{n*6Bl34xA)mQ4`J)nsS}jn)t|BQHk1_Y
zbB}rQ;_UDK;Q9<iK&=gP;tRJ(JNvFaBsJChp+umQ1q;-_Q-nTkxF)<VFY(*7Rr>Yy
zGpqLAJY<OCqL&fjyN|v+{Azn#FW2$Y@8jb{`p(za?)$M<_h}N6*Gpds8Eq<ejCje-
zl<se_3dNAAs!z83me-cN8x$(qCy0ohRd+Ze)BZp1*q*$$ZuV6jgv6_NUMEhx>V6q5
zb~0Q`Mi~)3Q-q2b`fcpKzk2^H0vMmLa4&sz^vl)xF|9~3JWHr(+M$i#%PZELL&Tny
zFQ=rXw;?EwkZfC}qqw+s%1YabKp&kJ`gKCk`>dA_G>vg8tSmCD{TBW{tMTs{?-xi;
z2?=v@6Pa9W-&cMFVL{ZYmYy1CLrF{5NXygW!hJJ9X$q1UPfwo^`Ms>GXxi;<2*bhI
dfZ>n+Kh~`M|8_3V555f&@pScbS?83{1ONg&a4Y}-

diff --git a/Launcher-UI/Views/SettingsWindow.axaml b/Launcher-UI/Views/SettingsWindow.axaml
index eab1ae2..f2b06c8 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml
+++ b/Launcher-UI/Views/SettingsWindow.axaml
@@ -19,47 +19,51 @@
     Background="#353535"
 >
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel Grid.Row="0" Grid.ColumnSpan="2">
+<Window.Background>
+    <ImageBrush Source="/Assets/Sprites/toml-paper.png" Stretch="UniformToFill"/>
+</Window.Background>
+
+<StackPanel Margin="5">
+
+    <StackPanel HorizontalAlignment="Center">
+        <TextBlock
+            Text="All tweaks can be found in TOML near executable."
+            FontFamily="{StaticResource QuicksandFont}"
+        />
+
+        <TextBlock
+            x:Name="tweaksVersion"
+            FontFamily="{StaticResource QuicksandFont}"
+        />
+
+    </StackPanel>
+
+    <StackPanel Margin="20">
+
+        <StackPanel>
+            
             <TextBlock
-                HorizontalAlignment="Center"
-                Text="All tweaks can be found in TOML near executable."
+                x:Name="currentDir"
                 FontFamily="{StaticResource QuicksandFont}"
             />
 
-            <TextBlock
-                HorizontalAlignment="Center"
-                x:Name="tweaksVersion"
-                FontFamily="{StaticResource QuicksandFont}"
-            />
-
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.Column="0">
-
             <Button
                 Margin="5"
                 Content="Select minecraft folder"
                 Click="OnFilePickerClick"
+                HorizontalAlignment="Center"
             />
-
+        
         </StackPanel>
 
-        <StackPanel Grid.Row="2" Grid.Column="1">
-            <Image Source="/Assets/Sprites/toml-paper.png" Stretch="Uniform" />
+    </StackPanel>
+
+    <!-- <StackPanel Grid.Row="2" Grid.Column="1">
+        <Image Source="/Assets/Sprites/toml-paper.png" Stretch="Uniform" /> 
 
 
-        </StackPanel>
+    </StackPanel> -->
 
-    </Grid>
+</StackPanel>
 
 </Window>
diff --git a/Launcher-UI/Views/SettingsWindow.axaml.cs b/Launcher-UI/Views/SettingsWindow.axaml.cs
index adf4795..32140dc 100644
--- a/Launcher-UI/Views/SettingsWindow.axaml.cs
+++ b/Launcher-UI/Views/SettingsWindow.axaml.cs
@@ -15,6 +15,7 @@ public partial class SettingsWindow : Window
         InitializeComponent();
         _mainWindowVM = mainWindowVM;
         tweaksVersion.Text = $"Current tweaks version: {_mainWindowVM.TweaksVersion}";
+        currentDir.Text = $"Current saving directory: {_mainWindowVM.RuntimeLocation}";
     }
 
     private async void OnFilePickerClick(object sender, RoutedEventArgs args)
@@ -36,6 +37,7 @@ public partial class SettingsWindow : Window
             if (location is null) throw new NullReferenceException("Invalid location selected!");
             _mainWindowVM.RuntimeLocation = location;
             System.Console.WriteLine($"Selected {_mainWindowVM.RuntimeLocation}.");
+            currentDir.Text = $"Current saving directory: {_mainWindowVM.RuntimeLocation}";
             ConfigManager.WriteInConfig("runtime-path", location);
         }
     }

From de64c08364edc398dc1be06d0bb0148ff446be22 Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Wed, 26 Feb 2025 16:32:55 +0300
Subject: [PATCH 09/10] MainWindow information update

---
 Launcher-UI/Views/MainWindow.axaml    | 24 +++---------------------
 Launcher-UI/Views/MainWindow.axaml.cs |  1 -
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Launcher-UI/Views/MainWindow.axaml b/Launcher-UI/Views/MainWindow.axaml
index c714306..a2d276d 100644
--- a/Launcher-UI/Views/MainWindow.axaml
+++ b/Launcher-UI/Views/MainWindow.axaml
@@ -42,7 +42,7 @@
 
             </Border>
             <TextBlock FontFamily="{StaticResource QuicksandFont}" 
-                HorizontalAlignment="Right" Text="v1.1.0 - nullmax17"/>
+                HorizontalAlignment="Right" Text="v1.2.1 - Plombir Contribuitors"/>
         </StackPanel>
 
         <!-- Settings for launcher -->
@@ -77,14 +77,6 @@
                 HorizontalAlignment="Center"
                 CornerRadius="10"
                 Padding="15">
-                <!-- <StackPanel>
-                    <TextBlock 
-                        HorizontalAlignment="Center" 
-                        Text="Insert username:"
-                        FontFamily="{StaticResource QuicksandFont}"/>
-                    <TextBox Margin="5" Text="{Binding Usernick, Mode=TwoWay}" Width="200" />
-
-                </StackPanel> -->
 
                 <Grid>
                     <Grid.RowDefinitions>
@@ -103,7 +95,7 @@
                     Click="OnLaunchMinecraftClick" 
                     HorizontalAlignment="Center"/>
 
-
+                <!-- Selecting version -->
                 <Button
                     Grid.Column="1"
                     Grid.Row="1"
@@ -112,6 +104,7 @@
                     Click="OnChooseVersionClick"
                     HorizontalAlignment="Center"/>
 
+                <!-- Account managment -->
                 <Image 
                     Height="60"
                     Width="60"
@@ -126,17 +119,6 @@
 
             </Border>
 
-
-            <!-- Version selection -->
-            <!-- <Border
-                Background="#353535"
-                HorizontalAlignment="Center"
-                Width="150"
-                CornerRadius="10"
-                Padding="10">
-
-                
-            </Border> -->
         </StackPanel>
 
         <!-- Minecraft area end -->
diff --git a/Launcher-UI/Views/MainWindow.axaml.cs b/Launcher-UI/Views/MainWindow.axaml.cs
index 5b28613..0850eb9 100644
--- a/Launcher-UI/Views/MainWindow.axaml.cs
+++ b/Launcher-UI/Views/MainWindow.axaml.cs
@@ -29,7 +29,6 @@ public partial class MainWindow : Window
 
         var vm = DataContext as MainWindowViewModel;
         await LauncherUtils.CreateMinecraftInstance(vm, root);
-        button.Content = "Minecraft launched";
 
     }
 

From 93b619228e7a6f207e06efd5fe1f1238bd3a248d Mon Sep 17 00:00:00 2001
From: Max Nullov <max.pan@tuta.io>
Date: Wed, 26 Feb 2025 17:04:42 +0300
Subject: [PATCH 10/10] 1.2.1 version bump

---
 Launcher-Core/Utils.cs                        | 12 +++--
 Launcher-UI/ConfigManager.cs                  | 53 ++++++++++++-------
 .../Views/SessionManagmentWindow.axaml        |  8 +--
 .../Views/SessionManagmentWindow.axaml.cs     |  4 ++
 README.md                                     |  1 +
 package/build-targz-linux-ui.sh               |  2 +-
 package/build-targz-osx-ui.sh                 |  2 +-
 package/build-targz-win-ui.sh                 |  2 +-
 8 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/Launcher-Core/Utils.cs b/Launcher-Core/Utils.cs
index 13db5d3..724dff6 100644
--- a/Launcher-Core/Utils.cs
+++ b/Launcher-Core/Utils.cs
@@ -37,11 +37,13 @@ static public class Utils
             var loginHandler = JELoginHandlerBuilder.BuildDefault();
 
             var authenticator = loginHandler.CreateAuthenticatorWithNewAccount(default);
-            authenticator.AddMsalOAuth(app, msal => msal.DeviceCode(deviceCode =>
-            {
-                Console.WriteLine(deviceCode.Message);
-                return Task.CompletedTask;
-            }));
+            authenticator.AddMsalOAuth(app, msal => msal.SystemBrowser());
+            // authenticator.AddMsalOAuth(app, msal => msal.DeviceCode(deviceCode =>
+            // {
+            //     Console.WriteLine(deviceCode.Message);
+            //     return Task.CompletedTask;
+            // }));
+            // Im too lazy to implement this type of auth
             authenticator.AddMsalOAuth(app, msal => msal.Silent());
             authenticator.AddXboxAuthForJE(xbox => xbox.Basic());
             authenticator.AddJEAuthenticator();
diff --git a/Launcher-UI/ConfigManager.cs b/Launcher-UI/ConfigManager.cs
index 8d07037..dfa34dd 100644
--- a/Launcher-UI/ConfigManager.cs
+++ b/Launcher-UI/ConfigManager.cs
@@ -62,7 +62,7 @@ public class ConfigManager
             TomlTable table = TOML.Parse(reader);
 
             // If config don't contains it means it's oudated or broken.
-            if (!table.TryGetNode(key, out var node))
+            if (!IsValueExists(table, key))
             {
                 WriteInConfig(key, "NaN");
             }
@@ -73,33 +73,46 @@ public class ConfigManager
                 if ((key == "tweaks-version") & (table[key] != currentTweaksVersion))
                 {
                     Console.WriteLine("Warning! Tweaks version mismatch!");
+                    WriteInConfig("tweaks-version", "wrong-version");
                 }
                 return table[key];
             }
 
-            // Handling out-dated or broken toml files by filling with defaults
-            switch (key)
-            {
-                case "runtime-path": { WriteInConfig(key, defaultRuntime); return defaultRuntime; }
-                case "last-version-launched": { WriteInConfig(key, defaultVersion); return defaultVersion; }
-                case "nickname": { WriteInConfig(key, defaultNickname); return defaultNickname; }
-
-                case "accsess-token": { WriteInConfig(key, defaultAccsessToken); return defaultAccsessToken; }
-                case "uuid": { WriteInConfig(key, defaultUuid); return defaultUuid; }
-                case "login-method": { WriteInConfig(key, defaultLoginType); return defaultLoginType; }
-                case "tweaks-version":
-                    {
-                        WriteInConfig(key, currentTweaksVersion);
-                        Console.WriteLine("Warning! Can't locate tweaks version! Attempting auto recovery...");
-                        return "possibly broken";
-                    }
-            }
-
-            return null;
+            return RepairConfig(key);
 
         }
     }
 
+    public static bool IsValueExists(TomlTable table, string key)
+    {
+        if (table.TryGetNode(key, out var _))
+            return true;
+        return false;
+    }
+
+    private static string? RepairConfig(string key)
+    {
+        Console.WriteLine($"Warning! Can't locate {key} in tweaks! Fallback to defaults!");
+        // Handling out-dated or broken toml files by filling with defaults
+        switch (key)
+        {
+            case "runtime-path": { WriteInConfig(key, defaultRuntime); return defaultRuntime; }
+            case "last-version-launched": { WriteInConfig(key, defaultVersion); return defaultVersion; }
+            case "nickname": { WriteInConfig(key, defaultNickname); return defaultNickname; }
+
+            case "accsess-token": { WriteInConfig(key, defaultAccsessToken); return defaultAccsessToken; }
+            case "uuid": { WriteInConfig(key, defaultUuid); return defaultUuid; }
+            case "login-method": { WriteInConfig(key, defaultLoginType); return defaultLoginType; }
+            case "tweaks-version":
+                {
+                    WriteInConfig(key, currentTweaksVersion);
+                    return "possibly broken";
+                }
+        }
+
+        return null;
+    }
+
     public static void WriteInConfig(string key, dynamic value)
     {
         if (!File.Exists("tweaks.toml"))
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml b/Launcher-UI/Views/SessionManagmentWindow.axaml
index 388e954..ca1c78e 100644
--- a/Launcher-UI/Views/SessionManagmentWindow.axaml
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml
@@ -16,7 +16,7 @@
     MinHeight="400"
     MaxWidth="500"
     MaxHeight="400"
-    Background="#353535"
+    Background="#542434"
 >
 
     <StackPanel>
@@ -39,7 +39,7 @@
                         Text="Session nickname: "
                         FontFamily="{StaticResource QuicksandFont}"
                     />
-                    <TextBlock x:Name="currentNickname" />
+                    <TextBlock x:Name="currentNickname" Foreground="#d9ccfb"/>
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
@@ -47,7 +47,7 @@
                         Text="Session login method: "
                         FontFamily="{StaticResource QuicksandFont}"
                     />
-                    <TextBlock x:Name="loginMethod" />
+                    <TextBlock x:Name="loginMethod" Foreground="#d9ccfb" />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
@@ -55,7 +55,7 @@
                         Text="Session uuid: "
                         FontFamily="{StaticResource QuicksandFont}"
                     />
-                    <TextBlock x:Name="currentUuid" />
+                    <TextBlock x:Name="currentUuid" Foreground="#d9ccfb" />
                 </StackPanel>
 
             </StackPanel>
diff --git a/Launcher-UI/Views/SessionManagmentWindow.axaml.cs b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
index 75f0e28..65e4555 100644
--- a/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
+++ b/Launcher-UI/Views/SessionManagmentWindow.axaml.cs
@@ -29,6 +29,10 @@ public partial class SessionManagmentWindow : Window
         if (sender is not Button button) return;
 
         _mainWindowVM.Usernick = inputNickname.Text;
+        _mainWindowVM.LoginMethod = "offline";  // Swapping to offline method
+        _mainWindowVM.UUID = "offline";         // Just to be sure
+        _mainWindowVM.AccsesToken = "offline";
+
         Console.WriteLine($"Changing nickname to {inputNickname.Text}");
 
         button.Content = "Saved!";
diff --git a/README.md b/README.md
index 84ed532..f7baf20 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,4 @@ Licensed in MIT!
 - [Minecraft](https://www.minecraft.net)
 - [Cmllib](https://github.com/CmlLib/CmlLib.Core.git) - MIT license
 - [Avalonia UI](https://github.com/AvaloniaUI/Avalonia) - MIT license
+- [Tommy](https://github.com/dezhidki/Tommy) - MIT license
diff --git a/package/build-targz-linux-ui.sh b/package/build-targz-linux-ui.sh
index dcac85e..08b87a1 100755
--- a/package/build-targz-linux-ui.sh
+++ b/package/build-targz-linux-ui.sh
@@ -1,7 +1,7 @@
 cd ../Launcher-UI
 
 out_dir=../package/out/build
-archieve_name=PlombirLinux-v1-1-0.tar.gz
+archieve_name=PlombirLinux-v1-2-1.tar.gz
 
 rm -r $out_dir
 
diff --git a/package/build-targz-osx-ui.sh b/package/build-targz-osx-ui.sh
index 48b6b50..fb2ec93 100755
--- a/package/build-targz-osx-ui.sh
+++ b/package/build-targz-osx-ui.sh
@@ -1,7 +1,7 @@
 cd ../Launcher-UI
 
 out_dir=../package/out/build
-archieve_name=PlombirOSX-v1-1-0.tar.gz
+archieve_name=PlombirOSX-v1-2-1.tar.gz
 
 rm -r $out_dir
 
diff --git a/package/build-targz-win-ui.sh b/package/build-targz-win-ui.sh
index ccbcd6e..a02f3d8 100755
--- a/package/build-targz-win-ui.sh
+++ b/package/build-targz-win-ui.sh
@@ -1,7 +1,7 @@
 cd ../Launcher-UI
 
 out_dir=../package/out/build
-archieve_name=PlombirWindows-v1-1-0.tar.gz
+archieve_name=PlombirWindows-v1-2-1.tar.gz
 
 rm -r $out_dir