🛠️ Fix Storage Based Animations

- Fixed animations with `.` in them causing invalid storage paths.
- Fixed storage-based animations not animating text, item, and block displays.

Author: SnaveSutit

src/systems/animated_java.mcb

@@ -324,7 +324,7 @@ dir <%export_namespace%> {
 							#ARGS: {frame: int}
 							REPEAT (animation.includedNodes) as node {
 								IF (['bone', 'text_display', 'item_display', 'block_display'].includes(node.type)) {
-									$execute on passengers run data modify entity @s[tag=<%TAGS.LOCAL_BONE(export_namespace, node.name)%>] {} merge from storage aj.<%export_namespace%>:animations list.<%animation.name%>.frames[$(frame)].<%node.name%>
+									$execute on passengers run data modify entity @s[tag=<%TAGS.LOCAL_BONE(export_namespace, node.name)%>] {} merge from storage aj.<%export_namespace%>:animations list.<%animation.storageSafeName%>.frames[$(frame)].<%node.name%>
 								}
 							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
@@ -333,7 +333,7 @@ dir <%export_namespace%> {
 							#ARGS: {frame: int}
 							REPEAT (animation.includedNodes) as node {
 								IF (['bone', 'text_display', 'item_display', 'block_display'].includes(node.type)) {
-									$execute on passengers run data modify entity @s[tag=<%TAGS.LOCAL_BONE(export_namespace, node.name)%>] {} merge from storage aj.<%export_namespace%>:animations list.<%animation.name%>.frames[$(frame)].<%node.name%>
+									$execute on passengers run data modify entity @s[tag=<%TAGS.LOCAL_BONE(export_namespace, node.name)%>] {} merge from storage aj.<%export_namespace%>:animations list.<%animation.storageSafeName%>.frames[$(frame)].<%node.name%>
 								}
 							}
 						}

src/systems/animationRenderer.ts

@@ -8,6 +8,7 @@ import {
 import { TextDisplay } from '../outliner/textDisplay'
 import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
 import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
+import { toSafeFuntionName } from '../util/minecraftUtil'
 import { roundToNth } from '../util/misc'
 import { AnyRenderedNode, IRenderedRig } from './rigRenderer'
 import * as crypto from 'crypto'
@@ -74,6 +75,7 @@ export interface IRenderedFrame {
 
 export interface IRenderedAnimation {
 	name: string
+	storageSafeName: string
 	loopDelay: number
 	frames: IRenderedFrame[]
 	/**
@@ -250,6 +252,7 @@ export function updatePreview(animation: _Animation, time: number) {
 export function renderAnimation(animation: _Animation, rig: IRenderedRig) {
 	const rendered = {
 		name: animation.name,
+		storageSafeName: toSafeFuntionName(animation.name).replaceAll('.', '_'),
 		loopDelay: Number(animation.loop_delay) || 0,
 		frames: [],
 		duration: 0,

src/systems/datapackCompiler.ts

@@ -19,6 +19,8 @@ import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../interface/expor
 import { roundTo } from '../util/misc'
 import { setTimeout } from 'timers'
 
+const BONE_TYPES = ['bone', 'text_display', 'item_display', 'block_display']
+
 namespace TAGS {
 	export const NEW = () => 'aj.new'
 	export const GLOBAL_RIG = () => 'aj.rig_entity'
@@ -421,14 +423,14 @@ function createAnimationStorage(animations: IRenderedAnimation[]) {
 			new NbtCompound(), // This compound is just to make the list 1-indexed
 		])
 		const animStorage = new NbtCompound().set('frames', frames)
-		storage.set(animation.name, animStorage)
+		storage.set(animation.storageSafeName, animStorage)
 		for (const frame of animation.frames) {
 			const frameStorage = new NbtCompound()
 			frames.add(frameStorage)
 			for (const node of frame.nodes) {
-				if (node.type !== 'bone') continue
+				if (!BONE_TYPES.includes(node.type)) continue
 				frameStorage.set(
-					node.name,
+					node.type + '_' + node.name,
 					new NbtCompound()
 						.set('transformation', matrixToNbtFloatArray(node.matrix))
 						.set('start_interpolation', new NbtInt(0))