Compare commits

..

No commits in common. "main" and "1.1.0" have entirely different histories.
main ... 1.1.0

18 changed files with 83 additions and 159 deletions

View File

@ -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()
public UpdateHelper.GiteaConfig gitea { get; set; } = new UpdateHelper.GiteaConfig
{
serverUrl = "https://timerix.ddns.net/git/",
serverUrl = "https://timerix.ddns.net:3322",
user = "Timerix",
repo = "mlaumcherb",
};

View File

@ -34,11 +34,10 @@ public class GameVersion
_gameArgs = new GameArguments(_descriptor);
_libraries = new Libraries(_descriptor);
WorkingDirectory = GetVersionDir(_descriptor.id);
JavaExecutableFilePath = GetJavaExecutablePath(
_descriptor.javaVersion.component, LauncherApp.Config.redirect_game_output);
JavaExecutableFilePath = GetJavaExecutablePath(_descriptor.javaVersion.component, LauncherApp.Config.debug);
}
public async Task Download(bool checkHashes, Action<NetworkTask> networkTaskCreatedCallback)
public async Task Download(bool update, Action<NetworkTask> networkTaskCreatedCallback)
{
LauncherApp.Logger.LogInfo(Id, $"started updating version {Id}");
@ -47,9 +46,9 @@ public class GameVersion
new AssetsDownloadTaskFactory(_descriptor),
new LibrariesDownloadTaskFactory(_descriptor, _libraries),
];
if (LauncherApp.Config.download_java && (!File.Exists(JavaExecutableFilePath) || checkHashes))
if (LauncherApp.Config.download_java)
taskFactories.Add(new JavaDownloadTaskFactory(_descriptor));
if (_descriptor.modpack != null)
if (_descriptor.modpack != null)
taskFactories.Add(new ModpackDownloadTaskFactory(_descriptor));
// has to be downloaded last because it is used to check if version is installed
taskFactories.Add(new VersionJarDownloadTaskFactory(_descriptor));
@ -57,7 +56,7 @@ public class GameVersion
var networkTasks = new List<NetworkTask>();
for (int i = 0; i < taskFactories.Count; i++)
{
var nt = await taskFactories[i].CreateAsync(checkHashes);
var nt = await taskFactories[i].CreateAsync(update);
if (nt != null)
{
networkTasks.Add(nt);
@ -109,7 +108,6 @@ 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() {
@ -129,14 +127,14 @@ public class GameVersion
{ "launcher_version", "1.6.84-j" },
{ "classpath", _libraries.Libs.Select(l => l.jarFilePath)
.Append(GetVersionJarFilePath(_descriptor.id))
.MergeToString(classSeparator) },
.MergeToString(';') },
{ "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", classSeparator},
{ "classpath_separator", ";"},
{ "path", GetLog4jConfigFilePath().ToString() },
{ "version_name", _descriptor.id },
{ "version_type", _descriptor.type },
@ -188,4 +186,4 @@ public class GameVersion
public override string ToString() => Id;
}
}

View File

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

View File

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

View File

