Skip to content

Commit 06f6c55

Browse files
committed
🎨 No more Vanilla prefix for display entity elements!
1 parent ffd177a commit 06f6c55

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

src/blockbench-additions/outliner-elements/blockDisplay.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ interface BlockDisplayOptions {
2626
visibility?: boolean
2727
}
2828

29+
@fixClassPropertyInheritance
2930
export class BlockDisplay extends ResizableOutlinerElement {
30-
static type = `${PACKAGE.name}:vanilla_block_display`
31+
static type = `${PACKAGE.name}:block_display`
3132
static selected: BlockDisplay[] = []
3233
static all: BlockDisplay[] = []
3334

@@ -406,8 +407,8 @@ createBlockbenchMod(
406407
}
407408
)
408409

409-
export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_block_display`, {
410-
name: translate('action.create_vanilla_block_display.title'),
410+
export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_block_display`, {
411+
name: translate('action.create_block_display.title'),
411412
icon: 'deployed_code',
412413
category: 'animated_java',
413414
condition() {

src/blockbench-additions/outliner-elements/itemDisplay.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ interface ItemDisplayOptions {
2323
visibility?: boolean
2424
}
2525

26+
@fixClassPropertyInheritance
2627
export class ItemDisplay extends ResizableOutlinerElement {
27-
static type = `${PACKAGE.name}:vanilla_item_display`
28+
static type = `${PACKAGE.name}:item_display`
2829
static selected: ItemDisplay[] = []
2930
static all: ItemDisplay[] = []
3031

@@ -406,8 +407,8 @@ createBlockbenchMod(
406407
}
407408
)
408409

409-
export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_item_display`, {
410-
name: translate('action.create_vanilla_item_display.title'),
410+
export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_item_display`, {
411+
name: translate('action.create_item_display.title'),
411412
icon: 'icecream',
412413
category: 'animated_java',
413414
condition() {

src/systems/datapack-compiler/tags.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export namespace TAGS {
2222

2323
export const GLOBAL_NODE = () => 'aj.global.node'
2424
export const GLOBAL_DISPLAY_NODE = () => 'aj.global.display_node'
25-
export const GLOBAL_VANILLA_DISPLAY_NODE = () => 'aj.global.vanilla_display_node'
25+
export const GLOBAL_VANILLA_DISPLAY_NODE = () => 'aj.global.display_node'
2626
export const GLOBAL_BONE = () => 'aj.global.bone'
2727
export const GLOBAL_ITEM_DISPLAY = () => 'aj.global.item_display'
2828
export const GLOBAL_BLOCK_DISPLAY = () => 'aj.global.block_display'
@@ -97,7 +97,7 @@ export namespace TAGS {
9797
export const PROJECT_DISPLAY_NODE = () =>
9898
`aj.${createTagPrefixFromBlueprintID(Project!.animated_java.id)}.display_node`
9999
export const PROJECT_VANILLA_DISPLAY_NODE = () =>
100-
`aj.${createTagPrefixFromBlueprintID(Project!.animated_java.id)}.vanilla_display_node`
100+
`aj.${createTagPrefixFromBlueprintID(Project!.animated_java.id)}.display_node`
101101
export const PROJECT_BONE = () =>
102102
`aj.${createTagPrefixFromBlueprintID(Project!.animated_java.id)}.bone`
103103
export const PROJECT_ITEM_DISPLAY = () =>

src/ui/dialogs/block-display-config/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function openBlockDisplayConfigDialog(display: BlockDisplay) {
3131

3232
new SvelteDialog({
3333
id: `${PACKAGE.name}:vanillaItemDisplayConfigDialog`,
34-
title: translate('dialog.vanilla_block_display_config.title'),
34+
title: translate('dialog.block_display_config.title'),
3535
width: 400,
3636
component: BlockDisplayConfigDialog,
3737
props: {
@@ -96,10 +96,10 @@ export function openBlockDisplayConfigDialog(display: BlockDisplay) {
9696
}
9797

9898
export const VANILLA_BLOCK_DISPLAY_CONFIG_ACTION = createAction(
99-
`${PACKAGE.name}:open_vanilla_block_display_config`,
99+
`${PACKAGE.name}:open_block_display_config`,
100100
{
101101
icon: 'settings',
102-
name: translate('action.open_vanilla_block_display_config.name'),
102+
name: translate('action.open_block_display_config.name'),
103103
condition: () => isCurrentFormat(),
104104
click: () => {
105105
if (BlockDisplay.selected.length === 0) return

src/ui/dialogs/item-display-config/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function openItemDisplayConfigDialog(display: ItemDisplay) {
3131

3232
new SvelteDialog({
3333
id: `${PACKAGE.name}:vanillaItemDisplayConfigDialog`,
34-
title: translate('dialog.vanilla_item_display_config.title'),
34+
title: translate('dialog.item_display_config.title'),
3535
width: 400,
3636
component: ItemDisplayConfigDialog,
3737
props: {
@@ -96,10 +96,10 @@ export function openItemDisplayConfigDialog(display: ItemDisplay) {
9696
}
9797

9898
export const VANILLA_ITEM_DISPLAY_CONFIG_ACTION = createAction(
99-
`${PACKAGE.name}:open_vanilla_item_display_config`,
99+
`${PACKAGE.name}:open_item_display_config`,
100100
{
101101
icon: 'settings',
102-
name: translate('action.open_vanilla_item_display_config.name'),
102+
name: translate('action.open_item_display_config.name'),
103103
condition: () => isCurrentFormat(),
104104
click: () => {
105105
if (ItemDisplay.selected.length === 0) return

src/ui/panels/block-display-element/vanillaBlockDisplayElementPanel.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</script>
2525

2626
<p class="panel_toolbar_label label" style={!!visible ? '' : 'visibility:hidden; height: 0px;'}>
27-
{translate('panel.vanilla_block_display.title')}
27+
{translate('panel.block_display.title')}
2828
</p>
2929

3030
<div
3131
class="toolbar custom-toolbar"
3232
style={!!visible ? '' : 'visibility:hidden; height: 0px;'}
33-
title={translate('panel.vanilla_block_display.description')}
33+
title={translate('panel.block_display.description')}
3434
>
3535
<div class="content" style="width: 95%;">
3636
<input type="text" bind:value={$block} />

src/ui/panels/item-display-element/vanillaItemDisplayElementPanel.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</script>
3232

3333
<p class="panel_toolbar_label label" style={!!visible ? '' : 'visibility:hidden; height: 0px;'}>
34-
{translate('panel.vanilla_item_display.title')}
34+
{translate('panel.item_display.title')}
3535
</p>
3636

3737
<div
3838
class="toolbar custom-toolbar"
3939
style={!!visible ? '' : 'visibility:hidden; height: 0px;'}
40-
title={translate('panel.vanilla_item_display.description')}
40+
title={translate('panel.item_display.description')}
4141
>
4242
<div class="content" style="width: 95%;">
4343
<input type="text" bind:value={$item} />

0 commit comments

Comments
 (0)