🩹 Update old code to new Blockbench Types

Author: SnaveSutit

src/components/dialogItems/select.svelte

@@ -17,7 +17,12 @@
 		options,
 		value: value.get(),
 		onChange() {
-			value.set(selectInput.node.getAttribute('value'))
+			const v = selectInput.node.getAttribute('value')
+			if (v == undefined) {
+				console.warn('Select value is undefined')
+				return
+			}
+			value.set(v)
 		},
 	})
 

src/components/dialogItems/vector2d.svelte

@@ -43,7 +43,7 @@
 		target: HTMLElement,
 		value: Valuable<number>,
 		min?: number,
-		max?: number,
+		max?: number
 	) {
 		addEventListeners(target, 'mousedown touchstart', (e1: any) => {
 			convertTouchEvent(e1)
@@ -56,15 +56,15 @@
 						Math.clamp(
 							value.get() + (difference - last_difference),
 							min !== undefined ? min : -Infinity,
-							max !== undefined ? max : Infinity,
-						),
+							max !== undefined ? max : Infinity
+						)
 					)
 					last_difference = difference
 				}
 			}
 			function stop(e2: any) {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move)
+				removeEventListeners(document, 'mouseup touchend', stop)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)
@@ -75,8 +75,8 @@
 				Math.clamp(
 					molangParser.parse(value.get()),
 					min !== undefined ? min : -Infinity,
-					max !== undefined ? max : Infinity,
-				),
+					max !== undefined ? max : Infinity
+				)
 			)
 		})
 	}

src/components/dialogItems/vector3d.svelte

@@ -52,7 +52,7 @@
 		target: HTMLElement,
 		value: Valuable<number>,
 		min?: number,
-		max?: number,
+		max?: number
 	) {
 		addEventListeners(target, 'mousedown touchstart', (e1: any) => {
 			convertTouchEvent(e1)
@@ -65,15 +65,15 @@
 						Math.clamp(
 							value.get() + (difference - last_difference),
 							min !== undefined ? min : -Infinity,
-							max !== undefined ? max : Infinity,
-						),
+							max !== undefined ? max : Infinity
+						)
 					)
 					last_difference = difference
 				}
 			}
 			function stop(e2: any) {
-				removeEventListeners(document, 'mousemove touchmove', move, null)
-				removeEventListeners(document, 'mouseup touchend', stop, null)
+				removeEventListeners(document, 'mousemove touchmove', move)
+				removeEventListeners(document, 'mouseup touchend', stop)
 			}
 			addEventListeners(document as unknown as any, 'mousemove touchmove', move)
 			addEventListeners(document as unknown as any, 'mouseup touchend', stop)
@@ -84,8 +84,8 @@
 				Math.clamp(
 					molangParser.parse(value.get()),
 					min !== undefined ? min : -Infinity,
-					max !== undefined ? max : Infinity,
-				),
+					max !== undefined ? max : Infinity
+				)
 			)
 		})
 	}

src/components/keyframePanels/variantKeyframePanel.svelte

@@ -1,11 +1,8 @@
-<script lang="ts" context="module">
+<script lang="ts">
+	import { getKeyframeVariant, setKeyframeVariant } from '../../mods/customKeyframesMod'
 	import { Valuable } from '../../util/stores'
 	import { translate } from '../../util/translation'
 	import { Variant } from '../../variants'
-	import { getKeyframeVariant, setKeyframeVariant } from '../../mods/customKeyframesMod'
-</script>
-
-<script lang="ts">
 	export let selectedKeyframe: _Keyframe
 	const keyframeValue = new Valuable<string>(getKeyframeVariant(selectedKeyframe) as string)
 	let selectContainer: HTMLDivElement
@@ -15,15 +12,20 @@
 	})
 
 	const options = Object.fromEntries(
-		Variant.all.map(variant => [variant.uuid, variant.displayName]),
+		Variant.all.map(variant => [variant.uuid, variant.displayName])
 	)
 
 	// @ts-ignore
 	const selectInput = new Interface.CustomElements.SelectInput('keyframe-variant-selector', {
 		options,
 		value: keyframeValue.get(),
 		onChange() {
-			keyframeValue.set(selectInput.node.getAttribute('value'))
+			const value = selectInput.node.getAttribute('value')
+			if (value == undefined) {
+				console.warn('Variant value is undefined')
+				return
+			}
+			keyframeValue.set(value)
 			Animator.preview()
 		},
 	})

src/mods/panelMod.ts

@@ -8,9 +8,9 @@ createBlockbenchMod(
 		panel: Interface.Panels.animations,
 	},
 	context => {
-		const originalFilesFunction = context.panel.inside_vue.$options.computed.files
+		const originalFilesFunction = context.panel.inside_vue.$options.computed!.files as () => any
 
-		context.panel.inside_vue.$options.computed.files = function (this) {
+		context.panel.inside_vue.$options.computed!.files = function (this) {
 			if (Format.id === BLUEPRINT_FORMAT.id) {
 				return {
 					'': {
@@ -23,13 +23,12 @@ createBlockbenchMod(
 					},
 				}
 			}
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return originalFilesFunction.call(this)
 		}
 
 		return { ...context, originalFilesFunction }
 	},
 	context => {
-		context.panel.inside_vue.$options.computed.files = context.originalFilesFunction
+		context.panel.inside_vue.$options.computed!.files = context.originalFilesFunction
 	}
 )

src/mods/pluginsDialogMod.ts

@@ -19,9 +19,11 @@ injectSvelteCompomponentMod({
 createBlockbenchMod(
 	`${PACKAGE.name}:pluginsDialogMod`,
 	{
+		// @ts-expect-error
 		originalSelect: Plugins.dialog.component.methods.selectPlugin,
 	},
 	context => {
+		// @ts-expect-error
 		Plugins.dialog.component.methods.selectPlugin = function (this, plugin: BBPlugin) {
 			const result = context.originalSelect.call(this, plugin)
 			SELECTED_PLUGIN.set(plugin)
@@ -32,6 +34,7 @@ createBlockbenchMod(
 		return context
 	},
 	context => {
+		// @ts-expect-error
 		Plugins.dialog.component.methods.selectPlugin = context.originalSelect
 	}
 )