Млаумчерб.Клиент/Игра.cs

@@ -16,7 +16,7 @@ public class GameVersion
 
     private IOPath JavaExecutableFilePath;
 
-    private GameVersionDescriptor descriptor;
+    private VersionDescriptor descriptor;
     private JavaArguments javaArgs;
     private GameArguments gameArgs;
     private Libraries libraries;
@@ -54,7 +54,7 @@ public class GameVersion
     {
         _props = props;
         string descriptorText = File.ReadAllText(props.LocalDescriptorPath);
-        descriptor = JsonConvert.DeserializeObject<GameVersionDescriptor>(descriptorText)
+        descriptor = JsonConvert.DeserializeObject<VersionDescriptor>(descriptorText)
                      ?? throw new Exception($"can't parse descriptor file '{props.LocalDescriptorPath}'");
         javaArgs = new JavaArguments(descriptor);
         gameArgs = new GameArguments(descriptor);

Млаумчерб.Клиент/Млаумчерб.Клиент.csproj

@@ -22,10 +22,9 @@
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.*" />
         <PackageReference Include="Avalonia.Labs.Gif" Version="11.2.999-cibuild-00051673"/>
         <PackageReference Include="CliWrap" Version="3.6.*" />
-        <PackageReference Include="DTLib" Version="1.4.3" />
+        <PackageReference Include="DTLib" Version="1.4.2" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.1.*" />
         <PackageReference Include="Newtonsoft.Json" Version="13.*" />
-        <PackageReference Include="EasyCompressor.LZMA" Version="2.0.2" />
     </ItemGroup>
 
     <ItemGroup>

Млаумчерб.Клиент/классы/GameArguments.cs

@@ -9,7 +9,7 @@ public class GameArguments : ArgumentsWithPlaceholders
         "has_custom_resolution"
     ];
     
-    public GameArguments(GameVersionDescriptor d)
+    public GameArguments(VersionDescriptor d)
     {
         if (d.minecraftArguments is not null)
         {

Млаумчерб.Клиент/классы/JavaArguments.cs

@@ -12,7 +12,7 @@ public class JavaArguments : ArgumentsWithPlaceholders
         
     ];
 
-    public JavaArguments(GameVersionDescriptor d)
+    public JavaArguments(VersionDescriptor d)
     {
         raw_args.AddRange(_initial_arguments);
         if (d.arguments is not null)

Млаумчерб.Клиент/классы/JavaVersionCatalog.cs

@@ -1,30 +0,0 @@
-namespace Млаумчерб.Клиент.классы;
-
-public class JavaVersionCatalog
-{
-    
-}
-
-public class JavaVersionProps
-{
-    [JsonRequired] public Artifact manifest { get; set; }
-}
-
-public class JavaVersionManifest
-{
-    [JsonRequired] public Dictionary<string, JavaDistributiveElementProps> manifest { get; set; }
-}
-
-public class JavaDistributiveElementProps
-{
-    // "directory" / "file"
-    [JsonRequired] public string type { get; set; } = "";
-    public bool? executable { get; set; }
-    public JavaCompressedArtifact? downloads { get; set; }
-}
-
-public class JavaCompressedArtifact
-{
-    public Artifact? lzma { get; set; }
-    public Artifact raw { get; set; } = null!;
-}

Млаумчерб.Клиент/классы/Libraries.cs

@@ -7,12 +7,12 @@ public class Libraries
     private static readonly string[] enabled_features = [];
     
     public record JarLib(string name, IOPath jarFilePath, Artifact artifact);
-    public record NativeLib(string name, IOPath jarFilePath, Artifact artifact, Extract? extractionOptions) 
+    public record NativeLib(string name, IOPath jarFilePath, Artifact artifact, IOPath nativeFilesDir, Extract? extractionOptions) 
         : JarLib(name, jarFilePath, artifact);
     
     public IReadOnlyCollection<JarLib> Libs { get; }
     
-    public Libraries(GameVersionDescriptor descriptor)
+    public Libraries(VersionDescriptor descriptor)
     {
         List<JarLib> libs = new();
         HashSet<string> libHashes = new();
@@ -43,9 +43,9 @@ public class Libraries
                 if(!libHashes.Add(artifact.sha1))
                     continue;
 
-                string urlTail = artifact.url.AsSpan().After("://").After('/').ToString();
-                IOPath jarFilePath = Path.Concat(Пути.GetLibrariesDir(), urlTail);
-                libs.Add(new NativeLib(l.name, jarFilePath, artifact, l.extract));
+                IOPath dir = Пути.GetVersionDir(descriptor.id);
+                IOPath jarPath = Path.Concat(dir, Path.ReplaceRestrictedChars(l.name));
+                libs.Add(new NativeLib(l.name, jarPath, artifact, dir, l.extract));
             }
             else
             {
@@ -57,9 +57,8 @@ public class Libraries
                 if(!libHashes.Add(artifact.sha1))
                     continue;
                 
-                string urlTail = artifact.url.AsSpan().After("://").After('/').ToString();
-                IOPath jarFilePath = Path.Concat(Пути.GetLibrariesDir(), urlTail);
-                libs.Add(new JarLib(l.name, jarFilePath, artifact));
+                IOPath path = artifact.url.AsSpan().After("://").After('/').ToString();
+                libs.Add(new JarLib(l.name, Path.Concat(Пути.GetLibrariesDir(), path), artifact));
             }
         }
 

Млаумчерб.Клиент/классы/VersionCatalog.cs

@@ -1,6 +1,6 @@
 namespace Млаумчерб.Клиент.классы;
 
-public class GameVersionCatalog
+public class VersionCatalog
 {
     [JsonRequired] public List<RemoteVersionDescriptorProps> versions { get; set; } = null!;
 }

Млаумчерб.Клиент/классы/VersionDescriptor.cs

@@ -3,7 +3,7 @@
 
 namespace Млаумчерб.Клиент.классы;
 
-public class GameVersionDescriptor
+public class VersionDescriptor
 {
     [JsonRequired] public string id { get; set; } = "";
     [JsonRequired] public DateTime time { get; set; }

Млаумчерб.Клиент/классы/Буржуазия.cs

@@ -53,13 +53,4 @@ public static class Буржуазия
 
         return allowed;
     } 
-
-    public static string GetOs() =>
-        Environment.OSVersion.Platform switch
-        {
-            PlatformID.Win32NT => "windows",
-            PlatformID.Unix => "linux",
-            PlatformID.MacOSX => "osx",
-            _ => throw new ArgumentOutOfRangeException(Environment.OSVersion.Platform.ToString())
-        };
 }

