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-18 04:59:52 +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
1535 changed files with 15517 additions and 56991 deletions
@@ -21,7 +21,7 @@
      ]
    },
    "ppy.localisationanalyser.tools": {
-      "version": "2024.802.0",
+      "version": "2023.1117.0",
      "commands": [
        "localisation"
      ]
@@ -196,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: 720
-
-    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"

@@ -88,7 +87,7 @@ jobs:
      # 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}}
@@ -100,16 +99,16 @@ 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"

@@ -121,19 +120,24 @@ jobs:

  build-only-ios:
    name: Build only (iOS)
-    runs-on: macos-latest
+    # `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 --from-rollback-file https://raw.githubusercontent.com/ppy/osu-framework/refs/heads/master/workloads.json
+        run: dotnet workload install maui-ios
+
+      - 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
@@ -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)
-          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
@@ -43,7 +43,7 @@ jobs:
      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,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,7 @@ 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. We also have a [`good first issue`](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) 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.
+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.

@@ -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.
@@ -2,6 +2,7 @@
 <Project>
  <PropertyGroup Label="C#">
    <LangVersion>12.0</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <PropertyGroup>
@@ -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,7 +9,7 @@
      <GenerateProgramFile>false</GenerateProgramFile>
    </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <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>
@@ -9,7 +9,7 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <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>
@@ -9,7 +9,7 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <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>
@@ -9,7 +9,7 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <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>
@@ -10,7 +10,7 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1115.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);
+        }
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -5,29 +5,29 @@ using Android.Content.PM;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Play;
+using osu.Game;

 namespace osu.Android
 {
    public partial class GameplayScreenRotationLocker : Component
    {
-        private IBindable<LocalUserPlayingState> localUserPlaying = null!;
+        private Bindable<bool> localUserPlaying = null!;

        [Resolved]
        private OsuGameActivity gameActivity { get; set; } = null!;

        [BackgroundDependencyLoader]
-        private void load(ILocalUserPlayInfo localUserPlayInfo)
+        private void load(OsuGame game)
        {
-            localUserPlaying = localUserPlayInfo.PlayingState.GetBoundCopy();
+            localUserPlaying = game.LocalUserPlaying.GetBoundCopy();
            localUserPlaying.BindValueChanged(updateLock, true);
        }

-        private void updateLock(ValueChangedEvent<LocalUserPlayingState> userPlaying)
+        private void updateLock(ValueChangedEvent<bool> userPlaying)
        {
            gameActivity.RunOnUiThread(() =>
            {
-                gameActivity.RequestedOrientation = userPlaying.NewValue == LocalUserPlayingState.Playing ? ScreenOrientation.Locked : gameActivity.DefaultOrientation;
+                gameActivity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : gameActivity.DefaultOrientation;
            });
        }
    }
@@ -5,9 +5,13 @@ using System;
 using Android.App;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
+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.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;

@@ -80,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>
@@ -5,21 +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.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;
@@ -28,78 +21,39 @@ 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!;
-
-        [Resolved]
-        private LoginOverlay? login { get; set; }
-
-        [Resolved]
-        private MultiplayerClient multiplayerClient { get; set; } = null!;
-
-        [Resolved]
-        private OsuConfigManager config { get; set; } = null!;
-
        private readonly IBindable<UserStatus?> status = new Bindable<UserStatus?>();
        private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
+
        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()
+        private void load(OsuConfigManager config)
        {
            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, LogLevel.Error);

-            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.Initialize();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
+            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);

            config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);

@@ -113,59 +67,36 @@ namespace osu.Desktop
                activity.BindTo(u.NewValue.Activity);
            }, true);