@ -2,6 +2,7 @@ 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.холопы;
@ -19,26 +20,19 @@ public class LauncherApp : Application
Config = Config.LoadFromFile();
Logger.DebugLogEnabled = Config.debug;
AvaloniaXamlLoader.Load(this);
try
{
SelfUpdateAsync();
// some file required by forge installer
if (!File.Exists("launcher_profiles.json"))
{
File.WriteAllText("launcher_profiles.json", "{}");
}
InstalledVersionCatalog = InstalledVersionCatalog.Load();
}
catch (Exception e)
Update();
// some file required by forge installer
if (!File.Exists("launcher_profiles.json"))
{
ErrorHelper.ShowMessageBox(nameof(LauncherApp), e);
File.WriteAllText("launcher_profiles.json", "{}");
}
InstalledVersionCatalog = InstalledVersionCatalog.Load();
}
private async void SelfUpdateAsync()
private async void Update()
{
try
{
@ -52,10 +46,6 @@ public class LauncherApp : Application
Logger.LogInfo(nameof(LauncherApp), "restarting...");
upd.RestartSelf();
}
else
{
Logger.LogInfo(nameof(LauncherApp), "no updates found");
}
}
catch (Exception e)
{

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,20 +92,6 @@ 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();
@ -135,15 +121,8 @@ 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);
}
var selectedVersionView = InstalledVersionCatalogComboBox.SelectedItem as InstalledGameVersionItemView;
UpdateInstalledVersionsCatalogView(selectedVersionView?.Props.Id);
}
private void GuiLogMessage(LauncherLogger.LogMessage msg)
@ -168,27 +147,22 @@ public partial class MainWindow : Window
Dispatcher.UIThread.Invoke(() => LaunchButton.IsEnabled = false);
LauncherApp.Config.last_launched_version = selectedVersionView.Props.Id;
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();
var v = await selectedVersionView.Props.LoadDescriptor(UpdateGameFiles);
try
{
await v.Download(UpdateGameFiles, nt =>
await v.Download(UpdateGameFiles, nt =>
{
Dispatcher.UIThread.Invoke(() =>
{
Dispatcher.UIThread.Invoke(() =>
{
DownloadsPanel.Children.Add(new NetworkTaskView(nt,
ntv => DownloadsPanel.Children.Remove(ntv)));
});
}
);
}
catch (Exception ex)
{
ErrorHelper.ShowMessageBox(nameof(MainWindow), ex);
}
DownloadsPanel.Children.Add(new NetworkTaskView(nt,
ntv => DownloadsPanel.Children.Remove(ntv)));
});
}
);
Dispatcher.UIThread.Invoke(() =>
{
UpdateGameFiles = false;
@ -209,10 +183,7 @@ public partial class MainWindow : Window
{
try
{
string workingDir = Directory.GetCurrent().ToString();
LauncherApp.Logger.LogDebug(nameof(MainWindow),
$"opening working directory: {workingDir}");
Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(workingDir))
Launcher.LaunchDirectoryInfoAsync(new DirectoryInfo(Directory.GetCurrent().ToString()))
.ConfigureAwait(false);
}
catch (Exception ex)
@ -225,10 +196,7 @@ public partial class MainWindow : Window
{
try
{
string logFilePath = LauncherApp.Logger.LogFilePath.ToString();
LauncherApp.Logger.LogDebug(nameof(MainWindow),
$"opening log file: {logFilePath}");
Launcher.LaunchFileInfoAsync(new FileInfo(logFilePath))
Launcher.LaunchFileInfoAsync(new FileInfo(LauncherApp.Logger.LogfileName.ToString()))
.ConfigureAwait(false);
}
catch (Exception ex)
@ -241,10 +209,7 @@ public partial class MainWindow : Window
{
try
{
var sourcesUri = new Uri(LauncherApp.Config.gitea.GetRepoUrl());
LauncherApp.Logger.LogDebug(nameof(MainWindow),
$"opening in web browser: {sourcesUri}");
Launcher.LaunchUriAsync(sourcesUri)
Launcher.LaunchUriAsync(new Uri("https://timerix.ddns.net:3322/Timerix/mlaumcherb"))
.ConfigureAwait(false);
}
catch (Exception ex)

View File

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

View File

@ -66,26 +66,23 @@ public class InstalledGameVersionProps : IComparable<InstalledGameVersionProps>,
JObject descriptorRaw = JObject.Parse(descriptorText);
// Descriptors can inherit from other descriptors.
// 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))
// 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");
?? 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}'");
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.
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(DescriptorPath, descriptorRaw.ToString());
}
var descriptor = descriptorRaw.ToObject<GameVersionDescriptor>()

View File

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

View File

@ -12,7 +12,6 @@ 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);

View File

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

View File

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

View File

@ -10,17 +10,15 @@ 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)
{

View File

@ -29,21 +29,19 @@ case "$mode" in
args="$args_selfcontained"
;;
*)
echo "ПОЛЬЗОВАНИЕ: ./build.sh [способ]"
echo "ПОЛЬЗОВАНИЕ: ./собрать.sh [способ]"
echo " СПОСОБЫ:"
echo " aot, native, бинарное - компилирует промежуточный (управляемый) код в машинный вместе с рантаймом"
echo " self-contained, selfcontained, небинарное - приделывает промежуточный (управляемый) код к рантайму"
echo " Оба способа собирают программу в один файл, который не является 80-мегабайтовым умственно отсталым кубом.\
Он 20-мегабайтовый >w<"
echo " бинарное - компилирует промежуточный (управляемый) код в машинный вместе с рантаймом"
echo " небинарное - приделывает промежуточный (управляемый) код к рантайму"
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"
tree -sh "$outdir"
ls -shk "$outdir" | sort -h

View File

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

View File

@ -1,14 +0,0 @@
# 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
```

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

View File

@ -5,8 +5,6 @@ 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