v1.1.2

Mlaumcherb.Client.Avalonia/Config.cs

@@ -27,9 +27,9 @@ public record Config
         new() { name = "Mojang", url = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" },
     ];
     
-    public UpdateHelper.GiteaConfig gitea { get; set; } = new UpdateHelper.GiteaConfig
+    public UpdateHelper.GiteaConfig gitea { get; set; } = new()
     {
-        serverUrl = "https://timerix.ddns.net:3322",
+        serverUrl = "https://timerix.ddns.net/git/",
         user = "Timerix",
         repo = "mlaumcherb",
     };

Mlaumcherb.Client.Avalonia/GameVersion.cs

@@ -34,10 +34,11 @@ public class GameVersion
         _gameArgs = new GameArguments(_descriptor);
         _libraries = new Libraries(_descriptor);
         WorkingDirectory = GetVersionDir(_descriptor.id);
-        JavaExecutableFilePath = GetJavaExecutablePath(_descriptor.javaVersion.component, LauncherApp.Config.debug);
+        JavaExecutableFilePath = GetJavaExecutablePath(
+            _descriptor.javaVersion.component, LauncherApp.Config.redirect_game_output);
     }
 
-    public async Task Download(bool update, Action<NetworkTask> networkTaskCreatedCallback)
+    public async Task Download(bool checkHashes, Action<NetworkTask> networkTaskCreatedCallback)
     {
         LauncherApp.Logger.LogInfo(Id, $"started updating version {Id}");
         
@@ -46,7 +47,7 @@ public class GameVersion
             new AssetsDownloadTaskFactory(_descriptor),
             new LibrariesDownloadTaskFactory(_descriptor, _libraries),
         ];
-        if (LauncherApp.Config.download_java) 
+        if (LauncherApp.Config.download_java && (!File.Exists(JavaExecutableFilePath) || checkHashes))
             taskFactories.Add(new JavaDownloadTaskFactory(_descriptor));
         if (_descriptor.modpack != null)
             taskFactories.Add(new ModpackDownloadTaskFactory(_descriptor));