-            ruleset.BindValueChanged(_ => schedulePresenceUpdate());
-            status.BindValueChanged(_ => schedulePresenceUpdate());
-            activity.BindValueChanged(_ => schedulePresenceUpdate());
-            privacyMode.BindValueChanged(_ => schedulePresenceUpdate());
-            multiplayerClient.RoomUpdated += onRoomUpdated;
+            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 ScheduledDelegate? presenceUpdateDelegate;
-
-        private void schedulePresenceUpdate()
+        private void updateStatus()
        {
-            presenceUpdateDelegate?.Cancel();
-            presenceUpdateDelegate = Scheduler.AddDelayed(() =>
-            {
-                if (!client.IsInitialized)
-                    return;
-
-                if (status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
-                {
-                    client.ClearPresence();
-                    return;
-                }
-
-                bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited || status.Value == UserStatus.DoNotDisturb;
-
-                updatePresence(hideIdentifiableInformation);
-                client.SetPresence(presence);
-            }, 200);
-        }
-
-        private void updatePresence(bool hideIdentifiableInformation)
-        {
-            if (user == null)
+            if (!client.IsInitialized)
                return;

-            // user activity
-            if (activity.Value != null)
+            if (status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
            {
-                presence.State = clampLength(activity.Value.GetStatus(hideIdentifiableInformation));
-                presence.Details = clampLength(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
+                client.ClearPresence();
+                return;
+            }
+
+            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)
                {
@@ -189,42 +120,7 @@ namespace osu.Desktop
                presence.Details = string.Empty;
            }

-            // user party
-            if (!hideIdentifiableInformation && multiplayerClient.Room != null)
-            {
-                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
@@ -235,57 +131,17 @@ namespace osu.Desktop
                    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;

@@ -303,31 +159,7 @@ namespace osu.Desktop
            });
        }

-        private static bool tryParseRoomSecret(string secretJson, out long roomId, out string? password)
-        {
-            roomId = 0;
-            password = null;
-
-            RoomSecret? roomSecret;
-
-            try
-            {
-                roomSecret = JsonConvert.DeserializeObject<RoomSecret>(secretJson);
-            }
-            catch
-            {
-                return false;
-            }
-
-            if (roomSecret == null) return false;
-
-            roomId = roomSecret.RoomID;
-            password = roomSecret.Password;
-
-            return true;
-        }
-
-        private static int? getBeatmapID(UserActivity activity)
+        private int? getBeatmapID(UserActivity activity)
        {
            switch (activity)
            {
@@ -343,20 +175,8 @@ namespace osu.Desktop

        protected override void Dispose(bool isDisposing)
        {
-            if (multiplayerClient.IsNotNull())
-                multiplayerClient.RoomUpdated -= onRoomUpdated;
-
            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,12 +15,11 @@ using osu.Framework;
 using osu.Framework.Logging;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
-using osu.Framework.Allocation;
 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
 {
@@ -30,9 +28,6 @@ namespace osu.Desktop
        private OsuSchemeLinkIPCChannel? osuSchemeLinkIPCChannel;
        private ArchiveImportIPCChannel? archiveImportIPCChannel;

-        [Cached(typeof(IHighPerformanceSessionManager))]
-        private readonly HighPerformanceSessionManager highPerformanceSessionManager = new HighPerformanceSessionManager();
-
        public OsuGameDesktop(string[]? args = null)
            : base(args)
        {
@@ -91,24 +86,46 @@ namespace osu.Desktop
        [SupportedOSPlatform("windows")]
        private string? getStableInstallPathFromRegistry()
        {
-            using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey("osu!"))
-                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 (IsPackageManaged)
+            string? packageManaged = Environment.GetEnvironmentVariable("OSU_EXTERNAL_UPDATE_PROVIDER");
+
+            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()).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()
@@ -138,7 +155,7 @@ namespace osu.Desktop
            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)
        {
@@ -146,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
 {
@@ -31,11 +30,19 @@ namespace osu.Desktop
        [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();
-
+            /*
+             * 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;
@@ -44,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;
@@ -97,13 +102,7 @@ namespace osu.Desktop
                }
            }

-            var hostOptions = new HostOptions
-            {
-                IPCPort = !tournamentClient ? OsuGame.IPC_PORT : 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)
                {
@@ -167,28 +166,29 @@ namespace osu.Desktop
            return false;
        }

-        private static void setupVelopack()
-        {
-            if (OsuGameDesktop.IsPackageManaged)
-            {
-                Logger.Log("Updates are being managed by an external provider. Skipping Velopack setup.");
-                return;
-            }
-
-            var app = VelopackApp.Build();
-
-            if (OperatingSystem.IsWindows())
-                configureWindows(app);
-
-            app.Run();
-        }
-
        [SupportedOSPlatform("windows")]
-        private static void configureWindows(VelopackApp app)
+        private static void setupSquirrel()
        {
-            app.WithFirstRun(_ => WindowsAssociationManager.InstallAssociations());
-            app.WithAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
-            app.WithBeforeUninstallFastCallback(_ => 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,6 +2,7 @@
 // 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;
@@ -20,14 +21,48 @@ 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;
@@ -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,148 +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.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 Velopack;
-using Velopack.Sources;
-
-namespace osu.Desktop.Updater
-{
-    public partial class VelopackUpdateManager : Game.Updater.UpdateManager
-    {
-        private readonly UpdateManager updateManager;
-        private INotificationOverlay notificationOverlay = null!;
-
-        [Resolved]
-        private OsuGameBase game { get; set; } = null!;
-
-        [Resolved]
-        private ILocalUserPlayInfo? localUserInfo { get; set; }
-
-        private bool isInGameplay => localUserInfo?.PlayingState.Value != LocalUserPlayingState.NotPlaying;
-
-        private UpdateInfo? pendingUpdate;
-
-        public VelopackUpdateManager()
-        {
-            updateManager = new UpdateManager(new GithubSource(@"https://github.com/ppy/osu", null, false), new UpdateOptions
-            {
-                AllowVersionDowngrade = true,
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(INotificationOverlay notifications)
-        {
-            notificationOverlay = notifications;
-        }
-
-        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);
-
-        private async Task<bool> checkForUpdateAsync()
-        {
-            // whether to check again in 30 minutes. generally only if there's an error or no update was found (yet).
-            bool scheduleRecheck = false;
-
-            try
-            {
-                // Avoid any kind of update checking while gameplay is running.
-                if (isInGameplay)
-                {
-                    scheduleRecheck = true;
-                    return true;
-                }
-
-                // TODO: we should probably be checking if there's a more recent update, rather than shortcutting here.
-                // Velopack does support this scenario (see https://github.com/ppy/osu/pull/28743#discussion_r1743495975).
-                if (pendingUpdate != null)
-                {
-                    // If there is an update pending restart, show the notification to restart again.
-                    notificationOverlay.Post(new UpdateApplicationCompleteNotification
-                    {
-                        Activated = () =>
-                        {
-                            Task.Run(restartToApplyUpdate);
-                            return true;
-                        }
-                    });
-
-                    return true;
-                }
-
-                pendingUpdate = await updateManager.CheckForUpdatesAsync().ConfigureAwait(false);
-
-                // No update is available. We'll check again later.
-                if (pendingUpdate == null)
-                {
-                    scheduleRecheck = true;
-                    return false;
-                }
-
-                // An update is found, let's notify the user and start downloading it.
-                UpdateProgressNotification notification = new UpdateProgressNotification
-                {
-                    CompletionClickAction = () =>
-                    {
-                        Task.Run(restartToApplyUpdate);
-                        return true;
-                    },
-                };
-
-                runOutsideOfGameplay(() => notificationOverlay.Post(notification));
-                notification.StartDownload();
-
-                try
-                {
-                    await updateManager.DownloadUpdatesAsync(pendingUpdate, p => notification.Progress = p / 100f).ConfigureAwait(false);
-                    runOutsideOfGameplay(() => notification.State = ProgressNotificationState.Completed);
-                }
-                catch (Exception e)
-                {
-                    // In the case of an error, a separate notification will be displayed.
-                    scheduleRecheck = true;
-                    notification.FailDownload();
-                    Logger.Error(e, @"update failed!");
-                }
-            }
-            catch (Exception e)
-            {
-                // we'll ignore this and retry later. can be triggered by no internet connection or thread abortion.
-                scheduleRecheck = true;
-                Logger.Log($@"update check failed ({e.Message})");
-            }
-            finally
-            {
-                if (scheduleRecheck)
-                {
-                    Scheduler.AddDelayed(() => Task.Run(async () => await checkForUpdateAsync().ConfigureAwait(false)), 60000 * 30);
-                }
-            }
-
-            return true;
-        }
-
-        private void runOutsideOfGameplay(Action action)
-        {
-            if (isInGameplay)
-            {
-                Scheduler.AddDelayed(() => runOutsideOfGameplay(action), 1000);
-                return;
-            }
-
-            action();
-        }
-
-        private async Task restartToApplyUpdate()
-        {
-            await updateManager.WaitExitThenApplyUpdatesAsync(pendingUpdate?.TargetFullRelease).ConfigureAwait(false);
-            Schedule(() => game.AttemptExit());
-        }
-    }
-}
@@ -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,295 +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";
-
-        /// <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_prefix = "osu.File";
-
-        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="UpdateDescriptions"/> in a timely fashion to keep descriptions up-to-date and localised.
-        /// </remarks>
-        public static void InstallAssociations()
-        {
-            try
-            {
-                updateAssociations();
-                updateDescriptions(null); // write default descriptions in case `UpdateDescriptions()` is not called.
-                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="UpdateDescriptions"/> in a timely fashion to keep descriptions up-to-date and localised.
-        /// </remarks>
-        public static void UpdateAssociations()
-        {
-            try
-            {
-                updateAssociations();
-
-                // TODO: Remove once UpdateDescriptions() is called as specified in the xmldoc.
-                updateDescriptions(null); // always write default descriptions, in case of updating from an older version in which file associations were not implemented/installed
-
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @"Failed to update file and URI associations.");
-            }
-        }
-
-        public static void UpdateDescriptions(LocalisationManager localisationManager)
-        {
-            try
-            {
-                updateDescriptions(localisationManager);
-                NotifyShellUpdate();
-            }
-            catch (Exception e)
-            {
-                Logger.Error(e, @"Failed to update file and URI association descriptions.");
-            }
-        }
-
-        public static void UninstallAssociations()
-        {
-            try
-            {
-                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()
-        {
-            foreach (var association in file_associations)
-                association.Install();
-
-            foreach (var association in uri_associations)
-                association.Install();
-        }
-
-        private static void updateDescriptions(LocalisationManager? localisation)
-        {
-            foreach (var association in file_associations)
-                association.UpdateDescription(getLocalisedString(association.Description));
-
-            foreach (var association in uri_associations)
-                association.UpdateDescription(getLocalisedString(association.Description));
-
-            string getLocalisedString(LocalisableString s)
-            {
-                if (localisation == null)
-                    return s.ToString();
-
-                var b = localisation.GetLocalisedBindableString(s);
-                b.UnbindAll();
-                return b.Value;
-            }
-        }
-
-        #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 record FileAssociation(string Extension, LocalisableString Description, string IconPath)
-        {
-            private string programId => $@"{program_id_prefix}{Extension}";
-
-            /// <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))
-                {
-                    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))
-                {
-                    // set ourselves as the default program
-                    extensionKey.SetValue(null, programId);
-
-                    // 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 UpdateDescription(string description)
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var programKey = classes.OpenSubKey(programId, true))
-                    programKey?.SetValue(null, 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))
-                {
-                    // clear our default association so that Explorer doesn't show the raw programId to users
-                    // the null/(Default) entry is used for both ProdID association and as a fallback friendly name, for legacy reasons
-                    if (extensionKey?.GetValue(null) is string s && s == programId)
-                        extensionKey.SetValue(null, string.Empty);
-
-                    using (var openWithKey = extensionKey?.CreateSubKey(@"OpenWithProgIds"))
-                        openWithKey?.DeleteValue(programId, throwOnMissingValue: false);
-                }
-
-                classes.DeleteSubKeyTree(programId, throwOnMissingSubKey: false);
-            }
-        }
-
-        private record UriAssociation(string Protocol, LocalisableString Description, string IconPath)
-        {
-            /// <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>
-            public const string URL_PROTOCOL = @"URL 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(URL_PROTOCOL, string.Empty);
-
-                    using (var defaultIconKey = protocolKey.CreateSubKey(default_icon))
-                        defaultIconKey.SetValue(null, IconPath);
-
-                    using (var openCommandKey = protocolKey.CreateSubKey(SHELL_OPEN_COMMAND))
-                        openCommandKey.SetValue(null, $@"""{exe_path}"" ""%1""");
-                }
-            }
-
-            public void UpdateDescription(string description)
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                if (classes == null) return;
-
-                using (var protocolKey = classes.OpenSubKey(Protocol, true))
-                    protocolKey?.SetValue(null, $@"URL:{description}");
-            }
-
-            public void Uninstall()
-            {
-                using var classes = Registry.CurrentUser.OpenSubKey(software_classes, true);
-                classes?.DeleteSubKeyTree(Protocol, 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="8.0.1" />
+    <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" />
-    <PackageReference Include="Velopack" Version="0.0.630-g9c52e40" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
  </ItemGroup>
-  <ItemGroup Label="Windows Icons">
-    <Content Include="*.ico" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-  </ItemGroup>
 </Project>
@@ -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>
@@ -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);
-    }
-}
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
    <PackageReference Include="nunit" Version="3.14.0" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
  </ItemGroup>
@@ -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);
-        }
-    }
-}
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            contentContainer.Playfield.HitObjectContainer.Add(hitObject);
        }

-        protected override SnapResult SnapForBlueprint(HitObjectPlacementBlueprint blueprint)
+        protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
        {
            var result = base.SnapForBlueprint(blueprint);
            result.Time = Math.Round(HitObjectContainer.TimeAtScreenSpacePosition(result.ScreenSpacePosition) / TIME_SNAP) * TIME_SNAP;
@@ -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()
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor

        protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableJuiceStream((JuiceStream)hitObject);

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

        private void addMoveAndClickSteps(double time, float position, bool end = false)
        {
@@ -82,7 +82,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor

            AddMouseMoveStep(-100, 100);
            addVertexCheckStep(3, 1, times[0], positions[0]);
-            addDragEndStep();
        }

        [Test]
@@ -101,9 +100,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            AddMouseMoveStep(times[2] - 50, positions[2] - 50);
            addVertexCheckStep(4, 1, times[1] - 50, positions[1] - 50);
            addVertexCheckStep(4, 2, times[2] - 50, positions[2] - 50);
-
-            AddStep("release control", () => InputManager.ReleaseKey(Key.ControlLeft));
-            addDragEndStep();
        }

        [Test]
@@ -117,7 +113,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            addDragStartStep(times[1], positions[1]);
            AddMouseMoveStep(times[1], 400);
            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityMultiplierBindable.IsDefault);
-            addDragEndStep();
        }

        [Test]
@@ -134,7 +129,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            AddStep("scroll playfield", () => manualClock.CurrentTime += 200);
            AddMouseMoveStep(times[1] + 200, positions[1] + 100);
            addVertexCheckStep(2, 1, times[1] + 200, positions[1] + 100);
-            addDragEndStep();
        }

        [Test]
@@ -167,18 +161,18 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            addAddVertexSteps(500, 150);
            addVertexCheckStep(3, 1, 500, 150);

-            addAddVertexSteps(160, 200);
-            addVertexCheckStep(4, 1, 160, 200);
+            addAddVertexSteps(90, 200);
+            addVertexCheckStep(4, 1, times[0], positions[0]);

            addAddVertexSteps(750, 180);
-            addVertexCheckStep(5, 4, 800, 160);
+            addVertexCheckStep(5, 4, 750, 180);
            AddAssert("duration is changed", () => Precision.AlmostEquals(hitObject.Duration, 800 - times[0], 1e-3));
        }

        [Test]
        public void TestDeleteVertex()
        {
-            double[] times = { 100, 300, 400 };
+            double[] times = { 100, 300, 500 };
            float[] positions = { 100, 200, 150 };
            addBlueprintStep(times, positions);

@@ -271,7 +265,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            AddStep("delete vertex", () =>
            {
                InputManager.PressKey(Key.ShiftLeft);
-                InputManager.Click(MouseButton.Right);
+                InputManager.Click(MouseButton.Left);
                InputManager.ReleaseKey(Key.ShiftLeft);
            });
        }
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                            StartTime = 5000,
                        }
                    },
-                    Breaks =
+                    Breaks = new List<BreakPeriod>
                    {
                        new BreakPeriod(2000, 4000),
                    }
@@ -1,210 +0,0 @@
-osu file format v14
-
-[General]
-AudioFilename: audio.mp3
-AudioLeadIn: 0
-PreviewTime: 65316
-Countdown: 0
-SampleSet: Soft
-StackLeniency: 0.7
-Mode: 2
-LetterboxInBreaks: 0
-WidescreenStoryboard: 0
-
-[Editor]
-DistanceSpacing: 1.4
-BeatDivisor: 4
-GridSize: 8
-TimelineZoom: 1.4
-
-[Metadata]
-Title:Nanairo Symphony -TV Size-
-TitleUnicode:七色シンフォニー -TV Size-
-Artist:Coalamode.
-ArtistUnicode:コアラモード．
-Creator:Ascendance
-Version:Aru's Cup
-Source:四月は君の嘘
-Tags:shigatsu wa kimi no uso your lie in april opening arusamour tenshichan [superstar]
-BeatmapID:1041052
-BeatmapSetID:488149
-
-[Difficulty]
-HPDrainRate:3
-CircleSize:2.5
-OverallDifficulty:6
-ApproachRate:6
-SliderMultiplier:1.02
-SliderTickRate:2
-
-[Events]
-//Background and Video events
-Video,500,"forty.avi"
-0,0,"cropped-1366-768-647733.jpg",0,0
-//Break Periods
-//Storyboard Layer 0 (Background)
-//Storyboard Layer 1 (Fail)
-//Storyboard Layer 2 (Pass)
-//Storyboard Layer 3 (Foreground)
-//Storyboard Sound Samples
-
-[TimingPoints]
-1155,387.096774193548,4,2,1,50,1,0
-15284,-100,4,2,1,60,0,0
-16638,-100,4,2,1,50,0,0
-41413,-100,4,2,1,60,0,0
-59993,-100,4,2,1,65,0,0
-66187,-100,4,2,1,70,0,1
-87284,-100,4,2,1,60,0,1
-87864,-100,4,2,1,70,0,0
-87961,-100,4,2,1,50,0,0
-88638,-100,4,2,1,30,0,0
-89413,-100,4,2,1,10,0,0
-89800,-100,4,2,1,5,0,0
-
-
-[Colours]
-Combo1 : 255,128,64
-Combo2 : 0,128,255
-Combo3 : 255,128,192
-Combo4 : 0,128,192
-
-[HitObjects]
-208,160,1155,6,0,L|45:160,1,153,2|2,0:0|0:0,0:0:0:0:
-160,160,2122,1,0,0:0:0:0:
-272,160,2509,1,2,0:0:0:0:
-448,288,3284,6,0,P|480:240|480:192,1,102,2|0,0:0|0:0,0:0:0:0:
-384,96,4058,1,2,0:0:0:0:
-128,64,5025,6,0,L|32:64,2,76.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
-192,64,5800,1,2,0:0:0:0:
-240,64,5993,1,2,0:0:0:0:
-288,64,6187,1,2,0:0:0:0:
-416,80,6574,6,0,L|192:80,1,204,0|2,0:0|0:0,0:0:0:0:
-488,160,8122,2,0,L|376:160,1,102
-457,288,8896,2,0,L|297:288,1,153,2|2,0:0|0:0,0:0:0:0:
-400,288,10058,1,0,0:0:0:0:
-304,288,10445,6,0,L|192:288,2,102,2|0|2,0:0|0:0|0:0,0:0:0:0:
-400,288,11606,1,0,0:0:0:0:
-240,288,11993,2,0,L|80:288,1,153,2|0,0:0|0:0,0:0:0:0:
-0,288,13154,1,0,0:0:0:0:
-112,240,13542,6,0,P|160:288|256:288,1,153,6|2,0:0|0:0,0:0:0:0:
-288,288,14316,2,0,L|368:288,2,76.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
-192,288,15284,2,0,L|160:224,1,51,0|12,0:0|0:0,0:0:0:0:
-312,208,15864,1,6,0:0:0:0:
-128,176,16638,6,0,P|64:160|0:96,2,153,6|2|0,0:0|0:0|0:0,0:0:0:0:
-224,176,18187,2,0,P|288:192|352:272,2,153,2|2|0,0:0|0:0|0:0,0:0:0:0:
-128,176,19735,6,0,L|288:176,1,153,2|2,0:0|0:0,0:0:0:0:
-432,176,20896,1,0,0:0:0:0:
-328,176,21284,2,0,L|488:176,1,153,2|2,0:0|0:0,0:0:0:0:
-328,176,22445,1,0,0:0:0:0:
-224,176,22832,6,0,L|64:176,1,153,2|2,0:0|0:0,0:0:0:0:
-224,176,23993,1,0,0:0:0:0:
-112,176,24380,2,0,L|272:176,1,153,2|2,0:0|0:0,0:0:0:0:
-416,176,25541,1,0,0:0:0:0:
-304,256,25929,6,0,P|272:208|312:120,1,153,2|2,0:0|0:0,0:0:0:0:
-480,112,27090,1,0,0:0:0:0:
-384,112,27477,6,0,L|320:112,2,51,2|2|0,0:0|0:0|0:0,0:0:0:0:
-432,112,28058,1,2,0:0:0:0:
-333,112,28445,2,0,L|282:112,2,51,0|0|0,0:0|0:0|0:0,0:0:0:0:
-384,112,29025,6,0,L|272:112,1,102,6|0,0:0|0:0,0:0:0:0:
-224,112,29606,2,0,P|160:144|160:240,1,153,2|2,0:0|0:0,0:0:0:0:
-272,272,30574,2,0,L|374:272,1,102
-424,272,31154,2,0,P|414:344|348:378,1,153,0|0,0:0|0:0,0:0:0:0:
-224,304,32122,6,0,P|176:320|144:368,1,102,2|0,0:0|0:0,0:0:0:0:
-200,368,32703,1,2,0:0:0:0:
-376,368,33284,1,0,0:0:0:0:
-304,296,33671,2,0,L|240:296,2,51,2|2|0,0:0|0:0|0:0,0:0:0:0:
-352,296,34251,2,0,P|400:248|384:168,1,153,2|0,0:0|0:0,0:0:0:0:
-280,176,35219,6,0,L|216:80,1,102,2|0,0:0|0:0,0:0:0:0:
-272,104,35800,2,0,L|336:8,1,102,2|0,0:0|0:0,0:0:0:0:
-280,16,36380,1,2,0:0:0:0:
-176,32,36767,6,0,L|112:128,1,102,2|0,0:0|0:0,0:0:0:0:
-168,128,37348,2,0,L|232:224,1,102,2|0,0:0|0:0,0:0:0:0:
-176,224,37928,1,2,0:0:0:0:
-304,264,38316,6,0,L|200:264,1,102,2|0,0:0|0:0,0:0:0:0:
-144,264,38896,1,2,0:0:0:0:
-280,336,39477,2,0,L|336:336,1,51
-424,336,39864,2,0,P|440:304|416:240,1,102,8|0,0:3|0:3,0:3:0:0:
-352,232,40445,1,4,0:1:0:0:
-160,224,41025,1,8,0:3:0:0:
-256,48,41413,6,0,P|302:28|353:31,1,102,6|0,0:0|0:0,0:0:0:0:
-400,40,41993,1,0,0:0:0:0:
-440,80,42187,2,0,P|389:76|342:96,1,102,2|8,0:0|0:0,0:0:0:0:
-248,128,42961,2,0,P|312:176|392:144,2,153,2|2|8,0:0|0:0|0:3,0:0:0:0:
-144,136,44509,6,0,P|80:88|0:120,1,153,2|0,0:0|0:0,0:0:0:0:
-56,136,45284,1,2,0:0:0:0:
-160,144,45671,1,8,0:0:0:0:
-264,144,46058,2,0,L|384:144,1,102,2|0,0:0|0:0,0:0:0:0:
-416,152,46638,2,0,L|264:152,1,153,2|8,0:0|0:3,0:0:0:0:
-360,120,47606,6,0,L|192:120,1,153,2|0,0:0|0:0,0:0:0:0:
-160,128,48380,2,0,P|208:80|256:96,1,102,2|8,0:0|0:0,0:0:0:0:
-144,136,49154,1,2,0:0:0:0:
-248,144,49542,2,0,L|368:144,1,102,0|2,0:0|0:0,0:0:0:0:
-256,192,50316,2,0,L|200:192,1,51,10|0,0:0|0:0,0:0:0:0:
-256,184,50703,6,0,L|360:184,1,102,2|0,0:0|0:0,0:0:0:0:
-400,208,51284,1,0,0:0:0:0:
-352,240,51477,2,0,L|240:240,1,102
-128,336,52251,6,0,P|64:336|0:256,1,153,2|2,0:0|0:0,0:0:0:0:
-88,264,53025,1,2,0:0:0:0:
-168,208,53413,2,0,L|152:144,1,51,8|8,0:0|0:3,0:0:0:0:
-248,120,53800,6,0,P|328:152|392:120,1,153,6|0,0:0|0:0,0:0:0:0:
-432,120,54574,1,2,0:0:0:0:
-328,128,54961,1,8,0:0:0:0:
-224,128,55348,6,0,L|112:144,1,102,2|0,0:0|0:0,0:0:0:0:
-72,152,55929,2,0,L|192:176,1,102,2|0,0:0|0:0,0:0:0:0:
-224,184,56509,1,8,0:3:0:0:
-328,176,56896,6,0,P|376:208|472:192,1,153,2|0,0:0|0:0,0:0:0:0:
-416,208,57671,2,0,L|304:240,1,102,2|8,0:0|0:0,0:0:0:0:
-224,272,58445,5,2,0:0:0:0:
-320,296,58832,1,0,0:0:0:0:
-224,328,59219,1,2,0:0:0:0:
-120,328,59606,1,8,0:3:0:0:
-224,264,59993,6,0,P|224:200|192:152,1,102,6|0,0:0|0:0,0:0:0:0:
-80,184,60767,2,0,P|76:133|97:87,1,102,2|8,0:0|0:0,0:0:0:0:
-200,80,61542,2,0,P|232:112|296:112,1,102,2|0,0:0|0:0,0:0:0:0:
-376,160,62316,2,0,P|344:192|280:192,1,102,2|8,0:0|0:0,0:0:0:0:
-184,240,63090,6,0,L|200:128,1,102,2|8,0:0|0:0,0:0:0:0:
-88,136,63864,2,0,L|8:152,2,76.5,6|2|2,0:0|0:0|0:0,0:0:0:0:
-160,112,64638,1,8,0:0:0:0:
-208,128,64832,1,8,0:0:0:0:
-256,144,65025,1,8,0:0:0:0:
-360,152,65413,6,0,L|424:152,1,51,8|0,0:0|0:0,0:0:0:0:
-462,152,65800,2,0,L|398:152,1,51,8|8,0:0|0:3,0:0:0:0:
-344,144,66187,6,0,L|232:144,1,102,12|8,0:0|0:0,0:0:0:0:
-152,120,66961,2,0,P|148:169|107:196,1,102,8|8,0:0|0:0,0:0:0:0:
-32,264,67735,6,0,L|144:216,1,102,8|8,0:0|0:0,0:0:0:0:
-176,208,68316,1,0,0:0:0:0:
-224,200,68509,2,0,L|317:240,1,102,8|8,0:0|0:0,0:0:0:0:
-216,256,69284,6,0,P|184:304|200:352,1,102,8|8,0:0|0:0,0:0:0:0:
-360,256,70058,2,0,P|368:207|337:167,1,102,8|8,0:0|0:0,0:0:0:0:
-264,80,70832,6,0,L|152:96,1,102,8|8,0:0|0:0,0:0:0:0:
-112,104,71413,2,0,L|11:89,1,102,8|0,0:0|0:0,0:0:0:0:
-40,128,71993,2,0,L|72:176,1,51,8|8,0:0|0:3,0:0:0:0:
-176,216,72380,6,0,P|144:280|64:280,1,153,12|0,0:0|0:0,0:0:0:0:
-120,280,73154,2,0,P|191:299|216:328,1,102,8|8,0:0|0:0,0:0:0:0:
-312,320,73929,6,0,L|424:304,1,102,8|8,0:0|0:0,0:0:0:0:
-336,272,74703,2,0,L|312:216,1,51,8|0,0:0|0:0,0:0:0:0:
-400,200,75090,2,0,L|424:136,1,51,8|0,0:0|0:0,0:0:0:0:
-328,152,75477,6,0,P|280:184|200:136,1,153,12|0,0:0|0:0,0:0:0:0:
-296,136,76251,2,0,P|360:136|408:168,1,102,8|8,0:0|0:0,0:0:0:0:
-152,248,77219,6,0,L|96:248,2,51,0|12|0,0:0|0:0|0:0,0:0:0:0:
-208,248,77800,1,8,0:0:0:0:
-320,256,78187,2,0,L|369:243,1,51,8|8,0:0|0:3,0:0:0:0:
-456,232,78574,6,0,L|408:136,1,102,12|8,0:0|0:0,0:0:0:0:
-288,136,79348,2,0,L|336:40,1,102,8|8,0:0|0:0,0:0:0:0:
-240,80,80122,6,0,P|144:80|128:64,1,102,8|8,0:0|0:0,0:0:0:0:
-96,72,80703,1,0,0:0:0:0:
-40,104,80896,2,0,P|136:104|152:88,1,102,8|8,0:0|0:0,0:0:0:0:
-248,128,81671,6,0,L|296:224,1,102,12|8,0:0|0:0,0:0:0:0:
-208,272,82445,1,10,0:0:0:0:
-312,272,82832,1,8,0:0:0:0:
-400,224,83219,6,0,L|416:160,1,51,8|2,0:0|0:0,0:0:0:0:
-360,56,83606,2,0,L|336:120,1,51,8|0,0:0|0:0,0:0:0:0:
-272,152,83993,2,0,P|192:152|176:136,1,102,0|8,0:0|0:0,0:0:0:0:
-80,160,84767,6,0,L|96:208,1,51,8|0,0:0|0:0,0:0:0:0:
-16,272,85154,2,0,L|16:328,1,51,8|0,0:0|0:0,0:0:0:0:
-104,304,85542,2,0,L|208:304,1,102,2|8,0:0|0:0,0:0:0:0:
-376,336,86316,6,0,L|472:304,1,102,4|0,0:0|0:0,0:0:0:0:
-296,248,87090,2,0,P|312:168|312:136,1,102,2|8,0:0|0:3,0:0:0:0:
-168,96,87864,1,4,0:0:0:0:
-256,192,88251,12,0,89800,0:0:0:0:
@@ -1 +0,0 @@
-{"Mappings":[{"StartTime":265568.0,"Objects":[{"StartTime":265568.0,"Position":486.0,"HyperDash":false},{"StartTime":265658.0,"Position":465.1873,"HyperDash":false},{"StartTime":265749.0,"Position":463.208435,"HyperDash":false},{"StartTime":265840.0,"Position":465.146484,"HyperDash":false},{"StartTime":265967.0,"Position":459.5862,"HyperDash":false}]}]}
@@ -1,238 +0,0 @@
-osu file format v14
-
-[General]
-AudioFilename: audio.mp3
-AudioLeadIn: 0
-PreviewTime: 226943
-Countdown: 0
-SampleSet: Soft
-StackLeniency: 0.7
-Mode: 2
-LetterboxInBreaks: 0
-WidescreenStoryboard: 1
-
-[Editor]
-Bookmarks: 85568,86768,90968,265568
-DistanceSpacing: 0.9
-BeatDivisor: 12
-GridSize: 16
-TimelineZoom: 1
-
-[Metadata]
-Title:Snow
-TitleUnicode:Snow
-Artist:Ricky Montgomery
-ArtistUnicode:Ricky Montgomery
-Creator:Crowley
-Version:Bury Me Six Feet in Snow
-Source:
-Tags:indie the honeysticks alternative english
-BeatmapID:2062131
-BeatmapSetID:971028
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4.2
-OverallDifficulty:8.3
-ApproachRate:8.3
-SliderMultiplier:3.59999990463257
-SliderTickRate:1
-
-[Events]
-//Background and Video events
-0,0,"me.jpg",0,0
-//Break Periods
-//Storyboard Layer 0 (Background)
-//Storyboard Layer 1 (Fail)
-//Storyboard Layer 2 (Pass)
-//Storyboard Layer 3 (Foreground)
-//Storyboard Layer 4 (Overlay)
-//Storyboard Sound Samples
-
-[TimingPoints]
-368,1200,2,2,1,30,1,0
-368,-66.6666666666667,2,2,1,30,0,0
-29168,-58.8235294117647,2,2,1,40,0,0
-30368,-58.8235294117647,2,2,2,40,0,0
-30568,-58.8235294117647,2,2,1,40,0,0
-31368,-58.8235294117647,2,2,2,40,0,0
-31568,-58.8235294117647,2,2,1,40,0,0
-32768,-58.8235294117647,2,2,2,40,0,0
-33568,-58.8235294117647,2,2,2,40,0,0
-33968,-58.8235294117647,2,2,1,40,0,0
-35168,-58.8235294117647,2,2,2,40,0,0
-35968,-58.8235294117647,2,2,1,40,0,0
-36168,-58.8235294117647,2,2,2,40,0,0
-36368,-58.8235294117647,2,2,1,40,0,0
-37568,-58.8235294117647,2,2,2,40,0,0
-37968,-58.8235294117647,2,2,1,40,0,0
-38368,-58.8235294117647,2,2,2,40,0,0
-38768,-58.8235294117647,2,2,1,40,0,0
-39968,-58.8235294117647,2,2,2,40,0,0
-40168,-58.8235294117647,2,2,1,40,0,0
-40968,-58.8235294117647,2,2,2,40,0,0
-41168,-58.8235294117647,2,2,1,40,0,0
-42368,-58.8235294117647,2,2,2,40,0,0
-43168,-58.8235294117647,2,2,2,40,0,0
-43568,-58.8235294117647,2,2,1,40,0,0
-44768,-58.8235294117647,2,2,2,40,0,0
-45768,-58.8235294117647,2,2,2,40,0,0
-45968,-58.8235294117647,2,2,1,50,0,0
-47168,-58.8235294117647,2,2,2,50,0,0
-48368,-62.5,2,2,1,50,0,0
-67568,-58.8235294117647,2,2,1,70,0,1
-84668,-58.8235294117647,2,2,1,5,0,1
-84768,-58.8235294117647,2,2,1,70,0,1
-85068,-58.8235294117647,2,2,1,5,0,1
-85168,-58.8235294117647,2,2,1,70,0,1
-85468,-58.8235294117647,2,2,1,5,0,1
-85568,-58.8235294117647,2,2,1,70,0,1
-86768,-58.8235294117647,2,2,1,30,0,0
-91168,-58.8235294117647,2,2,1,50,0,0
-91568,1200,2,2,1,50,1,0
-91568,-58.8235294117647,2,2,1,50,0,1
-91643,-58.8235294117647,2,2,1,50,0,0
-92768,-58.8235294117647,2,2,2,50,0,0
-92968,-58.8235294117647,2,2,1,50,0,0
-95168,-58.8235294117647,2,2,2,50,0,0
-95368,-58.8235294117647,2,2,1,50,0,0
-97568,-58.8235294117647,2,2,2,50,0,0
-97768,-58.8235294117647,2,2,1,50,0,0
-99968,-58.8235294117647,2,2,2,50,0,0
-100168,-58.8235294117647,2,2,1,50,0,0
-100768,-58.8235294117647,2,2,2,50,0,0
-101168,-58.8235294117647,2,2,1,50,0,0
-102368,-58.8235294117647,2,2,2,50,0,0
-102568,-58.8235294117647,2,2,1,50,0,0
-104768,-58.8235294117647,2,2,2,50,0,0
-104968,-58.8235294117647,2,2,1,50,0,0
-107168,-58.8235294117647,2,2,2,50,0,0
-107368,-58.8235294117647,2,2,1,50,0,0
-108968,-58.8235294117647,2,2,2,50,0,0
-109168,-58.8235294117647,2,2,1,50,0,0
-109568,-58.8235294117647,2,2,2,50,0,0
-109968,-58.8235294117647,2,2,1,50,0,0
-110368,-58.8235294117647,2,2,2,50,0,0
-110768,-100,2,2,1,40,0,0
-127568,-62.5,2,2,2,50,0,0
-127968,-62.5,2,2,1,50,0,0
-128168,-62.5,2,2,2,50,0,0
-129968,-58.8235294117647,2,2,1,50,0,0
-131168,-58.8235294117647,2,2,2,50,0,0
-131368,-58.8235294117647,2,2,1,50,0,0
-133568,-58.8235294117647,2,2,2,50,0,0
-133768,-58.8235294117647,2,2,1,50,0,0
-135968,-58.8235294117647,2,2,2,50,0,0
-136168,-58.8235294117647,2,2,1,50,0,0
-138368,-58.8235294117647,2,2,2,50,0,0
-138568,-58.8235294117647,2,2,1,50,0,0
-139168,-58.8235294117647,2,2,2,50,0,0
-139368,-58.8235294117647,2,2,1,50,0,0
-139568,-58.8235294117647,2,2,1,50,0,0
-140768,-58.8235294117647,2,2,2,50,0,0
-140968,-58.8235294117647,2,2,1,50,0,0
-143168,-58.8235294117647,2,2,2,50,0,0
-143368,-58.8235294117647,2,2,1,50,0,0
-145568,-58.8235294117647,2,2,2,50,0,0
-145768,-58.8235294117647,2,2,1,50,0,0
-147368,-58.8235294117647,2,2,2,50,0,0
-147768,-58.8235294117647,2,2,1,50,0,0
-147968,-58.8235294117647,2,2,1,60,0,0
-148768,-58.8235294117647,2,2,2,60,0,0
-149168,-58.8235294117647,2,2,1,70,0,1
-158268,-58.8235294117647,2,2,2,70,0,1
-158568,-58.8235294117647,2,2,1,70,0,1
-166268,-58.8235294117647,2,2,1,5,0,1
-166368,-58.8235294117647,2,2,1,70,0,1
-166668,-58.8235294117647,2,2,1,5,0,1
-166768,-58.8235294117647,2,2,1,70,0,1
-167068,-58.8235294117647,2,2,1,5,0,1
-167168,-58.8235294117647,2,2,1,70,0,1
-168368,-62.5,2,2,1,50,0,0
-172368,-62.5,2,2,1,50,0,1
-173168,-62.5,2,2,1,50,0,0
-185168,-62.5,2,2,1,60,0,0
-185468,-62.5,2,2,1,5,0,0
-185568,-62.5,2,2,1,60,0,0
-185868,-62.5,2,2,1,5,0,0
-185968,-62.5,2,2,1,60,0,0
-186268,-62.5,2,2,1,5,0,0
-186368,-62.5,2,2,1,60,0,0
-186668,-62.5,2,2,1,5,0,0
-186768,-52.6315789473684,2,2,1,60,0,0
-187068,-62.5,2,2,1,5,0,0
-187168,-62.5,2,2,1,60,0,0
-187468,-62.5,2,2,1,5,0,0
-187568,-62.5,2,2,1,20,0,0
-187768,-62.5,2,2,1,24,0,0
-187968,-62.5,2,2,1,28,0,0
-188168,-62.5,2,2,1,32,0,0
-188368,-62.5,2,2,1,36,0,0
-188568,-62.5,2,2,1,40,0,0
-188768,1200,2,2,1,50,1,1
-188768,-58.8235294117647,2,2,1,50,0,1
-188843,-58.8235294117647,2,2,1,50,0,0
-189968,-58.8235294117647,2,2,2,50,0,0
-190168,-58.8235294117647,2,2,1,50,0,0
-192368,-58.8235294117647,2,2,2,50,0,0
-192568,-58.8235294117647,2,2,1,50,0,0
-194768,-58.8235294117647,2,2,2,50,0,0
-194968,-58.8235294117647,2,2,1,50,0,0
-196568,-58.8235294117647,2,2,2,50,0,0
-196768,-58.8235294117647,2,2,1,50,0,0
-197168,-58.8235294117647,2,2,2,50,0,0
-197368,-58.8235294117647,2,2,1,50,0,0
-197568,-58.8235294117647,2,2,2,50,0,0
-197968,-58.8235294117647,2,2,1,50,0,0
-198368,-58.8235294117647,2,2,1,50,0,0
-199568,-58.8235294117647,2,2,2,50,0,0
-199768,-58.8235294117647,2,2,1,50,0,0
-201968,-58.8235294117647,2,2,2,50,0,0
-202168,-58.8235294117647,2,2,1,50,0,0
-204368,-58.8235294117647,2,2,2,50,0,0
-204568,-58.8235294117647,2,2,1,50,0,0
-206768,-58.8235294117647,2,2,1,60,0,0
-207168,-58.8235294117647,2,2,2,60,0,0
-207968,-58.8235294117647,2,2,1,70,0,1
-216968,-58.8235294117647,2,2,2,70,0,1
-217168,-58.8235294117647,2,2,1,70,0,1
-217368,-58.8235294117647,2,2,2,70,0,1
-217568,-58.8235294117647,2,2,1,70,0,1
-225068,-58.8235294117647,2,2,1,5,0,1
-225168,-58.8235294117647,2,2,1,70,0,1
-225468,-58.8235294117647,2,2,1,5,0,1
-225568,-58.8235294117647,2,2,1,70,0,1
-225868,-58.8235294117647,2,2,1,5,0,1
-225968,-58.8235294117647,2,2,1,70,0,1
-227168,-58.8235294117647,2,2,1,30,0,0
-234368,-58.8235294117647,2,2,1,40,0,0
-236768,-58.8235294117647,2,2,1,70,0,1
-255968,-58.8235294117647,2,2,1,70,0,1
-261168,-58.8235294117647,2,2,1,70,0,1
-263068,-58.8235294117647,2,2,1,70,0,0
-263168,-58.8235294117647,2,2,1,60,0,1
-263243,-58.8235294117647,2,2,1,60,0,0
-264368,-58.8235294117647,2,2,1,60,0,1
-264443,-58.8235294117647,2,2,1,60,0,0
-265568,-444.444444444444,2,2,1,50,0,1
-265643,-444.444444444444,2,2,1,50,0,0
-266768,-444.444444444444,2,2,1,40,0,0
-267968,-444.444444444444,2,2,1,30,0,0
-269168,-444.444444444444,2,2,1,20,0,0
-270368,-444.444444444444,2,2,1,10,0,0
-271168,-444.444444444444,2,2,1,9,0,0
-271568,-444.444444444444,2,2,1,8,0,0
-271968,-444.444444444444,2,2,1,7,0,0
-272368,-444.444444444444,2,2,1,6,0,0
-272768,-444.444444444444,2,2,1,5,0,0
-275168,-444.444444444444,2,2,1,5,0,0
-
-
-[Colours]
-Combo1 : 255,128,128
-Combo2 : 72,72,255
-Combo3 : 192,192,192
-Combo4 : 255,136,79
-
-[HitObjects]
-486,179,265568,6,0,P|461:174|454:174,1,26.999997997284,6|0,1:2|0:0,0:0:0:0:
@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Skinning;
@@ -18,17 +19,20 @@ namespace osu.Game.Rulesets.Catch.Tests
        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();

        [Test]
-        public void TestLegacyHUDComboCounterNotExistent([Values] bool withModifiedSkin)
+        public void TestLegacyHUDComboCounterHidden([Values] bool withModifiedSkin)
        {
            if (withModifiedSkin)
            {
                AddStep("change component scale", () => Player.ChildrenOfType<LegacyScoreCounter>().First().Scale = new Vector2(2f));
-                AddStep("update target", () => Player.ChildrenOfType<SkinnableContainer>().ForEach(LegacySkin.UpdateDrawableTarget));
+                AddStep("update target", () => Player.ChildrenOfType<SkinComponentsContainer>().ForEach(LegacySkin.UpdateDrawableTarget));
                AddStep("exit player", () => Player.Exit());
                CreateTest();
            }

-            AddAssert("legacy HUD combo counter not added", () => !Player.ChildrenOfType<LegacyDefaultComboCounter>().Any());
+            AddAssert("legacy HUD combo counter hidden", () =>
+            {
+                return Player.ChildrenOfType<LegacyComboCounter>().All(c => c.ChildrenOfType<Container>().Single().Alpha == 0f);
+            });
        }
    }
 }
@@ -1,36 +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.Rulesets.Catch.Beatmaps;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Scoring;
-using osu.Game.Tests.Visual;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    public partial class TestSceneCatchReplayHandling : OsuManualInputManagerTestScene
-    {
-        [Test]
-        public void TestReplayDetach()
-        {
-            DrawableCatchRuleset drawableRuleset = null!;
-            float catcherPosition = 0;
-
-            AddStep("create drawable ruleset", () => Child = drawableRuleset = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), []));
-            AddStep("attach replay", () => drawableRuleset.SetReplayScore(new Score()));
-            AddStep("store catcher position", () => catcherPosition = drawableRuleset.ChildrenOfType<Catcher>().Single().X);
-            AddStep("hold down left", () => InputManager.PressKey(Key.Left));
-            AddAssert("catcher didn't move", () => drawableRuleset.ChildrenOfType<Catcher>().Single().X, () => Is.EqualTo(catcherPosition));
-            AddStep("release left", () => InputManager.ReleaseKey(Key.Left));
-
-            AddStep("detach replay", () => drawableRuleset.SetReplayScore(null));
-            AddStep("hold down left", () => InputManager.PressKey(Key.Left));
-            AddUntilStep("catcher moved", () => drawableRuleset.ChildrenOfType<Catcher>().Single().X, () => Is.Not.EqualTo(catcherPosition));
-            AddStep("release left", () => InputManager.ReleaseKey(Key.Left));
-        }
-    }
-}
@@ -248,8 +248,7 @@ namespace osu.Game.Rulesets.Catch.Tests
        {
            AddStep("enable hit lighting", () => config.SetValue(OsuSetting.HitLighting, true));
            AddStep("catch fruit", () => attemptCatch(new Fruit()));
-            AddAssert("correct hit lighting colour",
-                () => catcher.ChildrenOfType<HitExplosion>().First()?.Entry?.ObjectColour == this.ChildrenOfType<DrawableCatchHitObject>().First().AccentColour.Value);
+            AddAssert("correct hit lighting colour", () => catcher.ChildrenOfType<HitExplosion>().First()?.Entry?.ObjectColour == this.ChildrenOfType<DrawableCatchHitObject>().First().AccentColour.Value);
        }

        [Test]
@@ -260,16 +259,6 @@ namespace osu.Game.Rulesets.Catch.Tests
            AddAssert("no hit lighting", () => !catcher.ChildrenOfType<HitExplosion>().Any());
        }

-        [Test]
-        public void TestAllExplodedObjectsAtUniquePositions()
-        {
-            AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
-            AddStep("catch normal fruit", () => attemptCatch(new Fruit { IndexInBeatmap = 2, LastInCombo = true }));
-            AddAssert("two fruit at distinct x coordinates",
-                () => this.ChildrenOfType<CaughtFruit>().Select(f => f.DrawPosition.X).Distinct(),
-                () => Has.Exactly(2).Items);
-        }
-
        private void checkPlate(int count) => AddAssert($"{count} objects on the plate", () => catcher.CaughtObjects.Count() == count);

        private void checkState(CatcherAnimationState state) => AddAssert($"catcher state is {state}", () => catcher.CurrentState == state);
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.TestProject.props" />
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <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>
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                        LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
                        // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
                        // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
-                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(obj.StartTime).SliderVelocity : 1,
+                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1 : ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(obj.StartTime).SliderVelocity,
                        SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                    }.Yield();

@@ -118,11 +118,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
            float offsetPosition = hitObject.OriginalX;
            double startTime = hitObject.StartTime;

-            if (lastPosition == null ||
-                // some objects can get assigned position zero, making stable incorrectly go inside this if branch on the next object. to maintain behaviour and compatibility, do the same here.
-                // reference: https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameplayElements/HitObjects/Fruits/HitFactoryFruits.cs#L45-L50
-                // todo: should be revisited and corrected later probably.
-                lastPosition == 0)
+            if (lastPosition == null)
            {
                lastPosition = offsetPosition;
                lastStartTime = startTime;
@@ -3,8 +3,8 @@

 using System;
 using System.Collections.Generic;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
@@ -29,10 +29,8 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
-using osuTK;

 namespace osu.Game.Rulesets.Catch
 {
@@ -64,43 +62,43 @@ namespace osu.Game.Rulesets.Catch

        public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
        {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                yield return new CatchModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                yield return new CatchModDoubleTime();

-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                yield return new CatchModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                yield return new CatchModSuddenDeath();

-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                yield return new CatchModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                yield return new CatchModAutoplay();

-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                yield return new CatchModEasy();

-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                yield return new CatchModFlashlight();

-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                yield return new CatchModHalfTime();

-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                yield return new CatchModHardRock();

-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                yield return new CatchModHidden();

-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                yield return new CatchModNoFail();

-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                yield return new CatchModRelax();

-            if (mods.HasFlag(LegacyMods.ScoreV2))
+            if (mods.HasFlagFast(LegacyMods.ScoreV2))
                yield return new ModScoreV2();
        }

@@ -225,30 +223,6 @@ namespace osu.Game.Rulesets.Catch

        public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);

-        public override IEnumerable<Drawable> CreateEditorSetupSections() =>
-        [
-            new MetadataSection(),
-            new DifficultySection(),
-            new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(SetupScreen.SPACING),
-                Children = new Drawable[]
-                {
-                    new ResourcesSection
-                    {
-                        RelativeSizeAxes = Axes.X,
-                    },
-                    new ColoursSection
-                    {
-                        RelativeSizeAxes = Axes.X,
-                    }
-                }
-            },
-            new DesignSection(),
-        ];
-
        public override IBeatmapVerifier CreateBeatmapVerifier() => new CatchBeatmapVerifier();

        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
@@ -274,7 +248,5 @@ namespace osu.Game.Rulesets.Catch

            return adjustedDifficulty;
        }
-
-        public override bool EditorShowScrollSpeed => false;
    }
 }
@@ -5,11 +5,15 @@ using osu.Game.Skinning;

 namespace osu.Game.Rulesets.Catch
 {
-    public class CatchSkinComponentLookup : SkinComponentLookup<CatchSkinComponents>
+    public class CatchSkinComponentLookup : GameplaySkinComponentLookup<CatchSkinComponents>
    {
        public CatchSkinComponentLookup(CatchSkinComponents component)
            : base(component)
        {
        }
+
+        protected override string RulesetPrefix => "catch"; // todo: use CatchRuleset.SHORT_NAME;
+
+        protected override string ComponentName => Component.ToString().ToLowerInvariant();
    }
 }
@@ -3,6 +3,7 @@

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
@@ -19,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
    public class CatchDifficultyCalculator : DifficultyCalculator
    {
-        private const double difficulty_multiplier = 4.59;
+        private const double star_scaling_factor = 0.153;

        private float halfCatcherWidth;

@@ -40,10 +41,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty

            CatchDifficultyAttributes attributes = new CatchDifficultyAttributes
            {
-                StarRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier,
+                StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
                Mods = mods,
                ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
-                MaxCombo = beatmap.GetMaxCombo(),
+                MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
            };

            return attributes;
@@ -2,21 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Scoring.Legacy;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
    public class CatchPerformanceCalculator : PerformanceCalculator
    {
-        private int num300;
-        private int num100;
-        private int num50;
-        private int numKatu;
-        private int numMiss;
+        private int fruitsHit;
+        private int ticksHit;
+        private int tinyTicksHit;
+        private int tinyTicksMissed;
+        private int misses;

        public CatchPerformanceCalculator()
            : base(new CatchRuleset())
@@ -27,11 +28,11 @@ namespace osu.Game.Rulesets.Catch.Difficulty
        {
            var catchAttributes = (CatchDifficultyAttributes)attributes;

-            num300 = score.GetCount300() ?? 0; // HitResult.Great
-            num100 = score.GetCount100() ?? 0; // HitResult.LargeTickHit
-            num50 = score.GetCount50() ?? 0; // HitResult.SmallTickHit
-            numKatu = score.GetCountKatu() ?? 0; // HitResult.SmallTickMiss
-            numMiss = score.GetCountMiss() ?? 0; // HitResult.Miss PLUS HitResult.LargeTickMiss
+            fruitsHit = score.Statistics.GetValueOrDefault(HitResult.Great);
+            ticksHit = score.Statistics.GetValueOrDefault(HitResult.LargeTickHit);
+            tinyTicksHit = score.Statistics.GetValueOrDefault(HitResult.SmallTickHit);
+            tinyTicksMissed = score.Statistics.GetValueOrDefault(HitResult.SmallTickMiss);
+            misses = score.Statistics.GetValueOrDefault(HitResult.Miss);

            // We are heavily relying on aim in catch the beat
            double value = Math.Pow(5.0 * Math.Max(1.0, catchAttributes.StarRating / 0.0049) - 4.0, 2.0) / 100000.0;
@@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                (numTotalHits > 2500 ? Math.Log10(numTotalHits / 2500.0) * 0.475 : 0.0);
            value *= lengthBonus;

-            value *= Math.Pow(0.97, numMiss);
+            value *= Math.Pow(0.97, misses);

            // Combo scaling
            if (catchAttributes.MaxCombo > 0)
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
            value *= Math.Pow(accuracy(), 5.5);

            if (score.Mods.Any(m => m is ModNoFail))
-                value *= Math.Max(0.90, 1.0 - 0.02 * numMiss);
+                value *= 0.90;

            return new CatchPerformanceAttributes
            {
@@ -85,8 +86,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
        }

        private double accuracy() => totalHits() == 0 ? 0 : Math.Clamp((double)totalSuccessfulHits() / totalHits(), 0, 1);
-        private int totalHits() => num50 + num100 + num300 + numMiss + numKatu;
-        private int totalSuccessfulHits() => num50 + num100 + num300;
-        private int totalComboHits() => numMiss + num100 + num300;
+        private int totalHits() => tinyTicksHit + ticksHit + fruitsHit + misses + tinyTicksMissed;
+        private int totalSuccessfulHits() => tinyTicksHit + ticksHit + fruitsHit;
+        private int totalComboHits() => misses + ticksHit + fruitsHit;
    }
 }
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
        private const float normalized_hitobject_radius = 41.0f;
        private const double direction_change_bonus = 21.0;

-        protected override double SkillMultiplier => 1;
+        protected override double SkillMultiplier => 900;
        protected override double StrainDecayBase => 0.2;

        protected override double DecayWeight => 0.94;
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit.Tools;

 namespace osu.Game.Rulesets.Catch.Edit
 {
-    public class BananaShowerCompositionTool : CompositionTool
+    public class BananaShowerCompositionTool : HitObjectCompositionTool
    {
        public BananaShowerCompositionTool()
            : base(nameof(BananaShower))
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.Catch.Edit

        public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners);

-        public override HitObjectPlacementBlueprint CreatePlacementBlueprint() => new BananaShowerPlacementBlueprint();
+        public override PlacementBlueprint CreatePlacementBlueprint() => new BananaShowerPlacementBlueprint();
    }
 }
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public partial class CatchPlacementBlueprint<THitObject> : HitObjectPlacementBlueprint
+    public partial class CatchPlacementBlueprint<THitObject> : PlacementBlueprint
        where THitObject : CatchHitObject, new()
    {
        protected new THitObject HitObject => (THitObject)base.HitObject;
@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Edit;
 using osuTK;

 namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
@@ -43,9 +42,6 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
        [Resolved]
        private IBeatSnapProvider? beatSnapProvider { get; set; }

-        [Resolved]
-        protected EditorBeatmap? EditorBeatmap { get; private set; }
-
        protected EditablePath(Func<float, double> positionToTime)
        {
            PositionToTime = positionToTime;
@@ -107,23 +103,15 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
            //
            // The value is clamped here by the bindable min and max values.
            // In case the required velocity is too large, the path is not preserved.
-            double previousVelocity = svBindable.Value;
            svBindable.Value = Math.Ceiling(requiredVelocity / svToVelocityFactor);

-            // adjust velocity locally, so that once the SV change is applied by applying defaults
-            // (triggered by `EditorBeatmap.Update()` call at end of method),
-            // it results in the outcome desired by the user.
-            double relativeChange = svBindable.Value / previousVelocity;
-            double localVelocity = hitObject.Velocity * relativeChange;
-            path.ConvertToSliderPath(hitObject.Path, hitObject.LegacyConvertedY, localVelocity);
+            path.ConvertToSliderPath(hitObject.Path, hitObject.LegacyConvertedY, hitObject.Velocity);

            if (beatSnapProvider == null) return;

            double endTime = hitObject.StartTime + path.Duration;
            double snappedEndTime = beatSnapProvider.SnapTime(endTime, hitObject.StartTime);
-            hitObject.Path.ExpectedDistance.Value = (snappedEndTime - hitObject.StartTime) * localVelocity;
-
-            EditorBeatmap?.Update(hitObject);
+            hitObject.Path.ExpectedDistance.Value = (snappedEndTime - hitObject.StartTime) * hitObject.Velocity;
        }

        public Vector2 ToRelativePosition(Vector2 screenSpacePosition)
@@ -4,11 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Screens.Edit;
 using osuTK;
 using osuTK.Input;

@@ -18,27 +19,22 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
    {
        public MenuItem[] ContextMenuItems => getContextMenuItems().ToArray();

-        private readonly JuiceStream juiceStream;
-
        // To handle when the editor is scrolled while dragging.
        private Vector2 dragStartPosition;

-        public SelectionEditablePath(JuiceStream juiceStream, Func<float, double> positionToTime)
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
+
+        public SelectionEditablePath(Func<float, double> positionToTime)
            : base(positionToTime)
        {
-            this.juiceStream = juiceStream;
        }

        public void AddVertex(Vector2 relativePosition)
        {
-            EditorBeatmap?.BeginChange();
-
            double time = Math.Max(0, PositionToTime(relativePosition.Y));
            int index = AddVertex(time, relativePosition.X);
-            UpdateHitObjectFromPath(juiceStream);
            selectOnly(index);
-
-            EditorBeatmap?.EndChange();
        }

        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => InternalChildren.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
@@ -49,13 +45,9 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
            if (index == -1 || VertexStates[index].IsFixed)
                return false;

-            if (e.Button == MouseButton.Right && e.ShiftPressed)
+            if (e.Button == MouseButton.Left && e.ShiftPressed)
            {
-                EditorBeatmap?.BeginChange();
                RemoveVertex(index);
-                UpdateHitObjectFromPath(juiceStream);
-                EditorBeatmap?.EndChange();
-
                return true;
            }

@@ -82,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
            for (int i = 0; i < VertexCount; i++)
                VertexStates[i].VertexBeforeChange = Vertices[i];

-            EditorBeatmap?.BeginChange();
+            changeHandler?.BeginChange();
            return true;
        }

@@ -96,7 +88,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components

        protected override void OnDragEnd(DragEndEvent e)
        {
-            EditorBeatmap?.EndChange();
+            changeHandler?.EndChange();
        }

        private int getMouseTargetVertex(Vector2 screenSpacePosition)
@@ -126,17 +118,11 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components

        private void deleteSelectedVertices()
        {
-            EditorBeatmap?.BeginChange();
-
            for (int i = VertexCount - 1; i >= 0; i--)
            {
                if (VertexStates[i].IsSelected)
                    RemoveVertex(i);
            }
-
-            UpdateHitObjectFromPath(juiceStream);
-
-            EditorBeatmap?.EndChange();
        }
    }
 }
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osuTK;

@@ -13,8 +12,6 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
 {
    public partial class VertexPiece : Circle
    {
-        private VertexState state = new VertexState();
-
        [Resolved]
        private OsuColour osuColour { get; set; } = null!;

@@ -27,32 +24,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components

        public void UpdateFrom(VertexState state)
        {
-            this.state = state;
-            updateMarkerDisplay();
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            updateMarkerDisplay();
-            return false;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateMarkerDisplay();
-        }
-
-        /// <summary>
-        /// Updates the state of the circular control point marker.
-        /// </summary>
-        private void updateMarkerDisplay()
-        {
-            var colour = osuColour.Yellow;
-
-            if (IsHovered || state.IsSelected)
-                colour = colour.Lighten(1);
-
-            Colour = colour;
+            Colour = state.IsSelected ? osuColour.Yellow.Lighten(1) : osuColour.Yellow;
            Alpha = state.IsFixed ? 0.5f : 1;
        }
    }
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
        {
            base.LoadComplete();

-            inputManager = GetContainingInputManager()!;
+            inputManager = GetContainingInputManager();

            BeginPlacement();
        }
@@ -8,7 +8,6 @@ using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
@@ -61,7 +60,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
            {
                scrollingPath = new ScrollingPath(),
                nestedOutlineContainer = new NestedOutlineContainer(),
-                editablePath = new SelectionEditablePath(hitObject, positionToTime)
+                editablePath = new SelectionEditablePath(positionToTime)
            };
        }

@@ -173,10 +172,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
            yield return new OsuMenuItem("Add vertex", MenuItemType.Standard, () =>
            {
                editablePath.AddVertex(rightMouseDownPosition);
-            })
-            {
-                Hotkey = new Hotkey(new KeyCombination(InputKey.Control, InputKey.MouseLeft))
-            };
+            });
        }

        protected override void Dispose(bool isDisposing)
@@ -13,8 +13,7 @@ namespace osu.Game.Rulesets.Catch.Edit
    {
        private readonly List<ICheck> checks = new List<ICheck>
        {
-            new CheckBananaShowerGap(),
-            new CheckCatchAbnormalDifficultySettings(),
+            new CheckBananaShowerGap()
        };

        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
@@ -18,9 +18,7 @@ namespace osu.Game.Rulesets.Catch.Edit
            // The implementation below is probably correct but should be checked if/when exposed via controls.

            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
-
-            float previousEndX = (before as JuiceStream)?.EndX ?? ((CatchHitObject)before).EffectiveX;
-            float actualDistance = Math.Abs(previousEndX - ((CatchHitObject)after).EffectiveX);
+            float actualDistance = Math.Abs(((CatchHitObject)before).EffectiveX - ((CatchHitObject)after).EffectiveX);

            return actualDistance / expectedDistance;
        }
@@ -8,6 +8,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 {
    public partial class CatchEditorPlayfield : CatchPlayfield
    {
+        // TODO fixme: the size of the catcher is not changed when circle size is changed in setup screen.
        public CatchEditorPlayfield(IBeatmapDifficultyInfo difficulty)
            : base(difficulty)
        {
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
@@ -84,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Edit

        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();

-        protected override IReadOnlyList<CompositionTool> CompositionTools => new CompositionTool[]
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
        {
            new FruitCompositionTool(),
            new JuiceStreamCompositionTool(),
@@ -114,33 +115,13 @@ namespace osu.Game.Rulesets.Catch.Edit
        {
        }

-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat)
-                return false;
-
-            handleToggleViaKey(e);
-            return base.OnKeyDown(e);
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            handleToggleViaKey(e);
-            base.OnKeyUp(e);
-        }
-
-        private void handleToggleViaKey(KeyboardEvent key)
-        {
-            DistanceSnapProvider.HandleToggleViaKey(key);
-        }
-
        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
        {
            var result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);

            result.ScreenSpacePosition.X = screenSpacePosition.X;

-            if (snapType.HasFlag(SnapType.RelativeGrids))
+            if (snapType.HasFlagFast(SnapType.RelativeGrids))
            {
                if (distanceSnapGrid.IsPresent && distanceSnapGrid.GetSnappedPosition(result.ScreenSpacePosition) is SnapResult snapResult &&
                    Vector2.Distance(snapResult.ScreenSpacePosition, result.ScreenSpacePosition) < distance_snap_radius)
@@ -76,38 +76,21 @@ namespace osu.Game.Rulesets.Catch.Edit

        public override bool HandleReverse()
        {
-            var hitObjects = EditorBeatmap.SelectedHitObjects
-                                          .OfType<CatchHitObject>()
-                                          .OrderBy(obj => obj.StartTime)
-                                          .ToList();
-
            double selectionStartTime = SelectedItems.Min(h => h.StartTime);
            double selectionEndTime = SelectedItems.Max(h => h.GetEndTime());

-            // the expectation is that even if the objects themselves are reversed temporally,
-            // the position of new combos in the selection should remain the same.
-            // preserve it for later before doing the reversal.
-            var newComboOrder = hitObjects.Select(obj => obj.NewCombo).ToList();
-
-            foreach (var h in hitObjects)
+            EditorBeatmap.PerformOnSelection(hitObject =>
            {
-                h.StartTime = selectionEndTime - (h.GetEndTime() - selectionStartTime);
+                hitObject.StartTime = selectionEndTime - (hitObject.GetEndTime() - selectionStartTime);

-                if (h is JuiceStream juiceStream)
+                if (hitObject is JuiceStream juiceStream)
                {
                    juiceStream.Path.Reverse(out Vector2 positionalOffset);
                    juiceStream.OriginalX += positionalOffset.X;
                    juiceStream.LegacyConvertedY += positionalOffset.Y;
                    EditorBeatmap.Update(juiceStream);
                }
-            }
-
-            // re-order objects by start time again after reversing, and restore new combo flag positioning
-            hitObjects = hitObjects.OrderBy(obj => obj.StartTime).ToList();
-
-            for (int i = 0; i < hitObjects.Count; ++i)
-                hitObjects[i].NewCombo = newComboOrder[i];
-
+            });
            return true;
        }

@@ -1,39 +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 osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Checks;
-using osu.Game.Rulesets.Edit.Checks.Components;
-
-namespace osu.Game.Rulesets.Catch.Edit.Checks
-{
-    public class CheckCatchAbnormalDifficultySettings : CheckAbnormalDifficultySettings
-    {
-        public override CheckMetadata Metadata => new CheckMetadata(CheckCategory.Settings, "Checks catch relevant settings");
-
-        public override IEnumerable<Issue> Run(BeatmapVerifierContext context)
-        {
-            var diff = context.Beatmap.Difficulty;
-            Issue? issue;
-
-            if (HasMoreThanOneDecimalPlace("Approach rate", diff.ApproachRate, out issue))
-                yield return issue;
-
-            if (OutOfRange("Approach rate", diff.ApproachRate, out issue))
-                yield return issue;
-
-            if (HasMoreThanOneDecimalPlace("Circle size", diff.CircleSize, out issue))
-                yield return issue;
-
-            if (OutOfRange("Circle size", diff.CircleSize, out issue))
-                yield return issue;
-
-            if (HasMoreThanOneDecimalPlace("Drain rate", diff.DrainRate, out issue))
-                yield return issue;
-
-            if (OutOfRange("Drain rate", diff.DrainRate, out issue))
-                yield return issue;
-        }
-    }
-}
@@ -2,22 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.

 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Edit;

 namespace osu.Game.Rulesets.Catch.Edit
 {
    public partial class DrawableCatchEditorRuleset : DrawableCatchRuleset
    {
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; } = null!;
-
        public readonly BindableDouble TimeRangeMultiplier = new BindableDouble(1);

        public DrawableCatchEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods = null)
@@ -34,30 +28,6 @@ namespace osu.Game.Rulesets.Catch.Edit
            TimeRange.Value = gamePlayTimeRange * TimeRangeMultiplier.Value * playfieldStretch;
        }

-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            editorBeatmap.BeatmapReprocessed += onBeatmapReprocessed;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (editorBeatmap.IsNotNull())
-                editorBeatmap.BeatmapReprocessed -= onBeatmapReprocessed;
-        }
-
-        private void onBeatmapReprocessed()
-        {
-            if (Playfield is CatchEditorPlayfield catchPlayfield)
-            {
-                catchPlayfield.Catcher.ApplyDifficulty(editorBeatmap.Difficulty);
-                catchPlayfield.CatcherArea.CatcherTrails.UpdateCatcherTrailsScale(catchPlayfield.Catcher.BodyScale);
-            }
-        }
-
        protected override Playfield CreatePlayfield() => new CatchEditorPlayfield(Beatmap.Difficulty);

        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchEditorPlayfieldAdjustmentContainer();
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`{"Mappings":[{"StartTime":265568.0,"Objects":[{"StartTime":265568.0,"Position":486.0,"HyperDash":false},{"StartTime":265658.0,"Position":465.1873,"HyperDash":false},{"StartTime":265749.0,"Position":463.208435,"HyperDash":false},{"StartTime":265840.0,"Position":465.146484,"HyperDash":false},{"StartTime":265967.0,"Position":459.5862,"HyperDash":false}]}]}`