🔨 1.0.0-Pre3 Fixes

- Removed a bunch of unneeded console.logs.
- Fixed blueprint codec crashing if attempting to save the project to a folder that doesn't exist.
- Fixed a bunch of issues where the code incorrectly assumed default configs for bones and display entities exsisted.

Author: SnaveSutit

package.json

@@ -2,8 +2,8 @@
 	"type": "module",
 	"name": "animated_java",
 	"title": "Animated Java",
-	"version": "0.5.0",
-	"display_version": "1.0.0-pre1",
+	"version": "0.5.2",
+	"display_version": "1.0.0-pre3",
 	"min_blockbench_version": "4.10.0",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",

src/blueprintFormat.ts

@@ -9,6 +9,7 @@ import { addProjectToRecentProjects } from './util/misc'
 import { Valuable } from './util/stores'
 import { TRANSPARENT_TEXTURE, TRANSPARENT_TEXTURE_MATERIAL, Variant } from './variants'
 import FormatPageSvelte from './components/formatPage.svelte'
+import { translate } from './util/translation'
 
 /**
  * The serialized Variant Bone Config
@@ -283,8 +284,6 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 							newElement.faces[face].texture = defaultTexture.uuid
 						}
 					}
-				} else if (newElement instanceof AnimatedJava.API.TextDisplay) {
-					console.log('TextDisplay', newElement)
 				}
 			}
 		}
@@ -471,8 +470,18 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 			content: BLUEPRINT_CODEC.compile(),
 			// eslint-disable-next-line @typescript-eslint/naming-convention
 			custom_writer: (content, path) => {
-				Project!.save_path = path
-				BLUEPRINT_CODEC.write(content, path)
+				if (fs.existsSync(PathModule.dirname(path))) {
+					Project!.save_path = path
+					BLUEPRINT_CODEC.write(content, path)
+				} else {
+					console.error(
+						`Failed to export Animated Java Blueprint, file location '${path}' does not exist!`
+					)
+					Blockbench.showMessageBox({
+						title: translate('error.blueprint_export_path_doesnt_exist.title'),
+						message: translate('error.blueprint_export_path_doesnt_exist', path),
+					})
+				}
 			},
 		})
 	},
@@ -500,7 +509,6 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
 		component: {
 			methods: {},
 			created() {
-				// if (formatPage)
 				void injectSvelteCompomponent({
 					elementSelector: () => $('#format_page_animated_java_blueprint_mount')[0],
 					svelteComponent: FormatPageSvelte,
@@ -643,7 +651,6 @@ events.SELECT_AJ_PROJECT.subscribe(() => {
 	})
 })
 events.UNSELECT_AJ_PROJECT.subscribe(project => {
-	console.log('Unselecting Animated Java Project', project)
 	if (project.visualBoundingBox) scene.remove(project.visualBoundingBox)
 	disableRotationLock()
 })

src/interface/boneConfigDialog.ts

@@ -20,7 +20,6 @@ function propagateInheritanceUp(group: Group, config: BoneConfig, variant?: stri
 			if (parentConfig.inherit_settings) {
 				propagateInheritanceUp(group.parent, parentBoneConfig, variant)
 			}
-			console.log('Inheriting from', group.parent.name, parentConfig)
 			config.inheritFrom(parentBoneConfig)
 			if (variant) group.configs.variants[variant] = config.toJSON()
 			else group.configs.default = config.toJSON()
@@ -34,7 +33,6 @@ function propagateInheritanceDown(group: Group, config: BoneConfig, variant?: st
 		const childConfig = variant ? child.configs.variants[variant] : child.configs.default
 		if (childConfig && childConfig.inherit_settings) {
 			const childBoneConfig = BoneConfig.fromJSON(childConfig)
-			console.log('Inheriting to', child.name, childBoneConfig)
 			childBoneConfig.inheritFrom(config)
 			if (variant) child.configs.variants[variant] = childBoneConfig.toJSON()
 			else child.configs.default = childBoneConfig.toJSON()

src/interface/exportProgressDialog.ts

@@ -9,7 +9,6 @@ export const MAX_PROGRESS = new Valuable(1)
 export const PROGRESS_DESCRIPTION = new Valuable('')
 
 export function openExportProgressDialog(debug?: boolean) {
-	const originalLog = console.log
 	PROGRESS.set(0)
 	MAX_PROGRESS.set(1)
 	PROGRESS_DESCRIPTION.set('Preparing...')
@@ -37,9 +36,6 @@ export function openExportProgressDialog(debug?: boolean) {
 		},
 		preventKeybinds: true,
 		buttons: [],
-		onClose: () => {
-			console.log = originalLog
-		},
 	}).show()
 	return dialog
 }

src/interface/importAJModelLoader.ts

@@ -42,7 +42,7 @@ createModelLoader(`${PACKAGE.name}-upgradeAJModelLoader`, {
 
 export function convertAJModelToBlueprint(path: string) {
 	try {
-		console.log(`Convert Old .ajmodel: ${path}`)
+		console.log(`Convert .ajmodel: ${path}`)
 		const blueprint = ModelDatFixerUpper.process(JSON.parse(fs.readFileSync(path, 'utf8')))
 
 		BLUEPRINT_CODEC.load(blueprint, {

src/lang/en.yml

@@ -395,3 +395,9 @@ animated_java.format_category.animated_java: Animated Java
 
 # Model Manager Warnings
 animated_java.block_model_manager.mob_head_warning: Mob Heads are don't render in Block Displays. Use an Item Display instead.
+
+# Project Errors
+animated_java.error.blueprint_export_path_doesnt_exist.title: Blueprint Export Path Doesn't Exist
+animated_java.error.blueprint_export_path_doesnt_exist.description: |-
+    The export path '{0}' does not exist!
+    Make sure the folder you're saving to exists and try again.

src/mods/exportOverActionMod.ts

@@ -13,13 +13,9 @@ createBlockbenchMod(
 			if (!Project || !Format) return
 			if (Format.id === BLUEPRINT_FORMAT.id) {
 				if (Project.save_path || Project.export_path) {
-					BLUEPRINT_CODEC.write(
-						BLUEPRINT_CODEC.compile(),
-						Project.save_path || Project.export_path
-					)
-				} else {
-					BLUEPRINT_CODEC.export()
+					Project.save_path = Project.save_path || Project.export_path
 				}
+				BLUEPRINT_CODEC.export()
 			} else {
 				context.originalClick.call(context.action, event)
 			}

src/outliner/resizableOutlinerElement.ts

@@ -94,7 +94,6 @@ export class ResizableOutlinerElement extends OutlinerElement {
 		// bidirectional: boolean
 	) {
 		let before = this.oldScale !== undefined ? this.oldScale : this.size(axis)
-		console.log(before, this.oldScale)
 		if (before instanceof Array) before = before[axis]
 		// For some unknown reason scale is not inverted on the y axis
 		const sign = before < 0 && axis !== 1 ? -1 : 1

src/outliner/textDisplay.ts

@@ -499,14 +499,12 @@ createBlockbenchMod(
 		context.subscriptions.push(
 			events.SELECT_PROJECT.subscribe(project => {
 				if (project.format.id !== BLUEPRINT_FORMAT.id) return
-				console.log('SELECT_PROJECT')
 				project.textDisplays ??= []
 				TextDisplay.all.empty()
 				TextDisplay.all.push(...project.textDisplays)
 			}),
 			events.UNSELECT_PROJECT.subscribe(project => {
 				if (project.format.id !== BLUEPRINT_FORMAT.id) return
-				console.log('UNSELECT_PROJECT')
 				project.textDisplays = [...TextDisplay.all]
 				TextDisplay.all.empty()
 			})

src/systems/animated_java.mcb

@@ -162,7 +162,7 @@ dir <%export_namespace%> {
 					function *<%export_namespace%>/animations/<%animation.name%>/zzz/on_tick
 			}
 			REPEAT (Object.values(rig.nodeMap).filter(v => v.type === 'locator')) as node {
-				IF (node.config.use_entity) {
+				IF (node.config?.use_entity) {
 					execute on passengers if entity @s[tag=<%TAGS.PROJECT_DATA(export_namespace)%>] run { with entity @s data.positions.locators.<%node.name%>
 						$execute as $(uuid) positioned ^$(posx) ^$(posy) ^$(posz) rotated ~$(roty) ~$(rotx) run {
 							tp @s ~ ~ ~ ~ ~
@@ -582,11 +582,11 @@ dir <%export_namespace%> {
 						execute on passengers if entity @s[tag=aj.<%export_namespace%>.bone.<%node.name%>] run {
 							data modify entity @s item.components.minecraft:custom_model_data set value <%node.customModelData%>
 							<%%
-								global.config = BoneConfig.fromJSON(node.configs.default)
+								if (node.configs.default) {
+									global.config = BoneConfig.fromJSON(node.configs.default)
+									emit.mcb(`data merge entity @s <%global.config.toNBT(undefined, true)%>`)
+								}
 							%%>
-							IF (!global.config.isDefault()) {
-								data merge entity @s <%global.config.toNBT(undefined, true)%>
-							}
 						}
 					}
 				}