Fixed #67

Author: SnaveSutit

src/exporting.ts

@@ -237,7 +237,6 @@ async function exportPredicate(
 	ajSettings: aj.Settings
 ) {
 	console.groupCollapsed('Export Predicate Model')
-	const projectName = safeFunctionName(ajSettings.projectName)
 
 	const predicateJSON = {
 		parent: 'item/generated',
@@ -249,6 +248,7 @@ async function exportPredicate(
 			includedRigs: {},
 		},
 	}
+
 	let usedIDs = []
 	function* idGen() {
 		let id = 1
@@ -257,12 +257,24 @@ async function exportPredicate(
 			id++
 		}
 	}
+
 	if (fs.existsSync(ajSettings.predicateFilePath)) {
-		const oldPredicate: PredicateModel = JSON.parse(
-			await fs.promises.readFile(ajSettings.predicateFilePath, {
+		const stringContent = await fs.promises.readFile(
+			ajSettings.predicateFilePath,
+			{
 				encoding: 'utf-8',
-			})
+			}
 		)
+		let oldPredicate: PredicateModel
+		try {
+			oldPredicate = JSON.parse(stringContent)
+		} catch (err) {
+			throwPredicateMergingError(
+				tl(
+					'animatedJava.dialogs.errors.predicateMergeFailed.reasons.invalidJson'
+				)
+			)
+		}
 		console.log(oldPredicate)
 		// @ts-ignore
 		if (oldPredicate) {
@@ -347,8 +359,8 @@ async function exportPredicate(
 			})
 		}
 
-	predicateJSON.overrides.sort((a: any,b: any) => {
-		return (a.predicate.custom_model_data - b.predicate.custom_model_data)
+	predicateJSON.overrides.sort((a: any, b: any) => {
+		return a.predicate.custom_model_data - b.predicate.custom_model_data
 	})
 	//@ts-ignore
 	predicateJSON.aj.includedRigs[Project.UUID] = {

src/lang/en.yaml

@@ -190,6 +190,7 @@ animatedJava:
         reasons:
           overridesMissing: Model overrides list missing.
           ajMetaMissing: Model file to merge into is not an Animated Java predicate file.
+          invalidJson: Model file to merge into does not contain valid JSON
 
       invalidAnimationSnappingValue:
         title: Invalid Animation Snapping Value

src/util/minecraft/resourcepack.ts

@@ -3,7 +3,6 @@ import * as path from 'path'
 import { CustomError } from '../customError'
 import { tl } from '../intl'
 import { normalizePath } from '../misc'
-import { format } from '../replace'
 
 export function getTexturePath(texture: any) {
 	if (!texture.path || !texture.saved) {