tidy up imports

package.json

@@ -40,7 +40,7 @@
     "tailwindcss": "3.4.1",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "vite": "5.1.6",
+    "vite": "5.1.7",
     "vite-plugin-tailwind-purgecss": "0.2.0"
   },
   "type": "module",

src/lib/assets/index.ts

@@ -0,0 +1,31 @@
+export { default as dark_dirt_background } from './dark_dirt_background.webp';
+export { default as fragment_template } from './fragment_template.webp';
+export { default as button_highlight } from './button_highlight.webp';
+export { default as default_fragment } from './default_fragment.webp';
+export { default as button_disabled } from './button_disabled.webp';
+export { default as knowledge_book } from './knowledge_book.webp';
+export { default as disc_template } from './disc_template.webp';
+export { default as checkbox_off } from './checkbox_off.webp';
+export { default as default_disc } from './default_disc.webp';
+export { default as default_icon } from './default_icon.webp';
+export { default as generate_btn } from './generate_btn.webp';
+export { default as checkbox_on } from './checkbox_on.webp';
+export { default as panorama_0 } from './panorama_0.webp';
+export { default as panorama_1 } from './panorama_1.webp';
+export { default as panorama_2 } from './panorama_2.webp';
+export { default as panorama_3 } from './panorama_3.webp';
+export { default as panorama_4 } from './panorama_4.webp';
+export { default as panorama_5 } from './panorama_5.webp';
+export { default as button } from './button.webp';
+export { default as cog } from './cog.webp';
+
+export { default as githubsponsors } from './githubsponsors.svg';
+export { default as hand_helping } from './hand_helping.svg';
+export { default as modrinth } from './modrinth.svg';
+export { default as spigotmc } from './spigotmc.svg';
+export { default as workflow } from './workflow.svg';
+export { default as warning } from './warning.svg';
+export { default as github } from './github.svg';
+export { default as hangar } from './hangar.svg';
+export { default as wrench } from './wrench.svg';
+export { default as java } from './java.svg';

src/lib/components/ConfigNode.svelte

@@ -1,12 +1,10 @@
 <script lang="ts">
-	import type { ConfigNode } from '$lib/types';
-	import MinecraftCheckbox from './MinecraftCheckbox.svelte';
-	import MinecraftButton from './MinecraftButton.svelte';
-	import MinecraftTextbox from './MinecraftTextbox.svelte';
-	import MinecraftNumber from './MinecraftNumber.svelte';
-	import MinecraftComboBox from './MinecraftComboBox.svelte';
+	import { MinecraftCheckbox, MinecraftButton, MinecraftTextbox, MinecraftNumber, MinecraftComboBox, DungeonSelectModal } from '.';
+	
 	import { getModalStore, type ModalComponent } from '@skeletonlabs/skeleton';
-	import DungeonSelectModal from './DungeonSelectModal.svelte';
+	
+	import type { ConfigNode } from '../';
+
 
 	export let node: ConfigNode<boolean | number | string | { [key: string]: number }>;
 

src/lib/components/CreateDiscModal.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
-	import { randomTextures } from '$lib/resourcepack/discs';
-	import type { Disc } from '$lib/types';
 	import { FileDropzone, ProgressRadial, getModalStore } from '@skeletonlabs/skeleton';
+	
+	import { randomTextures, type Disc } from '$lib/index';
+
 
 	let files: FileList;
 	let discs: Promise<Disc>[] = [];

src/lib/components/DungeonSelectModal.svelte

@@ -1,9 +1,11 @@
 <!-- This is extremely messy, but I'm too lazy to rewrite this -->
 <script lang="ts">
-	import { loottables } from '$lib/loottables';
 	import { TabGroup, Tab, ProgressRadial, getModalStore } from '@skeletonlabs/skeleton';
 	import { onDestroy } from 'svelte';
 
+	import { loottables } from '../';
+
+	
 	const modalStore = getModalStore();
 
 	export let source: string = 'chests/*';

src/lib/components/EditDiscModal.svelte

@@ -1,16 +1,12 @@
 <script lang="ts">
