⏺️ Excluded Bones -> Excluded Nodes

- Added cameras, locators, item displays, text displays, and block displays to the excluded nodes list.

Author: SnaveSutit

src/blockbenchTypeMods.d.ts

@@ -67,7 +67,7 @@ declare global {
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface _Animation {
-		excluded_bones: CollectionItem[]
+		excluded_nodes: CollectionItem[]
 	}
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention

src/blueprintFormat.ts

@@ -10,6 +10,7 @@ import { Valuable } from './util/stores'
 import { TRANSPARENT_TEXTURE, TRANSPARENT_TEXTURE_MATERIAL, Variant } from './variants'
 import FormatPageSvelte from './components/formatPage.svelte'
 import { translate } from './util/translation'
+import { process } from './systems/modelDataFixerUpper'
 
 /**
  * The serialized Variant Bone Config
@@ -95,7 +96,7 @@ export interface IBlueprintVariantJSON {
 	/**
 	 * The list of bones that should be ignored when applying the Variant
 	 */
-	excluded_bones: string[]
+	excluded_nodes: string[]
 }
 
 /**
@@ -137,7 +138,7 @@ export interface IBlueprintFormatJSON {
 	elements: any[]
 	outliner: any[]
 	textures: Texture[]
-	animations: AnimationOptions[]
+	animations: AnimationOptions[] & { excluded_nodes: string[] }
 	animation_controllers?: AnimationControllerOptions[]
 	animation_variable_placeholders: string
 	backgrounds?: Record<string, any>
@@ -200,6 +201,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 	// ANCHOR - Codec:load
 	load(model: IBlueprintFormatJSON, file) {
 		console.log(`Loading Animated Java Blueprint from '${file.name}'...`)
+		model = process(model)
 		setupProject(BLUEPRINT_FORMAT, model.meta.uuid)
 		if (!Project) {
 			throw new Error('Failed to load Animated Java Blueprint')
@@ -425,7 +427,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 			list: Variant.all.filter(v => !v.isDefault).map(v => v.toJSON()),
 		}
 
-		model.animations = []
+		model.animations = [] as any
 		const animationOptions = { bone_names: true, absolute_paths: options.absolute_paths }
 		for (const animation of Blockbench.Animation.all) {
 			if (!animation.getUndoCopy) continue

src/components/animationProperties.svelte

@@ -10,20 +10,14 @@
 <script lang="ts">
 	import Collection from './dialogItems/collection.svelte'
 	import Select from './dialogItems/select.svelte'
+	import { getAvailableNodes } from '../util/excludedNodes'
 
 	export let animationName: Valuable<string>
 	export let loopMode: Valuable<string>
 	export let loopDelay: Valuable<number>
 	export let excludedBones: Valuable<Array<{ name: string; value: string }>>
 
-	const availableBones = Group.all.map(group => {
-		const entry = excludedBones.get().find(bone => bone.value === group.uuid)
-		if (entry) {
-			entry.name = group.name
-		}
-
-		return { name: group.name, value: group.uuid }
-	})
+	const availableBones = getAvailableNodes(excludedBones.get())
 
 	function animationNameValueChecker(value: string): { type: string; message: string } {
 		if (value.trim().length === 0) {
@@ -71,15 +65,15 @@
 	/>
 
 	<Collection
-		label={translate('dialog.animation_properties.excluded_bones.title')}
+		label={translate('dialog.animation_properties.excluded_nodes.title')}
 		tooltip={translate('dialog.animation_properties.bone_lists.description')}
-		availableItemsColumnLable={translate('dialog.animation_properties.included_bones.title')}
+		availableItemsColumnLable={translate('dialog.animation_properties.included_nodes.title')}
 		availableItemsColumnTooltip={translate(
-			'dialog.animation_properties.included_bones.description',
+			'dialog.animation_properties.included_nodes.description',
 		)}
-		includedItemsColumnLable={translate('dialog.animation_properties.excluded_bones.title')}
+		includedItemsColumnLable={translate('dialog.animation_properties.excluded_nodes.title')}
 		includedItemsColumnTooltip={translate(
-			'dialog.animation_properties.excluded_bones.description',
+			'dialog.animation_properties.excluded_nodes.description',
 		)}
 		swapColumnsButtonTooltip={translate(
 			'dialog.animation_properties.swap_columns_button.tooltip',

src/components/dialogItems/collection.svelte

@@ -25,9 +25,9 @@
 	for (let i = 0; i < availableItems.length; i++) {
 		const item = availableItems[i]
 		if (includedItems.get().find(i => i.value === item.value)) {
-			includedItemsList.push({ id: i, title: item.name })
+			includedItemsList.push({ id: i, title: item.name, icon: item.icon })
 		} else {
-			availableItemsList.push({ id: i, title: item.name })
+			availableItemsList.push({ id: i, title: item.name, icon: item.icon })
 		}
 	}
 
@@ -80,7 +80,7 @@
 						{/if}
 						<i
 							class="material-icons notranslate icon"
-							style="color: rgb(162, 235, 255);">folder</i
+							style="color: rgb(162, 235, 255);">{item.icon || 'folder'}</i
 						>
 						<span>{item.title}</span>
 					</div>
@@ -119,7 +119,7 @@
 						{/if}
 						<i
 							class="material-icons notranslate icon"
-							style="color: rgb(162, 235, 255);">folder</i
+							style="color: rgb(162, 235, 255);">{item.icon || 'folder'}</i
 						>
 						<span>{item.title}</span>
 					</div>

src/components/dialogItems/dialogItemUtil.d.ts

@@ -2,4 +2,4 @@ type DialogItemValueChecker<Value> =
 	| ((value: Value) => { type: string; message: string })
 	| undefined
 
-type CollectionItem = { name: string; value: string }
+type CollectionItem = { icon?: string; name: string; value: string }

src/components/variantConfigDialog.svelte

@@ -9,27 +9,21 @@
 
 <script lang="ts">
 	import Collection from './dialogItems/collection.svelte'
+	import { getAvailableNodes } from '../util/excludedNodes'
 
 	export let variant: Variant
 	export let displayName: Valuable<string>
 	export let name: Valuable<string>
 	export let uuid: Valuable<string>
 	export let textureMap: TextureMap
 	export let generateNameFromDisplayName: Valuable<boolean>
-	export let excludedBones: Valuable<Array<{ name: string; value: string }>>
+	export let excludedBones: Valuable<Array<CollectionItem>>
 
 	const availableTextures = [...Texture.all, TRANSPARENT_TEXTURE]
 	const primaryTextures = [...Texture.all]
 	const secondaryTextures = availableTextures
 
-	const availableBones = Group.all.map(group => {
-		const entry = excludedBones.get().find(bone => bone.value === group.uuid)
-		if (entry) {
-			entry.name = group.name
-		}
-
-		return { name: group.name, value: group.uuid }
-	})
+	const availableBones = getAvailableNodes(excludedBones.get())
 
 	let textureMapUpdated = 0
 
@@ -208,15 +202,15 @@
 			{/key}
 		</lu>
 		<Collection
-			label={translate('dialog.variant_config.excluded_bones.title')}
+			label={translate('dialog.variant_config.excluded_nodes.title')}
 			tooltip={translate('dialog.variant_config.bone_lists.description')}
-			availableItemsColumnLable={translate('dialog.variant_config.included_bones.title')}
+			availableItemsColumnLable={translate('dialog.variant_config.included_nodes.title')}
 			availableItemsColumnTooltip={translate(
-				'dialog.variant_config.included_bones.description',
+				'dialog.variant_config.included_nodes.description',
 			)}
-			includedItemsColumnLable={translate('dialog.variant_config.excluded_bones.title')}
+			includedItemsColumnLable={translate('dialog.variant_config.excluded_nodes.title')}
 			includedItemsColumnTooltip={translate(
-				'dialog.variant_config.excluded_bones.description',
+				'dialog.variant_config.excluded_nodes.description',
 			)}
 			swapColumnsButtonTooltip={translate(
 				'dialog.variant_config.swap_columns_button.tooltip',

src/interface/animationPropertiesDialog.ts

@@ -8,7 +8,7 @@ export function openAnimationPropertiesDialog(animation: _Animation) {
 	const animationName = new Valuable(animation.name)
 	const loopMode = new Valuable(animation.loop)
 	const loopDelay = new Valuable(Number(animation.loop_delay) || 0)
-	const excludedBones = new Valuable(animation.excluded_bones)
+	const excludedBones = new Valuable(animation.excluded_nodes)
 
 	new SvelteDialog({
 		id: `${PACKAGE.name}:animationPropertiesDialog`,
@@ -27,7 +27,7 @@ export function openAnimationPropertiesDialog(animation: _Animation) {
 			animation.createUniqueName(Blockbench.Animation.all)
 			animation.loop = loopMode.get()
 			animation.loop_delay = loopDelay.get().toString()
-			animation.excluded_bones = excludedBones.get()
+			animation.excluded_nodes = excludedBones.get()
 		},
 	}).show()
 }

src/lang/en.yml

@@ -275,11 +275,11 @@ animated_java.dialog.variant_config.texture_map.description: A map of which text
 animated_java.dialog.variant_config.texture_map.create_new_mapping: Create New Mapping
 animated_java.dialog.variant_config.texture_map.no_mappings: Variant has no mapped textures.
 
-animated_java.dialog.variant_config.bone_lists.description: A list of bones to include or exclude from the Variant. Only bones in the included list will be modified by the Variant, and bones in the excluded list will be ignored.
-animated_java.dialog.variant_config.excluded_bones.title: Excluded Bones
-animated_java.dialog.variant_config.excluded_bones.description: A list of bones to exclude from the Variant. These bones will not be modified by the Variant.
-animated_java.dialog.variant_config.included_bones.title: Included Bones
-animated_java.dialog.variant_config.included_bones.description: A list of bones to include in the Variant. Only these bones will be modified by the Variant.
+animated_java.dialog.variant_config.bone_lists.description: A list of nodes to include or exclude from the Variant. Only nodes in the included list will be modified by the Variant, and nodes in the excluded list will be ignored.
+animated_java.dialog.variant_config.excluded_nodes.title: Excluded Nodes
+animated_java.dialog.variant_config.excluded_nodes.description: A list of nodes to exclude from the Variant. These nodes will not be modified by the Variant.
+animated_java.dialog.variant_config.included_nodes.title: Included Nodes
+animated_java.dialog.variant_config.included_nodes.description: A list of nodes to include in the Variant. Only these nodes will be modified by the Variant.
 animated_java.dialog.variant_config.swap_columns_button.tooltip: Swap Lists
 
 ## Old AJModel Loader Dialog
@@ -306,11 +306,11 @@ animated_java.dialog.animation_properties.animation_name.error.invalid_character
 animated_java.dialog.animation_properties.loop_delay.title: Loop Delay
 animated_java.dialog.animation_properties.loop_delay.description: The delay between loops. This is the time the animation will pause before starting again. This is only used when the Loop Mode is set to Loop.
 
-animated_java.dialog.animation_properties.bone_lists.description: A list of bones to include or exclude from the animation. Only bones in the included list will be modified by the animation, and bones in the excluded list will be ignored.
-animated_java.dialog.animation_properties.excluded_bones.title: Excluded Bones
-animated_java.dialog.animation_properties.excluded_bones.description: A list of bones to exclude from the animation. These bones will not be modified by the animation.
-animated_java.dialog.animation_properties.included_bones.title: Included Bones
-animated_java.dialog.animation_properties.included_bones.description: A list of bones to include in the animation. Only these bones will be modified by the animation.
+animated_java.dialog.animation_properties.bone_lists.description: A list of nodes to include or exclude from the animation. Only nodes in the included list will be modified by the animation, and nodes in the excluded list will be ignored.
+animated_java.dialog.animation_properties.excluded_nodes.title: Excluded Nodes
+animated_java.dialog.animation_properties.excluded_nodes.description: A list of nodes to exclude from the animation. These nodes will not be modified by the animation.
+animated_java.dialog.animation_properties.included_nodes.title: Included Nodes
+animated_java.dialog.animation_properties.included_nodes.description: A list of nodes to include in the animation. Only these nodes will be modified by the animation.
 animated_java.dialog.animation_properties.swap_columns_button.tooltip: Swap Lists
 
 ## Export Progress Dialog
@@ -336,8 +336,8 @@ animated_java.action.variants.delete: Delete Variant
 ### Animator
 
 ## Properties
-animated_java.animation.excluded_bones: Excluded Bones
-animated_java.animation.invert_excluded_bones: Invert Excluded Bones
+animated_java.animation.excluded_nodes: Excluded Nodes
+animated_java.animation.invert_excluded_nodes: Invert Excluded Nodes
 
 ## Timeline
 animated_java.effect_animator.timeline.variant: Variant

src/mods/animationPropertiesMod.ts

@@ -61,10 +61,10 @@ createBlockbenchMod(
 		context.excludedBonesProperty = new Property(
 			Blockbench.Animation,
 			'array',
-			'excluded_bones',
+			'excluded_nodes',
 			{
 				condition: () => isCurrentFormat(),
-				label: translate('animation.excluded_bones'),
+				label: translate('animation.excluded_nodes'),
 				default: [],
 			}
 		)

src/systems/animationRenderer.ts

@@ -109,7 +109,7 @@ export function getAnimationNodes(
 			const keyframeMap = new Map(animator.keyframes.map(kf => [kf.time, kf]))
 			keyframeCache.set(uuid, keyframeMap)
 		}
-		excludedBonesCache = new Set(animation.excluded_bones.map(b => b.value))
+		excludedBonesCache = new Set(animation.excluded_nodes.map(b => b.value))
 	}
 	const nodes: IAnimationNode[] = []