added support for modpack defined in version descriptor

bugfixes
my version catalog
2024-12-29 12:15:51 +05:00 · 2024-12-29 01:26:41 +05:00 · 2024-12-28 00:26:38 +05:00 · 2024-12-28 00:22:28 +05:00 · 2024-12-27 22:22:01 +05:00 · 2024-12-27 21:11:19 +05:00
25 changed files with 638 additions and 234 deletions
--- a/Mlaumcherb.Client.Avalonia/Config.cs
+++ b/Mlaumcherb.Client.Avalonia/Config.cs
@@ -1,10 +1,12 @@
 using Mlaumcherb.Client.Avalonia.зримое;
+using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;

 namespace Mlaumcherb.Client.Avalonia;

 public record Config
 {
+    [JsonRequired] public string config_version { get; set; } = "1.0.0";
    public bool debug { get; set; } = 
 #if DEBUG
        true;
@@ -15,10 +17,17 @@ public record Config
    public int max_memory { get; set; } = 4096;
    public string minecraft_dir { get; set; } = ".";
    public bool download_java { get; set; } = true;
+    public bool redirect_game_output { get; set; } = false;
    public string? last_launched_version { get; set; }
    public int max_parallel_downloads { get; set; } = 16;
+    public VersionCatalogProps[] version_catalogs { get; set; } =
+    [
+        new() { name = "Mojang", url = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" },
+        new() { name = "Тимериховое", url = "https://timerix.ddns.net/minecraft/catalog.json" }
+    ];
+
    
-    [JsonIgnore] static IOPath _filePath = "config.json";
+    [JsonIgnore] private static IOPath _filePath = "млаумчерб.json";
    
    public static Config LoadFromFile()
    {
--- a/Mlaumcherb.Client.Avalonia/GameVersion.cs
+++ b/Mlaumcherb.Client.Avalonia/GameVersion.cs
@@ -7,6 +7,7 @@ using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.сеть;
 using Mlaumcherb.Client.Avalonia.сеть.TaskFactories;
 using Mlaumcherb.Client.Avalonia.холопы;
+using Newtonsoft.Json.Linq;
 using static Mlaumcherb.Client.Avalonia.холопы.PathHelper;

 namespace Mlaumcherb.Client.Avalonia;
@@ -26,41 +27,35 @@ public class GameVersion
    private CancellationTokenSource? _gameCts;
    private CommandTask<CommandResult>? _commandTask;

-    public static async Task<List<GameVersionProps>> GetAllVersionsAsync()
+    public static Task<List<GameVersionProps>> GetAllVersionsAsync()
    {
-        var propsSet = new HashSet<GameVersionProps>();
+        var propsList = new List<GameVersionProps>();
        
        // local descriptors
        Directory.Create(GetVersionsDir());
        foreach (IOPath subdir in Directory.GetDirectories(GetVersionsDir()))
        {
            string name = subdir.LastName().ToString();
-            var d = new GameVersionProps(name, null);
+            var d = new GameVersionProps(name);
            if(!File.Exists(d.LocalDescriptorPath))
                throw new Exception("Can't find version descriptor file in directory '{subdir}'. Rename it as directory name.");
-            propsSet.Add(d);
-        }
-        
-        // remote non-duplicating versions
-        foreach (var removeVersion in await Сеть.GetDownloadableVersions())
-        {
-           propsSet.Add(removeVersion);
+            propsList.Add(d);
        }
        
        // reverse sort
-        var propsList = propsSet.ToList();
        propsList.Sort((a, b) => b.CompareTo(a));
-        return propsList;
+        return Task.FromResult(propsList);
    }

-    public static async Task<GameVersion> CreateFromPropsAsync(GameVersionProps props)
+    public static async Task<GameVersion> CreateFromPropsAsync(GameVersionProps props, bool checkHash)
    {
+        //TODO: refresh version descriptor from server
        if (!File.Exists(props.LocalDescriptorPath))
        {
-            if (props.RemoteDescriptorUrl is null)
+            if (props.RemoteProps is null)
                throw new NullReferenceException("can't download game version descriptor '"
                                                 + props.Name + "', because RemoteDescriptorUrl is null");
-            await Сеть.DownloadFile(props.RemoteDescriptorUrl, props.LocalDescriptorPath);
+            await NetworkHelper.DownloadFile(props.RemoteProps.url, props.LocalDescriptorPath);
        }

        return new GameVersion(props);
@@ -69,9 +64,32 @@ public class GameVersion
    private GameVersion(GameVersionProps props)
    {
        _props = props;
+        
        string descriptorText = File.ReadAllText(props.LocalDescriptorPath);
-        _descriptor = JsonConvert.DeserializeObject<GameVersionDescriptor>(descriptorText)
-                     ?? throw new Exception($"can't parse descriptor file '{props.LocalDescriptorPath}'");
+        JObject descriptorRaw =  JObject.Parse(descriptorText);
+        
+        // Descriptors can inherit from other descriptors.
+        // For example, 1.12.2-forge-14.23.5.2860 inherits from 1.12.2
+        if (descriptorRaw.TryGetValue("inheritsFrom", out var v))
+        {
+            string parentDescriptorId = v.Value<string>() 
+                        ?? throw new Exception("inheritsFrom is null");
+            LauncherApp.Logger.LogInfo(Name, $"merging descriptor '{parentDescriptorId}' with '{Name}'");
+            IOPath parentDescriptorPath = GetVersionDescriptorPath(parentDescriptorId);
+            if (!File.Exists(parentDescriptorPath))
+                throw new Exception($"Версия '{Name} требует установить версию '{parentDescriptorId}'");
+            string parentDescriptorText = File.ReadAllText(parentDescriptorPath);
+            JObject parentDescriptorRaw = JObject.Parse(parentDescriptorText);
+            parentDescriptorRaw.Merge(descriptorRaw,
+                new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Concat });
+            descriptorRaw = parentDescriptorRaw;
+            // removing dependency
+            descriptorRaw.Remove("inheritsFrom");
+            File.WriteAllText(props.LocalDescriptorPath, descriptorRaw.ToString());
+        }
+
+        _descriptor = descriptorRaw.ToObject<GameVersionDescriptor>()
+                      ?? throw new Exception($"can't parse descriptor file '{props.LocalDescriptorPath}'");
        _javaArgs = new JavaArguments(_descriptor);
        _gameArgs = new GameArguments(_descriptor);
        _libraries = new Libraries(_descriptor);
@@ -87,17 +105,17 @@ public class GameVersion
        [
            new AssetsDownloadTaskFactory(_descriptor),
            new LibrariesDownloadTaskFactory(_descriptor, _libraries),
-            new VersionFileDownloadTaskFactory(_descriptor),
        ];
-        if(LauncherApp.Config.download_java)
+        if (LauncherApp.Config.download_java)
        {
            taskFactories.Add(new JavaDownloadTaskFactory(_descriptor));
        }
-        //TODO: modpack
-        /*if (modpack != null)
+        if (_descriptor.modpack != null)
        {
-            taskFactories.Add(new ModpackDownloadTaskFactory(modpack));
-        }*/
+            taskFactories.Add(new ModpackDownloadTaskFactory(_descriptor));
+        }
+        // has to be downloaded last because it is used by GameVersionProps to check if version is installed
+        taskFactories.Add(new VersionJarDownloadTaskFactory(_descriptor));
        
        var networkTasks = new List<NetworkTask>();
        for (int i = 0; i < taskFactories.Count; i++)
@@ -159,7 +177,7 @@ public class GameVersion
        Dictionary<string, string> placeholder_values = new() {
            { "resolution_width", "1600" },
            { "resolution_height", "900" },
-            { "xms", "2048" },
+            { "xms", LauncherApp.Config.max_memory.ToString() },
            { "xmx", LauncherApp.Config.max_memory.ToString() },
            { "auth_player_name", LauncherApp.Config.player_name },
            { "auth_access_token", uuid },
@@ -179,6 +197,8 @@ public class GameVersion
            { "game_assets", GetAssetsDir().ToString() },
            { "game_directory", WorkingDirectory.ToString() },
            { "natives_directory", GetNativeLibrariesDir(_descriptor.id).ToString() },
+            { "library_directory", GetLibrariesDir().ToString() },
+            { "classpath_separator", ";"},
            { "path", GetLog4jConfigFilePath().ToString() },
            { "version_name", _descriptor.id },
            { "version_type", _descriptor.type },
@@ -197,9 +217,13 @@ public class GameVersion
        var command = Cli.Wrap(JavaExecutableFilePath.ToString())
            .WithWorkingDirectory(WorkingDirectory.ToString())
            .WithArguments(argsList)
-            .WithStandardOutputPipe(PipeTarget.ToDelegate(LogGameOut))
-            .WithStandardErrorPipe(PipeTarget.ToDelegate(LogGameError))
            .WithValidation(CommandResultValidation.None);
+        if (LauncherApp.Config.redirect_game_output)
+        {
+            command = command
+                .WithStandardOutputPipe(PipeTarget.ToDelegate(LogGameOut))
+                .WithStandardErrorPipe(PipeTarget.ToDelegate(LogGameError));
+        }
        LauncherApp.Logger.LogInfo(Name, "launching the game");
        LauncherApp.Logger.LogDebug(Name, "java: " + command.TargetFilePath);
        LauncherApp.Logger.LogDebug(Name, "working_dir: " + command.WorkingDirPath);
--- a/Mlaumcherb.Client.Avalonia/LauncherLogger.cs
+++ b/Mlaumcherb.Client.Avalonia/LauncherLogger.cs
@@ -1,6 +1,4 @@
-using Mlaumcherb.Client.Avalonia.зримое;
-
-namespace Mlaumcherb.Client.Avalonia;
+namespace Mlaumcherb.Client.Avalonia;

 public class LauncherLogger : ILogger
 {
--- a/Mlaumcherb.Client.Avalonia/зримое/LauncherApp.axaml.cs
+++ b/Mlaumcherb.Client.Avalonia/зримое/LauncherApp.axaml.cs
@@ -15,6 +15,12 @@ public class LauncherApp : Application
        Config = Config.LoadFromFile();
        Logger.DebugLogEnabled = Config.debug;
        AvaloniaXamlLoader.Load(this);
+        
+        // some file required by forge installer
+        if (!File.Exists("launcher_profiles.json"))
+        {
+            File.WriteAllText("launcher_profiles.json", "{}");
+        }
    }

    public override void OnFrameworkInitializationCompleted()
--- a/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml
+++ b/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml
@@ -7,53 +7,96 @@
        Title="млаумчерб"
        Icon="avares://млаумчерб/капитал/кубе.ico"
        FontFamily="{StaticResource MonospaceFont}" FontSize="18"
-        MinWidth="1200" MinHeight="700"
-        Width="800" Height="500"
+        MinWidth="800" MinHeight="400"
+        Width="800" Height="600"
        WindowStartupLocation="CenterScreen">
-    <Grid>
-        <Grid.RowDefinitions>* 30</Grid.RowDefinitions>
+    <Grid RowDefinitions="* 30">
        <Image Grid.RowSpan="2" Stretch="UniformToFill"
               Source="avares://млаумчерб/капитал/фоне.png"/>
        
        <Grid Grid.Row="0" Margin="10">
-            <Grid.ColumnDefinitions>* 300 *</Grid.ColumnDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition MinWidth="150"/>
+                <ColumnDefinition Width="2" />
+                <ColumnDefinition MinWidth="300"/>
+                <ColumnDefinition Width="2" />
+                <ColumnDefinition MinWidth="150"/>
+            </Grid.ColumnDefinitions>
+            
+            <GridSplitter Grid.Column="1" Background="Transparent" ResizeDirection="Columns" />
+            <GridSplitter Grid.Column="3" Background="Transparent" ResizeDirection="Columns"/>
            
            <!-- Central panel -->
-            <Border Grid.Column="1" 
-                    Classes="dark_tr_bg white_border"
-                    Margin="10 0">
+            <Border Grid.Column="2"
+                    Classes="dark_tr_bg white_border">
                <Grid>
                    <Grid.RowDefinitions>* 60</Grid.RowDefinitions>
-                    <StackPanel Orientation="Vertical" Margin="10" Spacing="10">
-                        <TextBlock>Версия:</TextBlock>
-                        <ComboBox Name="VersionComboBox"/>
-                        
-                        <TextBlock>Ник:</TextBlock>
-                        <TextBox Background="Transparent"
-                                 Text="{Binding #window.PlayerName}"/>
-                        
-                        <TextBlock>
-                            <Run>Выделенная память:</Run>
-                            <TextBox Background="Transparent" Padding="0"
-                                     BorderThickness="1"
-                                     BorderBrush="#777777"
-                                     Text="{Binding #window.MemoryLimit}">
-                            </TextBox>
-                            <Run>Мб</Run>
-                        </TextBlock>
-                        <Slider Minimum="2048" Maximum="8192"
-                                Value="{Binding #window.MemoryLimit}">
-                        </Slider>
-                        
-                        <CheckBox IsChecked="{Binding #window.CheckGameFiles}">
-                            Проверять файлы игры
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding #window.EnableJavaDownload}">
-                            Скачивать джаву
-                        </CheckBox>
-                    </StackPanel>
+                    <ScrollViewer Grid.Row="0" 
+                              HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Auto">
+                        <StackPanel Margin="10" Spacing="10">
+                            <TextBlock>Версия:</TextBlock>
+                            <ComboBox Name="InstalledVersionComboBox"/>
+                            <Button Name="DeleteVersionButton" 
+                                    Click="DeleteVersionButton_OnClick">
+                                Удалить версию
+                            </Button>
+                            
+                            <Expander Header="Добавление версий"
+                                      BorderThickness="1" BorderBrush="Gray"
+                                      Padding="4">
+                                <StackPanel>
+                                    <TextBlock>Источник:</TextBlock>
+                                    <ComboBox Name="VersionCatalogComboBox"/>
+                                    <WrapPanel>
+                                        <CheckBox Name="ReleaseVersionTypeCheckBox" IsChecked="True">релиз</CheckBox>
+                                        <CheckBox Name="SnapshotVersionTypeCheckBox">снапшот</CheckBox>
+                                        <CheckBox Name="OldVersionTypeCheckBox">старое</CheckBox>
+                                        <CheckBox Name="OtherVersionTypeAlphaCheckBox">другое</CheckBox>
+                                    </WrapPanel>
+                                    <Button Name="SearchVersionsButton"
+                                            Click="SearchVersionsButton_OnClick">
+                                        Поиск
+                                    </Button>
+                                    <TextBlock>Доступные версии:</TextBlock>
+                                    <ComboBox Name="VersionCatalogItemsComboBox"/>
+                                    <Button Name="AddVersionButton" IsEnabled="False"
+                                        Click="AddVersionButton_OnClick">
+                                        Добавить
+                                    </Button>
+                                </StackPanel>
+                            </Expander>
+                            
+                            <TextBlock>Ник:</TextBlock>
+                            <TextBox Background="Transparent"
+                                     Text="{Binding #window.PlayerName}"/>
+                            
+                            <TextBlock>
+                                <Run>Выделенная память:</Run>
+                                <TextBox Background="Transparent" Padding="0"
+                                         BorderThickness="1"
+                                         BorderBrush="#777777"
+                                         Text="{Binding #window.MemoryLimit}">
+                                </TextBox>
+                                <Run>Мб</Run>
+                            </TextBlock>
+                            <Slider Minimum="2048" Maximum="8192"
+                                    Value="{Binding #window.MemoryLimit}">
+                            </Slider>
+                            
+                            <CheckBox IsChecked="{Binding #window.CheckGameFiles}">
+                                Проверять файлы игры
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding #window.EnableJavaDownload}">
+                                Скачивать джаву
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding #window.RedirectGameOutput}">
+                                Выводить лог игры в лаунчер
+                            </CheckBox>
+                        </StackPanel>
+                    </ScrollViewer>
                    <Button Name="LaunchButton" Grid.Row="1"
-                            Margin="10" Padding="0 0 0 4"
+                            Margin="10" Padding="4"
                            Classes="button_no_border"
                            Background="#BBfd7300"
                            Click="Запуск">
@@ -63,10 +106,9 @@
            </Border>
            
            <!-- Left panel -->
-            <Border Grid.Column="0" 
+            <Border Grid.Column="0"
                    Classes="dark_tr_bg white_border">
-                <Grid>
-                    <Grid.RowDefinitions>36 *</Grid.RowDefinitions>
+                <Grid RowDefinitions="36 *">
                    <Border Classes="white_border" Margin="-1" Padding="4">
                        <DockPanel>
                            <TextBlock FontWeight="Bold"
@@ -92,9 +134,9 @@
            </Border>
            
            <!-- Right panel -->
-            <Border Grid.Column="2" Classes="dark_tr_bg white_border">
-                <Grid>
-                    <Grid.RowDefinitions>36 *</Grid.RowDefinitions>
+            <Border Grid.Column="4"
+                    Classes="dark_tr_bg white_border">
+                <Grid RowDefinitions="36 *">
                    <Border Classes="white_border" Margin="-1" Padding="4">
                        <DockPanel>
                            <TextBlock FontWeight="Bold"
--- a/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs
+++ b/Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs
@@ -6,6 +6,9 @@ using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;
+using MsBox.Avalonia;
+using MsBox.Avalonia.Dto;
+using MsBox.Avalonia.Models;

 namespace Mlaumcherb.Client.Avalonia.зримое;

@@ -48,6 +51,15 @@ public partial class MainWindow : Window
        set => SetValue(EnableJavaDownloadProperty, value);
    }
    
+    public static readonly StyledProperty<bool> RedirectGameOutputProperty =
+        AvaloniaProperty.Register<MainWindow, bool>(nameof(RedirectGameOutput),
+            defaultBindingMode: BindingMode.TwoWay, defaultValue: false);
+    public bool RedirectGameOutput
+    {
+        get => GetValue(RedirectGameOutputProperty);
+        set => SetValue(RedirectGameOutputProperty, value);
+    }
+    
    public MainWindow()
    {
        InitializeComponent();
@@ -62,20 +74,28 @@ public partial class MainWindow : Window
            PlayerName = LauncherApp.Config.player_name;
            MemoryLimit = LauncherApp.Config.max_memory;
            EnableJavaDownload = LauncherApp.Config.download_java;
+            RedirectGameOutput = LauncherApp.Config.redirect_game_output;

-            VersionComboBox.SelectedIndex = 0;
-            VersionComboBox.IsEnabled = false;
+            InstalledVersionComboBox.SelectedIndex = 0;
+            InstalledVersionComboBox.IsEnabled = false;
            var versions = await GameVersion.GetAllVersionsAsync();
            Dispatcher.UIThread.Invoke(() =>
            {
                foreach (var p in versions)
                {
-                    VersionComboBox.Items.Add(new VersionItemView(p));
+                    InstalledVersionComboBox.Items.Add(new VersionItemView(p));
+                    // select last played version
                    if (LauncherApp.Config.last_launched_version != null &&
                        p.Name == LauncherApp.Config.last_launched_version)
-                        VersionComboBox.SelectedIndex = VersionComboBox.Items.Count - 1;
+                        InstalledVersionComboBox.SelectedIndex = InstalledVersionComboBox.Items.Count - 1;
                }
-                VersionComboBox.IsEnabled = true;
+                InstalledVersionComboBox.IsEnabled = true;
+
+                foreach (var vc in LauncherApp.Config.version_catalogs)
+                {
+                    VersionCatalogComboBox.Items.Add(vc);
+                }
+                VersionCatalogComboBox.SelectedIndex = 0;
            });
        }
        catch (Exception ex)
@@ -103,17 +123,18 @@ public partial class MainWindow : Window
        {
            Dispatcher.UIThread.Invoke(() => LaunchButton.IsEnabled = false);
            
-            var selectedVersionView = (VersionItemView?)VersionComboBox.SelectedItem;
+            var selectedVersionView = (VersionItemView?)InstalledVersionComboBox.SelectedItem;
            var selectedVersion = selectedVersionView?.Props;
            LauncherApp.Config.last_launched_version = selectedVersion?.Name;
            LauncherApp.Config.player_name = PlayerName;
            LauncherApp.Config.max_memory = MemoryLimit;
            LauncherApp.Config.download_java = EnableJavaDownload;
+            LauncherApp.Config.redirect_game_output = RedirectGameOutput;
            LauncherApp.Config.SaveToFile();
            if (selectedVersion == null) 
                return;
            
-            var v = await GameVersion.CreateFromPropsAsync(selectedVersion);
+            var v = await GameVersion.CreateFromPropsAsync(selectedVersion, CheckGameFiles);
            await v.UpdateFiles(CheckGameFiles, nt =>
                {
                    Dispatcher.UIThread.Invoke(() =>
@@ -196,4 +217,95 @@ public partial class MainWindow : Window
        }
        DownloadsPanel.Children.Clear();
    }
+
+    private async void DeleteVersionButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        try
+        {
+            VersionItemView? sel = InstalledVersionComboBox.SelectedItem as VersionItemView;
+            if(sel is null)
+                return;
+        
+            var box = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams
+                {
+                    ButtonDefinitions = new List<ButtonDefinition> { new() { Name = "Да" }, new() { Name = "Нет" } },
+                    ContentTitle = $"Удаление версии {sel.Props.Name}",
+                    ContentMessage = $"Вы уверены, что хотите удалить версию {sel.Props.Name}? Все файлы, включая сохранения, будут удалены!",
+                    Icon = MsBox.Avalonia.Enums.Icon.Question,
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    SizeToContent = SizeToContent.WidthAndHeight,
+                    ShowInCenter = true,
+                    Topmost = true
+                }
+            );
+            var result = await box.ShowAsync().ConfigureAwait(false);
+            if (result != "Да") 
+                return;
+            
+            sel.Props.DeleteFiles();
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                InstalledVersionComboBox.Items.Remove(sel);
+            });
+        }
+        catch (Exception ex)
+        {
+            ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
+        }
+    }
+    
+    private async void SearchVersionsButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        try 
+        {
+            var catalogProps = VersionCatalogComboBox.SelectedItem as VersionCatalogProps;
+            if(catalogProps is null)
+                return;
+
+            var catalog = await catalogProps.GetVersionCatalogAsync();
+            var searchParams = new VersionSearchParams();
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                searchParams.ReleaseTypeAllowed = ReleaseVersionTypeCheckBox.IsChecked ?? false;
+                searchParams.SnapshotTypeAllowed = SnapshotVersionTypeCheckBox.IsChecked ?? false;
+                searchParams.OldTypeAllowed = OldVersionTypeCheckBox.IsChecked ?? false;
+                searchParams.OtherTypeAllowed = OtherVersionTypeAlphaCheckBox.IsChecked ?? false;
+            });
+            var versions = catalog.GetDownloadableVersions(searchParams);
+            
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                VersionCatalogItemsComboBox.IsEnabled = false;
+                VersionCatalogItemsComboBox.Items.Clear();
+                foreach (var p in versions)
+                {
+                    VersionCatalogItemsComboBox.Items.Add(new VersionItemView(p));
+                }
+                VersionCatalogItemsComboBox.SelectedIndex = 0;
+                VersionCatalogItemsComboBox.IsEnabled = true;
+                AddVersionButton.IsEnabled = versions.Count > 0;
+            });
+        }
+        catch (Exception ex)
+        {
+           ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
+        }
+    }
+
+    private void AddVersionButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        try
+        {
+            var selectedVersionView = VersionCatalogItemsComboBox.SelectedItem as VersionItemView;
+            if(selectedVersionView is null)
+                return;
+            
+            InstalledVersionComboBox.Items.Insert(0, new VersionItemView(selectedVersionView.Props));
+            InstalledVersionComboBox.SelectedIndex = 0;
+        }
+        catch (Exception ex)
+        {
+            ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
+        }
+    }
 }
