Fix including interaction data in plugin export

Author: Thojs

schemas/example-plugin-blueprint.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "./plugin-blueprint.schema.json",
-	"format_version": 1,
+	"format_version": 2,
 	"settings": {
 		"id": "animated_java:blueprint"
 	},
@@ -39,7 +39,7 @@
 				"rotation": [5, 180, 0],
 				"head_rotation": [5, 180]
 			},
-			"display_properties": {
+			"entity_properties": {
 				"billboard": "vertical",
 				"custom_brightness": 10,
 				"custom_name": "'Bone Node'",
@@ -198,7 +198,7 @@
 				},
 				"position": [0, 1.625, 0]
 			},
-			"display_properties": {
+			"entity_properties": {
 				"billboard": "vertical",
 				"is_glowing": true,
 				"shadow_radius": 3.0,
@@ -224,7 +224,7 @@
 				"head_rotation": [4.61854, 202.57734],
 				"scale": [1.0625, 1.125, 1]
 			},
-			"display_properties": {
+			"entity_properties": {
 				"billboard": "horizontal",
 				"custom_brightness": 15,
 				"custom_name": "'Block Display Node'",
@@ -235,7 +235,7 @@
 		},
 		"text_display_node": {
 			"type": "text_display",
-			"display_properties": {
+			"entity_properties": {
 				"custom_brightness": 5,
 				"is_custom_brightness_enabled": true,
 				"is_glowing": true,

schemas/plugin-blueprint.schema.json

@@ -183,7 +183,7 @@
 						"type": "object",
 						"required": ["elements"],
 						"properties": {
-							"display_properties": {
+							"entity_properties": {
 								"$ref": "#/definitions/bone_display_properties"
 							},
 							"elements": {
@@ -204,7 +204,7 @@
 					"then": {
 						"type": "object",
 						"properties": {
-							"display_properties": {
+							"entity_properties": {
 								"$ref": "#/definitions/item_display_properties"
 							}
 						}
@@ -219,7 +219,7 @@
 					"then": {
 						"type": "object",
 						"properties": {
-							"display_properties": {
+							"entity_properties": {
 								"$ref": "#/definitions/block_display_properties"
 							}
 						}
@@ -234,12 +234,27 @@
 					"then": {
 						"type": "object",
 						"properties": {
-							"display_properties": {
+							"entity_properties": {
 								"$ref": "#/definitions/text_display_properties"
 							}
 						}
 					}
 				},
+				{
+					"if": {
+						"properties": {
+							"type": { "const": "interaction" }
+						}
+					},
+					"then": {
+						"type": "object",
+						"properties": {
+							"entity_properties": {
+								"$ref": "#/definitions/interaction_entity_properties"
+							}
+						}
+					}
+				},
 				{
 					"if": {
 						"properties": {
@@ -609,6 +624,20 @@
 				}
 			]
 		},
+		"interaction_entity_properties": {
+			"type": "object",
+			"default": {},
+			"properties": {
+				"width": {
+					"type": "number",
+					"default": 1
+				},
+				"height": {
+					"type": "number",
+					"default": 1
+				}
+			}
+		},
 		"dynamic_animation": {
 			"type": "object",
 			"required": ["loop_mode", "length"],

src/systems/pluginCompiler.ts

@@ -113,6 +113,7 @@ type NodeType =
 	| 'item_display'
 	| 'block_display'
 	| 'text_display'
+	| 'interaction'
 	| 'structure'
 	| 'camera'
 	| 'locator'
@@ -122,14 +123,14 @@ type PluginNode =
 			type: 'bone'
 			parent?: string
 			default_transformation?: NodeTransformation
-			display_properties?: Record<string, unknown>
+			entity_properties?: Record<string, unknown>
 			elements: BoneElement[]
 	  }
 	| {
 			type: Exclude<NodeType, 'bone'>
 			parent?: string
 			default_transformation?: NodeTransformation
-			display_properties?: Record<string, unknown>
+			entity_properties?: Record<string, unknown>
 	  }
 
 type LoopMode = { type: 'once' } | { type: 'hold' } | { type: 'loop'; loop_delay?: string }
@@ -364,7 +365,7 @@ function serializeNode(
 			return scrubUndefined({
 				type: 'bone',
 				...base,
-				display_properties: displayProps,
+				entity_properties: displayProps,
 				elements: serializeBoneElements(model, {
 					textureIdToKey: options.textureIdToKey,
 					textureKeyToPaletteId: options.textureKeyToPaletteId,
@@ -375,7 +376,7 @@ function serializeNode(
 			return scrubUndefined({
 				type: 'item_display',
 				...base,
-				display_properties: scrubUndefined({
+				entity_properties: scrubUndefined({
 					...displayProps,
 					item: (node as any).item,
 					item_display: (node as any).item_display,
@@ -386,7 +387,7 @@ function serializeNode(
 			return scrubUndefined({
 				type: 'block_display',
 				...base,
-				display_properties: scrubUndefined({
+				entity_properties: scrubUndefined({
 					...displayProps,
 					block_state: (node as any).block,
 				}),
@@ -397,7 +398,7 @@ function serializeNode(
 			return scrubUndefined({
 				type: 'text_display',
 				...base,
-				display_properties: scrubUndefined({
+				entity_properties: scrubUndefined({
 					...displayProps,
 					alignment: (node as any).align,
 					background_color: argb,
@@ -409,6 +410,15 @@ function serializeNode(
 				}),
 			} satisfies PluginNode)
 		}
+		case 'interaction':
+			return scrubUndefined({
+				type: 'interaction',
+				...base,
+				entity_properties: {
+					width: node.width,
+					height: node.height,
+				},
+			})
 		case 'struct':
 			return { type: 'structure', ...base }
 		case 'camera':
@@ -704,7 +714,7 @@ export function exportPluginBlueprint(options: {
 	}
 
 	const blueprint: PluginBlueprintJson = scrubUndefined({
-		format_version: 1,
+		format_version: 2,
 		settings: {
 			id: aj.blueprint_id,
 		},