Fix .ajmeta problems

Author: SnaveSutit

exporters/datapackExporter/exporter/gen/datapack.ts

@@ -23,52 +23,23 @@ export interface IFolders {
 	}
 }
 
-export interface IAJMeta {
-	datapack: {
-		projects: Record<
-			string, // UUID
-			{
-				project_name: string
-				files: string[]
-			}
-		>
-	}
-	resourcepack: object
-}
+async function processAJMeta(folders: IFolders) {
+	const { LimitClock } = AnimatedJava.API
+	const ajmeta = new AnimatedJava.API.AJMetaFile()
 
-async function loadAJMeta() {
-	let ajMeta: IAJMeta
 	const oldPath = PathModule.join(G.DATAPACK_EXPORT_PATH, '.ajmeta')
-	const newPath = PathModule.join(G.DATAPACK_EXPORT_PATH, '.ajmeta')
-	const path = (await fileExists(oldPath)) ? oldPath : newPath
+	const newPath = PathModule.join(G.DATAPACK_EXPORT_PATH, 'datapack.ajmeta')
 
-	if (await fileExists(path)) {
-		ajMeta = await loadJsonFile(path).catch(e => {
-			console.warn(`Failed to load .ajmeta file:\n${e.stack}`)
-		})
+	if (await fileExists(newPath)) await ajmeta.load(newPath)
+	else if (await fileExists(oldPath)) {
+		await ajmeta.load(oldPath)
+		await fs.promises.unlink(oldPath).catch(() => {})
 	}
-	if (!ajMeta) ajMeta = {} as IAJMeta
-
-	ajMeta.datapack ??= { projects: {} }
-	ajMeta.datapack.projects ??= {}
-
-	if (path === oldPath) await fs.promises.rm(path).catch(() => {})
-
-	return ajMeta
-}
-
-async function processAJMeta(folders: IFolders) {
-	const { LimitClock } = AnimatedJava.API
-	const ajMetaContent = await loadAJMeta()
 
-	let project =
-		ajMetaContent.datapack.projects[Project!.animated_java_uuid!] ??
-		({} as IAJMeta['datapack']['projects'][string])
-	ajMetaContent.datapack.projects[Project!.animated_java_uuid!] = project
-	project.project_name = G.PROJECT_NAME
-	project.files ??= []
+	let project = ajmeta.getProject(Project!.animated_java_uuid!)
+	if (!project) project = ajmeta.addProject(Project!.animated_java_uuid!, G.PROJECT_NAME, [])
 
-	const oldFiles = project.files
+	const oldFiles = project.file_list
 	const newFiles = folders.datapack.getAllFilePaths()
 	const filesToRemove = oldFiles.filter(f => !newFiles.includes(f))
 
@@ -89,9 +60,9 @@ async function processAJMeta(folders: IFolders) {
 	}
 	progress.finish()
 
-	project.files = newFiles
+	project.file_list = newFiles
 
-	folders.datapack.newFile('.ajmeta', ajMetaContent)
+	folders.datapack.newFile('datapack.ajmeta', ajmeta.toJSON())
 }
 
 export async function generateDatapack(exportData: ExportData) {

src/ajmeta.ts

@@ -0,0 +1,59 @@
+import * as fs from 'fs/promises'
+import * as PACKAGE from '../package.json'
+
+export interface IAJMetaJSON {
+	version?: string
+	projects: Record<string, IAJMetaProject>
+}
+
+export interface IAJMetaProject {
+	project_name: string
+	file_list: string[]
+}
+
+export class AJMetaFile {
+	version: string = PACKAGE.version
+	projects: Record<string, IAJMetaProject> = {}
+
+	constructor() {
+		this.projects = {}
+	}
+
+	addProject(uuid: string, projectName: string, fileList: string[]): IAJMetaProject {
+		const project = { project_name: projectName, file_list: fileList }
+		this.projects[uuid] = project
+		return project
+	}
+
+	getProject(uuid: string): IAJMetaProject | undefined {
+		return this.projects[uuid]
+	}
+
+	toJSON(): IAJMetaJSON {
+		return {
+			version: PACKAGE.version,
+			projects: this.projects,
+		}
+	}
+
+	async load(path: string): Promise<AJMetaFile> {
+		this.projects = {}
+
+		const stringContent = await fs.readFile(path, 'utf-8').catch(e => {
+			console.warn(`Could not read ajmeta file at ${path}: ${e as string}`)
+			return '{}'
+		})
+
+		let content: IAJMetaJSON
+		try {
+			content = JSON.parse(stringContent)
+		} catch (e: any) {
+			throw new Error(`Invalid ajmeta file: ${e as string}`)
+		}
+
+		this.version = content.version || PACKAGE.version
+		this.projects = content.projects || {}
+
+		return this
+	}
+}

src/index.ts

@@ -49,6 +49,7 @@ import * as VirtualFileSystem from './util/virtualFileSystem'
 import { openUnexpectedErrorDialog } from './ui/popups/unexpectedError'
 import * as minecraft from './minecraft'
 import { openAJExportInProgressDialog } from './ui/ajExportInProgress'
+import { AJMetaFile } from './ajmeta'
 
 Prism.languages.mcfunction = {}
 
@@ -76,23 +77,24 @@ globalThis.AnimatedJava = {
 	openAJExportInProgressDialog,
 
 	API: {
-		Settings: AJSettings,
-		Exporter: AnimatedJavaExporter,
-		translate,
 		addTranslations,
+		AJMetaFile,
+		columnToRowMajor: transposeMatrix,
+		createInfo,
+		deepslate,
+		ExpectedError,
+		Exporter: AnimatedJavaExporter,
 		formatStr,
+		generateSearchTree,
+		JsonText,
+		LimitClock,
+		minecraft,
+		ProgressBarController,
 		roundTo,
 		roundToN,
+		Settings: AJSettings,
+		translate,
 		VirtualFileSystem,
-		deepslate,
-		ProgressBarController,
-		createInfo,
-		JsonText,
-		columnToRowMajor: transposeMatrix,
-		generateSearchTree,
-		minecraft,
-		ExpectedError,
-		LimitClock,
 	},
 }
 // Uninstall events

src/modelDataFixerUpper.ts

@@ -13,25 +13,38 @@ export function process(model: any) {
 	console.log('Upgrading model from version', model.meta.format_version, 'to', FORMAT_VERSION)
 
 	try {
-		if (compareVersions('1.0', model.meta.format_version)) updateModelTo1_0(model)
-		if (compareVersions('1.1', model.meta.format_version)) updateModelTo1_1(model)
-		if (compareVersions('1.2', model.meta.format_version)) updateModelTo1_2(model)
-		if (compareVersions('1.3', model.meta.format_version)) updateModelTo1_3(model)
-		if (compareVersions('1.4', model.meta.format_version)) updateModelTo1_4(model)
+		console.group('Upgrade process')
+		if (model.meta.format_version.length === 3) {
+			if (compareVersions('1.0', model.meta.format_version)) updateModelTo1_0(model)
+			if (compareVersions('1.1', model.meta.format_version)) updateModelTo1_1(model)
+			if (compareVersions('1.2', model.meta.format_version)) updateModelTo1_2(model)
+			if (compareVersions('1.3', model.meta.format_version)) updateModelTo1_3(model)
+			if (compareVersions('1.4', model.meta.format_version)) updateModelTo1_4(model)
+			model.meta.format_version = '0.3.9'
+		}
+		// Versions below this are post 0.3.10. I changed the versioning system to use the AJ version instead of a unique format version.
+		if (compareVersions('0.3.10', model.meta.format_version)) updateModelTo0_3_10(model)
+		console.groupEnd()
 	} catch (e) {
 		console.error(e)
 		openUnexpectedErrorDialog(e)
 		void Project?.close(true)
 		return
 	}
 
-	model.meta.format_version ??= FORMAT_VERSION
+	model.meta.format_version = FORMAT_VERSION
 
 	console.log('Upgrade complete')
 }
 
+// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unused-vars
+function updateModelTo0_3_10(model: any) {
+	console.log('Processing model for AJ 0.3.10')
+}
+
 // eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo1_4(model: any) {
+	console.log('Processing model format 1.4')
 	if (
 		model.animated_java.exporter_settings['animated_java:datapack_exporter']
 			.outdated_rig_warning !== undefined
@@ -49,6 +62,7 @@ function updateModelTo1_4(model: any) {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo1_3(model: any) {
+	console.log('Processing model format 1.3')
 	if (model.animated_java.settings.exporter === 'animated_java:animation_exporter') {
 		model.animated_java.settings.exporter = 'animated_java:datapack_exporter'
 	}
@@ -61,6 +75,7 @@ function updateModelTo1_3(model: any) {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo1_2(model: any) {
+	console.log('Processing model format 1.2')
 	for (const variant of model.animated_java.variants) {
 		for (const [from, to] of Object.entries(variant.textureMap as Record<string, string>)) {
 			const fromUUID = from.split('::')[0]
@@ -73,6 +88,7 @@ function updateModelTo1_2(model: any) {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo1_1(model: any) {
+	console.log('Processing model format 1.1')
 	model.animated_java.settings.resource_pack_mcmeta =
 		model.animated_java.settings.resource_pack_folder
 	delete model.animated_java.settings.resource_pack_folder
@@ -84,6 +100,7 @@ function updateModelTo1_1(model: any) {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo1_0(model: any) {
+	console.log('Processing model format 1.0')
 	if (model.meta.settings) {
 		console.log('Upgrading settings...')
 		const animatedJava: IAnimatedJavaModel['animated_java'] = {

src/modelFormat.ts

@@ -8,8 +8,9 @@ import { injectStartScreen } from './ui/ajStartScreen'
 import { consoleGroup, consoleGroupCollapsed } from './util/console'
 import { createBlockbenchMod } from './util/moddingTools'
 import { IBoneConfig, TextureMap, Variant, VariantsContainer } from './variants'
+import * as PACKAGE from '../package.json'
 
-export const FORMAT_VERSION = '1.4'
+export const FORMAT_VERSION = PACKAGE.version
 
 function addProjectToRecentProjects(file: FileResult) {
 	if (!Project || !file.path) return