fixes to predicate merging

Author: SnaveSutit

src/exporting.ts

@@ -209,7 +209,27 @@ interface PredicateModel {
 	}
 }
 
-let predicateIDMap = {}
+function throwPredicateMergingError(reason: string) {
+	throw new CustomError('Predicate Missing Overrides List', {
+		intentional: true,
+		dialog: {
+			id: 'animatedJava.predicateMergeFailed',
+			title: tl(
+				'animatedJava.dialogs.errors.predicateMergeFailed.title',
+				{
+					reason,
+				}
+			),
+			lines: [
+				tl('animatedJava.dialogs.errors.predicateMergeFailed.body', {
+					reason,
+				}),
+			],
+			width: 512 + 256,
+			singleButton: true,
+		},
+	})
+}
 
 async function exportPredicate(
 	models: aj.ModelObject,
@@ -245,6 +265,21 @@ async function exportPredicate(
 		)
 		console.log(oldPredicate)
 		// @ts-ignore
+		if (oldPredicate) {
+			if (!oldPredicate?.aj) {
+				throwPredicateMergingError(
+					tl(
+						'animatedJava.dialogs.errors.predicateMergeFailed.reasons.ajMetaMissing'
+					)
+				)
+			} else if (!oldPredicate.overrides) {
+				throwPredicateMergingError(
+					tl(
+						'animatedJava.dialogs.errors.predicateMergeFailed.reasons.overridesMissing'
+					)
+				)
+			}
+		}
 		const data = oldPredicate?.aj?.includedRigs || {}
 		if (!oldPredicate?.aj?.includedRigs) {
 			data.preExistingIds = {

src/lang/en.yaml

@@ -181,6 +181,16 @@ animatedJava:
         body:
           - All cubes must be inside of a group.
 
+      predicateMergeFailed:
+        title: Predicate Failed to Merge
+        body:
+          - "%reason"
+          - Animated Java only supports merging into Animated Java controlled predicate models.
+          - Please make sure you are attempting to merge your predicate item model with a valid pre-existing Animated Java predicate item model.
+        reasons:
+          overridesMissing: Model overrides list missing.
+          ajMetaMissing: Model file to merge into is not an Animated Java predicate file.
+
       invalidAnimationSnappingValue:
         title: Invalid Animation Snapping Value
         body: