✨ Add support for custom namespaces

Author: SnaveSutit

eslint.config.ts

@@ -67,12 +67,12 @@ const CUSTOM_RULES: ConfigWithExtends['rules'] = {
 			selector: ['import'],
 			modifiers: ['default'],
 			filter: {
-				regex: '(old_)?v[\\d_]+(_pre\\d+)?$',
+				regex: '(old_)?v[\\d_]+(_pre\\d+|_beta_\\d+)?$',
 				match: true,
 			},
 			custom: {
 				match: true,
-				regex: '(old_)?v[\\d_]+(_pre\\d+)?$',
+				regex: '(old_)?v[\\d_]+(_pre\\d+|_beta_\\d+)?$',
 			},
 			format: null,
 		},

package.json

@@ -4,7 +4,7 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
-	"version": "1.10.0-beta.3",
+	"version": "1.10.0-beta.4",
 	"min_blockbench_version": "4.12.6",
 	"max_blockbench_version": "4.12.6",
 	"variant": "desktop",

src/formats/ajmodel/index.ts

@@ -5,7 +5,7 @@ import { openUnexpectedErrorDialog } from '../../dialogs/unexpectedError/unexpec
 import { localize as translate } from '../../util/lang'
 import { sanitizeStorageKey } from '../../util/minecraftUtil'
 import { BLUEPRINT_CODEC } from '../blueprint/codec'
-import * as modelDatFixerUpper from '../blueprint/dfu'
+import { upgradeAnimatedJavaBlueprint } from '../blueprint/dfu'
 import FormatPage from './formatPage.svelte'
 
 // Blockbench has a bug where it calls the onStart function multiple times when double-clicking it.
