🔀 Merge #458: 🔖 v1.8.0-beta.3

SnaveSutit · web-flow · commit 37414fee1689 · 2025-10-14T17:20:41.000-04:00
### Fixes

- Fixed On-Summon Functions and On-Apply Functions not functioning.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
-	"version": "1.8.0-beta.2",
+	"version": "1.8.0-beta.3",
 	"min_blockbench_version": "4.12.0",
 	"max_blockbench_version": "4.12.6",
 	"variant": "desktop",
diff --git a/src/pluginPackage/changelog.json b/src/pluginPackage/changelog.json
@@ -379,5 +379,16 @@
 				]
 			}
 		]
+	},
+	"1.8.0-beta.3": {
+		"title": "v1.8.0-beta.3",
+		"author": "Titus Evans (SnaveSutit)",
+		"date": "2025-10-15",
+		"categories": [
+			{
+				"title": "Fixes",
+				"list": ["Fixed On-Summon Functions and On-Apply Functions not functioning."]
+			}
+		]
 	}
 }
diff --git a/src/systems/datapackCompiler/1.20.4/animation.mcb b/src/systems/datapackCompiler/1.20.4/animation.mcb
@@ -695,6 +695,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -989,6 +999,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -1006,6 +1017,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.20.4/static.mcb b/src/systems/datapackCompiler/1.20.4/static.mcb
@@ -276,6 +276,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -570,6 +580,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -587,6 +598,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.20.5/animation.mcb b/src/systems/datapackCompiler/1.20.5/animation.mcb
@@ -695,6 +695,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -989,6 +999,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -1006,6 +1017,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.20.5/static.mcb b/src/systems/datapackCompiler/1.20.5/static.mcb
@@ -276,6 +276,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -570,6 +580,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -587,6 +598,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.21.2/animation.mcb b/src/systems/datapackCompiler/1.21.2/animation.mcb
@@ -695,6 +695,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -989,6 +999,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -1006,6 +1017,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.21.2/static.mcb b/src/systems/datapackCompiler/1.21.2/static.mcb
@@ -276,6 +276,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -570,6 +580,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -587,6 +598,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.21.4/animation.mcb b/src/systems/datapackCompiler/1.21.4/animation.mcb
@@ -695,6 +695,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -989,6 +999,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -1006,6 +1017,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/datapackCompiler/1.21.4/static.mcb b/src/systems/datapackCompiler/1.21.4/static.mcb
@@ -276,6 +276,16 @@ function summon {
 			}
 		}
 
