fix jsign not running

.cargo/config.toml

@@ -1,6 +1,3 @@
 # Windows has stack overflows when calling from Tauri, so we increase compiler size
 [target.'cfg(windows)']
 rustflags = ["-C", "link-args=/STACK:16777220"]
-
-[build]
-rustflags = ["--cfg", "tokio_unstable"]

.github/ISSUE_TEMPLATE/1-app-bug.yml

@@ -16,7 +16,7 @@ body:
     id: version
     attributes:
       label: What version of the Modrinth App are you using?
-      description: Find this in ⚙️ Settings (bottom right) -> After Modrinth App (bottom left)
+      description: Find this in ⚙️ Settings (bottom right) -> About -> App version.
     validations:
       required: true
   - type: dropdown

.github/workflows/daedalus-docker.yml

@@ -7,13 +7,11 @@ on:
     paths:
       - .github/workflows/daedalus-docker.yml
       - 'apps/daedalus_client/**'
-      - 'packages/daedalus/**'
   pull_request:
     types: [opened, synchronize]
     paths:
       - .github/workflows/daedalus-docker.yml
       - 'apps/daedalus_client/**'
-      - 'packages/daedalus/**'
   merge_group:
     types: [checks_requested]
 

.github/workflows/labrinth-docker.yml

@@ -38,10 +38,8 @@ jobs:
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
-        env:
-          SQLX_OFFLINE: true
         with:
-          file: ./apps/labrinth/Dockerfile
+          context: ./apps/labrinth
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/theseus-release.yml

@@ -6,11 +6,9 @@ on:
     tags:
       - 'v*'
     paths:
-      - .github/workflows/theseus-release.yml
+      - .github/workflows/app-release.yml
       - 'apps/app/**'
       - 'apps/app-frontend/**'
-      - 'apps/labrinth/src/common/**'
-      - 'apps/labrinth/Cargo.toml'
       - 'packages/app-lib/**'
       - 'packages/app-macros/**'
       - 'packages/assets/**'
@@ -23,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, windows-latest, ubuntu-22.04]
+        platform: [macos-latest, self-hosted, ubuntu-22.04]
 
     runs-on: ${{ matrix.platform }}
 
@@ -129,6 +127,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          DIGICERT_PASSWORD: ${{ secrets.DIGICERT_PASSWORD }}
 
       - name: upload ${{ matrix.platform }}
         uses: actions/upload-artifact@v4

.idea/code.iml

@@ -10,11 +10,9 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/packages/app-lib/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/rust-common/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/ariadne/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

Cargo.toml

@@ -7,7 +7,6 @@ members = [
   './apps/labrinth',
     './apps/daedalus_client',
     './packages/daedalus',
-    './packages/ariadne',
 ]
 
 # Optimize for speed and reduce size on release builds
@@ -22,4 +21,4 @@ strip = true # Remove debug symbols
 opt-level = 3
 
 [patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" }
+wry = { git = "https://github.com/modrinth/wry", rev ="cdbf938" }

apps/app-frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "0.9.5",
+  "version": "0.9.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -16,7 +16,6 @@
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
     "@sentry/vue": "^8.27.0",
-    "@geometrically/minecraft-motd-parser": "^1.1.4",
     "@tauri-apps/api": "^2.1.1",
     "@tauri-apps/plugin-dialog": "^2.2.0",
     "@tauri-apps/plugin-os": "^2.2.0",
@@ -51,8 +50,7 @@
     "tsconfig": "workspace:*",
     "typescript": "^5.5.4",
     "vite": "^5.4.6",
-    "vue-tsc": "^2.1.6",
-    "@taijased/vue-render-tracker": "^1.0.7"
+    "vue-tsc": "^2.1.6"
   },
   "packageManager": "pnpm@9.4.0",
   "web-types": "../../web-types.json"

apps/app-frontend/src/App.vue

@@ -16,7 +16,6 @@ import {
   RestoreIcon,
   RightArrowIcon,
   SettingsIcon,
-  WorldIcon,
   XIcon,
 } from '@modrinth/assets'
 import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@modrinth/ui'
@@ -24,7 +23,7 @@ import { useLoading, useTheming } from '@/store/state'
 import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
-import { get } from '@/helpers/settings.ts'
+import { get } from '@/helpers/settings'
 import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
