✨ Update version-specific vanilla models when changing target MC version

Author: SnaveSutit

src/dialogs/blueprintSettings/blueprintSettings.ts

@@ -7,6 +7,8 @@ import {
 	OPEN_DOCUMENTATION,
 } from '../../interface/animatedJavaBarItem'
 import { updateAllCubeOutlines } from '../../mods/cube'
+import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay'
+import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
 import { createScopedTranslator } from '../../util/lang'
 import FooterComponent from './footer.svelte'
 import DatapackComponent from './pages/datapack.svelte'
@@ -81,6 +83,9 @@ export function openBlueprintSettings() {
 		disableKeybinds: true,
 		buttons: [tl('dialog.close')],
 		onClose: () => {
+			VanillaBlockDisplay.forceUpdateAll()
+			VanillaItemDisplay.forceUpdateAll()
+			VanillaItemDisplay.forceUpdateAll()
 			updateRotationConstraints()
 			updateAllCubeOutlines()
 			Canvas.updateAll()

src/outliner/textDisplay.ts

@@ -71,6 +71,12 @@ export class TextDisplay extends ResizableOutlinerElement {
 		this.sanitizeName()
 	}
 
+	static forceUpdateAll() {
+		for (const textDisplay of TextDisplay.all) {
+			textDisplay.preview_controller.updateAll(textDisplay)
+		}
+	}
+
 	sanitizeName(): string {
 		this.name = sanitizeOutlinerElementName(this.name, this.uuid)
 		return this.name

src/outliner/vanillaBlockDisplay.ts

@@ -64,6 +64,12 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 		})
 	}
 
+	static forceUpdateAll() {
+		for (const blockDisplay of VanillaBlockDisplay.all) {
+			blockDisplay.preview_controller.updateAll(blockDisplay)
+		}
+	}
+
 	get block() {
 		if (this.__block === undefined) return 'minecraft:stone'
 		return this.__block.get()

src/outliner/vanillaItemDisplay.ts

@@ -75,6 +75,12 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 		})
 	}
 
+	static forceUpdateAll() {
+		for (const itemDisplay of VanillaItemDisplay.all) {
+			itemDisplay.preview_controller.updateAll(itemDisplay)
+		}
+	}
+
 	get item() {
 		if (this.__item === undefined) return 'minecraft:diamond'
 		return this.__item.get()

src/systems/minecraft/blockModelManager.ts

@@ -49,16 +49,20 @@ const BLACKLISTED_BLOCKS = new Map([
 	['piglin_wall_head', translate('block_model_manager.mob_head_warning')],
 ])
 
-export async function getBlockModel(block: string): Promise<BlockModelMesh | undefined> {
-	let result = BLOCK_MODEL_CACHE.get(block)
+export async function getBlockModel(
+	block: string,
+	minecraftVersion = Project.animated_java.target_minecraft_version
+): Promise<BlockModelMesh | undefined> {
+	const key = minecraftVersion + '|' + block
+	let result = BLOCK_MODEL_CACHE.get(key)
 	if (!result) {
 		const parsed = await parseBlock(block)
 		if (!parsed) return undefined
 		if (BLACKLISTED_BLOCKS.has(block)) {
 			throw new Error(BLACKLISTED_BLOCKS.get(block))
 		}
 		result = await parseBlockState(parsed)
-		BLOCK_MODEL_CACHE.set(block, result)
+		BLOCK_MODEL_CACHE.set(key, result)
 	}
 	if (!result) return undefined
 	result = {

src/systems/minecraft/fontManager.ts

@@ -407,9 +407,12 @@ export class MinecraftFont {
 		return Math.max(width, 0)
 	}
 
-	getColorMaterial(color: tinycolor.Instance): THREE.Material {
-		const colorString = color.toHex8String()
-		let material = this.materialCache.get(colorString)
+	getColorMaterial(
+		color: tinycolor.Instance,
+		minecraftVersion = Project.animated_java.target_minecraft_version
+	): THREE.Material {
+		const cacheKey = color.toHex8String() + ';' + minecraftVersion
+		let material = this.materialCache.get(cacheKey)
 		if (!material) {
 			const alpha = color.getAlpha()
 			if (alpha < 1) {
@@ -421,7 +424,7 @@ export class MinecraftFont {
 			} else {
 				material = new THREE.MeshBasicMaterial({ color: color.toHexString() })
 			}
-			this.materialCache.set(colorString, material)
+			this.materialCache.set(cacheKey, material)
 		}
 		return material
 	}
@@ -571,7 +574,11 @@ export class MinecraftFont {
 		return { mesh, hitbox: backgroundGeo, outline }
 	}
 
-	async getCharGeo(char: string, style: TextComponentStyle): Promise<CachedCharGeo> {
+	async getCharGeo(
+		char: string,
+		style: TextComponentStyle,
+		minecraftVersion = Project.animated_java.target_minecraft_version
+	): Promise<CachedCharGeo> {
 		let font: MinecraftFont = this
 		if (style.font) {
 			const newFont = await MinecraftFont.getById(style.font)
@@ -580,12 +587,12 @@ export class MinecraftFont {
 
 		const hash = createHash('sha256')
 		hash.update(char)
+		hash.update(';' + minecraftVersion)
 		hash.update(';' + font.id)
-		if (style.bold) hash.update('bold')
-		if (style.italic) hash.update('italic')
-		if (style.underlined) hash.update('underlined')
-		if (style.strikethrough) hash.update('strikethrough')
-		if (style.font) hash.update(';' + font.id)
+		if (style.bold) hash.update(';bold')
+		if (style.italic) hash.update(';italic')
+		if (style.underlined) hash.update(';underlined')
+		if (style.strikethrough) hash.update(';strikethrough')
 		const digest = hash.digest('hex')
 
 		const charData = font.getChar(char)

src/systems/minecraft/itemModelManager.ts

@@ -18,9 +18,10 @@ const ITEM_MODEL_CACHE = new Map<string, ItemMesh>()
 
 export async function getItemModel(
 	item: string,
-	itemDisplay: ItemDisplayMode
+	itemDisplay: ItemDisplayMode,
+	minecraftVersion = Project.animated_java.target_minecraft_version
 ): Promise<ItemMesh | undefined> {
-	const cacheKey = item + '|' + itemDisplay
+	const cacheKey = minecraftVersion + '|' + item + '|' + itemDisplay
 	let result = ITEM_MODEL_CACHE.get(cacheKey)
 	if (!result) {
 		result = await parseItemModel(getItemResourceLocation(item), itemDisplay)