+		REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {
+			execute \
+				on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+			run block node_on_summon_<%node.storage_name%> {
+				<%%
+					emit.mcb(node.on_summon_function.trim())
+				%%>
+			}
+		}
+
 		IF (on_summon_function) {
 			execute at @s run block rig_on_summon {
 				<%%
@@ -570,6 +580,7 @@ IF (Object.keys(rig.variants).length > 1) {
 						execute \
 							on passengers \
 							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
+							at @s \
 						run \
 							block zzz/apply_to_node_<%node.storage_name%> {
 								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
@@ -587,6 +598,11 @@ IF (Object.keys(rig.variants).length > 1) {
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
 									}
+									IF (global.config.onApplyFunction) {
+										<%%
+											emit.mcb(global.config.onApplyFunction)
+										%%>
+									}
 								}
 						}
 					}
diff --git a/src/systems/rigRenderer.ts b/src/systems/rigRenderer.ts
@@ -85,6 +85,7 @@ export interface IRenderedDisplayEntityNode extends IRenderedNode {
 	 */
 	base_scale: number
 	bounding_box: THREE.Box3
+	on_summon_function?: string
 	configs?: IDisplayEntityConfigs
 }
 
@@ -354,7 +355,8 @@ function renderGroup(
 		parent: parentId,
 		bounding_box: getNodeBoundingBox(group),
 		base_scale: 1,
-		configs: group.configs,
+		configs: structuredClone(group.configs),
+		on_summon_function: group.onSummonFunction?.trim(),
 		// This is a placeholder value that will be updated later once the animation renderer is run.
 		default_transform: {} as INodeTransform,
 	}
@@ -464,7 +466,8 @@ function renderItemDisplay(display: VanillaItemDisplay, rig: IRenderedRig) {
 		item: display.item,
 		item_display: display.itemDisplay,
 		base_scale: 1,
-		configs: display.configs,
+		configs: structuredClone(display.configs),
+		on_summon_function: display.onSummonFunction?.trim(),
 		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
@@ -492,7 +495,8 @@ function renderBlockDisplay(display: VanillaBlockDisplay, rig: IRenderedRig) {
 		block: display.block,
 		parent: parentId,
 		base_scale: 1,
-		configs: display.configs,
+		configs: structuredClone(display.configs),
+		on_summon_function: display.onSummonFunction?.trim(),
 		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
@@ -527,7 +531,8 @@ function renderTextDisplay(display: TextDisplay, rig: IRenderedRig): INodeStruct
 		shadow: display.shadow,
 		see_through: display.seeThrough,
 		base_scale: 1,
-		configs: display.configs,
+		configs: structuredClone(display.configs),
+		on_summon_function: display.onSummonFunction?.trim(),
 		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
@@ -549,7 +554,7 @@ function renderLocator(locator: Locator, rig: IRenderedRig) {
 		storage_name: sanitizeStorageKey(locator.name),
 		uuid: locator.uuid,
 		parent: parentId,
-		config: locator.config,
+		config: structuredClone(locator.config),
 		max_distance: 0,
 		default_transform: {} as INodeTransform,
 	}
diff --git a/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint b/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint
@@ -928,7 +928,7 @@
 			"export": true,
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"onSummonFunction": "",
+			"onSummonFunction": "say I'm a Diamond!",
 			"configs": {
 				"default": {
 					"on_apply_function": "",
@@ -945,7 +945,7 @@
 				},
 				"variants": {
 					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
-						"on_apply_function": "",
+						"on_apply_function": "say I'm now a very colorful diamond!",
 						"billboard": "fixed",
 						"override_brightness": false,
 						"brightness_override": 0,

Original file line number	Diff line number	Diff line change
`@@ -379,5 +379,16 @@`
`379`	`379`	`]`
`380`	`380`	`}`
`381`	`381`	`]`
	`382`	`+ },`
	`383`	`+ "1.8.0-beta.3": {`
	`384`	`+ "title": "v1.8.0-beta.3",`
	`385`	`+ "author": "Titus Evans (SnaveSutit)",`
	`386`	`+ "date": "2025-10-15",`
	`387`	`+ "categories": [`
	`388`	`+ {`
	`389`	`+ "title": "Fixes",`
	`390`	`+ "list": ["Fixed On-Summon Functions and On-Apply Functions not functioning."]`
	`391`	`+ }`
	`392`	`+ ]`
`382`	`393`	`}`
`383`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -695,6 +695,16 @@ function summon {`
`695`	`695`	`}`
`696`	`696`	`}`
`697`	`697`
	`698`	`+ REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {`
	`699`	`+ execute \`
	`700`	`+ on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \`
	`701`	`+ run block node_on_summon_<%node.storage_name%> {`
	`702`	`+ <%%`
	`703`	`+ emit.mcb(node.on_summon_function.trim())`
	`704`	`+ %%>`
	`705`	`+ }`
	`706`	`+ }`
	`707`	`+`
`698`	`708`	`IF (on_summon_function) {`
`699`	`709`	`execute at @s run block rig_on_summon {`
`700`	`710`	`<%%`
`@@ -989,6 +999,7 @@ IF (Object.keys(rig.variants).length > 1) {`
`989`	`999`	`execute \`
`990`	`1000`	`on passengers \`
`991`	`1001`	`if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \`
	`1002`	`+ at @s \`
`992`	`1003`	`run \`
`993`	`1004`	`block zzz/apply_to_node_<%node.storage_name%> {`
`994`	`1005`	`IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {`
`@@ -1006,6 +1017,11 @@ IF (Object.keys(rig.variants).length > 1) {`
`1006`	`1017`	`IF (!global.config.isDefault()) {`
`1007`	`1018`	`data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>`
`1008`	`1019`	`}`
	`1020`	`+ IF (global.config.onApplyFunction) {`
	`1021`	`+ <%%`
	`1022`	`+ emit.mcb(global.config.onApplyFunction)`
	`1023`	`+ %%>`
	`1024`	`+ }`
`1009`	`1025`	`}`
`1010`	`1026`	`}`
`1011`	`1027`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,16 @@ function summon {`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
	`279`	`+ REPEAT (Object.values(rig.nodes).filter(node => BONE_TYPES.includes(node.type) && node.on_summon_function?.trim())) as node {`
	`280`	`+ execute \`
	`281`	`+ on passengers if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \`
	`282`	`+ run block node_on_summon_<%node.storage_name%> {`
	`283`	`+ <%%`
	`284`	`+ emit.mcb(node.on_summon_function.trim())`
	`285`	`+ %%>`
	`286`	`+ }`
	`287`	`+ }`
	`288`	`+`
`279`	`289`	`IF (on_summon_function) {`
`280`	`290`	`execute at @s run block rig_on_summon {`
`281`	`291`	`<%%`
`@@ -570,6 +580,7 @@ IF (Object.keys(rig.variants).length > 1) {`
`570`	`580`	`execute \`
`571`	`581`	`on passengers \`
`572`	`582`	`if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \`
	`583`	`+ at @s \`
`573`	`584`	`run \`
`574`	`585`	`block zzz/apply_to_node_<%node.storage_name%> {`
`575`	`586`	`IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {`
`@@ -587,6 +598,11 @@ IF (Object.keys(rig.variants).length > 1) {`
`587`	`598`	`IF (!global.config.isDefault()) {`
`588`	`599`	`data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>`
`589`	`600`	`}`
	`601`	`+ IF (global.config.onApplyFunction) {`
	`602`	`+ <%%`
	`603`	`+ emit.mcb(global.config.onApplyFunction)`
	`604`	`+ %%>`
	`605`	`+ }`
`590`	`606`	`}`
`591`	`607`	`}`
`592`	`608`	`}`