|
|
@@ -52,6 +52,7 @@ internal class Downloader
|
|
|
Parameters.Action.TasksStatus($"Task {tasksIterator} of {tasksCount} complete.");
|
|
|
|
|
|
var handler = new HttpClientHandler() { AllowAutoRedirect = true };
|
|
|
+
|
|
|
var ph = new ProgressMessageHandler(handler);
|
|
|
ph.HttpSendProgress += (_, args) =>
|
|
|
{
|
|
|
@@ -100,7 +101,7 @@ internal class Downloader
|
|
|
tasksIterator++;
|
|
|
Parameters.Action.TasksStatus($"Task {tasksIterator} of {tasksCount} complete.");
|
|
|
|
|
|
- await DownloadAssets(httpClient, versionJson, cancellationToken);
|
|
|
+ await DownloadAssets(versionJson, cancellationToken);
|
|
|
|
|
|
Parameters.Action.SetProgress(100);
|
|
|
tasksIterator++;
|
|
|
@@ -297,8 +298,9 @@ internal class Downloader
|
|
|
File.Delete($"{Settings.minecraftForlderPath}versions/Forge{versionJson.Id}/libraries.zip");
|
|
|
}
|
|
|
|
|
|
- private async Task DownloadAssets(HttpClient httpClient, Entity.Version.Version versionJson, CancellationToken cancellationToken)
|
|
|
+ private async Task DownloadAssets(Entity.Version.Version versionJson, CancellationToken cancellationToken)
|
|
|
{
|
|
|
+ using var httpClient = new HttpClient();
|
|
|
var assetsJson = await Downloader.DownloadAndDeserializeJsonData<AssetsManifest>(versionJson.AssetIndex.Url);
|
|
|
var assetsPath = $"{Settings.minecraftForlderPath}{(versionJson.Assets == "pre-1.6" ? "resources" : $"assets/{versionJson.Assets}/objects")}";
|
|
|
var assetsUrl = "https://resources.download.minecraft.net/";
|
