Use hashset for faster lookup

Materialise realm collection hashes during song select search process
Without this, there's a large overhead to do a realm-live `Contains` search when a collection is selected. This may also help considerably alleviate https://github.com/ppy/osu/discussions/27298#discussioncomment-8552508 as we will be performing the native realm search much less.
2026-05-13 23:23:32 +08:00 · 2024-03-02 02:43:09 +08:00 · 2024-03-02 02:43:09 +08:00 · 2024-03-02 02:43:01 +08:00 · 2024-03-02 02:43:01 +08:00 · 2024-03-02 02:43:01 +08:00
3274 changed files with 50132 additions and 185726 deletions
@@ -9,7 +9,7 @@
      ]
    },
    "nvika": {
-      "version": "4.0.0",
+      "version": "3.0.0",
      "commands": [
        "nvika"
      ]
@@ -21,7 +21,7 @@
      ]
    },
    "ppy.localisationanalyser.tools": {
-      "version": "2025.1208.0",
+      "version": "2023.1117.0",
      "commands": [
        "localisation"
      ]
@@ -19,11 +19,6 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true

-# temporary workaround for https://youtrack.jetbrains.com/issue/RIDER-130051/Cannot-resolve-symbol-inspections-incorrectly-firing-for-xmldoc-protected-member-references
-resharper_c_sharp_warnings_cs1574_cs1584_cs1581_cs1580_highlighting = hint
-# temporary workaround for https://youtrack.jetbrains.com/issue/RIDER-130381/Rider-does-not-respect-propagated-NoWarn-CS1591?backToIssues=false
-dotnet_diagnostic.CS1591.severity = none
-
 #license header
 file_header_template = Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.\nSee the LICENCE file in the repository root for full licence text.

@@ -201,9 +196,6 @@ csharp_style_prefer_switch_expression = false:none

 csharp_style_namespace_declarations = block_scoped:warning

-#Style - C# 12 features
-csharp_style_prefer_primary_constructors = false
-
 [*.{yaml,yml}]
 insert_final_newline = true
 indent_style = space
@@ -1,228 +0,0 @@
-name: "🔒diffcalc (do not use)"
-
-on:
-  workflow_call:
-    inputs:
-      id:
-        type: string
-      head-sha:
-        type: string
-      pr-url:
-        type: string
-      pr-text:
-        type: string
-      dispatch-inputs:
-        type: string
-    outputs:
-      target:
-        description: The comparison target.
-        value: ${{ jobs.generator.outputs.target }}
-      sheet:
-        description: The comparison spreadsheet.
-        value: ${{ jobs.generator.outputs.sheet }}
-    secrets:
-      DIFFCALC_GOOGLE_CREDENTIALS:
-        required: true
-
-env:
-  GENERATOR_DIR: ${{ github.workspace }}/${{ inputs.id }}
-  GENERATOR_ENV: ${{ github.workspace }}/${{ inputs.id }}/.env
-
-defaults:
-  run:
-    shell: bash -euo pipefail {0}
-
-jobs:
-  generator:
-    name: Run
-    runs-on: self-hosted
-    timeout-minutes: 1440
-
-    outputs:
-      target: ${{ steps.run.outputs.target }}
-      sheet: ${{ steps.run.outputs.sheet }}
-
-    steps:
-      - name: Checkout diffcalc-sheet-generator
-        uses: actions/checkout@v4
-        with:
-          path: ${{ inputs.id }}
-          repository: 'smoogipoo/diffcalc-sheet-generator'
-
-      - name: Add base environment
-        env:
-          GOOGLE_CREDS_FILE: ${{ github.workspace }}/${{ inputs.id }}/google-credentials.json
-          VARS_JSON: ${{ (vars != null && toJSON(vars)) || '' }}
-        run: |
-          # Required by diffcalc-sheet-generator
-          cp '${{ env.GENERATOR_DIR }}/.env.sample' "${{ env.GENERATOR_ENV }}"
-
-          # Add Google credentials
-          echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ env.GOOGLE_CREDS_FILE }}"
-
-          # Add repository variables
-          echo "${VARS_JSON}" | jq -c '. | to_entries | .[]' | while read -r line; do
-              opt=$(jq -r '.key' <<< ${line})
-              val=$(jq -r '.value' <<< ${line})
-
-              if [[ "${opt}" =~ ^DIFFCALC_ ]]; then
-                optNoPrefix=$(echo "${opt}" | cut -d '_' -f2-)
-                sed -i "s;^${optNoPrefix}=.*$;${optNoPrefix}=${val};" "${{ env.GENERATOR_ENV }}"
-              fi
-          done
-
-      - name: Add HEAD environment
-        run: |
-          sed -i "s;^OSU_A=.*$;OSU_A=${{ inputs.head-sha }};" "${{ env.GENERATOR_ENV }}"
-
-      - name: Add pull-request environment
-        if: ${{ inputs.pr-url != '' }}
-        run: |
-          sed -i "s;^OSU_B=.*$;OSU_B=${{ inputs.pr-url }};" "${{ env.GENERATOR_ENV }}"
-
-      - name: Add comment environment
-        if: ${{ inputs.pr-text != '' }}
-        env:
-          PR_TEXT: ${{ inputs.pr-text }}
-        run: |
-          # Add comment environment
-          echo "${PR_TEXT}" | sed -r 's/\r$//' | { grep -E '^\w+=' || true; } | while read -r line; do
-              opt=$(echo "${line}" | cut -d '=' -f1)
-              sed -i "s;^${opt}=.*$;${line};" "${{ env.GENERATOR_ENV }}"
-          done
-
-      - name: Add dispatch environment
-        if: ${{ inputs.dispatch-inputs != '' }}
-        env:
-          DISPATCH_INPUTS_JSON: ${{ inputs.dispatch-inputs }}
-        run: |
-          function get_input() {
-            echo "${DISPATCH_INPUTS_JSON}" | jq -r ".\"$1\""
-          }
-
-          osu_a=$(get_input 'osu-a')
-          osu_b=$(get_input 'osu-b')
-          ruleset=$(get_input 'ruleset')
-          generators=$(get_input 'generators')
-          difficulty_calculator_a=$(get_input 'difficulty-calculator-a')
-          difficulty_calculator_b=$(get_input 'difficulty-calculator-b')
-          score_processor_a=$(get_input 'score-processor-a')
-          score_processor_b=$(get_input 'score-processor-b')
-          converts=$(get_input 'converts')
-          ranked_only=$(get_input 'ranked-only')
-
-          sed -i "s;^OSU_B=.*$;OSU_B=${osu_b};" "${{ env.GENERATOR_ENV }}"
-          sed -i "s/^RULESET=.*$/RULESET=${ruleset}/" "${{ env.GENERATOR_ENV }}"
-          sed -i "s/^GENERATORS=.*$/GENERATORS=${generators}/" "${{ env.GENERATOR_ENV }}"
-
-          if [[ "${osu_a}" != 'latest' ]]; then
-              sed -i "s;^OSU_A=.*$;OSU_A=${osu_a};" "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${difficulty_calculator_a}" != 'latest' ]]; then
-              sed -i "s;^DIFFICULTY_CALCULATOR_A=.*$;DIFFICULTY_CALCULATOR_A=${difficulty_calculator_a};" "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${difficulty_calculator_b}" != 'latest' ]]; then
-              sed -i "s;^DIFFICULTY_CALCULATOR_B=.*$;DIFFICULTY_CALCULATOR_B=${difficulty_calculator_b};" "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${score_processor_a}" != 'latest' ]]; then
-              sed -i "s;^SCORE_PROCESSOR_A=.*$;SCORE_PROCESSOR_A=${score_processor_a};" "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${score_processor_b}" != 'latest' ]]; then
-              sed -i "s;^SCORE_PROCESSOR_B=.*$;SCORE_PROCESSOR_B=${score_processor_b};" "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${converts}" == 'true' ]]; then
-              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=0/' "${{ env.GENERATOR_ENV }}"
-          else
-              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=1/' "${{ env.GENERATOR_ENV }}"
-          fi
-
-          if [[ "${ranked_only}" == 'true' ]]; then
-              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=1/' "${{ env.GENERATOR_ENV }}"
-          else
-              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ env.GENERATOR_ENV }}"
-          fi
-
-      - name: Query latest scores
-        id: query-scores
-        run: |
-          ruleset=$(cat ${{ env.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-)
-          performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
-
-          echo "TARGET_DIR=${{ env.GENERATOR_DIR }}/sql/${ruleset}" >> "${GITHUB_OUTPUT}"
-          echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}"
-          echo "DATA_PKG=${performance_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}"
-
-      - name: Restore score cache
-        id: restore-score-cache
-        uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
-        with:
-          path: ${{ steps.query-scores.outputs.DATA_PKG }}
-          key: ${{ steps.query-scores.outputs.DATA_NAME }}
-
-      - name: Download scores
-        if: steps.restore-score-cache.outputs.cache-hit != 'true'
-        run: |
-          wget -q -O "${{ steps.query-scores.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query-scores.outputs.DATA_PKG }}"
-
-      - name: Extract scores
-        run: |
-          tar -I lbzip2 -xf "${{ steps.query-scores.outputs.DATA_PKG }}"
-          rm -r "${{ steps.query-scores.outputs.TARGET_DIR }}"
-          mv "${{ steps.query-scores.outputs.DATA_NAME }}" "${{ steps.query-scores.outputs.TARGET_DIR }}"
-
-      - name: Query latest beatmaps
-        id: query-beatmaps
-        run: |
-          beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
-
-          echo "TARGET_DIR=${{ env.GENERATOR_DIR }}/beatmaps" >> "${GITHUB_OUTPUT}"
-          echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}"
-          echo "DATA_PKG=${beatmaps_data_name}.tar.bz2" >> "${GITHUB_OUTPUT}"
-
-      - name: Restore beatmap cache
-        id: restore-beatmap-cache
-        uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
-        with:
-          path: ${{ steps.query-beatmaps.outputs.DATA_PKG }}
-          key: ${{ steps.query-beatmaps.outputs.DATA_NAME }}
-
-      - name: Download beatmap
-        if: steps.restore-beatmap-cache.outputs.cache-hit != 'true'
-        run: |
-          wget -q -O "${{ steps.query-beatmaps.outputs.DATA_PKG }}" "https://data.ppy.sh/${{ steps.query-beatmaps.outputs.DATA_PKG }}"
-
-      - name: Extract beatmap
-        run: |
-          tar -I lbzip2 -xf "${{ steps.query-beatmaps.outputs.DATA_PKG }}"
-          rm -r "${{ steps.query-beatmaps.outputs.TARGET_DIR }}"
-          mv "${{ steps.query-beatmaps.outputs.DATA_NAME }}" "${{ steps.query-beatmaps.outputs.TARGET_DIR }}"
-
-      - name: Run
-        id: run
-        run: |
-          # Add the GitHub token. This needs to be done here because it's unique per-job.
-          sed -i 's/^GH_TOKEN=.*$/GH_TOKEN=${{ github.token }}/' "${{ env.GENERATOR_ENV }}"
-
-          cd "${{ env.GENERATOR_DIR }}"
-
-          docker compose up --build --detach
-          docker compose logs --follow &
-          docker compose wait generator
-
-          link=$(docker compose logs --tail 10 generator | grep 'http' | sed -E 's/^.*(http.*)$/\1/')
-          target=$(cat "${{ env.GENERATOR_ENV }}" | grep -E '^OSU_B=' | cut -d '=' -f2-)
-
-          echo "target=${target}" >> "${GITHUB_OUTPUT}"
-          echo "sheet=${link}" >> "${GITHUB_OUTPUT}"
-
-      - name: Shutdown
-        if: ${{ always() }}
-        run: |
-          cd "${{ env.GENERATOR_DIR }}"
-          docker compose down --volumes
-          rm -rf "${{ env.GENERATOR_DIR }}"
@@ -13,10 +13,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Install .NET 8.0.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v3
        with:
          dotnet-version: "8.0.x"

@@ -27,7 +27,7 @@ jobs:
        run: dotnet restore osu.Desktop.slnf

      - name: Restore inspectcode cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: ${{ github.workspace }}/inspectcode
          key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
@@ -64,17 +64,16 @@ jobs:
       matrix:
          os:
            - { prettyname: Windows, fullname: windows-latest }
-            # macOS runner performance has gotten unbearably slow so let's turn them off temporarily.
-            # - { prettyname: macOS, fullname: macos-latest }
+            - { prettyname: macOS, fullname: macos-latest }
            - { prettyname: Linux, fullname: ubuntu-latest }
          threadingMode: ['SingleThread', 'MultiThreaded']
-    timeout-minutes: 120
+    timeout-minutes: 60
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Install .NET 8.0.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v3
        with:
          dotnet-version: "8.0.x"

@@ -82,23 +81,13 @@ jobs:
        run: dotnet build -c Debug -warnaserror osu.Desktop.slnf

      - name: Test
-        run: >
-          dotnet test
-          osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll
-          osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll
-          osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll
-          osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll
-          osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll
-          osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll
-          Templates/**/*.Tests/bin/Debug/**/*.Tests.dll
-          --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
-          --
-          NUnit.ConsoleOut=0
+        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" -- NUnit.ConsoleOut=0
+        shell: pwsh

      # Attempt to upload results even if test fails.
      # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
      - name: Upload Test Results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        if: ${{ always() }}
        with:
          name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
@@ -110,45 +99,45 @@ jobs:
    timeout-minutes: 60
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Setup JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
          distribution: microsoft
          java-version: 11

      - name: Install .NET 8.0.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v3
        with:
          dotnet-version: "8.0.x"

      - name: Install .NET workloads
-        run: dotnet workload install android
+        run: dotnet workload install maui-android

      - name: Compile
        run: dotnet build -c Debug osu.Android.slnf

  build-only-ios:
    name: Build only (iOS)
-    runs-on: macos-15
+    # `macos-13` is required, because the newest Microsoft.iOS.Sdk versions require Xcode 14.3.
+    # TODO: can be changed to `macos-latest` once `macos-13` becomes latest (currently in beta: https://github.com/actions/runner-images/tree/main#available-images)
+    runs-on: macos-13
    timeout-minutes: 60
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Install .NET 8.0.x
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v3
        with:
          dotnet-version: "8.0.x"

      - name: Install .NET Workloads
-        run: dotnet workload install ios
+        run: dotnet workload install maui-ios

-      # https://github.com/dotnet/macios/issues/19157
-      # https://github.com/actions/runner-images/issues/12758
-      - name: Use Xcode 16.4
-        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
+      - name: Select Xcode 15.2
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer

      - name: Build
-        run: dotnet build -c Debug osu.iOS.slnf
+        run: dotnet build -c Debug osu.iOS
@@ -1,87 +0,0 @@
-name: Pack and nuget
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  notify_pending_production_deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Submit pending deployment notification
-        run: |
-          export TITLE="Pending osu Production Deployment: $GITHUB_REF_NAME"
-          export URL="https://github.com/ppy/osu/actions/runs/$GITHUB_RUN_ID"
-          export DESCRIPTION="Awaiting approval for building NuGet packages for tag $GITHUB_REF_NAME:
-          [View Workflow Run]($URL)"
-          export ACTOR_ICON="https://avatars.githubusercontent.com/u/$GITHUB_ACTOR_ID"
-
-          BODY="$(jq --null-input '{
-            "embeds": [
-              {
-                "title": env.TITLE,
-                "color": 15098112,
-                "description": env.DESCRIPTION,
-                "url": env.URL,
-                "author": {
-                  "name": env.GITHUB_ACTOR,
-                  "icon_url": env.ACTOR_ICON
-                }
-              }
-            ]
-          }')"
-
-          curl \
-            -H "Content-Type: application/json" \
-            -d "$BODY" \
-            "${{ secrets.DISCORD_INFRA_WEBHOOK_URL }}"
-
-  pack:
-    name: Pack
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set artifacts directory
-        id: artifactsPath
-        run: echo "::set-output name=nuget_artifacts::${{github.workspace}}/artifacts"
-
-      - name: Install .NET 8.0.x
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "8.0.x"
-
-      - name: Pack
-        run: |
-          # Replace project references in templates with package reference, because they're included as source files.
-          dotnet remove Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game/osu.Game.csproj
-          dotnet remove Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj reference osu.Game/osu.Game.csproj
-          dotnet remove Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game/osu.Game.csproj
-          dotnet remove Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj reference osu.Game/osu.Game.csproj
-
-          dotnet add Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -n -v ${{ github.ref_name }}
-          dotnet add Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -n -v ${{ github.ref_name }}
-          dotnet add Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -n -v ${{ github.ref_name }}
-          dotnet add Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -n -v ${{ github.ref_name }}
-
-          # Pack
-          dotnet pack -c Release osu.Game /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-          dotnet pack -c Release osu.Game.Rulesets.Osu /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-          dotnet pack -c Release osu.Game.Rulesets.Taiko /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-          dotnet pack -c Release osu.Game.Rulesets.Catch /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-          dotnet pack -c Release osu.Game.Rulesets.Mania /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-          dotnet pack -c Release Templates /p:Version=${{ github.ref_name }} -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: osu
-          path: |
-            ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg
-            ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.snupkg
-
-      - name: Publish packages to nuget.org
-        run: dotnet nuget push ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
@@ -103,10 +103,6 @@ permissions:
 env:
  EXECUTION_ID: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}

-defaults:
-  run:
-    shell: bash -euo pipefail {0}
-
 jobs:
  check-permissions:
    name: Check permissions
@@ -114,28 +110,10 @@ jobs:
    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') }}
    steps:
      - name: Check permissions
-        run: |
-          ALLOWED_USERS=(smoogipoo peppy bdach frenzibyte tsunyoku stanriders)
-          for i in "${ALLOWED_USERS[@]}"; do
-              if [[ "${{ github.actor }}" == "$i" ]]; then
-                  exit 0
-              fi
-          done
-          exit 1
-
-  run-diffcalc:
-    name: Run spreadsheet generator
-    needs: check-permissions
-    uses: ./.github/workflows/_diffcalc_processor.yml
-    with:
-      # Can't reference env... Why GitHub, WHY?
-      id: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
-      head-sha: https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha || github.sha }}
-      pr-url: ${{ github.event.issue.pull_request.html_url || '' }}
-      pr-text: ${{ github.event.comment.body || '' }}
-      dispatch-inputs: ${{ (github.event.type == 'workflow_dispatch' && toJSON(inputs)) || '' }}
-    secrets:
-      DIFFCALC_GOOGLE_CREDENTIALS: ${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}
+        if: ${{ github.event_name != 'workflow_dispatch' }}
+        uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819 # v2.2.0
+        with:
+          require: 'write'

  create-comment:
    name: Create PR comment
@@ -144,7 +122,7 @@ jobs:
    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
    steps:
      - name: Create comment
-        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
        with:
          comment_tag: ${{ env.EXECUTION_ID }}
          message: |
@@ -152,44 +130,252 @@ jobs:

            *This comment will update on completion*

