🛠️ Reduce complexity of storage-based variant functions

3 commands to 1 command :)

Author: SnaveSutit

src/systems/datapackCompiler/1.21.4/animation.mcb

@@ -366,9 +366,13 @@ dir <%export_namespace%> {
 								}
 							}
 							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 \
+									if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant \
+									unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] \
+								run { with storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+									#ARGS: {name: string, condition: string}
+									$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+								}
 							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
@@ -384,15 +388,13 @@ dir <%export_namespace%> {
 								}
 							}
 							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
+								$execute \
+									if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant \
+									unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] \
+								run { with storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+									#ARGS: {name: string, condition: string}
+									$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+								}
 							}
 						}
 					} ELSE {

src/systems/datapackCompiler/index.ts

@@ -559,7 +559,14 @@ async function createAnimationStorage(rig: IRenderedRig, animations: IRenderedAn
 					'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} ` : ''))
+						.set(
+							'condition',
+							new NbtString(
+								frame.variant.execute_condition
+									? `${frame.variant.execute_condition} `
+									: ''
+							)
+						)
 				)
 			}
 			if (frames.toString().length > 1000000) {

test_blueprints/armor_stand.ajblueprint

@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated_java_blueprint",
-		"format_version": "1.5.2",
+		"format_version": "1.6.0",
 		"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"
@@ -29,7 +29,7 @@
 		"ticking_commands": "",
 		"interpolation_duration": 1,
 		"teleportation_duration": 1,
-		"use_storage_for_animation": false,
+		"use_storage_for_animation": true,
 		"show_function_errors": true,
 		"show_outdated_warning": true,
 		"baked_animations": false,
@@ -1502,7 +1502,7 @@
 		"default": {
 			"name": "default",
 			"display_name": "Default",
-			"uuid": "d08528a6-bb3d-0203-485d-1727f5ff2ff7",
+			"uuid": "8b21ef0e-2651-7284-337b-7e5fddc16bb7",
 			"texture_map": {},
 			"excluded_nodes": [],
 			"is_default": true