-	import { discsStore } from '$lib/config';
-	import default_disc from '$lib/assets/default_disc.png';
-	import default_fragment from '$lib/assets/default_fragment.png';
-	import MinecraftTextbox from '$lib/components/MinecraftTextbox.svelte';
-	import FormatEditor from '$lib/components/FormatEditor.svelte';
-	import MinecraftCheckbox from '$lib/components/MinecraftCheckbox.svelte';
-	import MinecraftButton from './MinecraftButton.svelte';
+	import { default_disc, default_fragment } from '$lib/assets';
+
 	import { getModalStore, type ModalComponent } from '@skeletonlabs/skeleton';
-	import DungeonSelectModal from './DungeonSelectModal.svelte';
-	import MinecraftComboBox from './MinecraftComboBox.svelte';
-	import { inputFile, dropFile } from '$lib/directives';
-	import { processImage } from '$lib/resourcepack/utils';
+	
+	import { MinecraftTextbox, FormatEditor, MinecraftCheckbox, MinecraftButton, DungeonSelectModal, MinecraftComboBox } from '.';
+
+	import { inputFile, dropFile, processImage, discsStore } from '../';
+
 
 	export let discNamespaces: string[];
 	let multiple: boolean;

src/lib/components/FormatEditor.svelte

@@ -2,6 +2,7 @@
 	import { popup, type PopupSettings } from '@skeletonlabs/skeleton';
 	import MCText from 'minecraft-text-js';
 
+	
 	export let split: string[] = [];
 	export let text = '';
 	export let firstline = '';

src/lib/components/ImportResourcePackModal.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
-	import { JextFileChecker, RPChecker } from '$lib/resourcepack/utils';
-	import { Stepper, Step, getModalStore, FileDropzone, FileButton } from '@skeletonlabs/skeleton';
+	import { Stepper, Step, getModalStore, FileDropzone } from '@skeletonlabs/skeleton';
 
+	import { JextFileChecker, RPChecker } from '../';
+
+	
 	const modalStore = getModalStore();
 
 	let files: FileList;

src/lib/components/MinecraftButton.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-	import button from '$lib/assets/button.png';
-	import button_highlight from '$lib/assets/button_highlight.png';
-	import button_disabled from '$lib/assets/button_disabled.png';
+	import { button, button_highlight, button_disabled } from '$lib/assets';
+
 
 	export let enabled = true;
 	export let flex = false;
@@ -56,7 +55,7 @@
 	}
 
 	#clickable:hover {
-		border-image-source: url({@assets/button_highlight.png});
+		border-image-source: url({@assets/button_highlight.webp});
 	}
 
 	#clickable {

src/lib/components/MinecraftCheckbox.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import checkbox_on from '$lib/assets/checkbox_on.png';
-	import checkbox_off from '$lib/assets/checkbox_off.png';
+	import { checkbox_on, checkbox_off } from '$lib/assets';
+
 
 	export let value: unknown;
 	export let size: string = '24px';
@@ -28,7 +28,4 @@
 	>
 		<img src={checkbox_off} alt="false" class="h-full" />
 	</button>
-{/if}
-
-<style>
-</style>
+{/if}

src/lib/components/MinecraftLaunchButton.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
-	import generate_btn from '$lib/assets/generate_btn.png';
+	import { generate_btn } from '$lib/assets';
 
+	
 	export let enabled = true;
 	export let highlight = false;
 </script>

src/lib/components/OutputModal.svelte

@@ -1,20 +1,15 @@
 <script lang="ts">
-	import { outputEverything } from '$lib/resourcepack/exporter';
-	import { ProgressBar, getModalStore } from '@skeletonlabs/skeleton';
+	import { panorama_0 as panorama_front, panorama_1 as panorama_right, panorama_2 as panorama_back, panorama_3 as panorama_left, panorama_4 as panorama_top, panorama_5 as panorama_bottom, default_icon } from '$lib/assets';
+
+	import { getModalStore } from '@skeletonlabs/skeleton';
+	import { fade } from 'svelte/transition';
 	import { writable } from 'svelte/store';
-	import MinecraftButton from './MinecraftButton.svelte';
-	import { saveAs } from '$lib/utils';
 	import * as THREE from 'three';
