fix: function as_camera does not work & enhance error handling for it

package.json

@@ -4,7 +4,7 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
-	"version": "1.7.2",
+	"version": "1.7.3",
 	"min_blockbench_version": "4.12.0",
 	"variant": "desktop",
 	"tags": [

src/pluginPackage/changelog.json

@@ -191,5 +191,19 @@
 				]
 			}
 		]
+	},
+	"1.7.3": {
+		"title": "v1.7.3",
+		"author": "Titus Evans (SnaveSutit)",
+		"date": "2025-05-08",
+		"categories": [
+			{
+				"title": "Fixes",
+				"list": [
+					"Fixed adding cameras to a rig causing the data entity to dismount root.",
+					"Make variant keyframes reset to default if their variant doesn't exist anymore"
+				]
+			}
+		]
 	}
 }

src/systems/datapackCompiler/1.20.4/animation.mcb

@@ -548,7 +548,7 @@ dir <%export_namespace%> {
 							type=<%locator.config.entity_type%>, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_LOCATOR_NAMED(export_namespace, locator.storage_name)%>, \
-							distance=..<%locator.max_distance + 1%> \
+							distance=..<%Math.ceil(locator.max_distance)%> \
 						] \
 					run block as_locator/<%locator.path_name%> {
 					# run block ../as_locator/<%locator.path_name%> {
@@ -582,9 +582,10 @@ dir <%export_namespace%> {
 							type=minecraft:item_display, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_CAMERA_NAMED(export_namespace, camera.storage_name)%>, \
-							distance=..<%camera.max_distance + 1%> \
+							distance=..<%Math.ceil(camera.max_distance)%> \
 						] \
-					run block ../as_camera/<%camera.path_name%> {
+					run block as_camera/<%camera.path_name%> {
+					# run block ../as_camera/<%camera.path_name%> {
 						tag @s remove <%TAGS.NEW()%>
 						function *global/internal/gu/convert_uuid_array_to_string
 						tp @s \
@@ -807,13 +808,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.20.4/static.mcb

@@ -361,13 +361,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.20.5/animation.mcb

@@ -548,7 +548,7 @@ dir <%export_namespace%> {
 							type=<%locator.config.entity_type%>, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_LOCATOR_NAMED(export_namespace, locator.storage_name)%>, \
-							distance=..<%locator.max_distance + 1%> \
+							distance=..<%Math.ceil(locator.max_distance)%> \
 						] \
 					run block as_locator/<%locator.path_name%> {
 					# run block ../as_locator/<%locator.path_name%> {
@@ -582,9 +582,10 @@ dir <%export_namespace%> {
 							type=minecraft:item_display, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_CAMERA_NAMED(export_namespace, camera.storage_name)%>, \
-							distance=..<%camera.max_distance + 1%> \
+							distance=..<%Math.ceil(camera.max_distance)%> \
 						] \
-					run block ../as_camera/<%camera.path_name%> {
+					run block as_camera/<%camera.path_name%> {
+					# run block ../as_camera/<%camera.path_name%> {
 						tag @s remove <%TAGS.NEW()%>
 						function *global/internal/gu/convert_uuid_array_to_string
 						tp @s \
@@ -807,13 +808,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.20.5/static.mcb

@@ -361,13 +361,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.2/animation.mcb

@@ -548,7 +548,7 @@ dir <%export_namespace%> {
 							type=<%locator.config.entity_type%>, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_LOCATOR_NAMED(export_namespace, locator.storage_name)%>, \
-							distance=..<%locator.max_distance + 1%> \
+							distance=..<%Math.ceil(locator.max_distance)%> \
 						] \
 					run block as_locator/<%locator.path_name%> {
 					# run block ../as_locator/<%locator.path_name%> {
@@ -582,9 +582,10 @@ dir <%export_namespace%> {
 							type=minecraft:item_display, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_CAMERA_NAMED(export_namespace, camera.storage_name)%>, \
-							distance=..<%camera.max_distance + 1%> \
+							distance=..<%Math.ceil(camera.max_distance)%> \
 						] \
-					run block ../as_camera/<%camera.path_name%> {
+					run block as_camera/<%camera.path_name%> {
+					# run block ../as_camera/<%camera.path_name%> {
 						tag @s remove <%TAGS.NEW()%>
 						function *global/internal/gu/convert_uuid_array_to_string
 						tp @s \
@@ -807,13 +808,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.2/static.mcb

@@ -361,13 +361,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.4/animation.mcb

@@ -548,7 +548,7 @@ dir <%export_namespace%> {
 							type=<%locator.config.entity_type%>, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_LOCATOR_NAMED(export_namespace, locator.storage_name)%>, \
-							distance=..<%locator.max_distance + 1%> \
+							distance=..<%Math.ceil(locator.max_distance)%> \
 						] \
 					run block as_locator/<%locator.path_name%> {
 					# run block ../as_locator/<%locator.path_name%> {
@@ -582,9 +582,10 @@ dir <%export_namespace%> {
 							type=minecraft:item_display, \
 							tag=<%TAGS.NEW()%>, \
 							tag=<%TAGS.PROJECT_CAMERA_NAMED(export_namespace, camera.storage_name)%>, \
-							distance=..<%camera.max_distance + 1%> \
+							distance=..<%Math.ceil(camera.max_distance)%> \
 						] \
-					run block ../as_camera/<%camera.path_name%> {
+					run block as_camera/<%camera.path_name%> {
+					# run block ../as_camera/<%camera.path_name%> {
 						tag @s remove <%TAGS.NEW()%>
 						function *global/internal/gu/convert_uuid_array_to_string
 						tp @s \
@@ -807,13 +808,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.4/static.mcb

@@ -361,13 +361,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.5/animation.mcb

@@ -808,13 +808,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/1.21.5/static.mcb

@@ -361,13 +361,19 @@ dir <%export_namespace%> {
 				on passengers \
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run block zzz/as_camera/as_data { {name: $(name)}
-				data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name)
+				$data modify storage aj:temp args.uuid set from entity @s data.cameras.$(name).uuid
 				scoreboard players set #aj.check <%OBJECTIVES.I()%> 0
 				block execute_as_uuid { with storage aj:temp args
 					$execute as $(uuid) at @s run $(command)
 					scoreboard players set #aj.check <%OBJECTIVES.I()%> 1
 				}
-				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+				execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run block if_failed {
+					block check_existence { with storage aj:temp args
+						$execute at $(uuid) run scoreboard players set #aj.check <%OBJECTIVES.I()%> 2
+					}
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 0 run tellraw @a <%TELLRAW.CAMERA_NOT_FOUND_ENTITY()%>
+					execute if score #aj.check <%OBJECTIVES.I()%> matches 2 run tellraw @a <%TELLRAW.COMMAND_RUN_FAILED()%>
+				}
 			}
 		}
 	}

src/systems/datapackCompiler/index.ts

@@ -647,6 +647,14 @@ namespace TELLRAW {
 			},
 			TELLRAW_SUFFIX(),
 		])
+	export const COMMAND_RUN_FAILED = () =>
+		new JsonText([
+			TELLRAW_PREFIX(),
+			{ text: 'Command ', color: 'red' },
+			{ nbt: 'args.command', storage: 'aj:temp', color: 'aqua' },
+			{ text: ' run failed!', color: 'red' },
+			TELLRAW_SUFFIX(),
+		])
 }
 
 async function generateRootEntityPassengers(