🐛 Fix incorrect stringification of JsonText

Author: SnaveSutit

src/systems/datapackCompiler/index.ts

@@ -11,14 +11,15 @@ import {
 	parseDataPackPath,
 	parseResourceLocation,
 } from '../../util/minecraftUtil'
-import { eulerFromQuaternion, roundTo, tinycolorToDecimal } from '../../util/misc'
+import { eulerFromQuaternion, roundTo } from '../../util/misc'
 import { MSLimiter } from '../../util/msLimiter'
 import { Variant } from '../../variants'
 import type { IRenderedAnimation } from '../animationRenderer'
 import mcbFiles from '../datapackCompiler/mcbFiles'
 import { IntentionalExportError } from '../exporter'
 import { AJMeta, PackMeta, type PackMetaFormats, SUPPORTED_MINECRAFT_VERSIONS } from '../global'
 import { JsonText } from '../jsonText'
+import { JsonTextParser } from '../jsonText/parser'
 import type { AnyRenderedNode, IRenderedRig } from '../rigRenderer'
 import {
 	arrayToNbtFloatArray,
@@ -535,46 +536,35 @@ async function generateRootEntityPassengers(
 				break
 			}
 			case 'text_display': {
-				const color = new tinycolor(node.background_color)
-
 				passenger
 					.set('id', new NbtString('minecraft:text_display'))
-					.set('background', new NbtInt(tinycolorToDecimal(color)))
+					.set('background', new NbtInt(JsonText.hexToInt(node.background_color)))
 					.set('line_width', new NbtInt(node.line_width))
 					.set('shadow', new NbtByte(node.shadow ? 1 : 0))
 					.set('see_through', new NbtByte(node.see_through ? 1 : 0))
 					.set('alignment', new NbtString(node.align))
 
-				switch (version) {
-					case '1.20.4':
-					case '1.20.5':
-					case '1.21.0':
-					case '1.21.2':
-					case '1.21.4':
-						passenger.set(
-							'text',
-							// String JSON text format
-							new NbtString(
-								new JsonText(node.text).toString(true, version) ??
-									`{ "text": "Invalid Text Component", "color": "red" }`
-							)
-						)
-						break
-					case '1.21.5':
-						passenger.set(
-							'text',
-							// SNBT JSON text format
-							// Hacky workaround for deepslate not supporting MC's new escape sequences.
-							new NbtString(
-								'$$$' + node.type + '_' + node.storage_name + '_text_placeholder$$$'
-							)
+				if (!compareVersions('1.21.5', version) /* >= 1.21.5 */) {
+					passenger.set(
+						'text',
+						// SNBT JSON text format
+						// Hacky workaround for deepslate not supporting MC's new escape sequences.
+						new NbtString(
+							'$$$' + node.type + '_' + node.storage_name + '_text_placeholder$$$'
 						)
-						break
-					default: {
-						throw new Error(
-							`Unsupported Minecraft version '${version}' for text display!`
+					)
+				} else if (!compareVersions('1.20.4', version) /* >= 1.20.4 */) {
+					passenger.set(
+						'text',
+						// String JSON text format
+						new NbtString(
+							new JsonTextParser({ minecraftVersion: version })
+								.parse(node.text)
+								.toString(true, version)
 						)
-					}
+					)
+				} else {
+					throw new Error(`Unsupported Minecraft version '${version}' for text display!`)
 				}
 
 				if (node.config) {
@@ -652,12 +642,15 @@ async function generateRootEntityPassengers(
 
 	let result = passengers.toString()
 
-	for (const display of Object.values(rig.nodes).filter(n => n.type === 'text_display')) {
-		result = result.replace(
-			'"$$$' + display.type + '_' + display.storage_name + '_text_placeholder$$$"',
-			new JsonText(display.text).toString(true, version) ??
-				`{ "text": "Invalid Text Component", "color": "red" }`
-		)
+	if (!compareVersions('1.21.5', version) /* >= 1.21.5 */) {
+		for (const display of Object.values(rig.nodes).filter(n => n.type === 'text_display')) {
+			result = result.replace(
+				'"$$$' + display.type + '_' + display.storage_name + '_text_placeholder$$$"',
+				new JsonTextParser({ minecraftVersion: version })
+					.parse(display.text)
+					.toString(true, version)
+			)
+		}
 	}
 
 	return result

src/systems/jsonText/index.ts

@@ -246,7 +246,7 @@ export class JsonText {
 
 	toString(minify = true, minecraftVersion = JsonText.defaultMinecraftVersion) {
 		const content = minify ? this.flatten() : this.content
-		return new JsonTextStringifier(content, minecraftVersion).stringify()
+		return new JsonTextStringifier(minecraftVersion).stringify(content)
 	}
 
 	toJSON(): TextElement {

src/systems/jsonText/parser.ts

@@ -164,7 +164,7 @@ enum FEATURES {
 	TEXT_OBJECT_INFERRED_KEYS = 1 << 15,
 }
 
-function compareVersions(a: string, b: string): number {
+export function compareVersions(a: string, b: string): number {
 	const aParts = a.split('.').map(Number)
 	const bParts = b.split('.').map(Number)
 	for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {

src/systems/jsonText/stringifier.ts

@@ -6,25 +6,25 @@ import {
 	type TextElement,
 	type TextObject,
 } from '.'
+import { compareVersions } from './parser'
 
 enum FEATURES {
 	REQUIRE_DOUBLE_QUOTES = 1 << 0,
 	RESOLVE_SPACE_ESCAPE_SEQUENCES = 1 << 1,
 }
 
 export class JsonTextStringifier {
-	enabledFeatures = FEATURES.REQUIRE_DOUBLE_QUOTES
+	enabledFeatures = FEATURES.REQUIRE_DOUBLE_QUOTES | FEATURES.RESOLVE_SPACE_ESCAPE_SEQUENCES
 
-	constructor(private element: TextElement, private minecraftVersion: string) {
-		// targetMinecraftVersion >= 1.21.5
-		if (!compareVersions('1.21.5', this.minecraftVersion)) {
+	constructor(private minecraftVersion: string) {
+		if (compareVersions(this.minecraftVersion, '1.21.5') >= 0) {
 			this.enabledFeatures &= ~FEATURES.REQUIRE_DOUBLE_QUOTES
-			this.enabledFeatures |= FEATURES.RESOLVE_SPACE_ESCAPE_SEQUENCES
+			this.enabledFeatures &= ~FEATURES.RESOLVE_SPACE_ESCAPE_SEQUENCES
 		}
 	}
 
-	stringify(): string {
-		return this.stringifyTextElement(this.element)
+	stringify(element: TextElement): string {
+		return this.stringifyTextElement(element)
 	}
 
 	/**

src/util/misc.ts

@@ -18,11 +18,6 @@ export function roundToNth(n: number, x: number) {
 	return Math.round(n * x) / x
 }
 
-export function tinycolorToDecimal(color: InstanceType<typeof tinycolor>) {
-	const rgba = color.toRgb()
-	return ((rgba.a * 255) << 24) | (rgba.r << 16) | (rgba.g << 8) | rgba.b
-}
-
 export function makeNotZero(vec: THREE.Vector3 | THREE.Euler) {
 	if (vec.x === 0) vec.x = 0.00001
 	if (vec.y === 0) vec.y = 0.00001