🔧 Add @events alias, and remove THREE imports

SnaveSutit · SnaveSutit · commit 17130c4b61ce · 2025-02-12T22:56:38.000-05:00
diff --git a/src/blockbench-additions/model-formats/ajblueprint/index.ts b/src/blockbench-additions/model-formats/ajblueprint/index.ts
@@ -1,11 +1,10 @@
-import THREE from 'three'
+import EVENTS from '@events'
 import * as blueprintSettings from '../../../blueprintSettings'
 import { PACKAGE } from '../../../constants'
-import { type BillboardMode, BoneConfig, LocatorConfig } from '../../../nodeConfigs'
-import EVENTS from '../../../util/events'
 import { injectSvelteCompomponent } from '../../../util/injectSvelteComponent'
 import { toSafeFunctionName } from '../../../util/minecraftUtil'
 import { addProjectToRecentProjects } from '../../../util/misc'
+import { type BillboardMode, BoneConfig, LocatorConfig } from '../../../util/serializableConfig'
 import { Valuable } from '../../../util/stores'
 import { translate } from '../../../util/translation'
 import { Variant } from '../../../variants'
diff --git a/src/blockbench-additions/outliner-elements/blockDisplay.ts b/src/blockbench-additions/outliner-elements/blockDisplay.ts
@@ -2,13 +2,12 @@ import { getBlockModel } from '@aj/systems/minecraft-temp/blockModelManager'
 import { type BlockStateValue, getBlockState } from '@aj/systems/minecraft-temp/blockstateManager'
 import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
 import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
-import THREE from 'three'
+import EVENTS from '@events'
 import { PACKAGE } from '../../constants'
-import { BoneConfig } from '../../nodeConfigs'
 import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/block-display-config'
-import EVENTS from '../../util/events'
 import { parseBlock } from '../../util/minecraftUtil'
 import { createAction, createBlockbenchMod } from '../../util/moddingTools'
+import { BoneConfig } from '../../util/serializableConfig'
 import { Valuable } from '../../util/stores'
 import { translate } from '../../util/translation'
 import { type IBlueprintBoneConfigJSON, isCurrentFormat } from '../model-formats/ajblueprint'
diff --git a/src/blockbench-additions/outliner-elements/itemDisplay.ts b/src/blockbench-additions/outliner-elements/itemDisplay.ts
@@ -1,12 +1,11 @@
 import { getItemModel } from '@aj/systems/minecraft-temp/itemModelManager'
 import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
 import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
-import THREE from 'three'
+import EVENTS from '@events'
 import { PACKAGE } from '../../constants'
-import { BoneConfig } from '../../nodeConfigs'
 import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/item-display-config'
-import EVENTS from '../../util/events'
 import { createAction, createBlockbenchMod } from '../../util/moddingTools'
+import { BoneConfig } from '../../util/serializableConfig'
 import { Valuable } from '../../util/stores'
 import { translate } from '../../util/translation'
 import { type IBlueprintBoneConfigJSON, isCurrentFormat } from '../model-formats/ajblueprint'
