🚧 Add null state for fully transparent models.

Author: SnaveSutit

schemas/pluginJson.schema.json

@@ -11,7 +11,6 @@
 					"required": [
 						"export_namespace",
 						"bounding_box",
-						"display_item",
 						"custom_model_data_offset",
 						"baked_animations"
 					],
@@ -185,6 +184,10 @@
 			"properties": {
 				"model": {
 					"oneOf": [
+						{
+							"type": "null",
+							"description": "If the model is null it means all of the textures for this model were replaced with the internal transparency texture"
+						},
 						{ "$ref": "#/definitions/vanillaModel" },
 						{ "$ref": "#/definitions/variantModel" }
 					]
@@ -247,7 +250,7 @@
 		},
 		"node": {
 			"type": "object",
-			"required": ["type", "name", "safe_name", "uuid", "default_transform"],
+			"required": ["type", "name", "uuid", "default_transform"],
 			"properties": {
 				"type": {
 					"type": "string",
@@ -262,7 +265,6 @@
 					]
 				},
 				"name": { "type": "string" },
-				"safe_name": { "type": "string" },
 				"uuid": { "type": "string" },
 				"parent": { "type": "string" },
 				"default_transform": {
@@ -436,7 +438,6 @@
 					"type": "object",
 					"required": [
 						"name",
-						"safe_name",
 						"duration",
 						"loop_delay",
 						"loop_mode",
@@ -446,7 +447,6 @@
 					"additionalProperties": false,
 					"properties": {
 						"name": { "type": "string" },
-						"safe_name": { "type": "string" },
 						"duration": { "type": "number" },
 						"loop_delay": { "type": "number" },
 						"loop_mode": { "type": "string", "enum": ["none", "loop", "ping-pong"] },
@@ -665,13 +665,9 @@
 		},
 		"texture": {
 			"type": "object",
-			"required": ["name", "id", "src"],
+			"required": ["name", "src"],
 			"properties": {
 				"name": { "type": "string" },
-				"id": {
-					"type": "string",
-					"description": "The ID of the texture used when making vanilla models."
-				},
 				"src": {
 					"type": "string",
 					"description": "A data URL containing the texture image."

src/components/animationProperties.svelte

@@ -41,6 +41,7 @@
 		label={translate('dialog.animation_properties.animation_name.title')}
 		tooltip={translate('dialog.animation_properties.animation_name.description')}
 		bind:value={animationName}
+		defaultValue={'new'}
 		valueChecker={animationNameValueChecker}
 	/>
 
@@ -61,6 +62,7 @@
 		tooltip={translate('dialog.animation_properties.loop_delay.description')}
 		min={0}
 		bind:value={loopDelay}
+		defaultValue={0}
 	/>
 
 	<Collection

src/systems/datapackCompiler/animation.mcb

@@ -665,9 +665,14 @@ dir <%export_namespace%> {
 							{'export_namespace': '<%export_namespace%>', 'function_path': 'animated_java:<%export_namespace%>/variants/<%variant.name%>/apply'}
 					REPEAT (Object.values(rig.nodes)) as node {
 						IF (node.type === 'bone' && !variant.excluded_nodes.includes(node.uuid) && (variant.models[node.uuid] !== undefined || node.configs.variants[variant.uuid] !== undefined)) {
+
 							execute on passengers if entity @s[tag=aj.<%export_namespace%>.bone.<%node.safe_name%>] run {
 								IF (variant.models[node.uuid] !== undefined) {
-									data modify entity @s item.components.minecraft:custom_model_data set value <%variant.models[node.uuid].custom_model_data%>
+									IF (variant.models[node.uuid].model === null) {
+										data modify entity @s item.components.minecraft:custom_model_data set value 1
+									} ELSE {
+										data modify entity @s item.components.minecraft:custom_model_data set value <%variant.models[node.uuid].custom_model_data%>
+									}
 								}
 								IF (node.configs.variants[variant.uuid]) {
 									<%%

src/systems/jsonCompiler.ts

@@ -101,7 +101,7 @@ interface ExportedTexture {
 	src: string
 }
 type ExportedVariantModel = Omit<IRenderedVariantModel, 'model_path' | 'resource_location'> & {
-	model: IRenderedModel
+	model: IRenderedModel | null
 	custom_model_data: number
 }
 type ExportedVariant = Omit<IRenderedVariant, 'models'> & {
@@ -203,14 +203,7 @@ function serializeVariant(rig: IRenderedRig, variant: IRenderedVariant): Exporte
 		...variant,
 		models: mapObjEntries(variant.models, (uuid, model) => {
 			const json: ExportedVariantModel = {
-				model: {
-					...model.model,
-					// textures: mapObjEntries(model.model.textures, (id, path) => {
-					// 	const actualTexture = rig.textures[id]
-					// 	if (!actualTexture) return [id, path]
-					// 	return [id, actualTexture.uuid]
-					// }),
-				},
+				model: model.model,
 				custom_model_data: model.custom_model_data,
 			}
 			return [uuid, json]

src/systems/rigRenderer.ts

@@ -148,7 +148,7 @@ export interface IRenderedNodes {
 export type AnyRenderedNode = IRenderedNodes[keyof IRenderedNodes]
 
 export interface IRenderedVariantModel {
-	model: IRenderedModel
+	model: IRenderedModel | null
 	custom_model_data: number
 	model_path: string
 	resource_location: string
@@ -383,7 +383,7 @@ function renderGroup(
 				break
 			}
 			case node instanceof Cube: {
-				renderCube(node, rig, groupModel.model)
+				renderCube(node, rig, groupModel.model!)
 				rig.includes_custom_models = true
 				break
 			}
@@ -393,7 +393,7 @@ function renderGroup(
 	}
 
 	// Export a struct instead of a bone if no elements are present
-	if (!groupModel.model.elements || groupModel.model.elements.length === 0) {
+	if (!groupModel.model || !groupModel.model.elements || groupModel.model.elements.length === 0) {
 		delete defaultVariant.models[group.uuid]
 		const struct: IRenderedNodes['Struct'] = {
 			type: 'struct',
@@ -559,6 +559,9 @@ function renderVariantModels(variant: Variant, rig: IRenderedRig) {
 		if (variant.excludedNodes.find(v => v.value === uuid)) continue
 		const textures: IRenderedModel['textures'] = {}
 
+		// Is set false if any texture other than the internal transparency texture is found.
+		let isTransparent = true
+
 		for (const [fromUUID, toUUID] of variant.textureMap.map.entries()) {
 			const fromTexture = Texture.all.find(t => t.uuid === fromUUID)
 			if (!fromTexture) throw new Error(`From texture not found: ${fromUUID}`)
@@ -573,11 +576,12 @@ function renderVariantModels(variant: Variant, rig: IRenderedRig) {
 					rig
 				).resourceLocation
 				rig.textures[toTexture.id] = toTexture
+				isTransparent = false
 			}
 		}
 
-		// Don't export models without any texture changes
-		if (Object.keys(textures).length === 0) continue
+		// Don't export models without any texture changes, or that are fully transparent.
+		if (isTransparent || Object.keys(textures).length === 0) continue
 
 		const modelParent = PathModule.join(
 			rig.model_export_folder,

test_blueprints/armor_stand.ajblueprint

@@ -11,7 +11,7 @@
 		"show_bounding_box": false,
 		"auto_bounding_box": true,
 		"bounding_box": [95, 32],
-		"enable_plugin_mode": false,
+		"enable_plugin_mode": true,
 		"resource_pack_export_mode": "raw",
 		"data_pack_export_mode": "raw",
 		"display_item": "minecraft:white_dye",
@@ -3061,7 +3061,7 @@
 			"override": false,
 			"length": 0.8,
 			"snapping": 20,
-			"selected": false,
+			"selected": true,
 			"saved": false,
 			"path": "",
 			"anim_time_update": "",