🛠️ Fix #268 & #255

Author: SnaveSutit

src/systems/exporter.ts

@@ -4,6 +4,7 @@ import { openBlueprintSettingsDialog } from '../interface/blueprintSettingsDialo
 import { PROGRESS_DESCRIPTION, openExportProgressDialog } from '../interface/exportProgressDialog'
 import { openUnexpectedErrorDialog } from '../interface/unexpectedErrorDialog'
 import { resolvePath } from '../util/fileUtil'
+import { isResourcePackPath } from '../util/minecraftUtil'
 import { translate } from '../util/translation'
 import { Variant } from '../variants'
 import { hashAnimations, renderProjectAnimations } from './animationRenderer'
@@ -24,6 +25,22 @@ async function actuallyExportProject(forceSave = true) {
 	try {
 		console.time('Exporting project took')
 
+		// Verify that all variant texture maps are valid
+		for (const variant of Variant.all) {
+			variant.verifyTextureMap()
+		}
+
+		// Verify that all non-external textures have unique names
+		for (const texture of Texture.all) {
+			if (texture.path && isResourcePackPath(texture.path) && fs.existsSync(texture.path))
+				continue
+			if (Texture.all.some(t => t !== texture && t.name === texture.name)) {
+				throw new IntentionalExportError(
+					`Texture name "${texture.name}" is used more than once. Please make sure all textures have unique names.`
+				)
+			}
+		}
+
 		let textureExportFolder: string, modelExportFolder: string, displayItemPath: string
 
 		const resourcePackFolder = resolvePath(aj.resource_pack)
@@ -161,7 +178,5 @@ export async function exportProject(forceSave = true) {
 
 	settingsDialog.close(0)
 
-	// Verify that all textures have unique IDs
-
 	await actuallyExportProject(forceSave)
 }

src/variants.ts

@@ -66,11 +66,19 @@ export class TextureMap {
 		return textureMap
 	}
 
-	copy() {
+	public copy() {
 		const textureMap = new TextureMap()
 		textureMap.map = new Map(this.map)
 		return textureMap
 	}
+
+	public verifyTextures() {
+		for (const [key, value] of this.map) {
+			if (!Texture.all.some(t => t.uuid === value)) {
+				this.map.delete(key)
+			}
+		}
+	}
 }
 
 export class VariantBoneConfig {
@@ -158,6 +166,10 @@ export class Variant {
 		variant.select()
 	}
 
+	public verifyTextureMap() {
+		this.textureMap.verifyTextures()
+	}
+
 	public static fromJSON(json: IBlueprintVariantJSON, isDefault = false): Variant {
 		const variant = new Variant(json.display_name, isDefault)
 		variant.uuid = json.uuid

test_blueprints/armor_stand.ajblueprint

@@ -857,6 +857,7 @@
 			"scale": [1, 1, 1],
 			"visibility": true,
 			"item": "minecraft:diamond",
+			"item_display": "none",
 			"config": {},
 			"block": "minecraft:stone",
 			"text": "\"\\\"Hello World!\\\"\"\n",
@@ -975,7 +976,6 @@
 					"color": 0,
 					"configs": {
 						"default": {
-							"vanilla_item_model": "",
 							"billboard": "fixed",
 							"brightness_override": 0,
 							"enchanted": false,
@@ -1005,7 +1005,6 @@
 							"color": 0,
 							"configs": {
 								"default": {
-									"vanilla_item_model": "",
 									"billboard": "fixed",
 									"brightness_override": 0,
 									"enchanted": false,
@@ -1037,7 +1036,6 @@
 									"color": 0,
 									"configs": {
 										"default": {
-											"vanilla_item_model": "",
 											"billboard": "fixed",
 											"brightness_override": 0,
 											"enchanted": false,
@@ -1069,7 +1067,6 @@
 											"color": 0,
 											"configs": {
 												"default": {
-													"vanilla_item_model": "",
 													"billboard": "fixed",
 													"override_brightness": false,
 													"brightness_override": 0,
@@ -3070,7 +3067,7 @@
 			"override": false,
 			"length": 0.8,
 			"snapping": 20,
-			"selected": true,
+			"selected": false,
 			"saved": false,
 			"path": "",
 			"anim_time_update": "",