Raw Animation Exporter

- Added raw animation exporter
- Updated Linting

Author: SnaveSutit

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,17 +1,17 @@
 ---
 name: Bug report
 about: Report an issue you encountered while using Animated Java
-title: "[BUG]"
+title: '[BUG]'
 labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -21,6 +21,7 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Error Message**
+
 ```
 Paste the message the error displayed when it occurred (if applicable)
 ```
@@ -29,8 +30,9 @@ Paste the message the error displayed when it occurred (if applicable)
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. v0.2.0]
+
+-   OS: [e.g. iOS]
+-   Version [e.g. v0.2.0]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[FR]"
+title: '[FR]'
 labels: ''
 assignees: SnaveSutit
-
 ---
 
 **Is your feature request related to a problem? Please describe.**

README.md

@@ -7,14 +7,16 @@
 Welcome to Animated Java, A tool for mapmakers to create smooth, and detailed animations for Minecraft Java Edition.
 
 # Installing
-- Open Blockbench and navigate to the plugin list
-- Click on the "Available" tab, then search for `Animated Java`
-- Click `install`
-- Congratulations! You've installed Animated Java!
+
+-   Open Blockbench and navigate to the plugin list
+-   Click on the "Available" tab, then search for `Animated Java`
+-   Click `install`
+-   Congratulations! You've installed Animated Java!
 
 # Contributing to Animated Java
 
 ### Setting up a Development Enviornment
+
 You will need to install `nodejs` and `yarn` before you get started.
 
 1. Clone the repo
@@ -24,6 +26,7 @@ You will need to install `nodejs` and `yarn` before you get started.
 To make a production build, run `yarn build` inside your development enviornment.
 
 ### Adding Localizations
+
 Note: Translations should use formal language
 
 1. Fork the animated-java repo.
@@ -34,6 +37,7 @@ Note: Translations should use formal language
 
 To edit an existing language follow the above steps; but instead of overwriting the file just edit it as is.
 You can check what translation keys are missing using the following code inside of blockbench's dev tools (Opened with Ctrl+shift+i)
