Fixes and features

- Fixed #35, #32, and #20
- Added features from #41

Author: SnaveSutit

src/animationRenderer.js

@@ -276,6 +276,29 @@ async function renderAnimation(options) {
 		console.log('Rendered Groups:', renderedGroups)
 
 		for (const animation of Animator.animations.sort()) {
+			if (animation.snapping != 20) {
+				throw new CustomError('Invalid Snapping Value Error', {
+					intentional: true,
+					dialog: {
+						id: 'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue',
+						title: tl(
+							'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.title'
+						),
+						lines: format(
+							tl(
+								'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.body'
+							),
+							{
+								animationName: animation.name,
+								snapping: animation.snapping
+							}
+						)
+							.split('\n')
+							.map((line) => `<p>${line}</p>`),
+					},
+				})
+			}
+
 			const value = Cache.hit(animation)
 			if (!value) {
 				let maxDistance = -Infinity

src/exporters/animationExporter.ts

@@ -184,6 +184,7 @@ async function createMCFile(
 				.join('\n')}
 			scoreboard players add .aj.animation ${scoreboards.animatingFlag} 0
 			scoreboard players add .aj.anim_loop ${scoreboards.animatingFlag} 0
+			scoreboard players set .noScripts ${scoreboards.internal} 0
 		}
 	`)
 	// prettier-ignore
@@ -534,6 +535,24 @@ async function createMCFile(
 	}
 
 	{
+		if (!Object.keys(animations).length) {
+			throw new CustomError('No Animations Error', {
+				intentional: true,
+				dialog: {
+					id: 'animatedJava_exporter_animationExporter.popup.warning.noAnimations',
+					title: tl(
+						'animatedJava_exporter_animationExporter.popup.warning.noAnimations.title'
+					),
+					lines:
+						tl(
+							'animatedJava_exporter_animationExporter.popup.warning.noAnimations.body'
+						)
+						.split('\n')
+						.map((line: string) => `<p>${line}</p>`),
+				},
+			})
+		}
+
 		//? Animation Dir
 		FILE.push(`dir animations {`)
 
@@ -681,9 +700,10 @@ async function createMCFile(
 						# Reset animation time
 						scoreboard players set @s ${scoreboards.frame} 0
 						# load initial animation frame without running scripts
+						scoreboard players operation .oldValue ${scoreboards.internal} = .noScripts ${scoreboards.internal}
 						scoreboard players set .noScripts ${scoreboards.internal} 1
 						function ${projectName}:animations/${animation.name}/next_frame
-						scoreboard players set .noScripts ${scoreboards.internal} 0
+						scoreboard players operation .noScripts ${scoreboards.internal} = .oldValue ${scoreboards.internal}
 						# Reset animation time
 						scoreboard players set @s ${scoreboards.frame} 0
 					# If this entity is not the root

src/exporters/statueExporter.ts

@@ -686,7 +686,7 @@ const Exporter = (AJ: any) => {
 					AJ.settings.animatedJava_exporter_statueExporter
 						.exportMode === 'mcb' &&
 					(value === '' ||
-						b.base !== `${AJ.settings.animatedJava.projectName}.mc`)
+						b.base === `${AJ.settings.animatedJava.projectName}.mc`)
 				)
 			},
 			isVisible(settings: any) {

src/lang/en.yaml

@@ -68,13 +68,19 @@ animatedJava.customErrorReport.titleUndefined: Unknown Error
 
 animatedJava.popup.error.unableToGenerateTexturePath.title: Invalid texture path
 animatedJava.popup.error.unableToGenerateTexturePath.body: |-
-    The texture '%textureName' has an invalid location inside a resource pack
-    Please make sure it is properly saved inside of a valid resource pack in a sub folder of 'assets/namespace/textures/'
+    The texture '%textureName' has an invalid location inside a Resource Pack
+    Please make sure it is properly saved inside of a valid Resource Pack in a sub folder of 'assets/namespace/textures/'
+    eg. 'resources/assets/minecraft/textures/item/diamond.png'
 
 animatedJava.popup.error.invalidCubeRotations.title: Invalid Element Rotations
 animatedJava.popup.error.invalidCubeRotations.body: |-
     The rotations of some cubes are invalid for the java model format.
-    Please all invalid rotations before exporting
+    Please fix all invalid rotations before exporting.
+
+animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.title: Invalid Animation Snapping Value
+animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.body: |-
+    The animation '%animationName' has a snapping value of %snapping!
+    Due to how fast Minecraft ticks, Animated Java only supports a snapping value of 20.
 
 animatedJava.popup.error.unsavedTexture.title: Unsaved Texture
 animatedJava.popup.error.unsavedTexture.body: |-
@@ -196,7 +202,7 @@ animatedJava_exporter_statueExporter.setting.exportMode.vanilla.name: Vanilla
 animatedJava_exporter_statueExporter.setting.exportMode.mcb.name: MCB
 
 animatedJava_exporter_statueExporter.setting.mcbFilePath.name: Lang-mc file
-animatedJava_exporter_statueExporter.setting.mcbFilePath.description: The path to export the .mc file to
+animatedJava_exporter_statueExporter.setting.mcbFilePath.description: The path to export the .mc file to\nYou will need to install mc-extra into your MCB workspace in order to build the exported data pack
 
 animatedJava_exporter_statueExporter.setting.mcbConfigPath.name: Lang-mc config.json Path
 animatedJava_exporter_statueExporter.setting.mcbConfigPath.description: |-
@@ -268,14 +274,19 @@ animatedJava_exporter_animationExporter.setting.exportMode.vanilla.name: Vanilla
 animatedJava_exporter_animationExporter.setting.exportMode.mcb.name: MCB
 
 animatedJava_exporter_animationExporter.setting.mcbFilePath.name: Lang-mc File Path
-animatedJava_exporter_animationExporter.setting.mcbFilePath.description: The path to export the .mc file to
+animatedJava_exporter_animationExporter.setting.mcbFilePath.description: The path to export the .mc file to\nYou will need to install mc-extra into your MCB workspace in order to build the exported data pack
 animatedJava_exporter_animationExporter.setting.mcbFilePath.invalidPopup.text: Invalid MCB File Path! The MCB file must be called %projectName.mc (project_name.mc)
 
 animatedJava_exporter_animationExporter.setting.mcbConfigPath.name: Lang-mc config.json Path
 animatedJava_exporter_animationExporter.setting.mcbConfigPath.description: |-
     Exports the default MCB config for Animated Java
     WARNING! Will overwrite existing config.json
 
+animatedJava_exporter_animationExporter.popup.warning.noAnimations.title: No Animations
+animatedJava_exporter_animationExporter.popup.warning.noAnimations.body: |-
+  You haven't made any animations!
+  You'll need to create some animations in the animation tab before you can export using the animation exporter.
+
 animatedJava_exporter_animationExporter.setting.dataPackPath.name: Data Pack
 animatedJava_exporter_animationExporter.setting.dataPackPath.description: The path to export the generated Data Pack to.
 animatedJava_exporter_animationExporter.popup.error.dataPackPathNotDefined.title: Data Pack file path undefined