--- a/Mlaumcherb.Client.Avalonia/зримое/VersionItemView.axaml
+++ b/Mlaumcherb.Client.Avalonia/зримое/VersionItemView.axaml
@@ -4,6 +4,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:local="clr-namespace:Mlaumcherb.Client.Avalonia"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Mlaumcherb.Client.Avalonia.зримое.VersionItemView">
+             x:Class="Mlaumcherb.Client.Avalonia.зримое.VersionItemView"
+             Padding="2">
    <TextBlock Name="text" Background="Transparent"/>
 </UserControl>
--- a/Mlaumcherb.Client.Avalonia/зримое/VersionItemView.axaml.cs
+++ b/Mlaumcherb.Client.Avalonia/зримое/VersionItemView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
+using Avalonia.Threading;
 using Mlaumcherb.Client.Avalonia.классы;

 namespace Mlaumcherb.Client.Avalonia.зримое;
@@ -20,12 +21,14 @@ public partial class VersionItemView : ListBoxItem
        Props = props;
        InitializeComponent();
        text.Text = props.Name;
-        props.OnDownloadCompleted += UpdateBackground;
-        UpdateBackground();
+        props.StatusChanged += UpdateBackground;
+        UpdateBackground(props.IsDownloaded);
    }

-    private void UpdateBackground()
+    private void UpdateBackground(bool isDownloaded)
    {
-        Background = Props.IsDownloaded ? _avaliableColor : _unavaliableColor;
+        Dispatcher.UIThread.Invoke(() => 
+            Background = isDownloaded ? _avaliableColor : _unavaliableColor
+        );
    }
 }