@@ -56,7 +57,7 @@ public class GameVersion
         var networkTasks = new List<NetworkTask>();
         for (int i = 0; i < taskFactories.Count; i++)
         {
-            var nt = await taskFactories[i].CreateAsync(update);
+            var nt = await taskFactories[i].CreateAsync(checkHashes);
             if (nt != null)
             {
                 networkTasks.Add(nt);
@@ -108,6 +109,7 @@ public class GameVersion
         if (string.IsNullOrWhiteSpace(LauncherApp.Config.player_name))
             throw new Exception("invalid player name");
         
+        string classSeparator = PlatformHelper.GetOs() == "windows" ? ";" : ":";
         Directory.Create(WorkingDirectory);
         string uuid = GetPlayerUUID(LauncherApp.Config.player_name);
         Dictionary<string, string> placeholder_values = new() {
@@ -127,14 +129,14 @@ public class GameVersion
             { "launcher_version", "1.6.84-j" },
             { "classpath", _libraries.Libs.Select(l => l.jarFilePath)
                 .Append(GetVersionJarFilePath(_descriptor.id))
-                .MergeToString(';') },
+                .MergeToString(classSeparator) },
             { "assets_index_name", _descriptor.assets },
             { "assets_root", GetAssetsDir().ToString() },
             { "game_assets", GetAssetsDir().ToString() },
             { "game_directory", WorkingDirectory.ToString() },
             { "natives_directory", GetNativeLibrariesDir(_descriptor.id).ToString() },
             { "library_directory", GetLibrariesDir().ToString() },
-            { "classpath_separator", ";"},
+            { "classpath_separator", classSeparator},
             { "path", GetLog4jConfigFilePath().ToString() },
             { "version_name", _descriptor.id },
             { "version_type", _descriptor.type },

Mlaumcherb.Client.Avalonia/LauncherLogger.cs

@@ -5,7 +5,7 @@ public class LauncherLogger : ILogger
     private CompositeLogger _compositeLogger;
     private FileLogger _fileLogger;
     public static readonly IOPath LogsDirectory = "launcher_logs";
-    public IOPath LogfileName => _fileLogger.LogfileName;
+    public IOPath LogFilePath => _fileLogger.LogfileName;
     
     public LauncherLogger()
     {

Mlaumcherb.Client.Avalonia/Mlaumcherb.Client.Avalonia.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <Version>1.1.0</Version>
+        <Version>1.1.2</Version>
         <OutputType Condition="'$(Configuration)' == 'Debug'">Exe</OutputType>
         <OutputType Condition="'$(Configuration)' != 'Debug'">WinExe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
@@ -12,7 +12,6 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <ApplicationIcon>капитал\кубе.ico</ApplicationIcon>
         <AssemblyName>млаумчерб</AssemblyName>
-        <Configurations>Release;Debug</Configurations>
         <Platforms>x64</Platforms>
         <!-- AXAML resource has no public constructor -->
         <NoWarn>AVLN3001</NoWarn>
@@ -25,7 +24,7 @@
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.*" />
         <PackageReference Include="Avalonia.Labs.Gif" Version="11.2.*" />
         <PackageReference Include="CliWrap" Version="3.7.0" />
-        <PackageReference Include="DTLib" Version="1.6.1" />
+        <PackageReference Include="DTLib" Version="1.7.3" />
         <PackageReference Include="LZMA-SDK" Version="22.1.1" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.*" />
@@ -36,8 +35,4 @@
         <EmbeddedResource Include="встроенное\**" />
     </ItemGroup>
     
-    <ItemGroup>
-      <Folder Include="Gitea\" />
-    </ItemGroup>
-    
 </Project>

Mlaumcherb.Client.Avalonia/зримое/LauncherApp.axaml.cs

@@ -2,7 +2,6 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Mlaumcherb.Client.Avalonia.классы;
-using Mlaumcherb.Client.Avalonia.сеть;
 using Mlaumcherb.Client.Avalonia.сеть.Update;
 using Mlaumcherb.Client.Avalonia.холопы;
 
@@ -21,7 +20,9 @@ public class LauncherApp : Application
         Logger.DebugLogEnabled = Config.debug;
         AvaloniaXamlLoader.Load(this);
         
-        Update();
+        try
+        {
+            SelfUpdateAsync();
             
             // some file required by forge installer
             if (!File.Exists("launcher_profiles.json"))
@@ -31,8 +32,13 @@ public class LauncherApp : Application
 
             InstalledVersionCatalog = InstalledVersionCatalog.Load();
         }
+        catch (Exception e)
+        {
+            ErrorHelper.ShowMessageBox(nameof(LauncherApp), e);
+        }
+    }
 
-    private async void Update()
+    private async void SelfUpdateAsync()
     {
         try
         {
@@ -46,6 +52,10 @@ public class LauncherApp : Application
                 Logger.LogInfo(nameof(LauncherApp), "restarting...");
                 upd.RestartSelf();
             }
+            else
+            {
+                Logger.LogInfo(nameof(LauncherApp), "no updates found");
+            }
         }
         catch (Exception e)
         {

Mlaumcherb.Client.Avalonia/зримое/MainWindow.axaml.cs

@@ -71,7 +71,7 @@ public partial class MainWindow : Window
         try
         {
             LauncherApp.Logger.OnLogMessage += GuiLogMessage;
-            LauncherVersionTextBox.Text = $"v {Assembly.GetExecutingAssembly().GetName().Version}";
+            LauncherVersionTextBox.Text = $"v{Assembly.GetExecutingAssembly().GetName().Version}";
 
             PlayerName = LauncherApp.Config.player_name;
             MemoryLimit = LauncherApp.Config.max_memory;
@@ -92,6 +92,20 @@ public partial class MainWindow : Window
         }
     }
 
+    protected override void OnUnloaded(RoutedEventArgs e)
+    {
+        SaveGuiPropertiesToConfig();
+    }
+
+    private void SaveGuiPropertiesToConfig()
+    {
+        LauncherApp.Config.player_name = PlayerName;
+        LauncherApp.Config.max_memory = MemoryLimit;
+        LauncherApp.Config.download_java = EnableJavaDownload;
+        LauncherApp.Config.redirect_game_output = RedirectGameOutput;
+        LauncherApp.Config.SaveToFile();
+    }
+    
     private void UpdateInstalledVersionsCatalogView(string? selectVersion)
     {
         LauncherApp.InstalledVersionCatalog.CheckInstalledVersions();
@@ -120,10 +134,17 @@ public partial class MainWindow : Window
     }
 
     private void RescanInstalledVersionsButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        try
         {
             var selectedVersionView = InstalledVersionCatalogComboBox.SelectedItem as InstalledGameVersionItemView;
             UpdateInstalledVersionsCatalogView(selectedVersionView?.Props.Id);
         }
+        catch (Exception ex)
+        {
+            ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
+        }
+    }
     
     private void GuiLogMessage(LauncherLogger.LogMessage msg)
     {
@@ -147,13 +168,12 @@ public partial class MainWindow : Window
             
             Dispatcher.UIThread.Invoke(() => LaunchButton.IsEnabled = false);
             LauncherApp.Config.last_launched_version = selectedVersionView.Props.Id;
-            LauncherApp.Config.player_name = PlayerName;
-            LauncherApp.Config.max_memory = MemoryLimit;
-            LauncherApp.Config.download_java = EnableJavaDownload;
-            LauncherApp.Config.redirect_game_output = RedirectGameOutput;
-            LauncherApp.Config.SaveToFile();
+            SaveGuiPropertiesToConfig();
             
             var v = await selectedVersionView.Props.LoadDescriptor(UpdateGameFiles);
+            
+            try
+            {
                 await v.Download(UpdateGameFiles, nt =>
                     {
                         Dispatcher.UIThread.Invoke(() =>
@@ -163,6 +183,12 @@ public partial class MainWindow : Window
                         });
                     }
                 );
+            }
+            catch (Exception ex)
+            {
+                ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
+            }
+            
             Dispatcher.UIThread.Invoke(() =>
             {
                 UpdateGameFiles = false;
@@ -183,7 +209,10 @@ public partial class MainWindow : Window
     {
         try
         {
-            Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(Directory.GetCurrent().ToString()))
+            string workingDir = Directory.GetCurrent().ToString();
+            LauncherApp.Logger.LogDebug(nameof(MainWindow), 
+                $"opening working directory: {workingDir}");
+            Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(workingDir))
                 .ConfigureAwait(false);
         }
         catch (Exception ex)
@@ -196,7 +225,10 @@ public partial class MainWindow : Window
     {
         try
         {
-            Launcher.LaunchFileInfoAsync(new FileInfo(LauncherApp.Logger.LogfileName.ToString()))
+            string logFilePath = LauncherApp.Logger.LogFilePath.ToString();
+            LauncherApp.Logger.LogDebug(nameof(MainWindow), 
+                $"opening log file: {logFilePath}");
+            Launcher.LaunchFileInfoAsync(new FileInfo(logFilePath))
                 .ConfigureAwait(false);
         }
         catch (Exception ex)
@@ -209,7 +241,10 @@ public partial class MainWindow : Window
     {
         try
         {
-            Launcher.LaunchUriAsync(new Uri("https://timerix.ddns.net:3322/Timerix/mlaumcherb"))
+            var sourcesUri = new Uri(LauncherApp.Config.gitea.GetRepoUrl());
+            LauncherApp.Logger.LogDebug(nameof(MainWindow), 
+                $"opening in web browser: {sourcesUri}");
+            Launcher.LaunchUriAsync(sourcesUri)
                 .ConfigureAwait(false);
         }
         catch (Exception ex)

Mlaumcherb.Client.Avalonia/классы/Буржуазия/JavaVersionCatalog.cs

@@ -5,9 +5,9 @@ namespace Mlaumcherb.Client.Avalonia.классы;
 
 public class JavaVersionCatalog
 {
-    [JsonProperty("linux")]
-    public Dictionary<string, JavaVersionProps[]>? linux_x86 { get; set; }
     [JsonProperty("linux-i386")]
+    public Dictionary<string, JavaVersionProps[]>? linux_x86 { get; set; }
+    [JsonProperty("linux")]
     public Dictionary<string, JavaVersionProps[]>? linux_x64 { get; set; }
     [JsonProperty("mac-os")] 
     public Dictionary<string, JavaVersionProps[]>? osx_x64 { get; set; }

Mlaumcherb.Client.Avalonia/классы/Пролетариат/InstalledGameVersionProps.cs

@@ -66,23 +66,26 @@ public class InstalledGameVersionProps : IComparable<InstalledGameVersionProps>,
         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))
+        // For example, timerix-anarx-2 inherits from 1.12.2-forge-14.23.5.2860, which inherits from 1.12.2
+        while (descriptorRaw.TryGetValue("inheritsFrom", out var v))
         {
             string parentDescriptorId = v.Value<string>() 
                 ?? throw new Exception("inheritsFrom is null");
             LauncherApp.Logger.LogInfo(Id, $"merging descriptor '{parentDescriptorId}' with '{Id}'");
+            
             IOPath parentDescriptorPath = PathHelper.GetVersionDescriptorPath(parentDescriptorId);
             if (!File.Exists(parentDescriptorPath))
                 throw new Exception($"Версия '{Id} требует установить версию '{parentDescriptorId}'");
-            string parentDescriptorText = File.ReadAllText(parentDescriptorPath);
-            JObject parentDescriptorRaw = JObject.Parse(parentDescriptorText);
+            JObject parentDescriptorRaw = JObject.Parse(File.ReadAllText(parentDescriptorPath));
+            
+            // Remove `inheritsFrom: parentDescriptor.Id` to prevent overriding of `parentDescriptor.inheritsFrom`
+            descriptorRaw.Remove("inheritsFrom");
+            // Merge child descriptor into its parent.
+            // Child descriptor values override values of parent.
+            // Array values are merged together.
             parentDescriptorRaw.Merge(descriptorRaw,
                 new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Concat });
             descriptorRaw = parentDescriptorRaw;
-            // removing dependency
-            // descriptorRaw.Remove("inheritsFrom");
-            // File.WriteAllText(DescriptorPath, descriptorRaw.ToString());
         }
 
         var descriptor = descriptorRaw.ToObject<GameVersionDescriptor>()

Mlaumcherb.Client.Avalonia/классы/Пролетариат/InstalledVersionCatalog.cs

@@ -29,7 +29,6 @@ public class InstalledVersionCatalog
         }
 
         catalog.CheckInstalledVersions();
-        catalog.Save();
         return catalog;
     }
 
