Fix .ajmeta conflicts when exporting both Resource Pack and Data Pack to the same folder

Author: SnaveSutit

exporters/datapackExporter/exporter/datapackGen.ts

@@ -34,7 +34,10 @@ export function loadDataPackGenerator() {
 		)
 
 		interface IAJMeta {
-			projects: Record<string, { file_list: string[] }>
+			datapack: {
+				projects: Record<string, { file_list: string[] }>
+			}
+			resourcepack: object
 		}
 
 		let content: IAJMeta | undefined
@@ -49,7 +52,19 @@ export function loadDataPackGenerator() {
 		if (existingMetaFile !== undefined) {
 			content = await fs.promises.readFile(existingMetaFile, 'utf-8').then(JSON.parse)
 
-			if (!content.projects) {
+			// Upgrade from old format
+			// @ts-ignore
+			if (!content.datapack && content.projects) {
+				// @ts-ignore
+				content.datapack = {}
+				content.resourcepack = {}
+				// @ts-ignore
+				content.datapack.projects = content.projects
+				// @ts-ignore
+				delete content.projects
+			}
+
+			if (!content.datapack.projects) {
 				const message = `Failed to read the .ajmeta file. (Missing projects). Please delete the file and try again.`
 				Blockbench.showMessageBox({
 					title: 'Failed to read .ajmeta',
@@ -58,13 +73,13 @@ export function loadDataPackGenerator() {
 				throw new ExpectedError(message)
 			}
 
-			const project = content.projects[G.NAMESPACE] || {
+			const project = content.datapack.projects[G.NAMESPACE] || {
 				namespace: G.NAMESPACE,
 				tick_functions: tickFunctionTag.content.values,
 				load_functions: loadFunctionTag.content.values,
 				file_list: [],
 			}
-			content.projects[G.NAMESPACE] = project
+			content.datapack.projects[G.NAMESPACE] = project
 
 			if (!project.file_list) {
 				const message = `Failed to read the .ajmeta file. (Missing project file_list). Please delete the file and try again.`
@@ -97,9 +112,12 @@ export function loadDataPackGenerator() {
 			await fs.promises.rm(existingMetaFile)
 		} else {
 			content = {
-				projects: {
-					[G.NAMESPACE]: { file_list: G.DATAPACK.getAllFilePaths() },
+				datapack: {
+					projects: {
+						[G.NAMESPACE]: { file_list: G.DATAPACK.getAllFilePaths() },
+					},
 				},
+				resourcepack: {},
 			}
 		}
 		G.DATAPACK.newFile('.ajmeta', content)

src/resourcePackExporter.ts

@@ -222,7 +222,10 @@ export async function exportResources(
 	)
 
 	interface IAJMeta {
-		projects: Record<string, { file_list: string[] }>
+		datapack: object
+		resourcepack: {
+			projects: Record<string, { file_list: string[] }>
+		}
 	}
 
 	async function processAJMeta(filePaths: string[]) {
@@ -248,24 +251,36 @@ export async function exportResources(
 			if (!content)
 				throw new Error('Failed to read .ajmeta file as JSON. Content is undefined.')
 
-			if (!content.projects) {
+			// Upgrade from old format
+			// @ts-ignore
+			if (!content.resourcepack && content.projects) {
+				// @ts-ignore
+				content.resourcepack = {}
+				content.datapack = {}
+				// @ts-ignore
+				content.resourcepack.projects = content.projects
+				// @ts-ignore
+				delete content.projects
+			}
+
+			if (!content.resourcepack.projects) {
 				console.warn('Found existing .ajmeta file, but it is missing "projects" key.')
-				content.projects = {}
+				content.resourcepack.projects = {}
 			}
 
-			if (!content.projects[NAMESPACE]) {
+			if (!content.resourcepack.projects[NAMESPACE]) {
 				console.warn('Found existing .ajmeta file, but it is missing this project.')
-				content.projects[NAMESPACE] = {
+				content.resourcepack.projects[NAMESPACE] = {
 					file_list: [],
 				}
 			} else {
 				const progress = new ProgressBarController(
 					'Cleaning up old Resource Pack files...',
-					content.projects[NAMESPACE].file_list.length
+					content.resourcepack.projects[NAMESPACE].file_list.length
 				)
 				// Clean out old files from disk
 				const clock = new LimitClock(10)
-				for (let path of content.projects[NAMESPACE].file_list) {
+				for (let path of content.resourcepack.projects[NAMESPACE].file_list) {
 					await clock.sync().then(b => b && progress.update())
 					path = PathModule.join(resourcePackPath, path)
 					await fs.promises.unlink(path).catch(() => undefined)
@@ -278,15 +293,18 @@ export async function exportResources(
 				progress.finish()
 			}
 
-			content.projects[NAMESPACE].file_list = filePaths
+			content.resourcepack.projects[NAMESPACE].file_list = filePaths
 		}
 
 		if (!content) {
 			console.warn('.ajmeta does not exist. Creating new .ajmeta file.')
 			content = {
-				projects: {
-					[NAMESPACE]: {
-						file_list: filePaths,
+				datapack: {},
+				resourcepack: {
+					projects: {
+						[NAMESPACE]: {
+							file_list: filePaths,
+						},
 					},
 				},
 			}