diff --git a/src/blockbench-additions/outliner-elements/textDisplay.ts b/src/blockbench-additions/outliner-elements/textDisplay.ts
@@ -8,10 +8,9 @@ import {
 // import * as MinecraftFull from '@assets/MinecraftFull.json'
 import { getVanillaFont } from '@aj/systems/minecraft-temp/fontManager'
 import { JsonText } from '@aj/systems/minecraft-temp/jsonText'
-import THREE from 'three'
-import { TextDisplayConfig } from '../../nodeConfigs'
+import EVENTS from '@events'
 import { TEXT_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/text-display-config'
-import EVENTS from '../../util/events'
+import { TextDisplayConfig } from '../../util/serializableConfig'
 import { Valuable } from '../../util/stores'
 import { translate } from '../../util/translation'
 import { ResizableOutlinerElement } from './resizableOutlinerElement'
diff --git a/src/blockbench-mods/misc/customKeyframes.ts b/src/blockbench-mods/misc/customKeyframes.ts
@@ -1,8 +1,8 @@
+import EVENTS from '@events'
 import {
 	BLUEPRINT_FORMAT,
 	isCurrentFormat,
 } from '../../blockbench-additions/model-formats/ajblueprint'
-import EVENTS from '../../util/events'
 import { translate } from '../../util/translation'
 import { Variant } from '../../variants'
 
diff --git a/src/blockbench-mods/misc/locatorAnimator.ts b/src/blockbench-mods/misc/locatorAnimator.ts
@@ -1,5 +1,5 @@
+import EVENTS from '@events'
 import { BLUEPRINT_FORMAT } from '../../blockbench-additions/model-formats/ajblueprint'
-import EVENTS from '../../util/events'
 import { translate } from '../../util/translation'
 
 const DEFAULT_SHOW_MOTION_TRAIL = Animator.showMotionTrail
diff --git a/src/blockbench-mods/prototype/keyframeSelectEvents.ts b/src/blockbench-mods/prototype/keyframeSelectEvents.ts
@@ -1,6 +1,6 @@
+import EVENTS from '@events'
 import { isCurrentFormat } from '../../blockbench-additions/model-formats/ajblueprint'
 import { PACKAGE } from '../../constants'
-import EVENTS from '../../util/events'
 import { createBlockbenchMod } from '../../util/moddingTools'
 
 /**
diff --git a/src/blockbench-mods/prototype/modelFormatEvents.ts b/src/blockbench-mods/prototype/modelFormatEvents.ts
@@ -1,6 +1,6 @@
+import EVENTS from '@events'
 import { BLUEPRINT_FORMAT } from '../../blockbench-additions/model-formats/ajblueprint'
 import { PACKAGE } from '../../constants'
-import EVENTS from '../../util/events'
 import { createBlockbenchMod } from '../../util/moddingTools'
 
 createBlockbenchMod(
diff --git a/src/plugin/index.ts b/src/plugin/index.ts
@@ -1,6 +1,6 @@
+import EVENTS from '@events'
 import { PACKAGE } from '../constants'
 import { openInstallPopup } from '../ui/popups/installed'
-import EVENTS from '../util/events'
 
 export default function register() {
 	BBPlugin.register(PACKAGE.name, {
diff --git a/src/svelte-components/keyframeEasings.svelte b/src/svelte-components/keyframeEasings.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	// @ts-expect-error
 	import { default as ICON_IMPORTS, filenames } from '@assets/easingIcons/*.svg'
+	import EVENTS from '@events'
 	import { isCurrentFormat } from '../blockbench-additions/model-formats/ajblueprint'
 	import { getEasingArgDefault, hasArgs } from '../util/easing'
-	import EVENTS from '../util/events'
 	import { Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
 
diff --git a/src/systems/datapack-compiler/index.ts b/src/systems/datapack-compiler/index.ts
@@ -1,6 +1,4 @@
 import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtList, NbtString } from 'deepslate/lib/nbt'
-import THREE from 'three'
-import { BoneConfig, TextDisplayConfig } from '../../nodeConfigs'
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../ui/dialogs/export-progress'
 import { isFunctionTagPath } from '../../util/fileUtil'
 import {
@@ -14,6 +12,7 @@ import {
 } from '../../util/minecraftUtil'
 import { eulerFromQuaternion, floatToHex, roundTo, tinycolorToDecimal } from '../../util/misc'
 import { MSLimiter } from '../../util/msLimiter'
+import { BoneConfig, TextDisplayConfig } from '../../util/serializableConfig'
 import { Variant } from '../../variants'
 import { AJMeta } from '../ajmeta'
 import type { INodeTransform, IRenderedAnimation } from '../animation-renderer'
diff --git a/src/systems/minecraft-assets/index.ts b/src/systems/minecraft-assets/index.ts
@@ -1,9 +1,9 @@
+import EVENTS from '@events'
 import {
 	hideLoadingPopup,
 	showLoadingPopup,
 	showOfflineError,
 } from '../../ui/popups/animated-java-loading'
-import EVENTS from '../../util/events'
 
 EVENTS.LOAD.subscribe(() => {
 	// Show loading popup
diff --git a/src/systems/minecraft-temp/assetManager.ts b/src/systems/minecraft-temp/assetManager.ts
@@ -1,14 +1,14 @@
 import { PACKAGE } from '../../constants'
 import { getCurrentVersion, getLatestVersion } from './versionManager'
 
+import EVENTS from '@events'
 import download from 'download'
 import { type Unzipped } from 'fflate'
 import {
 	showOfflineError,
 	updateLoadingProgress,
 	updateLoadingProgressLabel,
 } from '../../ui/popups/animated-java-loading'
-import EVENTS from '../../util/events'
 import { unzip } from '../util'
 const ASSET_OVERRIDES: Record<string, string> = {}
 
diff --git a/src/systems/minecraft-temp/blockstateManager.ts b/src/systems/minecraft-temp/blockstateManager.ts
@@ -1,4 +1,4 @@
-import EVENTS from '../../util/events'
+import EVENTS from '@events'
 import { resolveBlockstateValueType } from '../../util/minecraftUtil'
 import { getLatestVersion } from './versionManager'
 
diff --git a/src/systems/minecraft-temp/fontManager.ts b/src/systems/minecraft-temp/fontManager.ts
@@ -1,9 +1,8 @@
 import MissingCharacter from '@assets/missing_character.png'
+import EVENTS from '@events'
 import { createHash } from 'crypto'
-import THREE from 'three'
 import { type Alignment } from '../../blockbench-additions/outliner-elements/textDisplay'
 import { mergeGeometries } from '../../util/bufferGeometryUtils'
-import EVENTS from '../../util/events'
 import { getPathFromResourceLocation } from '../../util/minecraftUtil'
 import { UnicodeString } from '../../util/unicodeString'
 import * as assets from './assetManager'
diff --git a/src/systems/minecraft-temp/registryManager.ts b/src/systems/minecraft-temp/registryManager.ts
@@ -1,4 +1,4 @@
-import EVENTS from '../../util/events'
+import EVENTS from '@events'
 import { checkForAssetsUpdate } from './assetManager'
 import { getLatestVersion } from './versionManager'
 
diff --git a/src/ui/dialogs/variant-config/index.ts b/src/ui/dialogs/variant-config/index.ts
@@ -1,5 +1,5 @@
+import EVENTS from '@events'
 import { PACKAGE } from '../../../constants'
-import EVENTS from '../../../util/events'
 import { Valuable } from '../../../util/stores'
 import { SvelteDialog } from '../../../util/svelteDialog'
 import { translate } from '../../../util/translation'
diff --git a/src/ui/panels/block-display-element/vanillaBlockDisplayElementPanel.svelte b/src/ui/panels/block-display-element/vanillaBlockDisplayElementPanel.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { VanillaBlockDisplay } from '@aj/blockbench-additions/outliner-elements/blockDisplay'
-	import EVENTS from '@aj/util/events'
 	import { Valuable } from '@aj/util/stores'
 	import { translate } from '@aj/util/translation'
+	import EVENTS from '@events'
 
 	let selectedDisplay = VanillaBlockDisplay.selected.at(0)
 	let block = new Valuable<string>('')
diff --git a/src/ui/panels/custom-keyframe/index.ts b/src/ui/panels/custom-keyframe/index.ts
@@ -1,7 +1,7 @@
+import EVENTS from '@events'
 import type { SvelteComponentDev } from 'svelte/internal'
 import { isCurrentFormat } from '../../../blockbench-additions/model-formats/ajblueprint'
 import { CUSTOM_CHANNELS } from '../../../blockbench-mods/misc/customKeyframes'
-import EVENTS from '../../../util/events'
 import { injectSvelteCompomponent } from '../../../util/injectSvelteComponent'
 import { translate } from '../../../util/translation'
 import CustomKeyframePanelSvelteComponent from './customKeyframePanel.svelte'
diff --git a/src/ui/panels/item-display-element/vanillaItemDisplayElementPanel.svelte b/src/ui/panels/item-display-element/vanillaItemDisplayElementPanel.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+	import EVENTS from '@events'
 	import { ITEM_DISPLAY_ITEM_DISPLAY_SELECT } from '.'
 	import { VanillaItemDisplay } from '../../../blockbench-additions/outliner-elements/itemDisplay'
-	import EVENTS from '../../../util/events'
 	import { Valuable } from '../../../util/stores'
 	import { translate } from '../../../util/translation'
 
diff --git a/src/ui/panels/text-display-element/textDisplayElementPanel.svelte b/src/ui/panels/text-display-element/textDisplayElementPanel.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import EVENTS from '@events'
 	import { CodeJar } from '@novacbn/svelte-codejar'
 	import {
 		TEXT_DISPLAY_ALIGNMENT_SELECT,
@@ -8,7 +9,6 @@
 		TEXT_DISPLAY_WIDTH_SLIDER,
 	} from '.'
 	import { TextDisplay } from '../../../blockbench-additions/outliner-elements/textDisplay'
-	import EVENTS from '../../../util/events'
 	import { floatToHex } from '../../../util/misc'
 	import { Valuable } from '../../../util/stores'
 	import { translate } from '../../../util/translation'
diff --git a/src/ui/panels/variants/variantsPanel.svelte b/src/ui/panels/variants/variantsPanel.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import EVENTS from '@events'
 	import { SHADOW_ITEM_MARKER_PROPERTY_NAME, dndzone } from 'svelte-dnd-action'
 	import { flip } from 'svelte/animate'
 	import { cubicIn } from 'svelte/easing'
@@ -9,7 +10,6 @@
 		DUPLICATE_VARIANT_ACTION,
 		VARIANT_PANEL_CONTEXT_MENU,
 	} from '.'
-	import EVENTS from '../../../util/events'
 	import { translate } from '../../../util/translation'
 	import { Variant } from '../../../variants'
 	import { openVariantConfigDialog } from '../../dialogs/variant-config'
diff --git a/src/util/moddingTools.ts b/src/util/moddingTools.ts
@@ -1,4 +1,4 @@
-import EVENTS from './events'
+import EVENTS from '@events'
 import { Subscribable } from './subscribable'
 
 export type NamespacedString = `${string}${string}:${string}${string}`
@@ -173,7 +173,7 @@ const SUBSCRIBABLES = new Map<
 	any,
 	[
 		Subscribable<{ storage: Storage<any>; value: any }>,
-		Subscribable<{ storage: Storage<any>; newValue: any }>
+		Subscribable<{ storage: Storage<any>; newValue: any }>,
 	]
 >()
 
diff --git a/src/variants.ts b/src/variants.ts
@@ -1,5 +1,5 @@
+import EVENTS from '@events'
 import { type IBlueprintVariantJSON } from './blockbench-additions/model-formats/ajblueprint'
-import EVENTS from './util/events'
 import { toSafeFunctionName } from './util/minecraftUtil'
 
 export class TextureMap {
diff --git a/tsconfig.json b/tsconfig.json
@@ -20,8 +20,9 @@
 		"alwaysStrict": true,
 		"experimentalDecorators": true,
 		"paths": {
-			"@svelte-components/*": ["./src/svelte-components/*"],
 			"@aj/*": ["./src/*"],
+			"@events": ["./src/util/events.ts"],
+			"@svelte-components/*": ["./src/svelte-components/*"],
 			"@assets/*": ["./src/assets/*"]
 		}
 	}
