🐛 Fix display item model merging in 1.20.4

Author: SnaveSutit

src/systems/resourcepackCompiler/1.20.4.ts

@@ -131,6 +131,7 @@ const compileResourcePack: ResourcePackCompiler = async ({
 	coreFiles,
 	versionedFiles,
 	rig,
+	resourcePackPath,
 	displayItemPath,
 	textureExportFolder,
 	modelExportFolder,
@@ -150,9 +151,10 @@ const compileResourcePack: ResourcePackCompiler = async ({
 
 	// Display Item
 	const displayItemModel = new PredicateItemModel()
-	if (fs.existsSync(displayItemPath)) {
+	const absoluteDisplayItemPath = PathModule.join(resourcePackPath, displayItemPath)
+	if (fs.existsSync(absoluteDisplayItemPath)) {
 		console.warn('Display item already exists! Attempting to merge...')
-		displayItemModel.readExisting(displayItemPath)
+		displayItemModel.readExisting(absoluteDisplayItemPath)
 	}
 
 	displayItemModel.lastOverrideId = Math.max(

src/systems/resourcepackCompiler/index.ts

@@ -27,6 +27,7 @@ interface ResourcePackCompilerOptions {
 	coreFiles: Map<string, ExportedFile>
 	versionedFiles: Map<string, ExportedFile>
 	rig: IRenderedRig
+	resourcePackPath: string
 	displayItemPath: string
 	textureExportFolder: string
 	modelExportFolder: string
@@ -81,6 +82,7 @@ export default async function compileResourcePack(
 		// Move paths into versioned overlay folders.
 		await VERSIONED_RESOURCE_PACK_COMPILERS[version]({
 			...options,
+			resourcePackPath: versionedResourcePackFolder,
 			ajmeta,
 			coreFiles,
 			versionedFiles,