✨ On Remove commands and bug fixes

- Implemented #400
- Fixed #398 
- Fixed several issues causing locators and cameras to not move correctly
- Fixed inconsistant data pack structure between versions
- Added on-remove commands

Author: SnaveSutit

src/blockbenchTypeMods.d.ts

@@ -8,15 +8,15 @@ import { blueprintSettingErrors, defaultValues } from './blueprintSettings'
 import { openExportProgressDialog } from './interface/dialog/exportProgress'
 import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
 import { TextDisplay } from './outliner/textDisplay'
+import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
+import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
 import datapackCompiler from './systems/datapackCompiler'
-import resourcepackCompiler from './systems/resourcepackCompiler'
 import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
+import resourcepackCompiler from './systems/resourcepackCompiler'
+import { EasingKey } from './util/easing'
 import { isDataPackPath, isResourcePackPath } from './util/minecraftUtil'
 import { Valuable } from './util/stores'
 import { type Variant } from './variants'
-import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
-import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
-import { EasingKey } from './util/easing'
 
 declare module 'three' {
 	interface Object3D {

src/blueprintSettings.ts

@@ -22,6 +22,7 @@ export const defaultValues = {
 	enable_advanced_data_pack_settings: false,
 	data_pack: '',
 	summon_commands: '',
+	remove_commands: '',
 	ticking_commands: '',
 	interpolation_duration: 1,
 	teleportation_duration: 1,

src/components/blueprintSettingsDialog.svelte

@@ -59,6 +59,7 @@
 	// export let enableAdvancedDataPackSettings: Valuable<boolean>
 	export let dataPack: Valuable<string>
 	export let summonCommands: Valuable<string>
+	export let removeCommands: Valuable<string>
 	export let tickingCommands: Valuable<string>
 	export let interpolationDuration: Valuable<number>
 	export let teleportationDuration: Valuable<number>
@@ -678,6 +679,13 @@
 				defaultValue={defaultValues.summon_commands}
 			/>
 
+			<CodeInput
+				label={translate('dialog.blueprint_settings.remove_commands.title')}
+				tooltip={translate('dialog.blueprint_settings.remove_commands.description')}
+				bind:value={removeCommands}
+				defaultValue={defaultValues.remove_commands}
+			/>
+
 			<CodeInput
 				label={translate('dialog.blueprint_settings.ticking_commands.title')}
 				tooltip={translate('dialog.blueprint_settings.ticking_commands.description')}

src/interface/dialog/blueprintSettings.ts

@@ -53,6 +53,7 @@ function getSettings() {
 		),
 		dataPack: new Valuable(Project!.animated_java.data_pack),
 		summonCommands: new Valuable(Project!.animated_java.summon_commands),
+		removeCommands: new Valuable(Project!.animated_java.remove_commands),
 		tickingCommands: new Valuable(Project!.animated_java.ticking_commands),
 		interpolationDuration: new Valuable(Project!.animated_java.interpolation_duration),
 		teleportationDuration: new Valuable(Project!.animated_java.teleportation_duration),
@@ -95,6 +96,7 @@ function setSettings(settings: ReturnType<typeof getSettings>) {
 		settings.enableAdvancedDataPackSettings.get()
 	Project.animated_java.data_pack = settings.dataPack.get()
 	Project.animated_java.summon_commands = settings.summonCommands.get()
+	Project.animated_java.remove_commands = settings.removeCommands.get()
 	Project.animated_java.ticking_commands = settings.tickingCommands.get()
 	Project.animated_java.interpolation_duration = settings.interpolationDuration.get()
 	Project.animated_java.teleportation_duration = settings.teleportationDuration.get()

src/lang/en.yml

@@ -174,8 +174,6 @@ export function getFrame(
 			case 'block_display':
 			case 'bone': {
 				matrix = getNodeMatrix(outlinerNode, node.base_scale)
-				// Only add the frame if the matrix has changed.
-				if (lastFrame && lastFrame.matrix.equals(matrix)) continue
 				// Inherit instant interpolation from parent
 				if (node.parent && node.parent !== 'root') {
 					const parentKeyframes = keyframeCache.get(node.parent)
@@ -187,6 +185,9 @@ export function getFrame(
 						interpolation = 'pre-post'
 					}
 				}
+				// Only add the frame if the matrix has changed, this is the first frame, or there is an interpolation change.
+				if (lastFrame && lastFrame.matrix.equals(matrix) && interpolation == undefined)
+					continue
 				// Instant interpolation
 				if (keyframe?.interpolation === 'step') {
 					interpolation = 'step'
@@ -204,6 +205,8 @@ export function getFrame(
 			}
 			case 'locator': {
 				matrix = getNodeMatrix(outlinerNode, 1)
+				// // Only add the frame if the matrix has changed, or this is the first frame
+				// if (lastFrame && lastFrame.matrix.equals(matrix)) continue
 				if (keyframe) {
 					commands = getKeyframeCommands(keyframe)
 					executeCondition = getKeyframeExecuteCondition(keyframe)
@@ -220,11 +223,15 @@ export function getFrame(
 						executeCondition = getKeyframeExecuteCondition(lastFrame.keyframe)
 					}
 				}
+				// lastFrameCache.set(uuid, { matrix, keyframe })
 				break
 			}
 			case 'camera':
 			case 'struct': {
 				matrix = getNodeMatrix(outlinerNode, 1)
+				// Only add the frame if the matrix has changed, or this is the first frame
+				if (lastFrame && lastFrame.matrix.equals(matrix)) continue
+				lastFrameCache.set(uuid, { matrix, keyframe })
 				break
 			}
 		}
@@ -235,6 +242,10 @@ export function getFrame(
 		matrix.decompose(pos, rot, scale)
 		const decomposed = getDecomposedTransformation(matrix)
 
+		if (node.type === 'locator' || node.type === 'camera') {
+			node.max_distance = Math.max(node.max_distance, pos.length())
+		}
+
 		frame.node_transforms[uuid] = {
 			matrix,
 			decomposed,