--- a/Mlaumcherb.Client.Avalonia/классы/Буржуазия/GameVersionCatalog.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Буржуазия/GameVersionCatalog.cs
@@ -1,8 +1,35 @@
 namespace Mlaumcherb.Client.Avalonia.классы;

+public record VersionSearchParams
+{
+    public bool ReleaseTypeAllowed;
+    public bool SnapshotTypeAllowed;
+    public bool OldTypeAllowed;
+    public bool OtherTypeAllowed;
+}
+
 public class GameVersionCatalog
 {
    [JsonRequired] public List<RemoteVersionDescriptorProps> versions { get; set; } = null!;
+    
+    /// <returns>empty list if couldn't find any remote versions</returns>
+    public List<GameVersionProps> GetDownloadableVersions(VersionSearchParams p)
+    {
+        var _versionPropsList = new List<GameVersionProps>();
+        foreach (var r in versions)
+        {
+            bool match = r.type switch
+            {
+                "release" => p.ReleaseTypeAllowed,
+                "snapshot" => p.SnapshotTypeAllowed,
+                "old_alpha" or "old_beta" => p.OldTypeAllowed,
+                _ => p.OtherTypeAllowed
+            };
+            if(match)
+                _versionPropsList.Add(new GameVersionProps(r));
+        }
+        return _versionPropsList;
+    }
 }

 public class AssetProperties
