🛠️ Fixed #296

Author: SnaveSutit

package.json

@@ -103,7 +103,7 @@
 		"generic-stream": "^1.2.6",
 		"marked": "^4.3.0",
 		"marked-gfm-heading-id": "^3.0.0",
-		"mc-build": "3.3.12",
+		"mc-build": "^3.4.3",
 		"request-progress": "^3.0.0",
 		"svelte-ace": "^1.0.21",
 		"svelte-dnd-action": "^0.9.38"

src/interface/animatedJavaLoadingPopup.ts

@@ -1,4 +1,4 @@
-import { SvelteComponent } from 'svelte'
+import { SvelteComponentDev } from 'svelte/internal'
 import AnimatedJavaLoadingPopup from '../components/animatedJavaLoadingPopup.svelte'
 import { injectSvelteCompomponent } from '../util/injectSvelteComponent'
 import { Valuable } from '../util/stores'
@@ -7,7 +7,7 @@ const LOADED = new Valuable(false)
 const OFFLINE = new Valuable(false)
 const PROGRESS = new Valuable(0)
 const PROGRESS_LABEL = new Valuable('')
-let activeComponent: SvelteComponent | undefined
+let activeComponent: SvelteComponentDev | undefined
 
 export async function showLoadingPopup() {
 	if (activeComponent) return

src/systems/datapackCompiler/animation.mcb

@@ -379,13 +379,6 @@ dir <%export_namespace%> {
 							REPEAT (animation.frames) as frame {
 								function <%animation.frames.indexOf(frame)%> {
 									<%%
-										if (frame.variant) {
-											console.log('Variant:', frame.variant)
-											const variant = rig.variants[frame.variant.uuid]
-											if (!variant) return
-											const execute_condition = variant.execute_condition ? variant.execute_condition.trim() + ' ' : ''
-											emit.mcb(`execute ${execute_condition}on vehicle unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *${export_namespace}/variants/${variant.name}/apply`)
-										}
 										global.merged = {
 											locators: {},
 											cameras: {}
@@ -459,6 +452,19 @@ dir <%export_namespace%> {
 									IF (Object.keys(global.merged.locators).length > 0 || Object.keys(global.merged.cameras).length > 0) {
 										data modify entity @s data merge value <%JSON.stringify(global.merged)%>
 									}
+									<%%
+										if (frame.variant) {
+											const variant = rig.variants[frame.variant.uuid]
+											if (!variant) return
+											const execute_condition = variant.execute_condition ? variant.execute_condition.trim() + ' ' : ''
+											emit.mcb(`execute on vehicle unless entity @s[tag=!<%TAGS.TRANSFORMS_ONLY()%>] ${execute_condition}run function *${export_namespace}/variants/${variant.name}/apply`)
+										}
+										if (frame.commands) {
+											const commands = frame.commands
+											const execute_condition = commands.execute_condition ? commands.execute_condition.trim() + ' ' : ''
+											emit.mcb(`execute on vehicle unless entity @s[tag=!<%TAGS.TRANSFORMS_ONLY()%>] ${execute_condition}run {\n${commands.commands}\n}`)
+										}
+									%%>
 								}
 							}
 						}

test_blueprints/armor_stand.ajblueprint

@@ -11,7 +11,7 @@
 		"show_bounding_box": false,
 		"auto_bounding_box": true,
 		"bounding_box": [95, 32],
-		"enable_plugin_mode": true,
+		"enable_plugin_mode": false,
 		"resource_pack_export_mode": "raw",
 		"data_pack_export_mode": "raw",
 		"display_item": "minecraft:white_dye",
@@ -1673,6 +1673,23 @@
 							"interpolation": "linear",
 							"easing": "linear",
 							"easingArgs": []
+						},
+						{
+							"channel": "commands",
+							"data_points": [
+								{
+									"commands": "say bye",
+									"execute_condition": "",
+									"repeat": false,
+									"repeat_frequency": 1
+								}
+							],
+							"uuid": "523673ac-dff1-1729-8064-4d0258e2de2a",
+							"time": 2,
+							"color": -1,
+							"interpolation": "linear",
+							"easing": "linear",
+							"easingArgs": []
 						}
 					]
 				}