0.4.5

Add #155
Add #154
Fix #153
Added duplicate Variant action, and Variant sorting to the Variants panel

Author: SnaveSutit

exporters/jsonExporter/jsonConstructor.ts

@@ -32,19 +32,22 @@ interface ISerializedNodeAnimationFrameEntry {
 }
 
 interface ISerealizedAnimation {
-	frames: ISerializedAnimationFrame[]
+	start_delay?: number
+	loop_delay?: number
 	duration: number
 	loop_mode: 'once' | 'hold' | 'loop'
 	affected_bones: string[]
 	affected_bones_is_a_whitelist: boolean
+	frames: ISerializedAnimationFrame[]
 }
 
 interface ISerializedNode {
 	type: NodeType
 	name: string
 	uuid: string
-	custom_model_data: number
-	resource_location: string
+	nbt: string
+	custom_model_data?: number
+	resource_location?: string
 }
 
 interface ISerializedVariant {
@@ -92,21 +95,40 @@ function serializeNodeAnimationFrameEntry(
 	}
 }
 
-function serializeNodeMap(nodeMap: Record<string, any>): Record<string, ISerializedNode> {
+function serializeNodeMap(
+	nodeMap: Record<string, AnimatedJava.IRenderedNodes[keyof AnimatedJava.IRenderedNodes]>
+): Record<string, ISerializedNode> {
 	const serializedNodeMap: Record<string, ISerializedNode> = {}
 	for (const uuid in nodeMap) {
 		const node = nodeMap[uuid]
 		const type = node.type
 		const name = node.name
-		const custom_model_data = node.customModelData
-		const resource_location = node.resourceLocation
-
-		serializedNodeMap[uuid] = {
-			type,
-			name,
-			uuid,
-			custom_model_data,
-			resource_location,
+
+		switch (type) {
+			case 'bone': {
+				const custom_model_data = node.customModelData
+				const resource_location = node.resourceLocation
+
+				serializedNodeMap[uuid] = {
+					type,
+					name,
+					uuid,
+					nbt: node.nbt,
+					custom_model_data,
+					resource_location,
+				}
+
+				break
+			}
+			case 'camera':
+			case 'locator': {
+				serializedNodeMap[uuid] = {
+					type,
+					name,
+					uuid,
+					nbt: node.nbt,
+				}
+			}
 		}
 	}
 	return serializedNodeMap
@@ -155,6 +177,8 @@ function serializeAnimationFrame(
 }
 
 function serializeAnimation(animation: AnimatedJava.IRenderedAnimation): ISerealizedAnimation {
+	const start_delay = animation.startDelay
+	const loop_delay = animation.loopDelay
 	const frames = animation.frames.map(serializeAnimationFrame)
 	const duration = animation.duration
 	const loop_mode = animation.loopMode
@@ -165,6 +189,8 @@ function serializeAnimation(animation: AnimatedJava.IRenderedAnimation): ISereal
 	const affected_bones_is_a_whitelist = bbAnimation.affected_bones_is_a_whitelist
 
 	return {
+		start_delay,
+		loop_delay,
 		frames,
 		duration,
 		loop_mode,

exporters/jsonExporter/jsonStructure.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "http://json-schema.org/draft-07/schema#",
 	"title": "JSON Exporter Structure",
 	"type": "object",
 	"required": ["project_settings", "exporter_settings", "rig", "variants", "animations"],
@@ -52,13 +53,13 @@
 			}
 		}
 	},
-	"$def": {
+	"definitions": {
 		"node_type": {
 			"enum": ["bone", "locator", "camera"]
 		},
 		"node": {
 			"type": "object",
-			"required": ["type", "name", "uuid", "custom_model_data", "resource_location"],
+			"required": ["type", "name", "uuid"],
 			"properties": {
 				"type": {
 					"$ref": "#/definitions/node_type"
@@ -74,6 +75,9 @@
 				},
 				"resource_location": {
 					"type": "string"
+				},
+				"nbt": {
+					"type": "string"
 				}
 			}
 		},
@@ -129,14 +133,17 @@
 				"affected_bones_is_a_whitelist"
 			],
 			"properties": {
-				"frames": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/animation_frame"
-					}
+				"start_delay": {
+					"type": "number",
+					"minimum": 0
+				},
+				"loop_delay": {
+					"type": "number",
+					"minimum": 0
 				},
 				"duration": {
-					"type": "number"
+					"type": "number",
+					"minimum": 0
 				},
 				"loop_mode": {
 					"$ref": "#/definitions/animation_loop_mode"
@@ -151,6 +158,12 @@
 				"affected_bones_is_a_whitelist": {
 					"type": "boolean",
 					"description": "If true, only the bones in the list are affected. If false, all bones except those in the list are affected."
+				},
+				"frames": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/animation_frame"
+					}
 				}
 			}
 		},

exporters/jsonExporter/jsonStructure.yaml

@@ -2,7 +2,7 @@
 	"type": "module",
 	"name": "animated_java",
 	"title": "Animated Java",
-	"version": "0.4.4",
+	"version": "0.4.5",
 	"min_blockbench_version": "4.6.5",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",

package.json

@@ -250,6 +250,8 @@ animated_java.actions.add_variant.name: Add Variant
 animated_java.actions.add_variant.description: Create a new Variant
 animated_java.actions.variant_properties.name: Variant Properties
 animated_java.actions.variant_properties.description: Open the Variant properties dialog.
+animated_java.actions.duplicate_variant.name: Duplicate Variant
+animated_java.actions.duplicate_variant.description: Duplicate this Variant.
 
 ### Variants Properties Dialog
 animated_java.dialog.variant_properties.title: Variant Properties