Squashed commit of the following:

commit e3f1d2a
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Sat Jan 11 02:55:06 2025 -0500

    🛠️ Fix #356

commit f6c0713
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Fri Jan 10 21:35:13 2025 -0500

    🚧 v1.6.1

commit 779aa54
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Fri Jan 10 21:35:01 2025 -0500

    ✨ Changelog improvements

commit b166f91
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Fri Jan 10 21:14:25 2025 -0500

    🛠️ Fix overlays breaking custom function tags

commit 9328366
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Fri Jan 10 18:03:42 2025 -0500

    🛠️ Reduce complexity of storage-based variant functions

    3 commands to 1 command :)

commit b4ab4e6
Author: Chen <scnmed.g@gmail.com>
Date:   Fri Jan 10 07:14:33 2025 +0900

    ➕ Merge PR #354: Fix variant change in animation with “Use storage for animation”

    Fix #353

commit 544b88c
Merge: ddcea5a 55d0769
Author: Titus Evans <snavesutit@gmail.com>
Date:   Thu Jan 9 14:11:29 2025 -0800

    ➕ Merge pull request #351 from ChenCMD/next

    Fix Export with “Use Storage for Animation” enabled

commit 55d0769
Author: ChenCMD <scnmed.g@gmail.com>
Date:   Thu Jan 9 22:37:17 2025 +0900

    Fix Export `<export_namespace>/on_load.mcf` is corrupt with “Use Storage for Animation” enabled

    Fix #350

commit ddcea5a
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 13:33:09 2025 -0500

    🛠️ Add "has_changelog" to plugin packager

commit 2af409d
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 13:14:16 2025 -0500

    ❗ Forgot a changelog item

commit 3e2a0c2
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 13:11:09 2025 -0500

    🚧 v1.6.0

commit f54f807
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 11:52:58 2025 -0500

    🚧 Improved version handling

commit 02b1860
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 11:28:50 2025 -0500

    🚧 Version warning

    Added a warning when loading AJ data packs in versions they weren't exported for.

commit cc88b83
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Jan 8 10:48:27 2025 -0500

    🛠️ Fix transparent texture and missing tags

    - Fix incorrect export location for transparent texture.
    - Fix tags getting cleared out in old exports.

commit 271a0f6
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Tue Jan 7 14:28:24 2025 -0500

    🚧 Add extraction confirmation

commit 0070b9c
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 12:35:17 2024 -0500

    🛠️ Slightly improved empty JSON text rendering

    #322

commit 5781f3f
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:58:35 2024 -0500

    🛠️ Fix #342

commit 83acc4f
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:45:52 2024 -0500

    🛠️ Fix #340

commit 339345e
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:44:04 2024 -0500

    🛠️ Fix #343

commit 9912d7c
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:33:24 2024 -0500

    🛠️ Fix #341

commit e3129d1
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:30:49 2024 -0500

    🛠️ Fix #345

commit 99446a5
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:14:42 2024 -0500

    🛠️ Fixed #347

commit 89369b1
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:06:52 2024 -0500

    🛠️ Fix #349

commit a7b1753
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Mon Dec 30 11:05:09 2024 -0500

    🛠️ Fix #348

commit 5d24c77
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Tue Dec 24 06:07:18 2024 -0500

    🚧 Add .mcb file compression.

