LITW-Refined/minecraft-modpack-updater
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Pascal
2025-11-08 17:31:17 +01:00
parent 3e6b70bc4c
commit 3de764b833
5 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ModpackUpdater.Apps.Client.Gui/LangRes/MsgBoxLangRes.Designer.cs generated
View File

@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// Dieser Code wurde von einem Tool generiert. // This code was generated by a tool.
// Laufzeitversion:4.0.30319.42000
// //
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // Changes to this file may cause incorrect behavior and will be lost if
// der Code erneut generiert wird. // the code is regenerated.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -12,46 +11,32 @@ namespace ModpackUpdater.Apps.Client.Gui.LangRes {
using System; using System;
/// <summary> [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. [System.Diagnostics.DebuggerNonUserCodeAttribute()]
/// </summary> [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class MsgBoxLangRes { public class MsgBoxLangRes {
private static global::System.Resources.ResourceManager resourceMan; private static System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal MsgBoxLangRes() { internal MsgBoxLangRes() {
} }
/// <summary> [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. public static System.Resources.ResourceManager ResourceManager {
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.Equals(null, resourceMan)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Client.Gui.LangRes.MsgBoxLangRes", typeof(MsgBoxLangRes).Assembly); System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.Client.Gui.LangRes.MsgBoxLangRes", typeof(MsgBoxLangRes).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
} }
} }
/// <summary> [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle public static System.Globalization.CultureInfo Culture {
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture {
get { get {
return resourceCulture; return resourceCulture;
} }
@@ -60,18 +45,12 @@ namespace ModpackUpdater.Apps.Client.Gui.LangRes {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die A new version of this program is available. If you confirm, the update will be installed automatically. It takes just a few seconds. Continue? ähnelt.
/// </summary>
public static string UpdateAvailable { public static string UpdateAvailable {
get { get {
return ResourceManager.GetString("UpdateAvailable", resourceCulture); return ResourceManager.GetString("UpdateAvailable", resourceCulture);
} }
} }
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die New program version available ähnelt.
/// </summary>
public static string UpdateAvailable_Title { public static string UpdateAvailable_Title {
get { get {
return ResourceManager.GetString("UpdateAvailable_Title", resourceCulture); return ResourceManager.GetString("UpdateAvailable_Title", resourceCulture);

3
ModpackUpdater.Apps.Client.Gui/LangRes/MsgBoxLangRes.resx
View File

@@ -118,7 +118,8 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="UpdateAvailable" xml:space="preserve"> <data name="UpdateAvailable" xml:space="preserve">
<value>A new version of this program is available. If you confirm, the update will be installed automatically. It takes just a few seconds. Continue?</value> <value>A new version of this program is available! Install now?
If you confirm, the update will be installed automatically within a few seconds.</value>
</data> </data>
<data name="UpdateAvailable_Title" xml:space="preserve"> <data name="UpdateAvailable_Title" xml:space="preserve">
<value>New program version available</value> <value>New program version available</value>

14
ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
View File

@@ -7,15 +7,10 @@ using Avalonia.Platform.Storage;
using Avalonia.Threading; using Avalonia.Threading;
using ModpackUpdater.Apps.Client.Gui.LangRes; using ModpackUpdater.Apps.Client.Gui.LangRes;
using ModpackUpdater.Manager; using ModpackUpdater.Manager;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using Pilz;
using Pilz.Extensions; using Pilz.Extensions;
using Pilz.Runtime;
using Pilz.SymbolPacks.Sets; using Pilz.SymbolPacks.Sets;
using Pilz.UI.AvaloniaUI.Symbols; using Pilz.UI.AvaloniaUI.Symbols;
using Pilz.UI.Symbols; using Pilz.UI.Symbols;
using Pilz.Updating.Client;
namespace ModpackUpdater.Apps.Client.Gui; namespace ModpackUpdater.Apps.Client.Gui;
@@ -266,11 +261,9 @@ public partial class MainForm : Window
private async void MainForm_Loaded(object? sender, RoutedEventArgs e) private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
{ {
#if !DISABLE_UPDATE #if !DISABLE_UPDATE && !DEBUG
#if !DEBUG
try try
{ {
#endif
var myAppPath = EnvironmentEx.ProcessPath!; var myAppPath = EnvironmentEx.ProcessPath!;
var updater = new UpdateClient(Program.UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable) var updater = new UpdateClient(Program.UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable)
{ {
@@ -292,13 +285,12 @@ public partial class MainForm : Window
} }
IsEnabled = true; IsEnabled = true;
} }
#if !DEBUG
} }
catch catch (Exception ex)
{ {
await MessageBoxManager.GetMessageBoxStandard("error", ex.ToString(), ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Error).ShowWindowDialogAsync(this);
IsEnabled = true; IsEnabled = true;
} }
#endif
#endif #endif
CheckStatusAndUpdate(true); CheckStatusAndUpdate(true);

2
ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
View File

@@ -63,7 +63,7 @@
<PackageReference Include="MessageBox.Avalonia" Version="3.3.0" /> <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" /> <PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Pilz" Version="2.6.0" /> <PackageReference Include="Pilz" Version="2.6.1" />
<PackageReference Include="Pilz.Configuration" Version="3.2.7" /> <PackageReference Include="Pilz.Configuration" Version="3.2.7" />
<PackageReference Include="Pilz.Cryptography" Version="2.1.2" /> <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
<PackageReference Include="Pilz.IO" Version="2.1.0" /> <PackageReference Include="Pilz.IO" Version="2.1.0" />

2
ModpackUpdater.Apps.Client.Gui/Program.cs
View File

@@ -1,6 +1,7 @@
using Avalonia; using Avalonia;
using Castle.Core.Logging; using Castle.Core.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz;
using Pilz.Configuration; using Pilz.Configuration;
namespace ModpackUpdater.Apps.Client.Gui; namespace ModpackUpdater.Apps.Client.Gui;
@@ -11,6 +12,7 @@ public static class Program
private static readonly SettingsManager settingsManager; private static readonly SettingsManager settingsManager;
public static string ProcessPath = EnvironmentEx.ProcessPath!;
public static ISettings Settings => settingsManager.Instance; public static ISettings Settings => settingsManager.Instance;
public static ILogger Log { get; } = new ConsoleLogger(); public static ILogger Log { get; } = new ConsoleLogger();