@@ -44,6 +43,7 @@ public class InstalledVersionCatalog
 
     /// <summary>
     /// Check if any versions were installed or deleted manually.
+    /// Calls <see cref="Save"/>
     /// </summary>
     public void CheckInstalledVersions()
     {
@@ -53,17 +53,16 @@ public class InstalledVersionCatalog
         {
             string id = subdir.LastName().ToString();
             if (!File.Exists(PathHelper.GetVersionDescriptorPath(id)))
-                throw new Exception(
-                    $"Can't find version descriptor file in directory '{subdir}'. Rename it as directory name.");
+            {
+                LauncherApp.Logger.LogWarn(nameof(CheckInstalledVersions), 
+                    $"Can't find version descriptor file in directory '{subdir}'. " +
+                    $"Rename it as directory name.");
+                continue;
+            }
 
             if (versions.TryGetValue(id, out var foundProps))
-            {
                 versionsUpdated.Add(foundProps);
-            }
-            else
-            {
-                versionsUpdated.Add(new InstalledGameVersionProps(id, null, null));
-            }
+            else versionsUpdated.Add(new InstalledGameVersionProps(id, null, null));
         }
 
         // reverse sort
@@ -73,5 +72,7 @@ public class InstalledVersionCatalog
             versionsUpdated.Select(props =>
                 new KeyValuePair<string, InstalledGameVersionProps>(props.Id, props)
             ));
