Fixes

- Hopefully fixed #45 by making error catching set exportInProgress flag to false
- Fixed #46, and #31

Author: SnaveSutit

src/animatedJava.ts

@@ -62,6 +62,7 @@ const ANIMATED_JAVA = {
 	store: store,
 	format: modelFormat,
 	registerSettingRenderer,
+	exportInProgress: false,
 	get variants() {
 		return store.get('states')
 	},
@@ -74,6 +75,7 @@ const ANIMATED_JAVA = {
 	},
 	asyncError(e: Error) {
 		showUnknownErrorDialog(e)
+		ANIMATED_JAVA.exportInProgress = false
 		throw e
 		// console.error('CUSTOM ERROR HANDLING', e)
 	},

src/exporters/statueExporter.ts

@@ -20,7 +20,7 @@ interface statueExporterSettings {
 	boneType: 'aecStack' | 'armorStand'
 	internalScoreboardObjective: string
 	idScoreboardObjective: string
-	exportMode: 'datapack' | 'mcb'
+	exportMode: 'vanilla' | 'mcb'
 	mcbFilePath: string | undefined
 	dataPackPath: string | undefined
 	markerArmorStands: boolean
@@ -421,6 +421,10 @@ async function exportDataPack(
 		})
 	}
 
+	const translatedCompilationText = tl(
+		'animatedJava_exporter_statueExporter.exportingDataPackProgress'
+	)
+
 	function onMessage(message: {
 		type: 'progress' | 'EVT' | 'ERR' | 'INF' | 'TSK'
 		msg?: string
@@ -432,14 +436,9 @@ async function exportDataPack(
 		if (message.type === 'progress') {
 			Blockbench.setProgress(message.percent, 50)
 			Blockbench.setStatusBarText(
-				format(
-					tl(
-						'animatedJava_exporter_statueExporter.exportingDataPackProgress'
-					),
-					{
-						progress: (message.percent * 100).toPrecision(4),
-					}
-				)
+				format(translatedCompilationText, {
+					progress: (message.percent * 100).toPrecision(4),
+				})
 			)
 		}
 	}
@@ -451,6 +450,7 @@ async function exportDataPack(
 		onMessage
 	)
 	let fileQueue = []
+	console.log('Vanilla Data Pack:', dataPack)
 
 	Blockbench.setProgress(0, 0)
 	Blockbench.setStatusBarText()
@@ -467,7 +467,7 @@ async function exportDataPack(
 
 	const dataPackPath = exporterSettings.dataPackPath
 	const totalFiles = dataPack.length
-	const tldMessage = tl(
+	const translatedWritingText = tl(
 		'animatedJava_exporter_statueExporter.writingDataPackProgress'
 	)
 	const createdPaths = new Set()
@@ -478,7 +478,7 @@ async function exportDataPack(
 		if (!timeOut) {
 			Blockbench.setProgress(cur / max, 50)
 			Blockbench.setStatusBarText(
-				format(tldMessage, {
+				format(translatedWritingText, {
 					progress: ((cur / max) * 100).toPrecision(4),
 					fileName,
 				})
@@ -542,7 +542,7 @@ async function statueExport(data: any) {
 		case 'mcb':
 			await exportMCFile(generated, data.settings, exporterSettings)
 			break
-		case 'datapack':
+		case 'vanilla':
 			await exportDataPack(generated, data.settings, exporterSettings)
 			break
 	}

src/lang/en.yaml

@@ -64,6 +64,8 @@ animatedJava.dialog.miscError.body: |-
 
 animatedJava.exportCancelled: Export Cancelled
 
+animatedJava.error.exportInProgress: Export in Progress
+
 animatedJava.customErrorReport.titleUndefined: Unknown Error
 
 animatedJava.popup.error.unableToGenerateTexturePath.title: Invalid texture path

src/mainEntry.ts

@@ -78,16 +78,15 @@ import lang_zh_tw from './lang/zh_tw.yaml'
 intl.register('zh_tw', lang_zh_tw)
 import { makeArmorStandModel } from './makeArmorStandModel'
 
-let F_IS_BUILDING = false
 export const BuildModel = (callback: any, options: any) => {
-	if (!F_IS_BUILDING) {
-		F_IS_BUILDING = true
+	if (!ANIMATED_JAVA.exportInProgress) {
+		ANIMATED_JAVA.exportInProgress = true
 		computeAnimationData(callback, options)
 			.then(() => {
-				F_IS_BUILDING = false
+				ANIMATED_JAVA.exportInProgress = false
 			})
 			.catch((e) => {
-				F_IS_BUILDING = false
+				ANIMATED_JAVA.exportInProgress = false
 				Blockbench.setProgress(0)
 				if (
 					e instanceof CustomError &&
@@ -106,7 +105,7 @@ export const BuildModel = (callback: any, options: any) => {
 				}
 			})
 	} else {
-		Blockbench.showQuickMessage(tl('error.build_in_progress'))
+		Blockbench.showQuickMessage(tl('animatedJava.error.exportInProgress'))
 		ERROR.ANIMATED_JAVA_BUSY()
 	}
 }

src/typings/global.d.ts

@@ -1,6 +1,7 @@
 import * as THREE from 'three'
 declare global {
 	var AJ: any
+	const ANIMATED_JAVA: any
 	var THREE: typeof import('three')
 	var konsole: Console
 	// var NodePreviewController: any