+
 ```js
 ANIMATED_JAVA.logging = true
 ANIMATED_JAVA.logIntlDifferences()

debug_resourcepack/armor_stand.ajmodel

@@ -1,13 +1,13 @@
 {
   "meta": {
     "format_version": "0.0",
-    "creation_time": 1643574489,
+    "creation_time": 1644081457,
     "model_format": "animated_java/ajmodel",
     "box_uv": false,
     "settings": {
       "animatedJava": {
         "projectName": "armor_stand",
-        "exporter": "vanillaAnimationExporter",
+        "exporter": "rawAnimationExporter",
         "verbose": true,
         "rigItem": "minecraft:leather_horse_armor",
         "rigModelsExportFolder": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\resourcepacks\\Animated Java Testing\\assets\\animated_java\\models\\rigs\\armor_stand",
@@ -53,6 +53,9 @@
         "mcbFilePath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\saves\\Performance Tool 2_0\\datapacks\\performance_tool_2.0\\src\\armor_stand.mc",
         "mcbConfigPath": "",
         "dataPackPath": ""
+      },
+      "rawAnimationExporter": {
+        "outputJsonPath": "C:\\Users\\Snave\\Downloads\\output.json"
       }
     },
     "variants": {

src/animatedJava.ts

@@ -9,8 +9,9 @@ import { settings } from './settings'
 import { registerSettingRenderer } from './ui/dialogs/settings'
 import './ui/mods/boneConfig'
 import './compileLangMC'
-import './exporters/statueExporter'
-import './exporters/animationExporter'
+import './exporters/vanillaStatue'
+import './exporters/vanillaAnimation'
+import './exporters/rawAnimation'
 import './bbmods/modelFormatMod'
 import './bbmods/faceTint'
 import './util/minecraft/items'
@@ -146,6 +147,17 @@ export interface Settings {
 	verbose: boolean
 }
 
+export interface ExportData {
+	settings: GlobalSettings
+	cubeData: CubeData
+	bones: BoneObject
+	models: ModelObject
+	variantTextureOverrides: VariantTextureOverrides
+	variantModels: VariantModels
+	variantTouchedModels: variantTouchedModels
+	animations: Animations
+}
+
 export interface GlobalSettings {
 	animatedJava: Settings
 	[index: string]: any

src/bbmods/modelFormatMod.js

@@ -154,10 +154,10 @@ ModelFormat.prototype.convertTo = function convertTo() {
 	Canvas.updateAllBones()
 	Canvas.updateAllFaces()
 	updateSelection()
-	
+
 	// Mark the project as unsaved, so the user can save it and preserve the conversion
-	Project.saved = false;
-	
+	Project.saved = false
+
 	// Hacky method to refresh the top bar and make the custom tab menu appear without reopening the project
 	Interface.tab_bar.openNewTab()
 	ModelProject.all[0].select()

src/exporters/rawAnimation.ts

@@ -0,0 +1,105 @@
+import type * as aj from '../animatedJava'
+import { CustomError } from '../util/customError'
+import { store } from '../util/store'
+
+interface rawAnimationExporterSettings {
+	outputJsonPath: string
+}
+
+function rawExport(exportData: aj.ExportData) {
+	const ajSettings = exportData.settings.animatedJava
+	const exporterSettings = exportData.settings
+		.rawAnimationExporter as rawAnimationExporterSettings
+
+	const FILE = {
+		meta: {
+			head_item: ajSettings.rigItem,
+		},
+		animations: exportData.animations,
+	}
+
+	if (!exporterSettings.outputJsonPath) {
+		throw new CustomError(
+			'animatedJava.exporters.rawAnimation.dialogs.errors.outputJsonPath.title',
+			{
+				intentional: true,
+				dialog: {
+					id: 'animatedJava.exporters.rawAnimation.dialogs.errors.outputJsonPath',
+					title: tl(
+						'animatedJava.exporters.rawAnimation.dialogs.errors.outputJsonPath.title'
+					),
+					lines: [
+						tl(
+							'animatedJava.exporters.rawAnimation.dialogs.errors.outputJsonPath.body'
+						),
+					],
+					width: 512,
+					singleButton: true,
+				},
+			}
+		)
+	}
+
+	Blockbench.writeFile(exporterSettings.outputJsonPath, {
+		content: JSON.stringify(FILE, null, '\t'),
+		custom_writer: null,
+	})
+}
+
+const genericEmptySettingText = tl(
+	'animatedJava.settings.generic.errors.emptyValue'
+)
+
+const Exporter = (AJ: any) => {
+	AJ.settings.registerPluginSettings(
+		'animatedJava.exporters.rawAnimation', // Exporter ID
+		'rawAnimationExporter', // Exporter Settings Key
+		{
+			outputJsonPath: {
+				title: tl(
+					'animatedJava.exporters.rawAnimation.settings.outputJson.title'
+				),
+				description: tl(
+					'animatedJava.exporters.rawAnimations.settings.outputJson.description'
+				),
+				type: 'filepath',
+				default: '',
+				optional: true,
+				props: {
+					dialogOpts: {
+						get defaultPath() {
+							return `output.json`
+						},
+						promptToCreate: true,
+						properties: ['openFile'],
+					},
+				},
+				onUpdate(d: aj.SettingDescriptor) {
+					if (d.value === '') {
+						d.isValid = false
+						d.error = genericEmptySettingText
+					}
+					return d
+				},
+			},
+		}
+	)
+	AJ.registerExportFunc('rawAnimationExporter', function () {
+		AJ.build(
+			(exportData: aj.ExportData) => {
+				console.log('Input Data:', exportData)
+				rawExport(exportData)
+			},
+			{
+				generate_static_animation: true,
+			}
+		)
+	})
+}
+
+if (Reflect.has(window, 'ANIMATED_JAVA')) {
+	Exporter(window['ANIMATED_JAVA'])
+} else {
+	// @ts-ignore
+	Blockbench.on('animated-java-ready', Exporter)
+}

src/exporters/animationExporter.ts renamed to src/exporters/vanillaAnimation.ts

@@ -983,11 +983,17 @@ async function createMCFile(
 								}
 							case 'leaf':
 								const pos = getPos(boneName, item)
-								const nextFrame = getFrame(boneName, item.index+1)
+								const nextFrame = getFrame(
+									boneName,
+									item.index + 1
+								)
 								if (isEqualVector(pos, lastPos)) {
 									// Ignore deduplication if next frame is different value
-									if (nextFrame && isEqualVector(pos, nextFrame.pos))
-									return { v: '', trimmed: true }
+									if (
+										nextFrame &&
+										isEqualVector(pos, nextFrame.pos)
+									)
+										return { v: '', trimmed: true }
 								}
 								lastPos = pos
 								return {
@@ -1037,11 +1043,17 @@ async function createMCFile(
 								}
 							case 'leaf':
 								const rot = getRot(boneName, item)
-								const nextFrame = getFrame(boneName, item.index+1)
+								const nextFrame = getFrame(
+									boneName,
+									item.index + 1
+								)
 								if (isEqualVector(rot, lastRot)) {
 									// Ignore deduplication if next frame is different value
-									if (nextFrame && isEqualVector(rot, nextFrame.rot))
-									return { v: '', trimmed: true }
+									if (
+										nextFrame &&
+										isEqualVector(rot, nextFrame.rot)
+									)
+										return { v: '', trimmed: true }
 								}
 								lastRot = rot
 								return {

src/exporters/statueExporter.ts renamed to src/exporters/vanillaStatue.ts

@@ -813,10 +813,7 @@ const Exporter = (AJ: any) => {
 					return d
 				},
 				isVisible(settings: any) {
-					return (
-						settings.vanillaStatueExporter
-							.exportMode === 'mcb'
-					)
+					return settings.vanillaStatueExporter.exportMode === 'mcb'
 				},
 				dependencies: [
 					'vanillaStatueExporter.exportMode',
@@ -849,14 +846,9 @@ const Exporter = (AJ: any) => {
 					return value == '' || value.endsWith('config.json')
 				},
 				isVisible(settings: any) {
-					return (
-						settings.vanillaStatueExporter
-							.exportMode === 'mcb'
-					)
+					return settings.vanillaStatueExporter.exportMode === 'mcb'
 				},
-				dependencies: [
-					'vanillaStatueExporter.exportMode',
-				],
+				dependencies: ['vanillaStatueExporter.exportMode'],
 			},
 			dataPackPath: {
 				title: tl(
@@ -886,13 +878,10 @@ const Exporter = (AJ: any) => {
 				},
 				isVisible(settings: any) {
 					return (
-						settings.vanillaStatueExporter
-							.exportMode === 'vanilla'
+						settings.vanillaStatueExporter.exportMode === 'vanilla'
 					)
 				},
-				dependencies: [
-					'vanillaStatueExporter.exportMode',
-				],
+				dependencies: ['vanillaStatueExporter.exportMode'],
 			},
 		}
 	)