Skip to content

Commit 4b92d51

Browse files
SnaveSutitSnaveSutit
committed
🛠️ Major Fixes and improvements
- Fixed locator commands not functioning. - Added ticking commands blueprint setting. - Added Root-based commands keyframes. - Improved Dialog Item UI interactivity. - Cleaned up index imports. - Split advanced resource pack settings into `advanced_resource_pack_settings` and `advanced_resource_pack_folders`. - Moved bone interpolation mod into it's own file. - Fixed animation renderer not correctly gathering variant keyframe execute conditions. - Fixed variant apply functions not actually doing anything. - Removed locator debug bubbles. - Added asset manager loading bar. - Added a MDFU entry for v1.4.0. - Fixed missing node configs causing crash when hashing rigs.
1 parent 750ab00 commit 4b92d51

33 files changed

+350
-284
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"type": "module",
33
"name": "animated_java",
44
"title": "Animated Java",
5-
"version": "1.3.1",
6-
"display_version": "1.3.1",
5+
"version": "1.4.0",
6+
"display_version": "1.4.0",
77
"min_blockbench_version": "4.10.0",
88
"author": {
99
"name": "Titus Evans (SnaveSutit)",

‎src/blueprintSettings.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const defaultValues = {
1515
display_item: 'minecraft:white_dye',
1616
custom_model_data_offset: 0,
1717
enable_advanced_resource_pack_settings: false,
18+
enable_advanced_resource_pack_folders: false,
1819
resource_pack: '',
1920
display_item_path: '',
2021
model_folder: '',
@@ -23,6 +24,7 @@ export const defaultValues = {
2324
enable_advanced_data_pack_settings: false,
2425
data_pack: '',
2526
summon_commands: '',
27+
ticking_commands: '',
2628
interpolation_duration: 1,
2729
teleportation_duration: 1,
2830
use_storage_for_animation: false,

‎src/components/blueprintSettingsDialog.svelte‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
export let displayItem: Valuable<string>
5050
export let customModelDataOffset: Valuable<number>
5151
export let enableAdvancedResourcePackSettings: Valuable<boolean>
52+
export let enableAdvancedResourcePackFolders: Valuable<boolean>
5253
export let resourcePack: Valuable<string>
5354
export let displayItemPath: Valuable<string>
5455
export let modelFolder: Valuable<string>
@@ -57,6 +58,7 @@
5758
export let enableAdvancedDataPackSettings: Valuable<boolean>
5859
export let dataPack: Valuable<string>
5960
export let summonCommands: Valuable<string>
61+
export let tickingCommands: Valuable<string>
6062
export let interpolationDuration: Valuable<number>
6163
export let teleportationDuration: Valuable<number>
6264
export let useStorageForAnimation: Valuable<boolean>
@@ -529,12 +531,6 @@
529531
valueChecker={displayItemChecker}
530532
/>
531533

532-
<NumberSlider
533-
label={translate('dialog.blueprint_settings.custom_model_data_offset.title')}
534-
tooltip={translate('dialog.blueprint_settings.custom_model_data_offset.description')}
535-
bind:value={customModelDataOffset}
536-
/>
537-
538534
<Checkbox
539535
label={translate('dialog.blueprint_settings.baked_animations.title')}
540536
tooltip={translate('dialog.blueprint_settings.baked_animations.description')}
@@ -576,33 +572,49 @@
576572
<SectionHeader
577573
label={translate('dialog.blueprint_settings.resource_pack_settings.title')}
578574
/>
575+
576+
<LineInput
577+
label={translate('dialog.blueprint_settings.display_item.title')}
578+
tooltip={translate('dialog.blueprint_settings.display_item.description')}
579+
bind:value={displayItem}
580+
valueChecker={displayItemChecker}
581+
/>
582+
583+
<Checkbox
584+
label={translate(
585+
'dialog.blueprint_settings.enable_advanced_resource_pack_settings.title',
586+
)}
587+
bind:checked={enableAdvancedResourcePackSettings}
588+
/>
589+
590+
{#if $enableAdvancedResourcePackSettings}
591+
<p class="warning">
592+
{translate('dialog.blueprint_settings.advanced_settings_warning')}
593+
</p>
594+
595+
<NumberSlider
596+
label={translate('dialog.blueprint_settings.custom_model_data_offset.title')}
597+
tooltip={translate(
598+
'dialog.blueprint_settings.custom_model_data_offset.description',
599+
)}
600+
bind:value={customModelDataOffset}
601+
min={0}
602+
max={2147483647}
603+
/>
604+
{/if}
605+
579606
{#if $resourcePackExportMode === 'raw'}
580607
<Checkbox
581608
label={translate(
582-
'dialog.blueprint_settings.enable_advanced_resource_pack_settings.title',
609+
'dialog.blueprint_settings.enable_advanced_resource_pack_folders.title',
583610
)}
584-
bind:checked={enableAdvancedResourcePackSettings}
611+
bind:checked={enableAdvancedResourcePackFolders}
585612
/>
586-
{#if $enableAdvancedResourcePackSettings}
613+
614+
{#if $enableAdvancedResourcePackFolders}
587615
<p class="warning">
588616
{translate('dialog.blueprint_settings.advanced_settings_warning')}
589617
</p>
590-
<LineInput
591-
label={translate('dialog.blueprint_settings.display_item.title')}
592-
tooltip={translate('dialog.blueprint_settings.display_item.description')}
593-
bind:value={displayItem}
594-
valueChecker={displayItemChecker}
595-
/>
596-
597-
<NumberSlider
598-
label={translate(
599-
'dialog.blueprint_settings.custom_model_data_offset.title',
600-
)}
601-
tooltip={translate(
602-
'dialog.blueprint_settings.custom_model_data_offset.description',
603-
)}
604-
bind:value={customModelDataOffset}
605-
/>
606618

607619
<FileSelect
608620
label={translate('dialog.blueprint_settings.display_item_path.title')}
@@ -627,25 +639,6 @@
627639
valueChecker={advancedResourcePackFolderChecker}
628640
/>
629641
{:else}
630-
<LineInput
631-
label={translate('dialog.blueprint_settings.display_item.title')}
632-
tooltip={translate('dialog.blueprint_settings.display_item.description')}
633-
bind:value={displayItem}
634-
valueChecker={displayItemChecker}
635-
/>
636-
637-
<NumberSlider
638-
label={translate(
639-
'dialog.blueprint_settings.custom_model_data_offset.title',
640-
)}
641-
tooltip={translate(
642-
'dialog.blueprint_settings.custom_model_data_offset.description',
643-
)}
644-
bind:value={customModelDataOffset}
645-
min={0}
646-
max={2147483647}
647-
/>
648-
649642
<FolderSelect
650643
label={translate('dialog.blueprint_settings.resource_pack.title')}
651644
tooltip={translate('dialog.blueprint_settings.resource_pack.description')}
@@ -667,6 +660,7 @@
667660
<SectionHeader
668661
label={translate('dialog.blueprint_settings.data_pack_settings.title')}
669662
/>
663+
670664
{#if $dataPackExportMode === 'raw'}
671665
{#if $enableAdvancedDataPackSettings}
672666
<p class="warning">
@@ -695,12 +689,19 @@
695689
valueChecker={zipChecker}
696690
/>
697691
{/if}
692+
698693
<CodeInput
699694
label={translate('dialog.blueprint_settings.summon_commands.title')}
700695
tooltip={translate('dialog.blueprint_settings.summon_commands.description')}
701696
bind:value={summonCommands}
702697
/>
703698

699+
<CodeInput
700+
label={translate('dialog.blueprint_settings.ticking_commands.title')}
701+
tooltip={translate('dialog.blueprint_settings.ticking_commands.description')}
702+
bind:value={tickingCommands}
703+
/>
704+
704705
<NumberSlider
705706
label={translate('dialog.blueprint_settings.interpolation_duration.title')}
706707
tooltip={translate('dialog.blueprint_settings.interpolation_duration.description')}

‎src/components/dialogItems/baseDialogItem.svelte‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
export let warning_text: string = ''
99
export let error_text: string = ''
1010
11+
let id = guid()
12+
1113
$: if (error_text) {
1214
blueprintSettingErrors.get()[label] = error_text
1315
}
@@ -20,7 +22,7 @@
2022
<div>
2123
<div class="base_dialog_item" title={tooltip}>
2224
<div class="slot_container" style={tooltip ? 'margin-right: 4px' : ''}>
23-
<slot />
25+
<slot {id} />
2426
</div>
2527
{#if tooltip}
2628
<!-- svelte-ignore a11y-click-events-have-key-events -->

‎src/components/dialogItems/checkbox.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
export let checked: Valuable<boolean>
88
</script>
99

10-
<BaseDialogItem {label} {tooltip}>
10+
<BaseDialogItem {label} {tooltip} let:id>
1111
<div class="dialog_bar form_bar checkbox_bar">
12-
<label class="name_space_left" for="export">{label}</label>
12+
<label class="name_space_left" for={id}>{label}</label>
1313
<div class="spacer" />
14-
<input type="checkbox" class="focusable_input" id="export" bind:checked={$checked} />
14+
<input type="checkbox" class="focusable_input" {id} bind:checked={$checked} />
1515
</div>
1616
</BaseDialogItem>
1717

‎src/components/dialogItems/codeInput.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
onValueChange()
2828
</script>
2929

30-
<BaseDialogItem {label} {tooltip} {warning_text} {error_text}>
30+
<BaseDialogItem {label} {tooltip} {warning_text} {error_text} let:id>
3131
<div class="dialog_bar form_bar">
32-
<label class="name_space_left" for="name">{label}</label>
32+
<label class="name_space_left" for={id}>{label}</label>
3333
<textarea
3434
class="dark_bordered half focusable_input"
35-
id="name"
35+
{id}
3636
bind:value={_value}
3737
on:change={onValueChange}
3838
{disabled}

‎src/components/dialogItems/collection.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454
</script>
5555

56-
<BaseDialogItem {label} {tooltip}>
56+
<BaseDialogItem {label} {tooltip} let:id>
5757
<div class="main-column-container">
5858
<div class="column" title={availableItemsColumnTooltip}>
5959
<h3>{availableItemsColumnLable}</h3>

‎src/components/dialogItems/colorPicker.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
})
2828
</script>
2929

30-
<BaseDialogItem {label} {tooltip}>
30+
<BaseDialogItem {label} {tooltip} let:id>
3131
<div class="dialog_bar form_bar">
32-
<label class="name_space_left" for="export">{label}</label>
32+
<label class="name_space_left" for={id}>{label}</label>
3333
<div bind:this={colorPickerMount} use:onLoad />
3434
</div>
3535
</BaseDialogItem>

‎src/components/dialogItems/fileSelect.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
onValueChange()
4949
</script>
5050

51-
<BaseDialogItem {label} {tooltip} bind:warning_text bind:error_text>
51+
<BaseDialogItem {label} {tooltip} bind:warning_text bind:error_text let:id>
5252
<div class="dialog_bar form_bar">
53-
<label class="name_space_left" for="name">{label}</label>
53+
<label class="name_space_left" for={id}>{label}</label>
5454
<input
5555
type="text"
5656
class="dark_bordered half focusable_input"
57-
id="name"
57+
{id}
5858
bind:value={_value}
5959
on:input={onValueChange}
6060
on:change={onValueChange}

‎src/components/dialogItems/folderSelect.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
onValueChange()
4949
</script>
5050

51-
<BaseDialogItem {label} {tooltip} bind:warning_text bind:error_text>
51+
<BaseDialogItem {label} {tooltip} bind:warning_text bind:error_text let:id>
5252
<div class="dialog_bar form_bar">
53-
<label class="name_space_left" for="name">{label}</label>
53+
<label class="name_space_left" for={id}>{label}</label>
5454
<input
5555
type="text"
5656
class="dark_bordered half focusable_input"
57-
id="name"
57+
{id}
5858
bind:value={_value}
5959
on:input={onValueChange}
6060
on:change={onValueChange}

0 commit comments

Comments
 (0)