Skip to content

Commit aed8d06

Browse files
SnaveSutitSnaveSutit
committed
🚧 Reorganize UI files
1 parent 61ff52c commit aed8d06

Some content is hidden

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

46 files changed

+192
-237
lines changed

‎src/blockbenchTypeMods.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import type {
55
IBlueprintLocatorConfigJSON,
66
} from './blueprintFormat'
77
import { blueprintSettingErrors, defaultValues } from './blueprintSettings'
8-
import { openExportProgressDialog } from './interface/exportProgressDialog'
9-
import { openUnexpectedErrorDialog } from './interface/unexpectedErrorDialog'
8+
import { openExportProgressDialog } from './interface/dialog/exportProgress'
9+
import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
1010
import { TextDisplay } from './outliner/textDisplay'
1111
import datapackCompiler from './systems/datapackCompiler'
1212
import resourcepackCompiler from './systems/resourcepackCompiler'

‎src/components/blueprintSettingsDialog.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import FolderSelect from './dialogItems/folderSelect.svelte'
1313
import CodeInput from './dialogItems/codeInput.svelte'
1414
import Select from './dialogItems/select.svelte'
15-
import { DIALOG_ID } from '../interface/animationPropertiesDialog'
15+
import { DIALOG_ID } from '../interface/dialog/animationProperties'
1616
1717
import HeartIcon from '../assets/heart.png'
1818
import KoFiImage from '../assets/kofi_s_tag_white.webp'

‎src/components/dialogItems/multiSelect.svelte

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/components/textDisplayElementPanel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
TEXT_DISPLAY_SHADOW_TOGGLE,
1010
TEXT_DISPLAY_ALIGNMENT_SELECT,
1111
TEXT_DISPLAY_SEE_THROUGH_TOGGLE,
12-
} from '../interface/textDisplayElementPanel'
12+
} from '../interface/panel/textDisplayElement'
1313
import { floatToHex } from '../util/misc'
1414
import { translate } from '../util/translation'
1515

‎src/components/vanillaItemDisplayElementPanel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts" context="module">
2-
import { ITEM_DISPLAY_ITEM_DISPLAY_SELECT } from '../interface/vanillaItemDisplayElementPanel'
2+
import { ITEM_DISPLAY_ITEM_DISPLAY_SELECT } from '../interface/panel/vanillaItemDisplayElement'
33
import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
44
import { events } from '../util/events'
55
import { Valuable } from '../util/stores'

‎src/components/variantsPanel.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import { SHADOW_ITEM_MARKER_PROPERTY_NAME, dndzone } from 'svelte-dnd-action'
55
import { Variant } from '../variants'
66
import { events } from '../util/events'
7-
import { openVariantConfigDialog } from '../interface/variantConfigDialog'
7+
import { openVariantConfigDialog } from '../interface/dialog/variantConfig'
88
import { fade } from 'svelte/transition'
99
import { cubicIn } from 'svelte/easing'
1010
import {
1111
CREATE_VARIANT_ACTION,
1212
DELETE_VARIANT_ACTION,
1313
DUPLICATE_VARIANT_ACTION,
1414
VARIANT_PANEL_CONTEXT_MENU,
15-
} from '../interface/variantsPanel'
15+
} from '../interface/panel/variants'
1616
1717
type LocalVariant = { id: number; value: Variant }
1818

