Attempt to fix cache issue

.cargo/config.toml

@@ -1,9 +1,6 @@
-# Windows has stack overflows when calling from Tauri, so we increase the default stack size used by the compiler
+# Windows has stack overflows when calling from Tauri, so we increase compiler size
 [target.'cfg(windows)']
-rustflags = ["-C", "link-args=/STACK:16777220", "--cfg", "tokio_unstable"]
+rustflags = ["-C", "link-args=/STACK:16777220"]
-
-[target.x86_64-pc-windows-msvc]
-linker = "rust-lld"
 
 [build]
 rustflags = ["--cfg", "tokio_unstable"]

.dockerignore

@@ -1 +0,0 @@
-.gitignore

.editorconfig

@@ -14,5 +14,5 @@ max_line_length = 100
 max_line_length = off
 trim_trailing_whitespace = false
 
-[*.{rs,java,kts}]
+[*.rs]
 indent_size = 4

.gitattributes

@@ -1,35 +1 @@
 * text=auto eol=lf
-
-# SQLx calculates a checksum of migration scripts at build time to compare
-# it with the checksum of the applied migration for the same version at
-# runtime, to know if the migration script has been changed, and thus the
-# DB schema went out of sync with the code.
-#
-# However, such checksum treats the script as a raw byte stream, taking
-# into account inconsequential differences like different line endings
-# in different OSes. When combined with Git's EOL conversion and mixed
-# native and cross-compilation scenarios, this leads to existing
-# migrations that didn't change having potentially different checksums
-# according to the environment they were built in, which can break the
-# migration system when deploying the Modrinth App, rendering it
-# unusable.
-#
-# The gitattribute above ensures that all text files are checked out
-# with LF line endings, but widely deployed app versions were built
-# without this attribute set, which left such line endings variable to
-# the platform. Thus, there is no perfect solution to this problem:
-# forcing CRLF here would break Linux and macOS users, forcing LF
-# breaks Windows users, and leaving it unspecified may still lead to
-# line ending differences when cross-compiling from Linux to Windows
-# or vice versa, or having Git configured with different line
-# conversion settings. Moreover, there is no `eol=native` attribute,
-# and using CI-only scripts to convert line endings would make the
-# builds differ between CI and most local environments. So, let's pick
-# the least bad option: let Git handle line endings using its
-# configuration by leaving it unspecified, which works fine as long as
-# people don't mess with Git's line ending settings, which is the vast
-# majority of cases.
-/packages/app-lib/migrations/20240711194701_init.sql !eol
-/packages/app-lib/migrations/20240813205023_drop-active-unique.sql !eol
-/packages/app-lib/migrations/20240930001852_disable-personalized-ads.sql !eol
-/packages/app-lib/migrations/20241222013857_feature-flags.sql !eol

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

@@ -6,7 +6,7 @@ body:
     attributes:
       label: Please confirm the following.
       options:
-        - label: I checked the [existing issues](https://github.com/modrinth/code/issues?q=is%3Aissue) for duplicate problems
+        - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate problems
           required: true
         - label: I have tried resolving the issue using the [support portal](https://support.modrinth.com)
           required: true
@@ -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/ISSUE_TEMPLATE/2-web-bug.yml

@@ -6,7 +6,7 @@ body:
     attributes:
       label: Please confirm the following.
       options:
-        - label: I checked the [existing issues](https://github.com/modrinth/code/issues?q=is%3Aissue) for duplicate problems
+        - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate problems
           required: true
         - label: I have tried resolving the issue using the [support portal](https://support.modrinth.com)
           required: true

.github/ISSUE_TEMPLATE/3-api-bug.yml

@@ -6,7 +6,7 @@ body:
     attributes:
       label: Please confirm the following.
       options:
-        - label: I checked the [existing issues](https://github.com/modrinth/code/issues?q=is%3Aissue) for duplicate problems
+        - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate problems
           required: true
         - label: I have tried resolving the issue using the [support portal](https://support.modrinth.com)
           required: true

.github/ISSUE_TEMPLATE/4-feature-request.yml

@@ -7,7 +7,7 @@ body:
     attributes:
       label: Please confirm the following.
       options:
-        - label: I checked the [existing issues](https://github.com/modrinth/code/issues?q=is%3Aissue) for duplicate feature requests
+        - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate feature requests
           required: true
         - label: I have checked that this feature request is not on our [roadmap](https://roadmap.modrinth.com)
           required: true

.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]
 
@@ -22,26 +20,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       - name: Fetch docker metadata
         id: docker_meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: ghcr.io/modrinth/daedalus
       - name: Login to GitHub Images
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        id: docker_build
+        uses: docker/build-push-action@v2
         with:
           file: ./apps/daedalus_client/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/modrinth/daedalus:main
-          cache-to: type=inline

.github/workflows/labrinth-docker.yml

@@ -18,28 +18,30 @@ on:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./apps/labrinth
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       - name: Fetch docker metadata
         id: docker_meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: ghcr.io/modrinth/labrinth
       - name: Login to GitHub Images
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        id: docker_build
+        uses: docker/build-push-action@v2
+        env:
+          SQLX_OFFLINE: true
         with:
           file: ./apps/labrinth/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/modrinth/labrinth:main
-          cache-to: type=inline

.github/workflows/theseus-build.yml

@@ -1,152 +0,0 @@
-name: Modrinth App build
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - 'v*'
-    paths:
-      - .github/workflows/theseus-build.yml
-      - 'apps/app/**'
-      - 'apps/app-frontend/**'
-      - 'packages/app-lib/**'
-      - 'packages/app-macros/**'
-      - 'packages/assets/**'
-      - 'packages/ui/**'
-      - 'packages/utils/**'
-  workflow_dispatch:
-    inputs:
-      sign-windows-binaries:
-        description: Sign Windows binaries
-        type: boolean
-        default: true
-        required: false
-
-jobs:
-  build:
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-latest, windows-latest, ubuntu-22.04]
-        include:
-          - platform: macos-latest
-            artifact-target-name: universal-apple-darwin
-          - platform: windows-latest
-            artifact-target-name: x86_64-pc-windows-msvc
-          - platform: ubuntu-22.04
-            artifact-target-name: x86_64-unknown-linux-gnu
-
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - name: 📥 Check out code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 🧰 Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          rustflags: ''
-          target: ${{ startsWith(matrix.platform, 'macos') && 'x86_64-apple-darwin' || '' }}
-
-      - name: 🧰 Install pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: 🧰 Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
-
-      - name: 🧰 Install Linux build dependencies
-        if: startsWith(matrix.platform, 'ubuntu')
-        run: |
-          sudo apt-get update
-          sudo apt-get install -yq libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
-
-      - name: 🧰 Setup Dasel
-        uses: jaxxstorm/action-install-gh-release@v2.1.0
-        with:
-          repo: TomWright/dasel
-          tag: v2.8.1
-          extension-matching: disable
-          rename-to: ${{ startsWith(matrix.platform, 'windows') && 'dasel.exe' || 'dasel' }}
-          chmod: 0755
-
-      - name: ⚙️ Set application version and environment
-        shell: bash
-        run: |
-          APP_VERSION="$(git describe --tags --always | sed -E 's/-([0-9]+)-(g[0-9a-fA-F]+)$/-canary+\1.\2/')"
-          echo "Setting application version to $APP_VERSION"
-          dasel put -f apps/app/Cargo.toml -t string -v "${APP_VERSION#v}" 'package.version'
-          dasel put -f packages/app-lib/Cargo.toml -t string -v "${APP_VERSION#v}" 'package.version'
-          dasel put -f apps/app-frontend/package.json -t string -v "${APP_VERSION#v}" 'version'
-
-          cp packages/app-lib/.env.prod packages/app-lib/.env
-
-      - name: 💨 Setup Turbo cache
-        uses: rharkor/caching-for-turbo@v1.8
-
-      - name: 🧰 Install dependencies
-        run: pnpm install
-
-      - name: ✍️ Set up Windows code signing
-        if: startsWith(matrix.platform, 'windows')
-        shell: bash
-        run: |
-          if [ '${{ startsWith(github.ref, 'refs/tags/v') || inputs.sign-windows-binaries }}' = 'true' ]; then
-            choco install jsign --ignore-dependencies # GitHub runners come with a global Java installation already
-          else
-            dasel delete -f apps/app/tauri-release.conf.json 'bundle.windows.signCommand'
-          fi
-
-      - name: 🔨 Build macOS app
-        run: pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config tauri-release.conf.json
-        if: startsWith(matrix.platform, 'macos')
-        env:
-          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
-      - name: 🔨 Build Linux app
-        run: pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json
-        if: startsWith(matrix.platform, 'ubuntu')
-        env:
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
-      - name: 🔨 Build Windows app
-        run: |
-          [System.Convert]::FromBase64String("$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64") | Set-Content -Path signer-client-cert.p12 -AsByteStream
-          $env:DIGICERT_ONE_SIGNER_CREDENTIALS = "$env:DIGICERT_ONE_SIGNER_API_KEY|$PWD\signer-client-cert.p12|$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD"
-          $env:JAVA_HOME = "$env:JAVA_HOME_11_X64"
-          pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json --verbose --bundles 'nsis,updater'
-          Remove-Item -Path signer-client-cert.p12 -ErrorAction SilentlyContinue
-        if: startsWith(matrix.platform, 'windows')
-        env:
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          DIGICERT_ONE_SIGNER_API_KEY: ${{ secrets.DIGICERT_ONE_SIGNER_API_KEY }}
-          DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64: ${{ secrets.DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64 }}
-          DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD }}
-
-      - name: 📤 Upload app bundles
-        uses: actions/upload-artifact@v4
-        with:
-          name: App bundle (${{ matrix.artifact-target-name }})
-          path: |
-            target/release/bundle/appimage/Modrinth App_*.AppImage*
-            target/release/bundle/deb/Modrinth App_*.deb*
-            target/release/bundle/rpm/Modrinth App-*.rpm*
-            target/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz*
-            target/universal-apple-darwin/release/bundle/dmg/Modrinth App_*.dmg*
-            target/release/bundle/nsis/Modrinth App_*-setup.exe*
-            target/release/bundle/nsis/Modrinth App_*-setup.nsis.zip*

.github/workflows/theseus-release.yml

@@ -1,118 +1,157 @@
-name: Modrinth App release
+name: 'Modrinth App build'
 on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+    paths:
+      - .github/workflows/theseus-release.yml
+      - 'apps/app/**'
+      - 'apps/app-frontend/**'
+      - 'apps/labrinth/src/common/**'
+      - 'apps/labrinth/Cargo.toml'
+      - 'packages/app-lib/**'
+      - 'packages/app-macros/**'
+      - 'packages/assets/**'
+      - 'packages/ui/**'
+      - 'packages/utils/**'
   workflow_dispatch:
-    inputs:
-      version-tag:
-        description: Version tag to release to the wide public
-        type: string
-        required: true
-      release-notes:
-        description: Release notes to include in the Tauri version manifest
-        default: A new release of the Modrinth App is available!
-        type: string
-        required: true
 
 jobs:
-  release:
+  build:
-    name: Release Modrinth App
+    strategy:
-    runs-on: ubuntu-latest
+      fail-fast: false
+      matrix:
+        platform: [macos-latest, windows-latest, ubuntu-22.04]
 
-    env:
+    runs-on: ${{ matrix.platform }}
-      LINUX_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-unknown-linux-gnu)
-      WINDOWS_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-pc-windows-msvc)
-      MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME: App bundle (universal-apple-darwin)
-      LAUNCHER_FILES_BUCKET_BASE_URL: https://launcher-files.modrinth.com
 
     steps:
-      - name: 📥 Download Modrinth App artifacts
+      - uses: actions/checkout@v4
-        uses: dawidd6/action-download-artifact@v11
+
+      - name: Rust setup (mac)
+        if: startsWith(matrix.platform, 'macos')
+        uses: dtolnay/rust-toolchain@stable
         with:
-          workflow: theseus-build.yml
+          components: rustfmt, clippy
-          workflow_conclusion: success
+          targets: aarch64-apple-darwin, x86_64-apple-darwin
-          event: push
-          branch: ${{ inputs.version-tag }}
-          use_unzip: true
 
-      - name: 🛠️ Generate version manifest
+      - name: Rust setup
-        env:
+        if: "!startsWith(matrix.platform, 'macos')"
-          VERSION_TAG: ${{ inputs.version-tag }}
+        uses: dtolnay/rust-toolchain@stable
-          RELEASE_NOTES: ${{ inputs.release-notes }}
+        with:
+          components: rustfmt, clippy
+
+      - name: Setup rust cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            target/**
+            !target/*/release/bundle/*/*.dmg
+            !target/*/release/bundle/*/*.app.tar.gz
+            !target/*/release/bundle/*/*.app.tar.gz.sig
+            !target/release/bundle/*/*.dmg
+            !target/release/bundle/*/*.app.tar.gz
+            !target/release/bundle/*/*.app.tar.gz.sig
+
+            !target/release/bundle/appimage/*.AppImage
+            !target/release/bundle/appimage/*.AppImage.tar.gz
+            !target/release/bundle/appimage/*.AppImage.tar.gz.sig
+            !target/release/bundle/deb/*.deb
+            !target/release/bundle/rpm/*.rpm
+
+            !target/release/bundle/msi/*.msi
+            !target/release/bundle/msi/*.msi.zip
+            !target/release/bundle/msi/*.msi.zip.sig
+
+            !target/release/bundle/nsis/*.exe
+            !target/release/bundle/nsis/*.nsis.zip
+            !target/release/bundle/nsis/*.nsis.zip.sig
+          key: ${{ runner.os }}-rust-target-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-target-
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install pnpm via corepack
+        shell: bash
         run: |
-          # Reference: https://tauri.app/plugin/updater/#server-support
+          corepack enable
-          jq -nc \
+          corepack prepare --activate
-            --arg versionTag "${VERSION_TAG#v}" \
-            --arg releaseNotes "$RELEASE_NOTES" \
-            --rawfile macOsAarch64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
-            --rawfile macOsX64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
-            --rawfile linuxX64UpdateArtifactSignature "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_amd64.AppImage.tar.gz.sig" \
-            --rawfile windowsX64UpdateArtifactSignature "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION_TAG#v}_x64-setup.nsis.zip.sig" \
-          '{
-            "version": $versionTag,
-            "notes": $releaseNotes,
-            "pub_date": now | todateiso8601,
-            "platforms": {
-              "darwin-aarch64": {
-                "signature": $macOsAarch64UpdateArtifactSignature,
-                "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/macos/\("Modrinth App.app.tar.gz")",
-                "install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/macos/\("Modrinth App_" + $versionTag + "_universal.dmg")"]
-              },
-              "darwin-x86_64": {
-                "signature": $macOsX64UpdateArtifactSignature,
-                "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/macos/\("Modrinth App.app.tar.gz")",
-                "install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/macos/\("Modrinth App_" + $versionTag + "_universal.dmg")"]
-              },
-              "linux-x86_64": {
-                "signature": $linuxX64UpdateArtifactSignature,
-                "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_amd64.AppImage.tar.gz")",
-                "install_urls": [
-                  @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_amd64.deb")",
-                  @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_amd64.AppImage")",
-                  @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App-" + $versionTag + "-1.x86_64.rpm")"
-                ]
-              },
-              "windows-x86_64": {
-                "signature": $windowsX64UpdateArtifactSignature,
-                "url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.nsis.zip")",
-                "install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.exe")"]
-              }
-            }
-          }' > updates.json
 
-          echo "Generated manifest for version ${VERSION_TAG}:"
+      - name: Get pnpm store directory
-          cat updates.json
+        id: pnpm-cache
-
+        shell: bash
-      - name: 📤 Upload release artifacts
-        env:
-          VERSION_TAG: ${{ inputs.version-tag }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.LAUNCHER_FILES_BUCKET_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.LAUNCHER_FILES_BUCKET_SECRET_ACCESS_KEY }}
-          AWS_BUCKET: ${{ secrets.LAUNCHER_FILES_BUCKET_NAME }}
-          AWS_REGION: ${{ secrets.LAUNCHER_FILES_BUCKET_REGION }}
-          AWS_ENDPOINT_URL: ${{ secrets.LAUNCHER_FILES_BUCKET_ENDPOINT_URL }}
-          AWS_PAGER: ''
-          # Work around incompatible checksum behavior with some S3-like object storage providers,
-          # such as Cloudflare R2. See:
-          # - https://developers.cloudflare.com/r2/examples/aws/aws-cli/
-          # - https://developers.cloudflare.com/r2/examples/aws/aws-sdk-java/
-          AWS_REQUEST_CHECKSUM_CALCULATION: when_required
-          AWS_RESPONSE_CHECKSUM_VALIDATION: when_required
         run: |
-          for macosBundleType in 'macos' 'dmg'; do
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-            aws s3 cp --recursive \
-              "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/${macosBundleType}" \
-              "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/macos"
-          done
 
-          for linuxBundleType in 'appimage' 'deb' 'rpm'; do
+      - name: Setup pnpm cache
-            aws s3 cp --recursive \
+        uses: actions/cache@v4
-              "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${linuxBundleType}" \
+        with:
-              "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/linux"
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          done
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
-          for windowsBundleType in 'nsis'; do
+      - name: install dependencies (ubuntu only)
-            aws s3 cp --recursive \
+        if: startsWith(matrix.platform, 'ubuntu')
-              "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${windowsBundleType}" \
+        run: |
-              "s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/windows"
+          sudo apt-get update
-          done
+          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev pkg-config libayatana-appindicator3-dev librsvg2-dev
 
-          aws s3 cp updates.json "s3://${AWS_BUCKET}"
+      - name: Install frontend dependencies
+        run: pnpm install
+
+      - name: build app (macos)
+        run: pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config "tauri-release.conf.json"
+        if: startsWith(matrix.platform, 'macos')
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+
+      - name: build app
+        run: pnpm --filter=@modrinth/app run tauri build --config "tauri-release.conf.json"
+        id: build_os
+        if: "!startsWith(matrix.platform, 'macos')"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+
+      - name: upload ${{ matrix.platform }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform }}
+          path: |
+            target/*/release/bundle/*/*.dmg
+            target/*/release/bundle/*/*.app.tar.gz
+            target/*/release/bundle/*/*.app.tar.gz.sig
+            target/release/bundle/*/*.dmg
+            target/release/bundle/*/*.app.tar.gz
+            target/release/bundle/*/*.app.tar.gz.sig
+
+            target/release/bundle/*/*.AppImage
+            target/release/bundle/*/*.AppImage.tar.gz
+            target/release/bundle/*/*.AppImage.tar.gz.sig
+            target/release/bundle/*/*.deb
+            target/release/bundle/*/*.rpm
+
+            target/release/bundle/msi/*.msi
+            target/release/bundle/msi/*.msi.zip
+            target/release/bundle/msi/*.msi.zip.sig
+
+            target/release/bundle/nsis/*.exe
+            target/release/bundle/nsis/*.nsis.zip
+            target/release/bundle/nsis/*.nsis.zip.sig

.github/workflows/turbo-ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: ['main']
   pull_request:
     types: [opened, synchronize]
   merge_group:
@@ -10,78 +10,71 @@ on:
 
 jobs:
   build:
-    name: Lint and Test
+    name: Build, Test, and Lint
     runs-on: ubuntu-22.04
 
-    env:
-      # Ensure pnpm output is colored in GitHub Actions logs
-      FORCE_COLOR: 3
-      # Make cargo nextest successfully ignore projects without tests
-      NEXTEST_NO_TESTS: pass
-
     steps:
-      - name: 📥 Check out code
+      - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
-      - name: 🧰 Install build dependencies
+      - name: Cache turbo build setup
+        uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
+
+      - name: Install build dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -yq libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: 🧰 Install pnpm
+      - name: Setup Node.JS environment
-        uses: pnpm/action-setup@v4
-
-      - name: 🧰 Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: .nvmrc
+          node-version: 20
-          cache: pnpm
 
-      - name: 🧰 Setup Rust toolchain
+      - name: Install pnpm via corepack
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        shell: bash
+        run: |
+          corepack enable
+          corepack prepare --activate
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
         with:
-          rustflags: ''
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          components: clippy, rustfmt
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          cache: false
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
-      - name: 🧰 Setup nextest
+      - name: Install dependencies
-        uses: taiki-e/install-action@nextest
-
-      # cargo-binstall does not have pre-built binaries for sqlx-cli, so we fall
-      # back to a cached cargo install
-      - name: 🧰 Setup cargo-sqlx
-        uses: taiki-e/cache-cargo-install-action@v2
-        with:
-          tool: sqlx-cli
-          locked: false
-          no-default-features: true
-          features: rustls,postgres
-
-      - name: 💨 Setup Turbo cache
-        uses: rharkor/caching-for-turbo@v1.8
-
-      - name: 🧰 Install dependencies
         run: pnpm install
 
-      - name: ⚙️ Start services
+      - name: Build
-        run: docker compose up --wait
+        run: pnpm build
+        env:
+          SQLX_OFFLINE: true
 
-      - name: ⚙️ Setup Labrinth environment and database
+      - name: Lint
-        working-directory: apps/labrinth
+        run: pnpm lint
-        run: |
+        env:
-          cp .env.local .env
+          SQLX_OFFLINE: true
-          sqlx database setup
 
-      - name: ⚙️ Set app environment
+      - name: Start docker compose
-        working-directory: packages/app-lib
+        run: docker compose up -d
-        run: cp .env.staging .env
 
-      - name: 🔍 Lint and test
+      - name: Test
-        run: pnpm run ci
+        run: pnpm test
-
+        env:
-      - name: 🔍 Verify intl:extract has been run
+          SQLX_OFFLINE: true
-        run: |
+          DATABASE_URL: postgresql://labrinth:labrinth@localhost/postgres
-          pnpm intl:extract
-          git diff --exit-code --color */*/src/locales/en-US/index.json

.idea/code.iml

@@ -10,6 +10,7 @@
       <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>

.idea/vcs.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CommitMessageInspectionProfile">
-    <profile version="1.0">
-      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
-      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
-    </profile>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>

.nvmrc

@@ -1 +0,0 @@
-20.19.2

.vscode/settings.json

@@ -2,7 +2,6 @@
   "prettier.endOfLine": "lf",
   "editor.formatOnSave": true,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
-  "editor.detectIndentation": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   }

Cargo.toml

@@ -1,240 +1,25 @@
 [workspace]
-resolver = "2"
+resolver = '2'
 members = [
-  "apps/app",
+  './packages/app-lib',
-  "apps/app-playground",
+	'./apps/app-playground',
-  "apps/daedalus_client",
+  './apps/app',
-  "apps/labrinth",
+  './apps/labrinth',
-  "packages/app-lib",
+    './apps/daedalus_client',
-  "packages/ariadne",
+    './packages/daedalus',
-  "packages/daedalus",
+    './packages/ariadne',
 ]
 
-[workspace.package]
-edition = "2024"
-
-[workspace.dependencies]
-actix-cors = "0.7.1"
-actix-files = "0.6.6"
-actix-http = "3.11.0"
-actix-multipart = "0.7.2"
-actix-rt = "2.10.0"
-actix-web = "4.11.0"
-actix-web-prom = "0.10.0"
-actix-ws = "0.3.0"
-argon2 = { version = "0.5.3", features = ["std"] }
-ariadne = { path = "packages/ariadne" }
-async_zip = "0.0.17"
-async-compression = { version = "0.4.25", default-features = false }
-async-recursion = "1.1.1"
-async-stripe = { version = "0.41.0", default-features = false, features = [
-  "runtime-tokio-hyper-rustls",
-] }
-async-trait = "0.1.88"
-async-tungstenite = { version = "0.29.1", default-features = false, features = [
-  "futures-03-sink",
-] }
-async-walkdir = "2.1.0"
-base64 = "0.22.1"
-bitflags = "2.9.1"
-bytemuck = "1.23.0"
-bytes = "1.10.1"
-censor = "0.3.0"
-chardetng = "0.1.17"
-chrono = "0.4.41"
-clap = "4.5.40"
-clickhouse = "0.13.3"
-color-thief = "0.2.2"
-console-subscriber = "0.4.1"
-daedalus = { path = "packages/daedalus" }
-dashmap = "6.1.0"
-data-url = "0.3.1"
-deadpool-redis = "0.21.1"
-dirs = "6.0.0"
-discord-rich-presence = "0.2.5"
-dotenv-build = "0.1.1"
-dotenvy = "0.15.7"
-dunce = "1.0.5"
-either = "1.15.0"
-encoding_rs = "0.8.35"
-enumset = "1.1.6"
-flate2 = "1.1.2"
-fs4 = { version = "0.13.1", default-features = false }
-futures = { version = "0.3.31", default-features = false }
-futures-util = "0.3.31"
-hashlink = "0.10.0"
-heck = "0.5.0"
-hex = "0.4.3"
-hickory-resolver = "0.25.2"
-hmac = "0.12.1"
-hyper = "1.6.0"
-hyper-rustls = { version = "0.27.7", default-features = false, features = [
-  "http1",
-  "native-tokio",
-  "ring",
-  "tls12",
-] }
-hyper-util = "0.1.14"
-iana-time-zone = "0.1.63"
-image = { version = "0.25.6", default-features = false, features = ["rayon"] }
-indexmap = "2.9.0"
-indicatif = "0.17.11"
-itertools = "0.14.0"
-jemalloc_pprof = "0.7.0"
-json-patch = { version = "4.0.0", default-features = false }
-lettre = { version = "0.11.17", default-features = false, features = [
-  "builder",
-  "hostname",
-  "pool",
-  "ring",
-  "rustls",
-  "rustls-native-certs",
-  "smtp-transport",
-] }
-maxminddb = "0.26.0"
-meilisearch-sdk = { version = "0.28.0", default-features = false }
-murmur2 = "0.1.0"
-native-dialog = "0.9.0"
-notify = { version = "8.0.0", default-features = false }
-notify-debouncer-mini = { version = "0.6.0", default-features = false }
-p256 = "0.13.2"
-paste = "1.0.15"
-phf = { version = "0.12.1", features = ["macros"] }
-png = "0.17.16"
-prometheus = "0.14.0"
-quartz_nbt = "0.2.9"
-quick-xml = "0.37.5"
-rand = "=0.8.5"  # Locked on 0.8 until argon2 and p256 update to 0.9
-rand_chacha = "=0.3.1"  # Locked on 0.3 until we can update rand to 0.9
-redis = "=0.31.0"  # Locked on 0.31 until deadpool-redis updates to 0.32
-regex = "1.11.1"
-reqwest = { version = "0.12.20", default-features = false }
-rgb = "0.8.50"
-rust_decimal = { version = "1.37.2", features = [
-  "serde-with-float",
-  "serde-with-str",
-] }
-rust_iso3166 = "0.1.14"
-rust-s3 = { version = "0.35.1", default-features = false, features = [
-  "fail-on-err",
-  "tags",
-  "tokio-rustls-tls",
-] }
-rusty-money = "0.4.1"
-sentry = { version = "0.41.0", default-features = false, features = [
-  "backtrace",
-  "contexts",
-  "debug-images",
-  "panic",
-  "reqwest",
-  "rustls",
-] }
-sentry-actix = "0.41.0"
-serde = "1.0.219"
-serde_bytes = "0.11.17"
-serde_cbor = "0.11.2"
-serde_ini = "0.2.0"
-serde_json = "1.0.140"
-serde_with = "3.13.0"
-serde-xml-rs = "0.8.1"  # Also an XML (de)serializer, consider dropping yaserde in favor of this
-sha1 = "0.10.6"
-sha1_smol = { version = "1.0.1", features = ["std"] }
-sha2 = "0.10.9"
-spdx = "0.10.8"
-sqlx = { version = "0.8.6", default-features = false }
-sysinfo = { version = "0.35.2", default-features = false }
-tar = "0.4.44"
-tauri = "2.6.1"
-tauri-build = "2.3.0"
-tauri-plugin-deep-link = "2.4.0"
-tauri-plugin-dialog = "2.3.0"
-tauri-plugin-http = "2.5.0"
-tauri-plugin-opener = "2.4.0"
-tauri-plugin-os = "2.3.0"
-tauri-plugin-single-instance = "2.3.0"
-tauri-plugin-updater = { version = "2.9.0", default-features = false, features = [
-  "rustls-tls",
-  "zip",
-] }
-tauri-plugin-window-state = "2.3.0"
-tempfile = "3.20.0"
-theseus = { path = "packages/app-lib" }
-thiserror = "2.0.12"
-tikv-jemalloc-ctl = "0.6.0"
-tikv-jemallocator = "0.6.0"
-tokio = "1.45.1"
-tokio-stream = "0.1.17"
-tokio-util = "0.7.15"
-totp-rs = "5.7.0"
-tracing = "0.1.41"
-tracing-actix-web = "0.7.18"
-tracing-error = "0.2.1"
-tracing-subscriber = "0.3.19"
-url = "2.5.4"
-urlencoding = "2.1.3"
-uuid = "1.17.0"
-validator = "0.20.0"
-webp = { version = "0.3.0", default-features = false }
-whoami = "1.6.0"
-winreg = "0.55.0"
-woothee = "0.13.0"
-yaserde = "0.12.0"
-zip = { version = "4.2.0", default-features = false, features = [
-  "bzip2",
-  "deflate",
-  "deflate64",
-  "zstd",
-] }
-zxcvbn = "3.1.0"
-
-[workspace.lints.clippy]
-bool_to_int_with_if = "warn"
-borrow_as_ptr = "warn"
-cfg_not_test = "warn"
-clear_with_drain = "warn"
-cloned_instead_of_copied = "warn"
-collection_is_never_read = "warn"
-dbg_macro = "warn"
-default_trait_access = "warn"
-explicit_iter_loop = "warn"
-filter_map_next = "warn"
-flat_map_option = "warn"
-format_push_string = "warn"
-get_unwrap = "warn"
-large_include_file = "warn"
-large_stack_arrays = "warn"
-manual_assert = "warn"
-manual_instant_elapsed = "warn"
-manual_is_variant_and = "warn"
-manual_let_else = "warn"
-map_unwrap_or = "warn"
-match_bool = "warn"
-needless_collect = "warn"
-negative_feature_names = "warn"
-non_std_lazy_statics = "warn"
-pathbuf_init_then_push = "warn"
-read_zero_byte_vec = "warn"
-redundant_clone = "warn"
-redundant_feature_names = "warn"
-redundant_type_annotations = "warn"
-todo = "warn"
-unnested_or_patterns = "warn"
-wildcard_dependencies = "warn"
-
-[workspace.lints.rust]
-# Turn warnings into errors by default
-warnings = "deny"
-
-[patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev = "21db186" }
-
 # Optimize for speed and reduce size on release builds
 [profile.release]
-opt-level = "s"  # Optimize for binary size
+panic = "abort" # Strip expensive panic clean-up logic
-strip = true  # Remove debug symbols
+codegen-units = 1 # Compile crates one after another so the compiler can optimize better
-lto = true  # Enables link to optimizations
+lto = true # Enables link to optimizations
-panic = "abort"  # Strip expensive panic clean-up logic
+opt-level = "s" # Optimize for binary size
-codegen-units = 1  # Compile crates one after another so the compiler can optimize better
+strip = true # Remove debug symbols
 
 [profile.dev.package.sqlx-macros]
 opt-level = 3
+
+[patch.crates-io]
+wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" }

apps/app-frontend/.prettierignore

@@ -1,2 +1 @@
 **/dist
-*.gltf

apps/app-frontend/eslint.config.mjs

@@ -1,2 +1,22 @@
-import config from '@modrinth/tooling-config/eslint/nuxt.mjs'
+import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
-export default config
+import { fixupPluginRules } from '@eslint/compat'
+import turboPlugin from 'eslint-plugin-turbo'
+
+export default createConfigForNuxt().append([
+  {
+    name: 'turbo',
+    plugins: {
+      turbo: fixupPluginRules(turboPlugin),
+    },
+    rules: {
+      'turbo/no-undeclared-env-vars': 'error',
+    },
+  },
+  {
+    name: 'modrinth',
+    rules: {
+      'vue/html-self-closing': 'off',
+      'vue/multi-word-component-names': 'off',
+    },
+  },
+])

apps/app-frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "1.0.0-local",
+  "version": "0.9.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -9,31 +9,25 @@
     "tsc:check": "vue-tsc --noEmit",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"src/**/*.{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",
+    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{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"
-    "test": "vue-tsc --noEmit"
   },
   "dependencies": {
-    "@geometrically/minecraft-motd-parser": "^1.1.4",
     "@modrinth/assets": "workspace:*",
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
     "@sentry/vue": "^8.27.0",
-    "@tauri-apps/api": "^2.5.0",
+    "@tauri-apps/api": "^2.1.1",
-    "@tauri-apps/plugin-dialog": "^2.2.1",
+    "@tauri-apps/plugin-dialog": "^2.2.0",
-    "@tauri-apps/plugin-http": "^2.5.0",
+    "@tauri-apps/plugin-os": "^2.2.0",
-    "@tauri-apps/plugin-opener": "^2.2.6",
+    "@tauri-apps/plugin-opener": "^2.2.1",
-    "@tauri-apps/plugin-os": "^2.2.1",
+    "@tauri-apps/plugin-updater": "^2.3.0",
-    "@tauri-apps/plugin-updater": "^2.7.1",
+    "@tauri-apps/plugin-window-state": "^2.2.0",
-    "@tauri-apps/plugin-window-state": "^2.2.2",
-    "@types/three": "^0.172.0",
     "@vintl/vintl": "^4.4.1",
-    "@vueuse/core": "^11.1.0",
     "dayjs": "^1.11.10",
     "floating-vue": "^5.2.2",
     "ofetch": "^1.3.4",
     "pinia": "^2.1.7",
     "posthog-js": "^1.158.2",
-    "three": "^0.172.0",
     "vite-svg-loader": "^5.1.0",
     "vue": "^3.5.13",
     "vue-multiselect": "3.0.0",
@@ -41,19 +35,19 @@
     "vue-virtual-scroller": "v2.0.0-beta.8"
   },
   "devDependencies": {
-    "@modrinth/tooling-config": "workspace:*",
     "@eslint/compat": "^1.1.1",
     "@formatjs/cli": "^6.2.12",
     "@nuxt/eslint-config": "^0.5.6",
-    "@taijased/vue-render-tracker": "^1.0.7",
     "@vitejs/plugin-vue": "^5.0.4",
     "autoprefixer": "^10.4.19",
     "eslint": "^9.9.1",
-    "eslint-plugin-turbo": "^2.5.4",
+    "eslint-config-custom": "workspace:*",
+    "eslint-plugin-turbo": "^2.1.1",
     "postcss": "^8.4.39",
     "prettier": "^3.2.5",
     "sass": "^1.74.1",
     "tailwindcss": "^3.4.4",
+    "tsconfig": "workspace:*",
     "typescript": "^5.5.4",
     "vite": "^5.4.6",
     "vue-tsc": "^2.1.6"

apps/app-frontend/src/App.vue

@@ -1,7 +1,8 @@
 <script setup>
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { RouterView, useRoute, useRouter } from 'vue-router'
 import {
   ArrowBigUpDashIcon,
-  ChangeSkinIcon,
   CompassIcon,
   DownloadIcon,
   HomeIcon,
@@ -11,69 +12,54 @@ import {
   LogOutIcon,
   MaximizeIcon,
   MinimizeIcon,
-  NewspaperIcon,
   PlusIcon,
   RestoreIcon,
   RightArrowIcon,
   SettingsIcon,
-  WorldIcon,
   XIcon,
 } from '@modrinth/assets'
-import {
+import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@modrinth/ui'
-  Avatar,
+import { useLoading, useTheming } from '@/store/state'
-  Button,
-  ButtonStyled,
-  NewsArticleCard,
-  Notifications,
-  OverflowMenu,
-} from '@modrinth/ui'
-import { renderString } from '@modrinth/utils'
-import { getVersion } from '@tauri-apps/api/app'
-import { invoke } from '@tauri-apps/api/core'
-import { getCurrentWindow } from '@tauri-apps/api/window'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { type } from '@tauri-apps/plugin-os'
-import { check } from '@tauri-apps/plugin-updater'
-import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
-import { computed, onMounted, onUnmounted, provide, ref, watch } from 'vue'
-import { RouterView, useRoute, useRouter } from 'vue-router'
-
 import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
-import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
-import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
-import ErrorModal from '@/components/ui/ErrorModal.vue'
-import FriendsList from '@/components/ui/friends/FriendsList.vue'
-import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue'
-import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue'
-import ModInstallModal from '@/components/ui/install_flow/ModInstallModal.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
-import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
+import { get } from '@/helpers/settings'
-import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue'
+import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
-import NavButton from '@/components/ui/NavButton.vue'
-import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
-import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
-import URLConfirmModal from '@/components/ui/URLConfirmModal.vue'
+import ErrorModal from '@/components/ui/ErrorModal.vue'
-import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
+import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
-import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
-import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
-import { get_user } from '@/helpers/cache.js'
-import { command_listener, warning_listener } from '@/helpers/events.js'
-import { useFetch } from '@/helpers/fetch.js'
-import { cancelLogin, get as getCreds, login, logout } from '@/helpers/mr_auth.js'
-import { get } from '@/helpers/settings.ts'
-import { get_opening_command, initialize_state } from '@/helpers/state'
-import { getOS, isDev, restartApp } from '@/helpers/utils.js'
-import { useError } from '@/store/error.js'
-import { useInstall } from '@/store/install.js'
 import { handleError, useNotifications } from '@/store/notifications.js'
-import { useLoading, useTheming } from '@/store/state'
+import { command_listener, warning_listener } from '@/helpers/events.js'
-
+import { type } from '@tauri-apps/plugin-os'
+import { getOS, isDev, restartApp } from '@/helpers/utils.js'
+import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
+import { getCurrentWindow } from '@tauri-apps/api/window'
+import { getVersion } from '@tauri-apps/api/app'
+import URLConfirmModal from '@/components/ui/URLConfirmModal.vue'
 import { create_profile_and_install_from_file } from './helpers/pack'
-import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
+import { useError } from '@/store/error.js'
-import { get_available_capes, get_available_skins } from './helpers/skins'
+import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
+import ModInstallModal from '@/components/ui/install_flow/ModInstallModal.vue'
+import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue'
+import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue'
+import { useInstall } from '@/store/install.js'
+import { invoke } from '@tauri-apps/api/core'
+import { get_opening_command, initialize_state } from '@/helpers/state'
+import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
+import { renderString } from '@modrinth/utils'
+import { useFetch } from '@/helpers/fetch.js'
+import { check } from '@tauri-apps/plugin-updater'
+import NavButton from '@/components/ui/NavButton.vue'
+import { get as getCreds, login, logout } from '@/helpers/mr_auth.js'
+import { get_user } from '@/helpers/cache.js'
+import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
+import dayjs from 'dayjs'
+import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
+import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
+import FriendsList from '@/components/ui/friends/FriendsList.vue'
+import { openUrl } from '@tauri-apps/plugin-opener'
+import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 
 const themeStore = useTheming()
 
@@ -180,48 +166,21 @@ async function setupApp() {
     `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
     'criticalAnnouncements',
     true,
-  )
+  ).then((res) => {
-    .then((response) => response.json())
+    if (res && res.header && res.body) {
-    .then((res) => {
+      criticalErrorMessage.value = 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}`,
-      )
-    })
 
-  useFetch(`https://modrinth.com/news/feed/articles.json`, 'news', true)
+  useFetch(`https://modrinth.com/blog/news.json`, 'news', true).then((res) => {
-    .then((response) => response.json())
+    if (res && res.articles) {
-    .then((res) => {
+      news.value = res.articles
-      if (res && res.articles) {
+    }
-        // Format expected by NewsArticleCard component.
+  })
-        news.value = res.articles
-          .map((article) => ({
-            ...article,
-            path: article.link,
-            thumbnail: article.thumbnail,
-            title: article.title,
-            summary: article.summary,
-            date: article.date,
-          }))
-          .slice(0, 4)
-      }
-    })
 
   get_opening_command().then(handleCommand)
   checkUpdates()
   fetchCredentials()
-
-  try {
-    const skins = (await get_available_skins()) ?? []
-    const capes = (await get_available_capes()) ?? []
-    generateSkinPreviews(skins, capes)
-  } catch (error) {
-    console.warn('Failed to generate skin previews in app setup.', error)
-  }
 }
 
 const stateFailed = ref(false)
