😭 Begin fixing the mess of conflicts

eslint.config.ts

@@ -1,4 +1,3 @@
-// @ts-expect-error
 import checkFile from 'eslint-plugin-check-file'
 import svelteEslint from 'eslint-plugin-svelte'
 import svelteParser from 'svelte-eslint-parser'
@@ -64,7 +63,7 @@ const CUSTOM_RULES: ConfigWithExtends['rules'] = {
 	'@typescript-eslint/no-explicit-any': 'off',
 	'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
 	'@typescript-eslint/array-type': ['warn', { default: 'array-simple' }],
-	'@typescript-eslint/consistent-indexed-object-style': ['warn', 'record'],
+	'@typescript-eslint/consistent-indexed-object-style': ['warn', 'interface'],
 	'@typescript-eslint/consistent-generic-constructors': 'warn',
 	'@typescript-eslint/no-namespace': 'off',
 	'@typescript-eslint/restrict-template-expressions': 'off',

package.json

@@ -126,7 +126,8 @@
 		"mc-build": "^3.5.1",
 		"request-progress": "^3.0.0",
 		"svelte-ace": "^1.0.21",
-		"svelte-dnd-action": "^0.9.38"
+		"svelte-dnd-action": "^0.9.38",
+		"svelte-multiselect": "^11.1.1"
 	},
 	"packageManager": "yarn@4.6.0+sha512.5383cc12567a95f1d668fbe762dfe0075c595b4bfff433be478dbbe24e05251a8e8c3eb992a986667c1d53b6c3a9c85b8398c35a960587fbd9fa3a0915406728"
 }

src/assets/vanillaAssetOverrides/index.json

@@ -0,0 +1 @@
+{}

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

