feat: Ornithe support

apps/app-frontend/package.json

@@ -69,6 +69,5 @@
 		"vue-component-type-helpers": "^3.1.8",
 		"vue-tsc": "^2.1.6"
 	},
-	"packageManager": "pnpm@9.4.0",
 	"web-types": "../../web-types.json"
 }

apps/app-frontend/src/App.vue

@@ -2241,6 +2241,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 		<CreationFlowModal
 			ref="installationModal"
 			type="instance"
+			:available-loaders="['fabric', 'neoforge', 'forge', 'quilt', 'ornithe']"
 			show-snapshot-toggle
 			:fetch-existing-instance-names="fetchExistingInstanceNames"
 			:search-projects="searchProjects"

apps/app-frontend/src/generated/app-events/ModLoader.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ModLoader = "vanilla" | "forge" | "fabric" | "quilt" | "neoforge";
+export type ModLoader = "vanilla" | "forge" | "fabric" | "quilt" | "neoforge" | "ornithe";

apps/app-frontend/src/generated/app-events/postcard/index.d.ts

@@ -51,7 +51,7 @@ export type LogEvent = { tag: "log4j", value: Log4jEvent } | { tag: "legacy", va
 export type LogPayload = { instance_id: string, event: LogEvent }
 export type OnboardingChecklist = { has_created_instance: boolean, has_logged_into_minecraft: boolean, has_logged_into_modrinth: boolean, show_checklist: boolean }
 export type Log4jEvent = { timestamp_millis: i64 | undefined, logger_name: string | undefined, level: string | undefined, thread_name: string | undefined, message: string | undefined, throwable: string | undefined }
-export type ModLoader = { tag: "vanilla" } | { tag: "forge" } | { tag: "fabric" } | { tag: "quilt" } | { tag: "neoforge" }
+export type ModLoader = { tag: "vanilla" } | { tag: "forge" } | { tag: "fabric" } | { tag: "quilt" } | { tag: "neoforge" } | { tag: "ornithe" }
 export type InstallJobSnapshot = { content_count: u32 | undefined, job_id: string, instance_id: string | undefined, kind: InstallJobKind, status: InstallJobStatus, paused: boolean, canceling: boolean, can_pause: boolean, can_cancel: boolean, target: InstallTarget, phase: InstallPhaseId, progress: InstallProgress | undefined, details: InstallPhaseDetails, display: InstallJobDisplay | undefined, error: InstallErrorView | undefined, rollback_error: InstallErrorView | undefined, created: string, modified: string, finished: string | undefined }
 export type InstallJobKind = { tag: "create_instance" } | { tag: "create_modpack_instance" } | { tag: "create_shared_instance" } | { tag: "import_instance" } | { tag: "duplicate_instance" } | { tag: "install_existing_instance" } | { tag: "install_pack_to_existing_instance" } | { tag: "update_shared_instance" } | { tag: "bulk_update_content" }
 export type InstallJobStatus = { tag: "queued" } | { tag: "running" } | { tag: "succeeded" } | { tag: "failed" } | { tag: "interrupted" } | { tag: "canceled" }

apps/app-frontend/src/generated/app-events/postcard/index.js

@@ -821,6 +821,10 @@ function deserialize_MOD_LOADER(d) {
         return {
             tag: "neoforge"
         };
+    case 5:
+        return {
+            tag: "ornithe"
+        };
     default:
         throw "variant not implemented"
     }

apps/app-frontend/src/helpers/tags.js

@@ -15,6 +15,14 @@ export async function get_loaders() {
 	return await invoke('plugin:tags|tags_get_loaders')
 }
 
+// Gets cached loaders tags an instance can use, with vanilla first
+export async function get_modpack_loaders() {
+	const loaders = await get_loaders()
+	return loaders
+		.filter((item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla')
+		.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0))
+}
+
 // Gets cached game_versions tags
 export async function get_game_versions() {
 	return await invoke('plugin:tags|tags_get_game_versions')

apps/app-frontend/src/helpers/types.d.ts

@@ -147,7 +147,7 @@ export type Instance = GameInstance
 
 type ReleaseChannel = 'release' | 'beta' | 'alpha'
 
-export type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
+export type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge' | 'ornithe'
 
 export type ContentSourceKind =
 	| 'local'

apps/app-frontend/src/pages/Browse.vue

@@ -408,7 +408,7 @@ const instanceFilters = computed(() => {
 		}
 
 		const platform = instance.value.loader
-		const supportedModLoaders = ['fabric', 'forge', 'quilt', 'neoforge']
+		const supportedModLoaders = ['fabric', 'forge', 'quilt', 'neoforge', 'ornithe']
 
 		if (platform && projectType.value === 'mod' && supportedModLoaders.includes(platform)) {
 			filters.push({ type: 'mod_loader', option: platform })

apps/app-frontend/src/pages/instance/components/settings-modal/index.vue

@@ -9,14 +9,13 @@ import {
 	type TabbedModalTab,
 	useVIntl,
 } from '@modrinth/ui'
-import type { PlatformTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, nextTick, ref, watch } from 'vue'
 
 import { get_project_v3 } from '@/helpers/cache'
 import { get_linked_modpack_info, getInstanceIconUrl } from '@/helpers/instance'
 import { get_loader_versions } from '@/helpers/metadata'
-import { get_game_versions, get_loaders } from '@/helpers/tags'
+import { get_game_versions, get_modpack_loaders } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 
 import GeneralSettings from './general-settings.vue'
@@ -115,14 +114,6 @@ const tabs = computed<TabbedModalTab[]>(() => [
 	},
 ])
 
-function getSupportedModpackLoaders() {
-	return get_loaders().then((value: PlatformTag[]) =>
-		value
-			.filter((item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla')
-			.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0)),
-	)
-}
-
 // Preload
 useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'fabric'],
@@ -136,6 +127,10 @@ useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'quilt'],
 	queryFn: () => get_loader_versions('quilt'),
 })
