✨ Add support for multi-version data pack exporting

Author: SnaveSutit

src/lang/en.yml

@@ -52,8 +52,9 @@ animated_java.dialog.unexpected_error.paragraph: 'Please report this error by jo
 ## Blueprint Settings Dialog
 animated_java.dialog.blueprint_settings.title: Blueprint Settings
 animated_java.dialog.blueprint_settings.advanced_settings_warning: Advanced settings should only be used if absolutely needed!
+
 animated_java.dialog.blueprint_settings.blueprint_name.title: Blueprint Name
-animated_java.dialog.blueprint_settings.blueprint_name.description: The name of the Blueprint. Only used to identify the project in the workspace.
+animated_java.dialog.blueprint_settings.blueprint_name.description: The filename of the Blueprint.
 
 animated_java.dialog.blueprint_settings.texture_size.title: Texture Size
 animated_java.dialog.blueprint_settings.texture_size.description: The resolution of the UV editor. This should be the same size as the largest texture. For best results use a square texture, and make sure it's size is a power of 2.

src/systems/animationRenderer.ts

@@ -1,4 +1,5 @@
 import * as crypto from 'crypto'
+import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../interface/dialog/exportProgress'
 import {
 	getKeyframeCommands,
 	getKeyframeExecuteCondition,
@@ -12,6 +13,7 @@ import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
 import { sanitizePathName, sanitizeStorageKey } from '../util/minecraftUtil'
 import { eulerFromQuaternion, roundToNth } from '../util/misc'
 import { AnyRenderedNode, IRenderedRig } from './rigRenderer'
+import { sleepForAnimationFrame } from './util'
 
 export function correctSceneAngle() {
 	main_preview.controls.rotateLeft(Math.PI)
@@ -388,14 +390,18 @@ export function getAnimatableNodes(): OutlinerElement[] {
 	]
 }
 
-export function renderProjectAnimations(project: ModelProject, rig: IRenderedRig) {
+export async function renderProjectAnimations(project: ModelProject, rig: IRenderedRig) {
 	// Clear the cache
 	lastAnimation = undefined
 	lastFrameCache = new Map()
 	keyframeCache = new Map()
 	excludedNodesCache = new Set()
 	nodeCache = new Map()
 
+	PROGRESS_DESCRIPTION.set('Rendering Animations...')
+	PROGRESS.set(0)
+	MAX_PROGRESS.set(project.animations.length)
+
 	console.time('Rendering animations took')
 	let selectedAnimation: _Animation | undefined
 	let currentTime = 0
@@ -410,6 +416,8 @@ export function renderProjectAnimations(project: ModelProject, rig: IRenderedRig
 	const animations: IRenderedAnimation[] = []
 	for (const animation of project.animations) {
 		animations.push(renderAnimation(animation, rig))
+		PROGRESS.set(PROGRESS.get() + 1)
+		await sleepForAnimationFrame()
 	}
 	restoreSceneAngle()
 

src/systems/cleaner.ts

@@ -1,8 +1,7 @@
 import { isFunctionTagPath } from '../util/fileUtil'
 import { IFunctionTag, parseDataPackPath } from '../util/minecraftUtil'
-import { DataPackAJMeta } from './datapackCompiler'
 import { getExportPaths } from './exporter'
-import { ResourcePackAJMeta } from './resourcepackCompiler/global'
+import { AJMeta } from './global'
 import { replacePathPart } from './util'
 
 export async function cleanupExportedFiles() {
@@ -17,7 +16,7 @@ export async function cleanupExportedFiles() {
 
 	if (aj.resource_pack_export_mode === 'raw') {
 		const assetsMetaPath = PathModule.join(resourcePackFolder, 'assets.ajmeta')
-		const assetsMeta = new ResourcePackAJMeta(
+		const assetsMeta = new AJMeta(
 			assetsMetaPath,
 			aj.export_namespace,
 			Project!.last_used_export_namespace,
@@ -69,7 +68,7 @@ export async function cleanupExportedFiles() {
 
 	if (aj.data_pack_export_mode === 'raw') {
 		const dataMetaPath = PathModule.join(dataPackFolder, 'data.ajmeta')
-		const dataMeta = new DataPackAJMeta(
+		const dataMeta = new AJMeta(
 			dataMetaPath,
 			aj.export_namespace,
 			Project!.last_used_export_namespace,
@@ -81,7 +80,7 @@ export async function cleanupExportedFiles() {
 		// PROGRESS.set(0)
 		// MAX_PROGRESS.set(dataMeta.oldFiles.size)
 		const removedFolders = new Set<string>()
-		for (const file of dataMeta.oldFiles) {
+		for (const file of [...dataMeta.previousCoreFiles, ...dataMeta.previousVersionedFiles]) {
 			if (isFunctionTagPath(file) && fs.existsSync(file)) {
 				if (aj.export_namespace !== Project!.last_used_export_namespace) {
 					const resourceLocation = parseDataPackPath(file)!.resourceLocation

src/systems/datapackCompiler/compiler.ts

@@ -1,17 +1,29 @@
 import { Parser, SyncIo, Tokenizer } from 'mc-build'
 import { Compiler, VariableMap } from 'mc-build/dist/mcl/Compiler'
 import { getDataPackFormat } from '../../util/minecraftUtil'
+import { MinecraftVersion } from '../global'
+import { ExportedFile } from '../util'
 
-export function compile(
-	path: string,
-	mcbFile: string,
-	destPath: string,
+interface CompilerOptions {
+	path: string
+	mcbFile: string
+	destPath: string
 	variables: Record<string, any>
-) {
+	version: MinecraftVersion
+	exportedFiles: Map<string, ExportedFile>
+}
+
+export function compile({
+	path,
+	mcbFile,
+	destPath,
+	variables,
+	version,
+	exportedFiles,
+}: CompilerOptions) {
 	console.group('Compiling', path)
 	console.log('Variables:', variables)
 
-	const exportedFiles = new Map<string, string>()
 	const compiler = new Compiler('src/', {
 		libDir: null,
 		generatedDirName: 'zzz',
@@ -22,7 +34,7 @@ export function compile(
 		ioThreadCount: null,
 		dontEmitComments: true,
 		setup: null,
-		formatVersion: getDataPackFormat(Project!.animated_java.target_minecraft_versions),
+		formatVersion: getDataPackFormat(version),
 	})
 	compiler.disableRequire = true
 	compiler.templateParsingEnabled = false
@@ -31,7 +43,10 @@ export function compile(
 		const io = new SyncIo()
 		io.write = (localPath, content) => {
 			const writePath = PathModule.join(destPath, localPath)
-			exportedFiles.set(writePath, content)
+			exportedFiles.set(writePath, {
+				content,
+				includeInAJMeta: true,
+			})
 		}
 		return io
 	}