Bring up to day wit h commit b200841

Author: SnaveSutit

types/animatedJavaExporter.d.ts

@@ -1,38 +1,41 @@
-import type { IRenderedAnimation } from './animationRenderer'
-import type { GUIStructure } from './guiStructure'
-import type { IRenderedRig } from './modelRenderer'
-import type { IAnimatedJavaProjectSettings } from './projectSettings'
 import type { IAnimatedJavaSettings, Setting } from './settings'
 
-type NamespacedString = `${string}${string}:${string}${string}`
-type ProjectSettings = Record<NamespacedString, Setting<any>>
+declare global {
+	namespace AnimatedJava {
+		type NamespacedString = `${string}${string}:${string}${string}`
+		type ProjectSettings = Record<NamespacedString, Setting<any>>
+	}
+}
 
-interface IAnimatedJavaExporterOptions<S extends ProjectSettings> {
-	id: NamespacedString
+interface IAnimatedJavaExporterOptions<S extends AnimatedJava.ProjectSettings> {
+	id: AnimatedJava.NamespacedString
 	name: string
 	description: string
 	getSettings(): S
-	settingsStructure: GUIStructure
+	settingsStructure: AnimatedJava.GUIStructure
 	onStartup?: () => void
 	export(
 		ajSettings: IAnimatedJavaSettings,
-		projectSettings: IAnimatedJavaProjectSettings,
+		projectSettings: AnimatedJava.IProjectSettings,
 		exporterSettings: S,
-		renderedAnimations: IRenderedAnimation[],
-		rig: IRenderedRig
+		renderedAnimations: AnimatedJava.IRenderedAnimation[],
+		rig: AnimatedJava.IRenderedRig
 	): Promise<void> | void
 }
 
 export class AnimatedJavaExporter<
-	S extends ProjectSettings = Record<NamespacedString, Setting<any>>
+	S extends AnimatedJava.ProjectSettings = Record<
+		AnimatedJava.NamespacedString,
+		Setting<any>
+	>
 > {
 	static all: AnimatedJavaExporter[]
 	constructor(options: IAnimatedJavaExporterOptions<S>)
-	id: NamespacedString
+	id: AnimatedJava.NamespacedString
 	name: string
 	description: string
 	getSettings: IAnimatedJavaExporterOptions<S>['getSettings']
-	settingsStructure: GUIStructure
+	settingsStructure: AnimatedJava.GUIStructure
 	onStartup?: IAnimatedJavaExporterOptions<S>['onStartup']
 	export: IAnimatedJavaExporterOptions<S>['export']
 }

types/animationRenderer.d.ts

@@ -1,29 +1,32 @@
-export interface IAnimationBone {
-	name: string
-	uuid: string
-	group?: Group
-	matrix: number[]
-}
+declare namespace AnimatedJava {
+	export interface IAnimationBone {
+		name: string
+		uuid: string
+		group?: Group
+		matrix: number[]
+	}
 
-export interface IRenderedAnimation {
-	name: string
-	frames: Array<{
-		bones: IAnimationBone[]
-		variant?: {
-			uuid: string
-			condition: string
-		}
-		commands?: {
-			commands: string
-			condition: string
-		}
-		animationState?: {
-			animation: string
-			condition: string
-		}
-	}>
-	/**
-	 * Duration of the animation in ticks (AKA frames). Same as animation.frames.length
-	 */
-	duration: number
+	export interface IRenderedAnimation {
+		name: string
+		frames: Array<{
+			bones: IAnimationBone[]
+			variant?: {
+				uuid: string
+				executeCondition: string
+			}
+			commands?: {
+				commands: string
+				executeCondition: string
+			}
+			animationState?: {
+				animation: string
+				executeCondition: string
+			}
+		}>
+		/**
+		 * Duration of the animation in ticks (AKA frames). Same as animation.frames.length
+		 */
+		duration: number
+		loopMode: 'loop' | 'once' | 'hold'
+	}
 }

types/guiStructure.d.ts

@@ -1,5 +1,3 @@
-import type { SettingID } from './settings'
-
 interface IGUIElement {
 	type: string
 }
@@ -9,23 +7,24 @@ interface IGUIElements {
 		type: 'group'
 		openByDefault: boolean
 		title: string
-		children: GUIStructure
+		children: AnimatedJava.GUIStructure
 	}
 	setting: IGUIElement & {
 		type: 'setting'
-		settingId: SettingID
+		settingId: AnimatedJava.SettingID
 	}
 	toggle: {
 		type: 'toggle'
-		settingId: SettingID
+		settingId: AnimatedJava.SettingID
 		title?: string
 		activeTitle?: string
 		inactiveTitle?: string
-		active: GUIStructure
-		inactive: GUIStructure
+		active: AnimatedJava.GUIStructure
+		inactive: AnimatedJava.GUIStructure
 	}
 }
 
-export type AnyGUIElement = IGUIElements[keyof IGUIElements]
-
-export type GUIStructure = AnyGUIElement[]
+declare namespace AnimatedJava {
+	type AnyGUIElement = IGUIElements[keyof IGUIElements]
+	type GUIStructure = AnyGUIElement[]
+}

types/index.d.ts

@@ -1,20 +1,27 @@
-import './global'
+/// <reference path="./animationRenderer.d.ts" />
+/// <reference path="./modelRenderer.d.ts" />
+/// <reference path="./guiStructure.d.ts" />
+/// <reference path="./global.d.ts" />
+
 import type { AnimatedJavaExporter } from './animatedJavaExporter'
 import type { generateSearchTree, JsonText } from './minecraft'
-import type { IAnimatedJavaProjectSettings } from './projectSettings'
 import type { createInfo, Setting } from './settings'
 import type { addTranslations, translate } from './translation'
 import type { formatStr, roundTo, roundToN } from './util'
 import type { ProgressBarController } from './util/progressBarController'
 import type { VariantsContainer } from './variants'
+import type * as VFS from './virtualFileSystem'
 
 declare global {
-	const AnimatedJava: {
-		loaded?: boolean
-		docClick: (link: string) => void
-		events: typeof import('./events')
+	namespace AnimatedJava {
+		export const loaded: boolean
+		export function docClick(link: string): void
+		export const events: typeof import('./events')
+
+		export class VirtualFile extends VFS.VirtualFile {}
+		export class VirtualFolder extends VFS.VirtualFolder {}
 
-		API: {
+		export const API: {
 			Exporter: typeof AnimatedJavaExporter
 			Settings: typeof import('./settings')
 			translate: typeof translate
@@ -41,7 +48,7 @@ declare global {
 	}
 
 	interface ModelProject {
-		animated_java_settings?: IAnimatedJavaProjectSettings
+		animated_java_settings?: AnimatedJava.IProjectSettings
 		animated_java_exporter_settings?: Record<
 			string,
 			Record<string, Setting<any>>

types/minecraft/searchGenerator.d.ts

@@ -1,14 +1,20 @@
-interface ITreeLeaf<T> {
-	type: 'leaf'
-	scoreIndex: number
-	item: T
-}
+declare global {
+	namespace AnimatedJava {
+		export interface ITreeLeaf<T> {
+			type: 'leaf'
+			scoreIndex: number
+			item: T
+		}
 
-interface ITreeBranch<T> {
-	type: 'branch'
-	items?: Array<ITreeBranch<T> | ITreeLeaf<T>>
-	minScoreIndex: number
-	maxScoreIndex: number
+		export interface ITreeBranch<T> {
+			type: 'branch'
+			items?: Array<ITreeBranch<T> | ITreeLeaf<T>>
+			minScoreIndex: number
+			maxScoreIndex: number
+		}
+	}
 }
 
-export function generateSearchTree<T>(items: T[]): ITreeBranch<T> | ITreeLeaf<T>
+export function generateSearchTree<T>(
+	items: T[]
+): AnimatedJava.ITreeBranch<T> | AnimatedJava.ITreeLeaf<T>