Млаумчерб.Клиент/классы/Пути.cs

@@ -25,9 +25,6 @@ public static class Пути
     public static IOPath GetLibrariesDir() => 
         Path.Concat(Приложение.Настройки.путь_к_кубачу, "libraries");
 
-    public static IOPath GetNativeLibrariesDir(string id) =>
-        Path.Concat(GetVersionDir(id), "natives", Буржуазия.GetOs());
-    
     public static IOPath GetJavaRuntimesDir() => 
         Path.Concat(Приложение.Настройки.путь_к_кубачу, "java");
     

Млаумчерб.Клиент/сеть/NetworkTaskFactories/AssetsDownloadTaskFactory.cs

@@ -9,12 +9,12 @@ namespace Млаумчерб.Клиент.сеть.NetworkTaskFactories;
 public class AssetsDownloadTaskFactory : INetworkTaskFactory
 {
     private const string ASSET_SERVER_URL = "https://resources.download.minecraft.net/";
-    private GameVersionDescriptor _descriptor;
+    private VersionDescriptor _descriptor;
     private SHA1 _hasher;
     private IOPath _indexFilePath;
     List<AssetDownloadProperties> _assetsToDownload = new();
 
-    public AssetsDownloadTaskFactory(GameVersionDescriptor descriptor)
+    public AssetsDownloadTaskFactory(VersionDescriptor descriptor)
     {
         _descriptor = descriptor;
         _hasher = SHA1.Create();
@@ -86,7 +86,7 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
         public string url;
         public IOPath filePath;
 
-        public AssetDownloadProperties(string key, GameAssetProperties p)
+        public AssetDownloadProperties(string key, AssetProperties p)
         {
             name = key;
             hash = p.hash;
@@ -99,7 +99,7 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
     
     private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
     {
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"started downloading assets '{_descriptor.assetIndex.id}'");
+        Приложение.Логгер.LogInfo(nameof(Сеть), "started downloading assets");
         ParallelOptions opt = new() { MaxDegreeOfParallelism = ParallelDownloadsN, CancellationToken = ct };
         await Parallel.ForEachAsync(_assetsToDownload, opt, 
             async (a, _ct) =>
@@ -107,6 +107,6 @@ public class AssetsDownloadTaskFactory : INetworkTaskFactory
                 Приложение.Логгер.LogDebug(nameof(Сеть), $"downloading asset '{a.name}' {a.hash}");
                 await DownloadFileHTTP(a.url, a.filePath, _ct, pr.AddBytesCount);
             });
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"finished downloading assets '{_descriptor.assetIndex.id}'");
+        Приложение.Логгер.LogInfo(nameof(Сеть), "finished downloading assets");
     }
 }