@@ -26,7 +26,7 @@ export async function openAJModel() {
 export function convertAJModelToBlueprint(path: string) {
 	try {
 		console.log(`Converting .ajmodel: ${path}`)
-		const blueprint = modelDatFixerUpper.process(JSON.parse(fs.readFileSync(path, 'utf8')))
+		const blueprint = upgradeAnimatedJavaBlueprint(JSON.parse(fs.readFileSync(path, 'utf8')))
 
 		const codec = BLUEPRINT_CODEC.get()
 		if (!codec) throw new Error('Animated Java Blueprint codec is not registered!')
@@ -35,7 +35,8 @@ export function convertAJModelToBlueprint(path: string) {
 			name: 'Upgrade .ajmodel to Blueprint',
 			path,
 		})
-		blueprint.blueprint_settings!.export_namespace ??= sanitizeStorageKey(Project!.name)
+		blueprint.blueprint_settings!.blueprint_id ??=
+			'animated_java:' + sanitizeStorageKey(Project!.name)
 
 		requestAnimationFrame(() => {
 			Project!.save_path = ''

src/formats/blueprint/codec.ts

@@ -92,8 +92,8 @@ export const BLUEPRINT_CODEC = registerDeletableHandlerPatch({
 					}
 				}
 
-				Project.last_used_export_namespace =
-					model.meta?.last_used_export_namespace ?? Project.animated_java.export_namespace
+				Project.last_used_blueprint_id =
+					model.meta?.last_used_blueprint_id ?? Project.animated_java.blueprint_id
 
 				if (model.textures) {
 					for (const texture of model.textures) {
@@ -255,7 +255,7 @@ export const BLUEPRINT_CODEC = registerDeletableHandlerPatch({
 						uuid: Project.uuid,
 
 						save_location: Project.save_path,
-						last_used_export_namespace: Project.last_used_export_namespace,
+						last_used_blueprint_id: Project.last_used_blueprint_id,
 					},
 					resolution: {
 						width: Project.texture_width ?? 16,
@@ -393,7 +393,7 @@ export const BLUEPRINT_CODEC = registerDeletableHandlerPatch({
 					extensions: [this.extension!],
 					content: this.compile!(),
 					// eslint-disable-next-line @typescript-eslint/naming-convention
-					custom_writer: (content, path) => {
+					custom_writer: (content: string, path: string) => {
 						if (fs.existsSync(PathModule.dirname(path))) {
 							Project!.save_path = path
 							this.write!(content, path)

src/formats/blueprint/dfu.ts

@@ -14,7 +14,8 @@ import v1_0_0_pre1 from './versions/1.0.0-pre1'
 import v1_0_0_pre6 from './versions/1.0.0-pre6'
 import v1_0_0_pre7 from './versions/1.0.0-pre7'
 import v1_0_0_pre8 from './versions/1.0.0-pre8'
-import v1_10_0 from './versions/1.10.0'
+import v1_10_0_beta_1 from './versions/1.10.0-beta.1'
+import v1_10_0_beta_4 from './versions/1.10.0-beta.4'
 import v1_4_0 from './versions/1.4.0'
 import v1_6_3 from './versions/1.6.3'
 import v1_6_5 from './versions/1.6.5'
@@ -76,26 +77,28 @@ export function upgradeAnimatedJavaBlueprint(model: any): IBlueprintFormatJSON {
 
 		// Versions below this are post 0.3.10. I changed the versioning system to use the AJ version instead of a unique format version.
 		switch (true) {
-			case VersionUtil.compare('0.3.10', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '0.3.10'):
 				model = v0_3_10(model)
-			case VersionUtil.compare('0.5.0', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '0.5.0'):
 				model = v1_0_0_pre1(model)
-			case VersionUtil.compare('0.5.5', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '0.5.5'):
 				model = v1_0_0_pre6(model)
-			case VersionUtil.compare('0.5.6', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '0.5.6'):
 				model = v1_0_0_pre7(model)
-			case VersionUtil.compare('0.5.7', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '0.5.7'):
 				model = v1_0_0_pre8(model)
-			case VersionUtil.compare('1.4.0', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '1.4.0'):
 				model = v1_4_0(model)
-			case VersionUtil.compare('1.6.3', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '1.6.3'):
 				model = v1_6_3(model)
-			case VersionUtil.compare('1.6.5', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '1.6.5'):
 				model = v1_6_5(model)
-			case VersionUtil.compare('1.8.0', '>', model.meta.format_version):
+			case VersionUtil.compare(model.meta.format_version, '<', '1.8.0'):
 				model = v1_8_0(model)
-			case VersionUtil.compare('1.10.0', '>', model.meta.format_version):
-				model = v1_10_0(model)
+			case VersionUtil.compare(model.meta.format_version, '<', '1.10.0-beta.1'):
+				model = v1_10_0_beta_1(model)
+			case VersionUtil.compare(model.meta.format_version, '<', '1.10.0-beta.4'):
+				model = v1_10_0_beta_4(model)
 		}
 
 		// Remove unknown blueprint settings

src/formats/blueprint/index.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { ModelProject } from '@blockbench-types/generated/io/project'
 import { registerDeletableHandlerPatch } from 'blockbench-patch-manager'
 import { mount, unmount } from 'svelte'
@@ -21,7 +22,7 @@ import * as blueprintSettings from './settings'
 declare module '@blockbench-types/generated/io/project' {
 	export interface ModelProject {
 		animated_java: BlueprintSettings
-		last_used_export_namespace: string
+		last_used_blueprint_id: string
 		visualBoundingBox?: THREE.LineSegments
 		pluginMode: Observable<boolean>
 		transparentTexture: Texture
@@ -111,7 +112,7 @@ export interface IBlueprintFormatJSON {
 		format?: string
 		format_version?: string
 		uuid?: string
-		last_used_export_namespace?: string
+		last_used_blueprint_id?: string
 		box_uv?: boolean
 		backup?: boolean
 		save_location?: string
@@ -168,14 +169,15 @@ export function fixCubeRotation(cube: Cube) {
 export function convertToBlueprint() {
 	// Convert the current project to a Blueprint
 	Project!.save_path = ''
-	Project!.last_used_export_namespace = ''
+	Project!.last_used_blueprint_id = ''
 
 	for (const group of Group.all) {
 		group.createUniqueName(Group.all.filter(g => g !== group))
 		group.sanitizeName()
 	}
 
 	for (const animation of Blockbench.Animation.all) {
+		// @ts-expect-error - Broken BB types
 		animation.createUniqueName(Blockbench.Animation.all.filter(a => a !== animation))
 		animation.name = sanitizeStorageKey(animation.name)
 	}
@@ -291,7 +293,7 @@ export const BLUEPRINT_FORMAT = registerDeletableHandlerPatch({
 				const defaults = getDefaultProjectSettings()
 				if (newModel) {
 					project.animated_java = defaults
-					project.last_used_export_namespace = ''
+					project.last_used_blueprint_id = ''
 				} else {
 					project.animated_java = { ...defaults, ...project!.animated_java }
 				}
@@ -374,6 +376,7 @@ export const BLUEPRINT_FORMAT = registerDeletableHandlerPatch({
 		return format
 	},
 })
+// @ts-expect-error - Broken BB types
 Language.data['format_category.animated_java'] = translate('format_category.animated_java')
 
 export function activeProjectIsBlueprintFormat() {