🛠️ Fix Left-Over excludedBones References.

Author: SnaveSutit

src/components/animationProperties.svelte

@@ -14,9 +14,9 @@
 	export let animationName: Valuable<string>
 	export let loopMode: Valuable<string>
 	export let loopDelay: Valuable<number>
-	export let excludedBones: Valuable<Array<{ name: string; value: string }>>
+	export let excludedNodes: Valuable<Array<{ name: string; value: string }>>
 
-	const availableBones = getAvailableNodes(excludedBones.get())
+	const availableBones = getAvailableNodes(excludedNodes.get())
 
 	function animationNameValueChecker(value: string): { type: string; message: string } {
 		if (value.trim().length === 0) {
@@ -78,7 +78,7 @@
 			'dialog.animation_properties.swap_columns_button.tooltip',
 		)}
 		availableItems={availableBones}
-		bind:includedItems={excludedBones}
+		bind:includedItems={excludedNodes}
 	/>
 </div>
 

src/components/variantConfigDialog.svelte

@@ -17,13 +17,13 @@
 	export let uuid: Valuable<string>
 	export let textureMap: TextureMap
 	export let generateNameFromDisplayName: Valuable<boolean>
-	export let excludedBones: Valuable<Array<CollectionItem>>
+	export let excludedNodes: Valuable<Array<CollectionItem>>
 
 	const availableTextures = [...Texture.all, TRANSPARENT_TEXTURE]
 	const primaryTextures = [...Texture.all]
 	const secondaryTextures = availableTextures
 
-	const availableBones = getAvailableNodes(excludedBones.get(), {
+	const availableBones = getAvailableNodes(excludedNodes.get(), {
 		groupsOnly: true,
 		excludeEmptyGroups: true,
 	})
@@ -223,7 +223,7 @@
 				'dialog.variant_config.swap_columns_button.tooltip',
 			)}
 			availableItems={availableBones}
-			bind:includedItems={excludedBones}
+			bind:includedItems={excludedNodes}
 		/>
 	{/if}
 </div>

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_nodes)
+	const excludedNodes = new Valuable(animation.excluded_nodes)
 
 	new SvelteDialog({
 		id: `${PACKAGE.name}:animationPropertiesDialog`,
@@ -19,15 +19,15 @@ export function openAnimationPropertiesDialog(animation: _Animation) {
 			animationName,
 			loopMode,
 			loopDelay,
-			excludedBones,
+			excludedNodes,
 		},
 		preventKeybinds: true,
 		onConfirm() {
 			animation.name = animationName.get()
 			animation.createUniqueName(Blockbench.Animation.all)
 			animation.loop = loopMode.get()
 			animation.loop_delay = loopDelay.get().toString()
-			animation.excluded_nodes = excludedBones.get()
+			animation.excluded_nodes = excludedNodes.get()
 		},
 	}).show()
 }

src/interface/textDisplayElementPanel.ts

@@ -68,6 +68,7 @@ TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.set = function (this: ColorPicker, color: s
 }
 TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.change = function (
 	this: ColorPicker,
+	// @ts-ignore
 	color: tinycolor.Instance
 ) {
 	const selected = TextDisplay.selected[0]

src/interface/variantConfigDialog.ts

@@ -12,7 +12,7 @@ export function openVariantConfigDialog(variant: Variant) {
 	const uuid = new Valuable(variant.uuid)
 	const textureMap = variant.textureMap.copy()
 	const generateNameFromDisplayName = new Valuable(variant.generateNameFromDisplayName)
-	const excludedBones = new Valuable(variant.excludedNodes)
+	const excludedNodes = new Valuable(variant.excludedNodes)
 
 	new SvelteDialog({
 		id: `${PACKAGE.name}:variantConfig`,
@@ -26,7 +26,7 @@ export function openVariantConfigDialog(variant: Variant) {
 			uuid,
 			textureMap,
 			generateNameFromDisplayName,
-			excludedBones,
+			excludedNodes,
 		},
 		preventKeybinds: true,
 		onConfirm() {
@@ -35,7 +35,7 @@ export function openVariantConfigDialog(variant: Variant) {
 			variant.uuid = uuid.get()
 			variant.textureMap = textureMap
 			variant.generateNameFromDisplayName = generateNameFromDisplayName.get()
-			variant.excludedNodes = excludedBones.get()
+			variant.excludedNodes = excludedNodes.get()
 			events.UPDATE_VARIANT.dispatch(variant)
 			variant.select()
 		},

src/mods/animationPropertiesMod.ts

@@ -55,10 +55,10 @@ createBlockbenchMod(
 createBlockbenchMod(
 	`${PACKAGE.name}:animationPropertiesMod`,
 	{
-		excludedBonesProperty: undefined as ContextProperty<'array'>,
+		excludedNodesProperty: undefined as ContextProperty<'array'>,
 	},
 	context => {
-		context.excludedBonesProperty = new Property(
+		context.excludedNodesProperty = new Property(
 			Blockbench.Animation,
 			'array',
 			'excluded_nodes',
@@ -71,6 +71,6 @@ createBlockbenchMod(
 		return context
 	},
 	context => {
-		context.excludedBonesProperty?.delete()
+		context.excludedNodesProperty?.delete()
 	}
 )

src/systems/animated_java.mcb

@@ -659,7 +659,7 @@ dir <%export_namespace%> {
 							function *global/errors/function_not_executed_as_root_entity \
 								{'function_path': 'animated_java:<%export_namespace%>/variants/<%variant.name%>/apply'}
 						REPEAT (Object.values(rig.nodeMap)) as node {
-							IF (node.type === 'bone' && !Object.values(variant.excludedBones).find(v => v.value === node.node.uuid) && (rig.variantModels[variant.name][node.node.uuid] !== undefined || node.configs.variants[variant.uuid])) {
+							IF (node.type === 'bone' && !Object.values(variant.excludedNodes).find(v => v.value === node.node.uuid) && (rig.variantModels[variant.name][node.node.uuid] !== undefined || node.configs.variants[variant.uuid])) {
 								execute on passengers if entity @s[tag=aj.<%export_namespace%>.bone.<%node.name%>] run {
 									IF (rig.variantModels[variant.name][node.node.uuid] !== undefined) {
 										data modify entity @s item.components.minecraft:custom_model_data set value <%rig.variantModels[variant.name][node.node.uuid].customModelData%>