@@ -105,8 +105,7 @@ function updateModelToOld1_0(model: any) {
 	}
 
 	if (
-		model.animations &&
-		model.animations.find((a: any) =>
+		model.animations?.find((a: any) =>
 			Object.keys(a.animators as Record<string, any>).find(name => name === 'effects')
 		)
 	) {
@@ -197,7 +196,7 @@ function updateModelToOld1_4(model: any) {
 }
 
 // region v0.3.10
-// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/naming-convention
 function updateModelTo0_3_10(model: any) {
 	console.log('Processing model for AJ 0.3.10', JSON.parse(JSON.stringify(model)))
 }
@@ -218,7 +217,7 @@ function updateModelTo1_0pre1(model: any) {
 		meta: {
 			format: 'animated_java_blueprint',
 			format_version: '0.5.0',
-			uuid: model.meta.uuid || guid(),
+			uuid: model.meta.uuid ?? guid(),
 			last_used_export_namespace: model.animated_java.settings.project_namespace,
 		},
 		project_settings: {
@@ -258,9 +257,9 @@ function updateModelTo1_0pre1(model: any) {
 		variants: {
 			default: {
 				name: 'default',
-				display_name: defaultVariant.name || 'Default',
-				uuid: defaultVariant.uuid || guid(),
-				texture_map: defaultVariant.textureMap || {},
+				display_name: defaultVariant.name ?? 'Default',
+				uuid: defaultVariant.uuid ?? guid(),
+				texture_map: defaultVariant.textureMap ?? {},
 				// @ts-ignore
 				excluded_bones: [],
 			},
@@ -413,14 +412,14 @@ function updateModelTo1_0pre6(model: any): IBlueprintFormatJSON {
 		delete defaultVariant.excluded_bones
 	}
 
-	for (const variant of model?.variants?.list || []) {
+	for (const variant of model?.variants?.list ?? []) {
 		if (variant?.excluded_bones) {
 			variant.excluded_nodes = variant.excluded_bones
 			delete variant.excluded_bones
 		}
 	}
 
-	for (const animation of model?.animations || []) {
+	for (const animation of model?.animations ?? []) {
 		if (animation?.excluded_bones) {
 			animation.excluded_nodes = animation.excluded_bones
 			delete animation.excluded_bones

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

@@ -2,7 +2,7 @@ import EVENTS from '@aj/util/events'
 import * as blueprintSettings from '../../../blueprintSettings'
 import { PACKAGE } from '../../../constants'
 import { injectSvelteCompomponent } from '../../../util/injectSvelteComponent'
-import { toSafeFunctionName } from '../../../util/minecraftUtil'
+import { sanitizePathName } from '../../../util/minecraftUtil'
 import { addProjectToRecentProjects } from '../../../util/misc'
 import { Syncable } from '../../../util/stores'
 import { translate } from '../../../util/translation'
@@ -99,7 +99,7 @@ export function convertToBlueprint() {
 	}
 	for (const animation of Blockbench.Animation.all) {
 		animation.createUniqueName(Blockbench.Animation.all.filter(a => a !== animation))
-		animation.name = toSafeFunctionName(animation.name)
+		animation.name = sanitizePathName(animation.name)
 	}
 	for (const cube of Cube.all) {
 		cube.setUVMode(false)
@@ -274,7 +274,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 			parseGroups(model.outliner)
 
 			for (const group of Group.all) {
-				group.name = toSafeFunctionName(group.name)
+				group.name = sanitizePathName(group.name)
 			}
 		}
 
@@ -346,7 +346,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 
 	// region > compile
 	compile(options) {
-		if (!options) options = {}
+		options ??= {}
 		console.log(`Compiling Animated Java Blueprint from ${Project!.name}...`)
 		if (!Project) throw new Error('No project to compile.')
 

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

@@ -4,7 +4,6 @@ import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
 import { CommonDisplayConfig, ItemDisplayConfig, type Serialized } from '@aj/systems/node-configs'
 import EVENTS from '@events'
 import { PACKAGE } from '../../constants'
-import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/item-display-config'
 import {
 	createAction,
 	createBlockbenchMod,
@@ -47,7 +46,7 @@ export class ItemDisplay extends ResizableOutlinerElement {
 
 	public menu = new Menu([
 		...Outliner.control_menu_group,
-		VANILLA_ITEM_DISPLAY_CONFIG_ACTION,
+		ITEM_DISPLAY_CONFIG_ACTION,
 		'_',
 		'rename',
 		'delete',

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

@@ -1,4 +1,4 @@
-import { sanitizePathName } from '../util/minecraftUtil'
+import { sanitizePathName } from '@aj/util/minecraftUtil'
 import { BlockDisplay } from './blockDisplay'
 import { ItemDisplay } from './itemDisplay'
 import { TextDisplay } from './textDisplay'

src/svelte-components/multiSelect.svelte → src/svelte-components/dialog-items/multiSelect.svelte

@@ -1,22 +1,22 @@
 <script lang="ts">
 	import MultiSelect, { type ObjectOption } from 'svelte-multiselect'
-	import { Valuable } from '../../util/stores'
+	import { Syncable } from '../../util/stores'
 	import { translate } from '../../util/translation'
 	import BaseDialogItem from './baseDialogItem.svelte'
 
 	type StringOption = ObjectOption & { value: string }
 
 	export let label: string
-	export let tooltip: string = ''
+	export let tooltip = ''
 	export let options: StringOption[]
 	export let defaultValue: StringOption[]
-	export let value: Valuable<string[]>
+	export let value: Syncable<string[]>
 
 	let selected: StringOption[] = $value
 		.filter(v => options.find(o => o.value == v))
 		.map(v => options.find(o => o.value == v)!)
 
-	let warning_text = ''
+	let warningText = ''
 
 	if (selected.length === 0) {
 		selected = defaultValue
@@ -31,11 +31,11 @@
 		// FIXME - This warning is unique to the targeted minecraft version setting.
 		// Since the only use of this component is in the targeted minecraft version setting, this is fine... for now.
 		if (selected.length > 1) {
-			warning_text = translate(
+			warningText = translate(
 				'dialog.blueprint_settings.target_minecraft_versions.warning.multiple_versions'
 			)
 		} else {
-			warning_text = ''
+			warningText = ''
 		}
 	}
 
@@ -48,7 +48,7 @@
 	}
 </script>
 
-<BaseDialogItem {label} {tooltip} {onReset} let:id {warning_text}>
+<BaseDialogItem {label} {tooltip} {onReset} let:id {warningText}>
 	<div class="dialog_bar form_bar multi-select-container">
 		<label class="name_space_left" for={id}>{label}</label>
 		<MultiSelect

src/svelte-components/dialog-items/vector2d.svelte

@@ -63,8 +63,8 @@
 				}
 			}
 			function stop() {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move, undefined)
+				removeEventListeners(document, 'mouseup touchend', stop, undefined)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)

src/svelte-components/dialog-items/vector3d.svelte

@@ -72,8 +72,8 @@
 				}
 			}
 			function stop() {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move, undefined)
+				removeEventListeners(document, 'mouseup touchend', stop, undefined)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)

src/svelte-components/sidebar-dialog-items/numberSlider.svelte

@@ -66,8 +66,8 @@
 				}
 			}
 			function stop() {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move, undefined)
+				removeEventListeners(document, 'mouseup touchend', stop, undefined)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)

src/svelte-components/sidebar-dialog-items/vector2d.svelte

@@ -72,8 +72,8 @@
 				}
 			}
 			function stop() {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move, undefined)
+				removeEventListeners(document, 'mouseup touchend', stop, undefined)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)