+  directory:
+    name: Prepare directory
+    needs: check-permissions
+    runs-on: self-hosted
+    outputs:
+      GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
+      GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
+      GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
+    steps:
+      - name: Checkout diffcalc-sheet-generator
+        uses: actions/checkout@v3
+        with:
+          path: ${{ env.EXECUTION_ID }}
+          repository: 'smoogipoo/diffcalc-sheet-generator'
+
+      - name: Set outputs
+        id: set-outputs
+        run: |
+          echo "GENERATOR_DIR=${{ github.workspace }}/${{ env.EXECUTION_ID }}" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_ENV=${{ github.workspace }}/${{ env.EXECUTION_ID }}/.env" >> "${GITHUB_OUTPUT}"
+          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/${{ env.EXECUTION_ID }}/google-credentials.json" >> "${GITHUB_OUTPUT}"
+
+  environment:
+    name: Setup environment
+    needs: directory
+    runs-on: self-hosted
+    env:
+      VARS_JSON: ${{ toJSON(vars) }}
+    steps:
+      - name: Add base environment
+        run: |
+          # Required by diffcalc-sheet-generator
+          cp '${{ needs.directory.outputs.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+          # Add Google credentials
+          echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"
+
+          # Add repository variables
+          echo "${VARS_JSON}" | jq -c '. | to_entries | .[]' | while read -r line; do
+              opt=$(jq -r '.key' <<< ${line})
+              val=$(jq -r '.value' <<< ${line})
+
+              if [[ "${opt}" =~ ^DIFFCALC_ ]]; then
+                optNoPrefix=$(echo "${opt}" | cut -d '_' -f2-)
+                sed -i "s;^${optNoPrefix}=.*$;${optNoPrefix}=${val};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+              fi
+          done
+
+      - name: Add pull-request environment
+        if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
+        run: |
+          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.html_url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+      - name: Add comment environment
+        if: ${{ github.event_name == 'issue_comment' }}
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body }}
+        run: |
+          # Add comment environment
+          echo "$COMMENT_BODY" | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+              opt=$(echo "${line}" | cut -d '=' -f1)
+              sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          done
+
+      - name: Add dispatch environment
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i 's;^OSU_B=.*$;OSU_B=${{ inputs.osu-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^RULESET=.*$/RULESET=${{ inputs.ruleset }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^GENERATORS=.*$/GENERATORS=${{ inputs.generators }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+          if [[ '${{ inputs.osu-a }}' != 'latest' ]]; then
+              sed -i 's;^OSU_A=.*$;OSU_A=${{ inputs.osu-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.difficulty-calculator-a }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_A=.*$;DIFFICULTY_CALCULATOR_A=${{ inputs.difficulty-calculator-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.difficulty-calculator-b }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_B=.*$;DIFFICULTY_CALCULATOR_B=${{ inputs.difficulty-calculator-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-a }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_A=.*$;SCORE_PROCESSOR_A=${{ inputs.score-processor-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-b }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_B=.*$;SCORE_PROCESSOR_B=${{ inputs.score-processor-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.converts }}' == 'true' ]]; then
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.ranked-only }}' == 'true' ]]; then
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+  scores:
+    name: Setup scores
+    needs: [ directory, environment ]
+    runs-on: self-hosted
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          ruleset=$(cat ${{ needs.directory.outputs.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-)
+          performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/sql/${ruleset}" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  beatmaps:
+    name: Setup beatmaps
+    needs: directory
+    runs-on: self-hosted
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/beatmaps" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  generator:
+    name: Run generator
+    needs: [ directory, environment, scores, beatmaps ]
+    runs-on: self-hosted
+    timeout-minutes: 720
+    outputs:
+      TARGET: ${{ steps.run.outputs.TARGET }}
+      SPREADSHEET_LINK: ${{ steps.run.outputs.SPREADSHEET_LINK }}
+    steps:
+      - name: Run
+        id: run
+        run: |
+          # Add the GitHub token. This needs to be done here because it's unique per-job.
+          sed -i 's/^GH_TOKEN=.*$/GH_TOKEN=${{ github.token }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose up --build generator
+
+          link=$(docker-compose logs generator -n 10 | grep 'http' | sed -E 's/^.*(http.*)$/\1/')
+          target=$(cat "${{ needs.directory.outputs.GENERATOR_ENV }}" | grep -E '^OSU_B=' | cut -d '=' -f2-)
+
+          echo "TARGET=${target}" >> "${GITHUB_OUTPUT}"
+          echo "SPREADSHEET_LINK=${link}" >> "${GITHUB_OUTPUT}"
+
+      - name: Shutdown
+        if: ${{ always() }}
+        run: |
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose down -v
+
  output-cli:
-    name: Info
-    needs: run-diffcalc
+    name: Output info
+    needs: generator
    runs-on: ubuntu-latest
    steps:
      - name: Output info
        run: |
-          echo "Target: ${{ needs.run-diffcalc.outputs.target }}"
-          echo "Spreadsheet: ${{ needs.run-diffcalc.outputs.sheet }}"
+          echo "Target: ${{ needs.generator.outputs.TARGET }}"
+          echo "Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}"
+
+  cleanup:
+    name: Cleanup
+    needs: [ directory, generator ]
+    if: ${{ always() && needs.directory.result == 'success' }}
+    runs-on: self-hosted
+    steps:
+      - name: Cleanup
+        run: |
+          rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"

  update-comment:
    name: Update PR comment
-    needs: [ create-comment, run-diffcalc ]
+    needs: [ create-comment, generator ]
    runs-on: ubuntu-latest
    if: ${{ always() && needs.create-comment.result == 'success' }}
    steps:
      - name: Update comment on success
-        if: ${{ needs.run-diffcalc.result == 'success' }}
-        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+        if: ${{ needs.generator.result == 'success' }}
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
        with:
          comment_tag: ${{ env.EXECUTION_ID }}
-          mode: recreate
+          mode: upsert
+          create_if_not_exists: false
          message: |
-            Target: ${{ needs.run-diffcalc.outputs.target }}
-            Spreadsheet: ${{ needs.run-diffcalc.outputs.sheet }}
+            Target: ${{ needs.generator.outputs.TARGET }}
+            Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}

      - name: Update comment on failure
-        if: ${{ needs.run-diffcalc.result == 'failure' }}
-        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+        if: ${{ needs.generator.result == 'failure' }}
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
        with:
          comment_tag: ${{ env.EXECUTION_ID }}
-          mode: recreate
+          mode: upsert
+          create_if_not_exists: false
          message: |
            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

      - name: Update comment on cancellation
-        if: ${{ needs.run-diffcalc.result == 'cancelled' }}
-        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+        if: ${{ needs.generator.result == 'cancelled' }}
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
        with:
          comment_tag: ${{ env.EXECUTION_ID }}
          mode: delete
@@ -5,40 +5,33 @@
 name: Annotate CI run with test results
 on:
  workflow_run:
-    workflows: [ "Continuous Integration" ]
+    workflows: ["Continuous Integration"]
    types:
      - completed
-
-permissions:
-  contents: read
-  actions: read
-  checks: write
-
+permissions: {}
 jobs:
  annotate:
+    permissions:
+      checks: write # to create checks (dorny/test-reporter)
+
    name: Annotate CI run with test results
    runs-on: ubuntu-latest
    if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
+    strategy:
+       fail-fast: false
+       matrix:
+          os:
+            - { prettyname: Windows }
+            - { prettyname: macOS }
+            - { prettyname: Linux }
+          threadingMode: ['SingleThread', 'MultiThreaded']
    timeout-minutes: 5
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.workflow_run.repository.full_name }}
-          ref: ${{ github.event.workflow_run.head_sha }}
-
-      - name: Download results
-        uses: actions/download-artifact@v4
-        with:
-          pattern: osu-test-results-*
-          merge-multiple: true
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ github.token }}
-
      - name: Annotate CI run with test results
-        uses: dorny/test-reporter@v1.8.0
+        uses: dorny/test-reporter@v1.6.0
        with:
-          name: Results
+          artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
+          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})
          path: "*.trx"
          reporter: dotnet-trx
          list-suites: 'failed'
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -13,23 +13,23 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Install .NET 8.0.x
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v3
      with:
        dotnet-version: "8.0.x"

    - name: Checkout ppy/osu
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        path: osu

    - name: Checkout ppy/osu-tools
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        repository: ppy/osu-tools
        path: osu-tools

    - name: Checkout ppy/osu-web
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        repository: ppy/osu-web
        path: osu-web
@@ -38,16 +38,12 @@ jobs:
      run: ./UseLocalOsu.sh
      working-directory: ./osu-tools

-    - name: Build tools
-      run: dotnet build PerformanceCalculator --nologo --verbosity quiet
-      working-directory: ./osu-tools
-
    - name: Regenerate mod definitions
-      run: dotnet run --project PerformanceCalculator --no-build -- mods > ../osu-web/database/mods.json
+      run: dotnet run --project PerformanceCalculator -- mods > ../osu-web/database/mods.json
      working-directory: ./osu-tools

    - name: Create pull request with changes
-      uses: peter-evans/create-pull-request@v6
+      uses: peter-evans/create-pull-request@v5
      with:
        title: Update mod definitions
        body: "This PR has been auto-generated to update the mod definitions to match ppy/osu@${{ github.ref_name }}."
@@ -265,8 +265,6 @@ __pycache__/
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-.idea/*/.idea/projectSettingsUpdater.xml
-.idea/*/.idea/encodings.xml

 # Generated files
 .idea/**/contentModel.xml
@@ -342,5 +340,4 @@ inspectcode
 # Fody (pulled in by Realm) - schema file
 FodyWeavers.xsd

-.idea/.idea.osu.Desktop/.idea/misc.xml
-.idea/.idea.osu.Android/.idea/deploymentTargetDropDown.xml
+.idea/.idea.osu.Desktop/.idea/misc.xml
@@ -0,0 +1,57 @@
+# .NET Code Style
+# IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
+
+# IDE0001: Simplify names
+dotnet_diagnostic.IDE0001.severity = warning
+
+# IDE0002: Simplify member access
+dotnet_diagnostic.IDE0002.severity = warning
+
+# IDE0003: Remove qualification
+dotnet_diagnostic.IDE0003.severity = warning
+
+# IDE0004: Remove unnecessary cast
+dotnet_diagnostic.IDE0004.severity = warning
+
+# IDE0005: Remove unnecessary imports
+dotnet_diagnostic.IDE0005.severity = warning
+
+# IDE0034: Simplify default literal
+dotnet_diagnostic.IDE0034.severity = warning
+
+# IDE0036: Sort modifiers
+dotnet_diagnostic.IDE0036.severity = warning
+
+# IDE0040: Add accessibility modifier
+dotnet_diagnostic.IDE0040.severity = warning
+
+# IDE0049: Use keyword for type name
+dotnet_diagnostic.IDE0040.severity = warning
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = warning
+
+# IDE0051: Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+
+# IDE0052: Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+# IDE0073: File header
+dotnet_diagnostic.IDE0073.severity = warning
+
+# IDE0130: Namespace mismatch with folder
+dotnet_diagnostic.IDE0130.severity = warning
+
+# IDE1006: Naming style
+dotnet_diagnostic.IDE1006.severity = warning
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
+
+# Temporarily disable analysing CanBeNull = true in NRT contexts due to mobile issues.
+# See: https://github.com/ppy/osu/pull/19677
+dotnet_diagnostic.OSUF001.severity = none
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="osu.Android">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>
@@ -1,6 +1,5 @@
 {
    "recommendations": [
-        "editorconfig.editorconfig",
-        "ms-dotnettools.csdevkit"
+        "ms-dotnettools.csharp"
    ]
 }
@@ -55,7 +55,9 @@ When in doubt, it's probably best to start with a discussion first. We will esca

 While pull requests from unaffiliated contributors are welcome, please note that due to significant community interest and limited review throughput, the core team's primary focus is on the issues which are currently [on the roadmap](https://github.com/orgs/ppy/projects/7/views/6). Reviewing PRs that fall outside of the scope of the roadmap is done on a best-effort basis, so please be aware that it may take a while before a core maintainer gets around to review your change.

