Timerix/mlaumcherb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fixed some bugs, added ability to work without internet

Browse Source
This commit is contained in:
Timerix 2025-05-21 13:50:10 +05:00
parent ab1aefd619
commit e915892fa2
7 changed files with 79 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mlaumcherb.Client.Avalonia/GameVersion.cs
View File

@ -38,7 +38,7 @@ public class GameVersion
_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}");
@ -47,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));
@ -57,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);

7
Mlaumcherb.Client.Avalonia/Mlaumcherb.Client.Avalonia.csproj
View File

@ -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>

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

@ -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)
{

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

@ -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,6 @@ public partial class MainWindow : Window
{
try
{
string workingDir = Directory.GetCurrent().ToString();
LauncherApp.Logger.LogDebug(nameof(MainWindow),
$"opening working directory: {workingDir}");

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

@ -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();
}
}

1
Mlaumcherb.Client.Avalonia/сеть/NetworkHelper.cs
View File

@ -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);

1
build.sh
View File

@ -40,6 +40,7 @@ case "$mode" in
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