Skip to content

Commit 7e10dbf

Browse files
SnaveSutitSnaveSutit
committed
✨ Rename Valuable to Syncable and a couple other store API tweaks
1 parent e945654 commit 7e10dbf

File tree

59 files changed

+312
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+312
-284
lines changed

‎.yarn/install-state.gz

1 Byte
Binary file not shown.

‎src/blockbench-additions/model-formats/ajblueprint/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PACKAGE } from '../../../constants'
44
import { injectSvelteCompomponent } from '../../../util/injectSvelteComponent'
55
import { toSafeFunctionName } from '../../../util/minecraftUtil'
66
import { addProjectToRecentProjects } from '../../../util/misc'
7-
import { Valuable } from '../../../util/stores'
7+
import { Syncable } from '../../../util/stores'
88
import { translate } from '../../../util/translation'
99
import { Variant } from '../../../variants'
1010
import { process } from './dfu'
@@ -527,7 +527,7 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
527527
Project.loadingPromises.push(
528528
new Promise<void>(resolve => {
529529
requestAnimationFrame(() => {
530-
thisProject.pluginMode = new Valuable(
530+
thisProject.pluginMode = new Syncable(
531531
thisProject.animated_java.enable_plugin_mode
532532
)
533533
// Remove the default title

‎src/blockbench-additions/model-formats/ajblueprint/projectTitle.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
22
import AnimatedJavaIcon from '@assets/icons/animated_java_icon.svg'
33
import AnimatedPaperIcon from '@assets/icons/animated_paper_icon.svg'
4-
import { Valuable } from '../../../util/stores'
4+
import { Syncable } from '../../../util/stores'
55
6-
export let pluginMode: Valuable<boolean>
6+
export let pluginMode: Syncable<boolean>
77
</script>
88

99
{#if $pluginMode}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
createBlockbenchMod,
1313
fixClassPropertyInheritance,
1414
} from '../../util/moddingTools'
15-
import { Valuable } from '../../util/stores'
15+
import { Syncable } from '../../util/stores'
1616
import { translate } from '../../util/translation'
1717
import { isCurrentFormat } from '../model-formats/ajblueprint'
1818
import { ResizableOutlinerElement } from './resizableOutlinerElement'
@@ -42,11 +42,11 @@ export class BlockDisplay extends ResizableOutlinerElement {
4242
public needsUniqueName = true
4343

4444
// Properties
45-
private __block = new Valuable('minecraft:stone')
45+
private __block = new Syncable('minecraft:stone')
4646
public config: Serialized<BlockDisplayConfig>
4747
public commonConfig: Serialized<CommonDisplayConfig>
4848

49-
public error = new Valuable('')
49+
public error = new Syncable('')
5050

5151
public menu = new Menu([
5252
...Outliner.control_menu_group,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
createBlockbenchMod,
1111
fixClassPropertyInheritance,
1212
} from '../../util/moddingTools'
13-
import { Valuable } from '../../util/stores'
13+
import { Syncable } from '../../util/stores'
1414
import { translate } from '../../util/translation'
1515
import { isCurrentFormat } from '../model-formats/ajblueprint'
1616
import { ResizableOutlinerElement } from './resizableOutlinerElement'
@@ -38,12 +38,12 @@ export class ItemDisplay extends ResizableOutlinerElement {
3838
public needsUniqueName = true
3939

4040
// Properties
41-
private __item = new Valuable('minecraft:diamond')
42-
private __itemDisplay = new Valuable('none')
41+
private __item = new Syncable('minecraft:diamond')
42+
private __itemDisplay = new Syncable('none')
4343
public config: Serialized<ItemDisplayConfig>
4444
public commonConfig: Serialized<CommonDisplayConfig>
4545

46-
public error = new Valuable('')
46+
public error = new Syncable('')
4747

4848
public menu = new Menu([
4949
...Outliner.control_menu_group,

‎src/blockbench-additions/outliner-elements/textDisplay.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { CommonDisplayConfig, TextDisplayConfig, type Serialized } from '@aj/sys
1212
import EVENTS from '@events'
1313

1414
import { TEXT_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/text-display-config'
15-
import { Valuable } from '../../util/stores'
15+
import { Syncable } from '../../util/stores'
1616
import { translate } from '../../util/translation'
1717
import { ResizableOutlinerElement } from './resizableOutlinerElement'
1818
import { sanitizeOutlinerElementName } from './util'
@@ -58,7 +58,7 @@ export class TextDisplay extends ResizableOutlinerElement {
5858
public preview_controller = PREVIEW_CONTROLLER
5959

6060
public ready = false
61-
public textError = new Valuable('')
61+
public textError = new Syncable('')
6262

6363
private __renderingTextComponent = false
6464

‎src/blockbench-mods/ui/incompatiblePluginNotice.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import IncompatiblePluginNotice from '@svelte-components/incompatiblePluginNotic
22
import { PACKAGE } from '../../constants'
33
import { injectSvelteCompomponentMod } from '../../util/injectSvelteComponent'
44
import { createBlockbenchMod } from '../../util/moddingTools'
5-
import { Valuable } from '../../util/stores'
5+
import { Syncable } from '../../util/stores'
66

7-
const SELECTED_PLUGIN = new Valuable<BBPlugin | null>(null)
7+
const SELECTED_PLUGIN = new Syncable<BBPlugin | null>(null)
88

99
injectSvelteCompomponentMod({
1010
component: IncompatiblePluginNotice,

‎src/blockbenchTypes.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TextDisplay } from './blockbench-additions/outliner-elements/textDispla
44
import { defaultValues } from './blueprintSettings'
55
import type { CommonDisplayConfig, LocatorConfig, Serialized } from './systems/node-configs'
66
import { EasingKey } from './util/easing'
7-
import { Valuable } from './util/stores'
7+
import { Syncable } from './util/stores'
88
import { type Variant } from './variants'
99

1010
declare module 'three' {
@@ -21,7 +21,7 @@ declare global {
2121
animated_java: { [T in keyof typeof defaultValues]: (typeof defaultValues)[T] }
2222
last_used_export_namespace: string
2323
visualBoundingBox?: THREE.LineSegments
24-
pluginMode: Valuable<boolean>
24+
pluginMode: Syncable<boolean>
2525
transparentTexture: Texture
2626

2727
showingInvalidCubeRotations: boolean

‎src/blueprintFormat.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import FormatPageSvelte from './components/formatPage.svelte'
33
import ProjectTitleSvelte from './components/projectTitle.svelte'
44
import { PACKAGE } from './constants'
55
import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs'
6-
import FormatPageSvelte from './svelte/formatPage.svelte'
7-
import ProjectTitleSvelte from './svelte/projectTitle.svelte'
86
import { process } from './systems/modelDataFixerUpper'
97
import { events } from './util/events'
108
import { injectSvelteCompomponent } from './util/injectSvelteComponent'
119
import { toSafeFunctionName } from './util/minecraftUtil'
1210
import { addProjectToRecentProjects } from './util/misc'
13-
import { Valuable } from './util/stores'
11+
import { Syncable } from './util/stores'
1412
import { translate } from './util/translation'
1513
import { Variant } from './variants'
1614

@@ -596,7 +594,7 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
596594
Project.loadingPromises.push(
597595
new Promise<void>(resolve => {
598596
requestAnimationFrame(() => {
599-
thisProject.pluginMode = new Valuable(
597+
thisProject.pluginMode = new Syncable(
600598
thisProject.animated_java.enable_plugin_mode
601599
)
602600
// Remove the default title

‎src/blueprintSettings.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type MinecraftVersion } from './systems/datapack-compiler/versions'
2-
import { Valuable } from './util/stores'
2+
import { Syncable } from './util/stores'
33

44
export type ExportMode = 'folder' | 'zip' | 'none'
55
export type ExportEnvironment = 'vanilla' | 'plugin'
@@ -37,4 +37,4 @@ export const defaultValues = {
3737
json_file: '',
3838
}
3939

40-
export const blueprintSettingErrors = new Valuable<Record<string, string>>({})
40+
export const blueprintSettingErrors = new Syncable<Record<string, string>>({})

0 commit comments

Comments
 (0)