🚧 More Locator Improvements

- Fixed entities stacked on top of locator entities not being removed when the rig is removed.
- Fixed rig summon commands causing export crash.
- Added `as_own_locator_entities` function to execute commands as all of a rig's locators.
- Improved locator migration code.

Author: SnaveSutit

src/systems/animated_java.mcb

@@ -396,7 +396,9 @@ dir <%export_namespace%> {
 														~<%roundTo(node.rot.x, 10)%> \
 														~<%roundTo(node.rot.y, 10)%> \
 												run {
-													<%%emit.mcb(node.commands)%%>
+													<%%
+														emit.mcb(node.commands)
+													%%>
 												}
 											}
 										} ELSE IF (node.type === 'camera') {
@@ -532,7 +534,9 @@ dir <%export_namespace%> {
 			data modify entity @s teleport_duration set value <%teleportation_duration%>
 			execute on passengers run data modify entity @s teleport_duration set value <%teleportation_duration%>
 			# Custom Summon Commands
-			<%%if (custom_summon_commands) emit.mcb(custom_summon_commands)%%>
+			<%%
+				if (custom_summon_commands) emit.mcb(custom_summon_commands)
+			%%>
 			# Custom Summon Commands
 
 			# Run the on_summon function for the root entity.
@@ -548,6 +552,23 @@ dir <%export_namespace%> {
 		}
 	}
 
+	function as_own_locator_entities {
+		#ARGS: {command: string}
+		execute unless entity @s[type=item_display,tag=<%TAGS.PROJECT_ROOT(export_namespace)%>] run return run \
+			function *global/errors/function_not_executed_as_root_entity \
+				{'function_path': 'animated_java:<%export_namespace%>/as_all_locators'}
+		$data modify storage aj:temp command set value '$(command)'
+		execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run {
+			REPEAT (Object.values(rig.nodeMap).filter(v => v.type === 'locator')) as locator {
+				data modify storage aj:temp uuid set from entity @s data.positions.locators.<%locator.name%>.uuid
+				block zzz/execute { with storage aj:temp
+					$execute as $(uuid) run $(command)
+				}
+			}
+		}
+	}
+
+
 	dir remove {
 		# Removes all instances of this rig from the world.
 		function all {
@@ -565,7 +586,11 @@ dir <%export_namespace%> {
 			execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run {
 				REPEAT (Object.values(rig.nodeMap).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
 					block zzz/kill { with entity @s data.positions.locators.<%locator.name%>
-						$kill $(uuid)
+						# Recursively remove any stacked locator entities
+						$execute as $(uuid) run block kill_passengers {
+							execute on passengers run function ^0
+							kill @s
+						}
 					}
 				}
 			}

src/systems/modelDataFixerUpper.ts

@@ -277,6 +277,12 @@ function updateModelTo1_0pre1(model: any) {
 			if (element.entity_type) element.config.entity_type = element.entity_type
 			if (element.nbt) {
 				const summon_commands: string[] = []
+				const nbt = NbtTag.fromString(element.nbt as string) as NbtCompound
+				nbt.delete('Passengers')
+				const tags = (nbt.get('Tags') as NbtList<NbtString>)?.map(t => t.getAsString())
+				nbt.delete('Tags')
+				summon_commands.push('data merge entity @s ' + nbt.toString())
+				if (tags) summon_commands.push(...tags.map(t => `tag @s add ${t}`))
 
 				const recursePassengers = (stringNbt: string): string[] => {
 					const nbt = NbtTag.fromString(stringNbt) as NbtCompound
@@ -287,15 +293,25 @@ function updateModelTo1_0pre1(model: any) {
 						const commands = passengers.map(p => {
 							const id = (p.get('id') as NbtString).getAsString()
 							p.delete('id')
+							const tags = (p.get('Tags') as NbtList<NbtString>).map(t =>
+								t.getAsString()
+							)
+							p.delete('Tags')
 							const data = p.toString()
 							return `execute summon ${id} run {\n\t${[
 								`data merge entity @s ${data}`,
+								...tags.map(t => `tag @s add ${t}`),
 								`tag @s add to_mount`,
 								...recursePassengers(data),
 							].join('\n\t')}\n}`
 						})
 						commands.push(
-							`ride @e[tag=to_mount,distance=..0.01] mount @s`,
+							`tag @s add vehicle`,
+							`execute as @e[tag=to_mount,distance=..0.01] run {`,
+							`\tride @s mount @e[tag=vehicle,limit=1]`,
+							`\ttag @s remove to_mount`,
+							`}`,
+							`tag @s remove vehicle`,
 							`execute on passengers run tag @s remove to_mount`
 						)
 						return commands
@@ -312,6 +328,7 @@ function updateModelTo1_0pre1(model: any) {
 				if (summon_commands.length === 0) {
 					summon_commands.push(`data merge entity @s ${element.nbt as string}`)
 				}
+
 				element.config.summon_commands = summon_commands.join('\n')
 			}
 		}
@@ -395,9 +412,15 @@ function updateModelTo1_0pre1(model: any) {
 		datapackExporterSettings?.root_entity_nbt &&
 		datapackExporterSettings.root_entity_nbt !== '{}'
 	) {
-		blueprint.project_settings!.summon_commands = `data merge entity @s ${
+		const commands: string[] = []
+		const nbt = NbtTag.fromString(
 			datapackExporterSettings.root_entity_nbt as string
-		}`
+		) as NbtCompound
+		const tags = (nbt.get('Tags') as NbtList<NbtString>)?.map(t => t.getAsString())
+		nbt.delete('Tags')
+		if ([...nbt.keys()].length !== 0) commands.push('data merge entity @s ' + nbt.toString())
+		if (tags) commands.push(...tags.map(t => `tag @s add ${t}`))
+		blueprint.project_settings!.summon_commands = commands.join('\n')
 	}
 
 	console.log('Finished Blueprint:', blueprint)

src/util/fileUtil.ts

@@ -7,5 +7,5 @@ export function isJsonPath(path: string): boolean {
 }
 
 export function isFunctionTagPath(path: string): boolean {
-	return path.endsWith('.json') && path.includes(`tags${PathModule.sep}functions`)
+	return path.endsWith('.json') && path.includes(`tags${PathModule.sep}function`)
 }