@@ -19,9 +46,9 @@ public class AssetIndex
 public class RemoteVersionDescriptorProps
 {
    [JsonRequired] public string id { get; set; } = "";
-    [JsonRequired] public string type { get; set; } = "";
    [JsonRequired] public string url { get; set; } = "";
-    [JsonRequired] public string sha1 { get; set; } = "";
-    [JsonRequired] public DateTime time { get; set; }
-    [JsonRequired] public DateTime releaseTime { get; set; }
+    [JsonRequired] public string type { get; set; } = "";
+    public string sha1 { get; set; } = "";
+    public DateTime time { get; set; }
+    public DateTime releaseTime { get; set; }
 }
--- a/Mlaumcherb.Client.Avalonia/классы/Буржуазия/GameVersionDescriptor.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Буржуазия/GameVersionDescriptor.cs
@@ -10,17 +10,21 @@ public class GameVersionDescriptor
    [JsonRequired] public DateTime releaseTime { get; set; }
    [JsonRequired] public string type { get; set; } = "";
    [JsonRequired] public string mainClass { get; set; } = "";
-    [JsonRequired] public Downloads downloads { get; set; } = null!;
    [JsonRequired] public List<Library> libraries { get; set; } = null!;
    [JsonRequired] public AssetIndexProperties assetIndex { get; set; } = null!;
    [JsonRequired] public string assets { get; set; } = "";
+    public Downloads? downloads { get; set; } = null;
    public JavaVersion javaVersion { get; set; } = new() { component = "jre-legacy", majorVersion = 8 };
    public string? minecraftArguments { get; set; }
    public ArgumentsNew? arguments { get; set; }
+    
+    // my additions
+    public MyModpackRemoteProps? modpack { get; set; }
 }

 public class Artifact
 {
+    public string? path = null;
    [JsonRequired] public string url { get; set; } = "";
    [JsonRequired] public string sha1 { get; set; } = "";
    [JsonRequired] public int size { get; set; }
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/FilesManifest.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/FilesManifest.cs
@@ -0,0 +1,30 @@
+using Mlaumcherb.Client.Avalonia.холопы;
+
+namespace Mlaumcherb.Client.Avalonia.классы;
+
+public class ModpackFilesManifest
+{
+    public class FileProps
+    {
+        [JsonRequired] public string sha1 { get; set; }
+        public bool allow_edit { get; set; } = false;
+    }
+    
+    /// relative_path, hash
+    [JsonRequired] public Dictionary<string, FileProps> files { get; set; } = new();
+
+    public bool CheckFiles(IOPath basedir, bool checkHashes, HashSet<IOPath> unmatchedFilesLocalPaths)
+    {
+        foreach (var p in files)
+        {
+            var localPath = new IOPath(p.Key);
+            var realPath = Path.Concat(basedir, localPath);
+            if (!HashHelper.CheckFileSHA1(realPath, p.Value.sha1, checkHashes && !p.Value.allow_edit))
+            {
+                unmatchedFilesLocalPaths.Add(localPath);
+            }
+        }
+        
+        return unmatchedFilesLocalPaths.Count == 0;
+    }
+}
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/GameArguments.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/GameArguments.cs
@@ -30,7 +30,7 @@ public class GameArguments : ArgumentsWithPlaceholders
                {
                    foreach (var arg in av.value)
                    {
-                        if(!_raw_args.Contains(arg))
+                        // if(!_raw_args.Contains(arg))
                            _raw_args.Add(arg);
                    }
                }
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/GameVersionProps.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/GameVersionProps.cs
@@ -1,4 +1,5 @@
-using Mlaumcherb.Client.Avalonia.холопы;
+using Mlaumcherb.Client.Avalonia.зримое;
+using Mlaumcherb.Client.Avalonia.холопы;

 namespace Mlaumcherb.Client.Avalonia.классы;

@@ -6,29 +7,49 @@ public class GameVersionProps : IComparable<GameVersionProps>, IEquatable<GameVe
 {
    public string Name { get; }
    public IOPath LocalDescriptorPath { get; }
-    public string? RemoteDescriptorUrl { get; }
+    public RemoteVersionDescriptorProps? RemoteProps { get; }
    private bool _isDownloaded;
    public bool IsDownloaded
    {
        get => _isDownloaded;
        set
        {
-            bool downloadCompleted = value && !_isDownloaded;
-            _isDownloaded = value;
-            if(downloadCompleted)
-                OnDownloadCompleted?.Invoke();
+            if(_isDownloaded != value)
+            {
+                _isDownloaded = value;
+                StatusChanged?.Invoke(value);
+            }
        }
    }
-    public event Action? OnDownloadCompleted;
+    public event Action<bool>? StatusChanged;

-    public GameVersionProps(string name, string? url)
+    private GameVersionProps(string name, RemoteVersionDescriptorProps? remoteProps)
    {
+        
        Name = name;
+        RemoteProps = remoteProps;
        LocalDescriptorPath = PathHelper.GetVersionDescriptorPath(name);
-        RemoteDescriptorUrl = url;
        IsDownloaded = File.Exists(PathHelper.GetVersionJarFilePath(name));
    }
+    
+    public GameVersionProps(string name) 
+        : this(name, null)
+    { }
+    
+    public GameVersionProps(RemoteVersionDescriptorProps remoteProps)
+        : this(remoteProps.id, remoteProps)
+    { }

+    public void DeleteFiles()
+    {
+        IsDownloaded = false;
+        LauncherApp.Logger.LogInfo(Name, "Deleting files...");
+        var verdir = PathHelper.GetVersionDir(Name);
+        if(Directory.Exists(verdir))
+            Directory.Delete(verdir);
+        LauncherApp.Logger.LogInfo(Name, "Files deleted");
+    }
+    
    public override string ToString() => Name;

    public override int GetHashCode() => Name.GetHashCode();
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/JavaArguments.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/JavaArguments.cs
@@ -21,7 +21,6 @@ public class JavaArguments : ArgumentsWithPlaceholders
        "-Dminecraft.client.jar=${client_jar}",
        "-Dminecraft.launcher.brand=${launcher_name}",
        "-Dminecraft.launcher.version=${launcher_version}",
-        "-cp", "${classpath}"
    ];

    private static readonly string[] _enabled_features = 
@@ -39,11 +38,17 @@ public class JavaArguments : ArgumentsWithPlaceholders
                {
                    foreach (var arg in av.value)
                    {
-                        if(!_raw_args.Contains(arg))
+                        // if(!_raw_args.Contains(arg))
                            _raw_args.Add(arg);
                    }
                }
            }
        }