+useQuery({
+	queryKey: ['instance-settings', 'loader-versions', 'ornithe'],
+	queryFn: () => get_loader_versions('ornithe'),
+})
 useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'neo'],
 	queryFn: () => get_loader_versions('neo'),
@@ -146,7 +141,7 @@ useQuery({
 })
 useQuery({
 	queryKey: ['instance-settings', 'loaders', 'modpack'],
-	queryFn: getSupportedModpackLoaders,
+	queryFn: get_modpack_loaders,
 })
 useQuery({
 	queryKey: computed(() => ['linkedModpackInfo', props.instance.id]),

apps/app-frontend/src/pages/instance/components/settings-modal/installation-settings.vue

@@ -11,7 +11,7 @@ import {
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
-import type { GameVersionTag, PlatformTag } from '@modrinth/utils'
+import type { GameVersionTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
@@ -32,7 +32,7 @@ import {
 	update_repair_modrinth,
 } from '@/helpers/instance'
 import { get_loader_versions } from '@/helpers/metadata'
-import { get_game_versions, get_loaders } from '@/helpers/tags'
+import { get_game_versions, get_modpack_loaders } from '@/helpers/tags'
 import { injectAppEvents } from '@/providers/app-events'
 import { provideInstanceBackup } from '@/providers/instance-backup'
 
@@ -60,14 +60,6 @@ debug('metadata load: start', {
 	installStage: instance.value.install_stage,
 })
 
-function getSupportedModpackLoaders() {
-	return get_loaders().then((value: PlatformTag[]) =>
-		value
-			.filter((item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla')
-			.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0)),
-	)
-}
-
 const fabricVersionsQuery = useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'fabric'],
 	queryFn: () => get_loader_versions('fabric') as Promise<Manifest>,
@@ -80,6 +72,10 @@ const quiltVersionsQuery = useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'quilt'],
 	queryFn: () => get_loader_versions('quilt') as Promise<Manifest>,
 })
+const ornitheVersionsQuery = useQuery({
+	queryKey: ['instance-settings', 'loader-versions', 'ornithe'],
+	queryFn: () => get_loader_versions('ornithe') as Promise<Manifest>,
+})
 const neoforgeVersionsQuery = useQuery({
 	queryKey: ['instance-settings', 'loader-versions', 'neo'],
 	queryFn: () => get_loader_versions('neo') as Promise<Manifest>,
@@ -90,14 +86,15 @@ const gameVersionsQuery = useQuery({
 })
 const loadersQuery = useQuery({
 	queryKey: ['instance-settings', 'loaders', 'modpack'],
-	queryFn: getSupportedModpackLoaders,
+	queryFn: () => get_modpack_loaders() as Promise<Labrinth.Tags.v2.Loader[]>,
 })
 
 const metadataLoading = computed(() =>
 	[
 		fabricVersionsQuery,
 		forgeVersionsQuery,
 		quiltVersionsQuery,
+		ornitheVersionsQuery,
 		neoforgeVersionsQuery,
 		gameVersionsQuery,
 		loadersQuery,
@@ -177,6 +174,7 @@ function getManifest(loader: string) {
 		fabric: fabricVersionsQuery.data.value,
 		forge: forgeVersionsQuery.data.value,
 		quilt: quiltVersionsQuery.data.value,
+		ornithe: ornitheVersionsQuery.data.value,
 		neoforge: neoforgeVersionsQuery.data.value,
 	}
 	const manifest = map[loader]

apps/app-frontend/src/providers/content-install.ts

@@ -63,8 +63,15 @@ type InstallingProjectDisplay = {
 	organization?: string | null
 	team?: string
 }
-const LOADER_ORDER = ['vanilla', 'fabric', 'quilt', 'neoforge', 'forge']
-const SUPPORTED_LOADERS: Set<string> = new Set(['vanilla', 'forge', 'fabric', 'quilt', 'neoforge'])
+const LOADER_ORDER = ['vanilla', 'fabric', 'quilt', 'neoforge', 'forge', 'ornithe']
+const SUPPORTED_LOADERS: Set<string> = new Set([
+	'vanilla',
+	'forge',
+	'fabric',
+	'quilt',
+	'neoforge',
+	'ornithe',
+])
 const VANILLA_COMPATIBLE_LOADERS: Set<string> = new Set(['minecraft', 'datapack'])
 const noCompatibleVersionsMessage = defineMessage({
 	id: 'app.content-install.no-compatible-versions',

apps/daedalus_client/.gitignore

@@ -0,0 +1 @@
+meta-out/