‎src/index.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import { TRANSPARENT_TEXTURE, Variant } from './variants'
2424
import './systems/minecraft/registryManager'
2525
import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
2626
import resourcepackCompiler from './systems/resourcepackCompiler'
27-
import { openExportProgressDialog } from './interface/exportProgressDialog'
27+
import { openExportProgressDialog } from './interface/dialog/exportProgress'
2828
import { isDataPackPath, isResourcePackPath, parseResourcePackPath } from './util/minecraftUtil'
2929
import { blueprintSettingErrors } from './blueprintSettings'
30-
import { openUnexpectedErrorDialog } from './interface/unexpectedErrorDialog'
30+
import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
3131
import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat'
3232
import { TextDisplay } from './outliner/textDisplay'
3333
import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
@@ -39,11 +39,10 @@ import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
3939
import { VanillaBlockDisplay, debugBlockState, debugBlocks } from './outliner/vanillaBlockDisplay'
4040
import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
4141
import { exportProject } from './systems/exporter'
42-
import { openBlueprintLoadingDialog } from './interface/blueprintLoadingPopup'
43-
import { openInstallPopup } from './interface/installedPopup'
42+
import { openInstallPopup } from './interface/popup/installed'
4443
import { cleanupExportedFiles } from './systems/cleaner'
4544
import mcbFiles from './systems/datapackCompiler/mcbFiles'
46-
import { openChangelogDialog } from './interface/changelogDialog'
45+
import { openChangelogDialog } from './interface/dialog/changelog'
4746