+
+        if (!_raw_args.Contains("-cp"))
+        {
+            _raw_args.Add("-cp");
+            _raw_args.Add("${classpath}");
+        }
    }
 }
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/Libraries.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/Libraries.cs
@@ -12,6 +12,18 @@ public class Libraries
        : JarLib(name, jarFilePath, artifact);
    
    public IReadOnlyCollection<JarLib> Libs { get; }
+
+    private IOPath GetJarFilePath(Artifact artifact)
+    {
+        string relativePath;
+        if (!string.IsNullOrEmpty(artifact.path))
+            relativePath = artifact.path;
+        else if (!string.IsNullOrEmpty(artifact.url))
+            relativePath = artifact.url.AsSpan().After("://").After('/').ToString();
+        else throw new ArgumentException("Artifact must have a path or url");
+
+        return Path.Concat(PathHelper.GetLibrariesDir(), relativePath);
+    }
    
    public Libraries(GameVersionDescriptor descriptor)
    {
@@ -54,10 +66,8 @@ public class Libraries
                // skipping duplicates (WHO THE HELL CREATES THIS DISCRIPTORS AAAAAAAAA)
                if(!libHashes.Add(artifact.sha1))
                    continue;
-
-                string urlTail = artifact.url.AsSpan().After("://").After('/').ToString();
-                IOPath jarFilePath = Path.Concat(PathHelper.GetLibrariesDir(), urlTail);
-                libs.Add(new NativeLib(l.name, jarFilePath, artifact, l.extract));
+                
+                libs.Add(new NativeLib(l.name, GetJarFilePath(artifact), artifact, l.extract));
            }
            else
            {
@@ -69,9 +79,7 @@ public class Libraries
                if(!libHashes.Add(artifact.sha1))
                    continue;
                
-                string urlTail = artifact.url.AsSpan().After("://").After('/').ToString();
-                IOPath jarFilePath = Path.Concat(PathHelper.GetLibrariesDir(), urlTail);
-                libs.Add(new JarLib(l.name, jarFilePath, artifact));
+                libs.Add(new JarLib(l.name, GetJarFilePath(artifact), artifact));
            }
        }

--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/MyModpack.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/MyModpack.cs
@@ -0,0 +1,19 @@
+namespace Mlaumcherb.Client.Avalonia.классы;
+
+public class MyModpackRemoteProps
+{
+    [JsonRequired] public int format_version { get; set; }
+    [JsonRequired] public Artifact artifact { get; set; } = null!;
+}
+
+public class MyModpackV1
+{
+
+    // 1
+    [JsonRequired] public int format_version { get; set; }
+    [JsonRequired] public string name { get; set; }
+    // zip archive with all files
+    [JsonRequired] public Artifact zip { get; set; } = null!;
+    // ModpackFilesManifest
+    [JsonRequired] public Artifact manifest { get; set; } = null!;
+}
--- a/Mlaumcherb.Client.Avalonia/классы/Пролетариат/VersionCatalogProps.cs
+++ b/Mlaumcherb.Client.Avalonia/классы/Пролетариат/VersionCatalogProps.cs
@@ -0,0 +1,18 @@
+using Mlaumcherb.Client.Avalonia.сеть;
+
+namespace Mlaumcherb.Client.Avalonia.классы;
+
+
+public class VersionCatalogProps
+{
+    [JsonRequired] public required string name { get; init; }
+    [JsonRequired] public required string url { get; init; }
+        
+    public override string ToString() => name;
+    
+    
+    public async Task<GameVersionCatalog> GetVersionCatalogAsync()
+    {
+        return await NetworkHelper.DownloadStringAndDeserialize<GameVersionCatalog>(url);
+    }
+}
--- a/Mlaumcherb.Client.Avalonia/сеть/NetworkHelper.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/NetworkHelper.cs
@@ -1,14 +1,13 @@
 using System.Net.Http;
-using Mlaumcherb.Client.Avalonia.зримое;
-using Mlaumcherb.Client.Avalonia.классы;
+using Mlaumcherb.Client.Avalonia.холопы;

 namespace Mlaumcherb.Client.Avalonia.сеть;