commit d567389
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Tue Nov 26 17:52:04 2024 -0500

    Squashed commit of the following:

    commit 7aeec46
    Author: SnaveSutit <snavesutit@gmail.com>
    Date:   Thu Nov 21 14:14:15 2024 -0500

        🚧 1.21.4 Export

        - Added 1.21.4 target MC version.
        - Changed missing assets and data folder for resource and data pack folder settings errors into warnings.
        - Added an action to extract all of a blueprint's export files from a data pack / resource pack.
        - Added support for item definitions (1.21.4).
        - Changed default resource pack structure:
        `animated_java:textures/item/export_namespace/` -> `animated_java:textures/blueprint/export_namespace/`
        `animated_java:models/item/export_namespace/` -> `animated_java:models/blueprint/export_namespace/`

    commit efdc207
    Author: SnaveSutit <snavesutit@gmail.com>
    Date:   Sat Nov 16 11:18:07 2024 -0500

        🚧 Prevent exporting with invalid rotations.

        - Added a dialog and exception for exporting a blueprint with invalid cube rotations.

    commit fac53dc
    Author: SnaveSutit <snavesutit@gmail.com>
    Date:   Sat Nov 16 11:09:30 2024 -0500

        🚧 Enforce Per-Face UV when converting

    commit d285985
    Author: SnaveSutit <snavesutit@gmail.com>
    Date:   Sat Nov 2 17:37:32 2024 -0400

        🚧 Squashed v1.5.0, v1.5.1, and v1.5.2.

        commit bcbb6f8
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Sat Nov 2 17:33:16 2024 -0400

            🛠️ Fix broken asset download on first startup.

        commit 9a3b525
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Fri Nov 1 15:08:57 2024 -0400

            ✨ Improved tellraw messages

        commit d8dbdbd
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Wed Oct 30 17:53:35 2024 -0400

            Fix production build script issues.

        commit 2dce027
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Tue Oct 29 11:10:47 2024 -0400

            🛠️ Static Export Locator / Camera Fixes

            - Fixed use entity locators and cameras not summoning properly in static mode

        commit 66986b7
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Wed Oct 23 09:58:02 2024 -0400

            🚧 v1.5.1

        commit 357bfa2
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Wed Oct 23 09:57:52 2024 -0400

            🛠️ Fix broken passengers from summon tp command

    commit 7d95287
    Author: SnaveSutit <snavesutit@gmail.com>
    Date:   Wed Oct 23 09:58:29 2024 -0400

        🚧 Squashed v.1.5.1

        commit 66986b7
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Wed Oct 23 09:58:02 2024 -0400

            🚧 v1.5.1

        commit 357bfa2
        Author: SnaveSutit <snavesutit@gmail.com>
        Date:   Wed Oct 23 09:57:52 2024 -0400

            🛠️ Fix broken passengers from summon tp command

commit bd7c6b1
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Sat Nov 9 04:03:22 2024 -0500

    ✨ Add a toast notification for invalid cubes

commit bcbb6f8
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Sat Nov 2 17:33:16 2024 -0400

    🛠️ Fix broken asset download on first startup.

commit 9a3b525
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Fri Nov 1 15:08:57 2024 -0400

    ✨ Improved tellraw messages

commit d8dbdbd
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Oct 30 17:53:35 2024 -0400

    Fix production build script issues.

commit 2dce027
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Tue Oct 29 11:10:47 2024 -0400

    🛠️ Static Export Locator / Camera Fixes

    - Fixed use entity locators and cameras not summoning properly in static mode

commit 66986b7
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Oct 23 09:58:02 2024 -0400

    🚧 v1.5.1

commit 357bfa2
Author: SnaveSutit <snavesutit@gmail.com>
Date:   Wed Oct 23 09:57:52 2024 -0400

    🛠️ Fix broken passengers from summon tp command

Author: SnaveSutit

src/index.ts

@@ -24,10 +24,10 @@ import { TRANSPARENT_TEXTURE, Variant } from './variants'
 import './systems/minecraft/registryManager'
 import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
 import resourcepackCompiler from './systems/resourcepackCompiler'
-import { openExportProgressDialog } from './interface/dialog/exportProgress'
+import { openExportProgressDialog } from './interface/exportProgressDialog'
 import { isDataPackPath, isResourcePackPath, parseResourcePackPath } from './util/minecraftUtil'
 import { blueprintSettingErrors } from './blueprintSettings'
-import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
+import { openUnexpectedErrorDialog } from './interface/unexpectedErrorDialog'
 import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat'
 import { TextDisplay } from './outliner/textDisplay'
 import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
@@ -39,10 +39,11 @@ import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
 import { VanillaBlockDisplay, debugBlockState, debugBlocks } from './outliner/vanillaBlockDisplay'
 import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
 import { exportProject } from './systems/exporter'
-import { openInstallPopup } from './interface/popup/installed'
+import { openBlueprintLoadingDialog } from './interface/blueprintLoadingPopup'
+import { openInstallPopup } from './interface/installedPopup'
 import { cleanupExportedFiles } from './systems/cleaner'
 import mcbFiles from './systems/datapackCompiler/mcbFiles'