+        
+        Save();
     }
 }

Mlaumcherb.Client.Avalonia/сеть/NetworkHelper.cs

@@ -12,6 +12,7 @@ public static class NetworkHelper
         // thanks for Sashok :3
         // https://github.com/new-sashok724/Launcher/blob/23485c3f7de6620d2c6b7b2dd9339c3beb6a0366/Launcher/source/helper/IOHelper.java#L259
         _http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)");
+        _http.Timeout = TimeSpan.FromSeconds(4);
     }
 
     public static Task<string> GetString(string url, CancellationToken ct = default) => _http.GetStringAsync(url, ct);

Mlaumcherb.Client.Avalonia/сеть/TaskFactories/LibrariesDownloadTaskFactory.cs

@@ -41,15 +41,21 @@ public class LibrariesDownloadTaskFactory : INetworkTaskFactory
         bool nativeDirExists = Directory.Exists(_nativesDir);
         
         foreach (var l in _libraries.Libs)
+        {
+            if (l is Libraries.NativeLib native)
+            {
+                //TODO: replace with actual native libraries check
+                if(!nativeDirExists || checkHashes)
+                {
+                    _libsToDownload.Add(l);
+                }
+            }
+            else
             {
                 if (!HashHelper.CheckFileSHA1(l.jarFilePath, l.artifact?.sha1, checkHashes))
                 {
                     _libsToDownload.Add(l);
                 }
-            //TODO: replace with actual native libraries check
-            else if (!nativeDirExists && l is Libraries.NativeLib)
-            {
-                _libsToDownload.Add(l);
             }
         }
 

Mlaumcherb.Client.Avalonia/сеть/Update/Gitea.cs

@@ -32,7 +32,7 @@ public class GiteaClient(string ServerUrl)
 {
     public async Task<Release> GetLatestRelease(string user, string repo)
     {
-        string url = $"{ServerUrl}//api/v1/repos/{user}/{repo}/releases/latest";
+        string url = $"{ServerUrl}/api/v1/repos/{user}/{repo}/releases/latest";
         return await NetworkHelper.DownloadStringAndDeserialize<Release>(url);
     }
 }

Mlaumcherb.Client.Avalonia/сеть/Update/UpdateHelper.cs

@@ -10,15 +10,17 @@ public class UpdateHelper
     private readonly IOPath executablePathOld;
     private readonly IOPath executablePathNew;
 
+    private readonly GiteaConfig _giteaConfig;
     
     public class GiteaConfig
     {
         [JsonRequired] public required string serverUrl { get; set; }
         [JsonRequired] public required string user { get; set; }
         [JsonRequired] public required string repo { get; set; }
+        
+        public string GetRepoUrl() => $"{serverUrl}/{user}/{repo}";
     }
     
-    private GiteaConfig _giteaConfig;
     
     public UpdateHelper(GiteaConfig giteaConfig)
     {

Mlaumcherb.Client.Avalonia/холопы/PathHelper.cs

@@ -40,14 +40,17 @@ public static class PathHelper
 
     public static IOPath GetJavaBinDir(string id) =>
         Path.Concat(GetJavaRuntimeDir(id), "bin");
-    public static IOPath GetJavaExecutablePath(string id, bool debug)
+    public static IOPath GetJavaExecutablePath(string id, bool redirectOutput)
     {
         string executable_name = "java";
-        if (debug)
-            executable_name += "w";
+        if (!redirectOutput)
+            executable_name = "javaw";
         if(OperatingSystem.IsWindows())
             executable_name += ".exe";
-        return Path.Concat(GetJavaBinDir(id), executable_name);
+        var path = Path.Concat(GetJavaBinDir(id), executable_name);
+        if(!redirectOutput && !File.Exists(path))
+            return GetJavaExecutablePath(id, true);
+        return path;
     }
 
     public static string GetLog4jConfigFileName() => "log4j.xml";

README.md

@@ -0,0 +1,14 @@
+# Mlaumcherb - a minecraft laumcherb
+
+<img src="./images/cheems.png" alt="silly-dog-picture" style="width:200px;"/>
+
+## Features
+- Downloads minecraft from mojang server or any other
+- Downloads java or uses whatever you specified in config
+- Downloads modpacks of my custom format
+- Automatic launcher updates from git releases
+
+## How to build
+```sh
+./build.sh selfcontained
+```

build.sh

@@ -29,19 +29,21 @@ case "$mode" in
 		args="$args_selfcontained"
 		;;
 	*)
-		echo "ПОЛЬЗОВАНИЕ: ./собрать.sh [способ]"
+		echo "ПОЛЬЗОВАНИЕ: ./build.sh [способ]"
 		echo "  СПОСОБЫ:"
-		echo "    бинарное   - компилирует промежуточный (управляемый) код в машинный вместе с рантаймом"
-		echo "    небинарное - приделывает промежуточный (управляемый) код к рантайму"
-		echo "  Оба способа собирают программу в один файл, который не является 80-мегабайтовым умственно отсталым кубом. Он 20-мегабайтовый >w<"
+		echo "    aot, native, бинарное   - компилирует промежуточный (управляемый) код в машинный вместе с рантаймом"
+		echo "    self-contained, selfcontained, небинарное - приделывает промежуточный (управляемый) код к рантайму"
+		echo "  Оба способа собирают программу в один файл, который не является 80-мегабайтовым умственно отсталым кубом.\
+ Он 20-мегабайтовый >w<"
 		exit 1
 		;;
 esac
 
 rm -rf "$outdir"
+# when internet breaks again add --source /mnt/c/Users/User/.nuget/packages/ 
 command="dotnet publish -c Release -o $outdir $args"
 echo "$command"
 $command
 
 find "$outdir" -name '*.pdb' -delete -printf "deleted '%p'\n"
-ls -shk "$outdir" | sort -h
+tree -sh "$outdir"

mlaumcherb.sln

@@ -5,6 +5,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{A3217C18-CC0D-4CE8-9C48-1BDEC1E1B333}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		README.md = README.md
+		build.sh = build.sh
 	EndProjectSection
 EndProject
 Global