@@ -167,17 +166,11 @@ async function setupApp() {
     `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
     'criticalAnnouncements',
     true,
-  )
-    .then((res) => {
-      if (res && res.header && res.body) {
-        criticalErrorMessage.value = res
-      }
-    })
-    .catch(() => {
-      console.log(
-        `No critical announcement found at https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
-      )
-    })
+  ).then((res) => {
+    if (res && res.header && res.body) {
+      criticalErrorMessage.value = res
+    }
+  })
 
   useFetch(`https://modrinth.com/blog/news.json`, 'news', true).then((res) => {
     if (res && res.articles) {
@@ -366,7 +359,7 @@ function handleAuxClick(e) {
 <template>
   <SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
   <div id="teleports"></div>
-  <div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
+  <div v-if="stateInitialized" class="app-grid-layout relative">
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
     </Suspense>
@@ -379,9 +372,6 @@ function handleAuxClick(e) {
       <NavButton v-tooltip.right="'Home'" to="/">
         <HomeIcon />
       </NavButton>
-      <NavButton v-if="themeStore.featureFlags.worlds_tab" v-tooltip.right="'Worlds'" to="/worlds">
-        <WorldIcon />
-      </NavButton>
       <NavButton
         v-tooltip.right="'Discover content'"
         to="/browse/modpack"
@@ -483,7 +473,7 @@ function handleAuxClick(e) {
             <RunningAppBar />
           </Suspense>
         </div>
-        <section v-if="!nativeDecorations" class="window-controls" data-tauri-drag-region-exclude>
+        <section v-if="!nativeDecorations" class="window-controls">
           <Button class="titlebar-button" icon-only @click="() => getCurrentWindow().minimize()">
             <MinimizeIcon />
           </Button>
@@ -531,16 +521,6 @@ function handleAuxClick(e) {
           width: 'calc(100% - var(--right-bar-width))',
         }"
       ></div>
-      <div
-        v-if="criticalErrorMessage"
-        class="m-6 mb-0 flex flex-col border-red bg-bg-red rounded-2xl border-2 border-solid p-4 gap-1 font-semibold text-contrast"
-      >
-        <h1 class="m-0 text-lg font-extrabold">{{ criticalErrorMessage.header }}</h1>
-        <div
-          class="markdown-body text-primary"
-          v-html="renderString(criticalErrorMessage.body ?? '')"
-        ></div>
-      </div>
       <RouterView v-slot="{ Component }">
         <template v-if="Component">
           <Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
@@ -612,6 +592,12 @@ function handleAuxClick(e) {
         <PromotionWrapper />
       </template>
     </div>
+    <div class="view">
+      <div v-if="criticalErrorMessage" class="critical-error-banner" data-tauri-drag-region>
+        <h1>{{ criticalErrorMessage.header }}</h1>
+        <div class="markdown-body" v-html="renderString(criticalErrorMessage.body ?? '')"></div>
+      </div>
+    </div>
   </div>
   <URLConfirmModal ref="urlModal" />
   <Notifications ref="notificationsWrapper" sidebar />
@@ -714,14 +700,6 @@ function handleAuxClick(e) {
   grid-area: status;
 }
 
-[data-tauri-drag-region] {
-  -webkit-app-region: drag;
-}
-
-[data-tauri-drag-region-exclude] {
-  -webkit-app-region: no-drag;
-}
-
 .app-contents {
   position: absolute;
   z-index: 1;

apps/app-frontend/src/assets/stylesheets/global.scss

@@ -2,44 +2,8 @@
 @tailwind components;
 @tailwind utilities;
 
-@font-face {
-  font-family: 'bundled-minecraft-font-mrapp';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 400;
-  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/regular.otf') format('opentype');
-}
-
-@font-face {
-  font-family: 'bundled-minecraft-font-mrapp';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 400;
-  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/italic.otf') format('opentype');
-}
-
-@font-face {
-  font-family: 'bundled-minecraft-font-mrapp';
-  font-style: normal;
-  font-display: swap;
-  font-weight: 600;
-  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold.otf') format('opentype');
-}
-
-@font-face {
-  font-family: 'bundled-minecraft-font-mrapp';
-  font-style: italic;
-  font-display: swap;
-  font-weight: 600;
-  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold-italic.otf') format('opentype');
-}
-
-.font-minecraft {
-  font-family: 'bundled-minecraft-font-mrapp', monospace;
-}
-
 :root {
-  font-family: var(--font-standard, sans-serif), sans-serif;
+  font-family: var(--font-standard);
   color-scheme: dark;
   --view-width: calc(100% - 5rem);
   --expanded-view-width: calc(100% - 13rem);

apps/app-frontend/src/components/RowDisplay.vue

@@ -10,6 +10,7 @@ import {
   StopCircleIcon,
   ExternalIcon,
   EyeIcon,
+  ChevronRightIcon,
 } from '@modrinth/assets'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 import Instance from '@/components/ui/Instance.vue'
@@ -25,7 +26,6 @@ import { trackEvent } from '@/helpers/analytics'
 import { handleSevereError } from '@/store/error.js'
 import { install as installVersion } from '@/store/install.js'
 import { openUrl } from '@tauri-apps/plugin-opener'
-import { HeadingLink } from '@modrinth/ui'
 
 const router = useRouter()
 
@@ -44,9 +44,7 @@ const props = defineProps({
 })
 
 const actualInstances = computed(() =>
-  props.instances.filter(
-    (x) => (x && x.instances && x.instances[0] && x.show === undefined) || x.show,
-  ),
+  props.instances.filter((x) => x && x.instances && x.instances[0]),
 )
 
 const modsRow = ref(null)
@@ -183,10 +181,6 @@ const maxInstancesPerRow = ref(1)
 const maxProjectsPerRow = ref(1)
 
 const calculateCardsPerRow = () => {
-  if (rows.value.length === 0) {
-    return
-  }
-
   // Calculate how many cards fit in one row
   const containerWidth = rows.value[0].clientWidth
   // Convert container width from pixels to rem
@@ -210,21 +204,16 @@ const calculateCardsPerRow = () => {
 
 const rowContainer = ref(null)
 const resizeObserver = ref(null)
-
 onMounted(() => {
   calculateCardsPerRow()
   resizeObserver.value = new ResizeObserver(calculateCardsPerRow)
-  if (rowContainer.value) {
-    resizeObserver.value.observe(rowContainer.value)
-  }
+  resizeObserver.value.observe(rowContainer.value)
   window.addEventListener('resize', calculateCardsPerRow)
 })
 
 onUnmounted(() => {
   window.removeEventListener('resize', calculateCardsPerRow)
-  if (rowContainer.value) {
-    resizeObserver.value.unobserve(rowContainer.value)
-  }
+  resizeObserver.value.unobserve(rowContainer.value)
 })
 </script>
 
@@ -238,10 +227,17 @@ onUnmounted(() => {
     @proceed="deleteProfile"
   />
   <div ref="rowContainer" class="flex flex-col gap-4">
-    <div v-for="row in actualInstances" ref="rows" :key="row.label" class="row">
-      <HeadingLink class="mt-1" :to="row.route">
+    <div v-for="(row, rowIndex) in actualInstances" ref="rows" :key="row.label" class="row">
+      <router-link
+        class="flex mb-3 leading-none items-center gap-1 text-primary text-lg font-bold hover:underline group"
+        :class="{ 'mt-1': rowIndex > 0 }"
+        :to="row.route"
+      >
         {{ row.label }}
-      </HeadingLink>
+        <ChevronRightIcon
+          class="h-5 w-5 stroke-[3px] group-hover:translate-x-1 transition-transform group-hover:text-brand"
+        />
+      </router-link>
       <section
         v-if="row.instance"
         ref="modsRow"

apps/app-frontend/src/components/ui/Breadcrumbs.vue

@@ -19,7 +19,6 @@
           path: breadcrumb.link.replace('{id}', encodeURIComponent($route.params.id)),
           query: breadcrumb.query,
         }"
-        class="text-primary"
         >{{
           breadcrumb.name.charAt(0) === '?'
             ? breadcrumbData.getName(breadcrumb.name.slice(1))

apps/app-frontend/src/components/ui/ErrorModal.vue

@@ -1,20 +1,11 @@
 <script setup>
-import {
-  CheckIcon,
-  DropdownIcon,
-  XIcon,
-  HammerIcon,
-  LogInIcon,
-  UpdatedIcon,
-  CopyIcon,
-} from '@modrinth/assets'
+import { XIcon, HammerIcon, LogInIcon, UpdatedIcon } from '@modrinth/assets'
 import { ChatIcon } from '@/assets/icons'
-import { ButtonStyled, Collapsible } from '@modrinth/ui'
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
 import { handleError } from '@/store/notifications.js'
 import { handleSevereError } from '@/store/error.js'
-import { cancel_directory_change } from '@/helpers/settings.ts'
+import { cancel_directory_change } from '@/helpers/settings.js'
 import { install } from '@/helpers/profile.js'
 import { trackEvent } from '@/helpers/analytics'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
@@ -22,7 +13,6 @@ import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 const errorModal = ref()
 const error = ref()
 const closable = ref(true)
-const errorCollapsed = ref(false)
 
 const title = ref('An error occurred')
 const errorType = ref('unknown')
@@ -128,26 +118,6 @@ async function repairInstance() {
   }
   loadingRepair.value = false
 }
-
-const hasDebugInfo = computed(
-  () =>
-    errorType.value === 'directory_move' ||
-    errorType.value === 'minecraft_auth' ||
-    errorType.value === 'state_init' ||
-    errorType.value === 'no_loader_version',
-)
-
-const debugInfo = computed(() => error.value.message ?? error.value ?? 'No error message.')
-
-const copied = ref(false)
-
-async function copyToClipboard(text) {
-  await navigator.clipboard.writeText(text)
-  copied.value = true
-  setTimeout(() => {
-    copied.value = false
-  }, 3000)
-}
 </script>
 
 <template>
@@ -274,9 +244,16 @@ async function copyToClipboard(text) {
           </div>
         </template>
         <template v-else>
-          {{ debugInfo }}
+          {{ error.message ?? error }}
         </template>
-        <template v-if="hasDebugInfo">
+        <template
+          v-if="
+            errorType === 'directory_move' ||
+            errorType === 'minecraft_auth' ||
+            errorType === 'state_init' ||
+            errorType === 'no_loader_version'
+          "
+        >
           <hr />
           <p>
             If nothing is working and you need help, visit
@@ -284,39 +261,16 @@ async function copyToClipboard(text) {
             and start a chat using the widget in the bottom right and we will be more than happy to
             assist! Make sure to provide the following debug information to the agent:
           </p>
+          <details>
+            <summary>Debug information</summary>
+            {{ error.message ?? error }}
+          </details>
         </template>
       </div>
-      <div class="flex items-center gap-2">
-        <ButtonStyled>
-          <a :href="supportLink" @click="errorModal.hide()"><ChatIcon /> Get support</a>
-        </ButtonStyled>
-        <ButtonStyled v-if="closable">
-          <button @click="errorModal.hide()"><XIcon /> Close</button>
-        </ButtonStyled>
-        <ButtonStyled v-if="hasDebugInfo">
-          <button :disabled="copied" @click="copyToClipboard(debugInfo)">
-            <template v-if="copied"> <CheckIcon class="text-green" /> Copied! </template>
-            <template v-else> <CopyIcon /> Copy debug info </template>
-          </button>
-        </ButtonStyled>
+      <div class="input-group push-right">
+        <a :href="supportLink" class="btn" @click="errorModal.hide()"><ChatIcon /> Get support</a>
+        <button v-if="closable" class="btn" @click="errorModal.hide()"><XIcon /> Close</button>
       </div>
-      <template v-if="hasDebugInfo">
-        <div class="bg-button-bg rounded-xl mt-2 overflow-clip">
-          <button
-            class="flex items-center justify-between w-full bg-transparent border-0 px-4 py-3 cursor-pointer"
-            @click="errorCollapsed = !errorCollapsed"
-          >
-            <span class="text-contrast font-extrabold m-0">Debug information:</span>
-            <DropdownIcon
-              class="h-5 w-5 text-secondary transition-transform"
-              :class="{ 'rotate-180': !errorCollapsed }"
-            />
-          </button>
-          <Collapsible :collapsed="errorCollapsed">
-            <pre class="m-0 px-4 py-3 bg-bg rounded-none">{{ debugInfo }}</pre>
-          </Collapsible>
-        </div>
-      </template>
     </div>
   </ModalWrapper>
 </template>

apps/app-frontend/src/components/ui/ExportModal.vue

@@ -151,7 +151,7 @@ const exportPack = async () => {
           </div>
         </div>
         <div v-if="showingFiles" class="table-content">
-          <div v-for="[path, children] in folders" :key="path.name" class="table-row">
+          <div v-for="[path, children] of folders" :key="path.name" class="table-row">
             <div class="table-cell file-entry">
               <div class="file-primary">
                 <Checkbox

apps/app-frontend/src/components/ui/InstanceCreationModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="modal" header="Creating an instance">
+  <ModalWrapper ref="modal" header="Create instance">
     <div class="modal-header">
       <Chips v-model="creationType" :items="['custom', 'from file', 'import from launcher']" />
     </div>

apps/app-frontend/src/components/ui/ModpackVersionModal.vue

@@ -70,7 +70,7 @@ const onHide = () => {
               v-for="version in filteredVersions"
               :key="version.id"
               class="table-row with-columns selectable"
-              @click="$router.push(`/project/${version.project_id}/version/${version.id}`)"
+              @click="$router.push(`/project/${$route.params.id}/version/${version.id}`)"
             >
               <div class="table-cell table-text">
                 <Button

apps/app-frontend/src/components/ui/NavButton.vue

@@ -7,7 +7,7 @@
       'router-link-active': isPrimary && isPrimary(route),
       'subpage-active': isSubpage && isSubpage(route),
     }"
-    class="w-12 h-12 text-primary rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
+    class="w-12 h-12 rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
   >
     <slot />
   </RouterLink>

apps/app-frontend/src/components/ui/RunningAppBar.vue

@@ -14,10 +14,7 @@
     <div v-if="selectedProcess" class="status">
       <span class="circle running" />
       <div ref="profileButton" class="running-text">
-        <router-link
-          class="text-primary"
-          :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`"
-        >
+        <router-link :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`">
           {{ selectedProcess.profile.name }}
         </router-link>
         <div

apps/app-frontend/src/components/ui/SearchCard.vue

@@ -124,11 +124,8 @@ import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { ref, computed } from 'vue'
 import { install as installVersion } from '@/store/install.js'
-import { useRouter } from 'vue-router'
 dayjs.extend(relativeTime)
 
-const router = useRouter()
-
 const props = defineProps({
   backgroundImage: {
     type: String,
@@ -171,9 +168,6 @@ async function install() {
       installing.value = false
       emit('install', props.project.project_id ?? props.project.id)
     },
-    (profile) => {
-      router.push(`/instance/${profile}`)
-    },
   )
 }
 

apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue

@@ -13,17 +13,15 @@ const confirmModal = ref(null)
 const installing = ref(false)
 
 const onInstall = ref(() => {})
-const onCreateInstance = ref(() => {})
 
 defineExpose({
-  show: (projectVal, versionIdVal, callback, createInstanceCallback) => {
+  show: (projectVal, versionIdVal, callback) => {
     project.value = projectVal
     versionId.value = versionIdVal
     installing.value = false
     confirmModal.value.show()
 
     onInstall.value = callback
-    onCreateInstance.value = createInstanceCallback
 
     trackEvent('PackInstallStart')
   },
@@ -38,7 +36,6 @@ async function install() {
     versionId.value,
     project.value.title,
     project.value.icon_url,
-    onCreateInstance.value,
   ).catch(handleError)
   trackEvent('PackInstall', {
     id: project.value.id,

apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue

@@ -3,7 +3,7 @@ import { Checkbox } from '@modrinth/ui'
 import { computed, ref, watch } from 'vue'
 import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings.ts'
+import { get } from '@/helpers/settings'
 import { edit } from '@/helpers/profile'
 import type { InstanceSettingsTabProps, AppSettings, Hooks } from '../../../helpers/types'
 

apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue

@@ -7,7 +7,7 @@ import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { get_max_memory } from '@/helpers/jre'
-import { get } from '@/helpers/settings.ts'
+import { get } from '@/helpers/settings'
 import type { InstanceSettingsTabProps, AppSettings, MemorySettings } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()

apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue

@@ -3,9 +3,9 @@ import { Checkbox, Toggle } from '@modrinth/ui'
 import { computed, ref, type Ref, watch } from 'vue'
 import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings.ts'
+import { get } from '@/helpers/settings'
 import { edit } from '@/helpers/profile'
-import type { AppSettings, InstanceSettingsTabProps } from '../../../helpers/types'
+import type { InstanceSettingsTabProps, AppSettings } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()
 
@@ -114,6 +114,7 @@ const messages = defineMessages({
       <Toggle
         id="fullscreen"
         :model-value="overrideWindowSettings ? fullscreenSetting : globalSettings.force_fullscreen"
+        :checked="fullscreenSetting"
         :disabled="!overrideWindowSettings"
         @update:model-value="
           (e) => {

apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue

@@ -22,7 +22,7 @@ import { version as getOsVersion, platform as getOsPlatform } from '@tauri-apps/
 import { useTheming } from '@/store/state'
 import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { get, set } from '@/helpers/settings.ts'
+import { get, set } from '@/helpers/settings'
 
 const themeStore = useTheming()
 

apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ConfirmModal } from '@modrinth/ui'
 import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.ts'
+import { useTheming } from '@/store/theme.js'
 
 const themeStore = useTheming()
 
@@ -41,10 +41,6 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
-  markdown: {
-    type: Boolean,
-    default: true,
-  },
 })
 
 const emit = defineEmits(['proceed'])
@@ -84,7 +80,6 @@ function proceed() {
     :on-hide="onModalHide"
     :noblur="!themeStore.advancedRendering"
     :danger="danger"
-    :markdown="markdown"
     @proceed="proceed"
   />
 </template>

apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">
-import { ChevronRightIcon } from '@modrinth/assets'
-import { Avatar } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import type { GameInstance } from '@/helpers/types'
-
-defineProps<{
-  instance: GameInstance
-}>()
-</script>
-<template>
-  <span class="flex items-center gap-2 text-lg font-semibold text-primary">
-    <Avatar
-      :src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
-      size="24px"
-      :tint-by="instance.path"
-    />
-    {{ instance.name }} <ChevronRightIcon />
-  </span>
-</template>

apps/app-frontend/src/components/ui/modal/ModalWrapper.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { NewModal as Modal } from '@modrinth/ui'
 import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.ts'
+import { useTheming } from '@/store/theme.js'
 
 const themeStore = useTheming()
 
@@ -43,7 +43,7 @@ function onModalHide() {
   if (props.showAdOnClose) {
     show_ads_window()
   }
-  props.onHide?.()
+  props.onHide()
 }
 </script>
 

apps/app-frontend/src/components/ui/modal/ShareModalWrapper.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ShareModal } from '@modrinth/ui'
 import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.ts'
+import { useTheming } from '@/store/theme.js'
 
 const themeStore = useTheming()
 

apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import { TeleportDropdownMenu, ThemeSelector, Toggle } from '@modrinth/ui'
+import { Toggle, ThemeSelector, TeleportDropdownMenu } from '@modrinth/ui'
 import { useTheming } from '@/store/state'
-import { get, set } from '@/helpers/settings.ts'
-import { ref, watch } from 'vue'
+import { get, set } from '@/helpers/settings'
+import { watch, ref } from 'vue'
 import { getOS } from '@/helpers/utils'
-import type { ColorTheme } from '@/store/theme.ts'
 
 const themeStore = useTheming()
 
@@ -25,13 +24,13 @@ watch(
 
   <ThemeSelector
     :update-color-theme="
-      (theme: ColorTheme) => {
+      (theme) => {
         themeStore.setThemeState(theme)
         settings.theme = theme
       }
     "
     :current-theme="settings.theme"
-    :theme-options="themeStore.getThemeOptions()"
+    :theme-options="themeStore.themeOptions"
     system-theme-color="system"
   />
 
@@ -47,6 +46,7 @@ watch(
     <Toggle
       id="advanced-rendering"
       :model-value="themeStore.advancedRendering"
+      :checked="themeStore.advancedRendering"
       @update:model-value="
         (e) => {
           themeStore.advancedRendering = e
@@ -61,7 +61,16 @@ watch(
       <h2 class="m-0 text-lg font-extrabold text-contrast">Native Decorations</h2>
       <p class="m-0 mt-1">Use system window frame (app restart required).</p>
     </div>
-    <Toggle id="native-decorations" v-model="settings.native_decorations" />
+    <Toggle
+      id="native-decorations"
+      :model-value="settings.native_decorations"
+      :checked="settings.native_decorations"
+      @update:model-value="
+        (e) => {
+          settings.native_decorations = e
+        }
+      "
+    />
   </div>
 
   <div class="mt-4 flex items-center justify-between">
@@ -69,7 +78,16 @@ watch(
       <h2 class="m-0 text-lg font-extrabold text-contrast">Minimize launcher</h2>
       <p class="m-0 mt-1">Minimize the launcher when a Minecraft process starts.</p>
     </div>
-    <Toggle id="minimize-launcher" v-model="settings.hide_on_process_start" />
+    <Toggle
+      id="minimize-launcher"
+      :model-value="settings.hide_on_process_start"
+      :checked="settings.hide_on_process_start"
+      @update:model-value="
+        (e) => {
+          settings.hide_on_process_start = e
+        }
+      "
+    />
   </div>
 
   <div class="mt-4 flex items-center justify-between">
@@ -81,28 +99,10 @@ watch(
       id="opening-page"
       v-model="settings.default_page"
       name="Opening page dropdown"
-      class="w-40"
       :options="['Home', 'Library']"
     />
   </div>
 
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Jump back into worlds</h2>
-      <p class="m-0 mt-1">Includes recent worlds in the "Jump back in" section on the Home page.</p>
-    </div>
-    <Toggle
-      :model-value="themeStore.getFeatureFlag('worlds_in_home')"
-      @update:model-value="
-        () => {
-          const newValue = !themeStore.getFeatureFlag('worlds_in_home')
-          themeStore.featureFlags['worlds_in_home'] = newValue
-          settings.feature_flags['worlds_in_home'] = newValue
-        }
-      "
-    />
-  </div>
-
   <div class="mt-4 flex items-center justify-between">
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast">Toggle sidebar</h2>
@@ -111,6 +111,7 @@ watch(
     <Toggle
       id="toggle-sidebar"
       :model-value="settings.toggle_sidebar"
+      :checked="settings.toggle_sidebar"
       @update:model-value="
         (e) => {
           settings.toggle_sidebar = e

apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { get, set } from '@/helpers/settings.ts'
+import { get, set } from '@/helpers/settings'
 import { ref, watch } from 'vue'
 import { get_max_memory } from '@/helpers/jre'
 import { handleError } from '@/store/notifications'
@@ -57,7 +57,16 @@ watch(
         </p>
       </div>
 
-      <Toggle id="fullscreen" v-model="settings.force_fullscreen" />
+      <Toggle
+        id="fullscreen"
+        :model-value="settings.force_fullscreen"
+        :checked="settings.force_fullscreen"
+        @update:model-value="
+          (e) => {
+            settings.force_fullscreen = e
+          }
+        "
+      />
     </div>
 
     <div class="flex items-center justify-between gap-4">

apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue

@@ -2,15 +2,18 @@
 import { Toggle } from '@modrinth/ui'
 import { useTheming } from '@/store/state'
 import { ref, watch } from 'vue'
-import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
-import { DEFAULT_FEATURE_FLAGS, type FeatureFlag } from '@/store/theme.ts'
+import { get, set } from '@/helpers/settings'
 
 const themeStore = useTheming()
 
-const settings = ref(await getSettings())
-const options = ref<FeatureFlag[]>(Object.keys(DEFAULT_FEATURE_FLAGS))
+const settings = ref(await get())
+const options = ref(['project_background', 'page_path'])
 
-function setFeatureFlag(key: string, value: boolean) {
+function getStoreValue(key: string) {
+  return themeStore.featureFlags[key] ?? false
+}
+
+function setStoreValue(key: string, value: boolean) {
   themeStore.featureFlags[key] = value
   settings.value.feature_flags[key] = value
 }
@@ -18,7 +21,7 @@ function setFeatureFlag(key: string, value: boolean) {
 watch(
   settings,
   async () => {
-    await setSettings(settings.value)
+    await set(settings.value)
   },
   { deep: true },
 )
@@ -27,14 +30,15 @@ watch(
   <div v-for="option in options" :key="option" class="mt-4 flex items-center justify-between">
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast capitalize">
-        {{ option.replaceAll('_', ' ') }}
+        {{ option }}
       </h2>
     </div>
 
     <Toggle
       id="advanced-rendering"
-      :model-value="themeStore.getFeatureFlag(option)"
-      @update:model-value="() => setFeatureFlag(option, !themeStore.getFeatureFlag(option))"
+      :model-value="getStoreValue(option)"
+      :checked="getStoreValue(option)"
+      @update:model-value="() => setStoreValue(option, !themeStore.featureFlags[option])"
     />
   </div>
 </template>

apps/app-frontend/src/components/ui/settings/PrivacySettings.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings.ts'
+import { get, set } from '@/helpers/settings'
 import { Toggle } from '@modrinth/ui'
 import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
 
@@ -30,7 +30,16 @@ watch(
         option, you opt out and ads will no longer be shown based on your interests.
       </p>
     </div>
-    <Toggle id="personalized-ads" v-model="settings.personalized_ads" />
+    <Toggle
+      id="personalized-ads"
+      :model-value="settings.personalized_ads"
+      :checked="settings.personalized_ads"
+      @update:model-value="
+        (e) => {
+          settings.personalized_ads = e
+        }
+      "
+    />
   </div>
 
   <div class="mt-4 flex items-center justify-between gap-4">
@@ -42,7 +51,16 @@ watch(
         longer be collected.
       </p>
     </div>
-    <Toggle id="opt-out-analytics" v-model="settings.telemetry" />
+    <Toggle
+      id="opt-out-analytics"
+      :model-value="settings.telemetry"
+      :checked="settings.telemetry"
+      @update:model-value="
+        (e) => {
+          settings.telemetry = e
+        }
+      "
+    />
   </div>
 
   <div class="mt-4 flex items-center justify-between gap-4">
@@ -57,6 +75,10 @@ watch(
         as those added by mods. (app restart required to take effect)
       </p>
     </div>
-    <Toggle id="disable-discord-rpc" v-model="settings.discord_rpc" />
+    <Toggle
+      id="disable-discord-rpc"
+      v-model="settings.discord_rpc"
+      :checked="settings.discord_rpc"
+    />
   </div>
 </template>

apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { Button, Slider } from '@modrinth/ui'
 import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings.ts'
+import { get, set } from '@/helpers/settings.js'
 import { purge_cache_types } from '@/helpers/cache.js'
 import { handleError } from '@/store/notifications.js'
 import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'

apps/app-frontend/src/components/ui/world/InstanceItem.vue

@@ -1,220 +0,0 @@
-<script setup lang="ts">
-import dayjs from 'dayjs'
-import {
-  EyeIcon,
-  FolderOpenIcon,
-  MoreVerticalIcon,
-  PlayIcon,
-  SpinnerIcon,
-  StopCircleIcon,
-} from '@modrinth/assets'
-import { Avatar, ButtonStyled, commonMessages, OverflowMenu, SmartClickable } from '@modrinth/ui'
-import { useVIntl } from '@vintl/vintl'
-import { computed, nextTick, ref, onMounted, onUnmounted } from 'vue'
-import { showProfileInFolder } from '@/helpers/utils'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { useRouter } from 'vue-router'
-import type { GameInstance } from '@/helpers/types'
-import { get_project } from '@/helpers/cache'
-import { capitalizeString } from '@modrinth/utils'
-import { kill, run } from '@/helpers/profile'
-import { handleSevereError } from '@/store/error'
-import { trackEvent } from '@/helpers/analytics'
-import { get_by_profile_path } from '@/helpers/process'
-import { handleError } from '@/store/notifications'
-import { process_listener } from '@/helpers/events'
-
-const { formatMessage } = useVIntl()
-
-const router = useRouter()
-
-const emit = defineEmits<{
-  (e: 'play' | 'stop'): void
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-}>()
-
-const loadingModpack = ref(!!props.instance.linked_data)
-
-const modpack = ref()
-
-if (props.instance.linked_data) {
-  nextTick().then(async () => {
-    modpack.value = await get_project(props.instance.linked_data?.project_id, 'must_revalidate')
-    loadingModpack.value = false
-  })
-}
-
-const instanceIcon = computed(() => props.instance.icon_path)
-
-const loader = computed(() => {
-  if (props.instance.loader === 'vanilla') {
-    return 'Minecraft'
-  } else if (props.instance.loader === 'neoforge') {
-    return 'NeoForge'
-  } else {
-    return capitalizeString(props.instance.loader)
-  }
-})
-
-const loading = ref(false)
-const playing = ref(false)
-
-const play = async (event: MouseEvent) => {
-  event?.stopPropagation()
-  loading.value = true
-  await run(props.instance.path)
-    .catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
-    .finally(() => {
-      trackEvent('InstancePlay', {
-        loader: props.instance.loader,
-        game_version: props.instance.game_version,
-        source: 'InstanceItem',
-      })
-    })
-  emit('play')
-  loading.value = false
-}
-
-const stop = async (event: MouseEvent) => {
-  event?.stopPropagation()
-  loading.value = true
-  await kill(props.instance.path).catch(handleError)
-  trackEvent('InstanceStop', {
-    loader: props.instance.loader,
-    game_version: props.instance.game_version,
-    source: 'InstanceItem',
-  })
-  emit('stop')
-  loading.value = false
-}
-
-const unlistenProcesses = await process_listener(async () => {
-  await checkProcess()
-})
-
-const checkProcess = async () => {
-  const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)
-
-  playing.value = runningProcesses.length > 0
-}
-
-onMounted(() => {
-  checkProcess()
-})
-
-onUnmounted(() => {
-  unlistenProcesses()
-})
-</script>
-<template>
-  <SmartClickable>
-    <template #clickable>
-      <router-link
-        class="no-click-animation"
-        :to="`/instance/${encodeURIComponent(instance.path)}`"
-      />
-    </template>
-    <div
-      class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised rounded-xl smart-clickable:highlight-on-hover"
-    >
-      <Avatar
-        :src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
-        :tint-by="instance.path"
-        size="48px"
-      />
-      <div class="flex flex-col col-span-2 justify-between h-full">
-        <div class="flex items-center gap-2">
-          <div class="text-lg text-contrast font-bold truncate smart-clickable:underline-on-hover">
-            {{ instance.name }}
-          </div>
-        </div>
-        <div class="flex items-center gap-2 text-sm text-secondary">
-          <div
-            v-tooltip="
-              instance.last_played
-                ? dayjs(instance.last_played).format('MMMM D, YYYY [at] h:mm A')
-                : null
-            "
-            class="w-fit shrink-0"
-            :class="{ 'cursor-help smart-clickable:allow-pointer-events': instance.last_played }"
-          >
-            <template v-if="instance.last_played">
-              {{
-                formatMessage(commonMessages.playedLabel, {
-                  time: dayjs(instance.last_played).fromNow(),
-                })
-              }}
-            </template>
-            <template v-else> Not played yet </template>
-          </div>
-          •
-          <span v-if="modpack" class="flex items-center gap-1 truncate text-secondary">
-            <router-link
-              class="inline-flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
-              :to="`/project/${modpack.id}`"
-            >
-              <Avatar :src="modpack.icon_url" size="16px" class="shrink-0" />
-              <span class="truncate">{{ modpack.title }}</span>
-            </router-link>
-            ({{ loader }} {{ instance.game_version }})
-          </span>
-          <span v-else-if="loadingModpack" class="flex items-center gap-1 truncate text-secondary">
-            <SpinnerIcon class="animate-spin shrink-0" />
-            <span class="truncate">Loading modpack...</span>
-          </span>
-          <span v-else class="flex items-center gap-1 truncate text-secondary">
-            {{ loader }}
-            {{ instance.game_version }}
-          </span>
-        </div>
-      </div>
-      <div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
-        <ButtonStyled v-if="playing && !loading" color="red">
-          <button @click="stop">
-            <StopCircleIcon aria-hidden="true" />
-            {{ formatMessage(commonMessages.stopButton) }}
-          </button>
-        </ButtonStyled>
-        <ButtonStyled v-else>
-          <button
-            v-tooltip="playing ? 'Instance is already open' : null"
-            :disabled="playing || loading"
-            @click="play"
-          >
-            <SpinnerIcon v-if="loading" class="animate-spin" />
-            <PlayIcon v-else aria-hidden="true" />
-            {{ formatMessage(commonMessages.playButton) }}
-          </button>
-        </ButtonStyled>
-        <ButtonStyled circular type="transparent">
-          <OverflowMenu
-            :options="[
-              {
-                id: 'open-instance',
-                shown: !!instance.path,
-                action: () => router.push(encodeURI(`/instance/${instance.path}`)),
-              },
-              {
-                id: 'open-folder',
-                action: () => showProfileInFolder(instance.path),
-              },
-            ]"
-          >
-            <MoreVerticalIcon aria-hidden="true" />
-            <template #open-instance>
-              <EyeIcon aria-hidden="true" />
-              View instance
-            </template>
-            <template #open-folder>
-              <FolderOpenIcon aria-hidden="true" />
-              {{ formatMessage(commonMessages.openFolderButton) }}
-            </template>
-          </OverflowMenu>
-        </ButtonStyled>
-      </div>
-    </div>
-  </SmartClickable>
-</template>

apps/app-frontend/src/components/ui/world/RecentWorldsList.vue

@@ -1,304 +0,0 @@
-<script setup lang="ts">
-import {
-  type ServerWorld,
-  type ServerData,
-  type WorldWithProfile,
-  get_recent_worlds,
-  getWorldIdentifier,
-  get_profile_protocol_version,
-  refreshServerData,
-  start_join_server,
-  start_join_singleplayer_world,
-} from '@/helpers/worlds.ts'
-import { HeadingLink, GAME_MODES } from '@modrinth/ui'
-import WorldItem from '@/components/ui/world/WorldItem.vue'
-import InstanceItem from '@/components/ui/world/InstanceItem.vue'
-import { watch, onMounted, onUnmounted, ref, computed } from 'vue'
-import type { Dayjs } from 'dayjs'
-import dayjs from 'dayjs'
-import { useTheming } from '@/store/theme.ts'
-import { kill, run } from '@/helpers/profile'
-import { handleError } from '@/store/notifications'
-import { trackEvent } from '@/helpers/analytics'
-import { process_listener, profile_listener } from '@/helpers/events'
-import { get_all } from '@/helpers/process'
-import type { GameInstance } from '@/helpers/types'
-import { handleSevereError } from '@/store/error'
-
-const props = defineProps<{
-  recentInstances: GameInstance[]
-}>()
-
-const theme = useTheming()
-
-const jumpBackInItems = ref<JumpBackInItem[]>([])
-const serverData = ref<Record<string, ServerData>>({})
-const protocolVersions = ref<Record<string, number | null>>({})
-
-const MIN_JUMP_BACK_IN = 3
-const MAX_JUMP_BACK_IN = 6
-const TWO_WEEKS_AGO = dayjs().subtract(14, 'day')
-
-type BaseJumpBackInItem = {
-  last_played: Dayjs
-  instance: GameInstance
-}
-
-type InstanceJumpBackInItem = BaseJumpBackInItem & {
-  type: 'instance'
-}
-
-type WorldJumpBackInItem = BaseJumpBackInItem & {
-  type: 'world'
-  world: WorldWithProfile
-}
-
-type JumpBackInItem = InstanceJumpBackInItem | WorldJumpBackInItem
-
-const showWorlds = computed(() => theme.getFeatureFlag('worlds_in_home'))
-
-watch([() => props.recentInstances, () => showWorlds.value], async () => {
-  await populateJumpBackIn().catch(() => {
-    console.error('Failed to populate jump back in')
-  })
-})
-
-await populateJumpBackIn().catch(() => {
-  console.error('Failed to populate jump back in')
-})
-
-async function populateJumpBackIn() {
-  console.info('Repopulating jump back in...')
-
-  const worldItems: WorldJumpBackInItem[] = []
-
-  if (showWorlds.value) {
-    const worlds = await get_recent_worlds(MAX_JUMP_BACK_IN, ['normal', 'favorite'])
-
-    worlds.forEach((world) => {
-      const instance = props.recentInstances.find((instance) => instance.path === world.profile)
-
-      if (!instance || !world.last_played) {
-        return
-      }
-
-      worldItems.push({
-        type: 'world',
-        last_played: dayjs(world.last_played),
-        world: world,
-        instance: instance,
-      })
-    })
-
-    const servers: {
-      instancePath: string
-      address: string
-    }[] = worldItems
-      .filter((item) => item.world.type === 'server' && item.instance)
-      .map((item) => ({
-        instancePath: item.instance.path,
-        address: (item.world as ServerWorld).address,
-      }))
-
-    // fetch protocol versions for all unique MC versions with server worlds
-    const uniqueServerInstances = new Set<string>(servers.map((x) => x.instancePath))
-    await Promise.all(
-      [...uniqueServerInstances].map((path) =>
-        get_profile_protocol_version(path)
-          .then((protoVer) => (protocolVersions.value[path] = protoVer))
-          .catch(() => {
-            console.error(`Failed to get profile protocol for: ${path} `)
-          }),
-      ),
-    )
-
-    // initialize server data
-    servers.forEach(({ address }) => {
-      if (!serverData.value[address]) {
-        serverData.value[address] = {
-          refreshing: true,
-        }
-      }
-    })
-
-    // fetch each server's data
-    Promise.all(
-      servers.map(({ instancePath, address }) =>
-        refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address),
-      ),
-    )
-  }
-
-  const instanceItems: InstanceJumpBackInItem[] = []
-  for (const instance of props.recentInstances) {
-    const worldItem = worldItems.find((item) => item.instance.path === instance.path)
-    if ((worldItem && worldItem.last_played.isAfter(TWO_WEEKS_AGO)) || !instance.last_played) {
-      continue
-    }
-
-    instanceItems.push({
-      type: 'instance',
-      last_played: dayjs(instance.last_played),
-      instance: instance,
-    })
-  }
-
-  const items: JumpBackInItem[] = [...worldItems, ...instanceItems]
-  items.sort((a, b) => dayjs(b.last_played).diff(dayjs(a.last_played)))
-  jumpBackInItems.value = items
-    .filter((item, index) => index < MIN_JUMP_BACK_IN || item.last_played.isAfter(TWO_WEEKS_AGO))
-    .slice(0, MAX_JUMP_BACK_IN)
-}
-
-async function refreshServer(address: string, instancePath: string) {
-  await refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address)
-}
-
-async function joinWorld(world: WorldWithProfile) {
-  console.log(`Joining world ${getWorldIdentifier(world)}`)
-  if (world.type === 'server') {
-    await start_join_server(world.profile, world.address).catch(handleError)
-  } else if (world.type === 'singleplayer') {
-    await start_join_singleplayer_world(world.profile, world.path).catch(handleError)
-  }
-}
-
-async function playInstance(instance: GameInstance) {
-  await run(instance.path)
-    .catch((err) => handleSevereError(err, { profilePath: instance.path }))
-    .finally(() => {
-      trackEvent('InstancePlay', {
-        loader: instance.loader,
-        game_version: instance.game_version,
-        source: 'WorldItem',
-      })
-    })
-}
-
-async function stopInstance(path: string) {
-  await kill(path).catch(handleError)
-  trackEvent('InstanceStop', {
-    source: 'RecentWorldsList',
-  })
-}
-
-const currentProfile = ref<string>()
-const currentWorld = ref<string>()
-
-const unlistenProcesses = await process_listener(async () => {
-  await checkProcesses()
-})
-
-const unlistenProfiles = await profile_listener(async () => {
-  await populateJumpBackIn().catch(() => {
-    console.error('Failed to populate jump back in')
-  })
-})
-
-const runningInstances = ref<string[]>([])
-
-type ProcessMetadata = {
-  uuid: string
-  profile_path: string
-  start_time: string
-}
-
-const checkProcesses = async () => {
-  const runningProcesses: ProcessMetadata[] = await get_all().catch(handleError)
-
-  const runningPaths = runningProcesses.map((x) => x.profile_path)
-
-  const stoppedInstances = runningInstances.value.filter((x) => !runningPaths.includes(x))
-  if (currentProfile.value && stoppedInstances.includes(currentProfile.value)) {
-    currentProfile.value = undefined
-    currentWorld.value = undefined
-  }
-
-  runningInstances.value = runningPaths
-}
-
-onMounted(() => {
-  checkProcesses()
-})
-
-onUnmounted(() => {
-  unlistenProcesses()
-  unlistenProfiles()
-})
-</script>
-
-<template>
-  <div v-if="jumpBackInItems.length > 0" class="flex flex-col gap-2">
-    <HeadingLink v-if="theme.getFeatureFlag('worlds_tab')" to="/worlds" class="mt-1">
-      Jump back in
-    </HeadingLink>
-    <span
-      v-else
-      class="flex mt-1 mb-3 leading-none items-center gap-1 text-primary text-lg font-bold"
-    >
-      Jump back in
-    </span>
-    <div class="grid-when-huge flex flex-col w-full gap-2">
-      <template
-        v-for="item in jumpBackInItems"
-        :key="`${item.instance.path}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
-      >
-        <WorldItem
-          v-if="item.type === 'world'"
-          :world="item.world"
-          :playing-instance="runningInstances.includes(item.instance.path)"
-          :playing-world="
-            currentProfile === item.instance.path && currentWorld === getWorldIdentifier(item.world)
-          "
-          :refreshing="
-            item.world.type === 'server'
-              ? serverData[item.world.address].refreshing && !serverData[item.world.address].status
-              : undefined
-          "
-          supports-quick-play
-          :server-status="
-            item.world.type === 'server' ? serverData[item.world.address].status : undefined
-          "
-          :rendered-motd="
-            item.world.type === 'server' ? serverData[item.world.address].renderedMotd : undefined
-          "
-          :current-protocol="protocolVersions[item.instance.path]"
-          :game-mode="
-            item.world.type === 'singleplayer' ? GAME_MODES[item.world.game_mode] : undefined
-          "
-          :instance-path="item.instance.path"
-          :instance-name="item.instance.name"
-          :instance-icon="item.instance.icon_path"
-          @refresh="
-            () =>
-              item.world.type === 'server'
-                ? refreshServer(item.world.address, item.instance.path)
-                : {}
-          "
-          @update="() => populateJumpBackIn()"
-          @play="
-            () => {
-              currentProfile = item.instance.path
-              currentWorld = getWorldIdentifier(item.world)
-              joinWorld(item.world)
-            }
-          "
-          @play-instance="
-            () => {
-              currentProfile = item.instance.path
-              playInstance(item.instance)
-            }
-          "
-          @stop="() => stopInstance(item.instance.path)"
-        />
-        <InstanceItem v-else :instance="item.instance" />
-      </template>
-    </div>
-  </div>
-</template>
-<style scoped lang="scss">
-.grid-when-huge {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(670px, 1fr));
-}
-</style>

apps/app-frontend/src/components/ui/world/WorldItem.vue

@@ -1,516 +0,0 @@
-<script setup lang="ts">
-import dayjs from 'dayjs'
-import type { ServerStatus, ServerWorld, World } from '@/helpers/worlds.ts'
-import {
-  set_world_display_status,
-  getWorldIdentifier,
-  showWorldInFolder,
-} from '@/helpers/worlds.ts'
-import { formatNumber } from '@modrinth/utils'
-import {
-  IssuesIcon,
-  EyeIcon,
-  ClipboardCopyIcon,
-  EditIcon,
-  FolderOpenIcon,
-  MoreVerticalIcon,
-  NoSignalIcon,
-  PlayIcon,
-  SignalIcon,
-  SkullIcon,
-  SpinnerIcon,
-  StopCircleIcon,
-  TrashIcon,
-  UpdatedIcon,
-  UserIcon,
-  XIcon,
-} from '@modrinth/assets'
-import { Avatar, ButtonStyled, commonMessages, OverflowMenu, SmartClickable } from '@modrinth/ui'
-import type { MessageDescriptor } from '@vintl/vintl'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import type { Component } from 'vue'
-import { computed } from 'vue'
-import { copyToClipboard } from '@/helpers/utils'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { useRouter } from 'vue-router'
-import { Tooltip } from 'floating-vue'
-
-const { formatMessage } = useVIntl()
-
-const router = useRouter()
-
-const emit = defineEmits<{
-  (e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
-}>()
-
-const props = withDefaults(
-  defineProps<{
-    world: World
-    playingInstance?: boolean
-    playingWorld?: boolean
-    startingInstance?: boolean
-    supportsQuickPlay?: boolean
-    currentProtocol?: number | null
-    highlighted?: boolean
-
-    // Server only
-    refreshing?: boolean
-    serverStatus?: ServerStatus
-    renderedMotd?: string
-
-    // Singleplayer only
-    gameMode?: {
-      icon: Component
-      message: MessageDescriptor
-    }
-
-    // Instance
-    instancePath?: string
-    instanceName?: string
-    instanceIcon?: string
-  }>(),
-  {
-    playingInstance: false,
-    playingWorld: false,
-    startingInstance: false,
-    supportsQuickPlay: false,
-    currentProtocol: null,
-
-    refreshing: false,
-    serverStatus: undefined,
-    renderedMotd: undefined,
-
-    gameMode: undefined,
-
-    instancePath: undefined,
-    instanceName: undefined,
-    instanceIcon: undefined,
-  },
-)
-
-const playingOtherWorld = computed(() => props.playingInstance && !props.playingWorld)
-const hasPlayersTooltip = computed(
-  () => !!props.serverStatus?.players?.sample && props.serverStatus.players?.sample?.length > 0,
-)
-const serverIncompatible = computed(
-  () =>
-    !!props.serverStatus &&
-    !!props.serverStatus.version?.protocol &&
-    !!props.currentProtocol &&
-    props.serverStatus.version.protocol !== props.currentProtocol,
-)
-
-function getPingLevel(ping: number) {
-  if (ping < 150) {
-    return 5
-  } else if (ping < 300) {
-    return 4
-  } else if (ping < 600) {
-    return 3
-  } else if (ping < 1000) {
-    return 2
-  } else {
-    return 1
-  }
-}
-
-const locked = computed(() => props.world.type === 'singleplayer' && props.world.locked)
-
-const messages = defineMessages({
-  hardcore: {
-    id: 'instance.worlds.hardcore',
-    defaultMessage: 'Hardcore mode',
-  },
-  cantConnect: {
-    id: 'instance.worlds.cant_connect',
-    defaultMessage: "Can't connect to server",
-  },
-  aMinecraftServer: {
-    id: 'instance.worlds.a_minecraft_server',
-    defaultMessage: 'A Minecraft Server',
-  },
-  noQuickPlay: {
-    id: 'instance.worlds.no_quick_play',
-    defaultMessage: 'You can only jump straight into worlds on Minecraft 1.20+',
-  },
-  gameAlreadyOpen: {
-    id: 'instance.worlds.game_already_open',
-    defaultMessage: 'Instance is already open',
-  },
-  copyAddress: {
-    id: 'instance.worlds.copy_address',
-    defaultMessage: 'Copy address',
-  },
-  viewInstance: {
-    id: 'instance.worlds.view_instance',
-    defaultMessage: 'View instance',
-  },
-  playAnyway: {
-    id: 'instance.worlds.play_anyway',
-    defaultMessage: 'Play anyway',
-  },
-  playInstance: {
-    id: 'instance.worlds.play_instance',
-    defaultMessage: 'Play instance',
-  },
-  worldInUse: {
-    id: 'instance.worlds.world_in_use',
-    defaultMessage: 'World is in use',
-  },
-  dontShowOnHome: {
-    id: 'instance.worlds.dont_show_on_home',
-    defaultMessage: `Don't show on Home`,
-  },
-})
-</script>
-<template>
-  <SmartClickable>
-    <template v-if="instancePath" #clickable>
-      <router-link
-        class="no-click-animation"
-        :to="`/instance/${encodeURIComponent(instancePath)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
-      />
-    </template>
-    <div
-      class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised smart-clickable:highlight-on-hover rounded-xl"
-      :class="{
-        'world-item-highlighted': highlighted,
-      }"
-    >
-      <Avatar
-        :src="
-          world.type === 'server' && serverStatus ? serverStatus.favicon ?? world.icon : world.icon
-        "
-        size="48px"
-      />
-      <div class="flex flex-col justify-between h-full">
-        <div class="flex items-center gap-2">
-          <div class="text-lg text-contrast font-bold truncate smart-clickable:underline-on-hover">
-            {{ world.name }}
-          </div>
-          <div
-            v-if="world.type === 'singleplayer'"
-            class="text-sm text-secondary flex items-center gap-1 font-semibold"
-          >
-            <UserIcon
-              aria-hidden="true"
-              class="h-4 w-4 text-secondary shrink-0"
-              stroke-width="3px"
-            />
-            {{ formatMessage(commonMessages.singleplayerLabel) }}
-          </div>
-          <div
-            v-else-if="world.type === 'server'"
-            class="text-sm text-secondary flex items-center gap-1 font-semibold flex-nowrap whitespace-nowrap"
-          >
-            <template v-if="refreshing">
-              <SpinnerIcon aria-hidden="true" class="animate-spin shrink-0" />
-              Loading...
-            </template>
-            <template v-else-if="serverStatus">
-              <template v-if="serverIncompatible">
-                <IssuesIcon class="shrink-0 text-orange" aria-hidden="true" />
-                <span class="text-orange">
-                  Incompatible version {{ serverStatus.version?.name }}
-                </span>
-              </template>
-              <template v-else>
-                <SignalIcon
-                  v-tooltip="serverStatus ? `${serverStatus.ping}ms` : null"
-                  aria-hidden="true"
-                  :style="`--_signal-${getPingLevel(serverStatus.ping || 0)}: var(--color-green)`"
-                  stroke-width="3px"
-                  class="shrink-0"
-                  :class="{
-                    'smart-clickable:allow-pointer-events': serverStatus,
-                  }"
-                />
-                <Tooltip :disabled="!hasPlayersTooltip">
-                  <span :class="{ 'cursor-help': hasPlayersTooltip }">
-                    {{ formatNumber(serverStatus.players?.online, false) }} online
-                  </span>
-                  <template #popper>
-                    <div class="flex flex-col gap-1">
-                      <span v-for="player in serverStatus.players?.sample" :key="player.name">
-                        {{ player.name }}
-                      </span>
-                    </div>
-                  </template>
-                </Tooltip>
-              </template>
-            </template>
-            <template v-else>
-              <NoSignalIcon aria-hidden="true" stroke-width="3px" class="shrink-0" /> Offline
-            </template>
-          </div>
-        </div>
-        <div class="flex items-center gap-2 text-sm text-secondary">
-          <div
-            v-tooltip="
-              world.last_played ? dayjs(world.last_played).format('MMMM D, YYYY [at] h:mm A') : null
-            "
-            class="w-fit shrink-0"
-            :class="{ 'cursor-help smart-clickable:allow-pointer-events': world.last_played }"
-          >
-            <template v-if="world.last_played">
-              {{
-                formatMessage(commonMessages.playedLabel, {
-                  time: dayjs(world.last_played).fromNow(),
-                })
-              }}
-            </template>
-            <template v-else> Not played yet </template>
-          </div>
-          <template v-if="instancePath">
-            •
-            <router-link
-              class="flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
-              :to="`/instance/${instancePath}`"
-            >
-              <Avatar
-                :src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
-                size="16px"
-                :tint-by="instancePath"
-                class="shrink-0"
-              />
-              <span class="truncate">{{ instanceName }}</span>
-            </router-link>
-          </template>
-        </div>
-      </div>
-      <div
-        class="font-semibold flex items-center gap-1 justify-center text-center"
-        :class="world.type === 'singleplayer' && world.hardcore ? `text-red` : 'text-secondary'"
-      >
-        <template v-if="world.type === 'server'">
-          <template v-if="refreshing">
-            <SpinnerIcon aria-hidden="true" class="animate-spin" />
-            {{ formatMessage(commonMessages.loadingLabel) }}
-          </template>
-          <div
-            v-else-if="renderedMotd"
-            class="motd-renderer font-normal font-minecraft line-clamp-2 text-secondary leading-5"
-            v-html="renderedMotd"
-          />
-          <div v-else-if="!serverStatus" class="font-normal font-minecraft text-red leading-5">
-            {{ formatMessage(messages.cantConnect) }}
-          </div>
-          <div v-else class="font-normal font-minecraft text-secondary leading-5">
-            {{ formatMessage(messages.aMinecraftServer) }}
-          </div>
-        </template>
-        <template v-else-if="world.type === 'singleplayer' && gameMode">
-          <template v-if="world.hardcore">
-            <SkullIcon aria-hidden="true" class="h-4 w-4 shrink-0" />
-            {{ formatMessage(messages.hardcore) }}
-          </template>
-          <template v-else>
-            <component :is="gameMode.icon" aria-hidden="true" class="h-4 w-4 shrink-0" />
-            {{ formatMessage(gameMode.message) }}
-          </template>
-        </template>
-      </div>
-      <div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
-        <template v-if="world.type === 'singleplayer' || serverStatus">
-          <ButtonStyled
-            v-if="(playingWorld || (locked && playingInstance)) && !startingInstance"
-            color="red"
-          >
-            <button @click="emit('stop')">
-              <StopCircleIcon aria-hidden="true" />
-              {{ formatMessage(commonMessages.stopButton) }}
-            </button>
-          </ButtonStyled>
-          <ButtonStyled v-else>
-            <button
-              v-tooltip="
-                serverIncompatible
-                  ? 'Server is incompatible'
-                  : !supportsQuickPlay
-                    ? formatMessage(messages.noQuickPlay)
-                    : playingOtherWorld || locked
-                      ? formatMessage(messages.gameAlreadyOpen)
-                      : null
-              "
-              :disabled="!supportsQuickPlay || playingOtherWorld || startingInstance"
-              @click="emit('play')"
-            >
-              <SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
-              <PlayIcon v-else aria-hidden="true" />
-              {{ formatMessage(commonMessages.playButton) }}
-            </button>
-          </ButtonStyled>
-        </template>
-        <ButtonStyled v-else>
-          <button class="invisible">
-            <PlayIcon aria-hidden="true" />
-            {{ formatMessage(commonMessages.playButton) }}
-          </button>
-        </ButtonStyled>
-        <ButtonStyled circular type="transparent">
-          <OverflowMenu
-            :options="[
-              {
-                id: 'play-instance',
-                shown: !!instancePath,
-                disabled: playingInstance,
-                action: () => emit('play-instance'),
-              },
-              {
-                id: 'play-anyway',
-                shown: serverIncompatible && !playingInstance && supportsQuickPlay,
-                action: () => emit('play'),
-              },
-              {
-                id: 'open-instance',
-                shown: !!instancePath,
-                action: () => router.push(encodeURI(`/instance/${instancePath}`)),
-              },
-              {
-                id: 'refresh',
-                shown: world.type === 'server',
-                action: () => emit('refresh'),
-              },
-              {
-                id: 'copy-address',
-                shown: world.type === 'server',
-                action: () => copyToClipboard((world as ServerWorld).address),
-              },
-              {
-                id: 'edit',
-                action: () => emit('edit'),
-                shown: !instancePath,
-                disabled: locked,
-                tooltip: locked ? formatMessage(messages.worldInUse) : undefined,
-              },
-              {
-                id: 'open-folder',
-                shown: world.type === 'singleplayer',
-                action: () =>
-                  world.type === 'singleplayer' ? showWorldInFolder(instancePath, world.path) : {},
-              },
-              {
-                divider: true,
-                shown: !!instancePath,
-              },
-              {
-                id: 'dont-show-on-home',
-                shown: !!instancePath,
-                action: () => {
-                  set_world_display_status(
-                    instancePath,
-                    world.type,
-                    getWorldIdentifier(world),
-                    'hidden',
-                  ).then(() => {
-                    emit('update')
-                  })
-                },
-              },
-              {
-                divider: true,
-                shown: !instancePath,
-              },
-              {
-                id: 'delete',
-                color: 'red',
-                hoverFilled: true,
-                action: () => emit('delete'),
-                shown: !instancePath,
-                disabled: locked,
-                tooltip: locked ? formatMessage(messages.worldInUse) : undefined,
-              },
-            ]"
-          >
-            <MoreVerticalIcon aria-hidden="true" />
-            <template #play-instance>
-              <PlayIcon aria-hidden="true" />
-              {{ formatMessage(messages.playInstance) }}
-            </template>
-            <template #play-anyway>
-              <PlayIcon aria-hidden="true" />
-              {{ formatMessage(messages.playAnyway) }}
-            </template>
-            <template #open-instance>
-              <EyeIcon aria-hidden="true" />
-              {{ formatMessage(messages.viewInstance) }}
-            </template>
-            <template #edit>
-              <EditIcon aria-hidden="true" /> {{ formatMessage(commonMessages.editButton) }}
-            </template>
-            <template #open-folder>
-              <FolderOpenIcon aria-hidden="true" />
-              {{ formatMessage(commonMessages.openFolderButton) }}
-            </template>
-            <template #copy-address>
-              <ClipboardCopyIcon aria-hidden="true" /> {{ formatMessage(messages.copyAddress) }}
-            </template>
-            <template #refresh>
-              <UpdatedIcon aria-hidden="true" /> {{ formatMessage(commonMessages.refreshButton) }}
-            </template>
-            <template #dont-show-on-home>
-              <XIcon aria-hidden="true" />
-              {{ formatMessage(messages.dontShowOnHome) }}
-            </template>
-            <template #delete>
-              <TrashIcon aria-hidden="true" />
-              {{
-                formatMessage(
-                  world.type === 'server'
-                    ? commonMessages.removeButton
-                    : commonMessages.deleteLabel,
-                )
-              }}
-            </template>
-          </OverflowMenu>
-        </ButtonStyled>
-      </div>
-    </div>
-  </SmartClickable>
-</template>
-<style scoped lang="scss">
-.world-item-highlighted {
-  position: relative;
-  animation: fade-highlight 4s ease-out;
-  filter: brightness(1);
-
-  &::before {
-    @apply rounded-xl inset-0 absolute;
-
-    animation: fade-opacity 4s ease-out;
-
-    content: '';
-    box-shadow: 0 0 8px 2px var(--color-brand);
-    border: 1.5px solid var(--color-brand);
-    opacity: 0;
-  }
-}
-
-@keyframes fade-highlight {
-  0% {
-    filter: brightness(1.25);
-  }
-  75% {
-    filter: brightness(1.25);
-  }
-  100% {
-    filter: brightness(1);
-  }
-}
-
-@keyframes fade-opacity {
-  0% {
-    opacity: 0.5;
-  }
-  75% {
-    opacity: 0.5;
-  }
-  100% {
-    opacity: 0;
-  }
-}
-
-.light-mode .motd-renderer {
-  filter: brightness(0.75);
-}
-</style>

apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue

@@ -1,115 +0,0 @@
-<script setup lang="ts">
-import { PlayIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, commonMessages } from '@modrinth/ui'
-import { ref } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import type { GameInstance } from '@/helpers/types'
-import InstanceModalTitlePrefix from '@/components/ui/modal/InstanceModalTitlePrefix.vue'
-import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { handleError } from '@/store/notifications'
-import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
-
-const { formatMessage } = useVIntl()
-
-const emit = defineEmits<{
-  submit: [server: ServerWorld, play: boolean]
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-}>()
-
-const modal = ref()
-
-const name = ref()
-const address = ref()
-const resourcePack = ref<ServerPackStatus>('enabled')
-
-async function addServer(play: boolean) {
-  const serverName = name.value ? name.value : address.value
-  const resourcePackStatus = resourcePack.value
-  const index =
-    (await add_server_to_profile(
-      props.instance.path,
-      serverName,
-      address.value,
-      resourcePackStatus,
-    ).catch(handleError)) ?? 0
-  emit(
-    'submit',
-    {
-      name: serverName,
-      type: 'server',
-      index,
-      address: address.value,
-      pack_status: resourcePackStatus,
-    },
-    play,
-  )
-  hide()
-}
-
-function show() {
-  name.value = ''
-  address.value = ''
-  resourcePack.value = 'enabled'
-  modal.value.show()
-}
-
-function hide() {
-  modal.value.hide()
-}
-
-const messages = defineMessages({
-  title: {
-    id: 'instance.add-server.title',
-    defaultMessage: 'Add a server',
-  },
-  addServer: {
-    id: 'instance.add-server.add-server',
-    defaultMessage: 'Add server',
-  },
-  addAndPlay: {
-    id: 'instance.add-server.add-and-play',
-    defaultMessage: 'Add and play',
-  },
-})
-
-defineExpose({ show, hide })
-</script>
-<template>
-  <ModalWrapper ref="modal">
-    <template #title>
-      <span class="flex items-center gap-2 text-lg font-semibold text-primary">
-        <InstanceModalTitlePrefix :instance="instance" />
-        <span class="font-extrabold text-contrast">{{ formatMessage(messages.title) }}</span>
-      </span>
-    </template>
-    <ServerModalBody
-      v-model:name="name"
-      v-model:address="address"
-      v-model:resource-pack="resourcePack"
-    />
-    <div class="flex gap-2 mt-4">
-      <ButtonStyled color="brand">
-        <button :disabled="!address" @click="addServer(true)">
-          <PlayIcon />
-          {{ formatMessage(messages.addAndPlay) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button :disabled="!address" @click="addServer(false)">
-          <PlusIcon />
-          {{ formatMessage(messages.addServer) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button @click="hide()">
-          <XIcon />
-          {{ formatMessage(commonMessages.cancelButton) }}
-        </button>
-      </ButtonStyled>
-    </div>
-  </ModalWrapper>
-</template>

apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue

@@ -1,118 +0,0 @@
-<script setup lang="ts">
-import { SaveIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, commonMessages } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import type { GameInstance } from '@/helpers/types'
-import {
-  type ServerPackStatus,
-  edit_server_in_profile,
-  type ServerWorld,
-  set_world_display_status,
-  type DisplayStatus,
-} from '@/helpers/worlds.ts'
-import { defineMessage, useVIntl } from '@vintl/vintl'
-import { handleError } from '@/store/notifications'
-import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
-import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
-
-const { formatMessage } = useVIntl()
-
-const emit = defineEmits<{
-  submit: [server: ServerWorld]
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-}>()
-
-const modal = ref()
-
-const name = ref<string>('')
-const address = ref<string>('')
-const resourcePack = ref<ServerPackStatus>('enabled')
-const index = ref<number>(0)
-const displayStatus = ref<DisplayStatus>('normal')
-const hideFromHome = ref(false)
-
-const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
-
-async function saveServer() {
-  const serverName = name.value ? name.value : address.value
-  const resourcePackStatus = resourcePack.value
-  await edit_server_in_profile(
-    props.instance.path,
-    index.value,
-    serverName,
-    address.value,
-    resourcePackStatus,
-  ).catch(handleError)
-
-  if (newDisplayStatus.value !== displayStatus.value) {
-    await set_world_display_status(
-      props.instance.path,
-      'server',
-      address.value,
-      newDisplayStatus.value,
-    )
-  }
-
-  emit('submit', {
-    name: serverName,
-    type: 'server',
-    index: index.value,
-    address: address.value,
-    pack_status: resourcePackStatus,
-    display_status: newDisplayStatus.value,
-  })
-  hide()
-}
-
-function show(server: ServerWorld) {
-  name.value = server.name
-  address.value = server.address
-  resourcePack.value = server.pack_status
-  index.value = server.index
-  displayStatus.value = server.display_status
-  hideFromHome.value = server.display_status === 'hidden'
-  modal.value.show()
-}
-
-function hide() {
-  modal.value.hide()
-}
-
-defineExpose({ show })
-
-const titleMessage = defineMessage({
-  id: 'instance.edit-server.title',
-  defaultMessage: 'Edit server',
-})
-</script>
-<template>
-  <ModalWrapper ref="modal">
-    <template #title>
-      <span class="font-extrabold text-lg text-contrast">{{ formatMessage(titleMessage) }}</span>
-    </template>
-    <ServerModalBody
-      v-model:name="name"
-      v-model:address="address"
-      v-model:resource-pack="resourcePack"
-    />
-    <HideFromHomeOption v-model="hideFromHome" class="mt-3" />
-    <div class="flex gap-2 mt-4">
-      <ButtonStyled color="brand">
-        <button :disabled="!address" @click="saveServer">
-          <SaveIcon />
-          {{ formatMessage(commonMessages.saveChangesButton) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button @click="hide()">
-          <XIcon />
-          {{ formatMessage(commonMessages.cancelButton) }}
-        </button>
-      </ButtonStyled>
-    </div>
-  </ModalWrapper>
-</template>

apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue

@@ -1,128 +0,0 @@
-<script setup lang="ts">
-import { ChevronRightIcon, SaveIcon, XIcon, UndoIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, commonMessages } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import type { GameInstance } from '@/helpers/types'
-import type { DisplayStatus, SingleplayerWorld } from '@/helpers/worlds.ts'
-import { set_world_display_status, rename_world, reset_world_icon } from '@/helpers/worlds.ts'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { handleError } from '@/store/notifications'
-import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
-
-const { formatMessage } = useVIntl()
-
-const emit = defineEmits<{
-  submit: [path: string, name: string, removeIcon: boolean, displayStatus: DisplayStatus]
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-}>()
-
-const modal = ref()
-
-const icon = ref()
-const name = ref()
-const path = ref()
-const removeIcon = ref(false)
-const displayStatus = ref<DisplayStatus>('normal')
-const hideFromHome = ref(false)
-
-const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
-
-async function saveWorld() {
-  await rename_world(props.instance.path, path.value, name.value).catch(handleError)
-
-  if (removeIcon.value) {
-    await reset_world_icon(props.instance.path, path.value).catch(handleError)
-  }
-  if (newDisplayStatus.value !== displayStatus.value) {
-    await set_world_display_status(
-      props.instance.path,
-      'singleplayer',
-      path.value,
-      newDisplayStatus.value,
-    )
-  }
-
-  emit('submit', path.value, name.value, removeIcon.value, newDisplayStatus.value)
-  hide()
-}
-
-function show(world: SingleplayerWorld) {
-  name.value = world.name
-  path.value = world.path
-  icon.value = world.icon
-  displayStatus.value = world.display_status
-  hideFromHome.value = world.display_status === 'hidden'
-  modal.value.show()
-}
-
-function hide() {
-  modal.value.hide()
-}
-
-defineExpose({ show })
-
-const messages = defineMessages({
-  title: {
-    id: 'instance.edit-world.title',
-    defaultMessage: 'Edit world',
-  },
-  name: {
-    id: 'instance.edit-world.name',
-    defaultMessage: 'Name',
-  },
-  placeholderName: {
-    id: 'instance.edit-world.placeholder-name',
-    defaultMessage: 'Minecraft World',
-  },
-  resetIcon: {
-    id: 'instance.edit-world.reset-icon',
-    defaultMessage: 'Reset icon',
-  },
-})
-</script>
-<template>
-  <ModalWrapper ref="modal">
-    <template #title>
-      <Avatar :src="removeIcon || !icon ? undefined : icon" size="24px" />
-      {{ instance.name }} <ChevronRightIcon />
-      <span class="font-extrabold text-lg text-contrast">{{ formatMessage(messages.title) }}</span>
-    </template>
-    <div class="w-[450px]">
-      <h2 class="text-lg font-extrabold text-contrast mt-0 mb-1">
-        {{ formatMessage(messages.name) }}
-      </h2>
-      <input
-        v-model="name"
-        type="text"
-        :placeholder="formatMessage(messages.placeholderName)"
-        class="w-full"
-        autocomplete="off"
-      />
-      <HideFromHomeOption v-model="hideFromHome" class="mt-3" />
-    </div>
-    <div class="flex gap-2 mt-4">
-      <ButtonStyled color="brand">
-        <button @click="saveWorld">
-          <SaveIcon />
-          {{ formatMessage(commonMessages.saveChangesButton) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button :disabled="removeIcon || !icon" @click="removeIcon = true">
-          <UndoIcon />
-          {{ formatMessage(messages.resetIcon) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button @click="hide()">
-          <XIcon />
-          {{ formatMessage(commonMessages.cancelButton) }}
-        </button>
-      </ButtonStyled>
-    </div>
-  </ModalWrapper>
-</template>

apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue

@@ -1,18 +0,0 @@
-<script setup lang="ts">
-import { defineMessage, useVIntl } from '@vintl/vintl'
-import { computed } from 'vue'
-import { Checkbox } from '@modrinth/ui'
-
-const { formatMessage } = useVIntl()
-const value = defineModel<boolean>({ required: true })
-
-const labelMessage = defineMessage({
-  id: 'instance.edit-world.hide-from-home',
-  defaultMessage: `Hide from the Home page`,
-})
-
-const label = computed(() => formatMessage(labelMessage))
-</script>
-<template>
-  <Checkbox v-model="value" :label="label" />
-</template>

apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue

@@ -1,86 +0,0 @@
-<script setup lang="ts">
-import { TeleportDropdownMenu } from '@modrinth/ui'
-import type { ServerPackStatus } from '@/helpers/worlds.ts'
-import { type MessageDescriptor, defineMessages, useVIntl } from '@vintl/vintl'
-
-const { formatMessage } = useVIntl()
-
-const name = defineModel<string>('name')
-const address = defineModel<string>('address')
-const resourcePack = defineModel<ServerPackStatus>('resourcePack')
-
-const resourcePackOptions: ServerPackStatus[] = ['enabled', 'prompt', 'disabled']
-
-const resourcePackOptionMessages: Record<ServerPackStatus, MessageDescriptor> = defineMessages({
-  enabled: {
-    id: 'instance.add-server.resource-pack.enabled',
-    defaultMessage: 'Enabled',
-  },
-  prompt: {
-    id: 'instance.add-server.resource-pack.prompt',
-    defaultMessage: 'Prompt',
-  },
-  disabled: {
-    id: 'instance.add-server.resource-pack.disabled',
-    defaultMessage: 'Disabled',
-  },
-})
-
-const messages = defineMessages({
-  name: {
-    id: 'instance.server-modal.name',
-    defaultMessage: 'Name',
-  },
-  address: {
-    id: 'instance.server-modal.address',
-    defaultMessage: 'Address',
-  },
-  resourcePack: {
-    id: 'instance.server-modal.resource-pack',
-    defaultMessage: 'Resource pack',
-  },
-  placeholderName: {
-    id: 'instance.server-modal.placeholder-name',
-    defaultMessage: 'Minecraft Server',
-  },
-})
-
-defineExpose({ resourcePackOptions })
-</script>
-<template>
-  <div class="w-[450px]">
-    <h2 class="text-lg font-extrabold text-contrast mt-0 mb-1">
-      {{ formatMessage(messages.name) }}
-    </h2>
-    <input
-      v-model="name"
-      type="text"
-      :placeholder="formatMessage(messages.placeholderName)"
-      class="w-full"
-      autocomplete="off"
-    />
-    <h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
-      {{ formatMessage(messages.address) }}
-    </h2>
-    <input
-      v-model="address"
-      type="text"
-      placeholder="example.modrinth.gg"
-      class="w-full"
-      autocomplete="off"
-    />
-    <h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
-      {{ formatMessage(messages.resourcePack) }}
-    </h2>
-    <div>
-      <TeleportDropdownMenu
-        v-model="resourcePack"
-        :options="resourcePackOptions"
-        name="Server resource pack"
-        :display-name="
-          (option: ServerPackStatus) => formatMessage(resourcePackOptionMessages[option])
-        "
-      />
-    </div>
-  </div>
-</template>

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

@@ -1,9 +1,8 @@
 import { posthog } from 'posthog-js'
 
 export const initAnalytics = () => {
-  posthog.init('phc_9Iqi6lFs9sr5BSqh9RRNRSJ0mATS9PSgirDiX3iOYJ', {
+  posthog.init('phc_hm2ihMpTAoE86xIm7XzsCB8RPiTRKivViK5biiHedm', {
     persistence: 'localStorage',
-    api_host: 'https://posthog.modrinth.com',
   })
 }
 

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

@@ -62,7 +62,7 @@ export async function process_listener(callback) {
     ProfilePayload {
         uuid: unique identification of the process in the state (currently identified by path, but that will change)
         name: name of the profile
-        profile_path: relative path toprofile_listener profile (used for path identification)
+        profile_path: relative path to profile (used for path identification)
         path: path to profile (used for opening the profile in the OS file explorer)
         event: event type ("Created", "Added", "Edited", "Removed")
     }

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

@@ -7,13 +7,7 @@ import { invoke } from '@tauri-apps/api/core'
 import { create } from './profile'
 
 // Installs pack from a version ID
-export async function create_profile_and_install(
-  projectId,
-  versionId,
-  packTitle,
-  iconUrl,
-  createInstanceCallback = () => {},
-) {
+export async function create_profile_and_install(projectId, versionId, packTitle, iconUrl) {
   const location = {
     type: 'fromVersionId',
     project_id: projectId,
@@ -30,7 +24,6 @@ export async function create_profile_and_install(
     null,
     true,
   )
-  createInstanceCallback(profile)
 
   return await invoke('plugin:pack|pack_install', { location, profile })
 }

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

@@ -0,0 +1,43 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ *  and deserialized into a usable JS object.
+ */
+import { invoke } from '@tauri-apps/api/core'
+
+// Settings object
+/*
+
+Settings {
+    "memory": MemorySettings,
+    "game_resolution": [int int],
+    "custom_java_args": [String ...],
+    "custom_env_args" : [(string, string) ... ]>,
+    "java_globals": Hash of (string, Path),
+    "default_user": Uuid string (can be null),
+    "hooks": Hooks,
+    "max_concurrent_downloads": uint,
+    "version": u32,
+    "collapsed_navigation": bool,
+}
+
+Memorysettings {
+    "min": u32, can be null,
+    "max": u32,
+}
+
+*/
+
+// Get full settings object
+export async function get() {
+  return await invoke('plugin:settings|settings_get')
+}
+
+// Set full settings object
+export async function set(settings) {
+  return await invoke('plugin:settings|settings_set', { settings })
+}
+
+export async function cancel_directory_change() {
+  return await invoke('plugin:settings|cancel_directory_change')
+}

apps/app-frontend/src/helpers/settings.ts

@@ -1,78 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-import type { ColorTheme, FeatureFlag } from '@/store/theme.ts'
-import type { Hooks, MemorySettings, WindowSize } from '@/helpers/types'
-
-// Settings object
-/*
-
-Settings {
-    "memory": MemorySettings,
-    "game_resolution": [int int],
-    "custom_java_args": [String ...],
-    "custom_env_args" : [(string, string) ... ]>,
-    "java_globals": Hash of (string, Path),
-    "default_user": Uuid string (can be null),
-    "hooks": Hooks,
-    "max_concurrent_downloads": uint,
-    "version": u32,
-    "collapsed_navigation": bool,
-}
-
-Memorysettings {
-    "min": u32, can be null,
-    "max": u32,
-}
-
-*/
-
-export type AppSettings = {
-  max_concurrent_downloads: number
-  max_concurrent_writes: number
-
-  theme: ColorTheme
-  default_page: 'home' | 'library'
-  collapsed_navigation: boolean
-  advanced_rendering: boolean
-  native_decorations: boolean
-  toggle_sidebar: boolean
-
-  telemetry: boolean
-  discord_rpc: boolean
-  personalized_ads: boolean
-
-  onboarded: boolean
-
-  extra_launch_args: string[]
-  custom_env_vars: [string, string][]
-  memory: MemorySettings
-  force_fullscreen: boolean
-  game_resolution: WindowSize
-  hide_on_process_start: boolean
-  hooks: Hooks
-
-  custom_dir?: string | null
-  prev_custom_dir?: string | null
-  migrated: boolean
-
-  developer_mode: boolean
-  feature_flags: Record<FeatureFlag, boolean>
-}
-
-// Get full settings object
-export async function get() {
-  return (await invoke('plugin:settings|settings_get')) as AppSettings
-}
-
-// Set full settings object
-export async function set(settings: AppSettings) {
-  return await invoke('plugin:settings|settings_set', { settings })
-}
-
-export async function cancel_directory_change(): Promise<void> {
-  return await invoke('plugin:settings|cancel_directory_change')
-}

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

@@ -48,32 +48,6 @@ type LinkedData = {
 
 type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
 
-type ContentFile = {
-  hash: string
-  file_name: string
-  size: number
-  metadata?: FileMetadata
-  update_version_id?: string
-  project_type: ContentFileProjectType
-}
-
-type FileMetadata = {
-  project_id: string
-  version_id: string
-}
-
-type ContentFileProjectType = 'mod' | 'datapack' | 'resourcepack' | 'shaderpack'
-
-type CacheBehaviour =
-  // Serve expired data. If fetch fails / launcher is offline, errors are ignored
-  | 'stale_while_revalidate_skip_offline'
-  // Serve expired data, revalidate in background
-  | 'stale_while_revalidate'
-  // Must revalidate if data is expired
-  | 'must_revalidate'
-  // Ignore cache- always fetch updated data from origin
-  | 'bypass'
-
 type MemorySettings = {
   maximum: number
 }
@@ -114,7 +88,6 @@ type AppSettings = {
   collapsed_navigation: boolean
   advanced_rendering: boolean
   native_decorations: boolean
-  worlds_in_home: boolean
 
   telemetry: boolean
   discord_rpc: boolean

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

@@ -37,13 +37,6 @@ export async function restartApp() {
   return await invoke('restart_app')
 }
 
-/**
- * @deprecated This method is no longer needed, and just returns its parameter
- */
-export function sanitizePotentialFileUrl(url) {
-  return url
-}
-
 export const releaseColor = (releaseType) => {
   switch (releaseType) {
     case 'release':
@@ -56,7 +49,3 @@ export const releaseColor = (releaseType) => {
       return ''
   }
 }
-
-export async function copyToClipboard(text) {
-  await navigator.clipboard.writeText(text)
-}

apps/app-frontend/src/helpers/worlds.ts

@@ -1,327 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-import { get_full_path } from '@/helpers/profile'
-import { openPath } from '@/helpers/utils'
-import { autoToHTML } from '@geometrically/minecraft-motd-parser'
-import dayjs from 'dayjs'
-import type { GameVersion } from '@modrinth/ui'
-
-type BaseWorld = {
-  name: string
-  last_played?: string
-  icon?: string
-  display_status: DisplayStatus
-  type: WorldType
-}
-
-export type WorldType = 'singleplayer' | 'server'
-export type DisplayStatus = 'normal' | 'hidden' | 'favorite'
-
-export type SingleplayerWorld = BaseWorld & {
-  type: 'singleplayer'
-  path: string
-  game_mode: SingleplayerGameMode
-  hardcore: boolean
-  locked: boolean
-}
-
-export type ServerWorld = BaseWorld & {
-  type: 'server'
-  index: number
-  address: string
-  pack_status: ServerPackStatus
-}
-
-export type World = SingleplayerWorld | ServerWorld
-
-export type WorldWithProfile = {
-  profile: string
-} & World
-
-export type SingleplayerGameMode = 'survival' | 'creative' | 'adventure' | 'spectator'
-export type ServerPackStatus = 'enabled' | 'disabled' | 'prompt'
-
-export type ServerStatus = {
-  // https://minecraft.wiki/w/Text_component_format
-  description?: string | Chat
-  players?: {
-    max: number
-    online: number
-    sample: { name: string; id: string }[]
-  }
-  version?: {
-    name: string
-    protocol: number
-  }
-  favicon?: string
-  enforces_secure_chat: boolean
-  ping?: number
-}
-
-export interface Chat {
-  text: string
-  bold: boolean
-  italic: boolean
-  underlined: boolean
-  strikethrough: boolean
-  obfuscated: boolean
-  color?: string
-  extra: Chat[]
-}
-
-export type ServerData = {
-  refreshing: boolean
-  status?: ServerStatus
-  rawMotd?: string | Chat
-  renderedMotd?: string
-}
-
-export async function get_recent_worlds(
-  limit: number,
-  displayStatuses?: DisplayStatus[],
-): Promise<WorldWithProfile[]> {
-  return await invoke('plugin:worlds|get_recent_worlds', { limit, displayStatuses })
-}
-
-export async function get_profile_worlds(path: string): Promise<World[]> {
-  return await invoke('plugin:worlds|get_profile_worlds', { path })
-}
-
-export async function get_singleplayer_world(
-  instance: string,
-  world: string,
-): Promise<SingleplayerWorld> {
-  return await invoke('plugin:worlds|get_singleplayer_world', { instance, world })
-}
-
-export async function set_world_display_status(
-  instance: string,
-  worldType: WorldType,
-  worldId: string,
-  displayStatus: DisplayStatus,
-): Promise<void> {
-  return await invoke('plugin:worlds|set_world_display_status', {
-    instance,
-    worldType,
-    worldId,
-    displayStatus,
-  })
-}
-
-export async function rename_world(
-  instance: string,
-  world: string,
-  newName: string,
-): Promise<void> {
-  return await invoke('plugin:worlds|rename_world', { instance, world, newName })
-}
-
-export async function reset_world_icon(instance: string, world: string): Promise<void> {
-  return await invoke('plugin:worlds|reset_world_icon', { instance, world })
-}
-
-export async function backup_world(instance: string, world: string): Promise<number> {
-  return await invoke('plugin:worlds|backup_world', { instance, world })
-}
-
-export async function delete_world(instance: string, world: string): Promise<void> {
-  return await invoke('plugin:worlds|delete_world', { instance, world })
-}
-
-export async function add_server_to_profile(
-  path: string,
-  name: string,
-  address: string,
-  packStatus: ServerPackStatus,
-): Promise<number> {
-  return await invoke('plugin:worlds|add_server_to_profile', { path, name, address, packStatus })
-}
-
-export async function edit_server_in_profile(
-  path: string,
-  index: number,
-  name: string,
-  address: string,
-  packStatus: ServerPackStatus,
-): Promise<void> {
-  return await invoke('plugin:worlds|edit_server_in_profile', {
-    path,
-    index,
-    name,
-    address,
-    packStatus,
-  })
-}
-
-export async function remove_server_from_profile(path: string, index: number): Promise<void> {
-  return await invoke('plugin:worlds|remove_server_from_profile', { path, index })
-}
-
-export async function get_profile_protocol_version(path: string): Promise<number | null> {
-  return await invoke('plugin:worlds|get_profile_protocol_version', { path })
-}
-
-export async function get_server_status(
-  address: string,
-  protocolVersion: number | null = null,
-): Promise<ServerStatus> {
-  return await invoke('plugin:worlds|get_server_status', { address, protocolVersion })
-}
-
-export async function start_join_singleplayer_world(path: string, world: string): Promise<unknown> {
-  return await invoke('plugin:worlds|start_join_singleplayer_world', { path, world })
-}
-
-export async function start_join_server(path: string, address: string): Promise<unknown> {
-  return await invoke('plugin:worlds|start_join_server', { path, address })
-}
-
-export async function showWorldInFolder(instancePath: string, worldPath: string) {
-  const fullPath = await get_full_path(instancePath)
-  return await openPath(fullPath + '/saves/' + worldPath)
-}
-
-export function getWorldIdentifier(world: World) {
-  return world.type === 'singleplayer' ? world.path : world.address
-}
-
-export function sortWorlds(worlds: World[]) {
-  worlds.sort((a, b) => {
-    if (!a.last_played) {
-      return 1
-    }
-    if (!b.last_played) {
-      return -1
-    }
-    return dayjs(b.last_played).diff(dayjs(a.last_played))
-  })
-}
-
-export function isSingleplayerWorld(world: World): world is SingleplayerWorld {
-  return world.type === 'singleplayer'
-}
-
-export function isServerWorld(world: World): world is ServerWorld {
-  return world.type === 'server'
-}
-
-export async function refreshServerData(
-  serverData: ServerData,
-  protocolVersion: number | null,
-  address: string,
-): Promise<void> {
-  serverData.refreshing = true
-  await get_server_status(address, protocolVersion)
-    .then((status) => {
-      serverData.status = status
-      if (status.description) {
-        serverData.rawMotd = status.description
-        serverData.renderedMotd = autoToHTML(status.description)
-      }
-    })
-    .catch((err) => {
-      console.error(`Refreshing addr: ${address}`, err)
-    })
-    .finally(() => {
-      serverData.refreshing = false
-    })
-}
-
-export async function refreshServers(
-  worlds: World[],
-  serverData: Record<string, ServerData>,
-  protocolVersion: number | null,
-) {
-  const servers = worlds.filter(isServerWorld)
-  servers.forEach((server) => {
-    if (!serverData[server.address]) {
-      serverData[server.address] = {
-        refreshing: true,
-      }
-    } else {
-      serverData[server.address].refreshing = true
-    }
-  })
-
-  // noinspection ES6MissingAwait - handled with .then by refreshServerData already
-  Promise.all(
-    Object.keys(serverData).map((address) =>
-      refreshServerData(serverData[address], protocolVersion, address),
-    ),
-  )
-}
-
-export async function refreshWorld(worlds: World[], instancePath: string, worldPath: string) {
-  const index = worlds.findIndex((w) => w.type === 'singleplayer' && w.path === worldPath)
-  const newWorld = await get_singleplayer_world(instancePath, worldPath)
-  if (index !== -1) {
-    worlds[index] = newWorld
-  } else {
-    console.info(`Adding new world at path: ${worldPath}.`)
-    worlds.push(newWorld)
-  }
-  sortWorlds(worlds)
-}
-
-export async function handleDefaultProfileUpdateEvent(
-  worlds: World[],
-  instancePath: string,
-  e: ProfileEvent,
-) {
-  if (e.event === 'world_updated') {
-    await refreshWorld(worlds, instancePath, e.world)
-  }
-
-  if (e.event === 'server_joined') {
-    const world = worlds.find(
-      (w) =>
-        w.type === 'server' &&
-        (w.address === `${e.host}:${e.port}` || (e.port == 25565 && w.address == e.host)),
-    )
-    if (world) {
-      world.last_played = e.timestamp
-      sortWorlds(worlds)
-    } else {
-      console.error(`Could not find world for server join event: ${e.host}:${e.port}`)
-    }
-  }
-}
-
-export async function refreshWorlds(instancePath: string): Promise<World[]> {
-  const worlds = await get_profile_worlds(instancePath).catch((err) => {
-    console.error(`Error refreshing worlds for instance: ${instancePath}`, err)
-  })
-  if (worlds) {
-    sortWorlds(worlds)
-  }
-
-  return worlds ?? []
-}
-
-const FIRST_QUICK_PLAY_VERSION = '23w14a'
-
-export function hasQuickPlaySupport(gameVersions: GameVersion[], currentVersion: string) {
-  if (!gameVersions.length) {
-    return false
-  }
-
-  const versionIndex = gameVersions.findIndex((v) => v.version === currentVersion)
-  const targetIndex = gameVersions.findIndex((v) => v.version === FIRST_QUICK_PLAY_VERSION)
-
-  return versionIndex !== -1 && targetIndex !== -1 && versionIndex <= targetIndex
-}
-
-export type ProfileEvent = { profile_path_id: string } & (
-  | {
-      event: 'servers_updated'
-    }
-  | {
-      event: 'world_updated'
-      world: string
-    }
-  | {
-      event: 'server_joined'
-      host: string
-      port: number
-      timestamp: string
-    }
-)

apps/app-frontend/src/locales/en-US/index.json

@@ -20,57 +20,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Resource management"
   },
-  "instance.add-server.add-and-play": {
-    "message": "Add and play"
-  },
-  "instance.add-server.add-server": {
-    "message": "Add server"
-  },
-  "instance.add-server.resource-pack.disabled": {
-    "message": "Disabled"
-  },
-  "instance.add-server.resource-pack.enabled": {
-    "message": "Enabled"
-  },
-  "instance.add-server.resource-pack.prompt": {
-    "message": "Prompt"
-  },
-  "instance.add-server.title": {
-    "message": "Add a server"
-  },
-  "instance.edit-server.title": {
-    "message": "Edit server"
-  },
-  "instance.edit-world.name": {
-    "message": "Name"
-  },
-  "instance.edit-world.placeholder-name": {
-    "message": "Minecraft World"
-  },
-  "instance.edit-world.reset-icon": {
-    "message": "Reset icon"
-  },
-  "instance.edit-world.title": {
-    "message": "Edit world"
-  },
-  "instance.filter.disabled": {
-    "message": "Disabled projects"
-  },
   "instance.filter.updates-available": {
     "message": "Updates available"
   },
-  "instance.server-modal.address": {
-    "message": "Address"
-  },
-  "instance.server-modal.name": {
-    "message": "Name"
-  },
-  "instance.server-modal.placeholder-name": {
-    "message": "Minecraft Server"
-  },
-  "instance.server-modal.resource-pack": {
-    "message": "Resource pack"
-  },
   "instance.settings.tabs.general": {
     "message": "General"
   },
@@ -353,42 +305,6 @@
   "instance.settings.title": {
     "message": "Settings"
   },
-  "instance.worlds.a_minecraft_server": {
-    "message": "A Minecraft Server"
-  },
-  "instance.worlds.cant_connect": {
-    "message": "Can't connect to server"
-  },
-  "instance.worlds.copy_address": {
-    "message": "Copy address"
-  },
-  "instance.worlds.filter.available": {
-    "message": "Available"
-  },
-  "instance.worlds.game_already_open": {
-    "message": "Instance is already open"
-  },
-  "instance.worlds.hardcore": {
-    "message": "Hardcore mode"
-  },
-  "instance.worlds.no_quick_play": {
-    "message": "You can only jump straight into worlds on Minecraft 1.20+"
-  },
-  "instance.worlds.play_anyway": {
-    "message": "Play anyway"
-  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Singleplayer"
-  },
-  "instance.worlds.view_instance": {
-    "message": "View instance"
-  },
-  "instance.worlds.world_in_use": {
-    "message": "World is in use"
-  },
   "search.filter.locked.instance": {
     "message": "Provided by the instance"
   },

apps/app-frontend/src/main.js

@@ -6,7 +6,6 @@ import FloatingVue from 'floating-vue'
 import 'floating-vue/dist/style.css'
 import { createPlugin } from '@vintl/vintl/plugin'
 import * as Sentry from '@sentry/vue'
-import { VueScanPlugin } from '@taijased/vue-render-tracker'
 
 const VIntlPlugin = createPlugin({
   controllerOpts: {
@@ -25,13 +24,6 @@ const VIntlPlugin = createPlugin({
   injectInto: [],
 })
 
-const vueScan = new VueScanPlugin({
-  enabled: false, // Enable or disable the tracker
-  showOverlay: true, // Show overlay to visualize renders
-  log: false, // Log render events to the console
-  playSound: false, // Play sound on each render
-})
-
 const pinia = createPinia()
 
 let app = createApp(App)
@@ -43,7 +35,6 @@ Sentry.init({
   tracesSampleRate: 0.1,
 })
 
-app.use(vueScan)
 app.use(router)
 app.use(pinia)
 app.use(FloatingVue, {

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

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup>
 import { ref, onUnmounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import RowDisplay from '@/components/RowDisplay.vue'
@@ -8,32 +8,19 @@ import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
 import dayjs from 'dayjs'
 import { get_search_results } from '@/helpers/cache.js'
-import type { SearchResult } from '@modrinth/utils'
-import RecentWorldsList from '@/components/ui/world/RecentWorldsList.vue'
+
+const featuredModpacks = ref({})
+const featuredMods = ref({})
+const filter = ref('')
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
 
 breadcrumbs.setRootContext({ name: 'Home', link: route.path })
 
-const instances = ref<GameInstance[]>([])
+const recentInstances = ref([])
 
-const featuredModpacks = ref<SearchResult[]>([])
-const featuredMods = ref<SearchResult[]>([])
-const installedModpacksFilter = ref('')
-
-const recentInstances = computed(() =>
-  instances.value
-    .filter((x) => x.last_played)
-    .slice()
-    .sort((a, b) => dayjs(b.last_played).diff(dayjs(a.last_played))),
-)
-
-const hasFeaturedProjects = computed(
-  () => (featuredModpacks.value?.length ?? 0) + (featuredMods.value?.length ?? 0) > 0,
-)
-
-const offline = ref<boolean>(!navigator.onLine)
+const offline = ref(!navigator.onLine)
 window.addEventListener('offline', () => {
   offline.value = true
 })
@@ -41,21 +28,34 @@ window.addEventListener('online', () => {
   offline.value = false
 })
 
-async function fetchInstances() {
-  instances.value = await list().catch(handleError)
+const getInstances = async () => {
+  const profiles = await list().catch(handleError)
+
+  recentInstances.value = profiles
+    .filter((x) => x.last_played)
+    .sort((a, b) => {
+      const dateA = dayjs(a.last_played)
+      const dateB = dayjs(b.last_played)
+
+      if (dateA.isSame(dateB)) {
+        return a.name.localeCompare(b.name)
+      }
+
+      return dateB - dateA
+    })
 
   const filters = []
-  for (const instance of instances.value) {
+  for (const instance of profiles) {
     if (instance.linked_data && instance.linked_data.project_id) {
       filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
     }
   }
-  installedModpacksFilter.value = filters.join(' AND ')
+  filter.value = filters.join(' AND ')
 }
 
-async function fetchFeaturedModpacks() {
+const getFeaturedModpacks = async () => {
   const response = await get_search_results(
-    `?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${installedModpacksFilter.value}`,
+    `?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`,
   )
 
   if (response) {
@@ -64,8 +64,7 @@ async function fetchFeaturedModpacks() {
     featuredModpacks.value = []
   }
 }
-
-async function fetchFeaturedMods() {
+const getFeaturedMods = async () => {
   const response = await get_search_results('?facets=[["project_type:mod"]]&limit=10&index=follows')
 
   if (response) {
@@ -75,21 +74,27 @@ async function fetchFeaturedMods() {
   }
 }
 
-async function refreshFeaturedProjects() {
-  await Promise.all([fetchFeaturedModpacks(), fetchFeaturedMods()])
-}
+await getInstances()
 
-await fetchInstances()
-await refreshFeaturedProjects()
+await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
 
 const unlistenProfile = await profile_listener(async (e) => {
-  await fetchInstances()
+  await getInstances()
 
   if (e.event === 'added' || e.event === 'created' || e.event === 'removed') {
-    await refreshFeaturedProjects()
+    await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
   }
 })
 
+// computed sums of recentInstances, featuredModpacks, featuredMods, treating them as arrays if they are not
+const total = computed(() => {
+  return (
+    (recentInstances.value?.length ?? 0) +
+    (featuredModpacks.value?.length ?? 0) +
+    (featuredMods.value?.length ?? 0)
+  )
+})
+
 onUnmounted(() => {
   unlistenProfile()
 })
@@ -99,10 +104,17 @@ onUnmounted(() => {
   <div class="p-6 flex flex-col gap-2">
     <h1 v-if="recentInstances" class="m-0 text-2xl">Welcome back!</h1>
     <h1 v-else class="m-0 text-2xl">Welcome to Modrinth App!</h1>
-    <RecentWorldsList :recent-instances="recentInstances" />
     <RowDisplay
-      v-if="hasFeaturedProjects"
+      v-if="total > 0"
       :instances="[
+        {
+          label: 'Recently played',
+          route: '/library',
+          instances: recentInstances,
+          instance: true,
+          downloaded: true,
+          compact: true,
+        },
         {
           label: 'Discover a modpack',
           route: '/browse/modpack',

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

@@ -1,4 +0,0 @@
-<script setup lang="ts"></script>
-<template>
-  <div class="p-6 flex flex-col gap-2">Worlds</div>
-</template>

apps/app-frontend/src/pages/index.js

@@ -1,5 +1,4 @@
 import Index from './Index.vue'
 import Browse from './Browse.vue'
-import Worlds from './Worlds.vue'
 
-export { Index, Browse, Worlds }
+export { Index, Browse }

apps/app-frontend/src/pages/instance/Index.vue

@@ -1,156 +1,152 @@
 <template>
-  <div>
-    <div
-      class="p-6 pr-2 pb-4"
-      @contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
-    >
-      <ExportModal ref="exportModal" :instance="instance" />
-      <InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
-      <ContentPageHeader>
-        <template #icon>
-          <Avatar :src="icon" :alt="instance.name" size="96px" :tint-by="instance.path" />
-        </template>
-        <template #title>
-          {{ instance.name }}
-        </template>
-        <template #summary> </template>
-        <template #stats>
-          <div
-            class="flex items-center gap-2 font-semibold transform capitalize border-0 border-solid border-divider pr-4 md:border-r"
+  <div
+    class="p-6 pr-2 pb-4"
+    @contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
+  >
+    <ExportModal ref="exportModal" :instance="instance" />
+    <InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
+    <ContentPageHeader>
+      <template #icon>
+        <Avatar :src="icon" :alt="instance.name" size="96px" :tint-by="instance.path" />
+      </template>
+      <template #title>
+        {{ instance.name }}
+      </template>
+      <template #summary> </template>
+      <template #stats>
+        <div
+          class="flex items-center gap-2 font-semibold transform capitalize border-0 border-solid border-divider pr-4 md:border-r"
+        >
+          <GameIcon class="h-6 w-6 text-secondary" />
+          {{ instance.loader }} {{ instance.game_version }}
+        </div>
+        <div class="flex items-center gap-2 font-semibold">
+          <TimerIcon class="h-6 w-6 text-secondary" />
+          <template v-if="timePlayed > 0">
+            {{ timePlayedHumanized }}
+          </template>
+          <template v-else> Never played </template>
+        </div>
+      </template>
+      <template #actions>
+        <div class="flex gap-2">
+          <ButtonStyled
+            v-if="instance.install_stage.includes('installing')"
+            color="brand"
+            size="large"
           >
-            <GameIcon class="h-6 w-6 text-secondary" />
-            {{ instance.loader }} {{ instance.game_version }}
-          </div>
-          <div class="flex items-center gap-2 font-semibold">
-            <TimerIcon class="h-6 w-6 text-secondary" />
-            <template v-if="timePlayed > 0">
-              {{ timePlayedHumanized }}
-            </template>
-            <template v-else> Never played </template>
-          </div>
-        </template>
-        <template #actions>
-          <div class="flex gap-2">
-            <ButtonStyled
-              v-if="instance.install_stage.includes('installing')"
-              color="brand"
-              size="large"
-            >
-              <button disabled>Installing...</button>
-            </ButtonStyled>
-            <ButtonStyled
-              v-else-if="instance.install_stage !== 'installed'"
-              color="brand"
-              size="large"
-            >
-              <button @click="repairInstance()">
-                <DownloadIcon />
-                Repair
-              </button>
-            </ButtonStyled>
-            <ButtonStyled v-else-if="playing === true" color="red" size="large">
-              <button @click="stopInstance('InstancePage')">
-                <StopCircleIcon />
-                Stop
-              </button>
-            </ButtonStyled>
-            <ButtonStyled
-              v-else-if="playing === false && loading === false"
-              color="brand"
-              size="large"
-            >
-              <button @click="startInstance('InstancePage')">
-                <PlayIcon />
-                Play
-              </button>
-            </ButtonStyled>
-            <ButtonStyled
-              v-else-if="loading === true && playing === false"
-              color="brand"
-              size="large"
-            >
-              <button disabled>Loading...</button>
-            </ButtonStyled>
-            <ButtonStyled size="large" circular>
-              <button v-tooltip="'Instance settings'" @click="settingsModal.show()">
-                <SettingsIcon />
-              </button>
-            </ButtonStyled>
-            <ButtonStyled size="large" type="transparent" circular>
-              <OverflowMenu
-                :options="[
-                  {
-                    id: 'open-folder',
-                    action: () => showProfileInFolder(instance.path),
-                  },
-                  {
-                    id: 'export-mrpack',
-                    action: () => $refs.exportModal.show(),
-                  },
-                ]"
-              >
-                <MoreVerticalIcon />
-                <template #share-instance> <UserPlusIcon /> Share instance </template>
-                <template #host-a-server> <ServerIcon /> Create a server </template>
-                <template #open-folder> <FolderOpenIcon /> Open folder </template>
-                <template #export-mrpack> <PackageIcon /> Export modpack </template>
-              </OverflowMenu>
-            </ButtonStyled>
-          </div>
-        </template>
-      </ContentPageHeader>
-    </div>
-    <div class="px-6">
-      <NavTabs :links="tabs" />
-    </div>
-    <div v-if="!!instance" class="p-6 pt-4">
-      <RouterView v-slot="{ Component }" :key="instance.path">
-        <template v-if="Component">
-          <Suspense
-            :key="instance.path"
-            @pending="loadingBar.startLoading()"
-            @resolve="loadingBar.stopLoading()"
+            <button disabled>Installing...</button>
+          </ButtonStyled>
+          <ButtonStyled
+            v-else-if="instance.install_stage !== 'installed'"
+            color="brand"
+            size="large"
           >
-            <component
-              :is="Component"
-              :instance="instance"
-              :options="options"
-              :offline="offline"
-              :playing="playing"
-              :versions="modrinthVersions"
-              :installed="instance.install_stage !== 'installed'"
-              @play="updatePlayState"
-              @stop="() => stopInstance('InstanceSubpage')"
-            ></component>
-            <template #fallback>
-              <LoadingIndicator />
-            </template>
-          </Suspense>
-        </template>
-      </RouterView>
-    </div>
-    <ContextMenu ref="options" @option-clicked="handleOptionsClick">
-      <template #play> <PlayIcon /> Play </template>
-      <template #stop> <StopCircleIcon /> Stop </template>
-      <template #add_content> <PlusIcon /> Add content </template>
-      <template #edit> <EditIcon /> Edit </template>
-      <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
-      <template #open_folder> <ClipboardCopyIcon /> Open folder </template>
-      <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
-      <template #open_link> <ClipboardCopyIcon /> Open in Modrinth <ExternalIcon /> </template>
-      <template #copy_names><EditIcon />Copy names</template>
-      <template #copy_slugs><HashIcon />Copy slugs</template>
-      <template #copy_links><GlobeIcon />Copy links</template>
-      <template #toggle><EditIcon />Toggle selected</template>
-      <template #disable><XIcon />Disable selected</template>
-      <template #enable><CheckCircleIcon />Enable selected</template>
-      <template #hide_show><EyeIcon />Show/Hide unselected</template>
-      <template #update_all
-        ><UpdatedIcon />Update {{ selected.length > 0 ? 'selected' : 'all' }}</template
-      >
-      <template #filter_update><UpdatedIcon />Select Updatable</template>
-    </ContextMenu>
+            <button @click="repairInstance()">
+              <DownloadIcon />
+              Repair
+            </button>
+          </ButtonStyled>
+          <ButtonStyled v-else-if="playing === true" color="red" size="large">
+            <button @click="stopInstance('InstancePage')">
+              <StopCircleIcon />
+              Stop
+            </button>
+          </ButtonStyled>
+          <ButtonStyled
+            v-else-if="playing === false && loading === false"
+            color="brand"
+            size="large"
+          >
+            <button @click="startInstance('InstancePage')">
+              <PlayIcon />
+              Play
+            </button>
+          </ButtonStyled>
+          <ButtonStyled
+            v-else-if="loading === true && playing === false"
+            color="brand"
+            size="large"
+          >
+            <button disabled>Loading...</button>
+          </ButtonStyled>
+          <ButtonStyled size="large" circular>
+            <button v-tooltip="'Instance settings'" @click="settingsModal.show()">
+              <SettingsIcon />
+            </button>
+          </ButtonStyled>
+          <ButtonStyled size="large" type="transparent" circular>
+            <OverflowMenu
+              :options="[
+                {
+                  id: 'open-folder',
+                  action: () => showProfileInFolder(instance.path),
+                },
+                {
+                  id: 'export-mrpack',
+                  action: () => $refs.exportModal.show(),
+                },
+              ]"
+            >
+              <MoreVerticalIcon />
+              <template #share-instance> <UserPlusIcon /> Share instance </template>
+              <template #host-a-server> <ServerIcon /> Create a server </template>
+              <template #open-folder> <FolderOpenIcon /> Open folder </template>
+              <template #export-mrpack> <PackageIcon /> Export modpack </template>
+            </OverflowMenu>
+          </ButtonStyled>
+        </div>
+      </template>
+    </ContentPageHeader>
   </div>
+  <div class="px-6">
+    <NavTabs :links="tabs" />
+  </div>
+  <div class="p-6 pt-4">
+    <RouterView v-slot="{ Component }" :key="instance.path">
+      <template v-if="Component">
+        <Suspense
+          :key="instance.path"
+          @pending="loadingBar.startLoading()"
+          @resolve="loadingBar.stopLoading()"
+        >
+          <component
+            :is="Component"
+            :instance="instance"
+            :options="options"
+            :offline="offline"
+            :playing="playing"
+            :versions="modrinthVersions"
+            :installed="instance.install_stage !== 'installed'"
+          ></component>
+          <template #fallback>
+            <LoadingIndicator />
+          </template>
+        </Suspense>
+      </template>
+    </RouterView>
+  </div>
+  <ContextMenu ref="options" @option-clicked="handleOptionsClick">
+    <template #play> <PlayIcon /> Play </template>
+    <template #stop> <StopCircleIcon /> Stop </template>
+    <template #add_content> <PlusIcon /> Add content </template>
+    <template #edit> <EditIcon /> Edit </template>
+    <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
+    <template #open_folder> <ClipboardCopyIcon /> Open folder </template>
+    <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
+    <template #open_link> <ClipboardCopyIcon /> Open in Modrinth <ExternalIcon /> </template>
+    <template #copy_names><EditIcon />Copy names</template>
+    <template #copy_slugs><HashIcon />Copy slugs</template>
+    <template #copy_links><GlobeIcon />Copy links</template>
+    <template #toggle><EditIcon />Toggle selected</template>
+    <template #disable><XIcon />Disable selected</template>
+    <template #enable><CheckCircleIcon />Enable selected</template>
+    <template #hide_show><EyeIcon />Show/Hide unselected</template>
+    <template #update_all
+      ><UpdatedIcon />Update {{ selected.length > 0 ? 'selected' : 'all' }}</template
+    >
+    <template #filter_update><UpdatedIcon />Select Updatable</template>
+  </ContextMenu>
 </template>
 <script setup>
 import {
@@ -242,10 +238,6 @@ async function fetchInstance() {
       })
   }
 
-  await updatePlayState()
-}
-
-async function updatePlayState() {
   const runningProcesses = await get_by_profile_path(route.params.id).catch(handleError)
 
   playing.value = runningProcesses.length > 0
@@ -261,20 +253,14 @@ watch(
   },
 )
 
-const basePath = computed(() => `/instance/${encodeURIComponent(route.params.id)}`)
-
 const tabs = computed(() => [
   {
     label: 'Content',
-    href: `${basePath.value}`,
-  },
-  {
-    label: 'Worlds',
-    href: `${basePath.value}/worlds`,
+    href: `/instance/${encodeURIComponent(route.params.id)}`,
   },
   {
     label: 'Logs',
-    href: `${basePath.value}/logs`,
+    href: `/instance/${encodeURIComponent(route.params.id)}/logs`,
   },
 ])
 

apps/app-frontend/src/pages/instance/Logs.vue

@@ -117,37 +117,15 @@ const route = useRoute()
 const props = defineProps({
   instance: {
     type: Object,
-    default() {
-      return {}
-    },
-  },
-  options: {
-    type: Object,
-    default() {
-      return {}
-    },
+    required: true,
   },
   offline: {
     type: Boolean,
-    default() {
-      return false
-    },
+    default: false,
   },
   playing: {
     type: Boolean,
-    default() {
-      return false
-    },
-  },
-  versions: {
-    type: Array,
-    required: true,
-  },
-  installed: {
-    type: Boolean,
-    default() {
-      return false
-    },
+    default: false,
   },
 })
 

apps/app-frontend/src/pages/instance/Mods.vue

@@ -1,252 +1,252 @@
 <template>
-  <div>
-    <template v-if="projects?.length > 0">
-      <div class="flex items-center gap-2 mb-4">
-        <div class="iconified-input flex-grow">
-          <SearchIcon />
-          <input
-            v-model="searchFilter"
-            type="text"
-            :placeholder="`Search ${filteredProjects.length} project${filteredProjects.length === 1 ? '' : 's'}...`"
-            class="text-input search-input"
-            autocomplete="off"
-          />
-          <Button class="r-btn" @click="() => (searchFilter = '')">
-            <XIcon />
-          </Button>
-        </div>
-        <AddContentButton :instance="instance" />
-      </div>
-      <div class="flex items-center justify-between">
-        <div v-if="filterOptions.length > 1" class="flex flex-wrap gap-1 items-center pb-4">
-          <FilterIcon class="text-secondary h-5 w-5 mr-1" />
-          <button
-            v-for="filter in filterOptions"
-            :key="`content-filter-${filter.id}`"
-            :class="`px-2 py-1 rounded-full font-semibold leading-none border-none cursor-pointer active:scale-[0.97] duration-100 transition-all ${selectedFilters.includes(filter.id) ? 'bg-brand-highlight text-brand' : 'bg-bg-raised text-secondary'}`"
-            @click="toggleArray(selectedFilters, filter.id)"
-          >
-            {{ filter.formattedName }}
-          </button>
-        </div>
-        <Pagination
-          v-if="search.length > 0"
-          :page="currentPage"
-          :count="Math.ceil(search.length / 20)"
-          :link-function="(page) => `?page=${page}`"
-          @switch-page="(page) => (currentPage = page)"
+  <template v-if="projects?.length > 0">
+    <div class="flex items-center gap-2 mb-4">
+      <div class="iconified-input flex-grow">
+        <SearchIcon />
+        <input
+          v-model="searchFilter"
+          type="text"
+          :placeholder="`Search ${filteredProjects.length} project${filteredProjects.length === 1 ? '' : 's'}...`"
+          class="text-input search-input"
+          autocomplete="off"
         />
+        <Button class="r-btn" @click="() => (searchFilter = '')">
+          <XIcon />
+        </Button>
       </div>
+      <AddContentButton :instance="instance" />
+    </div>
+    <div class="flex items-center justify-between">
+      <div v-if="filterOptions.length > 1" class="flex flex-wrap gap-1 items-center pb-4">
+        <FilterIcon class="text-secondary h-5 w-5 mr-1" />
+        <button
+          v-for="filter in filterOptions"
+          :key="filter"
+          :class="`px-2 py-1 rounded-full font-semibold leading-none border-none cursor-pointer active:scale-[0.97] duration-100 transition-all ${selectedFilters.includes(filter.id) ? 'bg-brand-highlight text-brand' : 'bg-bg-raised text-secondary'}`"
+          @click="toggleArray(selectedFilters, filter.id)"
+        >
+          {{ filter.formattedName }}
+        </button>
+      </div>
+      <Pagination
+        v-if="search.length > 0"
+        :page="currentPage"
+        :count="Math.ceil(search.length / 20)"
+        :link-function="(page) => `?page=${page}`"
+        @switch-page="(page) => (currentPage = page)"
+      />
+    </div>
 
-      <ContentListPanel
-        v-model="selectedFiles"
-        :locked="isPackLocked"
-        :items="
-          search.map((x) => {
-            const item: ContentItem<any> = {
-              path: x.path,
-              disabled: x.disabled,
-              filename: x.file_name,
-              icon: x.icon ?? undefined,
-              title: x.name,
-              data: x,
+    <ContentListPanel
+      v-model="selectedFiles"
+      :locked="isPackLocked"
+      :items="
+        search.map((x) => {
+          const item: ContentItem<any> = {
+            path: x.path,
+            disabled: x.disabled,
+            filename: x.file_name,
+            icon: x.icon,
+            title: x.name,
+            data: x,
+          }
+
+          if (x.version) {
+            item.version = x.version
+            item.versionId = x.version
+          }
+
+          if (x.id) {
+            item.project = {
+              id: x.id,
+              link: { path: `/project/${x.id}`, query: { i: props.instance.path } },
+              linkProps: {},
             }
+          }
 
-            if (x.version) {
-              item.version = x.version
-              item.versionId = x.version
+          if (x.author) {
+            item.creator = {
+              name: x.author,
+              type: 'user',
+              id: x.author,
+              link: 'https://modrinth.com/user/' + x.author,
+              linkProps: { target: '_blank' },
             }
+          }
 
-            if (x.id) {
-              item.project = {
-                id: x.id,
-                link: { path: `/project/${x.id}`, query: { i: props.instance.path } },
-                linkProps: {},
-              }
-            }
-
-            if (x.author) {
-              item.creator = {
-                name: x.author.name,
-                type: x.author.type,
-                id: x.author.slug,
-                link: `https://modrinth.com/${x.author.type}/${x.author.slug}`,
-                linkProps: { target: '_blank' },
-              }
-            }
-
-            return item
-          })
-        "
-        :sort-column="sortColumn"
-        :sort-ascending="ascending"
-        :update-sort="sortProjects"
-        :current-page="currentPage"
-      >
-        <template v-if="selectedProjects.length > 0" #headers>
-          <div class="flex gap-2">
-            <ButtonStyled
-              v-if="!isPackLocked && selectedProjects.some((m) => m.outdated)"
-              color="brand"
-              color-fill="text"
-              hover-color-fill="text"
-            >
-              <button @click="updateSelected()"><DownloadIcon /> Update</button>
-            </ButtonStyled>
-            <ButtonStyled>
-              <OverflowMenu
-                :options="[
-                  {
-                    id: 'share-names',
-                    action: () => shareNames(),
-                  },
-                  {
-                    id: 'share-file-names',
-                    action: () => shareFileNames(),
-                  },
-                  {
-                    id: 'share-urls',
-                    action: () => shareUrls(),
-                  },
-                  {
-                    id: 'share-markdown',
-                    action: () => shareMarkdown(),
-                  },
-                ]"
-              >
-                <ShareIcon /> Share <DropdownIcon />
-                <template #share-names> <TextInputIcon /> Project names </template>
-                <template #share-file-names> <FileIcon /> File names </template>
-                <template #share-urls> <LinkIcon /> Project links </template>
-                <template #share-markdown> <CodeIcon /> Markdown links </template>
-              </OverflowMenu>
-            </ButtonStyled>
-            <ButtonStyled v-if="selectedProjects.some((m) => m.disabled)">
-              <button @click="enableAll()"><CheckCircleIcon /> Enable</button>
-            </ButtonStyled>
-            <ButtonStyled v-if="selectedProjects.some((m) => !m.disabled)">
-              <button @click="disableAll()"><SlashIcon /> Disable</button>
-            </ButtonStyled>
-            <ButtonStyled color="red">
-              <button @click="deleteSelected()"><TrashIcon /> Remove</button>
-            </ButtonStyled>
-          </div>
-        </template>
-        <template #header-actions>
-          <ButtonStyled type="transparent" color-fill="text" hover-color-fill="text">
-            <button :disabled="refreshingProjects" class="w-max" @click="refreshProjects">
-              <UpdatedIcon />
-              Refresh
-            </button>
-          </ButtonStyled>
+          return item
+        })
+      "
+      :sort-column="sortColumn"
+      :sort-ascending="ascending"
+      :update-sort="sortProjects"
+      :current-page="currentPage"
+    >
+      <template v-if="selectedProjects.length > 0" #headers>
+        <div class="flex gap-2">
           <ButtonStyled
-            v-if="!isPackLocked && projects.some((m) => (m as any).outdated)"
-            type="transparent"
-            color="brand"
-            color-fill="text"
-            hover-color-fill="text"
-            @click="updateAll"
-          >
-            <button class="w-max"><DownloadIcon /> Update all</button>
-          </ButtonStyled>
-          <ButtonStyled
-            v-if="canUpdatePack"
-            type="transparent"
+            v-if="!isPackLocked && selectedProjects.some((m) => m.outdated)"
             color="brand"
             color-fill="text"
             hover-color-fill="text"
           >
-            <button class="w-max" :disabled="installing" @click="modpackVersionModal?.show()">
-              <DownloadIcon /> Update pack
-            </button>
+            <button @click="updateSelected()"><DownloadIcon /> Update</button>
           </ButtonStyled>
-        </template>
-        <template #actions="{ item }">
-          <ButtonStyled
-            v-if="!isPackLocked && (item.data as any).outdated"
-            type="transparent"
-            color="brand"
-            circular
-          >
-            <button
-              v-tooltip="`Update`"
-              :disabled="(item.data as ProjectListEntry).updating"
-              @click="updateProject(item.data)"
-            >
-              <DownloadIcon />
-            </button>
-          </ButtonStyled>
-          <div v-else class="w-[36px]"></div>
-          <Toggle
-            class="!mx-2"
-            :model-value="!item.data.disabled"
-            @update:model-value="toggleDisableMod(item.data)"
-          />
-          <ButtonStyled type="transparent" circular>
-            <button v-tooltip="'Remove'" @click="removeMod(item)">
-              <TrashIcon />
-            </button>
-          </ButtonStyled>
-
-          <ButtonStyled type="transparent" circular>
+          <ButtonStyled>
             <OverflowMenu
               :options="[
                 {
-                  id: 'show-file',
-                  action: () => highlightModInProfile(instance.path, item.path),
+                  id: 'share-names',
+                  action: () => shareNames(),
                 },
                 {
-                  id: 'copy-link',
-                  shown: item.data !== undefined && item.data.slug !== undefined,
-                  action: () => copyModLink(item),
+                  id: 'share-file-names',
+                  action: () => shareFileNames(),
+                },
+                {
+                  id: 'share-urls',
+                  action: () => shareUrls(),
+                },
+                {
+                  id: 'share-markdown',
+                  action: () => shareMarkdown(),
                 },
               ]"
-              direction="left"
             >
-              <MoreVerticalIcon />
-              <template #show-file> <ExternalIcon /> Show file </template>
-              <template #copy-link> <ClipboardCopyIcon /> Copy link </template>
+              <ShareIcon /> Share <DropdownIcon />
+              <template #share-names> <TextInputIcon /> Project names </template>
+              <template #share-file-names> <FileIcon /> File names </template>
+              <template #share-urls> <LinkIcon /> Project links </template>
+              <template #share-markdown> <CodeIcon /> Markdown links </template>
             </OverflowMenu>
           </ButtonStyled>
-        </template>
-      </ContentListPanel>
-      <div class="flex justify-end mt-4">
-        <Pagination
-          v-if="search.length > 0"
-          :page="currentPage"
-          :count="Math.ceil(search.length / 20)"
-          :link-function="(page) => `?page=${page}`"
-          @switch-page="(page) => (currentPage = page)"
-        />
-      </div>
-    </template>
-    <div v-else class="w-full max-w-[48rem] mx-auto flex flex-col mt-6">
-      <RadialHeader class="">
-        <div class="flex items-center gap-6 w-[32rem] mx-auto">
-          <img src="@/assets/sad-modrinth-bot.webp" class="h-24" />
-          <span class="text-contrast font-bold text-xl"
-            >You haven't added any content to this instance yet.</span
-          >
+          <ButtonStyled v-if="selectedProjects.some((m) => m.disabled)">
+            <button @click="enableAll()"><CheckCircleIcon /> Enable</button>
+          </ButtonStyled>
+          <ButtonStyled v-if="selectedProjects.some((m) => !m.disabled)">
+            <button @click="disableAll()"><SlashIcon /> Disable</button>
+          </ButtonStyled>
+          <ButtonStyled color="red">
+            <button @click="deleteSelected()"><TrashIcon /> Remove</button>
+          </ButtonStyled>
         </div>
-      </RadialHeader>
-      <div class="flex mt-4 mx-auto">
-        <AddContentButton :instance="instance" />
+      </template>
+      <template #header-actions>
+        <ButtonStyled type="transparent" color-fill="text" hover-color-fill="text">
+          <button :disabled="refreshingProjects" class="w-max" @click="refreshProjects">
+            <UpdatedIcon />
+            Refresh
+          </button>
+        </ButtonStyled>
+        <ButtonStyled
+          v-if="!isPackLocked && projects.some((m) => (m as any).outdated)"
+          type="transparent"
+          color="brand"
+          color-fill="text"
+          hover-color-fill="text"
+          @click="updateAll"
+        >
+          <button class="w-max"><DownloadIcon /> Update all</button>
+        </ButtonStyled>
+        <ButtonStyled
+          v-if="canUpdatePack"
+          type="transparent"
+          color="brand"
+          color-fill="text"
+          hover-color-fill="text"
+        >
+          <button class="w-max" :disabled="installing" @click="modpackVersionModal.show()">
+            <DownloadIcon /> Update pack
+          </button>
+        </ButtonStyled>
+      </template>
+      <template #actions="{ item }">
+        <ButtonStyled
+          v-if="!isPackLocked && (item.data as any).outdated"
+          type="transparent"
+          color="brand"
+          circular
+        >
+          <button
+            v-tooltip="`Update`"
+            :disabled="(item.data as any).updating"
+            @click="updateProject(item.data)"
+          >
+            <DownloadIcon />
+          </button>
+        </ButtonStyled>
+        <div v-else class="w-[36px]"></div>
+        <Toggle
+          class="!mx-2"
+          :model-value="!item.data.disabled"
+          :checked="!item.data.disabled"
+          @update:model-value="toggleDisableMod(item.data)"
+        />
+        <ButtonStyled type="transparent" circular>
+          <button v-tooltip="'Remove'" @click="removeMod(item)">
+            <TrashIcon />
+          </button>
+        </ButtonStyled>
+
+        <ButtonStyled type="transparent" circular>
+          <OverflowMenu
+            :options="[
+              {
+                id: 'show-file',
+                action: () => highlightModInProfile(instance.path, item.path),
+              },
+              {
+                id: 'copy-link',
+                shown: item.data !== undefined && item.data.slug !== undefined,
+                action: () => copyModLink(item),
+              },
+            ]"
+            direction="left"
+          >
+            <MoreVerticalIcon />
+            <template #show-file> <ExternalIcon /> Show file </template>
+            <template #copy-link> <ClipboardCopyIcon /> Copy link </template>
+          </OverflowMenu>
+        </ButtonStyled>
+      </template>
+    </ContentListPanel>
+    <div class="flex justify-end mt-4">
+      <Pagination
+        v-if="search.length > 0"
+        :page="currentPage"
+        :count="Math.ceil(search.length / 20)"
+        :link-function="(page) => `?page=${page}`"
+        @switch-page="(page) => (currentPage = page)"
+      />
+    </div>
+  </template>
+  <div v-else class="w-full flex flex-col items-center justify-center mt-6 max-w-[48rem] mx-auto">
+    <div class="top-box w-full">
+      <div class="flex items-center gap-6 w-[32rem] mx-auto">
+        <img src="@/assets/sad-modrinth-bot.webp" class="h-24" />
+        <span class="text-contrast font-bold text-xl"
+          >You haven't added any content to this instance yet.</span
+        >
       </div>
     </div>
-    <ShareModalWrapper
-      ref="shareModal"
-      share-title="Sharing modpack content"
-      share-text="Check out the projects I'm using in my modpack!"
-      :open-in-new-tab="false"
-    />
-    <ExportModal v-if="projects.length > 0" ref="exportModal" :instance="instance" />
-    <ModpackVersionModal
-      v-if="instance.linked_data"
-      ref="modpackVersionModal"
-      :instance="instance"
-      :versions="props.versions"
-    />
+    <div class="top-box-divider"></div>
+    <div class="flex items-center gap-6 py-4">
+      <AddContentButton :instance="instance" />
+    </div>
   </div>
+  <ShareModalWrapper
+    ref="shareModal"
+    share-title="Sharing modpack content"
+    share-text="Check out the projects I'm using in my modpack!"
+    :open-in-new-tab="false"
+  />
+  <ExportModal v-if="projects.length > 0" ref="exportModal" :instance="instance" />
+  <ModpackVersionModal
+    v-if="instance.linked_data"
+    ref="modpackVersionModal"
+    :instance="instance"
+    :versions="props.versions"
+  />
 </template>
 <script setup lang="ts">
 import {
@@ -273,10 +273,8 @@ import {
   ContentListPanel,
   OverflowMenu,
   Pagination,
-  RadialHeader,
   Toggle,
 } from '@modrinth/ui'
-import type { Organization, Project, TeamMember, Version } from '@modrinth/utils'
 import { formatProjectType } from '@modrinth/utils'
 import type { ComputedRef } from 'vue'
 import { computed, onUnmounted, ref, watch } from 'vue'
@@ -306,42 +304,31 @@ import { profile_listener } from '@/helpers/events.js'
 import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 import { getCurrentWebview } from '@tauri-apps/api/webview'
 import dayjs from 'dayjs'
-import type { CacheBehaviour, ContentFile, GameInstance } from '@/helpers/types'
-import type ContextMenu from '@/components/ui/ContextMenu.vue'
-import type { ContentItem } from '@modrinth/ui/src/components/content/ContentListItem.vue'
 
-const props = defineProps<{
-  instance: GameInstance
-  options: InstanceType<typeof ContextMenu>
-  offline: boolean
-  playing: boolean
-  versions: Version[]
-  installed: boolean
-}>()
-
-type ProjectListEntryAuthor = {
-  name: string
-  slug: string
-  type: 'user' | 'organization'
-}
-
-type ProjectListEntry = {
-  path: string
-  name: string
-  slug?: string
-  author: ProjectListEntryAuthor | null
-  version: string | null
-  file_name: string
-  icon: string | undefined
-  disabled: boolean
-  updateVersion?: string
-  outdated: boolean
-  updated: dayjs.Dayjs
-  project_type: string
-  id?: string
-  updating?: boolean
-  selected?: boolean
-}
+const props = defineProps({
+  instance: {
+    type: Object,
+    default() {
+      return {}
+    },
+  },
+  options: {
+    type: Object,
+    default() {
+      return {}
+    },
+  },
+  offline: {
+    type: Boolean,
+    default() {
+      return false
+    },
+  },
+  versions: {
+    type: Array,
+    required: true,
+  },
+})
 
 const isPackLocked = computed(() => {
   return props.instance.linked_data && props.instance.linked_data.locked
@@ -352,21 +339,18 @@ const canUpdatePack = computed(() => {
 })
 const exportModal = ref(null)
 
-const projects = ref<ProjectListEntry[]>([])
-const selectedFiles = ref<string[]>([])
+const projects = ref([])
+const selectedFiles = ref([])
 const selectedProjects = computed(() =>
   projects.value.filter((x) => selectedFiles.value.includes(x.file_name)),
 )
 
 const selectionMap = ref(new Map())
 
-const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
-  const newProjects: ProjectListEntry[] = []
+const initProjects = async (cacheBehaviour?) => {
+  const newProjects = []
 
-  const profileProjects = (await get_projects(props.instance.path, cacheBehaviour)) as Record<
-    string,
-    ContentFile
-  >
+  const profileProjects = await get_projects(props.instance.path, cacheBehaviour)
   const fetchProjects = []
   const fetchVersions = []
 
@@ -378,21 +362,21 @@ const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
   }
 
   const [modrinthProjects, modrinthVersions] = await Promise.all([
-    (await get_project_many(fetchProjects).catch(handleError)) as Project[],
-    (await get_version_many(fetchVersions).catch(handleError)) as Version[],
+    await get_project_many(fetchProjects).catch(handleError),
+    await get_version_many(fetchVersions).catch(handleError),
   ])
 
   const [modrinthTeams, modrinthOrganizations] = await Promise.all([
-    (await get_team_many(modrinthProjects.map((x) => x.team)).catch(handleError)) as TeamMember[][],
-    (await get_organization_many(
+    await get_team_many(modrinthProjects.map((x) => x.team)).catch(handleError),
+    await get_organization_many(
       modrinthProjects.map((x) => x.organization).filter((x) => !!x),
-    ).catch(handleError)) as Organization[],
+    ).catch(handleError),
   ])
 
   for (const [path, file] of Object.entries(profileProjects)) {
     if (file.metadata) {
-      const project = modrinthProjects.find((x) => file.metadata?.project_id === x.id)
-      const version = modrinthVersions.find((x) => file.metadata?.version_id === x.id)
+      const project = modrinthProjects.find((x) => file.metadata.project_id === x.id)
+      const version = modrinthVersions.find((x) => file.metadata.version_id === x.id)
 
       if (project && version) {
         const org = project.organization
@@ -401,29 +385,21 @@ const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
 
         const team = modrinthTeams.find((x) => x[0].team_id === project.team)
 
-        let author: ProjectListEntryAuthor | null = null
+        let owner
+
         if (org) {
-          author = {
-            name: org.name,
-            slug: org.slug,
-            type: 'organization',
-          }
+          owner = org.name
         } else if (team) {
-          const teamMember = team.find((x) => x.is_owner)
-          if (teamMember) {
-            author = {
-              name: teamMember.user.username,
-              slug: teamMember.user.username,
-              type: 'user',
-            }
-          }
+          owner = team.find((x) => x.is_owner).user.username
+        } else {
+          owner = null
         }
 
         newProjects.push({
           path,
           name: project.title,
           slug: project.slug,
-          author,
+          author: owner,
           version: version.version_number,
           file_name: file.file_name,
           icon: project.icon_url,
@@ -442,10 +418,10 @@ const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
     newProjects.push({
       path,
       name: file.file_name.replace('.disabled', ''),
-      author: null,
+      author: '',
       version: null,
       file_name: file.file_name,
-      icon: undefined,
+      icon: null,
       disabled: file.file_name.endsWith('.disabled'),
       outdated: false,
       updated: dayjs(0),
@@ -453,7 +429,7 @@ const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
     })
   }
 
-  projects.value = newProjects ?? []
+  projects.value = newProjects
 
   const newSelectionMap = new Map()
   for (const project of projects.value) {
@@ -469,7 +445,7 @@ const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
 }
 await initProjects()
 
-const modpackVersionModal = ref<InstanceType<typeof ModpackVersionModal> | null>()
+const modpackVersionModal = ref(null)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 
 const vintl = useVIntl()
@@ -494,7 +470,7 @@ const messages = defineMessages({
 const filterOptions: ComputedRef<FilterOption[]> = computed(() => {
   const options: FilterOption[] = []
 
-  const frequency = projects.value.reduce((map: Record<string, number>, item) => {
+  const frequency = projects.value.reduce((map, item) => {
     map[item.project_type] = (map[item.project_type] || 0) + 1
     return map
   }, {})
@@ -525,7 +501,7 @@ const filterOptions: ComputedRef<FilterOption[]> = computed(() => {
   return options
 })
 
-const selectedFilters = ref<string[]>([])
+const selectedFilters = ref([])
 const filteredProjects = computed(() => {
   const updatesFilter = selectedFilters.value.includes('updates')
   const disabledFilter = selectedFilters.value.includes('disabled')
@@ -552,7 +528,7 @@ watch(filterOptions, () => {
   }
 })
 
-function toggleArray<T>(array: T[], value: T) {
+function toggleArray(array, value) {
   if (array.includes(value)) {
     array.splice(array.indexOf(value), 1)
   } else {
@@ -562,7 +538,7 @@ function toggleArray<T>(array: T[], value: T) {
 
 const searchFilter = ref('')
 const selectAll = ref(false)
-const shareModal = ref<InstanceType<typeof ShareModalWrapper> | null>()
+const shareModal = ref(null)
 const ascending = ref(true)
 const sortColumn = ref('Name')
 const currentPage = ref(1)
@@ -603,7 +579,7 @@ const search = computed(() => {
 
 watch([sortColumn, ascending, selectedFilters.value, searchFilter], () => (currentPage.value = 1))
 
-const sortProjects = (filter: string) => {
+const sortProjects = (filter) => {
   if (sortColumn.value === filter) {
     ascending.value = !ascending.value
   } else {
@@ -621,7 +597,7 @@ const updateAll = async () => {
     }
   }
 
-  const paths = (await update_all(props.instance.path).catch(handleError)) as Record<string, string>
+  const paths = await update_all(props.instance.path).catch(handleError)
 
   for (const [oldVal, newVal] of Object.entries(paths)) {
     const index = projects.value.findIndex((x) => x.path === oldVal)
@@ -630,7 +606,7 @@ const updateAll = async () => {
 
     if (projects.value[index].updateVersion) {
       projects.value[index].version = projects.value[index].updateVersion.version_number
-      projects.value[index].updateVersion = undefined
+      projects.value[index].updateVersion = null
     }
   }
   for (const project of setProjects) {
@@ -645,15 +621,15 @@ const updateAll = async () => {
   })
 }
 
-const updateProject = async (mod: ProjectListEntry) => {
+const updateProject = async (mod) => {
   mod.updating = true
   await new Promise((resolve) => setTimeout(resolve, 0))
   mod.path = await update_project(props.instance.path, mod.path).catch(handleError)
   mod.updating = false
 
   mod.outdated = false
-  mod.version = mod.updateVersion?.version_number
-  mod.updateVersion = undefined
+  mod.version = mod.updateVersion.version_number
+  mod.updateVersion = null
 
   trackEvent('InstanceProjectUpdate', {
     loader: props.instance.loader,
@@ -664,15 +640,15 @@ const updateProject = async (mod: ProjectListEntry) => {
   })
 }
 
-const locks: Record<string, string | null> = {}
+const locks = {}
 
-const toggleDisableMod = async (mod: ProjectListEntry) => {
+const toggleDisableMod = async (mod) => {
   // Use mod's id as the key for the lock. If mod doesn't have a unique id, replace `mod.id` with some unique property.
   const lock = locks[mod.file_name]
 
   while (lock) {
     await new Promise((resolve) => {
-      setTimeout((value: unknown) => resolve(value), 100)
+      setTimeout((_) => resolve(), 100)
     })
   }
 
@@ -697,20 +673,20 @@ const toggleDisableMod = async (mod: ProjectListEntry) => {
   locks[mod.file_name] = null
 }
 
-const removeMod = async (mod: ContentItem<ProjectListEntry>) => {
+const removeMod = async (mod) => {
   await remove_project(props.instance.path, mod.path).catch(handleError)
   projects.value = projects.value.filter((x) => mod.path !== x.path)
 
   trackEvent('InstanceProjectRemove', {
     loader: props.instance.loader,
     game_version: props.instance.game_version,
-    id: mod.data.id,
-    name: mod.data.name,
-    project_type: mod.data.project_type,
+    id: mod.id,
+    name: mod.name,
+    project_type: mod.project_type,
   })
 }
 
-const copyModLink = async (mod: ContentItem<ProjectListEntry>) => {
+const copyModLink = async (mod) => {
   await navigator.clipboard.writeText(
     `https://modrinth.com/${mod.data.project_type}/${mod.data.slug}`,
   )
@@ -725,15 +701,15 @@ const deleteSelected = async () => {
 }
 
 const shareNames = async () => {
-  await shareModal.value?.show(functionValues.value.map((x) => x.name).join('\n'))
+  await shareModal.value.show(functionValues.value.map((x) => x.name).join('\n'))
 }
 
 const shareFileNames = async () => {
-  await shareModal.value?.show(functionValues.value.map((x) => x.file_name).join('\n'))
+  await shareModal.value.show(functionValues.value.map((x) => x.file_name).join('\n'))
 }
 
 const shareUrls = async () => {
-  await shareModal.value?.show(
+  await shareModal.value.show(
     functionValues.value
       .filter((x) => x.slug)
       .map((x) => `https://modrinth.com/${x.project_type}/${x.slug}`)
@@ -742,7 +718,7 @@ const shareUrls = async () => {
 }
 
 const shareMarkdown = async () => {
-  await shareModal.value?.show(
+  await shareModal.value.show(
     functionValues.value
       .map((x) => {
         if (x.slug) {
@@ -807,17 +783,15 @@ const unlisten = await getCurrentWebview().onDragDropEvent(async (event) => {
   await initProjects()
 })
 
-const unlistenProfiles = await profile_listener(
-  async (event: { event: string; profile_path_id: string }) => {
-    if (
-      event.profile_path_id === props.instance.path &&
-      event.event === 'synced' &&
-      props.instance.install_stage !== 'pack_installing'
-    ) {
-      await initProjects()
-    }
-  },
-)
+const unlistenProfiles = await profile_listener(async (event) => {
+  if (
+    event.profile_path_id === props.instance.path &&
+    event.event === 'synced' &&
+    props.instance.install_stage !== 'pack_installing'
+  ) {
+    await initProjects()
+  }
+})
 
 onUnmounted(() => {
   unlisten()

apps/app-frontend/src/pages/instance/Overview.vue

@@ -1,15 +0,0 @@
-<template>{{ instance.name }} overview</template>
-<script setup lang="ts">
-import type { GameInstance } from '@/helpers/types'
-import type ContextMenu from '@/components/ui/ContextMenu.vue'
-import type { Version } from '@modrinth/utils'
-
-defineProps<{
-  instance: GameInstance
-  options: InstanceType<typeof ContextMenu>
-  offline: boolean
-  playing: boolean
-  versions: Version[]
-  installed: boolean
-}>()
-</script>

apps/app-frontend/src/pages/instance/Worlds.vue

@@ -1,463 +0,0 @@
-<template>
-  <AddServerModal
-    ref="addServerModal"
-    :instance="instance"
-    @submit="
-      (server, start) => {
-        addServer(server)
-        if (start) {
-          joinWorld(server)
-        }
-      }
-    "
-  />
-  <EditServerModal ref="editServerModal" :instance="instance" @submit="editServer" />
-  <EditWorldModal ref="editWorldModal" :instance="instance" @submit="editWorld" />
-  <ConfirmModalWrapper
-    ref="removeServerModal"
-    :title="`Are you sure you want to remove ${serverToRemove?.name ?? 'this server'}?`"
-    :description="`'${serverToRemove?.name}'${serverToRemove?.address === serverToRemove?.name ? ' ' : ` (${serverToRemove?.address})`} will be removed from your list, including in-game, and there will be no way to recover it.`"
-    :markdown="false"
-    @proceed="proceedRemoveServer"
-  />
-  <ConfirmModalWrapper
-    ref="deleteWorldModal"
-    :title="`Are you sure you want to permanently delete this world?`"
-    :description="`'${worldToDelete?.name}' will be **permanently deleted**, and there will be no way to recover it.`"
-    @proceed="proceedDeleteWorld"
-  />
-  <div v-if="worlds.length > 0" class="flex flex-col gap-4">
-    <div class="flex flex-wrap gap-2 items-center">
-      <div class="iconified-input flex-grow">
-        <SearchIcon />
-        <input
-          v-model="searchFilter"
-          type="text"
-          :placeholder="`Search worlds...`"
-          class="text-input search-input"
-          autocomplete="off"
-        />
-        <Button v-if="searchFilter" class="r-btn" @click="() => (searchFilter = '')">
-          <XIcon />
-        </Button>
-      </div>
-      <ButtonStyled>
-        <button :disabled="refreshingAll" @click="refreshAllWorlds">
-          <template v-if="refreshingAll">
-            <SpinnerIcon class="animate-spin" />
-            Refreshing...
-          </template>
-          <template v-else>
-            <UpdatedIcon />
-            Refresh
-          </template>
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button @click="addServerModal?.show()">
-          <PlusIcon />
-          Add a server
-        </button>
-      </ButtonStyled>
-    </div>
-    <FilterBar v-model="filters" :options="filterOptions" show-all-options />
-    <div class="flex flex-col w-full gap-2">
-      <WorldItem
-        v-for="world in filteredWorlds"
-        :key="`world-${world.type}-${world.type == 'singleplayer' ? world.path : `${world.address}-${world.index}`}`"
-        :world="world"
-        :highlighted="highlightedWorld === getWorldIdentifier(world)"
-        :supports-quick-play="supportsQuickPlay"
-        :current-protocol="protocolVersion"
-        :playing-instance="playing"
-        :playing-world="worldsMatch(world, worldPlaying)"
-        :starting-instance="startingInstance"
-        :refreshing="world.type === 'server' ? serverData[world.address]?.refreshing : undefined"
-        :server-status="world.type === 'server' ? serverData[world.address]?.status : undefined"
-        :rendered-motd="
-          world.type === 'server' ? serverData[world.address]?.renderedMotd : undefined
-        "
-        :game-mode="world.type === 'singleplayer' ? GAME_MODES[world.game_mode] : undefined"
-        @play="() => joinWorld(world)"
-        @stop="() => emit('stop')"
-        @refresh="() => refreshServer((world as ServerWorld).address)"
-        @edit="
-          () =>
-            world.type === 'server' ? editServerModal?.show(world) : editWorldModal?.show(world)
-        "
-        @delete="() => promptToRemoveWorld(world)"
-      />
-    </div>
-  </div>
-  <div v-else class="w-full max-w-[48rem] mx-auto flex flex-col mt-6">
-    <RadialHeader class="">
-      <div class="flex items-center gap-6 w-[32rem] mx-auto">
-        <img src="@/assets/sad-modrinth-bot.webp" alt="" aria-hidden="true" class="h-24" />
-        <span class="text-contrast font-bold text-xl"> You don't have any worlds yet. </span>
-      </div>
-    </RadialHeader>
-    <div class="flex gap-2 mt-4 mx-auto">
-      <ButtonStyled>
-        <button @click="addServerModal?.show()">
-          <PlusIcon aria-hidden="true" />
-          Add a server
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button :disabled="refreshingAll" @click="refreshAllWorlds">
-          <template v-if="refreshingAll">
-            <SpinnerIcon aria-hidden="true" class="animate-spin" />
-            Refreshing...
-          </template>
-          <template v-else>
-            <UpdatedIcon aria-hidden="true" />
-            Refresh
-          </template>
-        </button>
-      </ButtonStyled>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref, computed, onUnmounted, watch } from 'vue'
-import { useRoute } from 'vue-router'
-import type { GameInstance } from '@/helpers/types'
-import {
-  Button,
-  ButtonStyled,
-  RadialHeader,
-  FilterBar,
-  type FilterBarOption,
-  type GameVersion,
-  GAME_MODES,
-} from '@modrinth/ui'
-import { PlusIcon, SpinnerIcon, UpdatedIcon, SearchIcon, XIcon } from '@modrinth/assets'
-import {
-  type SingleplayerWorld,
-  type World,
-  type ServerWorld,
-  type ServerData,
-  type ProfileEvent,
-  get_profile_protocol_version,
-  remove_server_from_profile,
-  delete_world,
-  start_join_server,
-  start_join_singleplayer_world,
-  getWorldIdentifier,
-  refreshServerData,
-  refreshWorld,
-  sortWorlds,
-  refreshServers,
-  hasQuickPlaySupport,
-  refreshWorlds,
-  handleDefaultProfileUpdateEvent,
-} from '@/helpers/worlds.ts'
-import AddServerModal from '@/components/ui/world/modal/AddServerModal.vue'
-import EditServerModal from '@/components/ui/world/modal/EditServerModal.vue'
-import EditWorldModal from '@/components/ui/world/modal/EditSingleplayerWorldModal.vue'
-import WorldItem from '@/components/ui/world/WorldItem.vue'
-
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import { handleError } from '@/store/notifications'
-import type ContextMenu from '@/components/ui/ContextMenu.vue'
-import type { Version } from '@modrinth/utils'
-import { profile_listener } from '@/helpers/events'
-import { get_game_versions } from '@/helpers/tags'
-import { defineMessages } from '@vintl/vintl'
-
-const route = useRoute()
-
-const addServerModal = ref<InstanceType<typeof AddServerModal>>()
-const editServerModal = ref<InstanceType<typeof EditServerModal>>()
-const editWorldModal = ref<InstanceType<typeof EditWorldModal>>()
-const removeServerModal = ref<InstanceType<typeof ConfirmModalWrapper>>()
-const deleteWorldModal = ref<InstanceType<typeof ConfirmModalWrapper>>()
-
-const serverToRemove = ref<ServerWorld>()
-const worldToDelete = ref<SingleplayerWorld>()
-
-const emit = defineEmits<{
-  (event: 'play', world: World): void
-  (event: 'stop'): void
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-  options: InstanceType<typeof ContextMenu> | null
-  offline: boolean
-  playing: boolean
-  versions: Version[]
-  installed: boolean
-}>()
-
-const instance = computed(() => props.instance)
-const playing = computed(() => props.playing)
-
-function play(world: World) {
-  emit('play', world)
-}
-
-const filters = ref<string[]>([])
-const searchFilter = ref('')
-
-const refreshingAll = ref(false)
-const hadNoWorlds = ref(true)
-const startingInstance = ref(false)
-const worldPlaying = ref<World>()
-
-const worlds = ref<World[]>([])
-const serverData = ref<Record<string, ServerData>>({})
-
-const protocolVersion = ref<number | null>(await get_profile_protocol_version(instance.value.path))
-
-const unlistenProfile = await profile_listener(async (e: ProfileEvent) => {
-  if (e.profile_path_id !== instance.value.path) return
-
-  console.info(`Handling profile event '${e.event}' for profile: ${e.profile_path_id}`)
-
-  if (e.event === 'servers_updated') {
-    await refreshAllWorlds()
-  }
-
-  await handleDefaultProfileUpdateEvent(worlds.value, instance.value.path, e)
-})
-
-await refreshAllWorlds()
-
-async function refreshServer(address: string) {
-  if (!serverData.value[address]) {
-    serverData.value[address] = {
-      refreshing: true,
-    }
-  }
-  await refreshServerData(serverData.value[address], protocolVersion.value, address)
-}
-
-async function refreshAllWorlds() {
-  if (refreshingAll.value) {
-    console.log(`Already refreshing, cancelling refresh.`)
-    return
-  }
-
-  refreshingAll.value = true
-
-  worlds.value = await refreshWorlds(instance.value.path).finally(
-    () => (refreshingAll.value = false),
-  )
-  await refreshServers(worlds.value, serverData.value, protocolVersion.value)
-
-  const hasNoWorlds = worlds.value.length === 0
-
-  if (hadNoWorlds.value && hasNoWorlds) {
-    setTimeout(() => {
-      refreshingAll.value = false
-    }, 1000)
-  } else {
-    refreshingAll.value = false
-  }
-
-  hadNoWorlds.value = hasNoWorlds
-}
-
-async function addServer(server: ServerWorld) {
-  worlds.value.push(server)
-  sortWorlds(worlds.value)
-  await refreshServer(server.address)
-}
-
-async function editServer(server: ServerWorld) {
-  const index = worlds.value.findIndex((w) => w.type === 'server' && w.index === server.index)
-  if (index !== -1) {
-    const oldServer = worlds.value[index] as ServerWorld
-    worlds.value[index] = server
-    sortWorlds(worlds.value)
-    if (oldServer.address !== server.address) {
-      await refreshServer(server.address)
-    }
-  } else {
-    handleError(`Error refreshing server, refreshing all worlds`)
-    await refreshAllWorlds()
-  }
-}
-
-async function removeServer(server: ServerWorld) {
-  await remove_server_from_profile(instance.value.path, server.index).catch(handleError)
-  worlds.value = worlds.value.filter((w) => w.type !== 'server' || w.index !== server.index)
-}
-
-async function editWorld(path: string, name: string, removeIcon: boolean) {
-  const world = worlds.value.find((world) => world.type === 'singleplayer' && world.path === path)
-  if (world) {
-    world.name = name
-    if (removeIcon) {
-      world.icon = undefined
-    }
-    sortWorlds(worlds.value)
-  } else {
-    handleError(`Error finding world in list, refreshing all worlds`)
-    await refreshAllWorlds()
-  }
-}
-
-async function deleteWorld(world: SingleplayerWorld) {
-  await delete_world(instance.value.path, world.path).catch(handleError)
-  worlds.value = worlds.value.filter((w) => w.type !== 'singleplayer' || w.path !== world.path)
-}
-
-function handleJoinError(err: unknown) {
-  handleError(err)
-  startingInstance.value = false
-  worldPlaying.value = undefined
-}
-
-async function joinWorld(world: World) {
-  console.log(`Joining world ${getWorldIdentifier(world)}`)
-  startingInstance.value = true
-  worldPlaying.value = world
-  if (world.type === 'server') {
-    await start_join_server(instance.value.path, world.address).catch(handleJoinError)
-  } else if (world.type === 'singleplayer') {
-    await start_join_singleplayer_world(instance.value.path, world.path).catch(handleJoinError)
-  }
-  play(world)
-  startingInstance.value = false
-}
-
-watch(
-  () => playing.value,
-  (playing) => {
-    if (!playing) {
-      worldPlaying.value = undefined
-
-      setTimeout(async () => {
-        for (const world of worlds.value) {
-          if (world.type === 'singleplayer' && world.locked) {
-            await refreshWorld(worlds.value, instance.value.path, world.path)
-          }
-        }
-      }, 1000)
-    }
-  },
-)
-
-function worldsMatch(world: World, other: World | undefined) {
-  if (world.type === 'server' && other?.type === 'server') {
-    return world.address === other.address
-  } else if (world.type === 'singleplayer' && other?.type === 'singleplayer') {
-    return world.path === other.path
-  }
-  return false
-}
-
-const gameVersions = ref<GameVersion[]>(await get_game_versions().catch(() => []))
-const supportsQuickPlay = computed(() =>
-  hasQuickPlaySupport(gameVersions.value, instance.value.game_version),
-)
-
-const filterOptions = computed(() => {
-  const options: FilterBarOption[] = []
-
-  const hasServer = worlds.value.some((x) => x.type === 'server')
-
-  if (worlds.value.some((x) => x.type === 'singleplayer') && hasServer) {
-    options.push({
-      id: 'singleplayer',
-      message: messages.singleplayer,
-    })
-    options.push({
-      id: 'server',
-      message: messages.server,
-    })
-  }
-
-  if (hasServer) {
-    // add available filter if there's any offline ("unavailable") servers AND there's any singleplayer worlds or available servers
-    if (
-      worlds.value.some(
-        (x) =>
-          x.type === 'server' &&
-          !serverData.value[x.address]?.status &&
-          !serverData.value[x.address]?.refreshing,
-      ) &&
-      worlds.value.some(
-        (x) =>
-          x.type === 'singleplayer' ||
-          (x.type === 'server' &&
-            serverData.value[x.address]?.status &&
-            !serverData.value[x.address]?.refreshing),
-      )
-    ) {
-      options.push({
-        id: 'available',
-        message: messages.available,
-      })
-    }
-  }
-
-  return options
-})
-
-const filteredWorlds = computed(() =>
-  worlds.value.filter((x) => {
-    const availableFilter = filters.value.includes('available')
-    const typeFilter = filters.value.includes('server') || filters.value.includes('singleplayer')
-
-    return (
-      (!typeFilter || filters.value.includes(x.type)) &&
-      (!availableFilter || x.type !== 'server' || serverData.value[x.address]?.status) &&
-      (!searchFilter.value || x.name.toLowerCase().includes(searchFilter.value.toLowerCase()))
-    )
-  }),
-)
-
-const highlightedWorld = ref(route.query.highlight)
-
-function promptToRemoveWorld(world: World): boolean {
-  if (world.type === 'server') {
-    serverToRemove.value = world
-    removeServerModal.value?.show()
-    return !!removeServerModal.value
-  } else {
-    worldToDelete.value = world
-    deleteWorldModal.value?.show()
-    return !!deleteWorldModal.value
-  }
-}
-
-async function proceedRemoveServer() {
-  if (!serverToRemove.value) {
-    handleError(`Error removing server, no server marked for removal.`)
-    return
-  }
-  await removeServer(serverToRemove.value)
-  serverToRemove.value = undefined
-}
-
-async function proceedDeleteWorld() {
-  if (!worldToDelete.value) {
-    handleError(`Error deleting world, no world marked for removal.`)
-    return
-  }
-  await deleteWorld(worldToDelete.value)
-  worldToDelete.value = undefined
-}
-
-onUnmounted(() => {
-  unlistenProfile()
-})
-
-const messages = defineMessages({
-  singleplayer: {
-    id: 'instance.worlds.type.singleplayer',
-    defaultMessage: 'Singleplayer',
-  },
-  server: {
-    id: 'instance.worlds.type.server',
-    defaultMessage: 'Server',
-  },
-  available: {
-    id: 'instance.worlds.filter.available',
-    defaultMessage: 'Available',
-  },
-})
-</script>

apps/app-frontend/src/pages/instance/index.js

@@ -1,7 +1,5 @@
 import Index from './Index.vue'
-import Overview from './Overview.vue'
-import Worlds from './Worlds.vue'
 import Mods from './Mods.vue'
 import Logs from './Logs.vue'
 
-export { Index, Overview, Worlds, Mods, Logs }
+export { Index, Mods, Logs }

apps/app-frontend/src/pages/project/Gallery.vue

@@ -31,10 +31,10 @@
             : 'https://cdn.modrinth.com/placeholder-banner.svg'
         "
         :alt="expandedGalleryItem.title ? expandedGalleryItem.title : 'gallery-image'"
-        @click.stop="() => {}"
+        @click.stop=""
       />
 
-      <div class="floating" @click.stop="() => {}">
+      <div class="floating" @click.stop="">
         <div class="text">
           <h2 v-if="expandedGalleryItem.title">
             {{ expandedGalleryItem.title }}
@@ -99,7 +99,7 @@ import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
 const props = defineProps({
   project: {
     type: Object,
-    default: () => ({}),
+    default: () => {},
   },
 })
 

apps/app-frontend/src/pages/project/Index.vue

@@ -155,7 +155,7 @@ import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ref, shallowRef, watch } from 'vue'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
@@ -170,7 +170,6 @@ import { openUrl } from '@tauri-apps/plugin-opener'
 dayjs.extend(relativeTime)
 
 const route = useRoute()
-const router = useRouter()
 const breadcrumbs = useBreadcrumbs()
 const themeStore = useTheming()
 
@@ -193,11 +192,6 @@ const [allLoaders, allGameVersions] = await Promise.all([
 async function fetchProjectData() {
   const project = await get_project(route.params.id, 'must_revalidate').catch(handleError)
 
-  if (!project) {
-    handleError('Error loading project')
-    return
-  }
-
   data.value = project
   ;[versions.value, members.value, categories.value, instance.value, instanceProjects.value] =
     await Promise.all([
@@ -248,9 +242,6 @@ async function install(version) {
         installedVersion.value = version
       }
     },
-    (profile) => {
-      router.push(`/instance/${profile}`)
-    },
   )
 }
 

apps/app-frontend/src/routes.js

@@ -18,14 +18,6 @@ export default new createRouter({
         breadcrumb: [{ name: 'Home' }],
       },
     },
-    {
-      path: '/worlds',
-      name: 'Worlds',
-      component: Pages.Worlds,
-      meta: {
-        breadcrumb: [{ name: 'Worlds' }],
-      },
-    },
     {
       path: '/browse/:projectType',
       name: 'Discover content',
@@ -114,31 +106,13 @@ export default new createRouter({
       component: Instance.Index,
       props: true,
       children: [
-        // {
-        //   path: '',
-        //   name: 'Overview',
-        //   component: Instance.Overview,
-        //   meta: {
-        //     useRootContext: true,
-        //     breadcrumb: [{ name: '?Instance' }],
-        //   },
-        // },
-        {
-          path: 'worlds',
-          name: 'InstanceWorlds',
-          component: Instance.Worlds,
-          meta: {
-            useRootContext: true,
-            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Worlds' }],
-          },
-        },
         {
           path: '',
           name: 'Mods',
           component: Instance.Mods,
           meta: {
             useRootContext: true,
-            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
+            breadcrumb: [{ name: '?Instance' }],
           },
         },
         {
@@ -147,7 +121,7 @@ export default new createRouter({
           component: Instance.Mods,
           meta: {
             useRootContext: true,
-            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
+            breadcrumb: [{ name: '?Instance' }],
           },
         },
         {

apps/app-frontend/src/store/install.js

@@ -23,8 +23,8 @@ export const useInstall = defineStore('installStore', {
     setInstallConfirmModal(ref) {
       this.installConfirmModal = ref
     },
-    showInstallConfirmModal(project, version_id, onInstall, createInstanceCallback) {
-      this.installConfirmModal.show(project, version_id, onInstall, createInstanceCallback)
+    showInstallConfirmModal(project, version_id, onInstall) {
+      this.installConfirmModal.show(project, version_id, onInstall)
     },
     setIncompatibilityWarningModal(ref) {
       this.incompatibilityWarningModal = ref
@@ -41,14 +41,7 @@ export const useInstall = defineStore('installStore', {
   },
 })
 
-export const install = async (
-  projectId,
-  versionId,
-  instancePath,
-  source,
-  callback = () => {},
-  createInstanceCallback = () => {},
-) => {
+export const install = async (projectId, versionId, instancePath, source, callback = () => {}) => {
   const project = await get_project(projectId, 'must_revalidate').catch(handleError)
 
   if (project.project_type === 'modpack') {
@@ -56,13 +49,7 @@ export const install = async (
     const packs = await list().catch(handleError)
 
     if (packs.length === 0 || !packs.find((pack) => pack.linked_data?.project_id === project.id)) {
-      await packInstall(
-        project.id,
-        version,
-        project.title,
-        project.icon_url,
-        createInstanceCallback,
-      ).catch(handleError)
+      await packInstall(project.id, version, project.title, project.icon_url).catch(handleError)
 
       trackEvent('PackInstall', {
         id: project.id,
@@ -74,7 +61,7 @@ export const install = async (
       callback(version)
     } else {
       const install = useInstall()
-      install.showInstallConfirmModal(project, version, callback, createInstanceCallback)
+      install.showInstallConfirmModal(project, version, callback)
     }
   } else {
     if (instancePath) {

apps/app-frontend/src/store/state.js

@@ -1,4 +1,4 @@
-import { useTheming } from './theme.ts'
+import { useTheming } from './theme'
 import { useBreadcrumbs } from './breadcrumbs'
 import { useLoading } from './loading'
 import { useNotifications, handleError } from './notifications'

apps/app-frontend/src/store/theme.js

@@ -0,0 +1,38 @@
+import { defineStore } from 'pinia'
+
+export const useTheming = defineStore('themeStore', {
+  state: () => ({
+    themeOptions: ['dark', 'light', 'oled', 'system'],
+    advancedRendering: true,
+    selectedTheme: 'dark',
+    toggleSidebar: false,
+
+    devMode: false,
+    featureFlags: {},
+  }),
+  actions: {
+    setThemeState(newTheme) {
+      if (this.themeOptions.includes(newTheme)) this.selectedTheme = newTheme
+      else console.warn('Selected theme is not present. Check themeOptions.')
+
+      this.setThemeClass()
+    },
+    setThemeClass() {
+      for (const theme of this.themeOptions) {
+        document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
+      }
+
+      let theme = this.selectedTheme
+      if (this.selectedTheme === 'system') {
+        const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
+        if (darkThemeMq.matches) {
+          theme = 'dark'
+        } else {
+          theme = 'light'
+        }
+      }
+
+      document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
+    },
+  },
+})

apps/app-frontend/src/store/theme.ts

@@ -1,70 +0,0 @@
-import { defineStore } from 'pinia'
-
-export const DEFAULT_FEATURE_FLAGS = {
-  project_background: false,
-  page_path: false,
-  worlds_tab: false,
-  worlds_in_home: true,
-}
-
-export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
-
-export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
-export type FeatureFlags = Record<FeatureFlag, boolean>
-export type ColorTheme = (typeof THEME_OPTIONS)[number]
-
-export type ThemeStore = {
-  selectedTheme: ColorTheme
-  advancedRendering: boolean
-  toggleSidebar: boolean
-
-  devMode: boolean
-  featureFlags: FeatureFlags
-}
-
-export const DEFAULT_THEME_STORE: ThemeStore = {
-  selectedTheme: 'dark',
-  advancedRendering: true,
-  toggleSidebar: false,
-
-  devMode: false,
-  featureFlags: DEFAULT_FEATURE_FLAGS,
-}
-
-export const useTheming = defineStore('themeStore', {
-  state: () => DEFAULT_THEME_STORE,
-  actions: {
-    setThemeState(newTheme: ColorTheme) {
-      if (THEME_OPTIONS.includes(newTheme)) {
-        this.selectedTheme = newTheme
-      } else {
-        console.warn('Selected theme is not present. Check themeOptions.')
-      }
-
-      this.setThemeClass()
-    },
-    setThemeClass() {
-      for (const theme of THEME_OPTIONS) {
-        document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
-      }
-
-      let theme = this.selectedTheme
-      if (this.selectedTheme === 'system') {
-        const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
-        if (darkThemeMq.matches) {
-          theme = 'dark'
-        } else {
-          theme = 'light'
-        }
-      }
-
-      document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
-    },
-    getFeatureFlag(key: FeatureFlag) {
-      return this.featureFlags[key] ?? DEFAULT_FEATURE_FLAGS[key]
-    },
-    getThemeOptions() {
-      return THEME_OPTIONS
-    },
-  },
-})

apps/app-playground/.cargo/config.toml

@@ -1,2 +0,0 @@
-[env]
-SQLX_OFFLINE = "true"

apps/app-playground/Cargo.toml

@@ -7,8 +7,18 @@ edition = "2021"
 
 [dependencies]
 theseus = { path = "../../packages/app-lib", features = ["cli"] }
+
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
+thiserror = "1.0"
+url = "2.2"
 webbrowser = "0.8.13"
-enumset = "1.1"
+dunce = "1.0.3"
+
+futures = "0.3"
+uuid = { version = "1.1", features = ["serde", "v4"] }
 
 tracing = "0.1.37"
+tracing-subscriber = "0.3.18"
+tracing-error = "0.2.0"

apps/app-playground/src/main.rs

@@ -3,9 +3,9 @@
     windows_subsystem = "windows"
 )]
 
-use enumset::EnumSet;
 use theseus::prelude::*;
-use theseus::worlds::get_recent_worlds;
+
+use theseus::profile::create::profile_create;
 
 // A simple Rust implementation of the authentication run
 // 1) call the authenticate_begin_flow() function to get the URL to open (like you would in the frontend)
@@ -41,16 +41,54 @@ async fn main() -> theseus::Result<()> {
     // Initialize state
     State::init().await?;
 
-    let worlds = get_recent_worlds(4, EnumSet::all()).await?;
-    for world in worlds {
-        println!(
-            "World: {:?}/{:?} played at {:?}: {:#?}",
-            world.profile,
-            world.world.name,
-            world.world.last_played,
-            world.world.details
-        );
+    if minecraft_auth::users().await?.is_empty() {
+        println!("No users found, authenticating.");
+        authenticate_run().await?; // could take credentials from here direct, but also deposited in state users
     }
+    //
+    // st.settings
+    //     .write()
+    //     .await
+    //     .java_globals
+    //     .insert(JAVA_8_KEY.to_string(), check_jre(path).await?.unwrap());
+    // Clear profiles
+    println!("Clearing profiles.");
+    {
+        let h = profile::list().await?;
+        for profile in h.into_iter() {
+            profile::remove(&profile.path).await?;
+        }
+    }
+
+    println!("Creating/adding profile.");
+
+    let name = "Example".to_string();
+    let game_version = "1.16.1".to_string();
+    let modloader = ModLoader::Forge;
+    let loader_version = "stable".to_string();
+
+    let profile_path = profile_create(
+        name,
+        game_version,
+        modloader,
+        Some(loader_version),
+        None,
+        None,
+        None,
+    )
+    .await?;
+
+    println!("running");
+    // Run a profile, running minecraft and store the RwLock to the process
+    let process = profile::run(&profile_path).await?;
+
+    println!("Minecraft UUID: {}", process.uuid);
+
+    println!("All running process UUID {:?}", process::get_all().await?);
+
+    // hold the lock to the process until it ends
+    println!("Waiting for process to end...");
+    process::wait_for(process.uuid).await?;
 
     Ok(())
 }

apps/app/.cargo/config.toml

@@ -1,2 +0,0 @@
-[env]
-SQLX_OFFLINE = "true"

apps/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.9.5"
+version = "0.9.2"
 description = "The Modrinth App is a desktop application for managing your Minecraft mods"
 license = "GPL-3.0-only"
 repository = "https://github.com/modrinth/code/apps/app/"
@@ -28,21 +28,24 @@ tauri-plugin-single-instance = { version = "2.2.0" }
 
 tokio = { version = "1", features = ["full"] }
 thiserror = "1.0"
+futures = "0.3"
 daedalus = { path = "../../packages/daedalus" }
 chrono = "0.4.26"
-either = "1.15"
+
+dirs = "5.0.1"
 
 url = "2.2"
-urlencoding = "2.1"
 uuid = { version = "1.1", features = ["serde", "v4"] }
 os_info = "3.7.0"
 
 tracing = "0.1.37"
 tracing-error = "0.2.0"
 
+lazy_static = "1"
+once_cell = "1"
+
 dashmap = "6.0.1"
 paste = "1.0.15"
-enumset = { version = "1.1", features = ["serde"] }
 
 opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] }
 

apps/app/build.rs

@@ -240,30 +240,6 @@ fn main() {
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),
-            )
-            .plugin(
-                "worlds",
-                InlinedPlugin::new()
-                    .commands(&[
-                        "get_recent_worlds",
-                        "get_profile_worlds",
-                        "get_singleplayer_world",
-                        "set_world_display_status",
-                        "rename_world",
-                        "reset_world_icon",
-                        "backup_world",
-                        "delete_world",
-                        "add_server_to_profile",
-                        "edit_server_in_profile",
-                        "remove_server_from_profile",
-                        "get_profile_protocol_version",
-                        "get_server_status",
-                        "start_join_singleplayer_world",
-                        "start_join_server",
-                    ])
-                    .default_permission(
-                        DefaultPermissionRule::AllowAllCommands,
-                    ),
             ),
     )
     .expect("Failed to run tauri-build");

apps/app/capabilities/plugins.json

@@ -35,7 +35,6 @@
     "tags:default",
     "utils:default",
     "ads:default",
-    "friends:default",
-    "worlds:default"
+    "friends:default"
   ]
 }

apps/app/src/api/mod.rs

@@ -19,7 +19,6 @@ pub mod utils;
 pub mod ads;
 pub mod cache;
 pub mod friends;
-pub mod worlds;
 
 pub type Result<T> = std::result::Result<T, TheseusSerializableError>;
 

apps/app/src/api/profile.rs

@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use theseus::prelude::*;
-use theseus::profile::QuickPlayType;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("profile")
@@ -251,7 +250,7 @@ pub async fn profile_get_pack_export_candidates(
 // invoke('plugin:profile|profile_run', path)
 #[tauri::command]
 pub async fn profile_run(path: &str) -> Result<ProcessMetadata> {
-    let process = profile::run(path, &QuickPlayType::None).await?;
+    let process = profile::run(path).await?;
 
     Ok(process)
 }
@@ -265,9 +264,7 @@ pub async fn profile_run_credentials(
     path: &str,
     credentials: Credentials,
 ) -> Result<ProcessMetadata> {
-    let process =
-        profile::run_credentials(path, &credentials, &QuickPlayType::None)
-            .await?;
+    let process = profile::run_credentials(path, &credentials).await?;
 
     Ok(process)
 }
@@ -350,9 +347,6 @@ pub async fn profile_edit(path: &str, edit_profile: EditProfile) -> Result<()> {
             prof.name = name;
         }
         if let Some(game_version) = edit_profile.game_version.clone() {
-            if game_version != prof.game_version {
-                prof.protocol_version = None;
-            }
             prof.game_version = game_version;
         }
         if let Some(loader) = edit_profile.loader {

apps/app/src/api/utils.rs

@@ -4,11 +4,9 @@ use theseus::{
     prelude::{CommandPayload, DirectoryInfo},
 };
 
-use crate::api::{Result, TheseusSerializableError};
+use crate::api::Result;
 use dashmap::DashMap;
-use std::path::{Path, PathBuf};
-use theseus::prelude::canonicalize;
-use url::Url;
+use std::path::PathBuf;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("utils")
@@ -142,28 +140,3 @@ pub async fn handle_command(command: String) -> Result<()> {
     tracing::info!("handle command: {command}");
     Ok(theseus::handler::parse_and_emit_command(&command).await?)
 }
-
-// Remove when (and if) https://github.com/tauri-apps/tauri/issues/12022 is implemented
-pub(crate) fn tauri_convert_file_src(path: &Path) -> Result<Url> {
-    #[cfg(any(windows, target_os = "android"))]
-    const BASE: &str = "http://asset.localhost/";
-    #[cfg(not(any(windows, target_os = "android")))]
-    const BASE: &str = "asset://localhost/";
-
-    macro_rules! theseus_try {
-        ($test:expr) => {
-            match $test {
-                Ok(val) => val,
-                Err(e) => {
-                    return Err(TheseusSerializableError::Theseus(e.into()))
-                }
-            }
-        };
-    }
-
-    let path = theseus_try!(canonicalize(path));
-    let path = path.to_string_lossy();
-    let encoded = urlencoding::encode(&path);
-
-    Ok(theseus_try!(Url::parse(&format!("{BASE}{encoded}"))))
-}

apps/app/src/api/worlds.rs

@@ -1,218 +0,0 @@
-use crate::api::Result;
-use either::Either;
-use enumset::EnumSet;
-use tauri::{AppHandle, Manager, Runtime};
-use theseus::prelude::ProcessMetadata;
-use theseus::profile::{get_full_path, QuickPlayType};
-use theseus::worlds::{
-    DisplayStatus, ServerPackStatus, ServerStatus, World, WorldType,
-    WorldWithProfile,
-};
-use theseus::{profile, worlds};
-
-pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
-    tauri::plugin::Builder::new("worlds")
-        .invoke_handler(tauri::generate_handler![
-            get_recent_worlds,
-            get_profile_worlds,
-            get_singleplayer_world,
-            set_world_display_status,
-            rename_world,
-            reset_world_icon,
-            backup_world,
-            delete_world,
-            add_server_to_profile,
-            edit_server_in_profile,
-            remove_server_from_profile,
-            get_profile_protocol_version,
-            get_server_status,
-            start_join_singleplayer_world,
-            start_join_server,
-        ])
-        .build()
-}
-
-#[tauri::command]
-pub async fn get_recent_worlds<R: Runtime>(
-    app_handle: AppHandle<R>,
-    limit: usize,
-    display_statuses: Option<EnumSet<DisplayStatus>>,
-) -> Result<Vec<WorldWithProfile>> {
-    let mut result = worlds::get_recent_worlds(
-        limit,
-        display_statuses.unwrap_or(EnumSet::all()),
-    )
-    .await?;
-    for world in result.iter_mut() {
-        adapt_world_icon(&app_handle, &mut world.world);
-    }
-    Ok(result)
-}
-
-#[tauri::command]
-pub async fn get_profile_worlds<R: Runtime>(
-    app_handle: AppHandle<R>,
-    path: &str,
-) -> Result<Vec<World>> {
-    let mut result = worlds::get_profile_worlds(path).await?;
-    for world in result.iter_mut() {
-        adapt_world_icon(&app_handle, world);
-    }
-    Ok(result)
-}
-
-#[tauri::command]
-pub async fn get_singleplayer_world<R: Runtime>(
-    app_handle: AppHandle<R>,
-    instance: &str,
-    world: &str,
-) -> Result<World> {
-    let mut world = worlds::get_singleplayer_world(instance, world).await?;
-    adapt_world_icon(&app_handle, &mut world);
-    Ok(world)
-}
-
-fn adapt_world_icon<R: Runtime>(app_handle: &AppHandle<R>, world: &mut World) {
-    if let Some(Either::Left(icon_path)) = &world.icon {
-        let icon_path = icon_path.clone();
-        if let Ok(new_url) = super::utils::tauri_convert_file_src(&icon_path) {
-            world.icon = Some(Either::Right(new_url));
-            if let Err(e) =
-                app_handle.asset_protocol_scope().allow_file(&icon_path)
-            {
-                tracing::warn!(
-                    "Failed to allow file access for icon {}: {}",
-                    icon_path.display(),
-                    e
-                );
-            }
-        } else {
-            tracing::warn!(
-                "Encountered invalid icon path for world {}: {}",
-                world.name,
-                icon_path.display()
-            );
-            world.icon = None;
-        }
-    }
-}
-
-#[tauri::command]
-pub async fn set_world_display_status(
-    instance: &str,
-    world_type: WorldType,
-    world_id: &str,
-    display_status: DisplayStatus,
-) -> Result<()> {
-    Ok(worlds::set_world_display_status(
-        instance,
-        world_type,
-        world_id,
-        display_status,
-    )
-    .await?)
-}
-
-#[tauri::command]
-pub async fn rename_world(
-    instance: &str,
-    world: &str,
-    new_name: &str,
-) -> Result<()> {
-    let instance = get_full_path(instance).await?;
-    worlds::rename_world(&instance, world, new_name).await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn reset_world_icon(instance: &str, world: &str) -> Result<()> {
-    let instance = get_full_path(instance).await?;
-    worlds::reset_world_icon(&instance, world).await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn backup_world(instance: &str, world: &str) -> Result<u64> {
-    let instance = get_full_path(instance).await?;
-    Ok(worlds::backup_world(&instance, world).await?)
-}
-
-#[tauri::command]
-pub async fn delete_world(instance: &str, world: &str) -> Result<()> {
-    let instance = get_full_path(instance).await?;
-    worlds::delete_world(&instance, world).await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn add_server_to_profile(
-    path: &str,
-    name: String,
-    address: String,
-    pack_status: ServerPackStatus,
-) -> Result<usize> {
-    let path = get_full_path(path).await?;
-    Ok(
-        worlds::add_server_to_profile(&path, name, address, pack_status)
-            .await?,
-    )
-}
-
-#[tauri::command]
-pub async fn edit_server_in_profile(
-    path: &str,
-    index: usize,
-    name: String,
-    address: String,
-    pack_status: ServerPackStatus,
-) -> Result<()> {
-    let path = get_full_path(path).await?;
-    worlds::edit_server_in_profile(&path, index, name, address, pack_status)
-        .await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn remove_server_from_profile(
-    path: &str,
-    index: usize,
-) -> Result<()> {
-    let path = get_full_path(path).await?;
-    worlds::remove_server_from_profile(&path, index).await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn get_profile_protocol_version(path: &str) -> Result<Option<i32>> {
-    Ok(worlds::get_profile_protocol_version(path).await?)
-}
-
-#[tauri::command]
-pub async fn get_server_status(
-    address: &str,
-    protocol_version: Option<i32>,
-) -> Result<ServerStatus> {
-    Ok(worlds::get_server_status(address, protocol_version).await?)
-}
-
-#[tauri::command]
-pub async fn start_join_singleplayer_world(
-    path: &str,
-    world: String,
-) -> Result<ProcessMetadata> {
-    let process =
-        profile::run(path, &QuickPlayType::Singleplayer(world)).await?;
-
-    Ok(process)
-}
-
-#[tauri::command]
-pub async fn start_join_server(
-    path: &str,
-    address: &str,
-) -> Result<ProcessMetadata> {
-    let process =
-        profile::run(path, &QuickPlayType::Server(address.to_owned())).await?;
-
-    Ok(process)
-}

apps/app/src/main.rs

@@ -117,7 +117,8 @@ fn show_window(app: tauri::AppHandle) {
             .set_type(MessageType::Error)
             .set_title("Initialization error")
             .set_text(&format!(
-                "Cannot display application window due to an error:\n{e}"
+                "Cannot display application window due to an error:\n{}",
+                e
             ))
             .show_alert()
             .unwrap();
@@ -137,7 +138,8 @@ fn is_dev() -> bool {
 async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
     window.set_decorations(b).map_err(|e| {
         theseus::Error::from(theseus::ErrorKind::OtherError(format!(
-            "Failed to toggle decorations: {e}"
+            "Failed to toggle decorations: {}",
+            e
         )))
     })?;
     Ok(())
@@ -266,7 +268,6 @@ fn main() {
         .plugin(api::cache::init())
         .plugin(api::ads::init())
         .plugin(api::friends::init())
-        .plugin(api::worlds::init())
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
@@ -318,7 +319,7 @@ fn main() {
             #[cfg(target_os = "windows")]
             {
                 // tauri doesn't expose runtime errors, so matching a string representation seems like the only solution
-                if format!("{e:?}").contains(
+                if format!("{:?}", e).contains(
                     "Runtime(CreateWebview(WebView2Error(WindowsError",
                 ) {
                     MessageDialog::new()
@@ -336,7 +337,8 @@ fn main() {
                 .set_type(MessageType::Error)
                 .set_title("Initialization error")
                 .set_text(&format!(
-                    "Cannot initialize application due to an error:\n{e:?}"
+                    "Cannot initialize application due to an error:\n{:?}",
+                    e
                 ))
                 .show_alert()
                 .unwrap();

apps/app/tauri-release.conf.json

@@ -1,6 +1,10 @@
 {
   "bundle": {
-    "createUpdaterArtifacts": "v1Compatible"
+    "createUpdaterArtifacts": "v1Compatible",
+    "windows": {
+      "certificateThumbprint": "6007d6ed9b1ba057aa29144d58ca3ed89ac4ef94",
+      "signCommand": "bash -c \"jsign.bat --storetype ETOKEN --alg SHA-256 --storepass $DIGICERT_PASSWORD --tsurl https://timestamp.digicert.com %1\""
+    }
   },
   "build": {
     "features": ["updater"]

apps/app/tauri.conf.json

@@ -39,12 +39,12 @@
     "fileAssociations": [
       {
         "ext": ["mrpack"],
-        "mimeType": "application/x-modrinth-modpack+zip"
+        "mimeType": "application/zip+mrpack"
       }
     ]
   },
   "productName": "Modrinth App",
-  "version": "0.9.5",
+  "version": "0.9.2",
   "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {
@@ -76,14 +76,14 @@
     ],
     "security": {
       "assetProtocol": {
-        "scope": ["$APPDATA/caches/icons/*", "$APPCONFIG/caches/icons/*", "$CONFIG/caches/icons/*", "$APPDATA/profiles/*/saves/*/icon.png", "$APPCONFIG/profiles/*/saves/*/icon.png", "$CONFIG/profiles/*/saves/*/icon.png"],
+        "scope": ["$APPDATA/caches/icons/*", "$APPCONFIG/caches/icons/*", "$CONFIG/caches/icons/*"],
         "enable": true
       },
       "capabilities": ["ads", "core", "plugins"],
       "csp": {
         "default-src": "'self' customprotocol: asset:",
         "connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs",
-        "font-src": ["https://cdn-raw.modrinth.com/fonts/"],
+        "font-src": ["https://cdn-raw.modrinth.com/fonts/inter/"],
         "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost blob: data:",
         "style-src": "'unsafe-inline' 'self'",
         "script-src": "https://*.posthog.com 'self'",

apps/daedalus_client/Cargo.toml

@@ -22,6 +22,7 @@ reqwest = { version = "0.12.5", default-features = false, features = [
     "rustls-tls-native-roots",
 ] }
 async_zip = { version = "0.0.17", features = ["full"] }
+semver = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 bytes = "1.6.0"
 rust-s3 = { version = "0.33.0", default-features = false, features = [
@@ -38,3 +39,4 @@ tracing-error = "0.2.0"
 
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] }

apps/daedalus_client/src/forge.rs

@@ -57,7 +57,7 @@ pub async fn fetch_forge(
 
         ForgeVersion {
             format_version,
-            installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{loader_version}/forge-{loader_version}-installer.jar"),
+            installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{0}/forge-{0}-installer.jar", loader_version),
             raw: loader_version,
             loader_version: version_split,
             game_version: game_version.clone(),
@@ -137,7 +137,7 @@ pub async fn fetch_neo(
 
         Ok(ForgeVersion {
             format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{loader_version}/forge-{loader_version}-installer.jar"),
+            installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{0}/forge-{0}-installer.jar", loader_version),
             raw: loader_version,
             loader_version: version_split,
             game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
@@ -163,7 +163,7 @@ pub async fn fetch_neo(
 
         Ok(ForgeVersion {
             format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{loader_version}/neoforge-{loader_version}-installer.jar"),
+            installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{0}/neoforge-{0}-installer.jar", loader_version),
             loader_version: loader_version.clone(),
             raw: loader_version,
             game_version,
@@ -502,7 +502,7 @@ async fn fetch(
                             )?;
 
                             artifact.url =
-                                format_url(&format!("maven/{artifact_path}"));
+                                format_url(&format!("maven/{}", artifact_path));
 
                             return Ok(lib);
                         }
@@ -598,7 +598,7 @@ async fn fetch(
                             ))
                                 })?;
 
-                        let file_name = value.split('/').next_back()
+                        let file_name = value.split('/').last()
                             .ok_or_else(|| {
                                 crate::ErrorKind::InvalidInput(format!(
                                     "Unable reading filename for data key {key} at path {value}",

apps/docs/astro.config.mjs

@@ -44,10 +44,6 @@ export default defineConfig({
           label: 'Contributing to Modrinth',
           autogenerate: { directory: 'contributing' },
         },
-        {
-          label: 'Guides',
-          autogenerate: { directory: 'guide' },
-        },
         // Add the generated sidebar group to the sidebar.
         ...openAPISidebarGroups,
       ],

apps/docs/package.json

@@ -10,12 +10,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.4",
-    "@astrojs/starlight": "^0.32.2",
+    "@astrojs/check": "^0.9.3",
+    "@astrojs/starlight": "^0.26.3",
     "@modrinth/assets": "workspace:*",
-    "astro": "^5.4.1",
-    "sharp": "^0.33.5",
-    "starlight-openapi": "^0.14.0",
-    "typescript": "^5.8.2"
+    "astro": "^4.10.2",
+    "sharp": "^0.32.5",
+    "starlight-openapi": "^0.7.0",
+    "typescript": "^5.5.4"
   }
-}
+}

apps/docs/public/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: '3.0.0'
 
 info:
-  version: v2.7.0/366f528
+  version: v2.7.0/15cf3fc
   title: Labrinth
   termsOfService: https://modrinth.com/legal/terms
   contact:
@@ -51,7 +51,35 @@ info:
     Please note that certain scopes and requests cannot be completed with a personal access token or using OAuth.
     For example, deleting a user account can only be done through Modrinth's frontend.
 
-    A detailed guide on OAuth has been published in [Modrinth's technical documentation](https://docs.modrinth.com/guide/oauth).
+    ### OAuth2
+    Applications interacting with an authenticated API should create an OAuth2 application.
+    You can do this in [the developer settings](https://modrinth.com/settings/applications).
+
+    Make sure to save your application secret, as you will not be able to access it after you leave the page.
+
+    Once you have created a client, use the following URL to have a user authorize your client:
+    ```
+    https://modrinth.com/auth/authorize?client_id=<CLIENT_ID>&redirect_uri=<CALLBACK_URL>&scope=<SCOPE_ONE>+<SCOPE_TWO>+<SCOPE_THREE>
+    ```
+    > You can get a list of all scope names [here](https://github.com/modrinth/code/tree/main/apps/labrinth/src/models/v3/pats.rs).
+
+    Then, send a `POST` request to the following URL to get the token:
+
+    ```
+    https://api.modrinth.com/_internal/oauth/token
+    ```
+
+    > Note that you will need to provide your application's secret under the Authorization header.
+
+    In the body of your request, make sure to include the following:
+    - `code`: The code generated when authorizing your client
+    - `client_id`: Your client ID (found in developer settings)
+    - `redirect_uri`: A valid redirect URI provided in your application's settings
+    - `grant_type`: This will need to be `authorization_code`.
+
+    If your token request fails for any reason, you will need to get another code from the authorization process.
+
+    This route will be changed in the future to move the `_internal` part to `v3`.
 
     ### Personal access tokens
     Personal access tokens (PATs) can be generated in from [the user settings](https://modrinth.com/settings/account).
@@ -1795,7 +1823,7 @@ components:
           description: Number of projects on Modrinth
         versions:
           type: integer
-          description: Number of versions on Modrinth
+          description: Number of projects on Modrinth
         files:
           type: integer
           description: Number of version files on Modrinth
@@ -2990,24 +3018,6 @@ paths:
                 $ref: '#/components/schemas/InvalidInputError'
         '404':
           description: The requested item(s) were not found or no authorization to access the requested item(s)
-    delete:
-      summary: Remove user's avatar
-      operationId: deleteUserIcon
-      tags:
-        - users
-      security:
-        - TokenAuth: ['USER_WRITE']
-      responses:
-        '204':
-          description: Expected response to a valid request
-        '400':
-          description: Request was invalid, see given error
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/InvalidInputError'
-        '404':
-          description: The requested item(s) were not found or no authorization to access the requested item(s)
   /user/{id|username}/projects:
     parameters:
       - $ref: '#/components/parameters/UserIdentifier'

apps/docs/src/content.config.ts

@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-import { docsLoader } from '@astrojs/starlight/loaders';
-import { docsSchema } from '@astrojs/starlight/schema';
-
-export const collections = {
-  docs: defineCollection({ loader: docsLoader(), schema: docsSchema() }),
-};

apps/docs/src/content/config.ts

@@ -0,0 +1,6 @@
+import { defineCollection } from 'astro:content'
+import { docsSchema } from '@astrojs/starlight/schema'
+
+export const collections = {
+  docs: defineCollection({ schema: docsSchema() }),
+}

apps/docs/src/content/docs/guide/oauth.md

@@ -1,95 +0,0 @@
----
-title: The hitchhiker's guide to OAuth
-description: Guide for using Modrinth OAuth to interact with the API on users' behalf.
----
-
-Modrinth allows developers to create applications which, once authorized by a Modrinth user, let the developer interact with the API on their behalf. The flow used to get an API token is based on the OAuth 2 protocol. It is recommended that most people use an existing OAuth library to handle the authentication. If you want to implement it from scratch, you will need to look into [RFC 6749]. If the only user of the application is yourself, a personal access token (PAT) may be a better fit.
-
-If you're familiar with OAuth 2, these are the URLs you will need:
-
-| Name               | URL                                              |
-|--------------------|--------------------------------------------------|
-| Authorization page | `https://modrinth.com/auth/authorize`            |
-| Token exchange     | `https://api.modrinth.com/_internal/oauth/token` |
-
-The flow will generally look like this:
-
-1. User is redirected to Modrinth to authorize your application
-2. User is redirected back to your site after authorizing, with an authorization code
-3. Your backend exchanges this code for an access token
-
-## Register your application
-
-To start off, you need to [register an application] in Modrinth's systems. The settings chosen here can always be changed later. You need to select what permissions you need, called scopes. For security reasons you will want to select only the scopes you need. See the [principle of least privilege].
-
-In addition to name and scopes, you will also need to add one or more redirect URIs. These are the URIs that the user can be redirected to after they authorize your application.
-
-After you've registered your application, it is important that you take note of the client secret somewhere safe. If the client secret is to ever leak, it is important that you regenerate it to ensure the security of your authorized users. If your client secret or access tokens are found exposed in the wild, your application may be disabled without prior notice.
-
-## Getting authorization
-
-Once the user is ready to authorize your application, you need to construct a URL to redirect them to. The authorization URL for Modrinth is `https://api.modrinth.com/_internal/oauth/token`. Supply the following query parameters:
-
-| Query parameter | Description                                                                               |
-|-----------------|-------------------------------------------------------------------------------------------|
-| `response_type` | In Modrinth this always needs to be `code`, since only code grants are supported          |
-| `client_id`     | The application identifier found in the settings                                          |
-| `scope`         | The permissions you need access to                                                        |
-| `state`         | A mechanism to prevent certain attacks. Explained further below. Recommended but optional |
-| `redirect_uri`  | The URI the user is redirect to after finishing authorization                             |
-
-You might have noticed the `state` parameter. [CSRF] (Cross-site request forgery), and [clickjacking] are security vulnerabilities that you're recommended to protect against. In OAuth2 this is usually done with the `state` parameter. When the user initiates a request to start authorization, you include a `state` which is unique to this request. This can, for example, be saved in localStorge or a cookie. When the redirect URI is called, you verify that the `state` parameter is the same. Using `state` is optional, but recommended.
-
-The scope identifiers are currently best found in the backend source code located at [`apps/labrinth/src/models/v3/pats.rs`]. The scope parameter is an array of scope identifiers, seperated by a plus sign (`+`).
-
-The redirect URI is the endpoint on your server that will receive the code which can eventually be used to act on the user's behalf. For security reasons the redirect URI used has to be allowlisted in your application settings. The redirect will contain the following query parameters:
-
-| Query parameter | Description                                        |
-|-----------------|----------------------------------------------------|
-| `code`          | The code that can be exchanged for an access token |
-| `client_id`     | Your client id                                     |
-| `redirect_uri`  | The redirect URI which was used                    |
-| `grant_type`    | Always `authorization_code` in Modrinth            |
-
-## Exchanging tokens
-
-If you've followed the previous section on getting authorization, you should now have an authorization code. Before you can access the API, you need to exchange this code for an access token. This is done by sending a POST request to the exchange token endpoint, `https://api.modrinth.com/_internal/oauth/token`. This request has to be of type urlencoded form. Make sure the `Content-Type` header is set to `application/x-www-form-urlencoded`. To authenticate this request you need to place your client secret in the `Authorization` header.
-
-In the body use these fields:
-
-| Field          | Description                                                  |
-|----------------|--------------------------------------------------------------|
-| `code`         | The authorization code                                       |
-| `client_id`    | Your client id, the same as in the authorization request     |
-| `redirect_uri` | The redirect URI which was redirected to after authorization |
-| `grant_type`   | Always `authorization_code` in Modrinth                      |
-
-If the request succeeds, you should receive a JSON payload with these fields:
-
-| Field          | Description                                          |
-|----------------|------------------------------------------------------|
-| `access_token` | The access token you can use to access the API       |
-| `token_type`   | Currently only `Bearer`                              |
-| `expires_in`   | The amount of seconds until the access token expires |
-
-To use this access token, you attach it to API requests in the `Authorization` header. To get basic information about the authorizer, you can use the [`/user` endpoint], which automatically gets the user from the header.
-
-If you have any questions, you're welcome to ask in #api-development in the [Discord guild], or create a ticket on the [support portal].
-
-[RFC 6749]: https://datatracker.ietf.org/doc/html/rfc6749
-
-[register an application]: https://modrinth.com/settings/applications
-
-[principle of least privilege]: https://en.wikipedia.org/wiki/Principle_of_least_privilege
-
-[`apps/labrinth/src/models/v3/pats.rs`]: https://github.com/modrinth/code/blob/main/apps/labrinth/src/models/v3/pats.rs
-
-[CSRF]: https://en.wikipedia.org/wiki/Cross-site_request_forgery
-
-[Clickjacking]: https://en.wikipedia.org/wiki/Clickjacking
-
-[`/user` endpoint]: https://docs.modrinth.com/api/operations/getuserfromauth/
-
-[Discord guild]: https://discord.modrinth.com
-
-[support portal]: https://support.modrinth.com/en/

apps/frontend/.env.example

@@ -1,3 +1,2 @@
 BASE_URL=https://api.modrinth.com/v2/
 BROWSER_BASE_URL=https://api.modrinth.com/v2/
-PYRO_BASE_URL=https://archon.modrinth.com/

apps/frontend/nuxt.config.ts

@@ -126,7 +126,6 @@ export default defineNuxtConfig({
         homePageSearch?: any[];
         homePageNotifs?: any[];
         products?: any[];
-        errors?: number[];
       } = {};
 
       try {
@@ -158,14 +157,6 @@ export default defineNuxtConfig({
         },
       };
 
-      const caughtErrorCodes = new Set<number>();
-
-      function handleFetchError(err: any, defaultValue: any) {
-        console.error("Error generating state: ", err);
-        caughtErrorCodes.add(err.status);
-        return defaultValue;
-      }
-
       const [
         categories,
         loaders,
@@ -177,25 +168,15 @@ export default defineNuxtConfig({
         homePageNotifs,
         products,
       ] = await Promise.all([
-        $fetch(`${API_URL}tag/category`, headers).catch((err) => handleFetchError(err, [])),
-        $fetch(`${API_URL}tag/loader`, headers).catch((err) => handleFetchError(err, [])),
-        $fetch(`${API_URL}tag/game_version`, headers).catch((err) => handleFetchError(err, [])),
-        $fetch(`${API_URL}tag/donation_platform`, headers).catch((err) =>
-          handleFetchError(err, []),
-        ),
-        $fetch(`${API_URL}tag/report_type`, headers).catch((err) => handleFetchError(err, [])),
-        $fetch(`${API_URL}projects_random?count=60`, headers).catch((err) =>
-          handleFetchError(err, []),
-        ),
-        $fetch(`${API_URL}search?limit=3&query=leave&index=relevance`, headers).catch((err) =>
-          handleFetchError(err, {}),
-        ),
-        $fetch(`${API_URL}search?limit=3&query=&index=updated`, headers).catch((err) =>
-          handleFetchError(err, {}),
-        ),
-        $fetch(`${API_URL.replace("/v2/", "/_internal/")}billing/products`, headers).catch((err) =>
-          handleFetchError(err, []),
-        ),
+        $fetch(`${API_URL}tag/category`, headers),
+        $fetch(`${API_URL}tag/loader`, headers),
+        $fetch(`${API_URL}tag/game_version`, headers),
+        $fetch(`${API_URL}tag/donation_platform`, headers),
+        $fetch(`${API_URL}tag/report_type`, headers),
+        $fetch(`${API_URL}projects_random?count=60`, headers),
+        $fetch(`${API_URL}search?limit=3&query=leave&index=relevance`, headers),
+        $fetch(`${API_URL}search?limit=3&query=&index=updated`, headers),
+        $fetch(`${API_URL.replace("/v2/", "/_internal/")}billing/products`, headers),
       ]);
 
       state.categories = categories;
@@ -207,7 +188,6 @@ export default defineNuxtConfig({
       state.homePageSearch = homePageSearch;
       state.homePageNotifs = homePageNotifs;
       state.products = products;
-      state.errors = [...caughtErrorCodes];
 
       await fs.writeFile("./src/generated/state.json", JSON.stringify(state));
 

apps/frontend/package.json

@@ -10,7 +10,7 @@
     "postinstall": "nuxi prepare",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
+    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
   },
   "devDependencies": {
     "@formatjs/cli": "^6.2.12",
@@ -57,8 +57,6 @@
     "pinia": "^2.1.7",
     "qrcode.vue": "^3.4.0",
     "semver": "^7.5.4",
-    "three": "^0.172.0",
-    "@types/three": "^0.172.0",
     "vue-multiselect": "3.0.0-alpha.2",
     "vue-typed-virtual-list": "^1.0.10",
     "vue3-ace-editor": "^2.2.4",

apps/frontend/src/assets/images/utils/align-left.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <line x1="21" y1="6" x2="3" y2="6"></line>
+  <line x1="15" y1="12" x2="3" y2="12"></line>
+  <line x1="17" y1="18" x2="3" y2="18"></line>
+
+</svg>

apps/frontend/src/assets/images/utils/archive.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="2" y="4" width="20" height="5" rx="2"></rect>
+  <path d="M4 9v9a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9"></path>
+  <path d="M10 13h4"></path>
+
+</svg>

apps/frontend/src/assets/images/utils/asterisk.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 6v12"></path>
+  <path d="M17.196 9 6.804 15"></path>
+  <path d="m6.804 9 10.392 6"></path>
+
+</svg>

apps/frontend/src/assets/images/utils/bell-ring.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path>
+  <path d="M13.73 21a2 2 0 0 1-3.46 0"></path>
+  <path d="M2 8c0-2.2.7-4.3 2-6"></path>
+  <path d="M22 8a10 10 0 0 0-2-6"></path>
+
+</svg>

apps/frontend/src/assets/images/utils/bell.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path>
+  <path d="M13.73 21a2 2 0 0 1-3.46 0"></path>
+
+</svg>