🛠️ More MDFU Bugfixes

- Fixed pre1 upgrade setting format version to the current format version instead of `0.5.0`.
- Fixed `project_settings` being named `blueprint_settings` too early in the upgrade process.
- Fixed Variants using excludedBones internally still.

Author: SnaveSutit

package.json

@@ -2,8 +2,8 @@
 	"type": "module",
 	"name": "animated_java",
 	"title": "Animated Java",
-	"version": "0.5.6",
-	"display_version": "1.0.0-pre7",
+	"version": "0.5.7",
+	"display_version": "1.0.0-pre8",
 	"min_blockbench_version": "4.10.0",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",

src/interface/variantConfigDialog.ts

@@ -12,7 +12,7 @@ export function openVariantConfigDialog(variant: Variant) {
 	const uuid = new Valuable(variant.uuid)
 	const textureMap = variant.textureMap.copy()
 	const generateNameFromDisplayName = new Valuable(variant.generateNameFromDisplayName)
-	const excludedBones = new Valuable(variant.excludedBones)
+	const excludedBones = new Valuable(variant.excludedNodes)
 
 	new SvelteDialog({
 		id: `${PACKAGE.name}:variantConfig`,
@@ -35,7 +35,7 @@ export function openVariantConfigDialog(variant: Variant) {
 			variant.uuid = uuid.get()
 			variant.textureMap = textureMap
 			variant.generateNameFromDisplayName = generateNameFromDisplayName.get()
-			variant.excludedBones = excludedBones.get()
+			variant.excludedNodes = excludedBones.get()
 			events.UPDATE_VARIANT.dispatch(variant)
 			variant.select()
 		},

src/mods/variantPreviewCubeFaceMod.ts

@@ -15,7 +15,7 @@ createBlockbenchMod(
 				if (
 					variant &&
 					this.cube.parent instanceof Group &&
-					!variant.excludedBones.find(
+					!variant.excludedNodes.find(
 						v => v.value === (this.cube.parent as Group).uuid
 					) &&
 					variant.textureMap.has(this.texture)

src/systems/modelDataFixerUpper.ts

@@ -208,11 +208,11 @@ function updateModelTo1_0pre1(model: any) {
 	const blueprint: IBlueprintFormatJSON = {
 		meta: {
 			format: 'animated_java_blueprint',
-			format_version: PACKAGE.version,
+			format_version: '0.5.0',
 			uuid: model.meta.uuid || guid(),
 			last_used_export_namespace: model.animated_java.settings.project_namespace,
 		},
-		blueprint_settings: {
+		project_settings: {
 			// Blueprint Settings
 			show_bounding_box: defaultSettings.show_bounding_box,
 			auto_bounding_box: defaultSettings.auto_bounding_box,
@@ -380,13 +380,13 @@ function updateModelTo1_0pre1(model: any) {
 	// Move command keyframes into commands channel on a "root" locator.
 	if (blueprint.animations) {
 		for (const animation of blueprint.animations) {
-			if (animation.animators.effects) {
+			if (animation.animators?.effects) {
 				for (const kf of animation.animators.effects.keyframes) {
 					if (kf.channel === 'variants') kf.channel = 'variant'
 				}
 			}
 			const keyframes: any[] = []
-			const effects = animation.animators.effects
+			const effects = animation.animators?.effects
 			if (!effects || !effects.keyframes) continue
 			for (const keyframe of effects.keyframes) {
 				if (
@@ -439,10 +439,10 @@ function updateModelTo1_0pre1(model: any) {
 		nbt.delete('Tags')
 		if ([...nbt.keys()].length !== 0) commands.push('data merge entity @s ' + nbt.toString())
 		if (tags) commands.push(...tags.map(t => `tag @s add ${t}`))
-		blueprint.blueprint_settings!.summon_commands = commands.join('\n')
+		// @ts-expect-error
+		blueprint.project_settings!.summon_commands = commands.join('\n')
 	}
 
-	console.log('Finished Blueprint:', blueprint)
 	return blueprint
 }
 

src/systems/rigRenderer.ts

@@ -561,7 +561,7 @@ function renderVariantModels(variant: Variant, rig: IRenderedRig) {
 
 	for (const [uuid, bone] of Object.entries(rig.nodeMap)) {
 		if (bone.type !== 'bone') continue
-		if (variant.excludedBones.find(v => v.value === uuid)) continue
+		if (variant.excludedNodes.find(v => v.value === uuid)) continue
 		const textures: IRenderedModel['textures'] = {}
 
 		for (const [fromUUID, toUUID] of variant.textureMap.map.entries()) {

src/variants.ts

@@ -92,7 +92,7 @@ export class Variant {
 	public textureMap: TextureMap
 	public isDefault = false
 	public generateNameFromDisplayName = true
-	public excludedBones: CollectionItem[] = []
+	public excludedNodes: CollectionItem[] = []
 
 	constructor(displayName: string, isDefault = false) {
 		this.displayName = Variant.makeDisplayNameUnique(this, displayName)
@@ -140,7 +140,7 @@ export class Variant {
 			name: this.name,
 			uuid: this.uuid,
 			texture_map: Object.fromEntries(this.textureMap.map),
-			excluded_nodes: this.excludedBones.map(item => item.value),
+			excluded_nodes: this.excludedNodes.map(item => item.value),
 		}
 	}
 
@@ -150,7 +150,7 @@ export class Variant {
 		variant.isDefault = false
 		variant.generateNameFromDisplayName = this.generateNameFromDisplayName
 		variant.textureMap = this.textureMap.copy()
-		variant.excludedBones = this.excludedBones.map(item => ({ ...item }))
+		variant.excludedNodes = this.excludedNodes.map(item => ({ ...item }))
 		variant.select()
 	}
 
@@ -160,7 +160,7 @@ export class Variant {
 		for (const [key, value] of Object.entries(json.texture_map)) {
 			variant.textureMap.add(key, value)
 		}
-		variant.excludedBones = json.excluded_nodes
+		variant.excludedNodes = json.excluded_nodes
 			.map(uuid => {
 				const group = Group.all.find(group => group.uuid === uuid)
 				return group ? { name: group.name, value: uuid } : undefined