🚧 Fix Blueprint Codec Failing to Load Textures

Also Fixed #192

Author: SnaveSutit

src/blueprintFormat.ts

@@ -187,9 +187,7 @@ export function updateBoundingBox() {
 	scene.add(Project.visualBoundingBox)
 }
 
-/**
- * The Animated Java Blueprint codec
- */
+// region Codec
 export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 	name: 'Animated Java Blueprint',
 	extension: 'ajblueprint',
@@ -254,8 +252,10 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 					)
 					if (fs.existsSync(resolvedPath)) {
 						newTexture.fromPath(resolvedPath)
+						continue
 					}
-				} else if (texture.path && fs.existsSync(texture.path) && !model.meta.backup) {
+				}
+				if (texture.path && fs.existsSync(texture.path) && !model.meta.backup) {
 					newTexture.fromPath(texture.path)
 				} else if (texture.source && texture.source.startsWith('data:')) {
 					newTexture.fromDataURL(texture.source)
@@ -495,9 +495,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 	},
 })
 
-/** ANCHOR
- * The Animated Java Blueprint format
- */
+// region Format
 export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
 	id: 'animated_java_blueprint',
 	name: 'Animated Java Blueprint',

src/interface/importAJModelLoader.ts

@@ -6,7 +6,8 @@ import { createModelLoader } from '../util/moddingTools'
 import { translate } from '../util/translation'
 import { openUnexpectedErrorDialog } from './unexpectedErrorDialog'
 import * as ModelDatFixerUpper from '../systems/modelDataFixerUpper'
-import { BLUEPRINT_CODEC } from '../blueprintFormat'
+import { BLUEPRINT_CODEC, IBlueprintFormatJSON } from '../blueprintFormat'
+import { toSafeFuntionName } from '../util/minecraftUtil'
 
 let activeComponent: SvelteComponentDev | null = null
 
@@ -43,12 +44,15 @@ createModelLoader(`${PACKAGE.name}-upgradeAJModelLoader`, {
 export function convertAJModelToBlueprint(path: string) {
 	try {
 		console.log(`Convert .ajmodel: ${path}`)
-		const blueprint = ModelDatFixerUpper.process(JSON.parse(fs.readFileSync(path, 'utf8')))
+		const blueprint = ModelDatFixerUpper.process(
+			JSON.parse(fs.readFileSync(path, 'utf8'))
+		) as IBlueprintFormatJSON
 
 		BLUEPRINT_CODEC.load(blueprint, {
 			name: 'Upgrade .ajmodel to Blueprint',
-			path: undefined,
+			path,
 		})
+		blueprint.project_settings!.export_namespace ??= toSafeFuntionName(Project!.name)
 
 		requestAnimationFrame(() => {
 			Project!.save_path = ''

src/systems/modelDataFixerUpper.ts

@@ -3,6 +3,7 @@ import { BoneConfig } from '../nodeConfigs'
 import { PACKAGE } from '../constants'
 import { openUnexpectedErrorDialog } from '../interface/unexpectedErrorDialog'
 import { NbtCompound, NbtList, NbtString, NbtTag } from 'deepslate'
+import { toSafeFuntionName } from '../util/minecraftUtil'
 
 export function process(model: any): any {
 	if (model.meta.model_format === 'animatedJava/ajmodel') {