Млаумчерб.Клиент/сеть/NetworkTaskFactories/JavaDownloadTaskFactory.cs

@@ -1,5 +1,4 @@
 using System.Security.Cryptography;
-using EasyCompressor;
 using Млаумчерб.Клиент.классы;
 using static Млаумчерб.Клиент.сеть.Сеть;
 
@@ -7,19 +6,15 @@ namespace Млаумчерб.Клиент.сеть.NetworkTaskFactories;
 
 public class JavaDownloadTaskFactory : INetworkTaskFactory
 {
-    private const string INDEX_URL =
-        "https://launchermeta.mojang.com/v1/products/java-runtime/2ec0cc96c44e5a76b9c8b7c39df7210883d12871/all.json";
-    private GameVersionDescriptor _descriptor;
-    private IOPath _javaVersionDir;
+    private VersionDescriptor _descriptor;
     private SHA1 _hasher;
-    private LZMACompressor _lzma;
+    IOPath _javaVersionDir;
     
-    public JavaDownloadTaskFactory(GameVersionDescriptor descriptor)
+    public JavaDownloadTaskFactory(VersionDescriptor descriptor)
     {
         _descriptor = descriptor;
-        _javaVersionDir = Пути.GetJavaRuntimeDir(_descriptor.javaVersion.component);
         _hasher = SHA1.Create();
-        _lzma = new LZMACompressor();
+        _javaVersionDir = Пути.GetJavaRuntimeDir(_descriptor.javaVersion.component);
     }
 
     public Task<NetworkTask?> CreateAsync(bool checkHashes)
@@ -36,21 +31,16 @@ public class JavaDownloadTaskFactory : INetworkTaskFactory
 
     private bool CheckFiles(bool checkHashes)
     {
-        //TODO: download catalog
-        //TODO: download manifest for required runtime
-        //TODO: check whether files from manifest exist and match hashes
         throw new NotImplementedException();
     }
     
     private long GetTotalSize()
     {
-        //TODO: sum up size of all files invalidated by CheckFiles
         throw new NotImplementedException();
     }
 
     private Task Download(NetworkProgressReporter pr, CancellationToken ct)
     {
-        //TODO: download files using lzma decompression
         throw new NotImplementedException();
     }
 }

Млаумчерб.Клиент/сеть/NetworkTaskFactories/LibrariesDownloadTaskFactory.cs

@@ -1,5 +1,4 @@
-using System.IO.Compression;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using DTLib.Extensions;
 using Млаумчерб.Клиент.видимое;
 using Млаумчерб.Клиент.классы;
