Data Pack Exporter fixes

Author: SnaveSutit

exporters/datapackExporter/exporter/datapackGen/animatedJavaFolderGen.ts

@@ -1,4 +1,3 @@
-import { type ExportData } from '../datapackGen'
 import { loadAnimationTreeGenerator } from './animationTreeGen'
 import { Globals as G } from './globals'
 
@@ -50,7 +49,6 @@ export function generateAnimatedJavaFolder() {
 			G.OUTDATED_RIG_WARNING_ENABLED
 				? `execute unless score @s ${G.SCOREBOARD.exportVersion} = ${G.SCOREBOARD.exportVersion} ${G.SCOREBOARD.i} at @s run function ${G.AJ_NAMESPACE}:upgrade_rig`
 				: undefined,
-			`function #${G.NAMESPACE}:on_load`,
 		])
 		// ANCHOR - func AJ_NAMESPACE:tick
 		.chainNewFile('tick.mcfunction', [

exporters/datapackExporter/exporter/datapackGen/globals.ts

@@ -41,7 +41,7 @@ export class Globals {
 			Object.keys(rig.nodeMap).length === 1 && renderedAnimations.length === 0
 		Globals.DEFAULT_INTERPOLATION_DURATION = exporterSettings.interpolation_duration.value
 
-		Globals.DATAPACK = new VirtualFileSystem.VirtualFolder(Globals.NAMESPACE)
+		Globals.DATAPACK = new VirtualFileSystem.VirtualFolder('virtual_datapack')
 		Globals.DATA_FOLDER = Globals.DATAPACK.newFolder('data')
 		Globals.MINECRAFT_FOLDER = Globals.DATA_FOLDER.newFolder('minecraft')
 

src/exporter/resourcePackExporter.ts

@@ -72,7 +72,23 @@ export async function exportResources(
 			rigs: {},
 		},
 	}
-	const predicateItemFile = minecraftFolder.newFile(`${rigItemName}.json`, content)
+	const predicateItemFile = minecraftFolder.newFile(
+		`${rigItemName}.json`,
+		content,
+		// TODO
+		(oldContent, newContent) => {
+			console.log('Merging predicate file...', oldContent, newContent)
+			if (!oldContent.animated_java) {
+				showPredicateFileOverwriteConfirmation(predicateItemFilePath)
+				oldContent.animated_java = {
+					rigs: {
+						[projectNamespace]: { used_ids: [] },
+					},
+				}
+			}
+			return newContent as unknown
+		}
+	)
 	let successfullyReadPredicateItemFile = false
 	if (fs.existsSync(predicateItemFilePath)) {
 		const stringContent = await fs.promises.readFile(predicateItemFilePath, 'utf8')

src/projectSettings.ts

@@ -428,8 +428,15 @@ export const projectSettingStructure: GUIStructure = [
 		],
 	},
 	{
-		type: 'setting',
-		settingId: _.exporter.id,
+		type: 'group',
+		title: translate('animated_java.project_settings.exporter_group'),
+		openByDefault: true,
+		children: [
+			{
+				type: 'setting',
+				settingId: _.exporter.id,
+			},
+		],
 	},
 ]
 

src/rendering/animationRenderer.ts

@@ -16,7 +16,10 @@ export function restoreSceneAngle() {
 function getNodeMatrix(node: OutlinerElement, scale: number) {
 	const matrixWorld = node.mesh.matrixWorld.clone()
 	matrixWorld.setPosition(
-		new THREE.Vector3().setFromMatrixPosition(matrixWorld).multiplyScalar(1 / 16)
+		new THREE.Vector3()
+			.setFromMatrixPosition(matrixWorld)
+			.multiplyScalar(1 / 16)
+			.multiply(new THREE.Vector3(-1, 1, -1))
 	)
 	matrixWorld.scale(new THREE.Vector3().setScalar(scale))
 	return matrixWorld
@@ -34,24 +37,26 @@ export interface IAnimationNode {
 	interpolation?: 'instant' | 'default'
 }
 
+export interface IRenderedFrame {
+	time: number
+	nodes: IAnimationNode[]
+	variant?: {
+		uuid: string
+		executeCondition: string
+	}
+	commands?: {
+		commands: string
+		executeCondition: string
+	}
+	animationState?: {
+		animation: string
+		executeCondition: string
+	}
+}
+
 export interface IRenderedAnimation {
 	name: string
-	frames: Array<{
-		time: number
-		nodes: IAnimationNode[]
-		variant?: {
-			uuid: string
-			executeCondition: string
-		}
-		commands?: {
-			commands: string
-			executeCondition: string
-		}
-		animationState?: {
-			animation: string
-			executeCondition: string
-		}
-	}>
+	frames: IRenderedFrame[]
 	/**
 	 * Duration of the animation in ticks (AKA frames). Same as animation.frames.length
 	 */
@@ -111,7 +116,7 @@ export function getAnimationNodes(
 					const parentRotation = new THREE.Quaternion().setFromRotationMatrix(
 						parentMatrix
 					)
-					console.log(matrix, parentRotation)
+					// console.log(matrix, parentRotation)
 					matrix.makeRotationFromQuaternion(parentRotation)
 				}
 				break

src/rendering/modelRenderer.ts

@@ -199,7 +199,6 @@ function renderCube(cube: Cube, rig: IRenderedRig, model: IRenderedModel) {
 				rescale: true,
 			}
 	}
-	console.log(cube.rotation, element)
 
 	if (cube.parent instanceof Group) {
 		const parent = cube.parent