I BROKE EVERYTHING

- Halfway though updating translation files

Author: SnaveSutit

debug_resourcepack/armor_stand.ajmodel

@@ -1,7 +1,7 @@
 {
   "meta": {
     "format_version": "0.0",
-    "creation_time": 1641691376,
+    "creation_time": 1641692475,
     "model_format": "animated_java/ajmodel",
     "box_uv": false,
     "settings": {
@@ -21,6 +21,7 @@
         "modelTag": "aj.%projectName",
         "rootTag": "aj.%projectName.root",
         "allBonesTag": "aj.%projectName.bone",
+        "boneModelDisplayTag": "aj.%projectName.bone_display",
         "individualBoneTag": "aj.%projectName.bone.%boneName",
         "internalScoreboardObjective": "aj.i",
         "idScoreboardObjective": "aj.id",
@@ -47,7 +48,7 @@
         "animatingFlagScoreboardObjective": "aj.%projectName.animating",
         "animationLoopModeScoreboardObjective": "aj.%projectName.%animationName.loopMode",
         "exportMode": "mcb",
-        "mcbFilePath": "",
+        "mcbFilePath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\saves\\Animated Java Dev\\datapacks\\Animated Java Development\\src\\armor_stand.mc",
         "mcbConfigPath": "",
         "dataPackPath": ""
       }

src/exporters/animationExporter.ts

@@ -1457,7 +1457,7 @@ const Exporter = (AJ: any) => {
 							b.base !==
 							`${AJ.settings.animatedJava.projectName}.mc`
 						) {
-							d.isValid
+							d.isValid = false
 							d.error = format(
 								tl(
 									'animatedJava_exporter_animationExporter.setting.mcbFilePath.error.mustBeNamedAfterProject'

src/exporters/statueExporter.ts

@@ -10,6 +10,7 @@ import { SNBT, SNBTTag, SNBTTagType } from '../util/SNBT'
 import { Path } from '../util/path'
 import { compileMC } from '../compileLangMC'
 import * as fs from 'fs'
+import { Entities } from '../util/minecraft/entities'
 
 interface statueExporterSettings {
 	modelTag: string
@@ -552,102 +553,131 @@ async function statueExport(data: any) {
 	)
 }
 
+const genericEmptySettingText = tl(
+	'animatedJava_exporter_statueExporter.generic.error.empty'
+)
+
+function validateFormattedStringSetting(required: string[]) {
+	return (d: aj.SettingDescriptor) => {
+		if (d.value === '') {
+			d.isValid = false
+			d.error = genericEmptySettingText
+			return d
+		}
+		if (required.length) {
+			const notFound = required.find((v: string) => !d.value.includes(v))
+			if (notFound) {
+				d.isValid = false
+				d.error = format(
+					tl(
+						'animatedJava_exporter_statueExporter.generic.error.missingFormatString'
+					),
+					{
+						notFound,
+					}
+				)
+			}
+		}
+		return d
+	}
+}
+
 const Exporter = (AJ: any) => {
 	AJ.settings.registerPluginSettings('animatedJava_exporter_statueExporter', {
 		rootEntityType: {
 			type: 'text',
 			default: 'minecraft:marker',
-			populate() {
-				return 'minecraft:marker'
-			},
-			isValid(value: any) {
-				return value != ''
+			onUpdate(d: aj.SettingDescriptor) {
+				if (d.value != '') {
+					if (!Entities.isEntity(d.value)) {
+						d.isValid = false
+						d.error = tl(
+							'animatedJava_exporter_statueExporter.setting.rootEntityType.error.invalidEntity'
+						)
+					}
+				} else {
+					d.isValid = false
+					d.error = genericEmptySettingText
+				}
+
+				return d
 			},
-			isResetable: true,
 		},
 		rootEntityNbt: {
 			type: 'text',
 			default: '{}',
-			populate() {
-				return '{}'
-			},
-			isValid(value: any) {
-				return value != ''
+			onUpdate(d: aj.SettingDescriptor) {
+				if (d.value != '') {
+					try {
+						SNBT.parse(d.value)
+					} catch (e) {
+						d.isValid = false
+						d.error = tl(
+							'animatedJava_exporter_statueExporter.setting.rootEntityNbt.error.invalidNbt'
+						)
+					}
+				} else {
+					d.isValid = false
+					d.error = genericEmptySettingText
+				}
+				return d
 			},
 		},
 		markerArmorStands: {
 			type: 'checkbox',
 			default: true,
-			populate() {
-				return true
-			},
-			isValid(value: any) {
-				return typeof value === 'boolean'
+			onUpdate(d: aj.SettingDescriptor) {
+				return d
 			},
 		},
 		modelTag: {
 			type: 'text',
 			default: 'aj.%projectName',
-			populate() {
-				return 'aj.%projectName'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
+			onUpdate: validateFormattedStringSetting(['%projectName']),
 			isResetable: true,
 		},
 		rootTag: {
 			type: 'text',
 			default: 'aj.%projectName.root',
-			populate() {
-				return 'aj.%projectName.root'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
+			onUpdate: validateFormattedStringSetting(['%projectName']),
 			isResetable: true,
 		},
 		allBonesTag: {
 			type: 'text',
 			default: 'aj.%projectName.bone',
-			populate() {
-				return 'aj.%projectName.bone'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
+			onUpdate: validateFormattedStringSetting(['%projectName']),
+			isResetable: true,
+		},
+		boneModelDisplayTag: {
+			type: 'text',
+			default: 'aj.%projectName.bone_display',
+			onUpdate: validateFormattedStringSetting(['%projectName']),
 			isResetable: true,
 		},
 		individualBoneTag: {
 			type: 'text',
 			default: 'aj.%projectName.bone.%boneName',
-			populate() {
-				return 'aj.%projectName.bone.%boneName'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
+			onUpdate: validateFormattedStringSetting([
+				'%projectName',
+				'%boneName',
+			]),
 			isResetable: true,
 		},
 		internalScoreboardObjective: {
 			type: 'text',
 			default: 'aj.i',
-			populate() {
-				return 'aj.i'
-			},
-			isValid(value: any) {
-				return value != ''
+			onUpdate(d: aj.SettingDescriptor) {
+				if (d.value === '') {
+					d.isValid = false
+					d.error = genericEmptySettingText
+				}
+				return d
 			},
 		},
 		idScoreboardObjective: {
 			type: 'text',
 			default: 'aj.id',
-			populate() {
-				return 'aj.id'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
+			onUpdate: validateFormattedStringSetting([]),
 		},
 		exportMode: {
 			type: 'select',
@@ -657,12 +687,6 @@ const Exporter = (AJ: any) => {
 					'animatedJava_exporter_statueExporter.setting.exportMode.vanilla.name',
 				mcb: 'animatedJava_exporter_statueExporter.setting.exportMode.mcb.name',
 			},
-			populate() {
-				return 'mcb'
-			},
-			isValid(value: any) {
-				return value != ''
-			},
 		},
 		mcbFilePath: {
 			type: 'filepath',
@@ -676,26 +700,40 @@ const Exporter = (AJ: any) => {
 					properties: ['openFile'],
 				},
 			},
-			populate() {
-				return ''
-			},
-			isValid(value: any) {
-				const p = new Path(value)
-				const b = p.parse()
-				return (
-					AJ.settings.animatedJava_exporter_statueExporter
-						.exportMode === 'mcb' &&
-					(value === '' ||
-						b.base === `${AJ.settings.animatedJava.projectName}.mc`)
-				)
+			onUpdate(d: aj.SettingDescriptor) {
+				if (d.value != '') {
+					const p = new Path(d.value)
+					const b = p.parse()
+					if (
+						b.base !== `${AJ.settings.animatedJava.projectName}.mc`
+					) {
+						d.isValid = false
+						d.error = format(
+							tl(
+								'animatedJava_exporter_statueExporter.setting.mcbFilePath.error.mustBeNamedAfterProject'
+							),
+							{
+								projectName:
+									AJ.settings.animatedJava.projectName,
+							}
+						)
+					}
+				} else {
+					d.isValid = false
+					d.error = genericEmptySettingText
+				}
+				return d
 			},
 			isVisible(settings: any) {
 				return (
 					settings.animatedJava_exporter_statueExporter.exportMode ===
 					'mcb'
 				)
 			},
-			dependencies: ['animatedJava_exporter_statueExporter.exportMode'],
+			dependencies: [
+				'animatedJava_exporter_statueExporter.exportMode',
+				'animatedJava.projectName',
+			],
 		},
 		mcbConfigPath: {
 			type: 'filepath',
@@ -737,11 +775,12 @@ const Exporter = (AJ: any) => {
 					properties: ['openDirectory'],
 				},
 			},
-			populate() {
-				return ''
-			},
-			isValid(value: any) {
-				return value != ''
+			onUpdate(d: aj.SettingDescriptor) {
+				if (d.value === '') {
+					d.isValid = false
+					d.error = genericEmptySettingText
+				}
+				return d
 			},
 			isVisible(settings: any) {
 				return (