breaking stuff is my favorite

- Fixed #30
- Merged #44

Author: SnaveSutit

src/animatedJava.ts

@@ -63,7 +63,7 @@ const ANIMATED_JAVA = {
 	format: modelFormat,
 	registerSettingRenderer,
 	get variants() {
-		return store.get('variants')
+		return store.get('states')
 	},
 	logging: false, //enable logging in production
 	PromiseWrapper<T>(promise: Promise<T>): Promise<T> {

src/exporters/animationExporter.ts

@@ -32,6 +32,9 @@ interface animationExporterSettings {
 	rootTag: string
 	rootEntityNbt: string
 	mcbConfigPath: string
+	autoDistance: number
+	autoDistanceMovementThreshold: number
+	manualDistance: number
 }
 
 interface MCBConfig {
@@ -94,16 +97,27 @@ async function createMCFile(
 
 	const staticAnimationUuid = store.get('static_animation_uuid')
 	const staticFrame = animations[staticAnimationUuid].frames[0].bones
-	const staticDistance = roundToN(
-		animations[staticAnimationUuid].maxDistance + -headYOffset,
-		1000
-	)
-	const maxDistance = roundToN(
-		Object.values(animations).reduce((o, n) => {
-			return Math.max(o, n.maxDistance)
-		}, -Infinity) + -headYOffset,
-		1000
-	)
+	// let staticDistance = 10
+	let maxDistance = 10
+	if (exporterSettings.autoDistance) {
+		// staticDistance = roundToN(
+		// 	animations[staticAnimationUuid].maxDistance + -headYOffset,
+		// 	1000
+		// )
+
+		maxDistance = roundToN(
+			Object.values(animations).reduce((o, n) => {
+				return Math.max(o, n.maxDistance)
+			}, -Infinity) +
+				exporterSettings.autoDistanceMovementThreshold +
+				-headYOffset,
+			1000
+		)
+	} else {
+		// staticDistance = exporterSettings.manualDistance
+		maxDistance = exporterSettings.manualDistance
+	}
+
 	animations = removeKeyGently(staticAnimationUuid, animations)
 	console.log(animations)
 
@@ -224,7 +238,7 @@ async function createMCFile(
 			function this {
 				execute (if entity @s[tag=${tags.root}] at @s) {
 					scoreboard players operation # ${scoreboards.id} = @s ${scoreboards.id}
-					execute as @e[type=${entityTypes.bone},tag=${tags.model},distance=..${staticDistance}] if score @s ${scoreboards.id} = # ${scoreboards.id} run kill @s
+					execute as @e[type=${entityTypes.bone},tag=${tags.model},distance=..${maxDistance}] if score @s ${scoreboards.id} = # ${scoreboards.id} run kill @s
 					kill @s
 				} else {
 					tellraw @s ${rootExeErrorJsonText.replace('%functionName', `${projectName}:remove/all`)}
@@ -391,7 +405,7 @@ async function createMCFile(
 							# Summon all bone entities
 							${summons.map(v => v.toString()).join('\n')}
 							# Update rotation and ID of bone entities to match the root entity
-							execute as @e[type=${entityTypes.bone},tag=${tags.model},tag=new,distance=..${staticDistance}] positioned as @s run {
+							execute as @e[type=${entityTypes.bone},tag=${tags.model},tag=new,distance=..${maxDistance}] positioned as @s run {
 								scoreboard players operation @s ${scoreboards.id} = .aj.last_id ${scoreboards.internal}
 								tp @s ~ ~ ~ ~ ~
 								tag @s remove new
@@ -543,10 +557,9 @@ async function createMCFile(
 					title: tl(
 						'animatedJava_exporter_animationExporter.popup.warning.noAnimations.title'
 					),
-					lines:
-						tl(
-							'animatedJava_exporter_animationExporter.popup.warning.noAnimations.body'
-						)
+					lines: tl(
+						'animatedJava_exporter_animationExporter.popup.warning.noAnimations.body'
+					)
 						.split('\n')
 						.map((line: string) => `<p>${line}</p>`),
 				},
@@ -1045,6 +1058,56 @@ const Exporter = (AJ: any) => {
 					return typeof value === 'boolean'
 				},
 			},
+			autoDistance: {
+				type: 'checkbox',
+				default: true,
+				populate() {
+					return true
+				},
+				isValid(value: any) {
+					return typeof value === 'boolean'
+				},
+			},
+			autoDistanceMovementThreshold: {
+				type: 'number',
+				default: 1,
+				populate() {
+					return 1
+				},
+				isValid(value: any) {
+					return !isNaN(value) && value >= 0
+				},
+				onUpdate(value: any) {
+					return Number(value)
+				},
+				isVisible(settings: any) {
+					return settings.animatedJava_exporter_animationExporter
+						.autoDistance
+				},
+				dependencies: [
+					'animatedJava_exporter_animationExporter.autoDistance',
+				],
+			},
+			manualDistance: {
+				type: 'number',
+				default: 10,
+				populate() {
+					return 10
+				},
+				isValid(value: any) {
+					return !isNaN(value) && value >= 0
+				},
+				onUpdate(value: any) {
+					return Number(value)
+				},
+				isVisible(settings: any) {
+					return !settings.animatedJava_exporter_animationExporter
+						.autoDistance
+				},
+				dependencies: [
+					'animatedJava_exporter_animationExporter.autoDistance',
+				],
+			},
 			modelTag: {
 				type: 'text',
 				default: 'aj.%projectName',

src/lang/en.yaml

@@ -91,7 +91,7 @@ animatedJava.popup.error.unsavedTexture.body: |-
 animatedJava.popup.warning.rigFolderUnused.title: Unused rig folder
 animatedJava.popup.warning.rigFolderUnused.body: |-
     This folder does not contain any existing rigs.
-    Are you sure you want to use this folder?
+    Are you sure you want to overwrite this folder?
 
 animatedJava.popup.error.rigFolderAlreadyUsedByOther.title: Chosen rig folder already in use
 animatedJava.popup.error.rigFolderAlreadyUsedByOther.body: |-
@@ -138,6 +138,7 @@ animatedJava.setting.predicateFilePath.description: The item model file of the r
 
 animatedJava.setting.transparentTexturePath.name: Transparent Texture Path
 animatedJava.setting.transparentTexturePath.description: A transparent texture for adding transparency to variants. Only needed if you're using transparency in your variants.
+animatedJava.setting.transparentTexturePath.error.invalidPath: Transparent texture path must be defined if your are using the transparency feature of variants
 
 animatedJava.setting.useCache.name: Use Animation Cache
 animatedJava.setting.useCache.description: Only re-render changed animations
@@ -239,6 +240,20 @@ animatedJava_exporter_animationExporter.setting.rootEntityNbt.description: The N
 animatedJava_exporter_animationExporter.setting.markerArmorStands.name: Marker Armor Stands
 animatedJava_exporter_animationExporter.setting.markerArmorStands.description: When enabled all armor_stands used to display the rig will have no hitbox or collision.
 
+animatedJava_exporter_animationExporter.setting.autoDistance.name: Auto Distance
+animatedJava_exporter_animationExporter.setting.autoDistance.description: |-
+  Automatically calculate the maximum distance required to animate all bones in the rig based on the rendered animations.
+
+animatedJava_exporter_animationExporter.setting.autoDistanceMovementThreshold.name: Auto Distance Movement Threshold
+animatedJava_exporter_animationExporter.setting.autoDistanceMovementThreshold.description: |-
+  How much distance to add to the calculated animation distance.
+  The more distance you add the farther you can move the rig in a single tick without dropping bones
+
+animatedJava_exporter_animationExporter.setting.manualDistance.name: Manual Animation Distance
+animatedJava_exporter_animationExporter.setting.manualDistance.description: |-
+  How far away a bone can be from the root entity before it stops animating.
+  This setting is intended for advanced users.
+
 animatedJava_exporter_animationExporter.setting.modelTag.name: Model Tag
 animatedJava_exporter_animationExporter.setting.modelTag.description: The tag used to select the model
 

src/modelFormat.js

@@ -309,6 +309,7 @@ const format = new ModelFormat({
 	uv_rotation: true,
 	centered_grid: true,
 	animation_files: true,
+	animated_textures: true,
 	icon: 'fa-cube',
 	codec,
 	onDeactivation() {

src/settings.js

@@ -172,7 +172,7 @@ export const DefaultSettings = {
 	},
 }
 
-function evaluateSetting(namespace, name, value) {
+function evaluateSetting(event, namespace, name, value) {
 	const setting = DefaultSettings[namespace]?.[name]
 	if (setting) {
 		if (setting.isValid) {
@@ -240,13 +240,15 @@ class Settings {
 			Object.defineProperty(value, settings[i], {
 				get: () => {
 					return evaluateSetting(
+						'get',
 						namespace,
 						settings[i],
 						this.get(namespace + '.' + settings[i])
 					)
 				},
 				set: (value) => {
 					const validatedValue = evaluateSetting(
+						'set',
 						namespace,
 						settings[i],
 						value
@@ -294,6 +296,7 @@ class Settings {
 										? DefaultSettings[namespace][name]
 												.default
 										: evaluateSetting(
+												'update',
 												namespace,
 												name,
 												settings[namespace][name]
@@ -410,6 +413,7 @@ class Settings {
 								get() {
 									if (_cached2 != UNASSIGNED) return _cached2
 									_cached2 = evaluateSetting(
+										'get',
 										key,
 										key2,
 										value2

src/ui/dialogs/settings.js

@@ -128,27 +128,6 @@ const RenderTemplates = {
 			</>
 		)
 	},
-	// textarea({ value, setValue, namespace, name, children }) {
-	// 	return (
-	// 		<>
-	// 			<div>{children}</div>
-	// 			<div style={{ display: 'inline-block' }}>
-	// 				<textarea
-	// 					id={`aj.setting.${namespace}.${name}`}
-	// 					value={value || ''}
-	// 					onChange={(e) => {
-	// 						setValue(e.target.value)
-	// 					}}
-	// 					onBlur={(e) => {
-	// 						settings[namespace][name] = e.target.value
-	// 					}}
-	// 					className="dark_bordered"
-	// 					style={{ width: '389%' }}
-	// 				/>
-	// 			</div>
-	// 		</>
-	// 	)
-	// },
 	select({ value, setValue, namespace, name, children, definition }) {
 		return (
 			<>

src/util/eventSystem.ts

@@ -60,7 +60,7 @@ class EventSystem {
 	}
 	dispatch(type: string, payload: any) {
 		const eventFrame = this.createNewEventFrame()
-		console.log(`[event (${this.id}): dispatch] `, type)
+		// console.log(`[event (${this.id}): dispatch] `, type)
 		Object.freeze(payload)
 		const recipients = this._getEventListForType(type)
 		const errors = []

src/util/minecraft/resourcepack.ts

@@ -5,7 +5,7 @@ import { tl } from '../intl'
 import { format } from '../replace'
 
 export function getTexturePath(texture: any) {
-	if (!texture.path) {
+	if (!texture.path || !texture.saved) {
 		throw new CustomError('Unsaved texture', {
 			dialog: {
 				title: tl('animatedJava.popup.error.unsavedTexture.title'),