Merge branch 'experimental'

Author: SnaveSutit

README.md

@@ -4,7 +4,7 @@
 <h1 align="center">
 	Animated Java
 	<br>
-	<a href="https://discord.gg/jFgY4PXZfp">
+	<a href="https://animated-java.dev/discord">
 		<img src="https://img.shields.io/discord/785339959518953482?color=5865f2&label=Discord&style=flat" alt="Discord" />
 	</a>
 	<a>

exporters/datapackExporter/datapackExporter.ts

@@ -42,10 +42,12 @@ export function loadExporter() {
 				'animated_java.datapack_exporter.settings.interpolation_duration.description'
 			).split('\n'),
 		},
-		outdated_rig_warning: {
-			name: API.translate('animated_java.datapack_exporter.settings.outdated_rig_warning'),
+		enable_outdated_rig_warning: {
+			name: API.translate(
+				'animated_java.datapack_exporter.settings.enable_outdated_rig_warning'
+			),
 			description: API.translate(
-				'animated_java.datapack_exporter.settings.outdated_rig_warning.description'
+				'animated_java.datapack_exporter.settings.enable_outdated_rig_warning.description'
 			).split('\n'),
 		},
 		include_convenience_functions: {
@@ -56,6 +58,14 @@ export function loadExporter() {
 				'animated_java.datapack_exporter.settings.include_convenience_functions.description'
 			).split('\n'),
 		},
+		// enable_single_rig_optimizations: {
+		// 	name: API.translate(
+		// 		'animated_java.datapack_exporter.settings.enable_single_rig_optimizations'
+		// 	),
+		// 	description: API.translate(
+		// 		'animated_java.datapack_exporter.settings.enable_single_rig_optimizations.description'
+		// 	).split('\n'),
+		// },
 		root_entity_nbt: {
 			name: API.translate('animated_java.datapack_exporter.settings.root_entity_nbt'),
 			description: API.translate(
@@ -87,25 +97,17 @@ export function loadExporter() {
 		)
 	}
 
-	const _export: (typeof API.Exporter)['prototype']['export'] = async (
-		ajSettings,
-		projectSettings,
-		exporterSettings,
-		renderedAnimations,
-		rig
-	) => {
+	const _export: (typeof API.Exporter)['prototype']['export'] = async exportData => {
 		if (!Project?.animated_java_variants) throw new Error('No variants found')
-		console.log('Animated Java Settings', ajSettings)
-		console.log('Project Settings', projectSettings)
-		console.log('Exporter Settings', exporterSettings)
-		console.log('Rendered Animations', renderedAnimations)
-		console.log('Rig', rig)
+		console.log('Export Options', exportData)
 
 		console.log('Beginning export process...')
 
 		//--------------------------------------------
-		// ANCHOR Settings
+		// ANCHOR Settings and Export Options
 		//--------------------------------------------
+		const { ajSettings, projectSettings, exporterSettings, renderedAnimations, rig } =
+			exportData
 		const NAMESPACE = projectSettings.project_namespace.value
 		const RIG_ITEM = projectSettings.rig_item.value
 		const EXPORT_FOLDER = PathModule.parse(exporterSettings.datapack_mcmeta.value).dir
@@ -1070,8 +1072,8 @@ export function loadExporter() {
 				}),
 				outdated_rig_warning: new API.Settings.CheckboxSetting({
 					id: 'animated_java:datapack_exporter/outdated_rig_warning',
-					displayName: TRANSLATIONS.outdated_rig_warning.name,
-					description: TRANSLATIONS.outdated_rig_warning.description,
+					displayName: TRANSLATIONS.enable_outdated_rig_warning.name,
+					description: TRANSLATIONS.enable_outdated_rig_warning.description,
 					defaultValue: true,
 				}),
 				include_convenience_functions: new API.Settings.CheckboxSetting({
@@ -1080,6 +1082,12 @@ export function loadExporter() {
 					description: TRANSLATIONS.include_convenience_functions.description,
 					defaultValue: true,
 				}),
+				// enable_single_rig_optimizations: new API.Settings.CheckboxSetting({
+				// 	id: 'animated_java:datapack_exporter/enable_single_rig_optimizations',
+				// 	displayName: TRANSLATIONS.enable_single_rig_optimizations.name,
+				// 	description: TRANSLATIONS.enable_single_rig_optimizations.description,
+				// 	defaultValue: false,
+				// }),
 				root_entity_nbt: new API.Settings.CodeboxSetting(
 					{
 						id: 'animated_java:datapack_exporter/root_entity_nbt',
@@ -1115,6 +1123,10 @@ export function loadExporter() {
 				type: 'setting',
 				settingId: 'animated_java:datapack_exporter/include_convenience_functions',
 			},
+			// {
+			// 	type: 'setting',
+			// 	settingId: 'animated_java:datapack_exporter/enable_single_rig_optimizations',
+			// },
 			{
 				type: 'setting',
 				settingId: 'animated_java:datapack_exporter/root_entity_nbt',

exporters/datapackExporter/lang/en.yaml

@@ -16,10 +16,15 @@ animated_java.datapack_exporter.settings.interpolation_duration.description: |-
   Setting this higher than 1 will cause the animation to be smoother, but lose precision.
   Setting this to 0 will disable interpolation.
 
-animated_java.datapack_exporter.settings.outdated_rig_warning: Outdated Rig Warning
-animated_java.datapack_exporter.settings.outdated_rig_warning.description: |-
+animated_java.datapack_exporter.settings.enable_outdated_rig_warning: Enable Outdated Rig Warning
+animated_java.datapack_exporter.settings.enable_outdated_rig_warning.description: |-
   Whether to show a warning in-game when a Rig is found that was summoned before the most recent export.
 
+# animated_java.datapack_exporter.settings.enable_single_rig_optimizations: Enable Single Rig Optimizations
+# animated_java.datapack_exporter.settings.enable_single_rig_optimizations.description: |-
+#   Whether to enable optimizations that are only possible when there is only one Rig in the world at a time.
+#   These optimizations will reduce the performance impact of the generated Data Pack, but will prevent you from having multiple Rigs in the world at once.
+
 animated_java.datapack_exporter.settings.include_convenience_functions: Include Convenience Functions
 animated_java.datapack_exporter.settings.include_convenience_functions.description: |-
   Whether to include convenience functions in the generated Data Pack.

exporters/rawExporter/rawExporter.ts

@@ -28,8 +28,9 @@ export function loadExporter() {
 				settingId: 'animated_java:raw_exporter/foo',
 			},
 		],
-		async export(ajSettings, projectSettings, exporterSettings) {
-			console.log(ajSettings, projectSettings, exporterSettings)
+		async export(exportOptions) {
+			console.log('Export Options:', exportOptions)
+			const { ajSettings, projectSettings, exporterSettings } = exportOptions
 			// Temporary placeholder to hide "no await" warning
 			await new Promise(resolve => setTimeout(resolve, 100))
 		},

package.json

@@ -2,8 +2,8 @@
 	"type": "module",
 	"name": "animated_java",
 	"title": "Animated Java",
-	"version": "0.3.5",
-	"min_blockbench_version": "4.2.0",
+	"version": "0.3.6",
+	"min_blockbench_version": "4.6.5",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",
 		"email": "snavesutit@gmail.com",
@@ -96,6 +96,8 @@
 	},
 	"dependencies": {
 		"deepslate": "^0.17.2",
+		"marked": "^4.3.0",
+		"marked-gfm-heading-id": "^3.0.0",
 		"svelte-ace": "^1.0.21"
 	}
 }