@@ -266,8 +225,6 @@ const incompatibilityWarningModal = ref()
 
 const credentials = ref()
 
-const modrinthLoginFlowWaitModal = ref()
-
 async function fetchCredentials() {
   const creds = await getCreds().catch(handleError)
   if (creds && creds.user_id) {
@@ -277,24 +234,8 @@ async function fetchCredentials() {
 }
 
 async function signIn() {
-  modrinthLoginFlowWaitModal.value.show()
+  await login().catch(handleError)
-
+  await fetchCredentials()
-  try {
-    await login()
-    await fetchCredentials()
-  } catch (error) {
-    if (
-      typeof error === 'object' &&
-      typeof error['message'] === 'string' &&
-      error.message.includes('Login canceled')
-    ) {
-      // Not really an error due to being a result of user interaction, show nothing
-    } else {
-      handleError(error)
-    }
-  } finally {
-    modrinthLoginFlowWaitModal.value.hide()
-  }
 }
 
 async function logOut() {
@@ -347,7 +288,6 @@ onMounted(() => {
 })
 
 const accounts = ref(null)
-provide('accountsCard', accounts)
 
 command_listener(handleCommand)
 async function handleCommand(e) {
@@ -419,13 +359,10 @@ 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>
-    <Suspense>
-      <AuthGrantFlowWaitModal ref="modrinthLoginFlowWaitModal" @flow-cancel="cancelLogin" />
-    </Suspense>
     <Suspense>
       <InstanceCreationModal ref="installationModal" />
     </Suspense>
@@ -435,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"
@@ -446,9 +380,6 @@ function handleAuxClick(e) {
       >
         <CompassIcon />
       </NavButton>
-      <NavButton v-tooltip.right="'Skins (Beta)'" to="/skins">
-        <ChangeSkinIcon />
-      </NavButton>
       <NavButton
         v-tooltip.right="'Library'"
         to="/library"
@@ -509,13 +440,13 @@ function handleAuxClick(e) {
         <ModrinthAppLogo class="h-full w-auto text-contrast pointer-events-none" />
         <div class="flex items-center gap-1 ml-3">
           <button
-            class="cursor-pointer p-0 m-0 text-contrast border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
+            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
             @click="router.back()"
           >
             <LeftArrowIcon />
           </button>
           <button
-            class="cursor-pointer p-0 m-0 text-contrast border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
+            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
             @click="router.forward()"
           >
             <RightArrowIcon />
@@ -542,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>
@@ -590,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()">
@@ -629,20 +550,34 @@ function handleAuxClick(e) {
               <FriendsList :credentials="credentials" :sign-in="() => signIn()" />
             </suspense>
           </div>
-          <div v-if="news && news.length > 0" class="pt-4 flex flex-col items-center">
+          <div v-if="news && news.length > 0" class="pt-4 flex flex-col">
-            <h3 class="px-4 text-lg m-0 text-left w-full">News</h3>
+            <h3 class="px-4 text-lg m-0">News</h3>
-            <div class="px-4 pt-2 space-y-4 flex flex-col items-center w-full">
+            <template v-for="(item, index) in news" :key="`news-${index}`">
-              <NewsArticleCard
+              <a
-                v-for="(item, index) in news"
+                :class="`flex flex-col outline-offset-[-4px] hover:bg-[--brand-gradient-border] focus:bg-[--brand-gradient-border] px-4 transition-colors ${index === 0 ? 'pt-2 pb-4' : 'py-4'}`"
-                :key="`news-${index}`"
+                :href="item.link"
-                :article="item"
+                target="_blank"
+                rel="external"
+              >
+                <img
+                  :src="item.thumbnail"
+                  alt="News thumbnail"
+                  aria-hidden="true"
+                  class="w-full aspect-[3/1] object-cover rounded-2xl border-[1px] border-solid border-[--brand-gradient-border]"
+                />
+                <h4 class="mt-2 mb-0 text-sm leading-none text-contrast font-semibold">
+                  {{ item.title }}
+                </h4>
+                <p class="my-1 text-sm text-secondary leading-tight">{{ item.summary }}</p>
+                <p class="text-right text-sm text-secondary opacity-60 leading-tight m-0">
+                  {{ dayjs(item.date).fromNow() }}
+                </p>
+              </a>
+              <hr
+                v-if="index !== news.length - 1"
+                class="h-px my-[-2px] mx-4 border-0 m-0 bg-[--brand-gradient-border]"
               />
-              <ButtonStyled color="brand" size="large">
+            </template>
-                <a href="https://modrinth.com/news" target="_blank" class="my-4">
-                  <NewspaperIcon /> View all news
-                </a>
-              </ButtonStyled>
-            </div>
           </div>
         </div>
       </div>
@@ -657,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 />
@@ -759,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/external/index.js

@@ -1,18 +1,18 @@
-export { default as ATLauncherIcon } from './atlauncher.svg'
 export { default as BuyMeACoffeeIcon } from './bmac.svg'
 export { default as DiscordIcon } from './discord.svg'
-export { default as GDLauncherIcon } from './gdlauncher.png'
-export { default as GithubIcon } from './github.svg'
-export { default as GitLabIcon } from './gitlab.svg'
-export { default as GoogleIcon } from './google.svg'
 export { default as KoFiIcon } from './kofi.svg'
-export { default as MastodonIcon } from './mastodon.svg'
-export { default as MicrosoftIcon } from './microsoft.svg'
-export { default as MultiMCIcon } from './multimc.webp'
-export { default as OpenCollectiveIcon } from './opencollective.svg'
 export { default as PatreonIcon } from './patreon.svg'
 export { default as PaypalIcon } from './paypal.svg'
-export { default as PrismIcon } from './prism.svg'
+export { default as OpenCollectiveIcon } from './opencollective.svg'
-export { default as RedditIcon } from './reddit.svg'
-export { default as SteamIcon } from './steam.svg'
 export { default as TwitterIcon } from './twitter.svg'
+export { default as GithubIcon } from './github.svg'
+export { default as MastodonIcon } from './mastodon.svg'
+export { default as RedditIcon } from './reddit.svg'
+export { default as GoogleIcon } from './google.svg'
+export { default as MicrosoftIcon } from './microsoft.svg'
+export { default as SteamIcon } from './steam.svg'
+export { default as GitLabIcon } from './gitlab.svg'
+export { default as ATLauncherIcon } from './atlauncher.svg'
+export { default as GDLauncherIcon } from './gdlauncher.png'
+export { default as MultiMCIcon } from './multimc.webp'
+export { default as PrismIcon } from './prism.svg'

apps/app-frontend/src/assets/icons/index.js

@@ -1,9 +1,9 @@
-export { default as AddProjectImage } from './add-project.svg'
 export { default as SwapIcon } from './arrow-left-right.svg'
+export { default as ToggleIcon } from './toggle.svg'
+export { default as PackageIcon } from './package.svg'
+export { default as VersionIcon } from './milestone.svg'
+export { default as TextInputIcon } from './text-cursor-input.svg'
+export { default as AddProjectImage } from './add-project.svg'
+export { default as NewInstanceImage } from './new-instance.svg'
 export { default as MenuIcon } from './menu.svg'
 export { default as ChatIcon } from './messages-square.svg'
-export { default as VersionIcon } from './milestone.svg'
-export { default as NewInstanceImage } from './new-instance.svg'
-export { default as PackageIcon } from './package.svg'
-export { default as TextInputIcon } from './text-cursor-input.svg'
-export { default as ToggleIcon } from './toggle.svg'

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/GridDisplay.vue

@@ -1,25 +1,24 @@
 <script setup>
+import Instance from '@/components/ui/Instance.vue'
+import { computed, ref } from 'vue'
 import {
   ClipboardCopyIcon,
-  EyeIcon,
   FolderOpenIcon,
   PlayIcon,
   PlusIcon,
-  SearchIcon,
-  StopCircleIcon,
   TrashIcon,
+  StopCircleIcon,
+  EyeIcon,
+  SearchIcon,
   XIcon,
 } from '@modrinth/assets'
 import { Button, DropdownSelect } from '@modrinth/ui'
 import { formatCategoryHeader } from '@modrinth/utils'
-import dayjs from 'dayjs'
-import { computed, ref } from 'vue'
-
 import ContextMenu from '@/components/ui/ContextMenu.vue'
-import Instance from '@/components/ui/Instance.vue'
+import dayjs from 'dayjs'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 import { duplicate, remove } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 
 const props = defineProps({
   instances: {
@@ -137,7 +136,7 @@ const filteredResults = computed(() => {
 
   if (sortBy.value === 'Game version') {
     instances.sort((a, b) => {
-      return a.game_version.localeCompare(b.game_version, undefined, { numeric: true })
+      return a.game_version.localeCompare(b.game_version)
     })
   }
 
@@ -214,17 +213,6 @@ const filteredResults = computed(() => {
       instanceMap.set(entry[0], entry[1])
     })
   }
-  // default sorting would do 1.20.4 < 1.8.9 because 2 < 8
-  // localeCompare with numeric=true puts 1.8.9 < 1.20.4 because 8 < 20
-  if (group.value === 'Game version') {
-    const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
-      return a[0].localeCompare(b[0], undefined, { numeric: true })
-    })
-    instanceMap.clear()
-    sortedEntries.forEach((entry) => {
-      instanceMap.set(entry[0], entry[1])
-    })
-  }
 
   return instanceMap
 })

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

@@ -1,6 +1,5 @@
 <script setup>
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
-
 import { useLoading } from '@/store/state.js'
 
 const props = defineProps({

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

@@ -1,32 +1,31 @@
 <script setup>
 import {
   ClipboardCopyIcon,
-  DownloadIcon,
-  ExternalIcon,
-  EyeIcon,
   FolderOpenIcon,
-  GlobeIcon,
   PlayIcon,
   PlusIcon,
-  StopCircleIcon,
   TrashIcon,
+  DownloadIcon,
+  GlobeIcon,
+  StopCircleIcon,
+  ExternalIcon,
+  EyeIcon,
+  ChevronRightIcon,
 } from '@modrinth/assets'
-import { HeadingLink } from '@modrinth/ui'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import ContextMenu from '@/components/ui/ContextMenu.vue'
-import Instance from '@/components/ui/Instance.vue'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import Instance from '@/components/ui/Instance.vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ProjectCard from '@/components/ui/ProjectCard.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { get_by_profile_path } from '@/helpers/process.js'
+import { handleError } from '@/store/notifications.js'
 import { duplicate, kill, remove, run } from '@/helpers/profile.js'
+import { useRouter } from 'vue-router'
 import { showProfileInFolder } from '@/helpers/utils.js'
+import { trackEvent } from '@/helpers/analytics'
 import { handleSevereError } from '@/store/error.js'
 import { install as installVersion } from '@/store/install.js'
-import { handleError } from '@/store/notifications.js'
+import { openUrl } from '@tauri-apps/plugin-opener'
 
 const router = useRouter()
 
@@ -45,9 +44,7 @@ const props = defineProps({
 })
 
 const actualInstances = computed(() =>
-  props.instances.filter(
+  props.instances.filter((x) => x && x.instances && x.instances[0]),
-    (x) => (x && x.instances && x.instances[0] && x.show === undefined) || x.show,
-  ),
 )
 
 const modsRow = ref(null)
@@ -184,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
@@ -211,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>
 
@@ -239,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">
+    <div v-for="(row, rowIndex) in actualInstances" ref="rows" :key="row.label" class="row">
-      <HeadingLink class="mt-1" :to="row.route">
+      <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/AccountsCard.vue

@@ -9,11 +9,13 @@
     <Avatar
       size="36px"
       :src="
-        selectedAccount ? avatarUrl : 'https://launcher-files.modrinth.com/assets/steve_head.png'
+        selectedAccount
+          ? `https://mc-heads.net/avatar/${selectedAccount.id}/128`
+          : 'https://launcher-files.modrinth.com/assets/steve_head.png'
       "
     />
     <div class="flex flex-col w-full">
-      <span>{{ selectedAccount ? selectedAccount.profile.name : 'Select account' }}</span>
+      <span>{{ selectedAccount ? selectedAccount.username : 'Select account' }}</span>
       <span class="text-secondary text-xs">Minecraft account</span>
     </div>
     <DropdownIcon class="w-5 h-5 shrink-0" />
@@ -26,40 +28,28 @@
       :class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }"
     >
       <div v-if="selectedAccount" class="selected account">
-        <Avatar size="xs" :src="avatarUrl" />
+        <Avatar size="xs" :src="`https://mc-heads.net/avatar/${selectedAccount.id}/128`" />
         <div>
-          <h4>{{ selectedAccount.profile.name }}</h4>
+          <h4>{{ selectedAccount.username }}</h4>
           <p>Selected</p>
         </div>
-        <Button
+        <Button v-tooltip="'Log out'" icon-only color="raised" @click="logout(selectedAccount.id)">
-          v-tooltip="'Log out'"
-          icon-only
-          color="raised"
-          @click="logout(selectedAccount.profile.id)"
-        >
           <TrashIcon />
         </Button>
       </div>
       <div v-else class="logged-out account">
         <h4>Not signed in</h4>
-        <Button
+        <Button v-tooltip="'Log in'" icon-only color="primary" @click="login()">
-          v-tooltip="'Log in'"
+          <LogInIcon />
-          :disabled="loginDisabled"
-          icon-only
-          color="primary"
-          @click="login()"
-        >
-          <LogInIcon v-if="!loginDisabled" />
-          <SpinnerIcon v-else class="animate-spin" />
         </Button>
       </div>
       <div v-if="displayAccounts.length > 0" class="account-group">
-        <div v-for="account in displayAccounts" :key="account.profile.id" class="account-row">
+        <div v-for="account in displayAccounts" :key="account.id" class="account-row">
           <Button class="option account" @click="setAccount(account)">
-            <Avatar :src="getAccountAvatarUrl(account)" class="icon" />
+            <Avatar :src="`https://mc-heads.net/avatar/${account.id}/128`" class="icon" />
-            <p>{{ account.profile.name }}</p>
+            <p>{{ account.username }}</p>
           </Button>
-          <Button v-tooltip="'Log out'" icon-only @click="logout(account.profile.id)">
+          <Button v-tooltip="'Log out'" icon-only @click="logout(account.id)">
             <TrashIcon />
           </Button>
         </div>
@@ -73,23 +63,20 @@
 </template>
 
 <script setup>
-import { DropdownIcon, LogInIcon, PlusIcon, SpinnerIcon, TrashIcon } from '@modrinth/assets'
+import { DropdownIcon, PlusIcon, TrashIcon, LogInIcon } from '@modrinth/assets'
 import { Avatar, Button, Card } from '@modrinth/ui'
-import { computed, onBeforeUnmount, onMounted, onUnmounted, ref } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount, onUnmounted } from 'vue'
-
-import { trackEvent } from '@/helpers/analytics'
 import {
-  get_default_user,
+  users,
-  login as login_flow,
   remove_user,
   set_default_user,
-  users,
+  login as login_flow,
+  get_default_user,
 } from '@/helpers/auth'
-import { process_listener } from '@/helpers/events'
-import { getPlayerHeadUrl } from '@/helpers/rendering/batch-skin-renderer.ts'
-import { get_available_skins } from '@/helpers/skins'
-import { handleSevereError } from '@/store/error.js'
 import { handleError } from '@/store/state.js'
+import { trackEvent } from '@/helpers/analytics'
+import { process_listener } from '@/helpers/events'
+import { handleSevereError } from '@/store/error.js'
 
 defineProps({
   mode: {
@@ -102,86 +89,32 @@ defineProps({
 const emit = defineEmits(['change'])
 
 const accounts = ref({})
-const loginDisabled = ref(false)
 const defaultUser = ref()
-const equippedSkin = ref(null)
-const headUrlCache = ref(new Map())
 
 async function refreshValues() {
   defaultUser.value = await get_default_user().catch(handleError)
   accounts.value = await users().catch(handleError)
-
-  try {
-    const skins = await get_available_skins()
-    equippedSkin.value = skins.find((skin) => skin.is_equipped)
-
-    if (equippedSkin.value) {
-      try {
-        const headUrl = await getPlayerHeadUrl(equippedSkin.value)
-        headUrlCache.value.set(equippedSkin.value.texture_key, headUrl)
-      } catch (error) {
-        console.warn('Failed to get head render for equipped skin:', error)
-      }
-    }
-  } catch {
-    equippedSkin.value = null
-  }
 }
-
-function setLoginDisabled(value) {
-  loginDisabled.value = value
-}
-
 defineExpose({
   refreshValues,
-  setLoginDisabled,
-  loginDisabled,
 })
 await refreshValues()
 
 const displayAccounts = computed(() =>
-  accounts.value.filter((account) => defaultUser.value !== account.profile.id),
+  accounts.value.filter((account) => defaultUser.value !== account.id),
 )
 
-const avatarUrl = computed(() => {
-  if (equippedSkin.value?.texture_key) {
-    const cachedUrl = headUrlCache.value.get(equippedSkin.value.texture_key)
-    if (cachedUrl) {
-      return cachedUrl
-    }
-    return `https://mc-heads.net/avatar/${equippedSkin.value.texture_key}/128`
-  }
-  if (selectedAccount.value?.profile?.id) {
-    return `https://mc-heads.net/avatar/${selectedAccount.value.profile.id}/128`
-  }
-  return 'https://launcher-files.modrinth.com/assets/steve_head.png'
-})
-
-function getAccountAvatarUrl(account) {
-  if (
-    account.profile.id === selectedAccount.value?.profile?.id &&
-    equippedSkin.value?.texture_key
-  ) {
-    const cachedUrl = headUrlCache.value.get(equippedSkin.value.texture_key)
-    if (cachedUrl) {
-      return cachedUrl
-    }
-  }
-  return `https://mc-heads.net/avatar/${account.profile.id}/128`
-}
-
 const selectedAccount = computed(() =>
-  accounts.value.find((account) => account.profile.id === defaultUser.value),
+  accounts.value.find((account) => account.id === defaultUser.value),
 )
 
 async function setAccount(account) {
-  defaultUser.value = account.profile.id
+  defaultUser.value = account.id
-  await set_default_user(account.profile.id).catch(handleError)
+  await set_default_user(account.id).catch(handleError)
   emit('change')
 }
 
 async function login() {
-  loginDisabled.value = true
   const loggedIn = await login_flow().catch(handleSevereError)
 
   if (loggedIn) {
@@ -190,7 +123,6 @@ async function login() {
   }
 
   trackEvent('AccountLogIn')
-  loginDisabled.value = false
 }
 
 const logout = async (id) => {

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

@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import { DropdownIcon, FolderOpenIcon, PlusIcon } from '@modrinth/assets'
+import { DropdownIcon, PlusIcon, FolderOpenIcon } from '@modrinth/assets'
 import { ButtonStyled, OverflowMenu } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
-import { useRouter } from 'vue-router'
-
 import { add_project_from_path } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
+import { useRouter } from 'vue-router'
 
 const props = defineProps({
   instance: {

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))
@@ -42,12 +41,11 @@
 </template>
 
 <script setup>
-import { ChevronLeftIcon, ChevronRightIcon } from '@modrinth/assets'
+import { ChevronRightIcon, ChevronLeftIcon } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
-import { computed } from 'vue'
-import { useRoute } from 'vue-router'
-
 import { useBreadcrumbs } from '@/store/breadcrumbs'
+import { useRoute } from 'vue-router'
+import { computed } from 'vue'
 
 const route = useRoute()
 

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

@@ -1,24 +1,23 @@
 <script setup>
 import {
   CheckIcon,
-  CopyIcon,
   DropdownIcon,
+  XIcon,
   HammerIcon,
   LogInIcon,
   UpdatedIcon,
-  XIcon,
+  CopyIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, Collapsible } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
 import { ChatIcon } from '@/assets/icons'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { ButtonStyled, Collapsible } from '@modrinth/ui'
-import { trackEvent } from '@/helpers/analytics'
+import { ref, computed } from 'vue'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
-import { install } from '@/helpers/profile.js'
-import { cancel_directory_change } from '@/helpers/settings.ts'
-import { handleSevereError } from '@/store/error.js'
 import { handleError } from '@/store/notifications.js'
+import { handleSevereError } from '@/store/error.js'
+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'
 
 const errorModal = ref()
 const error = ref()
@@ -93,7 +92,7 @@ async function loginMinecraft() {
     const loggedIn = await login_flow()
 
     if (loggedIn) {
-      await set_default_user(loggedIn.profile.id).catch(handleError)
+      await set_default_user(loggedIn.id).catch(handleError)
     }
 
     await trackEvent('AccountLogIn', { source: 'ErrorModal' })
@@ -220,8 +219,8 @@ async function copyToClipboard(text) {
           <template v-else-if="metadata.notEnoughSpace">
             <h3>Not enough space</h3>
             <p>
-              It looks like there is not enough space on the disk containing the directory you
+              It looks like there is not enough space on the disk containing the dirctory you
-              selected. Please free up some space and try again or cancel the directory change.
+              selected Please free up some space and try again or cancel the directory change.
             </p>
           </template>
           <template v-else>

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

@@ -1,13 +1,12 @@
 <script setup>
-import { PlusIcon, XIcon } from '@modrinth/assets'
+import { XIcon, PlusIcon } from '@modrinth/assets'
 import { Button, Checkbox } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
-import { ref } from 'vue'
-
 import { PackageIcon, VersionIcon } from '@/assets/icons'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { ref } from 'vue'
 import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'
+import { open } from '@tauri-apps/plugin-dialog'
 import { handleError } from '@/store/notifications.js'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const props = defineProps({
   instance: {
@@ -152,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/Instance.vue

@@ -1,4 +1,6 @@
 <script setup>
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
 import {
   DownloadIcon,
   GameIcon,
@@ -7,21 +9,20 @@ import {
   StopCircleIcon,
   TimerIcon,
 } from '@modrinth/assets'
-import { Avatar, ButtonStyled, useRelativeTime } from '@modrinth/ui'
+import { Avatar, ButtonStyled } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
-import dayjs from 'dayjs'
-import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import { trackEvent } from '@/helpers/analytics'
-import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
 import { finish_install, kill, run } from '@/helpers/profile'
+import { get_by_profile_path } from '@/helpers/process'
+import { process_listener } from '@/helpers/events'
+import { handleError } from '@/store/state.js'
 import { showProfileInFolder } from '@/helpers/utils.js'
 import { handleSevereError } from '@/store/error.js'
-import { handleError } from '@/store/state.js'
+import { trackEvent } from '@/helpers/analytics'
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import { formatCategory } from '@modrinth/utils'
 
-const formatRelativeTime = useRelativeTime()
+dayjs.extend(relativeTime)
 
 const props = defineProps({
   instance: {
@@ -172,12 +173,7 @@ onUnmounted(() => unlisten())
       </div>
       <div class="flex items-center col-span-3 gap-1 text-secondary font-semibold">
         <TimerIcon />
-        <span class="text-sm">
+        <span class="text-sm"> Played {{ dayjs(instance.last_played).fromNow() }} </span>
-          <template v-if="instance.last_played">
-            Played {{ formatRelativeTime(dayjs(instance.last_played).toISOString()) }}
-          </template>
-          <template v-else> Never played </template>
-        </span>
       </div>
     </div>
   </template>
@@ -240,8 +236,8 @@ onUnmounted(() => unlisten())
         </p>
         <div class="flex items-center col-span-3 gap-1 text-secondary font-semibold mt-auto">
           <GameIcon class="shrink-0" />
-          <span class="text-sm capitalize">
+          <span class="text-sm">
-            {{ instance.loader }} {{ instance.game_version }}
+            {{ formatCategory(instance.loader) }} {{ instance.game_version }}
           </span>
         </div>
       </div>

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>
@@ -197,6 +197,7 @@
 </template>
 
 <script setup>
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import {
   CodeIcon,
   FolderOpenIcon,
@@ -208,25 +209,23 @@ import {
   XIcon,
 } from '@modrinth/assets'
 import { Avatar, Button, Checkbox, Chips } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { getCurrentWebview } from '@tauri-apps/api/webview'
-import { open } from '@tauri-apps/plugin-dialog'
 import { computed, onUnmounted, ref, shallowRef } from 'vue'
+import { get_loaders } from '@/helpers/tags'
+import { create } from '@/helpers/profile'
+import { open } from '@tauri-apps/plugin-dialog'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
+import { handleError } from '@/store/notifications.js'
 import Multiselect from 'vue-multiselect'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { trackEvent } from '@/helpers/analytics'
+import { create_profile_and_install_from_file } from '@/helpers/pack.js'
 import {
   get_default_launcher_path,
   get_importable_instances,
   import_instance,
 } from '@/helpers/import.js'
-import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
+import ProgressBar from '@/components/ui/ProgressBar.vue'
-import { create_profile_and_install_from_file } from '@/helpers/pack.js'
+import { getCurrentWebview } from '@tauri-apps/api/webview'
-import { create } from '@/helpers/profile'
-import { get_loaders } from '@/helpers/tags'
-import { handleError } from '@/store/notifications.js'
 
 const profile_name = ref('')
 const game_version = ref('')
@@ -306,16 +305,12 @@ const [
   get_game_versions().then(shallowRef).catch(handleError),
   get_loaders()
     .then((value) =>
-      ref(
+      value
-        value
+        .filter((item) => item.supported_project_types.includes('modpack'))
-          .filter((item) => item.supported_project_types.includes('modpack'))
+        .map((item) => item.name.toLowerCase()),
-          .map((item) => item.name.toLowerCase()),
-      ),
     )
-    .catch((err) => {
+    .then(ref)
-      handleError(err)
+    .catch(handleError),
-      return ref([])
-    }),
 ])
 loaders.value.unshift('vanilla')
 

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { formatCategory } from '@modrinth/utils'
 import { GameIcon, LeftArrowIcon } from '@modrinth/assets'
 import { Avatar, ButtonStyled } from '@modrinth/ui'
-import { formatCategory } from '@modrinth/utils'
-import { convertFileSrc } from '@tauri-apps/api/core'
 
 type Instance = {
   game_version: string

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

@@ -35,14 +35,13 @@
   </ModalWrapper>
 </template>
 <script setup>
-import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
+import { PlusIcon, CheckIcon, XIcon } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
 import { ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { find_filtered_jres } from '@/helpers/jre.js'
 import { handleError } from '@/store/notifications.js'
+import { trackEvent } from '@/helpers/analytics'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const chosenInstallOptions = ref([])
 const detectJavaModal = ref(null)

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

@@ -53,21 +53,20 @@
 
 <script setup>
 import {
-  CheckIcon,
-  DownloadIcon,
-  FolderSearchIcon,
-  PlayIcon,
   SearchIcon,
+  PlayIcon,
+  CheckIcon,
   XIcon,
+  FolderSearchIcon,
+  DownloadIcon,
 } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
-import { ref } from 'vue'
-
-import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { auto_install_java, find_filtered_jres, get_jre, test_jre } from '@/helpers/jre.js'
+import { ref } from 'vue'
+import { open } from '@tauri-apps/plugin-dialog'
+import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import { handleError } from '@/store/state.js'
+import { trackEvent } from '@/helpers/analytics'
 
 const props = defineProps({
   version: {
@@ -109,6 +108,7 @@ async function testJava() {
   testingJava.value = true
   testingJavaSuccess.value = await test_jre(
     props.modelValue ? props.modelValue.path : '',
+    1,
     props.version,
   )
   testingJava.value = false
@@ -127,7 +127,7 @@ async function handleJavaFileInput() {
   const filePath = await open()
 
   if (filePath) {
-    let result = await get_jre(filePath.path ?? filePath).catch(handleError)
+    let result = await get_jre(filePath.path ?? filePath)
     if (!result) {
       result = {
         path: filePath.path ?? filePath,

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

@@ -1,12 +1,11 @@
 <script setup>
 import { CheckIcon } from '@modrinth/assets'
-import { Badge, Button } from '@modrinth/ui'
+import { Button, Badge } from '@modrinth/ui'
 import { computed, ref } from 'vue'
-
-import { SwapIcon } from '@/assets/icons/index.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { update_managed_modrinth_version } from '@/helpers/profile'
 import { releaseColor } from '@/helpers/utils'
+import { SwapIcon } from '@/assets/icons/index.js'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const props = defineProps({
   versions: {
@@ -71,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/NavTabs.vue

@@ -30,7 +30,7 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import type { RouteLocationRaw } from 'vue-router'
-import { RouterLink, useRoute } from 'vue-router'
+import { useRoute, RouterLink } from 'vue-router'
 
 const route = useRoute()
 

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

@@ -1,10 +1,10 @@
 <script setup>
-import { DownloadIcon, HeartIcon, TagIcon } from '@modrinth/assets'
 import { Avatar, TagItem } from '@modrinth/ui'
-import { formatCategory, formatNumber } from '@modrinth/utils'
+import { DownloadIcon, HeartIcon, TagIcon } from '@modrinth/assets'
+import { formatNumber, formatCategory } from '@modrinth/utils'
+import { computed } from 'vue'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
 dayjs.extend(relativeTime)
@@ -21,11 +21,14 @@ const props = defineProps({
 })
 
 const featuredCategory = computed(() => {
-  if (props.project.display_categories.includes('optimization')) {
+  if (props.project.categories.includes('optimization')) {
     return 'optimization'
   }
 
-  return props.project.display_categories[0] ?? props.project.categories[0]
+  if (props.project.categories.length > 0) {
+    return props.project.categories[0]
+  }
+  return undefined
 })
 
 const toColor = computed(() => {

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

@@ -1,6 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue'
+import { ref, onMounted } from 'vue'
-
 import { init_ads_window } from '@/helpers/ads.js'
 
 const adsWrapper = ref(null)
@@ -33,33 +32,8 @@ function updateAdPosition() {
 
 <template>
   <div ref="adsWrapper" class="ad-parent relative flex w-full justify-center cursor-pointer bg-bg">
-    <a
+    <div class="flex max-h-[250px] min-h-[250px] min-w-[300px] max-w-[300px] flex-col gap-4 p-6">
-      href="https://modrinth.gg?from=app-placeholder"
+      <p class="m-0 text-2xl font-bold text-contrast">75% of ad revenue goes to creators</p>
-      target="_blank"
+    </div>
-      class="flex max-h-[250px] min-h-[250px] min-w-[300px] max-w-[300px] flex-col gap-4 rounded-[inherit]"
-    >
-      <img
-        src="https://cdn-raw.modrinth.com/modrinth-servers-placeholder-light.webp"
-        alt="Host your next server with Modrinth Servers"
-        class="hidden light-image rounded-[inherit]"
-      />
-      <img
-        src="https://cdn-raw.modrinth.com/modrinth-servers-placeholder-dark.webp"
-        alt="Host your next server with Modrinth Servers"
-        class="dark-image rounded-[inherit]"
-      />
-    </a>
   </div>
 </template>
-<style lang="scss" scoped>
-.light,
-.light-mode {
-  .dark-image {
-    display: none;
-  }
-
-  .light-image {
-    display: block;
-  }
-}
-</style>

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

@@ -1,14 +1,13 @@
 <script setup>
-import { SpinnerIcon } from '@modrinth/assets'
-import { Avatar } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import dayjs from 'dayjs'
-import { onUnmounted, ref } from 'vue'
-
-import NavButton from '@/components/ui/NavButton.vue'
-import { profile_listener } from '@/helpers/events.js'
 import { list } from '@/helpers/profile'
 import { handleError } from '@/store/notifications'
+import dayjs from 'dayjs'
+import { onUnmounted, ref } from 'vue'
+import { profile_listener } from '@/helpers/events.js'
+import NavButton from '@/components/ui/NavButton.vue'
+import { Avatar } from '@modrinth/ui'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { SpinnerIcon } from '@modrinth/assets'
 
 const recentInstances = ref([])
 const getInstances = async () => {
@@ -31,7 +30,7 @@ const getInstances = async () => {
 
       return dateB - dateA
     })
-    .slice(0, 3)
+    .slice(0, 4)
 }
 
 await getInstances()

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
+        <router-link :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`">
-          class="text-primary"
-          :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`"
-        >
           {{ selectedProcess.profile.name }}
         </router-link>
         <div
@@ -96,22 +93,21 @@
 <script setup>
 import {
   DownloadIcon,
-  DropdownIcon,
   StopCircleIcon,
   TerminalSquareIcon,
+  DropdownIcon,
   UnplugIcon,
 } from '@modrinth/assets'
 import { Button, ButtonStyled, Card } from '@modrinth/ui'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import ProgressBar from '@/components/ui/ProgressBar.vue'
-import { trackEvent } from '@/helpers/analytics'
-import { loading_listener, process_listener } from '@/helpers/events'
 import { get_all as getRunningProcesses, kill as killProcess } from '@/helpers/process'
-import { get_many } from '@/helpers/profile.js'
+import { loading_listener, process_listener } from '@/helpers/events'
+import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
+import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { handleError } from '@/store/notifications.js'
+import { get_many } from '@/helpers/profile.js'
+import { trackEvent } from '@/helpers/analytics'
 
 const router = useRouter()
 const card = ref(null)

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

@@ -117,19 +117,15 @@
 </template>
 
 <script setup>
-import { CheckIcon, DownloadIcon, HeartIcon, PlusIcon, TagsIcon } from '@modrinth/assets'
+import { TagsIcon, DownloadIcon, HeartIcon, PlusIcon, CheckIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled } from '@modrinth/ui'
+import { ButtonStyled, Avatar } from '@modrinth/ui'
-import { formatCategory, formatNumber } from '@modrinth/utils'
+import { formatNumber, formatCategory } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { computed, ref } from 'vue'
+import { ref, computed } from 'vue'
-import { useRouter } from 'vue-router'
-
 import { install as installVersion } from '@/store/install.js'
 dayjs.extend(relativeTime)
 
-const router = useRouter()
-
 const props = defineProps({
   backgroundImage: {
     type: String,
@@ -172,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/SplashScreen.vue

@@ -82,12 +82,11 @@
 </template>
 
 <script setup>
-import { MaximizeIcon, MinimizeIcon, XIcon } from '@modrinth/assets'
-import { getCurrentWindow } from '@tauri-apps/api/window'
 import { ref, watch } from 'vue'
-
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { loading_listener } from '@/helpers/events.js'
+import { getCurrentWindow } from '@tauri-apps/api/window'
+import { XIcon, MaximizeIcon, MinimizeIcon } from '@modrinth/assets'
 import { getOS } from '@/helpers/utils.js'
 import { useLoading } from '@/store/loading.js'
 

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

@@ -1,13 +1,12 @@
 <script setup>
 import { Button } from '@modrinth/ui'
 import { ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import SearchCard from '@/components/ui/SearchCard.vue'
-import { get_project, get_version } from '@/helpers/cache.js'
 import { get_categories } from '@/helpers/tags.js'
-import { install as installVersion } from '@/store/install.js'
 import { handleError } from '@/store/notifications.js'
+import { get_version, get_project } from '@/helpers/cache.js'
+import { install as installVersion } from '@/store/install.js'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const confirmModal = ref(null)
 const project = ref(null)

apps/app-frontend/src/components/ui/friends/FriendsList.vue

@@ -1,25 +1,22 @@
 <script setup lang="ts">
+import { Avatar, ButtonStyled, OverflowMenu } from '@modrinth/ui'
 import {
-  MailIcon,
+  UserPlusIcon,
   MoreVerticalIcon,
+  MailIcon,
   SettingsIcon,
   TrashIcon,
-  UserPlusIcon,
   XIcon,
 } from '@modrinth/assets'
-import { Avatar, ButtonStyled, OverflowMenu, useRelativeTime } from '@modrinth/ui'
+import { ref, onUnmounted, watch, computed } from 'vue'
+import { friend_listener } from '@/helpers/events'
+import { friends, friend_statuses, add_friend, remove_friend } from '@/helpers/friends'
+import { get_user_many } from '@/helpers/cache'
+import { handleError } from '@/store/notifications.js'
+import ContextMenu from '@/components/ui/ContextMenu.vue'
 import type { Dayjs } from 'dayjs'
 import dayjs from 'dayjs'
-import { computed, onUnmounted, ref, watch } from 'vue'
-
-import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { get_user_many } from '@/helpers/cache'
-import { friend_listener } from '@/helpers/events'
-import { add_friend, friend_statuses, friends, remove_friend } from '@/helpers/friends'
-import { handleError } from '@/store/notifications.js'
-
-const formatRelativeTime = useRelativeTime()
 
 const props = defineProps<{
   credentials: unknown | null
@@ -208,9 +205,7 @@ onUnmounted(() => {
                 You sent <span class="font-bold">{{ friend.username }}</span> a friend request
               </template>
             </p>
-            <p class="m-0 text-sm text-secondary">
+            <p class="m-0 text-sm text-secondary">{{ friend.created.fromNow() }}</p>
-              {{ formatRelativeTime(friend.created.toISOString()) }}
-            </p>
           </div>
           <div class="flex gap-2">
             <template v-if="friend.id === userCredentials.user_id">

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

@@ -56,16 +56,15 @@
 </template>
 
 <script setup>
-import { DownloadIcon, XIcon } from '@modrinth/assets'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { XIcon, DownloadIcon } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
 import { formatCategory } from '@modrinth/utils'
-import { ref } from 'vue'
-import Multiselect from 'vue-multiselect'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { add_project_from_version as installMod } from '@/helpers/profile'
+import { ref } from 'vue'
 import { handleError } from '@/store/state.js'
+import { trackEvent } from '@/helpers/analytics'
+import Multiselect from 'vue-multiselect'
 
 const instance = ref(null)
 const project = ref(null)
@@ -77,10 +76,10 @@ const installing = ref(false)
 const onInstall = ref(() => {})
 
 defineExpose({
-  show: (instanceVal, projectVal, projectVersions, selected, callback) => {
+  show: (instanceVal, projectVal, projectVersions, callback) => {
     instance.value = instanceVal
     versions.value = projectVersions
-    selectedVersion.value = selected ?? projectVersions[0]
+    selectedVersion.value = projectVersions[0]
 
     project.value = projectVal
 

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

@@ -1,12 +1,11 @@
 <script setup>
 import { DownloadIcon, XIcon } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
-import { ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { create_profile_and_install as pack_install } from '@/helpers/pack'
+import { ref } from 'vue'
+import { trackEvent } from '@/helpers/analytics'
 import { handleError } from '@/store/state.js'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const versionId = ref()
 const project = ref()
@@ -14,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')
   },
@@ -39,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/install_flow/ModInstallModal.vue

@@ -1,29 +1,28 @@
 <script setup>
 import {
-  CheckIcon,
   DownloadIcon,
   PlusIcon,
-  RightArrowIcon,
   UploadIcon,
   XIcon,
+  RightArrowIcon,
+  CheckIcon,
 } from '@modrinth/assets'
 import { Avatar, Button, Card } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { open } from '@tauri-apps/plugin-dialog'
 import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import {
   add_project_from_version as installMod,
   check_installed,
-  create,
   get,
   list,
+  create,
 } from '@/helpers/profile'
+import { open } from '@tauri-apps/plugin-dialog'
 import { installVersionDependencies } from '@/store/install.js'
 import { handleError } from '@/store/notifications.js'
+import { useRouter } from 'vue-router'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { trackEvent } from '@/helpers/analytics'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const router = useRouter()
 

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

@@ -1,18 +1,16 @@
 <script setup lang="ts">
-import { CopyIcon, EditIcon, PlusIcon, SpinnerIcon, TrashIcon, UploadIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, Checkbox, OverflowMenu } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
-import { open } from '@tauri-apps/plugin-dialog'
+import { SpinnerIcon, TrashIcon, UploadIcon, PlusIcon, EditIcon, CopyIcon } from '@modrinth/assets'
-import { defineMessages, useVIntl } from '@vintl/vintl'
+import { Avatar, ButtonStyled, OverflowMenu, Checkbox } from '@modrinth/ui'
-import { computed, type Ref, ref, watch } from 'vue'
+import { computed, ref, type Ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { duplicate, edit, edit_icon, list, remove } from '@/helpers/profile'
 import { handleError } from '@/store/notifications'
-
+import { trackEvent } from '@/helpers/analytics'
-import type { GameInstance, InstanceSettingsTabProps } from '../../../helpers/types'
+import { open } from '@tauri-apps/plugin-dialog'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { useRouter } from 'vue-router'
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import type { InstanceSettingsTabProps, GameInstance } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()
 const router = useRouter()

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

@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import { Checkbox } from '@modrinth/ui'
-import { defineMessages, useVIntl } from '@vintl/vintl'
 import { computed, ref, watch } from 'vue'
-
-import { edit } from '@/helpers/profile'
-import { get } from '@/helpers/settings.ts'
 import { handleError } from '@/store/notifications'
-
+import { defineMessages, useVIntl } from '@vintl/vintl'
-import type { AppSettings, Hooks, InstanceSettingsTabProps } from '../../../helpers/types'
+import { get } from '@/helpers/settings'
+import { edit } from '@/helpers/profile'
+import type { InstanceSettingsTabProps, AppSettings, Hooks } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()
 
@@ -27,8 +25,9 @@ const editProfileObject = computed(() => {
     hooks?: Hooks
   } = {}
 
-  // When hooks are not overridden per-instance, we want to clear them
+  if (overrideHooks.value) {
-  editProfile.hooks = overrideHooks.value ? hooks.value : {}
+    editProfile.hooks = hooks.value
+  }
 
   return editProfile
 })

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

@@ -1,16 +1,23 @@
 <script setup lang="ts">
 import {
-  DownloadIcon,
-  HammerIcon,
-  IssuesIcon,
-  SpinnerIcon,
   TransferIcon,
-  UndoIcon,
+  IssuesIcon,
-  UnlinkIcon,
+  HammerIcon,
-  UnplugIcon,
+  DownloadIcon,
   WrenchIcon,
+  UndoIcon,
+  SpinnerIcon,
+  UnplugIcon,
+  UnlinkIcon,
 } from '@modrinth/assets'
-import { Avatar, ButtonStyled, Checkbox, Chips, TeleportDropdownMenu } from '@modrinth/ui'
+import { Avatar, Checkbox, Chips, ButtonStyled, TeleportDropdownMenu } from '@modrinth/ui'
+import { computed, type ComputedRef, type Ref, ref, shallowRef, watch } from 'vue'
+import { edit, install, update_repair_modrinth } from '@/helpers/profile'
+import { handleError } from '@/store/notifications'
+import { trackEvent } from '@/helpers/analytics'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { get_loader_versions } from '@/helpers/metadata'
+import { get_game_versions, get_loaders } from '@/helpers/tags'
 import {
   formatCategory,
   type GameVersionTag,
@@ -18,23 +25,14 @@ import {
   type Project,
   type Version,
 } from '@modrinth/utils'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import dayjs from 'dayjs'
-import { computed, type ComputedRef, type Ref, ref, shallowRef, watch } from 'vue'
-
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { get_project, get_version_many } from '@/helpers/cache'
-import { get_loader_versions } from '@/helpers/metadata'
+import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
-import { edit, install, update_repair_modrinth } from '@/helpers/profile'
+import dayjs from 'dayjs'
-import { get_game_versions, get_loaders } from '@/helpers/tags'
-import { handleError } from '@/store/notifications'
-
 import type {
   InstanceSettingsTabProps,
-  Manifest,
   ManifestLoaderVersion,
+  Manifest,
 } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()

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

@@ -1,16 +1,14 @@
 <script setup lang="ts">
-import { CheckCircleIcon, XCircleIcon } from '@modrinth/assets'
 import { Checkbox, Slider } from '@modrinth/ui'
-import { defineMessages, useVIntl } from '@vintl/vintl'
+import { CheckCircleIcon, XCircleIcon } from '@modrinth/assets'
 import { computed, readonly, ref, watch } from 'vue'
-
-import JavaSelector from '@/components/ui/JavaSelector.vue'
-import useMemorySlider from '@/composables/useMemorySlider'
 import { edit, get_optimal_jre_key } from '@/helpers/profile'
-import { get } from '@/helpers/settings.ts'
 import { handleError } from '@/store/notifications'
-
+import { defineMessages, useVIntl } from '@vintl/vintl'
-import type { AppSettings, InstanceSettingsTabProps, MemorySettings } from '../../../helpers/types'
+import JavaSelector from '@/components/ui/JavaSelector.vue'
+import { get_max_memory } from '@/helpers/jre'
+import { get } from '@/helpers/settings'
+import type { InstanceSettingsTabProps, AppSettings, MemorySettings } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()
 
@@ -36,7 +34,7 @@ const envVars = ref(
 
 const overrideMemorySettings = ref(!!props.instance.memory)
 const memory = ref(props.instance.memory ?? globalSettings.memory)
-const { maxMemory, snapPoints } = await useMemorySlider()
+const maxMemory = Math.floor((await get_max_memory().catch(handleError)) / 1024)
 
 const editProfileObject = computed(() => {
   const editProfile: {
@@ -158,8 +156,6 @@ const messages = defineMessages({
       :min="512"
       :max="maxMemory"
       :step="64"
-      :snap-points="snapPoints"
-      :snap-range="512"
       unit="MB"
     />
     <h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">

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

@@ -1,12 +1,10 @@
 <script setup lang="ts">
 import { Checkbox, Toggle } from '@modrinth/ui'
-import { defineMessages, useVIntl } from '@vintl/vintl'
+import { computed, ref, type Ref, watch } from 'vue'
-import { computed, type Ref, ref, watch } from 'vue'
-
-import { edit } from '@/helpers/profile'
-import { get } from '@/helpers/settings.ts'
 import { handleError } from '@/store/notifications'
-
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { get } from '@/helpers/settings'
+import { edit } from '@/helpers/profile'
 import type { AppSettings, InstanceSettingsTabProps } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()

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

@@ -1,29 +1,28 @@
 <script setup lang="ts">
 import {
-  CoffeeIcon,
-  GameIcon,
-  GaugeIcon,
-  ModrinthIcon,
-  PaintbrushIcon,
   ReportIcon,
-  SettingsIcon,
+  ModrinthIcon,
   ShieldIcon,
+  SettingsIcon,
+  GaugeIcon,
+  PaintBrushIcon,
+  GameIcon,
+  CoffeeIcon,
 } from '@modrinth/assets'
 import { TabbedModal } from '@modrinth/ui'
-import { getVersion } from '@tauri-apps/api/app'
-import { platform as getOsPlatform, version as getOsVersion } from '@tauri-apps/plugin-os'
-import { defineMessage, useVIntl } from '@vintl/vintl'
 import { computed, ref, watch } from 'vue'
-
+import { useVIntl, defineMessage } from '@vintl/vintl'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import AppearanceSettings from '@/components/ui/settings/AppearanceSettings.vue'
-import DefaultInstanceSettings from '@/components/ui/settings/DefaultInstanceSettings.vue'
-import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
 import JavaSettings from '@/components/ui/settings/JavaSettings.vue'
-import PrivacySettings from '@/components/ui/settings/PrivacySettings.vue'
 import ResourceManagementSettings from '@/components/ui/settings/ResourceManagementSettings.vue'
-import { get, set } from '@/helpers/settings.ts'
+import PrivacySettings from '@/components/ui/settings/PrivacySettings.vue'
+import DefaultInstanceSettings from '@/components/ui/settings/DefaultInstanceSettings.vue'
+import { getVersion } from '@tauri-apps/api/app'
+import { version as getOsVersion, platform as getOsPlatform } from '@tauri-apps/plugin-os'
 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'
 
 const themeStore = useTheming()
 
@@ -42,7 +41,7 @@ const tabs = [
       id: 'app.settings.tabs.appearance',
       defaultMessage: 'Appearance',
     }),
-    icon: PaintbrushIcon,
+    icon: PaintBrushIcon,
     content: AppearanceSettings,
   },
   {

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

@@ -1,43 +0,0 @@
-<script setup lang="ts">
-import { LogInIcon, SpinnerIcon } from '@modrinth/assets'
-import { ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-
-defineProps({
-  onFlowCancel: {
-    type: Function,
-    default() {
-      return async () => {}
-    },
-  },
-})
-
-const modal = ref()
-
-function show() {
-  modal.value.show()
-}
-
-function hide() {
-  modal.value.hide()
-}
-
-defineExpose({ show, hide })
-</script>
-<template>
-  <ModalWrapper ref="modal" @hide="onFlowCancel">
-    <template #title>
-      <span class="items-center gap-2 text-lg font-extrabold text-contrast">
-        <LogInIcon /> Sign in
-      </span>
-    </template>
-
-    <div class="flex justify-center gap-2">
-      <SpinnerIcon class="w-12 h-12 animate-spin" />
-    </div>
-    <p class="text-sm text-secondary">
-      Please sign in at the browser window that just opened to continue.
-    </p>
-  </ModalWrapper>
-</template>

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

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { ConfirmModal } from '@modrinth/ui'
 import { ref } from 'vue'
-
+import { ConfirmModal } from '@modrinth/ui'
-import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
+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()
 
@@ -42,10 +41,6 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
-  markdown: {
-    type: Boolean,
-    default: true,
-  },
 })
 
 const emit = defineEmits(['proceed'])
@@ -85,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,21 +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/InstanceSettingsModal.vue

@@ -1,24 +1,22 @@
 <script setup lang="ts">
 import {
   ChevronRightIcon,
-  CodeIcon,
   CoffeeIcon,
   InfoIcon,
-  MonitorIcon,
   WrenchIcon,
+  MonitorIcon,
+  CodeIcon,
 } from '@modrinth/assets'
 import { Avatar, TabbedModal, type TabbedModalTab } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { defineMessage, useVIntl } from '@vintl/vintl'
 import { ref } from 'vue'
-
+import { defineMessage, useVIntl } from '@vintl/vintl'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import GeneralSettings from '@/components/ui/instance_settings/GeneralSettings.vue'
-import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
+import { convertFileSrc } from '@tauri-apps/api/core'
 import InstallationSettings from '@/components/ui/instance_settings/InstallationSettings.vue'
 import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
 import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
-
 import type { InstanceSettingsTabProps } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()

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

@@ -1,9 +1,8 @@
 <script setup lang="ts">
+import { ref } from 'vue'
 import { NewModal as Modal } from '@modrinth/ui'
-import { useTemplateRef } from 'vue'
+import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-
+import { useTheming } from '@/store/theme.js'
-import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.ts'
 
 const themeStore = useTheming()
 
@@ -27,16 +26,16 @@ const props = defineProps({
     default: true,
   },
 })
-const modal = useTemplateRef('modal')
+const modal = ref(null)
 
 defineExpose({
-  show: (e: MouseEvent) => {
+  show: () => {
     hide_ads_window()
-    modal.value?.show(e)
+    modal.value.show()
   },
   hide: () => {
     onModalHide()
-    modal.value?.hide()
+    modal.value.hide()
   },
 })
 

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

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { ShareModal } from '@modrinth/ui'
 import { ref } from 'vue'
-
+import { ShareModal } from '@modrinth/ui'
-import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
+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,11 +1,9 @@
 <script setup lang="ts">
 import { TeleportDropdownMenu, ThemeSelector, Toggle } from '@modrinth/ui'
-import { ref, watch } from 'vue'
-
-import { get, set } from '@/helpers/settings.ts'
-import { getOS } from '@/helpers/utils'
 import { useTheming } from '@/store/state'
-import type { ColorTheme } from '@/store/theme.ts'
+import { get, set } from '@/helpers/settings'
+import { ref, watch } from 'vue'
+import { getOS } from '@/helpers/utils'
 
 const themeStore = useTheming()
 
@@ -26,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"
   />
 
@@ -57,17 +55,9 @@ watch(
     />
   </div>
 
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Hide nametag</h2>
-      <p class="m-0 mt-1">Disables the nametag above your player on the skins page.</p>
-    </div>
-    <Toggle id="hide-nametag-skins-page" v-model="settings.hide_nametag_skins_page" />
-  </div>
-
   <div v-if="os !== 'MacOS'" class="mt-4 flex items-center justify-between gap-4">
     <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Native decorations</h2>
+      <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" />
@@ -90,28 +80,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>

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { Slider, Toggle } from '@modrinth/ui'
+import { get, set } from '@/helpers/settings'
 import { ref, watch } from 'vue'
-
+import { get_max_memory } from '@/helpers/jre'
-import useMemorySlider from '@/composables/useMemorySlider'
+import { handleError } from '@/store/notifications'
-import { get, set } from '@/helpers/settings.ts'
+import { Slider, Toggle } from '@modrinth/ui'
 
 const fetchSettings = await get()
 fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
@@ -11,7 +11,7 @@ fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).jo
 
 const settings = ref(fetchSettings)
 
-const { maxMemory, snapPoints } = await useMemorySlider()
+const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
 
 watch(
   settings,
@@ -107,8 +107,6 @@ watch(
       :min="512"
       :max="maxMemory"
       :step="64"
-      :snap-points="snapPoints"
-      :snap-range="512"
       unit="MB"
     />
 

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

@@ -1,17 +1,19 @@
 <script setup lang="ts">
 import { Toggle } from '@modrinth/ui'
-import { ref, watch } from 'vue'
-
-import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { useTheming } from '@/store/state'
-import { DEFAULT_FEATURE_FLAGS, type FeatureFlag } from '@/store/theme.ts'
+import { ref, watch } from 'vue'
+import { get, set } from '@/helpers/settings'
 
 const themeStore = useTheming()
 
-const settings = ref(await getSettings())
+const settings = ref(await get())
-const options = ref<FeatureFlag[]>(Object.keys(DEFAULT_FEATURE_FLAGS))
+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
 }
@@ -19,7 +21,7 @@ function setFeatureFlag(key: string, value: boolean) {
 watch(
   settings,
   async () => {
-    await setSettings(settings.value)
+    await set(settings.value)
   },
   { deep: true },
 )
@@ -28,14 +30,14 @@ 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)"
+      :model-value="getStoreValue(option)"
-      @update:model-value="() => setFeatureFlag(option, !themeStore.getFeatureFlag(option))"
+      @update:model-value="() => setStoreValue(option, !themeStore.featureFlags[option])"
     />
   </div>
 </template>

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

@@ -1,9 +1,8 @@
 <script setup>
 import { ref } from 'vue'
-
-import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { get_java_versions, set_java_version } from '@/helpers/jre'
 import { handleError } from '@/store/notifications'
+import JavaSelector from '@/components/ui/JavaSelector.vue'
 
 const javaVersions = ref(await get_java_versions().catch(handleError))
 async function updateJavaVersion(version) {

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

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'
-
+import { get, set } from '@/helpers/settings'
+import { Toggle } from '@modrinth/ui'
 import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
-import { get, set } from '@/helpers/settings.ts'
 
 const settings = ref(await get())
 

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

@@ -1,13 +1,12 @@
 <script setup>
-import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
 import { Button, Slider } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
 import { ref, watch } from 'vue'
-
+import { get, set } from '@/helpers/settings.js'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 import { purge_cache_types } from '@/helpers/cache.js'
-import { get, set } from '@/helpers/settings.ts'
 import { handleError } from '@/store/notifications.js'
+import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import { open } from '@tauri-apps/plugin-dialog'
 
 const settings = ref(await get())
 

apps/app-frontend/src/components/ui/skin/EditSkinModal.vue

@@ -1,414 +0,0 @@
-<template>
-  <UploadSkinModal ref="uploadModal" />
-  <ModalWrapper ref="modal" @on-hide="resetState">
-    <template #title>
-      <span class="text-lg font-extrabold text-contrast">
-        {{ mode === 'edit' ? 'Editing skin' : 'Adding a skin' }}
-      </span>
-    </template>
-
-    <div class="flex flex-col md:flex-row gap-6">
-      <div class="max-h-[25rem] w-[16rem] min-w-[16rem] overflow-hidden relative">
-        <div class="absolute top-[-4rem] left-0 h-[32rem] w-[16rem] flex-shrink-0">
-          <SkinPreviewRenderer
-            :variant="variant"
-            :texture-src="previewSkin || ''"
-            :cape-src="selectedCapeTexture"
-            :scale="1.4"
-            :fov="50"
-            :initial-rotation="Math.PI / 8"
-            class="h-full w-full"
-          />
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-4 w-full min-h-[20rem]">
-        <section>
-          <h2 class="text-base font-semibold mb-2">Texture</h2>
-          <Button @click="openUploadSkinModal"> <UploadIcon /> Replace texture </Button>
-        </section>
-
-        <section>
-          <h2 class="text-base font-semibold mb-2">Arm style</h2>
-          <RadioButtons v-model="variant" :items="['CLASSIC', 'SLIM']">
-            <template #default="{ item }">
-              {{ item === 'CLASSIC' ? 'Wide' : 'Slim' }}
-            </template>
-          </RadioButtons>
-        </section>
-
-        <section>
-          <h2 class="text-base font-semibold mb-2">Cape</h2>
-          <div class="flex gap-2">
-            <CapeButton
-              v-if="defaultCape"
-              :id="defaultCape.id"
-              :texture="defaultCape.texture"
-              :name="undefined"
-              :selected="!selectedCape"
-              faded
-              @select="selectCape(undefined)"
-            >
-              <span>Use default cape</span>
-            </CapeButton>
-            <CapeLikeTextButton v-else :highlighted="!selectedCape" @click="selectCape(undefined)">
-              <span>Use default cape</span>
-            </CapeLikeTextButton>
-
-            <CapeButton
-              v-for="cape in visibleCapeList"
-              :id="cape.id"
-              :key="cape.id"
-              :texture="cape.texture"
-              :name="cape.name || 'Cape'"
-              :selected="selectedCape?.id === cape.id"
-              @select="selectCape(cape)"
-            />
-
-            <CapeLikeTextButton
-              v-if="(capes?.length ?? 0) > 2"
-              tooltip="View more capes"
-              @mouseup="openSelectCapeModal"
-            >
-              <template #icon><ChevronRightIcon /></template>
-              <span>More</span>
-            </CapeLikeTextButton>
-          </div>
-        </section>
-      </div>
-    </div>
-
-    <div class="flex gap-2 mt-12">
-      <ButtonStyled color="brand" :disabled="disableSave || isSaving">
-        <button v-tooltip="saveTooltip" :disabled="disableSave || isSaving" @click="save">
-          <SpinnerIcon v-if="isSaving" class="animate-spin" />
-          <CheckIcon v-else-if="mode === 'new'" />
-          <SaveIcon v-else />
-          {{ mode === 'new' ? 'Add skin' : 'Save skin' }}
-        </button>
-      </ButtonStyled>
-      <Button :disabled="isSaving" @click="hide"><XIcon />Cancel</Button>
-    </div>
-  </ModalWrapper>
-
-  <SelectCapeModal
-    ref="selectCapeModal"
-    :capes="capes || []"
-    @select="handleCapeSelected"
-    @cancel="handleCapeCancel"
-  />
-</template>
-
-<script setup lang="ts">
-import {
-  CheckIcon,
-  ChevronRightIcon,
-  SaveIcon,
-  SpinnerIcon,
-  UploadIcon,
-  XIcon,
-} from '@modrinth/assets'
-import {
-  Button,
-  ButtonStyled,
-  CapeButton,
-  CapeLikeTextButton,
-  RadioButtons,
-  SkinPreviewRenderer,
-} from '@modrinth/ui'
-import { computed, ref, useTemplateRef, watch } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import SelectCapeModal from '@/components/ui/skin/SelectCapeModal.vue'
-import UploadSkinModal from '@/components/ui/skin/UploadSkinModal.vue'
-import {
-  add_and_equip_custom_skin,
-  type Cape,
-  determineModelType,
-  get_normalized_skin_texture,
-  remove_custom_skin,
-  type Skin,
-  type SkinModel,
-  unequip_skin,
-} from '@/helpers/skins.ts'
-import { handleError } from '@/store/notifications'
-
-const modal = useTemplateRef('modal')
-const selectCapeModal = useTemplateRef('selectCapeModal')
-const mode = ref<'new' | 'edit'>('new')
-const currentSkin = ref<Skin | null>(null)
-const shouldRestoreModal = ref(false)
-const isSaving = ref(false)
-
-const uploadedTextureUrl = ref<string | null>(null)
-const previewSkin = ref<string>('')
-
-const variant = ref<SkinModel>('CLASSIC')
-const selectedCape = ref<Cape | undefined>(undefined)
-const props = defineProps<{ capes?: Cape[]; defaultCape?: Cape }>()
-
-const selectedCapeTexture = computed(() => selectedCape.value?.texture)
-const visibleCapeList = ref<Cape[]>([])
-
-const sortedCapes = computed(() => {
-  return [...(props.capes || [])].sort((a, b) => {
-    const nameA = (a.name || '').toLowerCase()
-    const nameB = (b.name || '').toLowerCase()
-    return nameA.localeCompare(nameB)
-  })
-})
-
-function initVisibleCapeList() {
-  if (!props.capes || props.capes.length === 0) {
-    visibleCapeList.value = []
-    return
-  }
-
-  if (visibleCapeList.value.length === 0) {
-    if (selectedCape.value) {
-      const otherCape = getSortedCapeExcluding(selectedCape.value.id)
-      visibleCapeList.value = otherCape ? [selectedCape.value, otherCape] : [selectedCape.value]
-    } else {
-      visibleCapeList.value = getSortedCapes(2)
-    }
-  }
-}
-
-function getSortedCapes(count: number): Cape[] {
-  if (!sortedCapes.value || sortedCapes.value.length === 0) return []
-  return sortedCapes.value.slice(0, count)
-}
-
-function getSortedCapeExcluding(excludeId: string): Cape | undefined {
-  if (!sortedCapes.value || sortedCapes.value.length <= 1) return undefined
-  return sortedCapes.value.find((cape) => cape.id !== excludeId)
-}
-
-async function loadPreviewSkin() {
-  if (uploadedTextureUrl.value) {
-    previewSkin.value = uploadedTextureUrl.value
-  } else if (currentSkin.value) {
-    try {
-      previewSkin.value = await get_normalized_skin_texture(currentSkin.value)
-    } catch (error) {
-      console.error('Failed to load skin texture:', error)
-      previewSkin.value = '/src/assets/skins/steve.png'
-    }
-  } else {
-    previewSkin.value = '/src/assets/skins/steve.png'
-  }
-}
-
-const hasEdits = computed(() => {
-  if (mode.value !== 'edit') return true
-  if (uploadedTextureUrl.value) return true
-  if (!currentSkin.value) return false
-  if (variant.value !== currentSkin.value.variant) return true
-  if ((selectedCape.value?.id || null) !== (currentSkin.value.cape_id || null)) return true
-  return false
-})
-
-const disableSave = computed(
-  () =>
-    (mode.value === 'new' && !uploadedTextureUrl.value) ||
-    (mode.value === 'edit' && !hasEdits.value),
-)
-
-const saveTooltip = computed(() => {
-  if (isSaving.value) return 'Saving...'
-  if (mode.value === 'new' && !uploadedTextureUrl.value) return 'Upload a skin first!'
-  if (mode.value === 'edit' && !hasEdits.value) return 'Make an edit to the skin first!'
-  return undefined
-})
-
-function resetState() {
-  mode.value = 'new'
-  currentSkin.value = null
-  uploadedTextureUrl.value = null
-  previewSkin.value = ''
-  variant.value = 'CLASSIC'
-  selectedCape.value = undefined
-  visibleCapeList.value = []
-  shouldRestoreModal.value = false
-  isSaving.value = false
-}
-
-async function show(e: MouseEvent, skin?: Skin) {
-  mode.value = skin ? 'edit' : 'new'
-  currentSkin.value = skin ?? null
-  if (skin) {
-    variant.value = skin.variant
-    selectedCape.value = props.capes?.find((c) => c.id === skin.cape_id)
-  } else {
-    variant.value = 'CLASSIC'
-    selectedCape.value = undefined
-  }
-  visibleCapeList.value = []
-  initVisibleCapeList()
-
-  await loadPreviewSkin()
-
-  modal.value?.show(e)
-}
-
-async function showNew(e: MouseEvent, skinTextureUrl: string) {
-  mode.value = 'new'
-  currentSkin.value = null
-  uploadedTextureUrl.value = skinTextureUrl
-  variant.value = await determineModelType(skinTextureUrl)
-  selectedCape.value = undefined
-  visibleCapeList.value = []
-  initVisibleCapeList()
-
-  await loadPreviewSkin()
-
-  modal.value?.show(e)
-}
-
-async function restoreWithNewTexture(skinTextureUrl: string) {
-  uploadedTextureUrl.value = skinTextureUrl
-  await loadPreviewSkin()
-
-  if (shouldRestoreModal.value) {
-    setTimeout(() => {
-      modal.value?.show()
-      shouldRestoreModal.value = false
-    }, 0)
-  }
-}
-
-function hide() {
-  modal.value?.hide()
-  setTimeout(() => resetState(), 250)
-}
-
-function selectCape(cape: Cape | undefined) {
-  if (cape && selectedCape.value?.id !== cape.id) {
-    const isInVisibleList = visibleCapeList.value.some((c) => c.id === cape.id)
-    if (!isInVisibleList && visibleCapeList.value.length > 0) {
-      visibleCapeList.value.splice(0, 1, cape)
-
-      if (visibleCapeList.value.length > 1 && visibleCapeList.value[1].id === cape.id) {
-        const otherCape = getSortedCapeExcluding(cape.id)
-        if (otherCape) {
-          visibleCapeList.value.splice(1, 1, otherCape)
-        }
-      }
-    }
-  }
-  selectedCape.value = cape
-}
-
-function handleCapeSelected(cape: Cape | undefined) {
-  selectCape(cape)
-
-  if (shouldRestoreModal.value) {
-    setTimeout(() => {
-      modal.value?.show()
-      shouldRestoreModal.value = false
-    }, 0)
-  }
-}
-
-function handleCapeCancel() {
-  if (shouldRestoreModal.value) {
-    setTimeout(() => {
-      modal.value?.show()
-      shouldRestoreModal.value = false
-    }, 0)
-  }
-}
-
-function openSelectCapeModal(e: MouseEvent) {
-  if (!selectCapeModal.value) return
-
-  shouldRestoreModal.value = true
-  modal.value?.hide()
-
-  setTimeout(() => {
-    selectCapeModal.value?.show(
-      e,
-      currentSkin.value?.texture_key,
-      selectedCape.value,
-      previewSkin.value,
-      variant.value,
-    )
-  }, 0)
-}
-
-function openUploadSkinModal(e: MouseEvent) {
-  shouldRestoreModal.value = true
-  modal.value?.hide()
-  emit('open-upload-modal', e)
-}
-
-function restoreModal() {
-  if (shouldRestoreModal.value) {
-    setTimeout(() => {
-      const fakeEvent = new MouseEvent('click')
-      modal.value?.show(fakeEvent)
-      shouldRestoreModal.value = false
-    }, 500)
-  }
-}
-
-async function save() {
-  isSaving.value = true
-
-  try {
-    let textureUrl: string
-
-    if (uploadedTextureUrl.value) {
-      textureUrl = uploadedTextureUrl.value
-    } else {
-      textureUrl = currentSkin.value!.texture
-    }
-
-    await unequip_skin()
-
-    const bytes: Uint8Array = new Uint8Array(await (await fetch(textureUrl)).arrayBuffer())
-
-    if (mode.value === 'new') {
-      await add_and_equip_custom_skin(bytes, variant.value, selectedCape.value)
-      emit('saved')
-    } else {
-      await add_and_equip_custom_skin(bytes, variant.value, selectedCape.value)
-      await remove_custom_skin(currentSkin.value!)
-      emit('saved')
-    }
-
-    hide()
-  } catch (err) {
-    handleError(err)
-  } finally {
-    isSaving.value = false
-  }
-}
-
-watch([uploadedTextureUrl, currentSkin], async () => {
-  await loadPreviewSkin()
-})
-
-watch(
-  () => props.capes,
-  () => {
-    initVisibleCapeList()
-  },
-  { immediate: true },
-)
-
-const emit = defineEmits<{
-  (event: 'saved'): void
-  (event: 'deleted', skin: Skin): void
-  (event: 'open-upload-modal', mouseEvent: MouseEvent): void
-}>()
-
-defineExpose({
-  show,
-  showNew,
-  restoreWithNewTexture,
-  hide,
-  shouldRestoreModal,
-  restoreModal,
-})
-</script>

apps/app-frontend/src/components/ui/skin/SelectCapeModal.vue

@@ -1,141 +0,0 @@
-<script setup lang="ts">
-import { CheckIcon, XIcon } from '@modrinth/assets'
-import {
-  ButtonStyled,
-  CapeButton,
-  CapeLikeTextButton,
-  ScrollablePanel,
-  SkinPreviewRenderer,
-} from '@modrinth/ui'
-import { computed, ref, useTemplateRef } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import type { Cape, SkinModel } from '@/helpers/skins.ts'
-
-const modal = useTemplateRef('modal')
-
-const emit = defineEmits<{
-  (e: 'select', cape: Cape | undefined): void
-  (e: 'cancel'): void
-}>()
-
-const props = defineProps<{
-  capes: Cape[]
-}>()
-
-const sortedCapes = computed(() => {
-  return [...props.capes].sort((a, b) => {
-    const nameA = (a.name || '').toLowerCase()
-    const nameB = (b.name || '').toLowerCase()
-    return nameA.localeCompare(nameB)
-  })
-})
-
-const currentSkinId = ref<string | undefined>()
-const currentSkinTexture = ref<string | undefined>()
-const currentSkinVariant = ref<SkinModel>('CLASSIC')
-const currentCapeTexture = computed<string | undefined>(() => currentCape.value?.texture)
-const currentCape = ref<Cape | undefined>()
-
-function show(
-  e: MouseEvent,
-  skinId?: string,
-  selected?: Cape,
-  skinTexture?: string,
-  variant?: SkinModel,
-) {
-  currentSkinId.value = skinId
-  currentSkinTexture.value = skinTexture
-  currentSkinVariant.value = variant || 'CLASSIC'
-  currentCape.value = selected
-  modal.value?.show(e)
-}
-
-function select() {
-  emit('select', currentCape.value)
-  hide()
-}
-
-function hide() {
-  modal.value?.hide()
-  emit('cancel')
-}
-
-function updateSelectedCape(cape: Cape | undefined) {
-  currentCape.value = cape
-}
-
-function onModalHide() {
-  emit('cancel')
-}
-
-defineExpose({
-  show,
-  hide,
-})
-</script>
-<template>
-  <ModalWrapper ref="modal" @on-hide="onModalHide">
-    <template #title>
-      <div class="flex flex-col">
-        <span class="text-lg font-extrabold text-heading">Change cape</span>
-      </div>
-    </template>
-    <div class="flex flex-col md:flex-row gap-6">
-      <div class="max-h-[25rem] h-[25rem] w-[16rem] min-w-[16rem] overflow-hidden relative">
-        <div class="absolute top-[-4rem] left-0 h-[32rem] w-[16rem] flex-shrink-0">
-          <SkinPreviewRenderer
-            v-if="currentSkinTexture"
-            :cape-src="currentCapeTexture"
-            :texture-src="currentSkinTexture"
-            :variant="currentSkinVariant"
-            :scale="1.4"
-            :fov="50"
-            :initial-rotation="Math.PI + Math.PI / 8"
-            class="h-full w-full"
-          />
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-4 w-full my-auto">
-        <ScrollablePanel class="max-h-[20rem] max-w-[30rem] mb-5 h-full">
-          <div class="flex flex-wrap gap-2 justify-center content-start overflow-y-auto h-full">
-            <CapeLikeTextButton
-              tooltip="No Cape"
-              :highlighted="!currentCape"
-              @click="updateSelectedCape(undefined)"
-            >
-              <template #icon>
-                <XIcon />
-              </template>
-              <span>None</span>
-            </CapeLikeTextButton>
-            <CapeButton
-              v-for="cape in sortedCapes"
-              :id="cape.id"
-              :key="cape.id"
-              :name="cape.name"
-              :texture="cape.texture"
-              :selected="currentCape?.id === cape.id"
-              @select="updateSelectedCape(cape)"
-            />
-          </div>
-        </ScrollablePanel>
-      </div>
-    </div>
-    <div class="flex gap-2 items-center">
-      <ButtonStyled color="brand">
-        <button @click="select">
-          <CheckIcon />
-          Select
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button @click="hide">
-          <XIcon />
-          Cancel
-        </button>
-      </ButtonStyled>
-    </div>
-  </ModalWrapper>
-</template>

apps/app-frontend/src/components/ui/skin/UploadSkinModal.vue

@@ -1,141 +0,0 @@
-<template>
-  <ModalWrapper ref="modal" @on-hide="hide(true)">
-    <template #title>
-      <span class="text-lg font-extrabold text-contrast"> Upload skin texture </span>
-    </template>
-    <div class="relative">
-      <div
-        class="border-2 border-dashed border-highlight-gray rounded-xl h-[173px] flex flex-col items-center justify-center p-8 cursor-pointer bg-button-bg hover:bg-button-hover transition-colors relative"
-        @click="triggerFileInput"
-      >
-        <p class="mx-auto mb-0 text-primary font-bold text-lg text-center flex items-center gap-2">
-          <UploadIcon /> Select skin texture file
-        </p>
-        <p class="mx-auto mt-0 text-secondary text-sm text-center">
-          Drag and drop or click here to browse
-        </p>
-        <input
-          ref="fileInput"
-          type="file"
-          accept="image/png"
-          class="hidden"
-          @change="handleInputFileChange"
-        />
-      </div>
-    </div>
-  </ModalWrapper>
-</template>
-
-<script setup lang="ts">
-import { UploadIcon } from '@modrinth/assets'
-import { getCurrentWebview } from '@tauri-apps/api/webview'
-import { onBeforeUnmount, ref, watch } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { get_dragged_skin_data } from '@/helpers/skins'
-import { useNotifications } from '@/store/state'
-
-const notifications = useNotifications()
-
-const modal = ref()
-const fileInput = ref<HTMLInputElement>()
-const unlisten = ref<() => void>()
-const modalVisible = ref(false)
-
-const emit = defineEmits<{
-  (e: 'uploaded', data: ArrayBuffer): void
-  (e: 'canceled'): void
-}>()
-
-function show(e?: MouseEvent) {
-  modal.value?.show(e)
-  modalVisible.value = true
-  setupDragDropListener()
-}
-
-function hide(emitCanceled = false) {
-  modal.value?.hide()
-  modalVisible.value = false
-  cleanupDragDropListener()
-  resetState()
-  if (emitCanceled) {
-    emit('canceled')
-  }
-}
-
-function resetState() {
-  if (fileInput.value) fileInput.value.value = ''
-}
-
-function triggerFileInput() {
-  fileInput.value?.click()
-}
-
-async function handleInputFileChange(e: Event) {
-  const files = (e.target as HTMLInputElement).files
-  if (!files || files.length === 0) {
-    return
-  }
-  const file = files[0]
-  const buffer = await file.arrayBuffer()
-  await processData(buffer)
-}
-
-async function setupDragDropListener() {
-  try {
-    if (modalVisible.value) {
-      await cleanupDragDropListener()
-      unlisten.value = await getCurrentWebview().onDragDropEvent(async (event) => {
-        if (event.payload.type !== 'drop') {
-          return
-        }
-
-        if (!event.payload.paths || event.payload.paths.length === 0) {
-          return
-        }
-
-        const filePath = event.payload.paths[0]
-
-        try {
-          const data = await get_dragged_skin_data(filePath)
-          await processData(data.buffer)
-        } catch (error) {
-          notifications.addNotification({
-            title: 'Error processing file',
-            text: error instanceof Error ? error.message : 'Failed to read the dropped file.',
-            type: 'error',
-          })
-        }
-      })
-    }
-  } catch (error) {
-    console.error('Failed to set up drag and drop listener:', error)
-  }
-}
-
-async function cleanupDragDropListener() {
-  if (unlisten.value) {
-    unlisten.value()
-    unlisten.value = undefined
-  }
-}
-
-async function processData(buffer: ArrayBuffer) {
-  emit('uploaded', buffer)
-  hide()
-}
-
-watch(modalVisible, (isVisible) => {
-  if (isVisible) {
-    setupDragDropListener()
-  } else {
-    cleanupDragDropListener()
-  }
-})
-
-onBeforeUnmount(() => {
-  cleanupDragDropListener()
-})
-
-defineExpose({ show, hide })
-</script>

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

@@ -1,231 +0,0 @@
-<script setup lang="ts">
-import {
-  EyeIcon,
-  FolderOpenIcon,
-  MoreVerticalIcon,
-  PlayIcon,
-  SpinnerIcon,
-  StopCircleIcon,
-} from '@modrinth/assets'
-import {
-  Avatar,
-  ButtonStyled,
-  commonMessages,
-  OverflowMenu,
-  SmartClickable,
-  useRelativeTime,
-} from '@modrinth/ui'
-import { capitalizeString } from '@modrinth/utils'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { useVIntl } from '@vintl/vintl'
-import type { Dayjs } from 'dayjs'
-import dayjs from 'dayjs'
-import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import { trackEvent } from '@/helpers/analytics'
-import { get_project } from '@/helpers/cache'
-import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
-import type { GameInstance } from '@/helpers/types'
-import { showProfileInFolder } from '@/helpers/utils'
-import { handleSevereError } from '@/store/error'
-import { handleError } from '@/store/notifications'
-
-const { formatMessage } = useVIntl()
-const formatRelativeTime = useRelativeTime()
-
-const router = useRouter()
-
-const emit = defineEmits<{
-  (e: 'play' | 'stop'): void
-}>()
-
-const props = defineProps<{
-  instance: GameInstance
-  last_played: Dayjs
-}>()
-
-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': last_played }"
-          >
-            <template v-if="last_played">
-              {{
-                formatMessage(commonMessages.playedLabel, {
-                  time: formatRelativeTime(last_played.toISOString?.()),
-                })
-              }}
-            </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,303 +0,0 @@
-<script setup lang="ts">
-import { GAME_MODES, HeadingLink } from '@modrinth/ui'
-import type { Dayjs } from 'dayjs'
-import dayjs from 'dayjs'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
-
-import InstanceItem from '@/components/ui/world/InstanceItem.vue'
-import WorldItem from '@/components/ui/world/WorldItem.vue'
-import { trackEvent } from '@/helpers/analytics'
-import { process_listener, profile_listener } from '@/helpers/events'
-import { get_all } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
-import type { GameInstance } from '@/helpers/types'
-import {
-  get_profile_protocol_version,
-  get_recent_worlds,
-  getWorldIdentifier,
-  type ProtocolVersion,
-  refreshServerData,
-  type ServerData,
-  type ServerWorld,
-  start_join_server,
-  start_join_singleplayer_world,
-  type WorldWithProfile,
-} from '@/helpers/worlds.ts'
-import { handleSevereError } from '@/store/error'
-import { handleError } from '@/store/notifications'
-import { useTheming } from '@/store/theme.ts'
-
-const props = defineProps<{
-  recentInstances: GameInstance[]
-}>()
-
-const theme = useTheming()
-
-const jumpBackInItems = ref<JumpBackInItem[]>([])
-const serverData = ref<Record<string, ServerData>>({})
-const protocolVersions = ref<Record<string, ProtocolVersion | 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 ?? 0),
-        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,
-        }
-      }
-    })
-
-    servers.forEach(({ 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 ?? 0),
-      instance: instance,
-    })
-  }
-
-  const items: JumpBackInItem[] = [...worldItems, ...instanceItems]
-  items.sort((a, b) => dayjs(b.last_played ?? 0).diff(dayjs(a.last_played ?? 0)))
-  jumpBackInItems.value = items
-    .filter((item, index) => index < MIN_JUMP_BACK_IN || item.last_played.isAfter(TWO_WEEKS_AGO))
-    .slice(0, MAX_JUMP_BACK_IN)
-}
-
-function refreshServer(address: string, instancePath: string) {
-  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" :last_played="item.last_played" />
-      </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 {
-  ClipboardCopyIcon,
-  EditIcon,
-  EyeIcon,
-  FolderOpenIcon,
-  IssuesIcon,
-  MoreVerticalIcon,
-  NoSignalIcon,
-  PlayIcon,
-  SignalIcon,
-  SkullIcon,
-  SpinnerIcon,
-  StopCircleIcon,
-  TrashIcon,
-  UpdatedIcon,
-  UserIcon,
-  XIcon,
-} from '@modrinth/assets'
-import {
-  Avatar,
-  ButtonStyled,
-  commonMessages,
-  OverflowMenu,
-  SmartClickable,
-  useRelativeTime,
-} from '@modrinth/ui'
-import { formatNumber, getPingLevel } from '@modrinth/utils'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import type { MessageDescriptor } from '@vintl/vintl'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import dayjs from 'dayjs'
-import { Tooltip } from 'floating-vue'
-import type { Component } from 'vue'
-import { computed } from 'vue'
-import { useRouter } from 'vue-router'
-
-import { copyToClipboard } from '@/helpers/utils'
-import type {
-  ProtocolVersion,
-  ServerStatus,
-  ServerWorld,
-  SingleplayerWorld,
-  World,
-} from '@/helpers/worlds.ts'
-import { getWorldIdentifier, set_world_display_status } from '@/helpers/worlds.ts'
-
-const { formatMessage } = useVIntl()
-const formatRelativeTime = useRelativeTime()
-
-const router = useRouter()
-
-const emit = defineEmits<{
-  (e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
-  (e: 'open-folder', world: SingleplayerWorld): void
-}>()
-
-const props = withDefaults(
-  defineProps<{
-    world: World
-    playingInstance?: boolean
-    playingWorld?: boolean
-    startingInstance?: boolean
-    supportsServerQuickPlay?: boolean
-    supportsWorldQuickPlay?: boolean
-    currentProtocol?: ProtocolVersion | 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,
-    supportsServerQuickPlay: true,
-    supportsWorldQuickPlay: 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.version ||
-      props.serverStatus.version.legacy !== props.currentProtocol.legacy),
-)
-
-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',
-  },
-  noServerQuickPlay: {
-    id: 'instance.worlds.no_server_quick_play',
-    defaultMessage: 'You can only jump straight into servers on Minecraft Alpha 1.0.5+',
-  },
-  noSingleplayerQuickPlay: {
-    id: 'instance.worlds.no_singleplayer_quick_play',
-    defaultMessage: 'You can only jump straight into singleplayer worlds on Minecraft 1.20+',
-  },
-  gameAlreadyOpen: {
-    id: 'instance.worlds.game_already_open',
-    defaultMessage: 'Instance is already open',
-  },
-  noContact: {
-    id: 'instance.worlds.no_contact',
-    defaultMessage: "Server couldn't be contacted",
-  },
-  incompatibleServer: {
-    id: 'instance.worlds.incompatible_server',
-    defaultMessage: 'Server is incompatible',
-  },
-  copyAddress: {
-    id: 'instance.worlds.copy_address',
-    defaultMessage: 'Copy address',
-  },
-  viewInstance: {
-    id: 'instance.worlds.view_instance',
-    defaultMessage: 'View instance',
-  },
-  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: formatRelativeTime(dayjs(world.last_played).toISOString()),
-                })
-              }}
-            </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">
-        <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="
-              world.type == 'server' && !supportsServerQuickPlay
-                ? formatMessage(messages.noServerQuickPlay)
-                : world.type == 'singleplayer' && !supportsWorldQuickPlay
-                  ? formatMessage(messages.noSingleplayerQuickPlay)
-                  : playingOtherWorld || locked
-                    ? formatMessage(messages.gameAlreadyOpen)
-                    : !serverStatus
-                      ? formatMessage(messages.noContact)
-                      : serverIncompatible
-                        ? formatMessage(messages.incompatibleServer)
-                        : null
-            "
-            :disabled="
-              playingOtherWorld ||
-              startingInstance ||
-              (world.type == 'server' && !supportsServerQuickPlay) ||
-              (world.type == 'singleplayer' && !supportsWorldQuickPlay)
-            "
-            @click="emit('play')"
-          >
-            <SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
-            <PlayIcon v-else 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: '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' ? emit('open-folder', world) : {}),
-              },
-              {
-                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 #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,116 +0,0 @@
-<script setup lang="ts">
-import { PlayIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, commonMessages } from '@modrinth/ui'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { ref } from 'vue'
-
-import InstanceModalTitlePrefix from '@/components/ui/modal/InstanceModalTitlePrefix.vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
-import type { GameInstance } from '@/helpers/types'
-import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
-import { handleError } from '@/store/notifications'
-
-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,119 +0,0 @@
-<script setup lang="ts">
-import { SaveIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, commonMessages } from '@modrinth/ui'
-import { defineMessage, useVIntl } from '@vintl/vintl'
-import { computed, ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
-import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
-import type { GameInstance } from '@/helpers/types'
-import {
-  type DisplayStatus,
-  edit_server_in_profile,
-  type ServerPackStatus,
-  type ServerWorld,
-  set_world_display_status,
-} from '@/helpers/worlds.ts'
-import { handleError } from '@/store/notifications'
-
-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,
-    ).catch(handleError)
-  }
-
-  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,130 +0,0 @@
-<script setup lang="ts">
-import { ChevronRightIcon, SaveIcon, UndoIcon, XIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, commonMessages } from '@modrinth/ui'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { computed, ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
-import type { GameInstance } from '@/helpers/types'
-import type { DisplayStatus, SingleplayerWorld } from '@/helpers/worlds.ts'
-import { rename_world, reset_world_icon, set_world_display_status } from '@/helpers/worlds.ts'
-import { handleError } from '@/store/notifications'
-
-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'
-  removeIcon.value = false
-  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 { Checkbox } from '@modrinth/ui'
-import { defineMessage, useVIntl } from '@vintl/vintl'
-import { computed } from 'vue'
-
-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,87 +0,0 @@
-<script setup lang="ts">
-import { TeleportDropdownMenu } from '@modrinth/ui'
-import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
-
-import type { ServerPackStatus } from '@/helpers/worlds.ts'
-
-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/composables/macCssFix.js

@@ -1,5 +1,4 @@
 import { invoke } from '@tauri-apps/api/core'
-
 import cssContent from '@/assets/stylesheets/macFix.css?inline'
 
 export async function useCheckDisableMouseover() {

apps/app-frontend/src/composables/useMemorySlider.js

@@ -1,22 +0,0 @@
-import { computed, ref } from 'vue'
-
-import { get_max_memory } from '@/helpers/jre.js'
-import { handleError } from '@/store/notifications.js'
-
-export default async function () {
-  const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
-
-  const snapPoints = computed(() => {
-    let points = []
-    let memory = 2048
-
-    while (memory <= maxMemory.value) {
-      points.push(memory)
-      memory *= 2
-    }
-
-    return points
-  })
-
-  return { maxMemory, snapPoints }
-}

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/fetch.js

@@ -1,13 +1,12 @@
-import { getVersion } from '@tauri-apps/api/app'
+import { ofetch } from 'ofetch'
-import { fetch } from '@tauri-apps/plugin-http'
-
 import { handleError } from '@/store/state.js'
+import { getVersion } from '@tauri-apps/api/app'
 
 export const useFetch = async (url, item, isSilent) => {
   try {
     const version = await getVersion()
-    return await fetch(url, {
+
-      method: 'GET',
+    return await ofetch(url, {
       headers: { 'User-Agent': `modrinth/theseus/${version} (support@modrinth.com)` },
     })
   } catch (err) {

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

@@ -4,7 +4,6 @@
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
-
 import { create } from './profile'
 
 /*

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

@@ -36,8 +36,8 @@ export async function get_jre(path) {
 
 // Tests JRE version by running 'java -version' on it.
 // Returns true if the version is valid, and matches given (after extraction)
-export async function test_jre(path, majorVersion) {
+export async function test_jre(path, majorVersion, minorVersion) {
-  return await invoke('plugin:jre|jre_test_jre', { path, majorVersion })
+  return await invoke('plugin:jre|jre_test_jre', { path, majorVersion, minorVersion })
 }
 
 // Automatically installs specified java version

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

@@ -16,7 +16,3 @@ export async function logout() {
 export async function get() {
   return await invoke('plugin:mr-auth|get')
 }
-
-export async function cancelLogin() {
-  return await invoke('plugin:mr-auth|cancel_modrinth_login')
-}

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

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