Skip to content

Commit 21b027b

Browse files
committed
🔧 Add paths to tsconfig, and update important imports to use them
1 parent e0c8fa9 commit 21b027b

Some content is hidden

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

50 files changed

+147
-142
lines changed

src/blockbench-additions/model-formats/ajblueprint/dfu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import TransparentTexture from '@assets/transparent.png'
12
import { NbtCompound, NbtList, NbtString, NbtTag } from 'deepslate/lib/nbt'
23
import { type IBlueprintFormatJSON, getDefaultProjectSettings } from '.'
34
import { PACKAGE } from '../../../constants'
45
import { BoneConfig } from '../../../nodeConfigs'
56
import { openUnexpectedErrorDialog } from '../../../ui/dialogs/unexpected-error'
6-
import TransparentTexture from '../assets/transparent.png'
77

88
export function process(model: any): any {
99
console.log('Running MDFU...', JSON.parse(JSON.stringify(model)))

src/blockbench-additions/model-formats/ajblueprint/formatPage.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
2+
import AnimatedJavaIcon from '@assets/animated_java_icon.svg'
23
import { BLUEPRINT_FORMAT } from '.'
3-
import AnimatedJavaIcon from '../assets/animated_java_icon.svg'
44
55
const TITLE = document.querySelector('#format_page_animated_java_blueprint')
66
?.children[1] as HTMLHeadingElement

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

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

src/blockbench-additions/model-formats/ajblueprint/versions/v1.6.4.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { PACKAGE } from '../../../../constants'
1+
import type { PACKAGE } from '@aj/constants'
22
import {
33
CameraConfig,
44
TextDisplayConfig,
55
type BoneConfig,
66
type LocatorConfig,
7-
} from '../../../../nodeConfigs'
7+
} from '@aj/nodeConfigs'
88

99
namespace v1_6_4 {
1010
type SerializeConfig<T> = {

src/blockbench-additions/outliner-elements/vanillaBlockDisplay.ts renamed to src/blockbench-additions/outliner-elements/blockDisplay.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { getBlockModel } from '@aj/systems/minecraft-temp/blockModelManager'
2+
import { type BlockStateValue, getBlockState } from '@aj/systems/minecraft-temp/blockstateManager'
3+
import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
4+
import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
15
import THREE from 'three'
26
import { PACKAGE } from '../../constants'
37
import { BoneConfig } from '../../nodeConfigs'
4-
import { getBlockModel } from '../../systems/minecraft-temp/blockModelManager'
5-
import { type BlockStateValue, getBlockState } from '../../systems/minecraft-temp/blockstateManager'
6-
import { MINECRAFT_REGISTRY } from '../../systems/minecraft-temp/registryManager'
7-
import { getCurrentVersion } from '../../systems/minecraft-temp/versionManager'
88
import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/block-display-config'
99
import EVENTS from '../../util/events'
1010
import { parseBlock } from '../../util/minecraftUtil'

src/blockbench-additions/outliner-elements/vanillaItemDisplay.ts renamed to src/blockbench-additions/outliner-elements/itemDisplay.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { getItemModel } from '@aj/systems/minecraft-temp/itemModelManager'
2+
import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
3+
import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
14
import THREE from 'three'
25
import { PACKAGE } from '../../constants'
36
import { BoneConfig } from '../../nodeConfigs'
4-
import { getItemModel } from '../../systems/minecraft-temp/itemModelManager'
5-
import { MINECRAFT_REGISTRY } from '../../systems/minecraft-temp/registryManager'
6-
import { getCurrentVersion } from '../../systems/minecraft-temp/versionManager'
77
import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/item-display-config'
88
import EVENTS from '../../util/events'
99
import { createAction, createBlockbenchMod } from '../../util/moddingTools'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {
55
type IBlueprintTextDisplayConfigJSON,
66
isCurrentFormat,
77
} from '../model-formats/ajblueprint'
8-
// import * as MinecraftFull from '../assets/MinecraftFull.json'
8+
// import * as MinecraftFull from '@assets/MinecraftFull.json'
9+
import { getVanillaFont } from '@aj/systems/minecraft-temp/fontManager'
10+
import { JsonText } from '@aj/systems/minecraft-temp/jsonText'
911
import THREE from 'three'
1012
import { TextDisplayConfig } from '../../nodeConfigs'
11-
import { getVanillaFont } from '../../systems/minecraft-temp/fontManager'
12-
import { JsonText } from '../../systems/minecraft-temp/jsonText'
1313
import { TEXT_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/text-display-config'
1414
import EVENTS from '../../util/events'
1515
import { Valuable } from '../../util/stores'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REVIEW - This file should be moved somewhere else
22
import { toSafeFunctionName } from '../../util/minecraftUtil'
3+
import { VanillaBlockDisplay } from './blockDisplay'
4+
import { VanillaItemDisplay } from './itemDisplay'
35
import { TextDisplay } from './textDisplay'
4-
import { VanillaBlockDisplay } from './vanillaBlockDisplay'
5-
import { VanillaItemDisplay } from './vanillaItemDisplay'
66

77
export function sanitizeOutlinerElementName(name: string, elementUUID: string): string {
88
name = toSafeFunctionName(name)

src/blockbench-mods/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import './action/addLocator'
33
import './action/animationProperties'
44
import './action/exportOver'
55
import './action/projectSettings'
6-
import './action/saveAllAnimationsActionMod'
6+
import './action/saveAllAnimations'
77
import './action/saveProject'
88
import './action/saveProjectAs'
99
// Class Properties

src/blockbench-mods/ui/formatIcon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import Icon from '@svelte-components/icon.svelte'
12
import { PACKAGE } from '../../constants'
2-
import Icon from '../../svelte-components/icon.svelte'
33
import { injectSvelteCompomponent } from '../../util/injectSvelteComponent'
44
import { createBlockbenchMod } from '../../util/moddingTools'
55

0 commit comments

Comments
 (0)