🐛 Cameras and locators are missing the majority of their tags

Author: SnaveSutit

src/systems/datapackCompiler/1.21.4/animation.mcb

@@ -432,12 +432,13 @@ dir <%export_namespace%> {
 			execute store result score @s <%OBJECTIVES.ID()%> run scoreboard players add aj.last_id <%OBJECTIVES.ID()%> 1
 
 			execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run {
+
 				function *global/internal/gu/convert_uuid_array_to_string with entity @s
 				data modify entity @s data.bones.data_data set from storage aj:uuid main.out
 
 				REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator')) as locator {
 					IF (locator.config && locator.config.use_entity) {
-						summon <%locator.config.entity_type%> ~ ~ ~ {Tags:['<%TAGS.NEW()%>', '<%TAGS.GLOBAL_LOCATOR()%>', '<%TAGS.PROJECT_LOCATOR(export_namespace)%>', '<%TAGS.PROJECT_LOCATOR(export_namespace, locator.name)%>']}
+						summon <%locator.config.entity_type%> ~ ~ ~ {Tags:<%getNodeTags(locator, rig)%>}
 						execute as @e[type=<%locator.config.entity_type%>,tag=<%TAGS.NEW()%>,tag=<%TAGS.GLOBAL_LOCATOR()%>,limit=1,distance=..0.01] run {
 							tag @s remove <%TAGS.NEW()%>
 
@@ -453,7 +454,7 @@ dir <%export_namespace%> {
 				}
 
 				REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
-					summon item_display ~ ~ ~ {Tags:['<%TAGS.NEW()%>', '<%TAGS.GLOBAL_CAMERA()%>', '<%TAGS.PROJECT_CAMERA(export_namespace)%>', '<%TAGS.PROJECT_CAMERA(export_namespace, camera.name)%>'], teleport_duration: 2}
+					summon item_display ~ ~ ~ {Tags:<%getNodeTags(camera, rig)%>, teleport_duration: 2}
 					execute as @e[type=item_display,tag=<%TAGS.NEW()%>,tag=<%TAGS.GLOBAL_CAMERA()%>,limit=1,distance=..0.01] run {
 						tag @s remove <%TAGS.NEW()%>
 						function *global/internal/gu/convert_uuid_array_to_string with entity @s
@@ -468,8 +469,6 @@ dir <%export_namespace%> {
 				}
 			}
 
-			tag @s remove <%TAGS.NEW()%>
-
 			# Variant Arguement
 			IF (Object.keys(rig.variants).length > 1) {
 				execute if data storage aj:temp args.variant run { with storage aj:temp args
@@ -537,6 +536,9 @@ dir <%export_namespace%> {
 			%%>
 			# Custom Summon Commands
 
+			tag @s remove <%TAGS.NEW()%>
+			execute on passengers run tag @s remove <%TAGS.NEW()%>
+
 			# Run the on_summon function for the root entity.
 			function #*<%export_namespace%>/as_root/on_summon
 		}

src/systems/datapackCompiler/index.ts

@@ -1,18 +1,7 @@
-import { isFunctionTagPath } from '../../util/fileUtil'
-import mcbFiles from '../datapackCompiler/mcbFiles'
-import { AnyRenderedNode, IRenderedRig, IRenderedVariant } from '../rigRenderer'
-import { IRenderedAnimation } from '../animationRenderer'
-import { Variant } from '../../variants'
 import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtList, NbtString } from 'deepslate/lib/nbt'
-import {
-	arrayToNbtFloatArray,
-	getFunctionNamespace,
-	matrixToNbtFloatArray,
-	replacePathPart,
-	sortObjectKeys,
-	transformationToNbt,
-} from '../util'
+import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { BoneConfig, TextDisplayConfig } from '../../nodeConfigs'
+import { isFunctionTagPath } from '../../util/fileUtil'
 import {
 	getDataPackFormat,
 	IFunctionTag,
@@ -21,13 +10,24 @@ import {
 	parseDataPackPath,
 	parseResourceLocation,
 } from '../../util/minecraftUtil'
-import { JsonText } from '../minecraft/jsonText'
-import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { eulerFromQuaternion, floatToHex, roundTo, tinycolorToDecimal } from '../../util/misc'
 import { MSLimiter } from '../../util/msLimiter'
+import { Variant } from '../../variants'
+import { IRenderedAnimation } from '../animationRenderer'
+import mcbFiles from '../datapackCompiler/mcbFiles'
+import { IntentionalExportError } from '../exporter'
+import { JsonText } from '../minecraft/jsonText'
+import { AnyRenderedNode, IRenderedRig, IRenderedVariant } from '../rigRenderer'
+import {
+	arrayToNbtFloatArray,
+	getFunctionNamespace,
+	matrixToNbtFloatArray,
+	replacePathPart,
+	sortObjectKeys,
+	transformationToNbt,
+} from '../util'
 import { compile } from './compiler'
 import { TAGS } from './tags'
-import { IntentionalExportError } from '../exporter'
 
 const BONE_TYPES = ['bone', 'text_display', 'item_display', 'block_display']
 
@@ -69,6 +69,7 @@ function getNodeTags(node: AnyRenderedNode, rig: IRenderedRig): NbtList {
 
 	tags.push(
 		// Global
+		TAGS.NEW(),
 		TAGS.GLOBAL_ENTITY(),
 		TAGS.GLOBAL_NODE(),
 		TAGS.GLOBAL_NODE_NAMED(node.safe_name),
@@ -592,6 +593,7 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)
 			.set(
 				'Tags',
 				new NbtList([
+					new NbtString(TAGS.NEW()),
 					new NbtString(TAGS.GLOBAL_ENTITY()),
 					new NbtString(TAGS.GLOBAL_DATA()),
 					new NbtString(TAGS.PROJECT_ENTITY(aj.export_namespace)),
@@ -1069,6 +1071,7 @@ export default async function compileDataPack(options: {
 				.length > 0,
 		has_cameras: Object.values(rig.nodes).filter(n => n.type === 'camera').length > 0,
 		is_static,
+		getNodeTags,
 	}
 
 	const mcbFile = is_static