🐛 Fix custom fonts breaking Text Display components

Author: SnaveSutit

src/systems/jsonText/wrapping.ts

@@ -254,14 +254,15 @@ export async function wrapJsonText(jsonText: TextComponent, maxLineWidth = 200)
 
 	const words = await parseWords(jsonText.toJSON())
 	const lines: Line[] = []
-	// FIXME - This will not work for custom fonts
-	const font = await MinecraftFont.getById('minecraft:default')
+	// The `getWordWidth` function handles getting the width of words with different / custom fonts
+	const font = (await MinecraftFont.getById('minecraft:default'))!
 
 	let backgroundWidth = 0
 	let currentLine: Line = { words: [], width: 0 }
 	for (const word of words) {
 		const wordWidth = await font.getWordWidth(word)
 		const wordStyles = [...word.styles]
+
 		// If the word is longer than than the max line width, split it into multiple lines
 		if (wordWidth - 1 > maxLineWidth) {
 			if (currentLine.words.length) {
@@ -344,6 +345,15 @@ export async function wrapJsonText(jsonText: TextComponent, maxLineWidth = 200)
 				currentLine.words.pop()
 				currentLine.width -= lastWord.width
 			}
+			if (word.text.at(0) === ' ') {
+				// If the word starts with a space, remove it.
+				word.text = word.text.slice(1)
+				word.styles.forEach(span => {
+					span.start = Math.max(0, span.start - 1)
+					span.end = Math.max(0, span.end - 1)
+				})
+				// word.width = await font.getWordWidth(word)
+			}
 			lines.push(currentLine)
 			backgroundWidth = Math.max(backgroundWidth, currentLine.width)
 			currentLine = { words: [], width: 0 }

src/systems/minecraft/fontManager.ts

@@ -274,7 +274,7 @@ class BitmapFontProvider extends FontProvider {
 }
 
 export class MinecraftFont {
-	static all: MinecraftFont[] = []
+	static all = new Map<string, MinecraftFont>()
 
 	id: string
 	providers: FontProvider[] = []
@@ -291,18 +291,23 @@ export class MinecraftFont {
 		this.assetPath = assetPath
 		this.fallback = fallback
 
-		MinecraftFont.all.push(this)
+		MinecraftFont.all.set(this.id, this)
 	}
 
 	static async getById(id: string) {
-		let font = MinecraftFont.all.find(font => font.id === id)
+		let font = MinecraftFont.all.get(id)
 
 		if (!font) {
 			const path = getPathFromResourceLocation(id, 'font') + '.json'
 			font = new MinecraftFont(id, path)
 		}
 
-		await font.load()
+		try {
+			await font.load()
+		} catch (error) {
+			console.error(`Failed to load font ${font.id} from ${font.assetPath}:`, error)
+			return undefined
+		}
 
 		return font
 	}