4847
// @ts-ignore
4948
globalThis.AnimatedJava = {
@@ -73,7 +72,6 @@ globalThis.AnimatedJava = {
7372
debugBlockState,
7473
BLOCKSTATE_REGISTRY,
7574
exportProject,
76-
openBlueprintLoadingDialog,
7775
openInstallPopup,
7876
removeCubesAssociatedWithTexture(texture: Texture) {
7977
const cubes = Cube.all.filter(cube =>

‎src/interface/animatedJavaBarItem.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { cleanupExportedFiles } from '../systems/cleaner'
55
import { exportProject } from '../systems/exporter'
66
import { createAction, createBarMenu } from '../util/moddingTools'
77
import { translate } from '../util/translation'
8-
import { openAboutDialog } from './aboutDialog'
9-
import { openBlueprintSettingsDialog } from './blueprintSettingsDialog'
10-
import { openChangelogDialog } from './changelogDialog'
8+
import { openAboutDialog } from './dialog/about'
9+
import { openBlueprintSettingsDialog } from './dialog/blueprintSettings'
10+
import { openChangelogDialog } from './dialog/changelog'
1111

1212
function createIconImg() {
1313
const IMG = document.createElement('img')

‎src/interface/aboutDialog.ts renamed to ‎src/interface/dialog/about.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { PACKAGE } from '../constants'
2-
import AboutSvelte from '../components/about.svelte'
3-
import { SvelteDialog } from '../util/svelteDialog'
4-
import { translate } from '../util/translation'
1+
import { PACKAGE } from '../../constants'
2+
import AboutSvelte from '../../components/about.svelte'
3+
import { SvelteDialog } from '../../util/svelteDialog'
4+
import { translate } from '../../util/translation'
55

66
export function openAboutDialog() {
77
new SvelteDialog({

‎src/interface/animationPropertiesDialog.ts renamed to ‎src/interface/dialog/animationProperties.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import AniamtionPropertiesSvelteComponent from '../components/animationProperties.svelte'
2-
import { PACKAGE } from '../constants'
3-
import { Valuable } from '../util/stores'
4-
import { SvelteDialog } from '../util/svelteDialog'
5-
import { translate } from '../util/translation'
1+
import AniamtionPropertiesSvelteComponent from '../../components/animationProperties.svelte'
2+
import { PACKAGE } from '../../constants'
3+
import { Valuable } from '../../util/stores'
4+
import { SvelteDialog } from '../../util/svelteDialog'
5+
import { translate } from '../../util/translation'
66

77
export const DIALOG_ID = `${PACKAGE.name}:animationPropertiesDialog`
88

‎src/interface/blueprintSettingsDialog.ts renamed to ‎src/interface/dialog/blueprintSettings.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { PACKAGE } from '../constants'
2-
import { SvelteDialog } from '../util/svelteDialog'
3-
import { Valuable } from '../util/stores'
4-
import BlueprintSettingsDialogSvelteComponent from '../components/blueprintSettingsDialog.svelte'
5-
import { toSafeFuntionName } from '../util/minecraftUtil'
6-
import { defaultValues, ExportMode } from '../blueprintSettings'
7-
import { translate } from '../util/translation'
8-
import { updateBoundingBox } from '../blueprintFormat'
9-
import { MinecraftVersion } from '../systems/datapackCompiler/mcbFiles'
1+
import { PACKAGE } from '../../constants'
2+
import { SvelteDialog } from '../../util/svelteDialog'
3+
import { Valuable } from '../../util/stores'
4+
import BlueprintSettingsDialogSvelteComponent from '../../components/blueprintSettingsDialog.svelte'
5+
import { toSafeFuntionName } from '../../util/minecraftUtil'
6+
import { defaultValues, ExportMode } from '../../blueprintSettings'
7+
import { translate } from '../../util/translation'
8+
import { updateBoundingBox } from '../../blueprintFormat'
9+
import { MinecraftVersion } from '../../systems/datapackCompiler/mcbFiles'
1010

1111
function getSettings() {
1212
return {

‎src/interface/boneConfigDialog.ts renamed to ‎src/interface/dialog/boneConfig.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { BLUEPRINT_FORMAT } from '../blueprintFormat'
2-
import { BoneConfig } from '../nodeConfigs'
3-
import BoneConfigDialogSvelteComponent from '../components/boneConfigDialog.svelte'
4-
import { PACKAGE } from '../constants'
5-
import { createAction } from '../util/moddingTools'
6-
import { Valuable } from '../util/stores'
7-
import { SvelteDialog } from '../util/svelteDialog'
8-
import { translate } from '../util/translation'
9-
import { Variant } from '../variants'
1+
import { BLUEPRINT_FORMAT } from '../../blueprintFormat'
2+
import { BoneConfig } from '../../nodeConfigs'
3+
import BoneConfigDialogSvelteComponent from '../../components/boneConfigDialog.svelte'
4+
import { PACKAGE } from '../../constants'
5+
import { createAction } from '../../util/moddingTools'
6+
import { Valuable } from '../../util/stores'
7+
import { SvelteDialog } from '../../util/svelteDialog'
8+
import { translate } from '../../util/translation'
9+
import { Variant } from '../../variants'
1010

1111
// TODO: These should probably be part of the BoneConfig class
1212
function propagateInheritanceUp(group: Group, config: BoneConfig, variant?: string): void {

‎src/interface/changelogDialog.ts renamed to ‎src/interface/dialog/changelog.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import ChangelogDialog from '../components/changelogDialog.svelte'
2-
import { PACKAGE } from '../constants'
3-
import { SvelteDialog } from '../util/svelteDialog'
4-
import { translate } from '../util/translation'
1+
import ChangelogDialog from '../../components/changelogDialog.svelte'
2+
import { PACKAGE } from '../../constants'
3+
import { SvelteDialog } from '../../util/svelteDialog'
4+
import { translate } from '../../util/translation'
55

66
export const DIALOG_ID = `${PACKAGE.name}:animationPropertiesDialog`
77

‎src/interface/exportProgressDialog.ts renamed to ‎src/interface/dialog/exportProgress.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import ExportProgressDialogSvelteComponent from '../components/exportProgressDialog.svelte'
2-
import { PACKAGE } from '../constants'
3-
import { Valuable } from '../util/stores'
4-
import { SvelteDialog } from '../util/svelteDialog'
5-
import { translate } from '../util/translation'
1+
import ExportProgressDialogSvelteComponent from '../../components/exportProgressDialog.svelte'
2+
import { PACKAGE } from '../../constants'
3+
import { Valuable } from '../../util/stores'
4+
import { SvelteDialog } from '../../util/svelteDialog'
5+
import { translate } from '../../util/translation'
66

77
export const PROGRESS = new Valuable(0)
88
export const MAX_PROGRESS = new Valuable(1)

‎src/interface/locatorConfigDialog.ts renamed to ‎src/interface/dialog/locatorConfig.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { BLUEPRINT_FORMAT } from '../blueprintFormat'
2-
import { LocatorConfig } from '../nodeConfigs'
3-
import LocatorConfigDialog from '../components/locatorConfigDialog.svelte'
4-
import { PACKAGE } from '../constants'
5-
import { createAction } from '../util/moddingTools'
6-
import { Valuable } from '../util/stores'
7-
import { SvelteDialog } from '../util/svelteDialog'
8-
import { translate } from '../util/translation'
1+
import { BLUEPRINT_FORMAT } from '../../blueprintFormat'
2+
import { LocatorConfig } from '../../nodeConfigs'
3+
import LocatorConfigDialog from '../../components/locatorConfigDialog.svelte'
4+
import { PACKAGE } from '../../constants'
5+
import { createAction } from '../../util/moddingTools'
6+
import { Valuable } from '../../util/stores'
7+
import { SvelteDialog } from '../../util/svelteDialog'
8+
import { translate } from '../../util/translation'
99

1010
export function openLocatorConfigDialog(locator: Locator) {
1111
// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the locator instead of the actual LocatorConfig object

‎src/interface/textDisplayConfigDialog.ts renamed to ‎src/interface/dialog/textDisplayConfig.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { isCurrentFormat } from '../blueprintFormat'
2-
import { TextDisplayConfig } from '../nodeConfigs'
3-
import { PACKAGE } from '../constants'
4-
import { createAction } from '../util/moddingTools'
5-
import { Valuable } from '../util/stores'
6-
import { SvelteDialog } from '../util/svelteDialog'
7-
import { translate } from '../util/translation'
8-
import { Variant } from '../variants'
9-
import TextDisplayConfigDialog from '../components/textDisplayConfigDialog.svelte'
10-
import { TextDisplay } from '../outliner/textDisplay'
1+
import { isCurrentFormat } from '../../blueprintFormat'
2+
import { TextDisplayConfig } from '../../nodeConfigs'
3+
import { PACKAGE } from '../../constants'
4+
import { createAction } from '../../util/moddingTools'
5+
import { Valuable } from '../../util/stores'
6+
import { SvelteDialog } from '../../util/svelteDialog'
7+
import { translate } from '../../util/translation'
8+
import { Variant } from '../../variants'
9+
import TextDisplayConfigDialog from '../../components/textDisplayConfigDialog.svelte'
10+
import { TextDisplay } from '../../outliner/textDisplay'
1111

1212
export function openBoneConfigDialog(bone: TextDisplay) {
1313
// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object

‎src/interface/unexpectedErrorDialog.ts renamed to ‎src/interface/dialog/unexpectedError.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import UnexpectedErrorDialog from '../components/unexpectedErrorDialog.svelte'
2-
import { PACKAGE } from '../constants'
3-
import { SvelteDialog } from '../util/svelteDialog'
4-
import { translate } from '../util/translation'
1+
import UnexpectedErrorDialog from '../../components/unexpectedErrorDialog.svelte'
2+
import { PACKAGE } from '../../constants'
3+
import { SvelteDialog } from '../../util/svelteDialog'
4+
import { translate } from '../../util/translation'
55

66
export function openUnexpectedErrorDialog(error: Error) {
77
new SvelteDialog({

‎src/interface/vanillaBlockDisplayConfigDialog.ts renamed to ‎src/interface/dialog/vanillaBlockDisplayConfig.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { isCurrentFormat } from '../blueprintFormat'
2-
import { BoneConfig } from '../nodeConfigs'
3-
import { PACKAGE } from '../constants'
4-
import { createAction } from '../util/moddingTools'
5-
import { Valuable } from '../util/stores'
6-
import { SvelteDialog } from '../util/svelteDialog'
7-
import { translate } from '../util/translation'
8-
import { Variant } from '../variants'
9-
import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
10-
import VanillaBlockDisplayConfigDialog from '../components/vanillaBlockDisplayConfigDialog.svelte'
1+
import { isCurrentFormat } from '../../blueprintFormat'
2+
import { BoneConfig } from '../../nodeConfigs'
3+
import { PACKAGE } from '../../constants'
4+
import { createAction } from '../../util/moddingTools'
5+
import { Valuable } from '../../util/stores'
6+
import { SvelteDialog } from '../../util/svelteDialog'
7+
import { translate } from '../../util/translation'
8+
import { Variant } from '../../variants'
9+
import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay'
10+
import VanillaBlockDisplayConfigDialog from '../../components/vanillaBlockDisplayConfigDialog.svelte'
1111

1212
export function openVanillaBlockDisplayConfigDialog(display: VanillaBlockDisplay) {
1313
// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object

‎src/interface/vanillaItemDisplayConfigDialog.ts renamed to ‎src/interface/dialog/vanillaItemDisplayConfig.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { isCurrentFormat } from '../blueprintFormat'
2-
import { BoneConfig } from '../nodeConfigs'
3-
import { PACKAGE } from '../constants'
4-
import { createAction } from '../util/moddingTools'
5-
import { Valuable } from '../util/stores'
6-
import { SvelteDialog } from '../util/svelteDialog'
7-
import { translate } from '../util/translation'
8-
import { Variant } from '../variants'
9-
import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
10-
import VanillaItemDisplayConfigDialog from '../components/vanillaItemDisplayConfigDialog.svelte'
1+
import { isCurrentFormat } from '../../blueprintFormat'
2+
import { BoneConfig } from '../../nodeConfigs'
3+
import { PACKAGE } from '../../constants'
4+
import { createAction } from '../../util/moddingTools'
5+
import { Valuable } from '../../util/stores'
6+
import { SvelteDialog } from '../../util/svelteDialog'
7+
import { translate } from '../../util/translation'
8+
import { Variant } from '../../variants'
9+
import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
10+
import VanillaItemDisplayConfigDialog from '../../components/vanillaItemDisplayConfigDialog.svelte'
1111

1212
export function openVanillaItemDisplayConfigDialog(display: VanillaItemDisplay) {
1313
// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object

‎src/interface/variantConfigDialog.ts renamed to ‎src/interface/dialog/variantConfig.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import VariantConfigDialogSvelteComponent from '../components/variantConfigDialog.svelte'
2-
import { PACKAGE } from '../constants'
3-
import { events } from '../util/events'
4-
import { Valuable } from '../util/stores'
5-
import { SvelteDialog } from '../util/svelteDialog'
6-
import { translate } from '../util/translation'
7-
import { Variant } from '../variants'
1+
import VariantConfigDialogSvelteComponent from '../../components/variantConfigDialog.svelte'
2+
import { PACKAGE } from '../../constants'
3+
import { events } from '../../util/events'
4+
import { Valuable } from '../../util/stores'
5+
import { SvelteDialog } from '../../util/svelteDialog'
6+
import { translate } from '../../util/translation'
7+
import { Variant } from '../../variants'
88

99
export function openVariantConfigDialog(variant: Variant) {
1010
const displayName = new Valuable(variant.displayName)

‎src/interface/importAJModelLoader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PACKAGE } from '../constants'
44
import { injectSvelteCompomponent } from '../util/injectSvelteComponent'
55
import { createModelLoader } from '../util/moddingTools'
66
import { translate } from '../util/translation'
7-
import { openUnexpectedErrorDialog } from './unexpectedErrorDialog'
7+
import { openUnexpectedErrorDialog } from './dialog/unexpectedError'
88
import * as ModelDatFixerUpper from '../systems/modelDataFixerUpper'
99
import { BLUEPRINT_CODEC, IBlueprintFormatJSON } from '../blueprintFormat'
1010
import { toSafeFuntionName } from '../util/minecraftUtil'

0 commit comments

Comments
 (0)