Smartened up model path resolution. Should work in 99.9% of all cases now

Author: SnaveSutit

src/exporting.js

@@ -4,6 +4,7 @@ import { settings } from './settings'
 import { mkdir } from './util/ezfs'
 import { CustomError } from './util/customError'
 import { tl } from './util/intl'
+import { getModelPath } from './util/minecraft/resourcepack'
 // import { safeFunctionName } from './util'
 import transparent from './assets/transparent.png'
 
@@ -131,13 +132,6 @@ async function exportRigModels(models, variantModels) {
 
 	console.groupEnd('Export Rig Models')
 }
-function getMCPath(raw) {
-	let list = raw.split(path.sep)
-	console.log(list)
-	const index = list.indexOf('assets')
-	list = list.slice(index + 1, list.length)
-	return `${list[0]}:${list.slice(2).join('/')}`
-}
 
 async function exportPredicate(models, variantModels, ajSettings) {
 	console.groupCollapsed('Export Predicate Model')
@@ -150,20 +144,18 @@ async function exportPredicate(models, variantModels, ajSettings) {
 		overrides: [],
 	}
 
-	const modelPath = getMCPath(ajSettings.rigModelsExportFolder)
-	console.log(modelPath)
 	for (const [modelName, model] of Object.entries(models)) {
 		predicateJSON.overrides.push({
 			predicate: { custom_model_data: model.aj.customModelData },
-			model: modelPath + '/' + modelName,
+			model: getModelPath(path.join(ajSettings.rigModelsExportFolder, modelName)),
 		})
 	}
 
 	for (const [variantName, variant] of Object.entries(variantModels))
 		for (const [modelName, model] of Object.entries(variant)) {
 			predicateJSON.overrides.push({
 				predicate: { custom_model_data: model.aj.customModelData },
-				model: [modelPath, variantName, `${modelName}`].join('/'),
+				model: getModelPath(path.join(modelPath, variantName, modelName), modelName),
 			})
 		}
 

src/lang/en.yaml

@@ -74,6 +74,12 @@ animatedJava.popup.error.unableToGenerateTexturePath.body: |-
     Please make sure it is properly saved inside of a valid Resource Pack in a sub folder of 'assets/namespace/textures/'
     eg. 'resources/assets/minecraft/textures/item/diamond.png'
 
+animatedJava.popup.error.unableToGenerateModelPath.title: Invalid texture path
+animatedJava.popup.error.unableToGenerateModelPath.body: |-
+    The model '%modelName' has an invalid location inside a Resource Pack
+    Please make sure it is properly saved inside of a valid Resource Pack in a sub folder of 'assets/namespace/models/'
+    eg. 'resources/assets/minecraft/models/item/diamond.json'
+
 animatedJava.popup.error.invalidCubeRotations.title: Invalid Element Rotations
 animatedJava.popup.error.invalidCubeRotations.body: |-
     The rotations of some cubes are invalid for the java model format.

src/util/minecraft/resourcepack.ts

@@ -32,7 +32,8 @@ export function getTexturePath(texture: any) {
 				const textureIndex = relative.indexOf('textures') // Locate 'texture' in the path
 				if (textureIndex > -1) {
 					relative.splice(textureIndex, 1) // Remove 'texture' from the path
-					return `${namespace}:${relative.join('/')}` // Generate texture path
+					console.log('Texture Path', `${namespace}:${path.join(...relative)}`)
+					return `${namespace}:${path.join(...relative)}` // Generate texture path
 				}
 			}
 		}
@@ -54,3 +55,40 @@ export function getTexturePath(texture: any) {
 		},
 	})
 }
+
+export function getModelPath(modelPath: string, modelName: string) {
+	console.log(modelPath)
+	const parts = modelPath.split(path.sep)
+	const assetsIndex = parts.indexOf('assets')
+	if (assetsIndex) {
+		const relative = parts.slice(assetsIndex + 1) // Remove 'assets' and everything before it from the path
+		const namespace = relative.shift() // Remove the namespace from the path and store it
+		if (namespace && relative.length) {
+			relative.push(relative.pop().replace(/.png$/, '')) // Remove file type (.png)
+			if (relative) {
+				const modelsIndex = relative.indexOf('models') // Locate 'texture' in the path
+				if (modelsIndex > -1) {
+					relative.splice(modelsIndex, 1) // Remove 'texture' from the path
+					console.log('Model Path', `${namespace}:${path.join(...relative)}`)
+					return `${namespace}:${path.join(...relative)}` // Generate texture path
+				}
+			}
+		}
+	}
+	throw new CustomError('Unable to generate model path', {
+		dialog: {
+			title: tl(
+				'animatedJava.popup.error.unableToGenerateModelPath.title'
+			),
+			lines: format(
+				tl('animatedJava.popup.error.unableToGenerateModelPath.body'),
+				{
+					modelName
+				}
+			)
+				.split('\n')
+				.map((line: string) => `<p>${line}</p>`),
+			width: 512,
+		},
+	})
+}