-	import panorama_top from '$lib/assets/panorama_4.webp';
-	import panorama_bottom from '$lib/assets/panorama_5.webp';
-	import panorama_left from '$lib/assets/panorama_3.webp';
-	import panorama_right from '$lib/assets/panorama_1.webp';
-	import panorama_front from '$lib/assets/panorama_0.webp';
-	import panorama_back from '$lib/assets/panorama_2.webp';
-	import { fade } from 'svelte/transition';
-	import default_icon from '$lib/assets/default_icon.png';
-	import ForgeProgressBar from './ForgeProgressBar.svelte';
-	import { fetchAuthed, isLoggedIn } from '$lib/login';
+
+	import { MinecraftButton, ForgeProgressBar } from '.';
+
+	import { outputEverything, saveAs, fetchAuthed, isLoggedIn } from '../';
+
 
 	const modalStore = getModalStore();
 

src/lib/components/ResourcePackManager.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
-	import { resourcePackStore, versions } from '$lib/config';
-	import { inputFile, dropFile } from '$lib/directives';
 	import JSZip from 'jszip';
-	import MinecraftComboBox from './MinecraftComboBox.svelte';
-	import MinecraftTextbox from './MinecraftTextbox.svelte';
-	import { randomDiscTexture } from '$lib/resourcepack/discs';
+	
+	import { MinecraftComboBox, MinecraftTextbox } from '.';
 