-public static class Сеть
+public static class NetworkHelper
 {
    private static HttpClient _http = new();

-    static Сеть()
+    static NetworkHelper()
    {
        // thanks for Sashok :3
        // https://github.com/new-sashok724/Launcher/blob/23485c3f7de6620d2c6b7b2dd9339c3beb6a0366/Launcher/source/helper/IOHelper.java#L259
@@ -36,52 +35,30 @@ public static class Сеть
    
    public static async Task<T> DownloadStringAndDeserialize<T>(string url)
    {
-        var text = await _http.GetStringAsync(url);
+        var text = await GetString(url);
        var result = JsonConvert.DeserializeObject<T>(text)
            ?? throw new Exception($"can't deserialize {typeof(T).Name}");
        return result;
    }
    
-    private static readonly string[] VERSION_MANIFEST_URLS =
+    
+    public static async Task<string> ReadOrDownload(IOPath filePath, string url, 
+        string? sha1, bool checkHashes)
    {
-        "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"
-    };
-
-    private static async Task<List<RemoteVersionDescriptorProps>> GetRemoteVersionDescriptorsAsync()
-    {
-        List<RemoteVersionDescriptorProps> descriptors = new();
-        foreach (var url in VERSION_MANIFEST_URLS)
-        {
-            try
-            {
-                var catalog = await DownloadStringAndDeserialize<GameVersionCatalog>(url);
-                descriptors.AddRange(catalog.versions);
-            }
-            catch (Exception ex)
-            {
-                LauncherApp.Logger.LogWarn(nameof(Сеть), ex);
-            }
-        }
-
-        return descriptors;
+        if (HashHelper.CheckFileSHA1(filePath, sha1, checkHashes)) 
+            return File.ReadAllText(filePath);
+        
+        string txt = await NetworkHelper.GetString(url);
+        File.WriteAllText(filePath, txt);
+        return txt;
    }

-    private static List<GameVersionProps>? _versionPropsList;
-
-    /// <returns>empty list if couldn't find any remote versions</returns>
-    public static async Task<IReadOnlyList<GameVersionProps>> GetDownloadableVersions()
+    public static async Task<T> ReadOrDownloadAndDeserialize<T>(IOPath filePath, string url,
+        string? sha1, bool checkHashes)
    {
-        if (_versionPropsList == null)
-        {
-            _versionPropsList = new();
-            var rvdlist = await GetRemoteVersionDescriptorsAsync();
-            foreach (var r in rvdlist)
-            {
-                if (r.type == "release")
-                    _versionPropsList.Add(new GameVersionProps(r.id, r.url));
-            }
-        }
-
-        return _versionPropsList;
+        string text = await ReadOrDownload(filePath, url, sha1, checkHashes);
+        var result = JsonConvert.DeserializeObject<T>(text)
+                     ?? throw new Exception($"can't deserialize {typeof(T).Name}");
+        return result;
    }
 }
--- a/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/AssetsDownloadTaskFactory.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/AssetsDownloadTaskFactory.cs
@@ -1,11 +1,9 @@
 using System.Net;
 using System.Net.Http;
-using System.Security.Cryptography;
-using DTLib.Extensions;
 using Mlaumcherb.Client.Avalonia.зримое;
 using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;
-using static Mlaumcherb.Client.Avalonia.сеть.Сеть;
+using static Mlaumcherb.Client.Avalonia.сеть.NetworkHelper;

 namespace Mlaumcherb.Client.Avalonia.сеть.TaskFactories;

@@ -13,14 +11,12 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
 {
    private const string ASSET_SERVER_URL = "https://resources.download.minecraft.net/";
    private GameVersionDescriptor _descriptor;
-    private SHA1 _hasher;
    private IOPath _indexFilePath;
    List<AssetDownloadProperties> _assetsToDownload = new();

    public AssetsDownloadTaskFactory(GameVersionDescriptor descriptor)
    {
        _descriptor = descriptor;
-        _hasher = SHA1.Create();
        _indexFilePath = PathHelper.GetAssetIndexFilePath(_descriptor.assetIndex.id);
    }
    
@@ -37,16 +33,11 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
    }
    private async Task<bool> CheckFilesAsync(bool checkHashes)
    {
-        if(!File.Exists(_indexFilePath))
-        {
-            LauncherApp.Logger.LogInfo(nameof(Сеть), $"started downloading asset index to '{_indexFilePath}'");
-            await DownloadFile(_descriptor.assetIndex.url, _indexFilePath);
-            LauncherApp.Logger.LogInfo(nameof(Сеть), "finished downloading asset index");
-        }
-
-        string indexFileText = File.ReadAllText(_indexFilePath);
-        var assetIndex = JsonConvert.DeserializeObject<AssetIndex>(indexFileText) 
-                     ?? throw new Exception($"can't deserialize asset index file '{_indexFilePath}'");
+        var assetIndex = await ReadOrDownloadAndDeserialize<AssetIndex>(
+            _indexFilePath,
+            _descriptor.assetIndex.url, 
+            _descriptor.assetIndex.sha1,
+            checkHashes);
        
        _assetsToDownload.Clear();
        // removing duplicates for Dictionary (idk how can it be possible, but Newtonsoft.Json creates them)
@@ -56,17 +47,10 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
            if (assetHashes.Add(pair.Value.hash))
            {
                var a = new AssetDownloadProperties(pair.Key, pair.Value);
-                if (!File.Exists(a.filePath))
+                if (!HashHelper.CheckFileSHA1(a.filePath, a.hash, checkHashes))
                {
                    _assetsToDownload.Add(a);
                }
-                else if(checkHashes)
-                {
-                    await using var fs = File.OpenRead(a.filePath);
-                    string hash = _hasher.ComputeHash(fs).HashToString();
-                    if (hash != a.hash)
-                        _assetsToDownload.Add(a);
-                }
            }
        }
        
@@ -102,7 +86,7 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
    
    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
    {
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"started downloading assets '{_descriptor.assetIndex.id}'");
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"started downloading assets '{_descriptor.assetIndex.id}'");
        ParallelOptions opt = new()
        {
            MaxDegreeOfParallelism = LauncherApp.Config.max_parallel_downloads,
@@ -114,7 +98,7 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
            bool completed = false;
            while(!completed)
            {
-                LauncherApp.Logger.LogDebug(nameof(Сеть), $"downloading asset '{a.name}' {a.hash}");
+                LauncherApp.Logger.LogDebug(nameof(NetworkHelper), $"downloading asset '{a.name}' {a.hash}");
                try
                {
                    await DownloadFile(a.url, a.filePath, _ct, pr.AddBytesCount);
@@ -125,13 +109,13 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
                    // wait on rate limit
                    if(httpException.StatusCode == HttpStatusCode.TooManyRequests)
                    {
-                        LauncherApp.Logger.LogDebug(nameof(Сеть), "rate limit hit");
+                        LauncherApp.Logger.LogDebug(nameof(NetworkHelper), "rate limit hit");
                        await Task.Delay(1000, _ct);
                    }
                    else throw;
                }
            }
        });
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"finished downloading assets '{_descriptor.assetIndex.id}'");
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"finished downloading assets '{_descriptor.assetIndex.id}'");
    }
 }
--- a/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/JavaDownloadTaskFactory.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/JavaDownloadTaskFactory.cs
@@ -1,9 +1,7 @@
-using System.Security.Cryptography;
-using DTLib.Extensions;
-using Mlaumcherb.Client.Avalonia.зримое;
+using Mlaumcherb.Client.Avalonia.зримое;
 using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;
-using static Mlaumcherb.Client.Avalonia.сеть.Сеть;
+using static Mlaumcherb.Client.Avalonia.сеть.NetworkHelper;

 namespace Mlaumcherb.Client.Avalonia.сеть.TaskFactories;

@@ -13,7 +11,6 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
        "https://launchermeta.mojang.com/v1/products/java-runtime/2ec0cc96c44e5a76b9c8b7c39df7210883d12871/all.json";
    private GameVersionDescriptor _descriptor;
    private IOPath _javaVersionDir;
-    private SHA1 _hasher;
    private JavaDistributiveManifest? _distributiveManifest;
    private List<(IOPath path, JavaDistributiveElementProps props)> _filesToDownload = new();
    
@@ -21,7 +18,6 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
    {
        _descriptor = descriptor;
        _javaVersionDir = PathHelper.GetJavaRuntimeDir(_descriptor.javaVersion.component);
-        _hasher = SHA1.Create();
    }

    public async Task<NetworkTask?> CreateAsync(bool checkHashes)
@@ -52,18 +48,10 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
            {
                var artifact = pair.Value.downloads;
                IOPath file_path = Path.Concat(_javaVersionDir, pair.Key);
-                if (!File.Exists(file_path))
+                if (!HashHelper.CheckFileSHA1(file_path, artifact.raw.sha1, checkHashes))
                {
                    _filesToDownload.Add((file_path, pair.Value));
                }
-                else if(checkHashes)
-                {
-                    using var fs = File.OpenRead(file_path);
-                    if (_hasher.ComputeHash(fs).HashToString() != artifact.raw.sha1)
-                    {
-                        _filesToDownload.Add((file_path, pair.Value));
-                    }
-                }
            }
        }