-The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of issues to start with. In the case of simple issues, a direct PR is okay. However, if you decide to work on an existing issue which doesn't seem trivial, **please ask us first**. This way we can try to estimate if it is a good fit for you and provide the correct direction on how to address it. In addition, note that while we do not rule out external contributors from working on roadmapped issues, we will generally prefer to handle them ourselves unless they're not very time sensitive.
+The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of issues to start with. We also have a [`good-first-issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue) label, although from experience it is not used very often, as it is relatively rare that we can spot an issue that will definitively be a good first issue for a new contributor regardless of their programming experience.
+
+In the case of simple issues, a direct PR is okay. However, if you decide to work on an existing issue which doesn't seem trivial, **please ask us first**. This way we can try to estimate if it is a good fit for you and provide the correct direction on how to address it. In addition, note that while we do not rule out external contributors from working on roadmapped issues, we will generally prefer to handle them ourselves unless they're not very time sensitive.

 If you'd like to propose a subjective change to one of the visual aspects of the game, or there is a bigger task you'd like to work on, but there is no corresponding issue or discussion thread yet for it, **please open a discussion or issue first** to avoid wasted effort. This in particular applies if you want to work on [one of the available designs from the osu! Figma master library](https://www.figma.com/file/VIkXMYNPMtQem2RJg9k2iQ/Master-Library).

@@ -71,9 +73,6 @@ Aside from the above, below is a brief checklist of things to watch out when you
 After you're done with your changes and you wish to open the PR, please observe the following recommendations:

 - Please submit the pull request from a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) (not `master`), and keep the *Allow edits from maintainers* check box selected, so that we can push fixes to your PR if necessary.
- Please pick the following target branch for your pull request:
-    - `pp-dev`, if the change impacts star rating or performance points calculations for any of the rulesets,
-    - `master`, otherwise.
 - Please avoid pushing untested or incomplete code.
 - Please do not force-push or rebase unless we ask you to.
 - Please do not merge `master` continually if there are no conflicts to resolve. We will do this for you when the change is ready for merge.
@@ -7,6 +7,7 @@ T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> ins
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
+M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.
 M:System.Guid.#ctor;Probably meaning to use Guid.NewGuid() instead. If actually wanting empty, use Guid.Empty.
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IQueryable<T>,NotificationCallbackDelegate<T>) instead.
@@ -14,14 +15,11 @@ M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Collections.Gen
 M:System.Threading.Tasks.Task.Wait();Don't use Task.Wait. Use Task.WaitSafely() to ensure we avoid deadlocks.
 P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.GetResultSafely() to ensure we avoid deadlocks.
 M:System.Threading.ManualResetEventSlim.Wait();Specify a timeout to avoid waiting forever.
+M:System.Char.ToLower(System.Char);char.ToLower() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToLowerInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.
+M:System.Char.ToUpper(System.Char);char.ToUpper() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToUpperInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.
+M:System.String.ToLower();string.ToLower() changes behaviour depending on CultureInfo.CurrentCulture. Use string.ToLowerInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture or use LocalisableString.
+M:System.String.ToUpper();string.ToUpper() changes behaviour depending on CultureInfo.CurrentCulture. Use string.ToUpperInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture or use LocalisableString.
 M:Humanizer.InflectorExtensions.Pascalize(System.String);Humanizer's .Pascalize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToPascalCase() instead.
 M:Humanizer.InflectorExtensions.Camelize(System.String);Humanizer's .Camelize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToCamelCase() instead.
 M:Humanizer.InflectorExtensions.Underscore(System.String);Humanizer's .Underscore() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToSnakeCase() instead.
 M:Humanizer.InflectorExtensions.Kebaberize(System.String);Humanizer's .Kebaberize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToKebabCase() instead.
-M:osuTK.MathHelper.Clamp(System.Int32,System.Int32,System.Int32)~System.Int32;Use Math.Clamp() instead.
-M:osuTK.MathHelper.Clamp(System.Single,System.Single,System.Single)~System.Single;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.
-M:osuTK.MathHelper.Clamp(System.Double,System.Double,System.Double)~System.Double;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.
-M:TagLib.File.Create(System.String);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(TagLib.File.IFileAbstraction);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(System.String,TagLib.ReadStyle);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(TagLib.File.IFileAbstraction,TagLib.ReadStyle);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
@@ -1,112 +0,0 @@
-# .NET Code Style
-# IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
-is_global = true
-
-# IDE0001: Simplify names
-dotnet_diagnostic.IDE0001.severity = warning
-
-# IDE0002: Simplify member access
-dotnet_diagnostic.IDE0002.severity = warning
-
-# IDE0003: Remove qualification
-dotnet_diagnostic.IDE0003.severity = warning
-
-# IDE0004: Remove unnecessary cast
-dotnet_diagnostic.IDE0004.severity = warning
-
-# IDE0005: Remove unnecessary imports
-dotnet_diagnostic.IDE0005.severity = warning
-
-# IDE0034: Simplify default literal
-dotnet_diagnostic.IDE0034.severity = warning
-
-# IDE0036: Sort modifiers
-dotnet_diagnostic.IDE0036.severity = warning
-
-# IDE0040: Add accessibility modifier
-dotnet_diagnostic.IDE0040.severity = warning
-
-# IDE0049: Use keyword for type name
-dotnet_diagnostic.IDE0040.severity = warning
-
-# IDE0055: Fix formatting
-dotnet_diagnostic.IDE0055.severity = warning
-
-# IDE0051: Private method is unused
-dotnet_diagnostic.IDE0051.severity = silent
-
-# IDE0052: Private member is unused
-dotnet_diagnostic.IDE0052.severity = silent
-
-# IDE0073: File header
-dotnet_diagnostic.IDE0073.severity = warning
-
-# IDE0130: Namespace mismatch with folder
-dotnet_diagnostic.IDE0130.severity = warning
-
-# IDE1006: Naming style
-dotnet_diagnostic.IDE1006.severity = warning
-
-# CA1305: Specify IFormatProvider
-# Too many noisy warnings for parsing/formatting numbers
-dotnet_diagnostic.CA1305.severity = none
-
-# messagepack complains about "osu" not being title cased due to reserved words
-dotnet_diagnostic.CS8981.severity = none
-
-# CA1507: Use nameof to express symbol names
-# Flags serialization name attributes
-dotnet_diagnostic.CA1507.severity = suggestion
-
-# CA1806: Do not ignore method results
-# The usages for numeric parsing are explicitly optional
-dotnet_diagnostic.CA1806.severity = suggestion
-
-# CA1822: Mark members as static
-# Potential false positive around reflection/too much noise
-dotnet_diagnostic.CA1822.severity = none
-
-# CA1826: Do not use Enumerable method on indexable collections
-dotnet_diagnostic.CA1826.severity = suggestion
-
-# CA1859: Use concrete types when possible for improved performance
-# Involves design considerations
-dotnet_diagnostic.CA1859.severity = suggestion
-
-# CA1860: Avoid using 'Enumerable.Any()' extension method
-dotnet_diagnostic.CA1860.severity = suggestion
-
-# CA1861: Avoid constant arrays as arguments
-# Outdated with collection expressions
-dotnet_diagnostic.CA1861.severity = suggestion
-
-# CA2007: Consider calling ConfigureAwait on the awaited task
-dotnet_diagnostic.CA2007.severity = warning
-
-# CA2016: Forward the 'CancellationToken' parameter to methods
-# Some overloads are having special handling for debugger
-dotnet_diagnostic.CA2016.severity = suggestion
-
-# CA2021: Do not call Enumerable.Cast<T> or Enumerable.OfType<T> with incompatible types
-# Causing a lot of false positives with generics
-dotnet_diagnostic.CA2021.severity = none
-
-# CA2101: Specify marshaling for P/Invoke string arguments
-# Reports warning for all non-UTF16 usages on DllImport; consider migrating to LibraryImport
-dotnet_diagnostic.CA2101.severity = none
-
-# CA2201: Do not raise reserved exception types
-dotnet_diagnostic.CA2201.severity = warning
-
-# CA2208: Instantiate argument exceptions correctly
-dotnet_diagnostic.CA2208.severity = suggestion
-
-# CA2242: Test for NaN correctly
-dotnet_diagnostic.CA2242.severity = warning
-
-# Banned APIs
-dotnet_diagnostic.RS0030.severity = error
-
-# Temporarily disable analysing CanBeNull = true in NRT contexts due to mobile issues.
-# See: https://github.com/ppy/osu/pull/19677
-dotnet_diagnostic.OSUF001.severity = none
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="osu! Rule Set" Description=" " ToolsVersion="16.0">
+  <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
+    <Rule Id="CA1016" Action="None" />
+    <Rule Id="CA1028" Action="None" />
+    <Rule Id="CA1031" Action="None" />
+    <Rule Id="CA1034" Action="None" />
+    <Rule Id="CA1036" Action="None" />
+    <Rule Id="CA1040" Action="None" />
+    <Rule Id="CA1044" Action="None" />
+    <Rule Id="CA1051" Action="None" />
+    <Rule Id="CA1054" Action="None" />
+    <Rule Id="CA1056" Action="None" />
+    <Rule Id="CA1062" Action="None" />
+    <Rule Id="CA1063" Action="None" />
+    <Rule Id="CA1067" Action="None" />
+    <Rule Id="CA1707" Action="None" />
+    <Rule Id="CA1710" Action="None" />
+    <Rule Id="CA1714" Action="None" />
+    <Rule Id="CA1716" Action="None" />
+    <Rule Id="CA1717" Action="None" />
+    <Rule Id="CA1720" Action="None" />
+    <Rule Id="CA1721" Action="None" />
+    <Rule Id="CA1724" Action="None" />
+    <Rule Id="CA1801" Action="None" />
+    <Rule Id="CA1806" Action="None" />
+    <Rule Id="CA1812" Action="None" />
+    <Rule Id="CA1814" Action="None" />
+    <Rule Id="CA1815" Action="None" />
+    <Rule Id="CA1819" Action="None" />
+    <Rule Id="CA1822" Action="None" />
+    <Rule Id="CA1823" Action="None" />
+    <Rule Id="CA2007" Action="Warning" />
+    <Rule Id="CA2214" Action="None" />
+    <Rule Id="CA2227" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.CodeQuality.CSharp.Analyzers" RuleNamespace="Microsoft.CodeQuality.CSharp.Analyzers">
+    <Rule Id="CA1001" Action="None" />
+    <Rule Id="CA1032" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.NetCore.Analyzers" RuleNamespace="Microsoft.NetCore.Analyzers">
+    <Rule Id="CA1303" Action="None" />
+    <Rule Id="CA1304" Action="None" />
+    <Rule Id="CA1305" Action="None" />
+    <Rule Id="CA1307" Action="None" />
+    <Rule Id="CA1308" Action="None" />
+    <Rule Id="CA1816" Action="None" />
+    <Rule Id="CA1826" Action="None" />
+    <Rule Id="CA2000" Action="None" />
+    <Rule Id="CA2008" Action="None" />
+    <Rule Id="CA2213" Action="None" />
+    <Rule Id="CA2235" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.NetCore.CSharp.Analyzers" RuleNamespace="Microsoft.NetCore.CSharp.Analyzers">
+    <Rule Id="CA1309" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+  </Rules>
+</RuleSet>
@@ -2,11 +2,8 @@
 <Project>
  <PropertyGroup Label="C#">
    <LangVersion>12.0</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <Nullable>enable</Nullable>
-    <!-- Stabilises hot reload, see: https://platform.uno/docs/articles/studio/Hot%20Reload/hot-reload-overview.html?tabs=vswin%2Cwindows%2Cskia-desktop%2Ccommon-issues -->
-    <GenerateAssemblyInfo Condition="'$(Configuration)'=='Debug'">false</GenerateAssemblyInfo>
-    <!-- Required due to the above  -->
-    <NoWarn Condition="'$(Configuration)'=='Debug'">$(NoWarn);CA1416</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationManifest>$(MSBuildThisFileDirectory)app.manifest</ApplicationManifest>
@@ -22,21 +19,9 @@
  <ItemGroup Label="Code Analysis">
    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
    <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <!-- Rider compatibility: .globalconfig needs to be explicitly referenced instead of using the global file name. -->
-    <GlobalAnalyzerConfigFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\osu.globalconfig" />
  </ItemGroup>
  <PropertyGroup Label="Code Analysis">
-    <AnalysisMode>Default</AnalysisMode>
-    <AnalysisModeDesign>Default</AnalysisModeDesign>
-    <AnalysisModeDocumentation>Recommended</AnalysisModeDocumentation>
-    <AnalysisModeGlobalization>Recommended</AnalysisModeGlobalization>
-    <AnalysisModeInteroperability>Recommended</AnalysisModeInteroperability>
-    <AnalysisModeMaintainability>Recommended</AnalysisModeMaintainability>
-    <AnalysisModeNaming>Default</AnalysisModeNaming>
-    <AnalysisModePerformance>Minimum</AnalysisModePerformance>
-    <AnalysisModeReliability>Recommended</AnalysisModeReliability>
-    <AnalysisModeSecurity>Default</AnalysisModeSecurity>
-    <AnalysisModeUsage>Default</AnalysisModeUsage>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Label="Documentation">
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -50,7 +35,7 @@
    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
    <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2025 ppy Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2024 ppy Pty Ltd</Copyright>
    <PackageTags>osu game</PackageTags>
  </PropertyGroup>
 </Project>
@@ -1,4 +1,4 @@
-Copyright (c) 2025 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2024 ppy Pty Ltd <contact@ppy.sh>.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,7 @@ You can also generally download a version for your current device from the [osu!

 If your platform is unsupported or not listed above, there is still a chance you can run the release or manually build it by following the instructions below.

-**For iOS/iPadOS users**: The iOS testflight link fills up very fast (Apple has a hard limit of 10,000 users). We reset it occasionally. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements. Our goal is to get the game on mobile app stores very soon so we don't have to live with this limitation.
+**For iOS/iPadOS users**: The iOS testflight link fills up very fast (Apple has a hard limit of 10,000 users). We reset it occasionally. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements. Our goal is to get the game on mobile app stores in early 2024.

 ## Developing a custom ruleset

@@ -53,7 +53,7 @@ Please make sure you have the following prerequisites:

 - A desktop platform with the [.NET 8.0 SDK](https://dotnet.microsoft.com/download) installed.

-When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/), or [Visual Studio Code](https://code.visualstudio.com/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C# Dev Kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit) plugin installed.
+When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/), or [Visual Studio Code](https://code.visualstudio.com/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) plugin installed.

 ### Downloading the source code

@@ -9,9 +9,9 @@
      <GenerateProgramFile>false</GenerateProgramFile>
    </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.EmptyFreeform
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
        {
            return new DifficultyAttributes(mods, 0);
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods) => Enumerable.Empty<DifficultyHitObject>();
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => Array.Empty<Skill>();
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -14,16 +14,7 @@ namespace osu.Game.Rulesets.EmptyFreeform.Objects

        public Vector2 Position { get; set; }

-        public float X
-        {
-            get => Position.X;
-            set => Position = new Vector2(value, Y);
-        }
-
-        public float Y
-        {
-            get => Position.Y;
-            set => Position = new Vector2(X, value);
-        }
+        public float X => Position.X;
+        public float Y => Position.Y;
    }
 }
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.

 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Rulesets.Replays;
 using osuTK;

@@ -18,8 +17,5 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
            if (button.HasValue)
                Actions.Add(button.Value);
        }
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is EmptyFreeformReplayFrame freeformFrame && Time == freeformFrame.Time && Position == freeformFrame.Position && Actions.SequenceEqual(freeformFrame.Actions);
    }
 }
@@ -9,9 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
@@ -14,16 +14,7 @@ namespace osu.Game.Rulesets.Pippidon.Objects

        public Vector2 Position { get; set; }

-        public float X
-        {
-            get => Position.X;
-            set => Position = new Vector2(value, Y);
-        }
-
-        public float Y
-        {
-            get => Position.Y;
-            set => Position = new Vector2(X, value);
-        }
+        public float X => Position.X;
+        public float Y => Position.Y;
    }
 }
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Pippidon
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
        {
            return new DifficultyAttributes(mods, 0);
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods) => Enumerable.Empty<DifficultyHitObject>();
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => Array.Empty<Skill>();
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -9,8 +9,5 @@ namespace osu.Game.Rulesets.Pippidon.Replays
    public class PippidonReplayFrame : ReplayFrame
    {
        public Vector2 Position;
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is PippidonReplayFrame pippidonFrame && Time == pippidonFrame.Time && Position == pippidonFrame.Position;
    }
 }
@@ -9,9 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.EmptyScrolling
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
        {
            return new DifficultyAttributes(mods, 0);
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods) => Enumerable.Empty<DifficultyHitObject>();
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => Array.Empty<Skill>();
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.

 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Rulesets.Replays;

 namespace osu.Game.Rulesets.EmptyScrolling.Replays
@@ -16,8 +15,5 @@ namespace osu.Game.Rulesets.EmptyScrolling.Replays
            if (button.HasValue)
                Actions.Add(button.Value);
        }
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is EmptyScrollingReplayFrame scrollingFrame && Time == scrollingFrame.Time && Actions.SequenceEqual(scrollingFrame.Actions);
    }
 }
@@ -9,9 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -10,6 +9,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Pippidon.UI;
+using osuTK;

 namespace osu.Game.Rulesets.Pippidon.Beatmaps
 {
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Pippidon.Beatmaps
            };
        }

-        private int getLane(HitObject hitObject) => (int)Math.Clamp(
+        private int getLane(HitObject hitObject) => (int)MathHelper.Clamp(
            (getUsablePosition(hitObject) - minPosition) / (maxPosition - minPosition) * PippidonPlayfield.LANE_COUNT, 0, PippidonPlayfield.LANE_COUNT - 1);

        private float getUsablePosition(HitObject h) => (h as IHasYPosition)?.Y ?? ((IHasXPosition)h).X;
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Pippidon
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
        {
            return new DifficultyAttributes(mods, 0);
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods) => Enumerable.Empty<DifficultyHitObject>();
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => Array.Empty<Skill>();
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.

 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Rulesets.Replays;

 namespace osu.Game.Rulesets.Pippidon.Replays
@@ -16,8 +15,5 @@ namespace osu.Game.Rulesets.Pippidon.Replays
            if (button.HasValue)
                Actions.Add(button.Value);
        }
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is PippidonReplayFrame pippidonFrame && Time == pippidonFrame.Time && Actions.SequenceEqual(pippidonFrame.Actions);
    }
 }
@@ -8,7 +8,7 @@
    <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
-    <copyright>Copyright (c) 2025 ppy Pty Ltd</copyright>
+    <copyright>Copyright (c) 2024 ppy Pty Ltd</copyright>
    <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>
    <PackageTags>dotnet-new;templates;osu</PackageTags>
    <TargetFramework>netstandard2.1</TargetFramework>
@@ -0,0 +1,32 @@
+clone_depth: 1
+version: '{branch}-{build}'
+image: Visual Studio 2022
+cache:
+  - '%LOCALAPPDATA%\NuGet\v3-cache -> appveyor.yml'
+
+dotnet_csproj:
+  patch: true
+  file: 'osu.Game\osu.Game.csproj' # Use wildcard when it's able to exclude Xamarin projects
+  version: '0.0.{build}'
+
+before_build:
+  - cmd: dotnet --info # Useful when version mismatch between CI and local
+  - cmd: dotnet workload install maui-android # Change to `dotnet workload restore` once there's no old projects
+  - cmd: dotnet workload install maui-ios # Change to `dotnet workload restore` once there's no old projects
+  - cmd: nuget restore -verbosity quiet # Only nuget.exe knows both new (.NET Core) and old (Xamarin) projects
+
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+  publish_nuget: true
+
+after_build:
+  - ps: .\InspectCode.ps1
+
+test:
+  assemblies:
+    except:
+      - '**\*Android*'
+      - '**\*iOS*'
+      - 'build\**\*'
@@ -0,0 +1,86 @@
+clone_depth: 1
+version: '{build}'
+image: Visual Studio 2022
+test: off
+skip_non_tags: true
+configuration: Release
+
+environment:
+  matrix:
+    - job_name: osu-game
+    - job_name: osu-ruleset
+      job_depends_on: osu-game
+    - job_name: taiko-ruleset
+      job_depends_on: osu-game
+    - job_name: catch-ruleset
+      job_depends_on: osu-game
+    - job_name: mania-ruleset
+      job_depends_on: osu-game
+    - job_name: templates
+      job_depends_on: osu-game
+
+nuget:
+  project_feed: true
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: osu-game
+    build_script:
+      - cmd: dotnet pack osu.Game\osu.Game.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: osu-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: taiko-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: catch-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: mania-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: templates
+    build_script:
+      - cmd: dotnet remove Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+
+      - cmd: dotnet add Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+
+      - cmd: dotnet pack Templates\osu.Game.Templates.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+
+artifacts:
+  - path: '**\*.nupkg'
+
+deploy:
+  - provider: Environment
+    name: nuget
@@ -10,7 +10,7 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.310.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.223.0" />
  </ItemGroup>
  <PropertyGroup>
    <!-- Fody does not handle Android build well, and warns when unchanged.
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Android.Input;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Android
+{
+    public partial class AndroidJoystickSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => JoystickSettingsStrings.JoystickGamepad;
+
+        private readonly AndroidJoystickHandler joystickHandler;
+
+        private readonly Bindable<bool> enabled = new BindableBool(true);
+
+        private SettingsSlider<float> deadzoneSlider = null!;
+
+        private Bindable<float> handlerDeadzone = null!;
+
+        private Bindable<float> localDeadzone = null!;
+
+        public AndroidJoystickSettings(AndroidJoystickHandler joystickHandler)
+        {
+            this.joystickHandler = joystickHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            handlerDeadzone = joystickHandler.DeadzoneThreshold.GetBoundCopy();
+            localDeadzone = handlerDeadzone.GetUnboundCopy();
+
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = CommonStrings.Enabled,
+                    Current = enabled
+                },
+                deadzoneSlider = new SettingsSlider<float>
+                {
+                    LabelText = JoystickSettingsStrings.DeadzoneThreshold,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true,
+                    Current = localDeadzone,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            enabled.BindTo(joystickHandler.Enabled);
+            enabled.BindValueChanged(e => deadzoneSlider.Current.Disabled = !e.NewValue, true);
+
+            handlerDeadzone.BindValueChanged(val =>
+            {
+                bool disabled = localDeadzone.Disabled;
+
+                localDeadzone.Disabled = false;
+                localDeadzone.Value = val.NewValue;
+                localDeadzone.Disabled = disabled;
+            }, true);
+
+            localDeadzone.BindValueChanged(val => handlerDeadzone.Value = val.NewValue);
+        }
+    }
+}
@@ -5,13 +5,16 @@
 				 android:supportsRtl="true"
 				 android:label="osu!"
 				 android:icon="@mipmap/ic_launcher"
-				 android:roundIcon="@mipmap/ic_launcher">
-        <provider android:name="androidx.core.content.FileProvider"
-                  android:authorities="sh.ppy.osulazer.fileprovider"
-                  android:grantUriPermissions="true"
-                  android:exported="false">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
-                       android:resource="@xml/filepaths" />
-        </provider>
-    </application>
+				 android:roundIcon="@mipmap/ic_launcher" />
+	<!-- for editor usage -->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+	<!--
+		READ_MEDIA_* permissions are available only on API 33 or greater. Devices with older android versions
+		don't understand the new permissions, so request the old READ_EXTERNAL_STORAGE permission to get storage access.
+		Since the old permission has no effect on >= API 33, don't request it.
+
+		Care needs to be taken to ensure runtime permission checks target the correct permission for the API level.
+	-->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
 </manifest>
@@ -0,0 +1,97 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Android.OS;
+using osu.Framework.Allocation;
+using osu.Framework.Android.Input;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Localisation;
+using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Android
+{
+    public partial class AndroidMouseSettings : SettingsSubsection
+    {
+        private readonly AndroidMouseHandler mouseHandler;
+
+        protected override LocalisableString Header => MouseSettingsStrings.Mouse;
+
+        private Bindable<double> handlerSensitivity = null!;
+
+        private Bindable<double> localSensitivity = null!;
+
+        private Bindable<bool> relativeMode = null!;
+
+        public AndroidMouseSettings(AndroidMouseHandler mouseHandler)
+        {
+            this.mouseHandler = mouseHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager osuConfig)
+        {
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            handlerSensitivity = mouseHandler.Sensitivity.GetBoundCopy();
+            localSensitivity = handlerSensitivity.GetUnboundCopy();
+
+            relativeMode = mouseHandler.UseRelativeMode.GetBoundCopy();
+
+            // High precision/pointer capture is only available on Android 8.0 and up
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            {
+                AddRange(new Drawable[]
+                {
+                    new SettingsCheckbox
+                    {
+                        LabelText = MouseSettingsStrings.HighPrecisionMouse,
+                        TooltipText = MouseSettingsStrings.HighPrecisionMouseTooltip,
+                        Current = relativeMode,
+                        Keywords = new[] { @"raw", @"input", @"relative", @"cursor", @"captured", @"pointer" },
+                    },
+                    new MouseSettings.SensitivitySetting
+                    {
+                        LabelText = MouseSettingsStrings.CursorSensitivity,
+                        Current = localSensitivity,
+                    },
+                });
+            }
+
+            AddRange(new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = MouseSettingsStrings.DisableMouseWheelVolumeAdjust,
+                    TooltipText = MouseSettingsStrings.DisableMouseWheelVolumeAdjustTooltip,
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel),
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
+                },
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            relativeMode.BindValueChanged(relative => localSensitivity.Disabled = !relative.NewValue, true);
+
+            handlerSensitivity.BindValueChanged(val =>
+            {
+                bool disabled = localSensitivity.Disabled;
+
+                localSensitivity.Disabled = false;
+                localSensitivity.Value = val.NewValue;
+                localSensitivity.Disabled = disabled;
+            }, true);
+
+            localSensitivity.BindValueChanged(val => handlerSensitivity.Value = val.NewValue);
+        }
+    }
+}
@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Android.Content.PM;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game;
+
+namespace osu.Android
+{
+    public partial class GameplayScreenRotationLocker : Component
+    {
+        private Bindable<bool> localUserPlaying = null!;
+
+        [Resolved]
+        private OsuGameActivity gameActivity { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGame game)
+        {
+            localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
+            localUserPlaying.BindValueChanged(updateLock, true);
+        }
+
+        private void updateLock(ValueChangedEvent<bool> userPlaying)
+        {
+            gameActivity.RunOnUiThread(() =>
+            {
+                gameActivity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : gameActivity.DefaultOrientation;
+            });
+        }
+    }
+}
@@ -13,6 +13,7 @@ using Android.Graphics;
 using Android.OS;
 using Android.Views;
 using osu.Framework.Android;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Database;
 using Debug = System.Diagnostics.Debug;
 using Uri = Android.Net.Uri;
@@ -49,25 +50,9 @@ namespace osu.Android
        /// <remarks>Adjusted on startup to match expected UX for the current device type (phone/tablet).</remarks>
        public ScreenOrientation DefaultOrientation = ScreenOrientation.Unspecified;

-        public new bool IsTablet { get; private set; }
+        private OsuGameAndroid game = null!;

-        private readonly OsuGameAndroid game;
-
-        private bool gameCreated;
-
-        protected override Framework.Game CreateGame()
-        {
-            if (gameCreated)
-                throw new InvalidOperationException("Framework tried to create a game twice.");
-
-            gameCreated = true;
-            return game;
-        }
-
-        public OsuGameActivity()
-        {
-            game = new OsuGameAndroid(this);
-        }
+        protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);

        protected override void OnCreate(Bundle? savedInstanceState)
        {
@@ -91,9 +76,9 @@ namespace osu.Android
            WindowManager.DefaultDisplay.GetSize(displaySize);
 #pragma warning restore CA1422
            float smallestWidthDp = Math.Min(displaySize.X, displaySize.Y) / Resources.DisplayMetrics.Density;
-            IsTablet = smallestWidthDp >= 600f;
+            bool isTablet = smallestWidthDp >= 600f;

-            RequestedOrientation = DefaultOrientation = IsTablet ? ScreenOrientation.FullUser : ScreenOrientation.SensorLandscape;
+            RequestedOrientation = DefaultOrientation = isTablet ? ScreenOrientation.FullUser : ScreenOrientation.SensorLandscape;

            // Currently (SDK 6.0.200), BundleAssemblies is not runnable for net6-android.
            // The assembly files are not available as files either after native AOT.
@@ -110,38 +95,25 @@ namespace osu.Android

        private void handleIntent(Intent? intent)
        {
-            if (intent == null)
-                return;
-
-            switch (intent.Action)
+            switch (intent?.Action)
            {
                case Intent.ActionDefault:
                    if (intent.Scheme == ContentResolver.SchemeContent)
-                    {
-                        if (intent.Data != null)
-                            handleImportFromUris(intent.Data);
-                    }
+                        handleImportFromUris(intent.Data.AsNonNull());
                    else if (osu_url_schemes.Contains(intent.Scheme))
-                    {
-                        if (intent.DataString != null)
-                            game.HandleLink(intent.DataString);
-                    }
-
+                        game.HandleLink(intent.DataString);
                    break;

                case Intent.ActionSend:
                case Intent.ActionSendMultiple:
                {
-                    if (intent.ClipData == null)
-                        break;
-
                    var uris = new List<Uri>();

-                    for (int i = 0; i < intent.ClipData.ItemCount; i++)
+                    for (int i = 0; i < intent.ClipData?.ItemCount; i++)
                    {
-                        var item = intent.ClipData.GetItemAt(i);
-                        if (item?.Uri != null)
-                            uris.Add(item.Uri);
+                        var content = intent.ClipData?.GetItemAt(i);
+                        if (content != null)
+                            uris.Add(content.Uri.AsNonNull());
                    }

                    handleImportFromUris(uris.ToArray());
@@ -2,19 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
-using System.Linq;
 using Android.App;
-using Android.Content.PM;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
-using osu.Framework.Development;
+using osu.Framework.Android.Input;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
-using osu.Game.Screens;
+using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
-using osuTK;

 namespace osu.Android
 {
@@ -23,62 +22,60 @@ namespace osu.Android
        [Cached]
        private readonly OsuGameActivity gameActivity;

-        private readonly PackageInfo packageInfo;
-
-        public override Vector2 ScalingContainerTargetDrawSize => new Vector2(1024, 1024 * DrawHeight / DrawWidth);
-
        public OsuGameAndroid(OsuGameActivity activity)
            : base(null)
        {
            gameActivity = activity;
-            packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0).AsNonNull();
        }

-        public override string Version
+        public override Version AssemblyVersion
        {
            get
            {
-                if (!IsDeployedBuild)
-                    return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
+                var packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0).AsNonNull();

-                return packageInfo.VersionName.AsNonNull();
+                try
+                {
+                    // We store the osu! build number in the "VersionCode" field to better support google play releases.
+                    // If we were to use the main build number, it would require a new submission each time (similar to TestFlight).
+                    // In order to do this, we should split it up and pad the numbers to still ensure sequential increase over time.
+                    //
+                    // We also need to be aware that older SDK versions store this as a 32bit int.
+                    //
+                    // Basic conversion format (as done in Fastfile): 2020.606.0 -> 202006060
+
+                    // https://stackoverflow.com/questions/52977079/android-sdk-28-versioncode-in-packageinfo-has-been-deprecated
+                    string versionName;
+
+                    if (OperatingSystem.IsAndroidVersionAtLeast(28))
+                    {
+                        versionName = packageInfo.LongVersionCode.ToString();
+                        // ensure we only read the trailing portion of long (the part we are interested in).
+                        versionName = versionName.Substring(versionName.Length - 9);
+                    }
+                    else
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        // this is required else older SDKs will report missing method exception.
+                        versionName = packageInfo.VersionCode.ToString();
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+
+                    // undo play store version garbling (as mentioned above).
+                    return new Version(int.Parse(versionName.Substring(0, 4)), int.Parse(versionName.Substring(4, 4)), int.Parse(versionName.Substring(8, 1)));
+                }
+                catch
+                {
+                }
+
+                return new Version(packageInfo.VersionName.AsNonNull());
            }
        }

-        public override Version AssemblyVersion => new Version(packageInfo.VersionName.AsNonNull().Split('-').First());
-
        protected override void LoadComplete()
        {
            base.LoadComplete();
-            UserPlayingState.BindValueChanged(_ => updateOrientation());
-        }
-
-        protected override void ScreenChanged(IOsuScreen? current, IOsuScreen? newScreen)
-        {
-            base.ScreenChanged(current, newScreen);
-
-            if (newScreen != null)
-                updateOrientation();
-        }
-
-        private void updateOrientation()
-        {
-            var orientation = MobileUtils.GetOrientation(this, (IOsuScreen)ScreenStack.CurrentScreen, gameActivity.IsTablet);
-
-            switch (orientation)
-            {
-                case MobileUtils.Orientation.Locked:
-                    gameActivity.RequestedOrientation = ScreenOrientation.Locked;
-                    break;
-
-                case MobileUtils.Orientation.Portrait:
-                    gameActivity.RequestedOrientation = ScreenOrientation.Portrait;
-                    break;
-
-                case MobileUtils.Orientation.Default:
-                    gameActivity.RequestedOrientation = gameActivity.DefaultOrientation;
-                    break;
-            }
+            LoadComponentAsync(new GameplayScreenRotationLocker(), Add);
        }

        public override void SetHost(GameHost host)
@@ -87,10 +84,28 @@ namespace osu.Android
            host.Window.CursorState |= CursorState.Hidden;
        }

-        protected override UpdateManager CreateUpdateManager() => new MobileUpdateNotifier();
+        protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();

        protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();

+        public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler handler)
+        {
+            switch (handler)
+            {
+                case AndroidMouseHandler mh:
+                    return new AndroidMouseSettings(mh);
+
+                case AndroidJoystickHandler jh:
+                    return new AndroidJoystickSettings(jh);
+
+                case AndroidTouchHandler th:
+                    return new TouchSettings(th);
+
+                default:
+                    return base.CreateSettingsSubsectionFor(handler);
+            }
+        }
+
        private class AndroidBatteryInfo : BatteryInfo
        {
            public override double? ChargeLevel => Battery.ChargeLevel;
@@ -1,8 +1,24 @@
-<vector android:height="108dp" android:viewportHeight="434"
-    android:viewportWidth="434" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M299.36,178.05C303.08,178.05 305.62,180.81 305.62,184.62V219.92C305.62,223.74 303.08,226.5 299.36,226.5C295.55,226.5 293.11,223.74 293.11,219.92V184.62C293.11,180.81 295.55,178.05 299.36,178.05ZM299.36,248.97C294.81,248.97 291.2,245.37 291.2,240.81C291.2,236.35 294.81,232.75 299.36,232.75C303.92,232.75 307.53,236.35 307.53,240.81C307.53,245.37 303.92,248.97 299.36,248.97Z"/>
-    <path android:fillColor="#000000" android:pathData="M276.52,195.12C280.34,195.12 282.77,197.87 282.77,201.58V225.01C282.77,242.29 272.12,248.97 259.19,248.97C246.15,248.97 235.49,242.29 235.49,225.01V201.58C235.49,197.87 237.93,195.12 241.75,195.12C245.46,195.12 248,197.87 248,201.58V224.16C248,233.6 251.98,237.31 259.19,237.31C266.29,237.31 270.27,233.6 270.27,224.16V201.58C270.27,197.87 272.81,195.12 276.52,195.12Z"/>
-    <path android:fillColor="#000000" android:pathData="M200.02,209.43C200.02,212.93 203.63,214.2 210.52,215.79C220.06,218.12 229.18,220.56 229.18,232.33C229.18,243.78 220.7,248.97 208.51,248.97C198.43,248.97 191.12,245.47 187.73,241.44C185.08,238.26 185.4,235.51 187.94,233.07C191.12,229.99 193.88,231.27 195.68,232.86C198.54,235.51 202.04,238.26 208.82,238.26C213.91,238.26 217.09,236.57 217.09,233.18C217.09,229.78 213.7,228.62 204.8,226.18C196,223.74 188.15,221.41 188.15,210.91C188.15,199.15 197.69,194.27 208.29,194.27C214.34,194.27 221.23,195.86 225.47,200.42C227.27,202.22 228.65,204.76 225.47,208.26C222.29,211.55 219.96,210.6 217.73,208.9C215.71,207.41 212.22,204.87 206.92,204.87C203.31,204.87 200.02,206.04 200.02,209.43Z"/>
-    <path android:fillColor="#000000" android:pathData="M153.74,248.97C138.46,248.97 127.5,237.27 127.5,221.53C127.5,205.68 138.46,194.09 153.74,194.09C169.03,194.09 179.99,205.68 179.99,221.53C179.99,237.27 169.03,248.97 153.74,248.97ZM153.74,237.27C162.59,237.27 168.12,230.46 168.12,221.53C168.12,212.6 162.59,205.68 153.74,205.68C144.89,205.68 139.36,212.6 139.36,221.53C139.36,230.46 144.89,237.27 153.74,237.27Z"/>
-    <path android:fillColor="#000000" android:pathData="M349,217.5C349,290.13 290.13,349 217.5,349C144.88,349 86,290.13 86,217.5C86,144.88 144.88,86 217.5,86C290.13,86 349,144.88 349,217.5ZM99.15,217.5C99.15,282.86 152.14,335.85 217.5,335.85C282.86,335.85 335.85,282.86 335.85,217.5C335.85,152.14 282.86,99.15 217.5,99.15C152.14,99.15 99.15,152.14 99.15,217.5Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M73.92,44.43C74.82,44.43 75.43,45.1 75.43,46.02V54.54C75.43,55.46 74.82,56.13 73.92,56.13C73,56.13 72.41,55.46 72.41,54.54V46.02C72.41,45.1 73,44.43 73.92,44.43ZM73.92,61.55C72.82,61.55 71.95,60.68 71.95,59.58C71.95,58.51 72.82,57.64 73.92,57.64C75.02,57.64 75.89,58.51 75.89,59.58C75.89,60.68 75.02,61.55 73.92,61.55Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M68.41,48.55C69.33,48.55 69.92,49.22 69.92,50.11V55.77C69.92,59.94 67.35,61.55 64.22,61.55C61.08,61.55 58.5,59.94 58.5,55.77V50.11C58.5,49.22 59.09,48.55 60.01,48.55C60.91,48.55 61.52,49.22 61.52,50.11V55.56C61.52,57.84 62.48,58.74 64.22,58.74C65.94,58.74 66.9,57.84 66.9,55.56V50.11C66.9,49.22 67.51,48.55 68.41,48.55Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M49.94,52.01C49.94,52.85 50.81,53.16 52.47,53.54C54.78,54.1 56.98,54.69 56.98,57.53C56.98,60.3 54.93,61.55 51.99,61.55C49.56,61.55 47.79,60.71 46.97,59.73C46.33,58.97 46.41,58.3 47.02,57.71C47.79,56.97 48.46,57.28 48.89,57.66C49.58,58.3 50.43,58.97 52.07,58.97C53.29,58.97 54.06,58.56 54.06,57.74C54.06,56.92 53.24,56.64 51.09,56.05C48.97,55.46 47.08,54.9 47.08,52.36C47.08,49.52 49.38,48.35 51.94,48.35C53.4,48.35 55.06,48.73 56.08,49.83C56.52,50.27 56.85,50.88 56.08,51.72C55.32,52.52 54.75,52.29 54.22,51.88C53.73,51.52 52.88,50.91 51.6,50.91C50.73,50.91 49.94,51.19 49.94,52.01Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M38.79,61.55C34.9,61.55 32.11,58.74 32.11,54.95C32.11,51.14 34.9,48.35 38.79,48.35C42.68,48.35 45.47,51.14 45.47,54.95C45.47,58.74 42.68,61.55 38.79,61.55ZM38.79,58.74C41.04,58.74 42.45,57.1 42.45,54.95C42.45,52.8 41.04,51.14 38.79,51.14C36.54,51.14 35.13,52.8 35.13,54.95C35.13,57.1 36.54,58.74 38.79,58.74Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M86,54C86,71.67 71.67,86 54,86C36.33,86 22,71.67 22,54C22,36.33 36.33,22 54,22C71.67,22 86,36.33 86,54ZM25.2,54C25.2,69.91 38.09,82.8 54,82.8C69.91,82.8 82.8,69.91 82.8,54C82.8,38.09 69.91,25.2 54,25.2C38.09,25.2 25.2,38.09 25.2,54Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M36.78,54.99C36.78,56.09 37.65,56.96 38.75,56.96C39.85,56.96 40.72,56.09 40.72,54.99C40.72,53.91 39.85,53.04 38.75,53.04C37.65,53.04 36.78,53.91 36.78,54.99Z"
+      android:fillColor="#000000"/>
 </vector>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <!-- https://developer.android.com/reference/androidx/core/content/FileProvider -->
-    <external-files-path path="logs" name="logs" />
-    <external-files-path path="exports" name="exports" />
-</paths>
@@ -5,22 +5,14 @@ using System;
 using System.Text;
 using DiscordRPC;
 using DiscordRPC.Message;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using osu.Framework.Threading;
-using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
-using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Rooms;
-using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using LogLevel = osu.Framework.Logging.LogLevel;
@@ -29,151 +21,91 @@ namespace osu.Desktop
 {
    internal partial class DiscordRichPresence : Component
    {
-        private const string client_id = "1216669957799018608";
+        private const string client_id = "367827983903490050";

        private DiscordRpcClient client = null!;

        [Resolved]
        private IBindable<RulesetInfo> ruleset { get; set; } = null!;

+        private IBindable<APIUser> user = null!;
+
        [Resolved]
        private IAPIProvider api { get; set; } = null!;

-        [Resolved]
-        private OsuGame game { get; set; } = null!;
+        private readonly IBindable<UserStatus?> status = new Bindable<UserStatus?>();
+        private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();

-        [Resolved]
-        private LoginOverlay? login { get; set; }
-
-        [Resolved]
-        private MultiplayerClient multiplayerClient { get; set; } = null!;
-
-        [Resolved]
-        private LocalUserStatisticsProvider statisticsProvider { get; set; } = null!;
-
-        private IBindable<DiscordRichPresenceMode> privacyMode = null!;
-        private IBindable<UserStatus> userStatus = null!;
-        private IBindable<UserActivity?> userActivity = null!;
+        private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();

        private readonly RichPresence presence = new RichPresence
        {
-            Assets = new Assets { LargeImageKey = "osu_logo_lazer" },
-            Secrets = new Secrets
-            {
-                JoinSecret = null,
-                SpectateSecret = null,
-            },
+            Assets = new Assets { LargeImageKey = "osu_logo_lazer", }
        };

-        private IBindable<APIUser>? user;
-
        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, SessionStatics session)
+        private void load(OsuConfigManager config)
        {
-            privacyMode = config.GetBindable<DiscordRichPresenceMode>(OsuSetting.DiscordRichPresence);
-            userStatus = config.GetBindable<UserStatus>(OsuSetting.UserOnlineStatus);
-            userActivity = session.GetBindable<UserActivity?>(Static.UserOnlineActivity);
-
            client = new DiscordRpcClient(client_id)
            {
-                // SkipIdenticalPresence allows us to fire SetPresence at any point and leave it to the underlying implementation
-                // to check whether a difference has actually occurred before sending a command to Discord (with a minor caveat that's handled in onReady).
-                SkipIdenticalPresence = true
+                SkipIdenticalPresence = false // handles better on discord IPC loss, see updateStatus call in onReady.
            };

            client.OnReady += onReady;
-            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Message} ({e.Code})", LoggingTarget.Network);

-            try
-            {
-                client.RegisterUriScheme();
-                client.Subscribe(EventType.Join);
-                client.OnJoin += onJoin;
-            }
-            catch (Exception ex)
-            {
-                // This is known to fail in at least the following sandboxed environments:
-                // - macOS (when packaged as an app bundle)
-                // - flatpak (see: https://github.com/flathub/sh.ppy.osu/issues/170)
-                // There is currently no better way to do this offered by Discord, so the best we can do is simply ignore it for now.
-                Logger.Log($"Failed to register Discord URI scheme: {ex}");
-            }
+            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);

-            client.Initialize();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
+            config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);

            user = api.LocalUser.GetBoundCopy();
+            user.BindValueChanged(u =>
+            {
+                status.UnbindBindings();
+                status.BindTo(u.NewValue.Status);

-            ruleset.BindValueChanged(_ => schedulePresenceUpdate());
-            userStatus.BindValueChanged(_ => schedulePresenceUpdate());
-            userActivity.BindValueChanged(_ => schedulePresenceUpdate());
-            privacyMode.BindValueChanged(_ => schedulePresenceUpdate());
+                activity.UnbindBindings();
+                activity.BindTo(u.NewValue.Activity);
+            }, true);

-            multiplayerClient.RoomUpdated += onRoomUpdated;
-            statisticsProvider.StatisticsUpdated += onStatisticsUpdated;
+            ruleset.BindValueChanged(_ => updateStatus());
+            status.BindValueChanged(_ => updateStatus());
+            activity.BindValueChanged(_ => updateStatus());
+            privacyMode.BindValueChanged(_ => updateStatus());
+
+            client.Initialize();
        }

        private void onReady(object _, ReadyMessage __)
        {
            Logger.Log("Discord RPC Client ready.", LoggingTarget.Network, LogLevel.Debug);
-
-            // when RPC is lost and reconnected, we have to clear presence state for updatePresence to work (see DiscordRpcClient.SkipIdenticalPresence).
-            if (client.CurrentPresence != null)
-                client.SetPresence(null);
-
-            schedulePresenceUpdate();
+            updateStatus();
        }

-        private void onRoomUpdated() => schedulePresenceUpdate();
-
-        private void onStatisticsUpdated(UserStatisticsUpdate _) => schedulePresenceUpdate();
-
-        private ScheduledDelegate? presenceUpdateDelegate;
-
-        private void schedulePresenceUpdate()
+        private void updateStatus()
        {
-            presenceUpdateDelegate?.Cancel();
-            presenceUpdateDelegate = Scheduler.AddDelayed(() =>
-            {
-                if (!client.IsInitialized)
-                    return;
-
-                if (!api.IsLoggedIn || userStatus.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
-                {
-                    client.ClearPresence();
-                    return;
-                }
-
-                bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited || userStatus.Value == UserStatus.DoNotDisturb;
-
-                updatePresence(hideIdentifiableInformation);
-                client.SetPresence(presence);
-            }, 200);
-        }
-
-        private void updatePresence(bool hideIdentifiableInformation)
-        {
-            if (user == null)
+            if (!client.IsInitialized)
                return;

-            // user activity
-            if (userActivity.Value != null)
+            if (status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
            {
-                presence.State = clampLength(userActivity.Value.GetStatus(hideIdentifiableInformation));
-                presence.Details = clampLength(userActivity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
+                client.ClearPresence();
+                return;
+            }

-                if (userActivity.Value.GetBeatmapID(hideIdentifiableInformation) is int beatmapId && beatmapId > 0)
+            if (status.Value == UserStatus.Online && activity.Value != null)
+            {
+                bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited;
+                presence.State = truncate(activity.Value.GetStatus(hideIdentifiableInformation));
+                presence.Details = truncate(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
+
+                if (getBeatmapID(activity.Value) is int beatmapId && beatmapId > 0)
                {
                    presence.Buttons = new[]
                    {
                        new Button
                        {
                            Label = "View beatmap",
-                            Url = $@"{api.Endpoints.WebsiteUrl}/beatmaps/{beatmapId}?mode={ruleset.Value.ShortName}"
+                            Url = $@"{api.WebsiteRootUrl}/beatmaps/{beatmapId}?mode={ruleset.Value.ShortName}"
                        }
                    };
                }
@@ -188,101 +120,28 @@ namespace osu.Desktop
                presence.Details = string.Empty;
            }

-            // user party
-            if (!hideIdentifiableInformation && multiplayerClient.Room != null && multiplayerClient.Room.Settings.MatchType != MatchType.Matchmaking)
-            {
-                MultiplayerRoom room = multiplayerClient.Room;
-
-                presence.Party = new Party
-                {
-                    Privacy = string.IsNullOrEmpty(room.Settings.Password) ? Party.PrivacySetting.Public : Party.PrivacySetting.Private,
-                    ID = room.RoomID.ToString(),
-                    // technically lobbies can have infinite users, but Discord needs this to be set to something.
-                    // to make party display sensible, assign a powers of two above participants count (8 at minimum).
-                    Max = (int)Math.Max(8, Math.Pow(2, Math.Ceiling(Math.Log2(room.Users.Count)))),
-                    Size = room.Users.Count,
-                };
-
-                RoomSecret roomSecret = new RoomSecret
-                {
-                    RoomID = room.RoomID,
-                    Password = room.Settings.Password,
-                };
-
-                if (client.HasRegisteredUriScheme)
-                    presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
-
-                // discord cannot handle both secrets and buttons at the same time, so we need to choose something.
-                // the multiplayer room seems more important.
-                presence.Buttons = null;
-            }
-            else
-            {
-                presence.Party = null;
-                presence.Secrets.JoinSecret = null;
-            }
-
-            // game images:
-            // large image tooltip
+            // update user information
            if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                presence.Assets.LargeImageText = string.Empty;
            else
            {
-                var statistics = statisticsProvider.GetStatisticsFor(ruleset.Value);
-                presence.Assets.LargeImageText = $"{user.Value.Username}" + (statistics?.GlobalRank > 0 ? $" (rank #{statistics.GlobalRank:N0})" : string.Empty);
+                if (user.Value.RulesetsStatistics != null && user.Value.RulesetsStatistics.TryGetValue(ruleset.Value.ShortName, out UserStatistics? statistics))
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (statistics.GlobalRank > 0 ? $" (rank #{statistics.GlobalRank:N0})" : string.Empty);
+                else
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
            }

-            // small image
+            // update ruleset
            presence.Assets.SmallImageKey = ruleset.Value.IsLegacyRuleset() ? $"mode_{ruleset.Value.OnlineID}" : "mode_custom";
            presence.Assets.SmallImageText = ruleset.Value.Name;
+
+            client.SetPresence(presence);
        }

-        private void onJoin(object sender, JoinMessage args) => Scheduler.AddOnce(() =>
-        {
-            game.Window?.Raise();
-
-            if (!api.IsLoggedIn)
-            {
-                login?.Show();
-                return;
-            }
-
-            Logger.Log($"Received room secret from Discord RPC Client: \"{args.Secret}\"", LoggingTarget.Network, LogLevel.Debug);
-
-            // Stable and lazer share the same Discord client ID, meaning they can accept join requests from each other.
-            // Since they aren't compatible in multi, see if stable's format is being used and log to avoid confusion.
-            if (args.Secret[0] != '{' || !tryParseRoomSecret(args.Secret, out long roomId, out string? password))
-            {
-                Logger.Log("Could not join multiplayer room, invitation is invalid or incompatible.", LoggingTarget.Network, LogLevel.Important);
-                return;
-            }
-
-            var request = new GetRoomRequest(roomId);
-            request.Success += room => Schedule(() =>
-            {
-                game.PresentMultiplayerMatch(room, password);
-            });
-            request.Failure += _ => Logger.Log($"Could not join multiplayer room, room could not be found (room ID: {roomId}).", LoggingTarget.Network, LogLevel.Important);
-            api.Queue(request);
-        });
-
        private static readonly int ellipsis_length = Encoding.UTF8.GetByteCount(new[] { '…' });

-        private static string clampLength(string str)
+        private string truncate(string str)
        {
-            // Empty strings are fine to discord even though single-character strings are not. Make it make sense.
-            if (string.IsNullOrEmpty(str))
-                return str;
-
-            // As above, discord decides that *non-empty* strings shorter than 2 characters cannot possibly be valid input, because... reasons?
-            // And yes, that is two *characters*, or *codepoints*, not *bytes* as further down below (as determined by empirical testing).
-            // Also, spaces don't count. Because reasons, clearly.
-            // That all seems very questionable, and isn't even documented anywhere. So to *make it* accept such valid input,
-            // just tack on enough of U+200B ZERO WIDTH SPACEs at the end. After making sure to trim whitespace.
-            string trimmed = str.Trim();
-            if (trimmed.Length < 2)
-                return trimmed.PadRight(2, '\u200B');
-
            if (Encoding.UTF8.GetByteCount(str) <= 128)
                return str;

@@ -300,49 +159,24 @@ namespace osu.Desktop
            });
        }

-        private static bool tryParseRoomSecret(string secretJson, out long roomId, out string? password)
+        private int? getBeatmapID(UserActivity activity)
        {
-            roomId = 0;
-            password = null;
-
-            RoomSecret? roomSecret;
-
-            try
+            switch (activity)
            {
-                roomSecret = JsonConvert.DeserializeObject<RoomSecret>(secretJson);
-            }
-            catch
-            {
-                return false;
+                case UserActivity.InGame game:
+                    return game.BeatmapID;
+
+                case UserActivity.EditingBeatmap edit:
+                    return edit.BeatmapID;
            }

-            if (roomSecret == null) return false;
-
-            roomId = roomSecret.RoomID;
-            password = roomSecret.Password;
-
-            return true;
+            return null;
        }

        protected override void Dispose(bool isDisposing)
        {
-            if (multiplayerClient.IsNotNull())
-                multiplayerClient.RoomUpdated -= onRoomUpdated;
-
-            if (statisticsProvider.IsNotNull())
-                statisticsProvider.StatisticsUpdated -= onStatisticsUpdated;
-
            client.Dispose();
            base.Dispose(isDisposing);
        }
-
-        private class RoomSecret
-        {
-            [JsonProperty(@"roomId", Required = Required.Always)]
-            public long RoomID { get; set; }
-
-            [JsonProperty(@"password", Required = Required.AllowNull)]
-            public string? Password { get; set; }
-        }
    }
 }
@@ -8,13 +8,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using osu.Framework.Logging;

 namespace osu.Desktop
 {
    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    [SupportedOSPlatform("windows")]
    internal static class NVAPI
    {
        private const string osu_filename = "osu!.exe";
@@ -141,12 +139,12 @@ namespace osu.Desktop

                // Make sure that this is a laptop.
                IntPtr[] gpus = new IntPtr[64];
-                if (checkError(EnumPhysicalGPUs(gpus, out int gpuCount), nameof(EnumPhysicalGPUs)))
+                if (checkError(EnumPhysicalGPUs(gpus, out int gpuCount)))
                    return false;

                for (int i = 0; i < gpuCount; i++)
                {
-                    if (checkError(GetSystemType(gpus[i], out var type), nameof(GetSystemType)))
+                    if (checkError(GetSystemType(gpus[i], out var type)))
                        return false;

                    if (type == NvSystemType.LAPTOP)
@@ -182,7 +180,7 @@ namespace osu.Desktop

                bool success = setSetting(NvSettingID.OGL_THREAD_CONTROL_ID, (uint)value);

-                Logger.Log(success ? $"[NVAPI] Threaded optimizations set to \"{value}\"!" : "[NVAPI] Threaded optimizations set failed!");
+                Logger.Log(success ? $"Threaded optimizations set to \"{value}\"!" : "Threaded optimizations set failed!");
            }
        }

@@ -205,7 +203,7 @@ namespace osu.Desktop

            uint numApps = profile.NumOfApps;

-            if (checkError(EnumApplications(sessionHandle, profileHandle, 0, ref numApps, applications), nameof(EnumApplications)))
+            if (checkError(EnumApplications(sessionHandle, profileHandle, 0, ref numApps, applications)))
                return false;

            for (uint i = 0; i < numApps; i++)
@@ -236,10 +234,10 @@ namespace osu.Desktop

            isApplicationSpecific = true;

-            if (checkError(FindApplicationByName(sessionHandle, osu_filename, out profileHandle, ref application), nameof(FindApplicationByName)))
+            if (checkError(FindApplicationByName(sessionHandle, osu_filename, out profileHandle, ref application)))
            {
                isApplicationSpecific = false;
-                if (checkError(GetCurrentGlobalProfile(sessionHandle, out profileHandle), nameof(GetCurrentGlobalProfile)))
+                if (checkError(GetCurrentGlobalProfile(sessionHandle, out profileHandle)))
                    return false;
            }

@@ -258,10 +256,12 @@ namespace osu.Desktop
                Version = NvProfile.Stride,
                IsPredefined = 0,
                ProfileName = PROFILE_NAME,
-                GpuSupport = NvDrsGpuSupport.Geforce
+                GPUSupport = new uint[32]
            };

-            if (checkError(CreateProfile(sessionHandle, ref newProfile, out profileHandle), nameof(CreateProfile)))
+            newProfile.GPUSupport[0] = 1;
+
+            if (checkError(CreateProfile(sessionHandle, ref newProfile, out profileHandle)))
                return false;

            return true;
@@ -282,7 +282,7 @@ namespace osu.Desktop
                SettingID = settingId
            };

-            if (checkError(GetSetting(sessionHandle, profileHandle, settingId, ref setting), nameof(GetSetting)))
+            if (checkError(GetSetting(sessionHandle, profileHandle, settingId, ref setting)))
                return false;

            return true;
@@ -311,7 +311,7 @@ namespace osu.Desktop
            };

            // Set the thread state
-            if (checkError(SetSetting(sessionHandle, profileHandle, ref newSetting), nameof(SetSetting)))
+            if (checkError(SetSetting(sessionHandle, profileHandle, ref newSetting)))
                return false;

            // Get the profile (needed to check app count)
@@ -319,7 +319,7 @@ namespace osu.Desktop
            {
                Version = NvProfile.Stride
            };
-            if (checkError(GetProfileInfo(sessionHandle, profileHandle, ref profile), nameof(GetProfileInfo)))
+            if (checkError(GetProfileInfo(sessionHandle, profileHandle, ref profile)))
                return false;

            if (!containsApplication(profileHandle, profile, out application))
@@ -330,12 +330,12 @@ namespace osu.Desktop
                application.AppName = osu_filename;
                application.UserFriendlyName = APPLICATION_NAME;

-                if (checkError(CreateApplication(sessionHandle, profileHandle, ref application), nameof(CreateApplication)))
+                if (checkError(CreateApplication(sessionHandle, profileHandle, ref application)))
                    return false;
            }

            // Save!
-            return !checkError(SaveSettings(sessionHandle), nameof(SaveSettings));
+            return !checkError(SaveSettings(sessionHandle));
        }

        /// <summary>
@@ -344,25 +344,20 @@ namespace osu.Desktop
        /// <returns>If the operation succeeded.</returns>
        private static bool createSession()
        {
-            if (checkError(CreateSession(out sessionHandle), nameof(CreateSession)))
+            if (checkError(CreateSession(out sessionHandle)))
                return false;

            // Load settings into session
-            if (checkError(LoadSettings(sessionHandle), nameof(LoadSettings)))
+            if (checkError(LoadSettings(sessionHandle)))
                return false;

            return true;
        }

-        private static bool checkError(NvStatus status, string caller)
+        private static bool checkError(NvStatus status)
        {
            Status = status;
-
-            bool hasError = status != NvStatus.OK;
-            if (hasError)
-                Logger.Log($"[NVAPI] {caller} call failed with status code {status}");
-
-            return hasError;
+            return status != NvStatus.OK;
        }

        static NVAPI()
@@ -461,7 +456,9 @@ namespace osu.Desktop
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
        public string ProfileName;

-        public NvDrsGpuSupport GpuSupport;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public uint[] GPUSupport;
+
        public uint IsPredefined;
        public uint NumOfApps;
        public uint NumOfSettings;
@@ -490,7 +487,6 @@ namespace osu.Desktop
        public static uint Stride => (uint)Marshal.SizeOf(typeof(NvApplication)) | (2 << 16);
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvStatus
    {
        OK = 0, // Success. Request is completed.
@@ -607,14 +603,12 @@ namespace osu.Desktop
        SYNC_NOT_ACTIVE = -194, // The requested action cannot be performed without Sync being enabled.
        SYNC_MASTER_NOT_FOUND = -195, // The requested action cannot be performed without Sync Master being enabled.
        INVALID_SYNC_TOPOLOGY = -196, // Invalid displays passed in the NV_GSYNC_DISPLAY pointer.
-
        ECID_SIGN_ALGO_UNSUPPORTED = -197, // The specified signing algorithm is not supported. Either an incorrect value was entered or the current installed driver/hardware does not support the input value.
        ECID_KEY_VERIFICATION_FAILED = -198, // The encrypted public key verification has failed.
        FIRMWARE_OUT_OF_DATE = -199, // The device's firmware is out of date.
        FIRMWARE_REVISION_NOT_SUPPORTED = -200, // The device's firmware is not supported.
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvSystemType
    {
        UNKNOWN = 0,
@@ -622,7 +616,6 @@ namespace osu.Desktop
        DESKTOP = 2
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvGpuType
    {
        UNKNOWN = 0,
@@ -630,7 +623,6 @@ namespace osu.Desktop
        DGPU = 2, // Discrete
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvSettingID : uint
    {
        OGL_AA_LINE_GAMMA_ID = 0x2089BF6C,
@@ -723,7 +715,6 @@ namespace osu.Desktop
        INVALID_SETTING_ID = 0xFFFFFFFF
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvShimSetting : uint
    {
        SHIM_RENDERING_MODE_INTEGRATED = 0x00000000,
@@ -738,7 +729,6 @@ namespace osu.Desktop
        SHIM_RENDERING_MODE_DEFAULT = SHIM_RENDERING_MODE_AUTO_SELECT
    }

-    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal enum NvThreadControlSetting : uint
    {
        OGL_THREAD_CONTROL_ENABLE = 0x00000001,
@@ -746,12 +736,4 @@ namespace osu.Desktop
        OGL_THREAD_CONTROL_NUM_VALUES = 2,
        OGL_THREAD_CONTROL_DEFAULT = 0
    }
-
-    [Flags]
-    internal enum NvDrsGpuSupport : uint
-    {
-        Geforce = 1 << 0,
-        Quadro = 1 << 1,
-        Nvs = 1 << 2
-    }
 }
@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Threading.Tasks;
 using Microsoft.Win32;
-using osu.Desktop.Performance;
 using osu.Desktop.Security;
 using osu.Framework.Platform;
 using osu.Game;
@@ -16,13 +15,11 @@ using osu.Framework;
 using osu.Framework.Logging;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
-using osu.Framework.Allocation;
-using osu.Game.Configuration;
 using osu.Game.IO;
 using osu.Game.IPC;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Performance;
 using osu.Game.Utils;
+using SDL2;

 namespace osu.Desktop
 {
@@ -31,11 +28,6 @@ namespace osu.Desktop
        private OsuSchemeLinkIPCChannel? osuSchemeLinkIPCChannel;
        private ArchiveImportIPCChannel? archiveImportIPCChannel;

-        [Cached(typeof(IHighPerformanceSessionManager))]
-        private readonly HighPerformanceSessionManager highPerformanceSessionManager = new HighPerformanceSessionManager();
-
-        public bool IsFirstRun { get; init; }
-
        public OsuGameDesktop(string[]? args = null)
            : base(args)
        {
@@ -70,12 +62,7 @@ namespace osu.Desktop
            {
                try
                {
-                    stableInstallPath = getStableInstallPathFromRegistry("osustable.File.osz");
-
-                    if (!string.IsNullOrEmpty(stableInstallPath) && checkExists(stableInstallPath))
-                        return stableInstallPath;
-
-                    stableInstallPath = getStableInstallPathFromRegistry("osu!");
+                    stableInstallPath = getStableInstallPathFromRegistry();

                    if (!string.IsNullOrEmpty(stableInstallPath) && checkExists(stableInstallPath))
                        return stableInstallPath;
@@ -97,34 +84,48 @@ namespace osu.Desktop
        }

        [SupportedOSPlatform("windows")]
-        private string? getStableInstallPathFromRegistry(string progId)
+        private string? getStableInstallPathFromRegistry()
        {
-            using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey(progId))
-                return key?.OpenSubKey(WindowsAssociationManager.SHELL_OPEN_COMMAND)?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
+            using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey("osu"))
+                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
        }

-        public static bool IsPackageManaged => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("OSU_EXTERNAL_UPDATE_PROVIDER"));
-
        protected override UpdateManager CreateUpdateManager()
        {
-            // If this is the first time we've run the game, ie it is being installed,
-            // reset the user's release stream to "lazer".
-            //
-            // This ensures that if a user is trying to recover from a failed startup on an unstable release stream,
-            // the game doesn't immediately try and update them back to the release stream after starting up.
-            if (IsFirstRun)
-                LocalConfig.SetValue(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
+            string? packageManaged = Environment.GetEnvironmentVariable("OSU_EXTERNAL_UPDATE_PROVIDER");

-            if (IsPackageManaged)
+            if (!string.IsNullOrEmpty(packageManaged))
                return new NoActionUpdateManager();

-            return new VelopackUpdateManager();
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                    Debug.Assert(OperatingSystem.IsWindows());
+
+                    return new SquirrelUpdateManager();
+
+                default:
+                    return new SimpleUpdateManager();
+            }
        }

        public override bool RestartAppWhenExited()
        {
-            Task.Run(() => Velopack.UpdateExe.Start(waitPid: (uint)Environment.ProcessId)).FireAndForget();
-            return true;
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                    Debug.Assert(OperatingSystem.IsWindows());
+
+                    // Of note, this is an async method in squirrel that adds an arbitrary delay before returning
+                    // likely to ensure the external process is in a good state.
+                    //
+                    // We're not waiting on that here, but the outro playing before the actual exit should be enough
+                    // to cover this.
+                    Squirrel.UpdateManager.RestartAppWhenExited().FireAndForget();
+                    return true;
+            }
+
+            return base.RestartAppWhenExited();
        }

        protected override void LoadComplete()
@@ -146,18 +147,15 @@ namespace osu.Desktop
        {
            base.SetHost(host);

-            // Apple operating systems use a better icon provided via external assets.
-            if (!RuntimeInfo.IsApple)
-            {
-                var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
-                if (iconStream != null)
-                    host.Window.SetIconFromStream(iconStream);
-            }
+            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
+            if (iconStream != null)
+                host.Window.SetIconFromStream(iconStream);

+            host.Window.CursorState |= CursorState.Hidden;
            host.Window.Title = Name;
        }

-        protected override BatteryInfo CreateBatteryInfo() => FrameworkEnvironment.UseSDL3 ? new SDL3BatteryInfo() : new SDL2BatteryInfo();
+        protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();

        protected override void Dispose(bool isDisposing)
        {
@@ -165,5 +163,23 @@ namespace osu.Desktop
            osuSchemeLinkIPCChannel?.Dispose();
            archiveImportIPCChannel?.Dispose();
        }
+
+        private class SDL2BatteryInfo : BatteryInfo
+        {
+            public override double? ChargeLevel
+            {
+                get
+                {
+                    SDL.SDL_GetPowerInfo(out _, out int percentage);
+
+                    if (percentage == -1)
+                        return null;
+
+                    return percentage / 100.0;
+                }
+            }
+
+            public override bool OnBattery => SDL.SDL_GetPowerInfo(out _, out _) == SDL.SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
+        }
    }
 }
@@ -1,60 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Runtime;
-using System.Threading;
-using osu.Framework.Allocation;
-using osu.Framework.Logging;
-using osu.Game.Performance;
-
-namespace osu.Desktop.Performance
-{
-    public class HighPerformanceSessionManager : IHighPerformanceSessionManager
-    {
-        public bool IsSessionActive => activeSessions > 0;
-
-        private int activeSessions;
-
-        private GCLatencyMode originalGCMode;
-
-        public IDisposable BeginSession()
-        {
-            enterSession();
-            return new InvokeOnDisposal<HighPerformanceSessionManager>(this, static m => m.exitSession());
-        }
-
-        private void enterSession()
-        {
-            if (Interlocked.Increment(ref activeSessions) > 1)
-            {
-                Logger.Log($"High performance session requested ({activeSessions} running in total)");
-                return;
-            }
-
-            Logger.Log("Starting high performance session");
-
-            originalGCMode = GCSettings.LatencyMode;
-            GCSettings.LatencyMode = GCLatencyMode.LowLatency;
-
-            // Without doing this, the new GC mode won't kick in until the next GC, which could be at a more noticeable point in time.
-            GC.Collect(0);
-        }
-
-        private void exitSession()
-        {
-            if (Interlocked.Decrement(ref activeSessions) > 0)
-            {
-                Logger.Log($"High performance session finished ({activeSessions} others remain)");
-                return;
-            }
-
-            Logger.Log("Ending high performance session");
-
-            if (GCSettings.LatencyMode == GCLatencyMode.LowLatency)
-                GCSettings.LatencyMode = originalGCMode;
-
-            // No GC.Collect() as we were already collecting at a higher frequency in the old mode.
-        }
-    }
-}
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Runtime.Versioning;
 using osu.Desktop.LegacyIpc;
-using osu.Desktop.Windows;
 using osu.Framework;
 using osu.Framework.Development;
 using osu.Framework.Logging;
@@ -13,8 +12,8 @@ using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Tournament;
-using SDL;
-using Velopack;
+using SDL2;
+using Squirrel;

 namespace osu.Desktop
 {
@@ -28,16 +27,22 @@ namespace osu.Desktop

        private static LegacyTcpIpcProvider? legacyIpc;

-        private static bool isFirstRun;
-
        [STAThread]
        public static void Main(string[] args)
        {
-            // IMPORTANT DON'T IGNORE: For general sanity, velopack's setup needs to run before anything else.
-            // This has bitten us in the rear before (bricked updater), and although the underlying issue from
-            // last time has been fixed, let's not tempt fate.
-            setupVelopack(args);
-
+            /*
+             * WARNING: DO NOT PLACE **ANY** CODE ABOVE THE FOLLOWING BLOCK!
+             *
+             * Logic handling Squirrel MUST run before EVERYTHING if you do not want to break it.
+             * To be more precise: Squirrel is internally using a rather... crude method to determine whether it is running under NUnit,
+             * namely by checking loaded assemblies:
+             * https://github.com/clowd/Clowd.Squirrel/blob/24427217482deeeb9f2cacac555525edfc7bd9ac/src/Squirrel/SimpleSplat/PlatformModeDetector.cs#L17-L32
+             *
+             * If it finds ANY assembly from the ones listed above - REGARDLESS of the reason why it is loaded -
+             * the app will then do completely broken things like:
+             * - not creating system shortcuts (as the logic is if'd out if "running tests")
+             * - not exiting after the install / first-update / uninstall hooks are ran (as the `Environment.Exit()` calls are if'd out if "running tests")
+             */
            if (OperatingSystem.IsWindows())
            {
                var windowsVersion = Environment.OSVersion.Version;
@@ -46,27 +51,25 @@ namespace osu.Desktop
                // See https://www.mongodb.com/docs/realm/sdk/dotnet/compatibility/
                if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2))
                {
-                    unsafe
-                    {
-                        // If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
-                        // disabling it ourselves.
-                        // We could also better detect compatibility mode if required:
-                        // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
-                        SDL3.SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
-                            "Your operating system is too old to run osu!"u8,
-                            "This version of osu! requires at least Windows 8.1 to run.\n"u8
-                            + "Please upgrade your operating system or consider using an older version of osu!.\n\n"u8
-                            + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!"u8, null);
-                        return;
-                    }
+                    // If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
+                    // disabling it ourselves.
+                    // We could also better detect compatibility mode if required:
+                    // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
+                    SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
+                        "Your operating system is too old to run osu!",
+                        "This version of osu! requires at least Windows 8.1 to run.\n"
+                        + "Please upgrade your operating system or consider using an older version of osu!.\n\n"
+                        + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!", IntPtr.Zero);
+                    return;
                }
+
+                setupSquirrel();
            }

            // NVIDIA profiles are based on the executable name of a process.
            // Lazer and stable share the same executable name.
            // Stable sets this setting to "Off", which may not be what we want, so let's force it back to the default "Auto" on startup.
-            if (OperatingSystem.IsWindows())
-                NVAPI.ThreadedOptimisations = NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;
+            NVAPI.ThreadedOptimisations = NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;

            // Back up the cwd before DesktopGameHost changes it
            string cwd = Environment.CurrentDirectory;
@@ -99,13 +102,7 @@ namespace osu.Desktop
                }
            }

-            var hostOptions = new HostOptions
-            {
-                IPCPipeName = !tournamentClient ? OsuGame.IPC_PIPE_NAME : null,
-                FriendlyGameName = OsuGameBase.GAME_NAME,
-            };
-
-            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, hostOptions))
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { IPCPort = !tournamentClient ? OsuGame.IPC_PORT : null }))
            {
                if (!host.IsPrimaryInstance)
                {
@@ -137,12 +134,7 @@ namespace osu.Desktop
                if (tournamentClient)
                    host.Run(new TournamentGame());
                else
-                {
-                    host.Run(new OsuGameDesktop(args)
-                    {
-                        IsFirstRun = isFirstRun
-                    });
-                }
+                    host.Run(new OsuGameDesktop(args));
            }
        }

@@ -174,43 +166,29 @@ namespace osu.Desktop
            return false;
        }

-        private static void setupVelopack(string[] args)
-        {
-            // Arguments being present indicate the user is either starting the game in a special (aka tournament) mode,
-            // or is running with pending imports via file association or otherwise.
-            //
-            // In both these scenarios, we'd hope the game does not attempt to update.
-            //
-            // Special consideration for velopack startup arguments, which must be handled during update.
-            // See https://docs.velopack.io/integrating/hooks#command-line-hooks.
-            if (args.Length > 0 && !args[0].StartsWith("--velo", StringComparison.Ordinal))
-            {
-                Logger.Log("Handling arguments, skipping velopack setup.");
-                return;
-            }
-
-            if (OsuGameDesktop.IsPackageManaged)
-            {
-                Logger.Log("Updates are being managed by an external provider. Skipping Velopack setup.");
-                return;
-            }
-
-            var app = VelopackApp.Build();
-
-            app.OnFirstRun(_ => isFirstRun = true);
-
-            if (OperatingSystem.IsWindows())
-                configureWindows(app);
-
-            app.Run();
-        }
-
        [SupportedOSPlatform("windows")]
-        private static void configureWindows(VelopackApp app)
+        private static void setupSquirrel()
        {
-            app.OnFirstRun(_ => WindowsAssociationManager.InstallAssociations());
-            app.OnAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
-            app.OnBeforeUninstallFastCallback(_ => WindowsAssociationManager.UninstallAssociations());
+            SquirrelAwareApp.HandleEvents(onInitialInstall: (_, tools) =>
+            {
+                tools.CreateShortcutForThisExe();
+                tools.CreateUninstallerRegistryEntry();
+            }, onAppUpdate: (_, tools) =>
+            {
+                tools.CreateUninstallerRegistryEntry();
+            }, onAppUninstall: (_, tools) =>
+            {
+                tools.RemoveShortcutForThisExe();
+                tools.RemoveUninstallerRegistryEntry();
+            }, onEveryRun: (_, _, _) =>
+            {
+                // While setting the `ProcessAppUserModelId` fixes duplicate icons/shortcuts on the taskbar, it currently
+                // causes the right-click context menu to function incorrectly.
+                //
+                // This may turn out to be non-required after an alternative solution is implemented.
+                // see https://github.com/clowd/Clowd.Squirrel/issues/24
+                // tools.SetProcessAppUserModelId();
+            });
        }
    }
 }
@@ -1,25 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Utils;
-
-namespace osu.Desktop
-{
-    internal class SDL2BatteryInfo : BatteryInfo
-    {
-        public override double? ChargeLevel
-        {
-            get
-            {
-                SDL2.SDL.SDL_GetPowerInfo(out _, out int percentage);
-
-                if (percentage == -1)
-                    return null;
-
-                return percentage / 100.0;
-            }
-        }
-
-        public override bool OnBattery => SDL2.SDL.SDL_GetPowerInfo(out _, out _) == SDL2.SDL.SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
-    }
-}
@@ -1,27 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Utils;
-using SDL;
-
-namespace osu.Desktop
-{
-    internal unsafe class SDL3BatteryInfo : BatteryInfo
-    {
-        public override double? ChargeLevel
-        {
-            get
-            {
-                int percentage;
-                SDL3.SDL_GetPowerInfo(null, &percentage);
-
-                if (percentage == -1)
-                    return null;
-
-                return percentage / 100.0;
-            }
-        }
-
-        public override bool OnBattery => SDL3.SDL_GetPowerInfo(null, null) == SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
-    }
-}
@@ -2,12 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

@@ -21,19 +21,55 @@ namespace osu.Desktop.Security
        [Resolved]
        private INotificationOverlay notifications { get; set; } = null!;

+        private bool elevated;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            elevated = checkElevated();
+        }
+
        protected override void LoadComplete()
        {
            base.LoadComplete();

-            if (Environment.IsPrivilegedProcess)
+            if (elevated)
                notifications.Post(new ElevatedPrivilegesNotification());
        }

+        private bool checkElevated()
+        {
+            try
+            {
+                switch (RuntimeInfo.OS)
+                {
+                    case RuntimeInfo.Platform.Windows:
+                        if (!OperatingSystem.IsWindows()) return false;
+
+                        var windowsIdentity = WindowsIdentity.GetCurrent();
+                        var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+
+                        return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+
+                    case RuntimeInfo.Platform.macOS:
+                    case RuntimeInfo.Platform.Linux:
+                        return Mono.Unix.Native.Syscall.geteuid() == 0;
+                }
+            }
+            catch
+            {
+            }
+
+            return false;
+        }
+
        private partial class ElevatedPrivilegesNotification : SimpleNotification
        {
+            public override bool IsImportant => true;
+
            public ElevatedPrivilegesNotification()
            {
-                Text = NotificationsStrings.ElevatedPrivileges(RuntimeInfo.IsUnix ? "root" : "Administrator");
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance, may break integrations and poses a security risk. Please run the game as a normal user.";
            }

            [BackgroundDependencyLoader]
@@ -0,0 +1,180 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Game;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Play;
+using Squirrel.SimpleSplat;
+using Squirrel.Sources;
+using LogLevel = Squirrel.SimpleSplat.LogLevel;
+using UpdateManager = osu.Game.Updater.UpdateManager;
+
+namespace osu.Desktop.Updater
+{
+    [SupportedOSPlatform("windows")]
+    public partial class SquirrelUpdateManager : UpdateManager
+    {
+        private Squirrel.UpdateManager? updateManager;
+        private INotificationOverlay notificationOverlay = null!;
+
+        public Task PrepareUpdateAsync() => Squirrel.UpdateManager.RestartAppWhenExited();
+
+        private static readonly Logger logger = Logger.GetLogger("updater");
+
+        /// <summary>
+        /// Whether an update has been downloaded but not yet applied.
+        /// </summary>
+        private bool updatePending;
+
+        private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();
+
+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+
+        [Resolved]
+        private ILocalUserPlayInfo? localUserInfo { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(INotificationOverlay notifications)
+        {
+            notificationOverlay = notifications;
+
+            SquirrelLocator.CurrentMutable.Register(() => squirrelLogger, typeof(ILogger));
+        }
+
+        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);
+
+        private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification? notification = null)
+        {
+            // should we schedule a retry on completion of this check?
+            bool scheduleRecheck = true;
+
+            const string? github_token = null; // TODO: populate.
+
+            try
+            {
+                // Avoid any kind of update checking while gameplay is running.
+                if (localUserInfo?.IsPlaying.Value == true)
+                    return false;
+
+                updateManager ??= new Squirrel.UpdateManager(new GithubSource(@"https://github.com/ppy/osu", github_token, false), @"osulazer");
+
+                var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);
+
+                if (info.ReleasesToApply.Count == 0)
+                {
+                    if (updatePending)
+                    {
+                        // the user may have dismissed the completion notice, so show it again.
+                        notificationOverlay.Post(new UpdateApplicationCompleteNotification
+                        {
+                            Activated = () =>
+                            {
+                                restartToApplyUpdate();
+                                return true;
+                            },
+                        });
+                        return true;
+                    }
+
+                    // no updates available. bail and retry later.
+                    return false;
+                }
+
+                scheduleRecheck = false;
+
+                if (notification == null)
+                {
+                    notification = new UpdateProgressNotification
+                    {
+                        CompletionClickAction = restartToApplyUpdate,
+                    };
+
+                    Schedule(() => notificationOverlay.Post(notification));
+                }
+
+                notification.StartDownload();
+
+                try
+                {
+                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
+
+                    notification.StartInstall();
+
+                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
+
+                    notification.State = ProgressNotificationState.Completed;
+                    updatePending = true;
+                }
+                catch (Exception e)
+                {
+                    if (useDeltaPatching)
+                    {
+                        logger.Add(@"delta patching failed; will attempt full download!");
+
+                        // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
+                        // try again without deltas.
+                        await checkForUpdateAsync(false, notification).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        // In the case of an error, a separate notification will be displayed.
+                        notification.FailDownload();
+                        Logger.Error(e, @"update failed!");
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // we'll ignore this and retry later. can be triggered by no internet connection or thread abortion.
+                scheduleRecheck = true;
+            }
+            finally
+            {
+                if (scheduleRecheck)
+                {
+                    // check again in 30 minutes.
+                    Scheduler.AddDelayed(() => Task.Run(async () => await checkForUpdateAsync().ConfigureAwait(false)), 60000 * 30);
+                }
+            }
+
+            return true;
+        }
+
+        private bool restartToApplyUpdate()
+        {
+            PrepareUpdateAsync()
+                .ContinueWith(_ => Schedule(() => game.AttemptExit()));
+            return true;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            updateManager?.Dispose();
+        }
+
+        private class SquirrelLogger : ILogger, IDisposable
+        {
+            public LogLevel Level { get; set; } = LogLevel.Info;
+
+            public void Write(string message, LogLevel logLevel)
+            {
+                if (logLevel < Level)
+                    return;
+
+                logger.Add(message);
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
@@ -1,157 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Framework.Logging;
-using osu.Framework.Threading;
-using osu.Game;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using osu.Game.Screens.Play;
-using Velopack;
-using Velopack.Sources;
-using UpdateManager = osu.Game.Updater.UpdateManager;
-
-namespace osu.Desktop.Updater
-{
-    public partial class VelopackUpdateManager : UpdateManager
-    {
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; } = null!;
-
-        [Resolved]
-        private OsuGameBase game { get; set; } = null!;
-
-        [Resolved]
-        private ILocalUserPlayInfo? localUserInfo { get; set; }
-
-        private bool isInGameplay => localUserInfo?.PlayingState.Value != LocalUserPlayingState.NotPlaying;
-
-        private ScheduledDelegate? scheduledBackgroundCheck;
-
-        private void scheduleNextUpdateCheck()
-        {
-            scheduledBackgroundCheck?.Cancel();
-            scheduledBackgroundCheck = Scheduler.AddDelayed(() =>
-            {
-                log("Running scheduled background update check...");
-                CheckForUpdate();
-            }, 60000 * 30);
-        }
-
-        protected override async Task<bool> PerformUpdateCheck(CancellationToken cancellationToken)
-        {
-            scheduledBackgroundCheck?.Cancel();
-
-            if (isInGameplay)
-            {
-                log("Update check cancelled - user is in gameplay");
-                scheduleNextUpdateCheck();
-                return false;
-            }
-
-            try
-            {
-                IUpdateSource updateSource = new GithubSource(@"https://github.com/ppy/osu", null, ReleaseStream.Value == Game.Configuration.ReleaseStream.Tachyon);
-                Velopack.UpdateManager updateManager = new Velopack.UpdateManager(updateSource, new UpdateOptions
-                {
-                    AllowVersionDowngrade = true
-                });
-
-                UpdateInfo? update = await updateManager.CheckForUpdatesAsync().ConfigureAwait(false);
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    log("Update check cancelled");
-                    scheduleNextUpdateCheck();
-                    return true;
-                }
-
-                if (update == null)
-                {
-                    // No update is available.
-                    log("No update found");
-                    scheduleNextUpdateCheck();
-                    return false;
-                }
-
-                // Download update in the background while notifying awaiters of the update being available.
-                log($"New update available: {update.TargetFullRelease.Version}");
-                downloadUpdate(updateManager, update, cancellationToken);
-                return true;
-            }
-            catch (Exception e)
-            {
-                log($"Update check failed with error ({e.Message})");
-
-                // we shouldn't crash on a web failure. or any failure for the matter.
-                scheduleNextUpdateCheck();
-                return true;
-            }
-        }
-
-        private void downloadUpdate(Velopack.UpdateManager updateManager, UpdateInfo update, CancellationToken cancellationToken) => Task.Run(async () =>
-        {
-            log($"Beginning download of update {update.TargetFullRelease.Version}...");
-
-            UpdateDownloadProgressNotification progressNotification = new UpdateDownloadProgressNotification(cancellationToken)
-            {
-                CompletionClickAction = () =>
-                {
-                    restartToApplyUpdate(updateManager, update);
-                    return true;
-                }
-            };
-
-            try
-            {
-                using (var cts = CancellationTokenSource.CreateLinkedTokenSource(progressNotification.CancellationToken, cancellationToken))
-                {
-                    progressNotification.StartDownload();
-                    runOutsideOfGameplay(() => notificationOverlay.Post(progressNotification), cts.Token);
-
-                    await updateManager.DownloadUpdatesAsync(update, p => progressNotification.Progress = p / 100f, cts.Token).ConfigureAwait(false);
-                    runOutsideOfGameplay(() => progressNotification.State = ProgressNotificationState.Completed, cts.Token);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                progressNotification.FailDownload();
-                log(@"Update cancelled");
-            }
-            catch (Exception e)
-            {
-                // In the case of an error, a separate notification will be displayed.
-                progressNotification.FailDownload();
-                Logger.Error(e, @"Update failed!");
-            }
-
-            return true;
-        }, cancellationToken);
-
-        private void runOutsideOfGameplay(Action action, CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-                return;
-
-            if (isInGameplay)
-            {
-                Scheduler.AddDelayed(() => runOutsideOfGameplay(action, cancellationToken), 1000);
-                return;
-            }
-
-            action();
-        }
-
-        private void restartToApplyUpdate(Velopack.UpdateManager updateManager, UpdateInfo update) => Task.Run(async () =>
-        {
-            await updateManager.WaitExitThenApplyUpdatesAsync(update.TargetFullRelease).ConfigureAwait(false);
-            Schedule(() => game.AttemptExit());
-        });
-
-        private static void log(string text) => Logger.Log($"VelopackUpdateManager: {text}");
-    }
-}
@@ -13,7 +13,7 @@ namespace osu.Desktop.Windows
    public partial class GameplayWinKeyBlocker : Component
    {
        private Bindable<bool> disableWinKey = null!;
-        private IBindable<LocalUserPlayingState> localUserPlaying = null!;
+        private IBindable<bool> localUserPlaying = null!;
        private IBindable<bool> isActive = null!;

        [Resolved]
@@ -22,7 +22,7 @@ namespace osu.Desktop.Windows
        [BackgroundDependencyLoader]
        private void load(ILocalUserPlayInfo localUserInfo, OsuConfigManager config)
        {
-            localUserPlaying = localUserInfo.PlayingState.GetBoundCopy();
+            localUserPlaying = localUserInfo.IsPlaying.GetBoundCopy();
            localUserPlaying.BindValueChanged(_ => updateBlocking());

            isActive = host.IsActive.GetBoundCopy();
@@ -34,7 +34,7 @@ namespace osu.Desktop.Windows

        private void updateBlocking()
        {
-            bool shouldDisable = isActive.Value && disableWinKey.Value && localUserPlaying.Value == LocalUserPlayingState.Playing;
+            bool shouldDisable = isActive.Value && disableWinKey.Value && localUserPlaying.Value;

            if (shouldDisable)
                host.InputThread.Scheduler.Add(WindowsKey.Disable);
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.IO;
-
-namespace osu.Desktop.Windows
-{
-    public static class Icons
-    {
-        /// <summary>
-        /// Fully qualified path to the directory that contains icons (in the installation folder).
-        /// </summary>
-        private static readonly string icon_directory = Path.GetDirectoryName(typeof(Icons).Assembly.Location)!;
-
-        public static string Lazer => Path.Join(icon_directory, "lazer.ico");
-
-        public static string Beatmap => Path.Join(icon_directory, "beatmap.ico");
-    }
-}
@@ -1,390 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using Microsoft.Win32;
-using osu.Framework.Localisation;
-using osu.Framework.Logging;
-using osu.Game.Localisation;
-
-namespace osu.Desktop.Windows
-{
-    [SupportedOSPlatform("windows")]
-    public static class WindowsAssociationManager
-    {
-        private const string software_classes = @"Software\Classes";
-        private const string software_registered_applications = @"Software\RegisteredApplications";
-
-        /// <summary>
-        /// Sub key for setting the icon.
-        /// https://learn.microsoft.com/en-us/windows/win32/com/defaulticon
-        /// </summary>
-        private const string default_icon = @"DefaultIcon";
-
-        /// <summary>
-        /// Sub key for setting the command line that the shell invokes.
-        /// https://learn.microsoft.com/en-us/windows/win32/com/shell
-        /// </summary>
-        internal const string SHELL_OPEN_COMMAND = @"Shell\Open\Command";
-
-        private static readonly string exe_path = Path.ChangeExtension(typeof(WindowsAssociationManager).Assembly.Location, ".exe").Replace('/', '\\');
-
-        /// <summary>
-        /// Program ID prefix used for file associations. Should be relatively short since the full program ID has a 39 character limit,
-        /// see https://learn.microsoft.com/en-us/windows/win32/com/-progid--key.
-        /// </summary>
-        private const string program_id_file_prefix = "osu.File";
-
-        private const string program_id_protocol_prefix = "osu.Uri";
-
-        private static readonly ApplicationCapability application_capability = new ApplicationCapability(@"osu", @"Software\ppy\osu\Capabilities", "osu!(lazer)");
-
-        private static readonly FileAssociation[] file_associations =
-        {
-            new FileAssociation(@".osz", WindowsAssociationManagerStrings.OsuBeatmap, Icons.Beatmap),
-            new FileAssociation(@".olz", WindowsAssociationManagerStrings.OsuBeatmap, Icons.Beatmap),
-            new FileAssociation(@".osr", WindowsAssociationManagerStrings.OsuReplay, Icons.Beatmap),
-            new FileAssociation(@".osk", WindowsAssociationManagerStrings.OsuSkin, Icons.Beatmap),
-        };
-
-        private static readonly UriAssociation[] uri_associations =
-        {
-            new UriAssociation(@"osu", WindowsAssociationManagerStrings.OsuProtocol, Icons.Lazer),
-            new UriAssociation(@"osump", WindowsAssociationManagerStrings.OsuMultiplayer, Icons.Lazer),
-        };
-
-        /// <summary>
-        /// Installs file and URI associations.
-        /// </summary>
-        /// <remarks>
-        /// Call <see cref="LocaliseDescriptions"/> in a timely fashion to keep descriptions up-to-date and localised.
-        /// </remarks>
-        public static void InstallAssociations()
-        {
-            try
-            {
-                updateAssociations();
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @$"Failed to install file and URI associations: {e.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Updates associations with latest definitions.
-        /// </summary>
-        /// <remarks>
-        /// Call <see cref="LocaliseDescriptions"/> in a timely fashion to keep descriptions up-to-date and localised.
-        /// </remarks>
-        public static void UpdateAssociations()
-        {
-            try
-            {
-                updateAssociations();
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @"Failed to update file and URI associations.");
-            }
-        }
-
-        // TODO: call this sometime.
-        public static void LocaliseDescriptions(LocalisationManager localisationManager)
-        {
-            try
-            {
-                application_capability.LocaliseDescription(localisationManager);
-
-                foreach (var association in file_associations)
-                    association.LocaliseDescription(localisationManager);
-
-                foreach (var association in uri_associations)
-                    association.LocaliseDescription(localisationManager);
-
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @"Failed to update file and URI association descriptions.");
-            }
-        }
-
-        public static void UninstallAssociations()
-        {
-            try
-            {
-                application_capability.Uninstall();
-
-                foreach (var association in file_associations)
-                    association.Uninstall();
-
-                foreach (var association in uri_associations)
-                    association.Uninstall();
-
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @"Failed to uninstall file and URI associations.");
-            }
-        }
-
-        public static void NotifyShellUpdate() => SHChangeNotify(EventId.SHCNE_ASSOCCHANGED, Flags.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
-
-        /// <summary>
-        /// Installs or updates associations.
-        /// </summary>
-        private static void updateAssociations()
-        {
-            application_capability.Install();
-
-            foreach (var association in file_associations)
-                association.Install();
-
-            foreach (var association in uri_associations)
-                association.Install();
-
-            application_capability.RegisterFileAssociations(file_associations);
-            application_capability.RegisterUriAssociations(uri_associations);
-        }
-
-        #region Native interop
-
-        [DllImport("Shell32.dll")]
-        private static extern void SHChangeNotify(EventId wEventId, Flags uFlags, IntPtr dwItem1, IntPtr dwItem2);
-
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        private enum EventId
-        {
-            /// <summary>
-            /// A file type association has changed. <see cref="Flags.SHCNF_IDLIST"/> must be specified in the uFlags parameter.
-            /// dwItem1 and dwItem2 are not used and must be <see cref="IntPtr.Zero"/>. This event should also be sent for registered protocols.
-            /// </summary>
-            SHCNE_ASSOCCHANGED = 0x08000000
-        }
-
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        private enum Flags : uint
-        {
-            SHCNF_IDLIST = 0x0000
-        }
-
-        #endregion
-
-        private class ApplicationCapability
-        {
-            private string uniqueName { get; }
-            private string capabilityPath { get; }
-            private LocalisableString description { get; }
-
-            public ApplicationCapability(string uniqueName, string capabilityPath, LocalisableString description)
-            {
-                this.uniqueName = uniqueName;
-                this.capabilityPath = capabilityPath;
-                this.description = description;
-            }
-
-            /// <summary>
-            /// Registers an application capability according to <see href="https://learn.microsoft.com/en-us/windows/win32/shell/default-programs#registering-an-application-for-use-with-default-programs">
-            /// Registering an Application for Use with Default Programs</see>.
-            /// </summary>
-            public void Install()
-            {
-                using (var capability = Registry.CurrentUser.CreateSubKey(capabilityPath))
-                {
-                    capability.SetValue(@"ApplicationDescription", description.ToString());
-                }
-
-                using (var registeredApplications = Registry.CurrentUser.OpenSubKey(software_registered_applications, true))
-                    registeredApplications?.SetValue(uniqueName, capabilityPath);
-            }
-
-            public void RegisterFileAssociations(FileAssociation[] associations)
-            {
-                using var capability = Registry.CurrentUser.OpenSubKey(capabilityPath, true);
-                if (capability == null) return;
-
-                using var fileAssociations = capability.CreateSubKey(@"FileAssociations");
-
-                foreach (var association in associations)
-                    fileAssociations.SetValue(association.Extension, association.ProgramId);
-            }
-
-            public void RegisterUriAssociations(UriAssociation[] associations)
-            {
-                using var capability = Registry.CurrentUser.OpenSubKey(capabilityPath, true);
-                if (capability == null) return;
-
-                using var urlAssociations = capability.CreateSubKey(@"UrlAssociations");
-
-                foreach (var association in associations)
-                    urlAssociations.SetValue(association.Protocol, association.ProgramId);
-            }
-
-            public void LocaliseDescription(LocalisationManager localisationManager)
-            {
-                using (var capability = Registry.CurrentUser.OpenSubKey(capabilityPath, true))
-                {
-                    capability?.SetValue(@"ApplicationDescription", localisationManager.GetLocalisedString(description));
-                }
-            }
-
-            public void Uninstall()
-            {
-                using (var registeredApplications = Registry.CurrentUser.OpenSubKey(software_registered_applications, true))
-                    registeredApplications?.DeleteValue(uniqueName, throwOnMissingValue: false);
-
-                Registry.CurrentUser.DeleteSubKeyTree(capabilityPath, throwOnMissingSubKey: false);
-            }
-        }
-
-        private class FileAssociation
-        {
-            public string ProgramId => $@"{program_id_file_prefix}{Extension}";
-
-            public string Extension { get; }
-            private LocalisableString description { get; }
-            private string iconPath { get; }
-
-            public FileAssociation(string extension, LocalisableString description, string iconPath)
-            {
-                Extension = extension;
-                this.description = description;
-                this.iconPath = iconPath;
-            }
-
-            /// <summary>
-            /// Installs a file extension association in accordance with https://learn.microsoft.com/en-us/windows/win32/com/-progid--key
-            /// </summary>
-            public void Install()
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                // register a program id for the given extension
-                using (var programKey = classes.CreateSubKey(ProgramId))
-                {
-                    programKey.SetValue(null, description.ToString());
-
-                    using (var defaultIconKey = programKey.CreateSubKey(default_icon))
-                        defaultIconKey.SetValue(null, iconPath);
-
-                    using (var openCommandKey = programKey.CreateSubKey(SHELL_OPEN_COMMAND))
-                        openCommandKey.SetValue(null, $@"""{exe_path}"" ""%1""");
-                }
-
-                using (var extensionKey = classes.CreateSubKey(Extension))
-                {
-                    // Clear out our existing default ProgramID. Default programs in Windows are handled internally by Explorer,
-                    // so having it here is just confusing and may override user preferences.
-                    if (extensionKey.GetValue(null) is string s && s == ProgramId)
-                        extensionKey.SetValue(null, string.Empty);
-
-                    // add to the open with dialog
-                    // https://learn.microsoft.com/en-us/windows/win32/shell/how-to-include-an-application-on-the-open-with-dialog-box
-                    using (var openWithKey = extensionKey.CreateSubKey(@"OpenWithProgIds"))
-                        openWithKey.SetValue(ProgramId, string.Empty);
-                }
-            }
-
-            public void LocaliseDescription(LocalisationManager localisationManager)
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var programKey = classes.OpenSubKey(ProgramId, true))
-                    programKey?.SetValue(null, localisationManager.GetLocalisedString(description));
-            }
-
-            /// <summary>
-            /// Uninstalls the file extension association in accordance with https://learn.microsoft.com/en-us/windows/win32/shell/fa-file-types#deleting-registry-information-during-uninstallation
-            /// </summary>
-            public void Uninstall()
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var extensionKey = classes.OpenSubKey(Extension, true))
-                {
-                    using (var openWithKey = extensionKey?.CreateSubKey(@"OpenWithProgIds"))
-                        openWithKey?.DeleteValue(ProgramId, throwOnMissingValue: false);
-                }
-
-                classes.DeleteSubKeyTree(ProgramId, throwOnMissingSubKey: false);
-            }
-        }
-
-        private class UriAssociation
-        {
-            /// <summary>
-            /// "The <c>URL Protocol</c> string value indicates that this key declares a custom pluggable protocol handler."
-            /// See https://learn.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa767914(v=vs.85).
-            /// </summary>
-            private const string url_protocol = @"URL Protocol";
-
-            public string Protocol { get; }
-            private LocalisableString description { get; }
-            private string iconPath { get; }
-
-            public UriAssociation(string protocol, LocalisableString description, string iconPath)
-            {
-                Protocol = protocol;
-                this.description = description;
-                this.iconPath = iconPath;
-            }
-
-            public string ProgramId => $@"{program_id_protocol_prefix}.{Protocol}";
-
-            /// <summary>
-            /// Registers an URI protocol handler in accordance with https://learn.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa767914(v=vs.85).
-            /// </summary>
-            public void Install()
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var protocolKey = classes.CreateSubKey(Protocol))
-                {
-                    protocolKey.SetValue(null, $@"URL:{description}");
-                    protocolKey.SetValue(url_protocol, string.Empty);
-
-                    // clear out old data
-                    protocolKey.DeleteSubKeyTree(default_icon, throwOnMissingSubKey: false);
-                    protocolKey.DeleteSubKeyTree(@"Shell", throwOnMissingSubKey: false);
-                }
-
-                // register a program id for the given protocol
-                using (var programKey = classes.CreateSubKey(ProgramId))
-                {
-                    using (var defaultIconKey = programKey.CreateSubKey(default_icon))
-                        defaultIconKey.SetValue(null, iconPath);
-
-                    using (var openCommandKey = programKey.CreateSubKey(SHELL_OPEN_COMMAND))
-                        openCommandKey.SetValue(null, $@"""{exe_path}"" ""%1""");
-                }
-            }
-
-            public void LocaliseDescription(LocalisationManager localisationManager)
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var protocolKey = classes.OpenSubKey(Protocol, true))
-                    protocolKey?.SetValue(null, $@"URL:{localisationManager.GetLocalisedString(description)}");
-            }
-
-            public void Uninstall()
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                classes?.DeleteSubKeyTree(ProgramId, throwOnMissingSubKey: false);
-            }
-        }
-    }
-}
@@ -5,7 +5,6 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Description>A free-to-win rhythm game. Rhythm is just a *click* away!</Description>
    <AssemblyName>osu!</AssemblyName>
-    <AssemblyTitle>osu!(lazer)</AssemblyTitle>
    <Title>osu!</Title>
    <Product>osu!(lazer)</Product>
    <ApplicationIcon>lazer.ico</ApplicationIcon>
@@ -24,14 +23,12 @@
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="10.0.5" />
-    <PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
-    <PackageReference Include="Velopack" Version="0.0.1298" />
+    <PackageReference Include="Clowd.Squirrel" Version="2.11.1" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
+    <PackageReference Include="System.IO.Packaging" Version="8.0.0" />
+    <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
  </ItemGroup>
-  <ItemGroup Label="Windows Icons">
-    <Content Include="*.ico" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-  </ItemGroup>
 </Project>
@@ -12,7 +12,7 @@
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
        <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description>
        <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2025 ppy Pty Ltd</copyright>
+        <copyright>Copyright (c) 2024 ppy Pty Ltd</copyright>
        <language>en-AU</language>
    </metadata>
    <files>
@@ -20,7 +20,6 @@
      <file src="**.dll" target="lib\net45\"/>
      <file src="**.config" target="lib\net45\"/>
      <file src="**.json" target="lib\net45\"/>
-      <file src="**.ico" target="lib\net45\"/>
      <file src="icon.png" target=""/>
    </files>
 </package>
@@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
-using osu.Game.Tests.NonVisual.Filtering;
+using osu.Game.Screens.Select.Carousel;

 namespace osu.Game.Benchmarks
 {
@@ -42,7 +42,7 @@ namespace osu.Game.Benchmarks
            Status = BeatmapOnlineStatus.Loved
        };

-        private FilterMatchingTest.CarouselBeatmap carouselBeatmap = null!;
+        private CarouselBeatmap carouselBeatmap = null!;
        private FilterCriteria criteria1 = null!;
        private FilterCriteria criteria2 = null!;
        private FilterCriteria criteria3 = null!;
@@ -55,7 +55,7 @@ namespace osu.Game.Benchmarks
            var beatmap = getExampleBeatmap();
            beatmap.OnlineID = 20201010;
            beatmap.BeatmapSet = new BeatmapSetInfo { OnlineID = 1535 };
-            carouselBeatmap = new FilterMatchingTest.CarouselBeatmap(beatmap);
+            carouselBeatmap = new CarouselBeatmap(beatmap);
            criteria1 = new FilterCriteria();
            criteria2 = new FilterCriteria
            {
@@ -1,77 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.IO;
-using BenchmarkDotNet.Attributes;
-using osu.Framework.IO.Stores;
-using osu.Game.Beatmaps;
-using osu.Game.IO;
-using osu.Game.IO.Archives;
-using osu.Game.Rulesets.Catch;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Taiko;
-using osu.Game.Tests.Resources;
-
-namespace osu.Game.Benchmarks
-{
-    public class BenchmarkDifficultyCalculation : BenchmarkTest
-    {
-        private DifficultyCalculator osuCalculator = null!;
-        private DifficultyCalculator taikoCalculator = null!;
-        private DifficultyCalculator catchCalculator = null!;
-        private DifficultyCalculator maniaCalculator = null!;
-
-        public override void SetUp()
-        {
-            using var resources = new DllResourceStore(typeof(TestResources).Assembly);
-
-            using var archive = resources.GetStream("Resources/Archives/241526 Soleily - Renatus.osz");
-            using var archiveReader = new ZipArchiveReader(archive);
-
-            var osuBeatmap = readBeatmap(archiveReader, "Soleily - Renatus (Gamu) [Insane].osu");
-            var taikoBeatmap = readBeatmap(archiveReader, "Soleily - Renatus (MMzz) [Oni].osu");
-            var catchBeatmap = readBeatmap(archiveReader, "Soleily - Renatus (Deif) [Salad].osu");
-            var maniaBeatmap = readBeatmap(archiveReader, "Soleily - Renatus (ExPew) [Another].osu");
-
-            osuCalculator = new OsuRuleset().CreateDifficultyCalculator(osuBeatmap);
-            taikoCalculator = new TaikoRuleset().CreateDifficultyCalculator(taikoBeatmap);
-            catchCalculator = new CatchRuleset().CreateDifficultyCalculator(catchBeatmap);
-            maniaCalculator = new ManiaRuleset().CreateDifficultyCalculator(maniaBeatmap);
-        }
-
-        private WorkingBeatmap readBeatmap(ZipArchiveReader archiveReader, string beatmapName)
-        {
-            using var beatmapStream = new MemoryStream();
-            archiveReader.GetStream(beatmapName).CopyTo(beatmapStream);
-
-            beatmapStream.Seek(0, SeekOrigin.Begin);
-            using var reader = new LineBufferedReader(beatmapStream);
-
-            var decoder = Beatmaps.Formats.Decoder.GetDecoder<Beatmap>(reader);
-            return new FlatWorkingBeatmap(decoder.Decode(reader));
-        }
-
-        [Benchmark]
-        public void CalculateDifficultyOsu() => osuCalculator.Calculate();
-
-        [Benchmark]
-        public void CalculateDifficultyTaiko() => taikoCalculator.Calculate();
-
-        [Benchmark]
-        public void CalculateDifficultyCatch() => catchCalculator.Calculate();
-
-        [Benchmark]
-        public void CalculateDifficultyMania() => maniaCalculator.Calculate();
-
-        [Benchmark]
-        public void CalculateDifficultyOsuHundredTimes()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                osuCalculator.Calculate();
-            }
-        }
-    }
-}
@@ -1,29 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using BenchmarkDotNet.Attributes;
-using osu.Framework.Utils;
-using osu.Game.Utils;
-using osuTK;
-
-namespace osu.Game.Benchmarks
-{
-    public class BenchmarkGeometryUtils : BenchmarkTest
-    {
-        [Params(100, 1000, 2000, 4000, 8000, 10000)]
-        public int N;
-
-        private Vector2[] points = null!;
-
-        public override void SetUp()
-        {
-            points = new Vector2[N];
-
-            for (int i = 0; i < points.Length; ++i)
-                points[i] = new Vector2(RNG.Next(512), RNG.Next(384));
-        }
-
-        [Benchmark]
-        public void MinimumEnclosingCircle() => GeometryUtils.MinimumEnclosingCircle(points);
-    }
-}
@@ -4,54 +4,28 @@
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;

 namespace osu.Game.Benchmarks
 {
    public class BenchmarkUnstableRate : BenchmarkTest
    {
-        private readonly List<List<HitEvent>> incrementalEventLists = new List<List<HitEvent>>();
+        private List<HitEvent> events = null!;

        public override void SetUp()
        {
            base.SetUp();
+            events = new List<HitEvent>();

-            var events = new List<HitEvent>();
-
-            for (int i = 0; i < 2048; i++)
-            {
-                // Ensure the object has hit windows populated.
-                var hitObject = new HitCircle();
-                hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-                events.Add(new HitEvent(RNG.NextDouble(-200.0, 200.0), RNG.NextDouble(1.0, 2.0), HitResult.Great, hitObject, null, null));
-
-                incrementalEventLists.Add(new List<HitEvent>(events));
-            }
+            for (int i = 0; i < 1000; i++)
+                events.Add(new HitEvent(RNG.NextDouble(-200.0, 200.0), RNG.NextDouble(1.0, 2.0), HitResult.Great, new HitObject(), null, null));
        }

        [Benchmark]
        public void CalculateUnstableRate()
        {
-            for (int i = 0; i < 2048; i++)
-            {
-                var events = incrementalEventLists[i];
-                _ = events.CalculateUnstableRate();
-            }
-        }
-
-        [Benchmark]
-        public void CalculateUnstableRateUsingIncrementalCalculation()
-        {
-            HitEventExtensions.UnstableRateCalculationResult? last = null;
-
-            for (int i = 0; i < 2048; i++)
-            {
-                var events = incrementalEventLists[i];
-                last = events.CalculateUnstableRate(last);
-            }
+            _ = events.CalculateUnstableRate();
        }
    }
 }
@@ -7,9 +7,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageReference Include="nunit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
+    <PackageReference Include="nunit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>

  <ItemGroup>
@@ -1,15 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Foundation;
-using osu.Framework.iOS;
-using osu.Game.Tests;
-
-namespace osu.Game.Rulesets.Catch.Tests.iOS
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : GameApplicationDelegate
-    {
-        protected override Framework.Game CreateGame() => new OsuTestBrowser();
-    }
-}
@@ -1,15 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using UIKit;
+using osu.Framework.iOS;
+using osu.Game.Tests;

 namespace osu.Game.Rulesets.Catch.Tests.iOS
 {
-    public static class Program
+    public static class Application
    {
        public static void Main(string[] args)
        {
-            UIApplication.Main(args, null, typeof(AppDelegate));
+            GameApplication.Main(new OsuTestBrowser());
        }
    }
 }
@@ -35,9 +35,11 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
@@ -53,8 +53,6 @@ namespace osu.Game.Rulesets.Catch.Tests
        [TestCase("3689906", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
        [TestCase("3949367", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
        [TestCase("112643")]
-        [TestCase("1041052", new[] { typeof(CatchModHardRock) })]
-        [TestCase("high-speed-multiplier-precision")]
        public new void Test(string name, params Type[] mods) => base.Test(name, mods);

        protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
@@ -1,59 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Game.Rulesets.Catch.Beatmaps;
-using osu.Game.Rulesets.Catch.Judgements;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Scoring;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class CatchHealthProcessorTest
-    {
-        private static readonly object[][] test_cases =
-        [
-            // hitobject, starting HP, fail expected after miss
-            [new Fruit(), 0.01, true],
-            [new Droplet(), 0.01, true],
-            [new TinyDroplet(), 0, false],
-            [new Banana(), 0, false],
-            [new BananaShower(), 0, false]
-        ];
-
-        [TestCaseSource(nameof(test_cases))]
-        public void TestFailAfterMinResult(CatchHitObject hitObject, double startingHealth, bool failExpected)
-        {
-            var healthProcessor = new CatchHealthProcessor(0);
-            healthProcessor.ApplyBeatmap(new CatchBeatmap
-            {
-                HitObjects = { hitObject }
-            });
-            healthProcessor.Health.Value = startingHealth;
-
-            var result = new CatchJudgementResult(hitObject, hitObject.CreateJudgement());
-            result.Type = result.Judgement.MinResult;
-            healthProcessor.ApplyResult(result);
-
-            Assert.That(healthProcessor.HasFailed, Is.EqualTo(failExpected));
-        }
-
-        [TestCaseSource(nameof(test_cases))]
-        public void TestNoFailAfterMaxResult(CatchHitObject hitObject, double startingHealth, bool _)
-        {
-            var healthProcessor = new CatchHealthProcessor(0);
-            healthProcessor.ApplyBeatmap(new CatchBeatmap
-            {
-                HitObjects = { hitObject }
-            });
-            healthProcessor.Health.Value = startingHealth;
-
-            var result = new CatchJudgementResult(hitObject, hitObject.CreateJudgement());
-            result.Type = result.Judgement.MaxResult;
-            healthProcessor.ApplyResult(result);
-
-            Assert.That(healthProcessor.HasFailed, Is.False);
-        }
-    }
-}
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Mods;

 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -22,9 +21,8 @@ namespace osu.Game.Rulesets.Catch.Tests
        {
            var ruleset = new CatchRuleset();
            var difficulty = new BeatmapDifficulty { ApproachRate = originalApproachRate };
-            var beatmapInfo = new BeatmapInfo { Difficulty = difficulty };

-            var adjustedDifficulty = ruleset.GetAdjustedDisplayDifficulty(beatmapInfo, []);
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1);

            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(originalApproachRate));
        }
@@ -34,9 +32,8 @@ namespace osu.Game.Rulesets.Catch.Tests
        {
            var ruleset = new CatchRuleset();
            var difficulty = new BeatmapDifficulty();
-            var beatmapInfo = new BeatmapInfo { Difficulty = difficulty };

-            var adjustedDifficulty = ruleset.GetAdjustedDisplayDifficulty(beatmapInfo, [new CatchModHalfTime()]);
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 0.75);

            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(1.67).Within(0.01));
        }
@@ -46,9 +43,8 @@ namespace osu.Game.Rulesets.Catch.Tests
        {
            var ruleset = new CatchRuleset();
            var difficulty = new BeatmapDifficulty();
-            var beatmapInfo = new BeatmapInfo { Difficulty = difficulty };

-            var adjustedDifficulty = ruleset.GetAdjustedDisplayDifficulty(beatmapInfo, [new CatchModDoubleTime()]);
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1.5);

            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(7.67).Within(0.01));
        }
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.

 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Catch.Skinning.Legacy;
@@ -22,9 +21,9 @@ namespace osu.Game.Rulesets.Catch.Tests
            var skinSource = new SkinProvidingContainer(rawSkin);
            var skin = new CatchLegacySkinTransformer(skinSource);

-            ClassicAssert.AreEqual(new Color4(232, 185, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value);
-            ClassicAssert.AreEqual(new Color4(232, 74, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value);
-            ClassicAssert.AreEqual(new Color4(0, 255, 255, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value);
+            Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value);
+            Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value);
+            Assert.AreEqual(new Color4(0, 255, 255, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value);
        }

        private class TestLegacySkin : LegacySkin
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -22,8 +23,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
    public abstract partial class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
    {
-        protected sealed override Ruleset CreateRuleset() => new CatchRuleset();
-
        protected const double TIME_SNAP = 100;

        protected DrawableCatchHitObject LastObject;
@@ -72,11 +71,11 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            contentContainer.Playfield.HitObjectContainer.Add(hitObject);
        }

-        protected override void UpdatePlacementTimeAndPosition()
+        protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
        {
-            var position = InputManager.CurrentState.Mouse.Position;
-            double time = Math.Round(HitObjectContainer.TimeAtScreenSpacePosition(position) / TIME_SNAP) * TIME_SNAP;
-            CurrentBlueprint.UpdateTimeAndPosition(position, time);
+            var result = base.SnapForBlueprint(blueprint);
+            result.Time = Math.Round(HitObjectContainer.TimeAtScreenSpacePosition(result.ScreenSpacePosition) / TIME_SNAP) * TIME_SNAP;
+            return result;
        }
    }
 }
@@ -1,158 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Edit.Checks;
-using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Checks;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Tests.Beatmaps;
-
-namespace osu.Game.Rulesets.Catch.Tests.Editor.Checks
-{
-    [TestFixture]
-    public class CheckCatchAbnormalDifficultySettingsTest
-    {
-        private CheckCatchAbnormalDifficultySettings check = null!;
-
-        private readonly IBeatmap beatmap = new Beatmap<HitObject>();
-
-        [SetUp]
-        public void Setup()
-        {
-            check = new CheckCatchAbnormalDifficultySettings();
-
-            beatmap.BeatmapInfo.Ruleset = new CatchRuleset().RulesetInfo;
-            beatmap.Difficulty = new BeatmapDifficulty
-            {
-                ApproachRate = 5,
-                CircleSize = 5,
-                DrainRate = 5,
-            };
-        }
-
-        [Test]
-        public void TestNormalSettings()
-        {
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(0));
-        }
-
-        [Test]
-        public void TestApproachRateTwoDecimals()
-        {
-            beatmap.Difficulty.ApproachRate = 5.55f;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateMoreThanOneDecimal);
-        }
-
-        [Test]
-        public void TestCircleSizeTwoDecimals()
-        {
-            beatmap.Difficulty.CircleSize = 5.55f;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateMoreThanOneDecimal);
-        }
-
-        [Test]
-        public void TestDrainRateTwoDecimals()
-        {
-            beatmap.Difficulty.DrainRate = 5.55f;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateMoreThanOneDecimal);
-        }
-
-        [Test]
-        public void TestApproachRateUnder()
-        {
-            beatmap.Difficulty.ApproachRate = -10;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        [Test]
-        public void TestCircleSizeUnder()
-        {
-            beatmap.Difficulty.CircleSize = -10;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        [Test]
-        public void TestDrainRateUnder()
-        {
-            beatmap.Difficulty.DrainRate = -10;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        [Test]
-        public void TestApproachRateOver()
-        {
-            beatmap.Difficulty.ApproachRate = 20;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        [Test]
-        public void TestCircleSizeOver()
-        {
-            beatmap.Difficulty.CircleSize = 20;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        [Test]
-        public void TestDrainRateOver()
-        {
-            beatmap.Difficulty.DrainRate = 20;
-
-            var context = getContext();
-            var issues = check.Run(context).ToList();
-
-            Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckAbnormalDifficultySettings.IssueTemplateOutOfRange);
-        }
-
-        private BeatmapVerifierContext getContext()
-        {
-            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
-        }
-    }
-}
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
    {
        protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableBananaShower((BananaShower)hitObject);

-        protected override HitObjectPlacementBlueprint CreateBlueprint() => new BananaShowerPlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new BananaShowerPlacementBlueprint();

        protected override void AddHitObject(DrawableHitObject hitObject)
        {
@@ -1,66 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Testing;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Tests.Visual;
-using osuTK;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Catch.Tests.Editor
-{
-    public partial class TestSceneCatchEditorSaving : EditorSavingTestScene
-    {
-        protected override Ruleset CreateRuleset() => new CatchRuleset();
-
-        [Test]
-        public void TestCatchJuiceStreamTickCorrect()
-        {
-            AddStep("enter timing mode", () => InputManager.Key(Key.F3));
-            AddStep("add timing point", () => EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint()));
-            AddStep("enter compose mode", () => InputManager.Key(Key.F1));
-
-            Vector2 startPoint = Vector2.Zero;
-            float increment = 0;
-
-            AddUntilStep("wait for playfield", () => this.ChildrenOfType<CatchPlayfield>().FirstOrDefault()?.IsLoaded == true);
-            AddStep("move to centre", () =>
-            {
-                var playfield = this.ChildrenOfType<CatchPlayfield>().Single();
-                startPoint = playfield.ScreenSpaceDrawQuad.Centre + new Vector2(0, playfield.ScreenSpaceDrawQuad.Height / 3);
-                increment = playfield.ScreenSpaceDrawQuad.Height / 10;
-                InputManager.MoveMouseTo(startPoint);
-            });
-            AddStep("choose juice stream placing tool", () => InputManager.Key(Key.Number3));
-            AddStep("start placement", () => InputManager.Click(MouseButton.Left));
-
-            AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(2 * increment, -increment)));
-            AddStep("add node", () => InputManager.Click(MouseButton.Left));
-
-            AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(-2 * increment, -2 * increment)));
-            AddStep("add node", () => InputManager.Click(MouseButton.Left));
-
-            AddStep("move to next", () => InputManager.MoveMouseTo(startPoint + new Vector2(0, -3 * increment)));
-            AddStep("end placement", () => InputManager.Click(MouseButton.Right));
-
-            AddUntilStep("juice stream placed", () => EditorBeatmap.HitObjects, () => Has.Count.EqualTo(1));
-
-            int largeDropletCount = 0, tinyDropletCount = 0;
-            AddStep("store droplet count", () =>
-            {
-                largeDropletCount = EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(Droplet));
-                tinyDropletCount = EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(TinyDroplet));
-            });
-
-            SaveEditor();
-            ReloadEditorToSameBeatmap();
-
-            AddAssert("large droplet count is the same", () => EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(Droplet)), () => Is.EqualTo(largeDropletCount));
-            AddAssert("tiny droplet count is the same", () => EditorBeatmap.HitObjects[0].NestedHitObjects.Count(t => t.GetType() == typeof(TinyDroplet)), () => Is.EqualTo(tinyDropletCount));
-        }
-    }
-}
@@ -1,253 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Tests.Beatmaps;
-using osuTK;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Catch.Tests.Editor
-{
-    [TestFixture]
-    public partial class TestSceneCatchReverseSelection : TestSceneEditor
-    {
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
-
-        [Test]
-        public void TestReverseSelectionTwoFruits()
-        {
-            CatchHitObject[] objects = null!;
-            bool[] newCombos = null!;
-
-            addObjects([
-                new Fruit
-                {
-                    StartTime = 200,
-                    X = 0,
-                },
-                new Fruit
-                {
-                    StartTime = 400,
-                    X = 20,
-                }
-            ]);
-
-            AddStep("store objects & new combo data", () =>
-            {
-                objects = getObjects().ToArray();
-                newCombos = getObjectNewCombos().ToArray();
-            });
-
-            selectEverything();
-            reverseSelection();
-
-            AddAssert("objects reversed", getObjects, () => Is.EqualTo(objects.Reverse()));
-            AddAssert("new combo positions preserved", getObjectNewCombos, () => Is.EqualTo(newCombos));
-        }
-
-        [Test]
-        public void TestReverseSelectionThreeFruits()
-        {
-            CatchHitObject[] objects = null!;
-            bool[] newCombos = null!;
-
-            addObjects([
-                new Fruit
-                {
-                    StartTime = 200,
-                    X = 0,
-                },
-                new Fruit
-                {
-                    StartTime = 400,
-                    X = 20,
-                },
-                new Fruit
-                {
-                    StartTime = 600,
-                    X = 40,
-                }
-            ]);
-
-            AddStep("store objects & new combo data", () =>
-            {
-                objects = getObjects().ToArray();
-                newCombos = getObjectNewCombos().ToArray();
-            });
-
-            selectEverything();
-            reverseSelection();
-
-            AddAssert("objects reversed", getObjects, () => Is.EqualTo(objects.Reverse()));
-            AddAssert("new combo positions preserved", getObjectNewCombos, () => Is.EqualTo(newCombos));
-        }
-
-        [Test]
-        public void TestReverseSelectionFruitAndJuiceStream()
-        {
-            CatchHitObject[] objects = null!;
-            bool[] newCombos = null!;
-
-            addObjects([
-                new Fruit
-                {
-                    StartTime = 200,
-                    X = 0,
-                },
-                new JuiceStream
-                {
-                    StartTime = 400,
-                    X = 20,
-                    Path = new SliderPath
-                    {
-                        ControlPoints =
-                        {
-                            new PathControlPoint(),
-                            new PathControlPoint(new Vector2(50))
-                        }
-                    }
-                }
-            ]);
-
-            AddStep("store objects & new combo data", () =>
-            {
-                objects = getObjects().ToArray();
-                newCombos = getObjectNewCombos().ToArray();
-            });
-
-            selectEverything();
-            reverseSelection();
-
-            AddAssert("objects reversed", getObjects, () => Is.EqualTo(objects.Reverse()));
-            AddAssert("new combo positions preserved", getObjectNewCombos, () => Is.EqualTo(newCombos));
-        }
-
-        [Test]
-        public void TestReverseSelectionTwoFruitsAndJuiceStream()
-        {
-            CatchHitObject[] objects = null!;
-            bool[] newCombos = null!;
-
-            addObjects([
-                new Fruit
-                {
-                    StartTime = 200,
-                    X = 0,
-                },
-                new Fruit
-                {
-                    StartTime = 400,
-                    X = 20,
-                },
-                new JuiceStream
-                {
-                    StartTime = 600,
-                    X = 40,
-                    Path = new SliderPath
-                    {
-                        ControlPoints =
-                        {
-                            new PathControlPoint(),
-                            new PathControlPoint(new Vector2(50))
-                        }
-                    }
-                }
-            ]);
-
-            AddStep("store objects & new combo data", () =>
-            {
-                objects = getObjects().ToArray();
-                newCombos = getObjectNewCombos().ToArray();
-            });
-
-            selectEverything();
-            reverseSelection();
-
-            AddAssert("objects reversed", getObjects, () => Is.EqualTo(objects.Reverse()));
-            AddAssert("new combo positions preserved", getObjectNewCombos, () => Is.EqualTo(newCombos));
-        }
-
-        [Test]
-        public void TestReverseSelectionTwoCombos()
-        {
-            CatchHitObject[] objects = null!;
-            bool[] newCombos = null!;
-
-            addObjects([
-                new Fruit
-                {
-                    StartTime = 200,
-                    X = 0,
-                },
-                new Fruit
-                {
-                    StartTime = 400,
-                    X = 20,
-                },
-                new Fruit
-                {
-                    StartTime = 600,
-                    X = 40,
-                },
-
-                new Fruit
-                {
-                    StartTime = 800,
-                    NewCombo = true,
-                    X = 60,
-                },
-                new Fruit
-                {
-                    StartTime = 1000,
-                    X = 80,
-                },
-                new Fruit
-                {
-                    StartTime = 1200,
-                    X = 100,
-                }
-            ]);
-
-            AddStep("store objects & new combo data", () =>
-            {
-                objects = getObjects().ToArray();
-                newCombos = getObjectNewCombos().ToArray();
-            });
-
-            selectEverything();
-            reverseSelection();
-
-            AddAssert("objects reversed", getObjects, () => Is.EqualTo(objects.Reverse()));
-            AddAssert("new combo positions preserved", getObjectNewCombos, () => Is.EqualTo(newCombos));
-        }
-
-        private void addObjects(CatchHitObject[] hitObjects) => AddStep("Add objects", () => EditorBeatmap.AddRange(hitObjects));
-
-        private IEnumerable<CatchHitObject> getObjects() => EditorBeatmap.HitObjects.OfType<CatchHitObject>();
-
-        private IEnumerable<bool> getObjectNewCombos() => getObjects().Select(ho => ho.NewCombo);
-
-        private void selectEverything()
-        {
-            AddStep("Select everything", () =>
-            {
-                EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects);
-            });
-        }
-
-        private void reverseSelection()
-        {
-            AddStep("Reverse selection", () =>
-            {
-                InputManager.PressKey(Key.LControl);
-                InputManager.Key(Key.G);
-                InputManager.ReleaseKey(Key.LControl);
-            });
-        }
-    }
-}
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
    {
        protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableFruit((Fruit)hitObject);

-        protected override HitObjectPlacementBlueprint CreateBlueprint() => new FruitPlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new FruitPlacementBlueprint();

        [Test]
        public void TestFruitPlacementPosition()
--- a/Show More
+++ b/Show More