+	import { resourcePackStore, versions, inputFile, dropFile, randomDiscTexture } from '../';
+
+	
 	const setTexture = async (files?: File[]) => {
 		if (files && files.length > 0 && files[0]) {
 			$resourcePackStore.icon = files[0];

src/lib/components/index.ts

@@ -0,0 +1,15 @@
+export { default as ImportResourcePackModal } from './ImportResourcePackModal.svelte';
+export { default as MinecraftLaunchButton } from './MinecraftLaunchButton.svelte';
+export { default as ResourcePackManager } from './ResourcePackManager.svelte';
+export { default as DungeonSelectModal } from './DungeonSelectModal.svelte';
+export { default as MinecraftCheckbox } from './MinecraftCheckbox.svelte';
+export { default as MinecraftComboBox } from './MinecraftComboBox.svelte';
+export { default as ForgeProgressBar } from './ForgeProgressBar.svelte';
+export { default as MinecraftTextbox } from './MinecraftTextbox.svelte';
+export { default as CreateDiscModal } from './CreateDiscModal.svelte';
+export { default as MinecraftButton } from './MinecraftButton.svelte';
+export { default as MinecraftNumber } from './MinecraftNumber.svelte';
+export { default as EditDiscModal } from './EditDiscModal.svelte';
+export { default as FormatEditor } from './FormatEditor.svelte';
+export { default as OutputModal } from './OutputModal.svelte';
+export { default as ConfigNode } from './ConfigNode.svelte';

src/lib/config.ts

@@ -1,6 +1,9 @@
+import { default_icon } from './assets';
+
 import { writable } from 'svelte/store';
-import type { Disc, ResourcePackData } from './types';
-import default_icon from './assets/default_icon.png';
+
+import type { Disc, ResourcePackData } from '.';
+
 
 export const versions = new Map([
 	[4, '1.14 - 1.14.4'],
@@ -23,13 +26,4 @@ export const resourcePackStore = writable<ResourcePackData>({
 	version: Math.max(...Array.from(versions.keys())),
 	description: 'Adds custom music discs!',
 	packs: []
-});
-
-fetch(default_icon).then(async (res) => {
-	const blob = await res.blob();
-
-	resourcePackStore.update((store) => {
-		store.icon = blob;
-		return store;
-	});
-});
+});

src/lib/ffmpeg.ts

@@ -1,15 +1,11 @@
-import type { FFmpegData } from './types';
-import { FFmpeg } from '@ffmpeg/ffmpeg';
-import {
-	arrayBufferToBase64,
-	base64ToArrayBuffer,
-	blobToArraBuffer,
-	downloadWithProgress
-} from './utils';
-import { invoke } from '@tauri-apps/api/tauri';
 import { get, writable } from 'svelte/store';
+import { FFmpeg } from '@ffmpeg/ffmpeg';
+
 import { listen } from '@tauri-apps/api/event';
-import { getDuration } from './resourcepack/utils';
+import { invoke } from '@tauri-apps/api/tauri';
+
+import { getDuration, type FFmpegData, arrayBufferToBase64, base64ToArrayBuffer, blobToArraBuffer, downloadWithProgress } from '.'
+
 
 const baseURL = 'https://unpkg.com/@ffmpeg/[email protected]/dist/esm';
 const baseMTURL = 'https://unpkg.com/@ffmpeg/[email protected]/dist/esm';

src/lib/index.ts

@@ -0,0 +1,10 @@
+export * from './resourcepack';
+
+export * from './marked-renderer';
+export * from './directives';
+export * from './loottables';
+export * from './config';
+export * from './ffmpeg';
+export * from './login';
+export * from './types';
+export * from './utils';

src/lib/login.ts

@@ -1,6 +1,7 @@
 import { getModalStore, localStorageStore, type ModalStore } from '@skeletonlabs/skeleton';
 import { get } from 'svelte/store';
 
+
 export const LoginStore = localStorageStore<{ ip: string; token: string } | null>('login', null);
 
 export const login = async (

src/lib/marked-renderer.ts

@@ -1,5 +1,6 @@
 import { type RendererObject } from 'marked';
 
+
 export const renderer: RendererObject = {
 	blockquote: (quote: string) => `<blockquote class="blockquote m-2">${quote}</blockquote>`,
 	heading: (text: string, level: number) => `<h${level} class="m-2 h${level}">${text}</h${level}>`,

src/lib/resourcepack/discs.ts

@@ -1,6 +1,7 @@
-import type { Disc } from '$lib/types';
-import disc_template from '$lib/assets/disc_template.png';
-import fragment_template from '$lib/assets/fragment_template.png';
+import { disc_template, fragment_template } from '$lib/assets';
+
+import type { Disc } from '../';
+
 
 export const namespace = (disc: Disc) =>
 	`${disc.title}${disc.author}${disc['model-data']}`

src/lib/resourcepack/exporter.ts

@@ -1,10 +1,9 @@
-import { discsStore, resourcePackStore } from '$lib/config';
+import type { FFmpeg } from '@ffmpeg/ffmpeg';
 import { get } from 'svelte/store';
-import { getDuration, processImage } from './utils';
-import { loadFFmpeg, prepareAudio } from '$lib/ffmpeg';
 import JSZip from 'jszip';
-import { getVersionFromTime } from '$lib/utils';
-import type { FFmpeg } from '@ffmpeg/ffmpeg';
+
+import { discsStore, resourcePackStore, getDuration, processImage, loadFFmpeg, prepareAudio, getVersionFromTime } from '../';
+
 
 export const processResources = async (
 	ffmpeg: FFmpeg | null,

src/lib/resourcepack/importer.ts

@@ -1,9 +1,10 @@
-import type { Disc } from '$lib/types';
-import JSZip from 'jszip';
+import { default_disc, default_fragment } from '$lib/assets';
+
 import { get, type Writable } from 'svelte/store';
-import default_disc from '$lib/assets/default_disc.png';
-import default_fragment from '$lib/assets/default_fragment.png';
-import { resourcePackStore } from '$lib/config';
+import JSZip from 'jszip';
+
+import { type Disc, resourcePackStore } from '../';
+
 
 export const importRP = async (discStore: Writable<Disc[]>, rp: Blob, discsJson: Disc[]) => {
 	const zip = await JSZip.loadAsync(rp);

src/lib/resourcepack/index.ts

@@ -0,0 +1,4 @@
+export * from './exporter';
+export * from './importer';
+export * from './discs';
+export * from './utils';

src/lib/resourcepack/utils.ts

@@ -1,6 +1,8 @@
-import type { Disc } from '$lib/types';
-import Ajv from 'ajv';
 import JSZip from 'jszip';
+import Ajv from 'ajv';
+
+import type { Disc } from '../';
+
 
 export const RPChecker = async (blob: Blob): Promise<'JextRP' | 'RP' | 'NotValid'> => {
 	const zip = await JSZip.loadAsync(blob);