@@ -84,7 +72,7 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory

    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
    {
-        LauncherApp.Logger.LogInfo(nameof(Сеть), "started downloading java runtime " +
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), "started downloading java runtime " +
                    $"{_descriptor.javaVersion.majorVersion} '{_descriptor.javaVersion.component}'");
        
        ParallelOptions opt = new()
@@ -96,7 +84,7 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
        {
            if (f.props.downloads!.lzma != null)
            {
-                LauncherApp.Logger.LogDebug(nameof(Сеть), $"downloading lzma-compressed file '{f.path}'");
+                LauncherApp.Logger.LogDebug(nameof(NetworkHelper), $"downloading lzma-compressed file '{f.path}'");
                await using var pipe = new TransformStream(await GetStream(f.props.downloads.lzma.url, _ct));
                pipe.AddTransform(pr.AddBytesCount);
                await using var fs = File.OpenWrite(f.path);
@@ -104,18 +92,18 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
            }
            else
            {
-                LauncherApp.Logger.LogDebug(nameof(Сеть), $"downloading raw file '{f.path}'");
+                LauncherApp.Logger.LogDebug(nameof(NetworkHelper), $"downloading raw file '{f.path}'");
                await DownloadFile(f.props.downloads.raw.url, f.path, _ct, pr.AddBytesCount);
            }
            
            if(!OperatingSystem.IsWindows() && f.props.executable is true)
            {
-                LauncherApp.Logger.LogDebug(nameof(Сеть), $"adding execute rights to file '{f.path}'");
+                LauncherApp.Logger.LogDebug(nameof(NetworkHelper), $"adding execute rights to file '{f.path}'");
                System.IO.File.SetUnixFileMode(f.path.ToString(), UnixFileMode.UserExecute);
            }
        });
        
-        LauncherApp.Logger.LogInfo(nameof(Сеть), "finished downloading java runtime " + 
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), "finished downloading java runtime " + 
                    $"{_descriptor.javaVersion.majorVersion} '{_descriptor.javaVersion.component}'");
    }
    
--- a/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/LibrariesDownloadTaskFactory.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/LibrariesDownloadTaskFactory.cs
@@ -1,10 +1,8 @@
 using System.IO.Compression;
-using System.Security.Cryptography;
-using DTLib.Extensions;
 using Mlaumcherb.Client.Avalonia.зримое;
 using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;
-using static Mlaumcherb.Client.Avalonia.сеть.Сеть;
+using static Mlaumcherb.Client.Avalonia.сеть.NetworkHelper;

 namespace Mlaumcherb.Client.Avalonia.сеть.TaskFactories;

@@ -12,7 +10,6 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
 {
    private GameVersionDescriptor _descriptor;
    private Libraries _libraries;
-    private SHA1 _hasher;
    private List<Libraries.JarLib> _libsToDownload = new();
    private IOPath _nativesDir;

@@ -20,7 +17,6 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
    {
        _descriptor = descriptor;
        _libraries = libraries;
-        _hasher = SHA1.Create();
        _nativesDir = PathHelper.GetNativeLibrariesDir(descriptor.id);
    }
    
@@ -43,21 +39,15 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
        
        foreach (var l in _libraries.Libs)
        {
-            if (!File.Exists(l.jarFilePath))
+            if (!HashHelper.CheckFileSHA1(l.jarFilePath, l.artifact.sha1, checkHashes))
            {
                _libsToDownload.Add(l);
            }
+            //TODO: replace with actual native assets check
            else if (!nativeDirExists && l is Libraries.NativeLib)
            {
                _libsToDownload.Add(l);
            }
-            else if (checkHashes)
-            {
-                using var fs = File.OpenRead(l.jarFilePath);
-                string hash = _hasher.ComputeHash(fs).HashToString();
-                if(hash != l.artifact.sha1)
-                    _libsToDownload.Add(l);
-            }
        }

        return _libsToDownload.Count == 0;
@@ -73,7 +63,7 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory

    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
    {
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"started downloading libraries '{_descriptor.id}'");
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"started downloading libraries '{_descriptor.id}'");
        
        ParallelOptions opt = new()
        {
@@ -82,11 +72,14 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
        };
        await Parallel.ForEachAsync(_libsToDownload, opt, async (l, _ct) =>
        {
-            LauncherApp.Logger.LogDebug(nameof(Сеть), $"downloading library '{l.name}' to '{l.jarFilePath}'");
+            LauncherApp.Logger.LogDebug(nameof(NetworkHelper), $"downloading library '{l.name}' to '{l.jarFilePath}'");
+            if(string.IsNullOrEmpty(l.artifact.url))
+                throw new Exception($"library '{l.name}' doesn't have a url to download");
            await DownloadFile(l.artifact.url, l.jarFilePath, _ct, pr.AddBytesCount);
            if (l is Libraries.NativeLib n)
            {
-                var zipf = File.OpenRead(n.jarFilePath);
+                await using var zipf = File.OpenRead(n.jarFilePath);
+                //TODO: replace following code with manual extraction
                ZipFile.ExtractToDirectory(zipf, _nativesDir.ToString(), true);
                if (n.extractionOptions?.exclude != null)
                {
@@ -102,6 +95,6 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
            }
        });
        
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"finished downloading libraries '{_descriptor.id}'");
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"finished downloading libraries '{_descriptor.id}'");
    }
 }
--- a/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/ModpackDownloadTaskFactory.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/ModpackDownloadTaskFactory.cs
@@ -0,0 +1,102 @@
+using System.IO.Compression;
+using Mlaumcherb.Client.Avalonia.зримое;
+using Mlaumcherb.Client.Avalonia.классы;
+using Mlaumcherb.Client.Avalonia.холопы;
+
+namespace Mlaumcherb.Client.Avalonia.сеть.TaskFactories;
+
+public class ModpackDownloadTaskFactory : INetworkTaskFactory
+{
+    INetworkTaskFactory _implementationVersion;
+    
+    public ModpackDownloadTaskFactory(GameVersionDescriptor descriptor)
+    {
+        if(descriptor.modpack is null)
+            throw new ArgumentNullException(nameof(descriptor.modpack));
+        _implementationVersion = descriptor.modpack.format_version switch
+        {
+            1 => new MyModpackV1DownloadTaskFactory(descriptor),
+            _ => throw new Exception($"Unknown Modpack format_version: {descriptor.modpack.format_version}")
+        };
+    }
+
+    public Task<NetworkTask?> CreateAsync(bool checkHashes)
+    {
+        return _implementationVersion.CreateAsync(checkHashes);
+    }
+}
+
+public class MyModpackV1DownloadTaskFactory : INetworkTaskFactory
+{
+    private IOPath _modpackManifesPath;
+    private readonly GameVersionDescriptor _descriptor;
+    private IOPath _modpackDescriptorPath;
+    private IOPath _versionDir;
+    private MyModpackV1? _modpack;
+    private ModpackFilesManifest? _modpackManifest;
+    private HashSet<IOPath> _filesToDosnload = new();
+
+    public MyModpackV1DownloadTaskFactory(GameVersionDescriptor descriptor)
+    {
+        _descriptor = descriptor;
+        _modpackDescriptorPath = PathHelper.GetModpackDescriptorPath(_descriptor.id);
+        _modpackManifesPath = PathHelper.GetModpackManifestPath(_descriptor.id);
+        _versionDir = PathHelper.GetVersionDir(_descriptor.id);
+    }
+    
+    public async Task<NetworkTask?> CreateAsync(bool checkHashes)
+    {
+        if(_descriptor.modpack is null)
+            throw new ArgumentNullException(nameof(_descriptor.modpack));
+
+
+        _modpack = await NetworkHelper.ReadOrDownloadAndDeserialize<MyModpackV1>(
+            _modpackDescriptorPath,
+            _descriptor.modpack.artifact.url, 
+            _descriptor.modpack.artifact.sha1,
+            checkHashes);
+        if (_modpack.format_version != _descriptor.modpack.format_version)
+            throw new Exception($"Modpack.format_version mismatches descriptor.modpack.version: " +
+                                $"{_modpack.format_version} != {_descriptor.modpack.format_version}");
+
+        _modpackManifest = await NetworkHelper.ReadOrDownloadAndDeserialize<ModpackFilesManifest>(
+            _modpackManifesPath,
+            _modpack.manifest.url, 
+            _modpack.manifest.sha1, 
+            checkHashes);
+
+        if(!_modpackManifest.CheckFiles(_versionDir, checkHashes, _filesToDosnload))
+            return new NetworkTask(
+                $"modpack '{_descriptor.assetIndex.id}'",
+                _modpack.zip.size,
+                Download
+            );
+
+        return null;
+    }
+
+    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
+    {
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"started downloading modpack '{_modpack!.name}'");
+        if(string.IsNullOrEmpty(_modpack.zip.url))
+            throw new Exception($"modpack '{_modpack.name}' doesn't have a url to download");
+
+        var _archivePath = Path.Concat("downloads/modpacks", _modpack.name + ".zip");
+        await NetworkHelper.DownloadFile(_modpack.zip.url, _archivePath, ct, pr.AddBytesCount);
+        
+        await using var zipf = File.OpenRead(_archivePath);
+        using var archive = new ZipArchive(zipf);
+        foreach (var entry in archive.Entries)
+        {
+            IOPath localPath = new(entry.FullName);
+            if(_filesToDosnload.Contains(localPath))
+            {
+                var real_path = Path.Concat(_versionDir, localPath);
+                Directory.Create(real_path.ParentDir());
+                entry.ExtractToFile(real_path.ToString(), true);
+            }
+        }
+        
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"finished downloading modpack '{_modpack.name}'");
+    }
+}
--- a/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/VersionFileDownloadTaskFactory.cs
+++ b/Mlaumcherb.Client.Avalonia/сеть/TaskFactories/VersionFileDownloadTaskFactory.cs
@@ -1,23 +1,19 @@
-using System.Security.Cryptography;
-using DTLib.Extensions;
-using Mlaumcherb.Client.Avalonia.зримое;
+using Mlaumcherb.Client.Avalonia.зримое;
 using Mlaumcherb.Client.Avalonia.классы;
 using Mlaumcherb.Client.Avalonia.холопы;