@@ -9,18 +8,16 @@ namespace Млаумчерб.Клиент.сеть.NetworkTaskFactories;
 
 public class LibrariesDownloadTaskFactory : INetworkTaskFactory
 {
-    private GameVersionDescriptor _descriptor;
+    private VersionDescriptor _descriptor;
     private Libraries _libraries;
     private SHA1 _hasher;
     private List<Libraries.JarLib> _libsToDownload = new();
-    private IOPath _nativesDir;
 
-    public LibrariesDownloadTaskFactory(GameVersionDescriptor descriptor, Libraries libraries)
+    public LibrariesDownloadTaskFactory(VersionDescriptor descriptor, Libraries libraries)
     {
         _descriptor = descriptor;
         _libraries = libraries;
         _hasher = SHA1.Create();
-        _nativesDir = Пути.GetNativeLibrariesDir(descriptor.id);
     }
     
     public Task<NetworkTask?> CreateAsync(bool checkHashes)
@@ -38,7 +35,6 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
     private bool CheckFiles(bool checkHashes)
     {
         _libsToDownload.Clear();
-        bool nativeDirExists = Directory.Exists(_nativesDir);
         
         foreach (var l in _libraries.Libs)
         {
@@ -46,10 +42,6 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
             {
                 _libsToDownload.Add(l);
             }
-            else if (!nativeDirExists && l is Libraries.NativeLib)
-            {
-                _libsToDownload.Add(l);
-            }
             else if (checkHashes)
             {
                 using var fs = File.OpenRead(l.jarFilePath);
@@ -72,30 +64,15 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
 
     private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
     {
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"started downloading libraries '{_descriptor.id}'");
+        Приложение.Логгер.LogInfo(nameof(Сеть), "started downloading libraries");
         ParallelOptions opt = new() { MaxDegreeOfParallelism = ParallelDownloadsN, CancellationToken = ct };
         await Parallel.ForEachAsync(_libsToDownload, opt, async (l, _ct) =>
         {
             Приложение.Логгер.LogDebug(nameof(Сеть), 
                 $"downloading library '{l.name}' to '{l.jarFilePath}'");
             await DownloadFileHTTP(l.artifact.url, l.jarFilePath, _ct, pr.AddBytesCount);
-            if (l is Libraries.NativeLib n)
-            {
-                var zipf = File.OpenRead(n.jarFilePath);
-                ZipFile.ExtractToDirectory(zipf, _nativesDir.ToString(), true);
-                if (n.extractionOptions?.exclude != null)
-                {
-                    foreach (var excluded in n.extractionOptions.exclude)
-                    {
-                        IOPath path = Path.Concat(_nativesDir, excluded);
-                        if(Directory.Exists(path))
-                            Directory.Delete(path);
-                        if(File.Exists(path))
-                            File.Delete(path);
-                    }
-                }
-            }
+            //TODO: extract natives from jar
         });
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"finished downloading libraries '{_descriptor.id}'");
+        Приложение.Логгер.LogInfo(nameof(Сеть), "finished downloading libraries");
     }
 }

Млаумчерб.Клиент/сеть/NetworkTaskFactories/VersionFileDownloadTaskFactory.cs

@@ -1,6 +1,5 @@
 using System.Security.Cryptography;
 using DTLib.Extensions;
-using Млаумчерб.Клиент.видимое;
 using Млаумчерб.Клиент.классы;
 using static Млаумчерб.Клиент.сеть.Сеть;
 
@@ -8,11 +7,11 @@ namespace Млаумчерб.Клиент.сеть.NetworkTaskFactories;
 
 public class VersionFileDownloadTaskFactory : INetworkTaskFactory
 {
-    private GameVersionDescriptor _descriptor;
+    private VersionDescriptor _descriptor;
     private IOPath _filePath;
     private SHA1 _hasher;
     
-    public VersionFileDownloadTaskFactory(GameVersionDescriptor descriptor)
+    public VersionFileDownloadTaskFactory(VersionDescriptor descriptor)
     {
         _descriptor = descriptor;
         _filePath = Пути.GetVersionJarFilePath(_descriptor.id);
@@ -47,10 +46,8 @@ public class VersionFileDownloadTaskFactory : INetworkTaskFactory
         return _descriptor.downloads.client.size;
     }
     
-    private async Task Download(NetworkProgressReporter pr, CancellationToken ct)
+    private Task Download(NetworkProgressReporter pr, CancellationToken ct)
     {
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"started downloading version file '{_descriptor.id}'");
-        await DownloadFileHTTP(_descriptor.downloads.client.url, _filePath, ct, pr.AddBytesCount);
-        Приложение.Логгер.LogInfo(nameof(Сеть), $"finished downloading version file '{_descriptor.id}'");
+        return DownloadFileHTTP(_descriptor.downloads.client.url, _filePath, ct, pr.AddBytesCount);
     }
 }

Млаумчерб.Клиент/сеть/Сеть.cs

@@ -63,7 +63,7 @@ public static class Сеть
             try
             {
                 var manifestText = await http.GetStringAsync(url);
-                var catalog = JsonConvert.DeserializeObject<GameVersionCatalog>(manifestText);
+                var catalog = JsonConvert.DeserializeObject<VersionCatalog>(manifestText);
                 if (catalog != null)
                     descriptors.AddRange(catalog.versions);
             }