🚧 v1.0.0-pre7

- Renamed blueprint format's `project_settings` -> `blueprint_settings`.
- Fixed invalid `blueprint_settings` reference before upgrading.

Author: SnaveSutit

package.json

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

src/blueprintFormat.ts

@@ -115,7 +115,7 @@ export interface IBlueprintFormatJSON {
 	/**
 	 * The project settings of the Blueprint
 	 */
-	project_settings?: NonNullable<typeof Project>['animated_java']
+	blueprint_settings?: NonNullable<typeof Project>['animated_java']
 	/**
 	 * The variants of the Blueprint
 	 */
@@ -237,8 +237,8 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 			ModelProject.properties[key].merge(Project, model)
 		}
 
-		if (model.project_settings) {
-			Project.animated_java = { ...Project.animated_java, ...model.project_settings }
+		if (model.blueprint_settings) {
+			Project.animated_java = { ...Project.animated_java, ...model.blueprint_settings }
 		}
 
 		Project.last_used_export_namespace =
@@ -383,7 +383,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 				save_location: Project.save_path,
 				last_used_export_namespace: Project.last_used_export_namespace,
 			},
-			project_settings: Project.animated_java,
+			blueprint_settings: Project.animated_java,
 			resolution: {
 				width: Project.texture_width || 16,
 				height: Project.texture_height || 16,

src/interface/importAJModelLoader.ts

@@ -52,7 +52,7 @@ export function convertAJModelToBlueprint(path: string) {
 			name: 'Upgrade .ajmodel to Blueprint',
 			path,
 		})
-		blueprint.project_settings!.export_namespace ??= toSafeFuntionName(Project!.name)
+		blueprint.blueprint_settings!.export_namespace ??= toSafeFuntionName(Project!.name)
 
 		requestAnimationFrame(() => {
 			Project!.save_path = ''

src/systems/modelDataFixerUpper.ts

@@ -41,6 +41,8 @@ export function process(model: any): any {
 		if (compareVersions('0.5.5', model.meta.format_version)) model = updateModelTo1_0pre6(model)
 		// v1.0.0-pre7
 		if (compareVersions('0.5.6', model.meta.format_version)) model = updateModelTo1_0pre7(model)
+		// v1.0.0-pre8
+		if (compareVersions('0.5.7', model.meta.format_version)) model = updateModelTo1_0pre8(model)
 
 		console.groupEnd()
 
@@ -210,7 +212,7 @@ function updateModelTo1_0pre1(model: any) {
 			uuid: model.meta.uuid || guid(),
 			last_used_export_namespace: model.animated_java.settings.project_namespace,
 		},
-		project_settings: {
+		blueprint_settings: {
 			// Blueprint Settings
 			show_bounding_box: defaultSettings.show_bounding_box,
 			auto_bounding_box: defaultSettings.auto_bounding_box,
@@ -437,7 +439,7 @@ 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.project_settings!.summon_commands = commands.join('\n')
+		blueprint.blueprint_settings!.summon_commands = commands.join('\n')
 	}
 
 	console.log('Finished Blueprint:', blueprint)
@@ -477,19 +479,32 @@ function updateModelTo1_0pre6(model: any): IBlueprintFormatJSON {
 function updateModelTo1_0pre7(model: any): IBlueprintFormatJSON {
 	console.log('Processing model format 1.0.0-pre7', JSON.parse(JSON.stringify(model)))
 
-	if (model.blueprint_settings.enable_resource_pack !== undefined) {
-		model.blueprint_settings.resource_pack_export_mode = model.blueprint_settings
+	if (model.project_settings.enable_resource_pack !== undefined) {
+		model.project_settings.resource_pack_export_mode = model.project_settings
 			.enable_resource_pack
 			? 'raw'
 			: 'none'
-		delete model.blueprint_settings.enable_resource_pack
+		delete model.project_settings.enable_resource_pack
 	}
 
-	if (model.blueprint_settings.enable_data_pack !== undefined) {
-		model.blueprint_settings.data_pack_export_mode = model.blueprint_settings.enable_data_pack
+	if (model.project_settings.enable_data_pack !== undefined) {
+		model.project_settings.data_pack_export_mode = model.project_settings.enable_data_pack
 			? 'raw'
 			: 'none'
-		delete model.blueprint_settings.enable_data_pack
+		delete model.project_settings.enable_data_pack
+	}
+
+	return model as IBlueprintFormatJSON
+}
+
+// region v1.0.0-pre8
+// eslint-disable-next-line @typescript-eslint/naming-convention
+function updateModelTo1_0pre8(model: any): IBlueprintFormatJSON {
+	console.log('Processing model format 1.0.0-pre8', JSON.parse(JSON.stringify(model)))
+
+	if (model.project_settings) {
+		model.blueprint_settings = model.project_settings
+		delete model.project_settings
 	}
 
 	return model as IBlueprintFormatJSON

test_blueprints/armor_stand.ajblueprint

@@ -1,12 +1,12 @@
 {
 	"meta": {
 		"format": "animated_java_blueprint",
-		"format_version": "0.5.5",
+		"format_version": "0.5.6",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\animated-java\\test_blueprints\\armor_stand.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
 	},
-	"project_settings": {
+	"blueprint_settings": {
 		"export_namespace": "armor_stand",
 		"show_bounding_box": false,
 		"auto_bounding_box": true,
@@ -29,8 +29,6 @@
 		"use_storage_for_animation": false,
 		"baked_animations": false,
 		"json_file": "D:\\github-repos\\animated-java\\animated-java\\dist\\test.json",
-		"enable_resource_pack": true,
-		"enable_data_pack": true,
 		"custom_summon_commands": ""
 	},
 	"resolution": {
@@ -3881,7 +3879,7 @@
 			"override": false,
 			"length": 4.95,
 			"snapping": 20,
-			"selected": true,
+			"selected": false,
 			"saved": false,
 			"path": "",
 			"anim_time_update": "",