-using static Mlaumcherb.Client.Avalonia.сеть.Сеть;
+using static Mlaumcherb.Client.Avalonia.сеть.NetworkHelper;

 namespace Mlaumcherb.Client.Avalonia.сеть.TaskFactories;

-public class VersionFileDownloadTaskFactory : INetworkTaskFactory
+public class VersionJarDownloadTaskFactory : INetworkTaskFactory
 {
    private GameVersionDescriptor _descriptor;
    private IOPath _filePath;
-    private SHA1 _hasher;
    
-    public VersionFileDownloadTaskFactory(GameVersionDescriptor descriptor)
+    public VersionJarDownloadTaskFactory(GameVersionDescriptor descriptor)
    {
        _descriptor = descriptor;
        _filePath = PathHelper.GetVersionJarFilePath(_descriptor.id);
-        _hasher = SHA1.Create();
    }

    public Task<NetworkTask?> CreateAsync(bool checkHashes)
@@ -25,7 +21,7 @@ public class VersionFileDownloadTaskFactory : INetworkTaskFactory
        NetworkTask? networkTask = null;
        if (!CheckFiles(checkHashes))
            networkTask = new NetworkTask(
-                    $"version file '{_descriptor.id}'",
+                    $"game version jar '{_descriptor.id}'",
                    GetTotalSize(),
                    Download
                );
@@ -34,24 +30,23 @@ public class VersionFileDownloadTaskFactory : INetworkTaskFactory

    private bool CheckFiles(bool checkHashes)
    {
-        if (!File.Exists(_filePath))
-            return false;
-        if (!checkHashes)
-            return true;
-        using var fs = File.OpenRead(_filePath);
-        string hash = _hasher.ComputeHash(fs).HashToString();
-        return hash == _descriptor.downloads.client.sha1;
+        return HashHelper.CheckFileSHA1(_filePath, _descriptor.downloads?.client.sha1, checkHashes);
    }

    private long GetTotalSize()
    {
+        if(_descriptor.downloads is null)
+            return 0;
        return _descriptor.downloads.client.size;
    }
    
    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
    {
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"started downloading version file '{_descriptor.id}'");
+        if (_descriptor.downloads is null)
+            throw new Exception($"can't download game version jar '{_descriptor.id}' because it has no download url");
+        
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"started downloading game version jar '{_descriptor.id}'");
        await DownloadFile(_descriptor.downloads.client.url, _filePath, ct, pr.AddBytesCount);
-        LauncherApp.Logger.LogInfo(nameof(Сеть), $"finished downloading version file '{_descriptor.id}'");
+        LauncherApp.Logger.LogInfo(nameof(NetworkHelper), $"finished downloading game version jar '{_descriptor.id}'");
    }
 }
--- a/Mlaumcherb.Client.Avalonia/холопы/HashHelper.cs
+++ b/Mlaumcherb.Client.Avalonia/холопы/HashHelper.cs
@@ -0,0 +1,32 @@
+using System.Security.Cryptography;
+using DTLib.Extensions;
+
+namespace Mlaumcherb.Client.Avalonia.холопы;
+
+public static class HashHelper
+{
+    private static SHA1 _hasher;
+
+    static HashHelper()
+    {
+        _hasher = SHA1.Create();
+    }
+
+    public static string HashFileSHA1(IOPath f)
+    {
+        using var fs = File.OpenRead(f);
+        byte[] hash = _hasher.ComputeHash(fs);
+        return hash.HashToString();
+    }
+
+    public static bool CheckFileSHA1(IOPath f, string? sha1, bool checkHash)
+    {
+        if (!File.Exists(f))
+            return false;
+        
+        if(checkHash)
+            return sha1 is not null && HashFileSHA1(f) == sha1;
+
+        return true;
+    }
+}
--- a/Mlaumcherb.Client.Avalonia/холопы/PathHelper.cs
+++ b/Mlaumcherb.Client.Avalonia/холопы/PathHelper.cs
@@ -11,7 +11,7 @@ public static class PathHelper
        Path.Concat(GetRootFullPath(), "assets");
    
    public static IOPath GetAssetIndexFilePath(string id) => 
-        Path.Concat(GetAssetsDir(), $"assets/indexes/{id}.json");
+        Path.Concat(GetAssetsDir(), $"indexes/{id}.json"); // this path is hardcoded in the game
    
    public static IOPath GetVersionDescriptorPath(string id) => 
        Path.Concat(GetVersionDir(id), id + ".json");
@@ -54,4 +54,10 @@ public static class PathHelper
    
    public static IOPath GetLog4jConfigFilePath() =>
        Path.Concat(GetAssetsDir(), GetLog4jConfigFileName());
+
+    public static IOPath GetModpackDescriptorPath(string game_version) => 
+        Path.Concat(GetVersionDir(game_version), "timerix_modpack.json");
+    
+    public static IOPath GetModpackManifestPath(string game_version) => 
+        Path.Concat(GetVersionDir(game_version), "timerix_modpack_files.json");
 }
Author	SHA1	Message	Date
Timerix	2c780afea8	added support for modpack defined in version descriptor	2024-12-29 12:15:51 +05:00
Timerix	d141ec23dc	bugfixes	2024-12-29 01:26:41 +05:00
Timerix	e24ee815bc	my version catalog	2024-12-28 00:26:38 +05:00
Timerix	372fa5eda2	minor fixes	2024-12-28 00:22:28 +05:00
Timerix	631f5c9126	forge support	2024-12-27 22:22:01 +05:00
Timerix	cb85b132c3	Game version management	2024-12-27 21:11:19 +05:00