Fix Data Pack Exporter refactor bugs

Author: SnaveSutit

exporters/datapackExporter/datapackExporter.ts

@@ -112,6 +112,6 @@ export function loadExporter() {
 				settingId: 'animated_java:datapack_exporter/root_entity_nbt',
 			},
 		],
-		export() {},
+		export: loadDataPackGenerator() as any,
 	})
 }

exporters/datapackExporter/exporter/datapackGen.ts

@@ -8,10 +8,6 @@ import { Globals as G } from './datapackGen/globals'
 type ExporterSettings = ReturnType<ReturnType<typeof loadExporter>['getSettings']>
 export type ExportData = AnimatedJava.IAnimatedJavaExportData<ExporterSettings>
 
-export interface DataPackContext {
-	scoreboards: {}
-}
-
 export function loadDataPackGenerator() {
 	const { formatStr, ProgressBarController, ExpectedError, LimitClock } = AnimatedJava.API
 	const { NbtTag, NbtCompound, NbtString, NbtList, NbtInt } = AnimatedJava.API.deepslate

exporters/datapackExporter/exporter/datapackGen/globals.ts

@@ -1,5 +1,6 @@
 import { ExportData } from '../datapackGen'
 import { getEntityTypes, getScoreboard, getTags, loopModes } from './data'
+import { loadTellrawMessages } from './tellrawMessages'
 
 export class Globals {
 	static exportData: ExportData

exporters/datapackExporter/exporter/datapackGen/namespaceFolderGen.ts

@@ -165,8 +165,7 @@ export function generateNamespaceFolder() {
 	summonTags.add(new NbtString(G.TAGS.rootEntity))
 	summonNbt.set('Tags', summonTags)
 
-	const variantSummonFolder = namespaceFolder
-		.accessFolder('functions')
+	const variantSummonFolder = functionsFolder
 		// ANCHOR - function NAMESPACE:summon
 		.chainNewFile('summon.mcfunction', [
 			`summon minecraft:item_display ~ ~ ~ ${summonNbt.toString()}`,

exporters/datapackExporter/exporter/datapackGen/tellrawMessages.ts

@@ -1,4 +1,4 @@
-function loadTellrawMessages() {
+export function loadTellrawMessages() {
 	const { JsonText } = AnimatedJava.API
 
 	const errorMustBeRunAsRoot = new JsonText([

src/util/virtualFileSystem.ts

@@ -164,13 +164,15 @@ export class VirtualFolder extends VirtualNode {
 		const parts = path.split('/')
 		const name = parts[0]
 		const child = this.children.find(
-			child => child instanceof VirtualFile && child.fileName === name
+			child =>
+				(child instanceof VirtualFile && child.fileName === name) ||
+				(child instanceof VirtualFolder && child.name === name)
 		)
+		if (!child) throw new Error(`No child named ${name} in ${this.path}`)
+		if (child instanceof VirtualFolder) return child.accessFile(parts.slice(1).join('/'))
 		if (!(child instanceof VirtualFile))
 			throw new Error(`No file named ${name} in ${this.path}`)
-		if (!child) throw new Error(`No child named ${name} in ${this.path}`)
 		if (parts.length === 1) return child
-		if (child instanceof VirtualFolder) return child.accessFile(parts.slice(1).join('/'))
 		throw new Error(`Cannot access child of file ${this.path}/${name}`)
 	}