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

ChenCMD · web-flow · commit b4ab4e6286cc · 2025-01-09T14:14:33.000-08:00
Fix #353
diff --git a/src/systems/datapackCompiler/1.20.4/animation.mcb b/src/systems/datapackCompiler/1.20.4/animation.mcb
@@ -365,6 +365,11 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
 						function apply_frame {
@@ -378,6 +383,17 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
+						}
+						IF (animation.frames.some(v => v.variant)) {
+							function apply_variant {
+								#ARGS: {name: string, condition: string}
+								$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+							}
 						}
 					} ELSE {
 						function set_frame {
diff --git a/src/systems/datapackCompiler/1.20.5/animation.mcb b/src/systems/datapackCompiler/1.20.5/animation.mcb
@@ -365,6 +365,11 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
 						function apply_frame {
@@ -378,6 +383,17 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
+						}
+						IF (animation.frames.some(v => v.variant)) {
+							function apply_variant {
+								#ARGS: {name: string, condition: string}
+								$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+							}
 						}
 					} ELSE {
 						function set_frame {
diff --git a/src/systems/datapackCompiler/1.21.2/animation.mcb b/src/systems/datapackCompiler/1.21.2/animation.mcb
@@ -365,6 +365,11 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
 						function apply_frame {
@@ -378,6 +383,17 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
+						}
+						IF (animation.frames.some(v => v.variant)) {
+							function apply_variant {
+								#ARGS: {name: string, condition: string}
+								$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+							}
 						}
 					} ELSE {
 						function set_frame {
diff --git a/src/systems/datapackCompiler/1.21.4/animation.mcb b/src/systems/datapackCompiler/1.21.4/animation.mcb
@@ -365,6 +365,11 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
 						function apply_frame {
@@ -378,6 +383,17 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
+						}
+						IF (animation.frames.some(v => v.variant)) {
+							function apply_variant {
+								#ARGS: {name: string, condition: string}
+								$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+							}
 						}
 					} ELSE {
 						function set_frame {
diff --git a/src/systems/datapackCompiler/index.ts b/src/systems/datapackCompiler/index.ts
@@ -554,6 +554,14 @@ async function createAnimationStorage(rig: IRenderedRig, animations: IRenderedAn
 					)
 				}
 			}
+			if (frame.variant) {
+				thisFrame.set(
+					'variant',
+					new NbtCompound()
+						.set('name', new NbtString(rig.variants[frame.variant.uuid].name))
+						.set('condition', new NbtString(frame.variant.execute_condition ? `${frame.variant.execute_condition} ` : ''))
+				)
+			}
 			if (frames.toString().length > 1000000) {
 				addFrameDataCommand()
 			}

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,11 @@ dir <%export_namespace%> {`
`365`	`365`	`storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>`
`366`	`366`	`}`
`367`	`367`	`}`
	`368`	`+ IF (animation.frames.some(v => v.variant)) {`
	`369`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant`
	`370`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant`
	`371`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant`
	`372`	`+ }`
`368`	`373`	`execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1`
`369`	`374`	`}`
`370`	`375`	`function apply_frame {`
`@@ -378,6 +383,17 @@ dir <%export_namespace%> {`
`378`	`383`	`storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>`
`379`	`384`	`}`
`380`	`385`	`}`
	`386`	`+ IF (animation.frames.some(v => v.variant)) {`
	`387`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant`
	`388`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant`
	`389`	`+ $execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant`
	`390`	`+ }`
	`391`	`+ }`
	`392`	`+ IF (animation.frames.some(v => v.variant)) {`
	`393`	`+ function apply_variant {`
	`394`	`+ #ARGS: {name: string, condition: string}`
	`395`	`+ $execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply`
	`396`	`+ }`
`381`	`397`	`}`
`382`	`398`	`} ELSE {`
`383`	`399`	`function set_frame {`
Original file line number	Diff line number	Diff line change
`@@ -554,6 +554,14 @@ async function createAnimationStorage(rig: IRenderedRig, animations: IRenderedAn`
`554`	`554`	`)`
`555`	`555`	`}`
`556`	`556`	`}`
	`557`	`+ if (frame.variant) {`
	`558`	`+ thisFrame.set(`
	`559`	`+ 'variant',`
	`560`	`+ new NbtCompound()`
	`561`	`+ .set('name', new NbtString(rig.variants[frame.variant.uuid].name))`
	`562`	+ .set('condition', new NbtString(frame.variant.execute_condition ? `${frame.variant.execute_condition} ` : ''))
	`563`	`+ )`
	`564`	`+ }`
`557`	`565`	`if (frames.toString().length > 1000000) {`
`558`	`566`	`addFrameDataCommand()`
`559`	`567`	`}`