🛠️ Fix broken asset download on first startup.

Author: SnaveSutit

package.json

@@ -4,8 +4,8 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
-	"version": "1.5.1",
-	"display_version": "1.5.1",
+	"version": "1.5.2",
+	"display_version": "1.5.2",
 	"min_blockbench_version": "4.11.1",
 	"variant": "desktop",
 	"tags": [
@@ -82,6 +82,7 @@
 	},
 	"devDependencies": {
 		"@novacbn/svelte-codejar": "^0.1.2",
+		"@types/download": "^8.0.5",
 		"@types/eslint": "^8.21.1",
 		"@types/js-yaml": "^4.0.5",
 		"@types/node": "^17.0.21",
@@ -105,7 +106,7 @@
 	},
 	"dependencies": {
 		"deepslate": "^0.19.2",
-		"easydl": "^1.2.0",
+		"download": "^8.0.0",
 		"fflate": "^0.8.2",
 		"generic-stream": "^1.2.6",
 		"marked": "^4.3.0",

src/systems/datapackCompiler/index.ts

@@ -146,8 +146,6 @@ namespace TELLRAW {
 				color: 'aqua',
 				underlined: true,
 			},
-			// '\n',
-			// TELLRAW_LEARN_MORE_LINK(''),
 			TELLRAW_SUFFIX(),
 		])
 	export const RIG_OUTDATED_TEXT_DISPLAY = () =>

src/systems/minecraft/assetManager.ts

@@ -5,31 +5,31 @@ import { events } from '../../util/events'
 import index from '../../assets/vanillaAssetOverrides/index.json'
 import { Unzipped } from 'fflate'
 import { unzip } from '../util'
-import EasyDl from 'easydl'
+import download from 'download'
 import {
+	showOfflineError,
 	updateLoadingProgress,
 	updateLoadingProgressLabel,
 } from '../../interface/animatedJavaLoadingPopup'
 const ASSET_OVERRIDES = index as unknown as Record<string, string>
 
 async function downloadJar(url: string, savePath: string) {
 	updateLoadingProgressLabel('Downloading Minecraft Assets...')
-	await new EasyDl(url, savePath, {
-		existBehavior: 'overwrite',
-		maxRetry: 3,
-		reportInterval: 100,
-	})
-		.on('progress', progress => {
-			updateLoadingProgress(progress.total.percentage)
+
+	const data = await download(url, { retry: { retries: 3 } })
+		.on('downloadProgress', progress => {
+			updateLoadingProgress(progress.percent * 100)
 		})
-		.on('error', error => {
+		.catch((error: any) => {
 			console.error('Failed to download Minecraft client:', error)
 		})
-		.on('end', () => {
-			updateLoadingProgress(100)
-			updateLoadingProgressLabel('')
-		})
-		.wait()
+
+	if (!data) {
+		showOfflineError()
+		throw new Error('Failed to download Minecraft client after 3 retries.')
+	}
+
+	await fs.promises.writeFile(savePath, data)
 }
 
 export async function getLatestVersionClientDownloadUrl() {
@@ -74,8 +74,6 @@ export async function updateAssets() {
 
 export async function checkForAssetsUpdate() {
 	console.log('Checking for Minecraft assets update...')
-	// DEBUG
-	// await updateAssets()
 
 	const currentVersion = getCurrentVersion()
 	if (!currentVersion) {
@@ -95,6 +93,9 @@ export async function checkForAssetsUpdate() {
 		await updateAssets()
 	}
 
+	console.log('Does file exist?', fs.existsSync(cachedJarFilePath))
+	console.log('Are assets loaded?', localStorage.getItem('assetsLoaded') === 'true')
+
 	await extractAssets()
 	console.log('Minecraft assets are up to date!')
 	localStorage.setItem('assetsLoaded', 'true')

tools/plugins/packagerPlugin.ts

@@ -53,7 +53,7 @@ function plugin(): Plugin {
 					manifest.animated_java.icon = PACKAGE.icon
 					manifest.animated_java.description = PACKAGE.description
 					manifest.animated_java.version = PACKAGE.version
-					manifest.animated_java.min_version = PACKAGE.min_version
+					manifest.animated_java.min_version = PACKAGE.min_blockbench_version
 					manifest.animated_java.variant = PACKAGE.variant
 					manifest.animated_java.tags = PACKAGE.tags