🔁 Added Loop Delay property to animations

Author: SnaveSutit

src/components/animationProperties.svelte

@@ -13,6 +13,7 @@
 
 	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 => {
@@ -62,6 +63,13 @@
 		bind:value={loopMode}
 	/>
 
+	<NumberSlider
+		label={translate('dialog.animation_properties.loop_delay.title')}
+		tooltip={translate('dialog.animation_properties.loop_delay.description')}
+		min={0}
+		bind:value={loopDelay}
+	/>
+
 	<Collection
 		label={translate('dialog.animation_properties.excluded_bones.title')}
 		tooltip={translate('dialog.animation_properties.bone_lists.description')}

src/interface/animationPropertiesDialog.ts

@@ -7,6 +7,7 @@ import { translate } from '../util/translation'
 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)
 
 	new SvelteDialog({
@@ -17,24 +18,16 @@ export function openAnimationPropertiesDialog(animation: _Animation) {
 		svelteComponentProperties: {
 			animationName,
 			loopMode,
+			loopDelay,
 			excludedBones,
 		},
 		preventKeybinds: true,
 		onConfirm() {
 			animation.name = animationName.get()
 			animation.createUniqueName(Blockbench.Animation.all)
 			animation.loop = loopMode.get()
+			animation.loop_delay = loopDelay.get().toString()
 			animation.excluded_bones = excludedBones.get()
 		},
 	}).show()
 }
-
-// export const ANIMATION_PROPERTIES_ACTION = createAction(`${PACKAGE.name}:bone_config`, {
-// 	icon: 'settings',
-// 	name: translate('action.open_bone_config.name'),
-// 	condition: () => Format === BLUEPRINT_FORMAT,
-// 	click: () => {
-// 		if (!Blockbench.Animation.selected) return
-// 		openBoneConfigDialog(Blockbench.Animation.selected)
-// 	},
-// })

src/lang/en.yml

@@ -294,6 +294,9 @@ animated_java.dialog.animation_properties.loop_mode.options.loop: Loop
 animated_java.dialog.animation_properties.animation_name.error.empty: The animation name cannot be empty!
 animated_java.dialog.animation_properties.animation_name.error.invalid_characters: The animation name contains invalid characters! Animation names should only contain letters, numbers, underscores, and periods.
 
+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.

src/systems/animated_java.mcb

@@ -298,7 +298,7 @@ dir <%export_namespace%> {
 						execute if score @s <%OBJECTIVES.TWEEN_DURATION()%> matches 0 on passengers run data modify entity @s interpolation_duration set value <%interpolation_duration%>
 						# Animation logic
 						execute store result storage aj:temp frame int 1 run scoreboard players get @s <%OBJECTIVES.FRAME()%>
-						IF (animation.loopMode === 'loop') {
+						IF (animation.loopMode === 'loop' && animation.loopDelay === 0) {
 							# Makes sure commands in the last frame of the animation is run.
 							execute if score @s <%OBJECTIVES.FRAME()%> matches -1 run {
 								function ./apply_frame {frame: <%animation.duration-1%>}
@@ -307,8 +307,8 @@ dir <%export_namespace%> {
 						}
 						function ./apply_frame with storage aj:temp
 						IF (animation.loopMode === 'loop') {
-							execute if score @s <%OBJECTIVES.FRAME()%> matches <%animation.duration-2%>.. run return run {
-								scoreboard players set @s <%OBJECTIVES.FRAME()%> -1
+							execute if score @s <%OBJECTIVES.FRAME()%> matches <%animation.duration-2 + animation.loopDelay%>.. run return run {
+								scoreboard players set @s <%OBJECTIVES.FRAME()%> <%animation.loopDelay === 0 ? -1 : 0%>
 							}
 						} ELSE IF (animation.loopMode === 'hold') {
 							execute if score @s <%OBJECTIVES.FRAME()%> matches <%animation.duration-1%>.. run return run function ../pause

src/systems/animationRenderer.ts

@@ -74,7 +74,6 @@ export interface IRenderedFrame {
 
 export interface IRenderedAnimation {
 	name: string
-	startDelay: number
 	loopDelay: number
 	frames: IRenderedFrame[]
 	/**
@@ -251,8 +250,7 @@ export function updatePreview(animation: _Animation, time: number) {
 export function renderAnimation(animation: _Animation, rig: IRenderedRig) {
 	const rendered = {
 		name: animation.name,
-		startDelay: Number(animation.start_delay),
-		loopDelay: Number(animation.loop_delay),
+		loopDelay: Number(animation.loop_delay) || 0,
 		frames: [],
 		duration: 0,
 		loopMode: animation.loop,