-import { openChangelogDialog } from './interface/dialog/changelog'
+import { openChangelogDialog } from './interface/changelogDialog'
 
 // @ts-ignore
 globalThis.AnimatedJava = {
@@ -72,6 +73,7 @@ globalThis.AnimatedJava = {
 		debugBlockState,
 		BLOCKSTATE_REGISTRY,
 		exportProject,
+		openBlueprintLoadingDialog,
 		openInstallPopup,
 		removeCubesAssociatedWithTexture(texture: Texture) {
 			const cubes = Cube.all.filter(cube =>

src/interface/animatedJavaBarItem.ts

@@ -5,9 +5,9 @@ import { cleanupExportedFiles } from '../systems/cleaner'
 import { exportProject } from '../systems/exporter'
 import { createAction, createBarMenu } from '../util/moddingTools'
 import { translate } from '../util/translation'
-import { openAboutDialog } from './dialog/about'
-import { openBlueprintSettingsDialog } from './dialog/blueprintSettings'
-import { openChangelogDialog } from './dialog/changelog'
+import { openAboutDialog } from './aboutDialog'
+import { openBlueprintSettingsDialog } from './blueprintSettingsDialog'
+import { openChangelogDialog } from './changelogDialog'
 
 function createIconImg() {
 	const IMG = document.createElement('img')

src/interface/changelogDialog.ts

@@ -0,0 +1,18 @@
+import ChangelogDialog from '../components/changelogDialog.svelte'
+import { PACKAGE } from '../constants'
+import { SvelteDialog } from '../util/svelteDialog'
+import { translate } from '../util/translation'
+
+export const DIALOG_ID = `${PACKAGE.name}:animationPropertiesDialog`
+
+export function openChangelogDialog() {
+	new SvelteDialog({
+		id: DIALOG_ID,
+		title: translate('dialog.changelog_dialog.title'),
+		width: 600,
+		component: ChangelogDialog,
+		props: {},
+		buttons: ['OK!'],
+		preventKeybinds: true,
+	}).show()
+}

src/outliner/textDisplay.ts

@@ -9,11 +9,14 @@ import { createAction, createBlockbenchMod } from '../util/moddingTools'
 import { getVanillaFont } from '../systems/minecraft/fontManager'
 import { JsonText } from '../systems/minecraft/jsonText'
 import { Valuable } from '../util/stores'
+import { toSafeFuntionName } from '../util/minecraftUtil'
 import { TextDisplayConfig } from '../nodeConfigs'
-import { TEXT_DISPLAY_CONFIG_ACTION } from '../interface/dialog/textDisplayConfig'
+import { TEXT_DISPLAY_CONFIG_ACTION } from '../interface/textDisplayConfigDialog'
 import { events } from '../util/events'
 import { translate } from '../util/translation'
 import { ResizableOutlinerElement } from './resizableOutlinerElement'
+import { VanillaBlockDisplay } from './vanillaBlockDisplay'
+import { VanillaItemDisplay } from './vanillaItemDisplay'
 import { sanitizeOutlinerElementName } from './util'
 
 interface TextDisplayOptions {
@@ -289,7 +292,7 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	async waitForReady() {
 		while (!this.ready) {
-			await new Promise(resolve => requestAnimationFrame(resolve))
+			await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
 		}
 	}
 

src/outliner/util.ts

@@ -5,15 +5,18 @@ import { VanillaItemDisplay } from './vanillaItemDisplay'
 
 export function sanitizeOutlinerElementName(name: string, elementUUID: string): string {
 	name = toSafeFuntionName(name)
-	const otherNodes: OutlinerElement[] = [
-		...VanillaBlockDisplay.all.filter(v => v.uuid !== elementUUID),
+	let otherNodes: OutlinerElement[] = [
+		...VanillaBlockDisplay.all,
 		...Group.all,
 		...TextDisplay.all,
 		...VanillaItemDisplay.all,
+		...Locator.all,
 	]
 	if (OutlinerElement.types.camera) {
 		otherNodes.push(...OutlinerElement.types.camera.all)
 	}
+	otherNodes = otherNodes.filter(v => v.uuid !== elementUUID)
+
 	const otherNames = new Set(otherNodes.map(v => v.name))
 
 	if (!otherNames.has(name)) {

src/outliner/vanillaBlockDisplay.ts

@@ -1,18 +1,20 @@
 import { IBlueprintBoneConfigJSON, isCurrentFormat } from '../blueprintFormat'
 import { PACKAGE } from '../constants'
-import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../interface/dialog/vanillaBlockDisplayConfig'
+import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../interface/vanillaBlockDisplayConfigDialog'
 import { BoneConfig } from '../nodeConfigs'
 import { getBlockModel } from '../systems/minecraft/blockModelManager'
 import { BlockStateValue, getBlockState } from '../systems/minecraft/blockstateManager'
 import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
 import { getCurrentVersion } from '../systems/minecraft/versionManager'
 import { events } from '../util/events'
-import { parseBlock } from '../util/minecraftUtil'
+import { parseBlock, toSafeFuntionName } from '../util/minecraftUtil'
 import { createAction, createBlockbenchMod } from '../util/moddingTools'
 import { Valuable } from '../util/stores'
 import { translate } from '../util/translation'
 import { ResizableOutlinerElement } from './resizableOutlinerElement'
+import { TextDisplay } from './textDisplay'
 import { sanitizeOutlinerElementName } from './util'
+import { VanillaItemDisplay } from './vanillaItemDisplay'
 
 const ERROR_OUTLINE_MATERIAL = Canvas.outlineMaterial.clone()
 ERROR_OUTLINE_MATERIAL.color.set('#ff0000')
@@ -110,7 +112,7 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 
 	async waitForReady() {
 		while (!this.ready) {
-			await new Promise(resolve => requestAnimationFrame(resolve))
+			await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
 		}
 	}
 

src/outliner/vanillaItemDisplay.ts

@@ -1,16 +1,19 @@
 import { IBlueprintBoneConfigJSON, isCurrentFormat } from '../blueprintFormat'
 import { PACKAGE } from '../constants'
-import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../interface/dialog/vanillaItemDisplayConfig'
+import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../interface/vanillaItemDisplayConfigDialog'
 import { BoneConfig } from '../nodeConfigs'
 import { getItemModel } from '../systems/minecraft/itemModelManager'
 import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
 import { getCurrentVersion } from '../systems/minecraft/versionManager'
 import { events } from '../util/events'
+import { toSafeFuntionName } from '../util/minecraftUtil'
 import { createAction, createBlockbenchMod } from '../util/moddingTools'
 import { Valuable } from '../util/stores'
 import { translate } from '../util/translation'
 import { ResizableOutlinerElement } from './resizableOutlinerElement'
+import { TextDisplay } from './textDisplay'
 import { sanitizeOutlinerElementName } from './util'
+import { VanillaBlockDisplay } from './vanillaBlockDisplay'
 
 interface VanillaItemDisplayOptions {
 	name?: string
@@ -118,7 +121,7 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 
 	async waitForReady() {
 		while (!this.ready) {
-			await new Promise(resolve => requestAnimationFrame(resolve))
+			await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
 		}
 	}
 

src/systems/datapackCompiler/index.ts

@@ -22,7 +22,7 @@ import {
 	parseResourceLocation,
 } from '../../util/minecraftUtil'
 import { JsonText } from '../minecraft/jsonText'
-import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
+import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/exportProgressDialog'
 import { eulerFromQuaternion, floatToHex, roundTo, tinycolorToDecimal } from '../../util/misc'
 import { MSLimiter } from '../../util/msLimiter'
 import { compile } from './compiler'
@@ -344,8 +344,7 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)
 						break
 					}
 					case '1.20.5':
-					case '1.21.0':
-					case '1.21.2': {
+					case '1.21.0': {
 						item.set(
 							'components',
 							new NbtCompound().set(
@@ -356,6 +355,7 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)
 						item.set('count', new NbtInt(1))
 						break
 					}
+					case '1.21.2':
 					case '1.21.4': {
 						item.set(
 							'components',

src/systems/resourcepackCompiler/1.21.4.ts

@@ -1,4 +1,4 @@
-import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
+import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/exportProgressDialog'
 import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
 import { TRANSPARENT_TEXTURE, Variant } from '../../variants'
 import { IntentionalExportError } from '../exporter'

src/systems/resourcepackCompiler/index.ts

@@ -1,10 +1,11 @@
-import _1_20_4 from './1.20.4'
+import _1_20_5 from './1.21.1'
+import _1_21_2 from './1.21.2'
 import _1_21_4 from './1.21.4'
 
 export default {
-	'1.20.4': _1_20_4,
-	'1.20.5': _1_20_4,
-	'1.21.0': _1_20_4,
-	'1.21.2': _1_20_4,
+	'1.20.4': _1_20_5,
+	'1.20.5': _1_20_5,
+	'1.21.0': _1_20_5,
+	'1.21.2': _1_21_2,
 	'1.21.4': _1_21_4,
 }