Fix tablet settings adjusting with too much precision

Closes https://github.com/ppy/osu/issues/32920. I don't know if there's going to be other cases of breakage, but from what I can tell these settings *not* showing infinite precision representations was a bug with the previous implementation of number formatting.
Fix slider tooltip text not updating with current value
2026-05-14 04:22:34 +08:00 · 2025-04-24 15:24:39 +09:00 · 2025-04-24 15:07:57 +09:00 · 2025-04-24 15:07:49 +09:00 · 2025-04-24 15:07:38 +09:00 · 2025-04-24 15:07:26 +09:00
1964 changed files with 33023 additions and 97489 deletions
@@ -21,7 +21,7 @@
      ]
    },
    "ppy.localisationanalyser.tools": {
-      "version": "2025.1208.0",
+      "version": "2024.802.0",
      "commands": [
        "localisation"
      ]
@@ -19,11 +19,6 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true

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

@@ -36,7 +36,7 @@ jobs:
  generator:
    name: Run
    runs-on: self-hosted
-    timeout-minutes: 1440
+    timeout-minutes: 720

    outputs:
      target: ${{ steps.run.outputs.target }}
@@ -131,7 +131,7 @@ jobs:

  build-only-ios:
    name: Build only (iOS)
-    runs-on: macos-15
+    runs-on: macos-latest
    timeout-minutes: 60
    steps:
      - name: Checkout
@@ -143,12 +143,7 @@ jobs:
          dotnet-version: "8.0.x"

      - name: Install .NET Workloads
-        run: dotnet workload install ios
-
-      # https://github.com/dotnet/macios/issues/19157
-      # https://github.com/actions/runner-images/issues/12758
-      - name: Use Xcode 16.4
-        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
+        run: dotnet workload install ios --from-rollback-file https://raw.githubusercontent.com/ppy/osu-framework/refs/heads/master/workloads.json

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

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

    - name: Create pull request with changes
@@ -55,7 +55,9 @@ When in doubt, it's probably best to start with a discussion first. We will esca

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

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

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

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

 - Please submit the pull request from a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) (not `master`), and keep the *Allow edits from maintainers* check box selected, so that we can push fixes to your PR if necessary.
- Please pick the following target branch for your pull request:
-    - `pp-dev`, if the change impacts star rating or performance points calculations for any of the rulesets,
-    - `master`, otherwise.
 - Please avoid pushing untested or incomplete code.
 - Please do not force-push or rebase unless we ask you to.
 - Please do not merge `master` continually if there are no conflicts to resolve. We will do this for you when the change is ready for merge.
@@ -21,7 +21,3 @@ M:Humanizer.InflectorExtensions.Kebaberize(System.String);Humanizer's .Kebaberiz
 M:osuTK.MathHelper.Clamp(System.Int32,System.Int32,System.Int32)~System.Int32;Use Math.Clamp() instead.
 M:osuTK.MathHelper.Clamp(System.Single,System.Single,System.Single)~System.Single;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.
 M:osuTK.MathHelper.Clamp(System.Double,System.Double,System.Double)~System.Double;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.
-M:TagLib.File.Create(System.String);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(TagLib.File.IFileAbstraction);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(System.String,TagLib.ReadStyle);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
-M:TagLib.File.Create(TagLib.File.IFileAbstraction,TagLib.ReadStyle);TagLib's MIME type detection changes behaviour depending on CultureInfo.CurrentCulture. Use TagLibUtils.GetTagLibFile() instead.
@@ -3,10 +3,6 @@
  <PropertyGroup Label="C#">
    <LangVersion>12.0</LangVersion>
    <Nullable>enable</Nullable>
-    <!-- Stabilises hot reload, see: https://platform.uno/docs/articles/studio/Hot%20Reload/hot-reload-overview.html?tabs=vswin%2Cwindows%2Cskia-desktop%2Ccommon-issues -->
-    <GenerateAssemblyInfo Condition="'$(Configuration)'=='Debug'">false</GenerateAssemblyInfo>
-    <!-- Required due to the above  -->
-    <NoWarn Condition="'$(Configuration)'=='Debug'">$(NoWarn);CA1416</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationManifest>$(MSBuildThisFileDirectory)app.manifest</ApplicationManifest>
@@ -50,7 +46,7 @@
    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
    <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2025 ppy Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2024 ppy Pty Ltd</Copyright>
    <PackageTags>osu game</PackageTags>
  </PropertyGroup>
 </Project>
@@ -1,4 +1,4 @@
-Copyright (c) 2025 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2024 ppy Pty Ltd <contact@ppy.sh>.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10,8 +10,8 @@
    </PropertyGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.EmptyFreeform
        {
        }

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

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

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

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

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

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

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

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

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

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

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

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

 namespace osu.Game.Rulesets.EmptyScrolling.Replays
@@ -16,8 +15,5 @@ namespace osu.Game.Rulesets.EmptyScrolling.Replays
            if (button.HasValue)
                Actions.Add(button.Value);
        }
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is EmptyScrollingReplayFrame scrollingFrame && Time == scrollingFrame.Time && Actions.SequenceEqual(scrollingFrame.Actions);
    }
 }
@@ -10,8 +10,8 @@
  </PropertyGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Pippidon
        {
        }

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

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

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

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

 namespace osu.Game.Rulesets.Pippidon.Replays
@@ -16,8 +15,5 @@ namespace osu.Game.Rulesets.Pippidon.Replays
            if (button.HasValue)
                Actions.Add(button.Value);
        }
-
-        public override bool IsEquivalentTo(ReplayFrame other)
-            => other is PippidonReplayFrame pippidonFrame && Time == pippidonFrame.Time && Actions.SequenceEqual(pippidonFrame.Actions);
    }
 }
@@ -8,7 +8,7 @@
    <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
-    <copyright>Copyright (c) 2025 ppy Pty Ltd</copyright>
+    <copyright>Copyright (c) 2024 ppy Pty Ltd</copyright>
    <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>
    <PackageTags>dotnet-new;templates;osu</PackageTags>
    <TargetFramework>netstandard2.1</TargetFramework>
@@ -0,0 +1,32 @@
+clone_depth: 1
+version: '{branch}-{build}'
+image: Visual Studio 2022
+cache:
+  - '%LOCALAPPDATA%\NuGet\v3-cache -> appveyor.yml'
+
+dotnet_csproj:
+  patch: true
+  file: 'osu.Game\osu.Game.csproj' # Use wildcard when it's able to exclude Xamarin projects
+  version: '0.0.{build}'
+
+before_build:
+  - cmd: dotnet --info # Useful when version mismatch between CI and local
+  - cmd: dotnet workload install maui-android # Change to `dotnet workload restore` once there's no old projects
+  - cmd: dotnet workload install maui-ios # Change to `dotnet workload restore` once there's no old projects
+  - cmd: nuget restore -verbosity quiet # Only nuget.exe knows both new (.NET Core) and old (Xamarin) projects
+
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+  publish_nuget: true
+
+after_build:
+  - ps: .\InspectCode.ps1
+
+test:
+  assemblies:
+    except:
+      - '**\*Android*'
+      - '**\*iOS*'
+      - 'build\**\*'
@@ -0,0 +1,86 @@
+clone_depth: 1
+version: '{build}'
+image: Visual Studio 2022
+test: off
+skip_non_tags: true
+configuration: Release
+
+environment:
+  matrix:
+    - job_name: osu-game
+    - job_name: osu-ruleset
+      job_depends_on: osu-game
+    - job_name: taiko-ruleset
+      job_depends_on: osu-game
+    - job_name: catch-ruleset
+      job_depends_on: osu-game
+    - job_name: mania-ruleset
+      job_depends_on: osu-game
+    - job_name: templates
+      job_depends_on: osu-game
+
+nuget:
+  project_feed: true
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: osu-game
+    build_script:
+      - cmd: dotnet pack osu.Game\osu.Game.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: osu-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: taiko-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: catch-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: mania-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: templates
+    build_script:
+      - cmd: dotnet remove Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+
+      - cmd: dotnet add Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+
+      - cmd: dotnet pack Templates\osu.Game.Templates.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+
+artifacts:
+  - path: '**\*.nupkg'
+
+deploy:
+  - provider: Environment
+    name: nuget
@@ -10,7 +10,7 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.310.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.419.0" />
  </ItemGroup>
  <PropertyGroup>
    <!-- Fody does not handle Android build well, and warns when unchanged.
@@ -5,13 +5,16 @@
 				 android:supportsRtl="true"
 				 android:label="osu!"
 				 android:icon="@mipmap/ic_launcher"
-				 android:roundIcon="@mipmap/ic_launcher">
-        <provider android:name="androidx.core.content.FileProvider"
-                  android:authorities="sh.ppy.osulazer.fileprovider"
-                  android:grantUriPermissions="true"
-                  android:exported="false">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
-                       android:resource="@xml/filepaths" />
-        </provider>
-    </application>
+				 android:roundIcon="@mipmap/ic_launcher" />
+	<!-- for editor usage -->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+	<!--
+		READ_MEDIA_* permissions are available only on API 33 or greater. Devices with older android versions
+		don't understand the new permissions, so request the old READ_EXTERNAL_STORAGE permission to get storage access.
+		Since the old permission has no effect on >= API 33, don't request it.
+
+		Care needs to be taken to ensure runtime permission checks target the correct permission for the API level.
+	-->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
 </manifest>
@@ -2,12 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
-using System.Linq;
 using Android.App;
 using Android.Content.PM;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
-using osu.Framework.Development;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Game;
@@ -23,30 +21,58 @@ namespace osu.Android
        [Cached]
        private readonly OsuGameActivity gameActivity;

-        private readonly PackageInfo packageInfo;
-
        public override Vector2 ScalingContainerTargetDrawSize => new Vector2(1024, 1024 * DrawHeight / DrawWidth);

        public OsuGameAndroid(OsuGameActivity activity)
            : base(null)
        {
            gameActivity = activity;
-            packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0).AsNonNull();
        }

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

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

-        public override Version AssemblyVersion => new Version(packageInfo.VersionName.AsNonNull().Split('-').First());
-
        protected override void LoadComplete()
        {
            base.LoadComplete();
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <!-- https://developer.android.com/reference/androidx/core/content/FileProvider -->
-    <external-files-path path="logs" name="logs" />
-    <external-files-path path="exports" name="exports" />
-</paths>
@@ -189,7 +189,7 @@ namespace osu.Desktop
            }

            // user party
-            if (!hideIdentifiableInformation && multiplayerClient.Room != null && multiplayerClient.Room.Settings.MatchType != MatchType.Matchmaking)
+            if (!hideIdentifiableInformation && multiplayerClient.Room != null)
            {
                MultiplayerRoom room = multiplayerClient.Room;

@@ -17,7 +17,6 @@ using osu.Framework.Logging;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Allocation;
-using osu.Game.Configuration;
 using osu.Game.IO;
 using osu.Game.IPC;
 using osu.Game.Online.Multiplayer;
@@ -34,8 +33,6 @@ namespace osu.Desktop
        [Cached(typeof(IHighPerformanceSessionManager))]
        private readonly HighPerformanceSessionManager highPerformanceSessionManager = new HighPerformanceSessionManager();

-        public bool IsFirstRun { get; init; }
-
        public OsuGameDesktop(string[]? args = null)
            : base(args)
        {
@@ -107,14 +104,6 @@ namespace osu.Desktop

        protected override UpdateManager CreateUpdateManager()
        {
-            // If this is the first time we've run the game, ie it is being installed,
-            // reset the user's release stream to "lazer".
-            //
-            // This ensures that if a user is trying to recover from a failed startup on an unstable release stream,
-            // the game doesn't immediately try and update them back to the release stream after starting up.
-            if (IsFirstRun)
-                LocalConfig.SetValue(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
-
            if (IsPackageManaged)
                return new NoActionUpdateManager();

@@ -123,7 +112,7 @@ namespace osu.Desktop

        public override bool RestartAppWhenExited()
        {
-            Task.Run(() => Velopack.UpdateExe.Start(waitPid: (uint)Environment.ProcessId)).FireAndForget();
+            Task.Run(() => Velopack.UpdateExe.Start()).FireAndForget();
            return true;
        }

@@ -146,13 +135,9 @@ namespace osu.Desktop
        {
            base.SetHost(host);

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

            host.Window.Title = Name;
        }
@@ -28,15 +28,13 @@ namespace osu.Desktop

        private static LegacyTcpIpcProvider? legacyIpc;

-        private static bool isFirstRun;
-
        [STAThread]
        public static void Main(string[] args)
        {
            // IMPORTANT DON'T IGNORE: For general sanity, velopack's setup needs to run before anything else.
            // This has bitten us in the rear before (bricked updater), and although the underlying issue from
            // last time has been fixed, let's not tempt fate.
-            setupVelopack(args);
+            setupVelopack();

            if (OperatingSystem.IsWindows())
            {
@@ -137,12 +135,7 @@ namespace osu.Desktop
                if (tournamentClient)
                    host.Run(new TournamentGame());
                else
-                {
-                    host.Run(new OsuGameDesktop(args)
-                    {
-                        IsFirstRun = isFirstRun
-                    });
-                }
+                    host.Run(new OsuGameDesktop(args));
            }
        }

@@ -174,21 +167,8 @@ namespace osu.Desktop
            return false;
        }

-        private static void setupVelopack(string[] args)
+        private static void setupVelopack()
        {
-            // Arguments being present indicate the user is either starting the game in a special (aka tournament) mode,
-            // or is running with pending imports via file association or otherwise.
-            //
-            // In both these scenarios, we'd hope the game does not attempt to update.
-            //
-            // Special consideration for velopack startup arguments, which must be handled during update.
-            // See https://docs.velopack.io/integrating/hooks#command-line-hooks.
-            if (args.Length > 0 && !args[0].StartsWith("--velo", StringComparison.Ordinal))
-            {
-                Logger.Log("Handling arguments, skipping velopack setup.");
-                return;
-            }
-
            if (OsuGameDesktop.IsPackageManaged)
            {
                Logger.Log("Updates are being managed by an external provider. Skipping Velopack setup.");
@@ -197,8 +177,6 @@ namespace osu.Desktop

            var app = VelopackApp.Build();

-            app.OnFirstRun(_ => isFirstRun = true);
-
            if (OperatingSystem.IsWindows())
                configureWindows(app);

@@ -208,9 +186,9 @@ namespace osu.Desktop
        [SupportedOSPlatform("windows")]
        private static void configureWindows(VelopackApp app)
        {
-            app.OnFirstRun(_ => WindowsAssociationManager.InstallAssociations());
-            app.OnAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
-            app.OnBeforeUninstallFastCallback(_ => WindowsAssociationManager.UninstallAssociations());
+            app.WithFirstRun(_ => WindowsAssociationManager.InstallAssociations());
+            app.WithAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
+            app.WithBeforeUninstallFastCallback(_ => WindowsAssociationManager.UninstallAssociations());
        }
    }
 }
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

@@ -33,7 +32,7 @@ namespace osu.Desktop.Security
        {
            public ElevatedPrivilegesNotification()
            {
-                Text = NotificationsStrings.ElevatedPrivileges(RuntimeInfo.IsUnix ? "root" : "Administrator");
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance, may break integrations and poses a security risk. Please run the game as a normal user.";
            }

            [BackgroundDependencyLoader]
@@ -2,25 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.

 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
-using osu.Framework.Threading;
 using osu.Game;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Play;
 using Velopack;
 using Velopack.Sources;
-using UpdateManager = osu.Game.Updater.UpdateManager;

 namespace osu.Desktop.Updater
 {
-    public partial class VelopackUpdateManager : UpdateManager
+    public partial class VelopackUpdateManager : Game.Updater.UpdateManager
    {
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; } = null!;
+        private readonly UpdateManager updateManager;
+        private INotificationOverlay notificationOverlay = null!;

        [Resolved]
        private OsuGameBase game { get; set; } = null!;
@@ -30,128 +27,122 @@ namespace osu.Desktop.Updater

        private bool isInGameplay => localUserInfo?.PlayingState.Value != LocalUserPlayingState.NotPlaying;

-        private ScheduledDelegate? scheduledBackgroundCheck;
+        private UpdateInfo? pendingUpdate;

-        private void scheduleNextUpdateCheck()
+        public VelopackUpdateManager()
        {
-            scheduledBackgroundCheck?.Cancel();
-            scheduledBackgroundCheck = Scheduler.AddDelayed(() =>
+            updateManager = new UpdateManager(new GithubSource(@"https://github.com/ppy/osu", null, false), new UpdateOptions
            {
-                log("Running scheduled background update check...");
-                CheckForUpdate();
-            }, 60000 * 30);
+                AllowVersionDowngrade = true,
+            });
        }

-        protected override async Task<bool> PerformUpdateCheck(CancellationToken cancellationToken)
+        [BackgroundDependencyLoader]
+        private void load(INotificationOverlay notifications)
        {
-            scheduledBackgroundCheck?.Cancel();
+            notificationOverlay = notifications;
+        }

-            if (isInGameplay)
-            {
-                log("Update check cancelled - user is in gameplay");
-                scheduleNextUpdateCheck();
-                return false;
-            }
+        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
            {
-                IUpdateSource updateSource = new GithubSource(@"https://github.com/ppy/osu", null, ReleaseStream.Value == Game.Configuration.ReleaseStream.Tachyon);
-                Velopack.UpdateManager updateManager = new Velopack.UpdateManager(updateSource, new UpdateOptions
+                // Avoid any kind of update checking while gameplay is running.
+                if (isInGameplay)
                {
-                    AllowVersionDowngrade = true
-                });
-
-                UpdateInfo? update = await updateManager.CheckForUpdatesAsync().ConfigureAwait(false);
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    log("Update check cancelled");
-                    scheduleNextUpdateCheck();
+                    scheduleRecheck = true;
                    return true;
                }

-                if (update == null)
+                // 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)
                {
-                    // No update is available.
-                    log("No update found");
-                    scheduleNextUpdateCheck();
+                    // 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;
                }

-                // Download update in the background while notifying awaiters of the update being available.
-                log($"New update available: {update.TargetFullRelease.Version}");
-                downloadUpdate(updateManager, update, cancellationToken);
-                return true;
+                // 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)
            {
-                log($"Update check failed with error ({e.Message})");
-
-                // we shouldn't crash on a web failure. or any failure for the matter.
-                scheduleNextUpdateCheck();
-                return true;
+                // 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})");
            }
-        }
-
-        private void downloadUpdate(Velopack.UpdateManager updateManager, UpdateInfo update, CancellationToken cancellationToken) => Task.Run(async () =>
-        {
-            log($"Beginning download of update {update.TargetFullRelease.Version}...");
-
-            UpdateDownloadProgressNotification progressNotification = new UpdateDownloadProgressNotification(cancellationToken)
+            finally
            {
-                CompletionClickAction = () =>
+                if (scheduleRecheck)
                {
-                    restartToApplyUpdate(updateManager, update);
-                    return true;
+                    Scheduler.AddDelayed(() => Task.Run(async () => await checkForUpdateAsync().ConfigureAwait(false)), 60000 * 30);
                }
-            };
-
-            try
-            {
-                using (var cts = CancellationTokenSource.CreateLinkedTokenSource(progressNotification.CancellationToken, cancellationToken))
-                {
-                    progressNotification.StartDownload();
-                    runOutsideOfGameplay(() => notificationOverlay.Post(progressNotification), cts.Token);
-
-                    await updateManager.DownloadUpdatesAsync(update, p => progressNotification.Progress = p / 100f, cts.Token).ConfigureAwait(false);
-                    runOutsideOfGameplay(() => progressNotification.State = ProgressNotificationState.Completed, cts.Token);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                progressNotification.FailDownload();
-                log(@"Update cancelled");
-            }
-            catch (Exception e)
-            {
-                // In the case of an error, a separate notification will be displayed.
-                progressNotification.FailDownload();
-                Logger.Error(e, @"Update failed!");
            }

            return true;
-        }, cancellationToken);
+        }

-        private void runOutsideOfGameplay(Action action, CancellationToken cancellationToken)
+        private void runOutsideOfGameplay(Action action)
        {
-            if (cancellationToken.IsCancellationRequested)
-                return;
-
            if (isInGameplay)
            {
-                Scheduler.AddDelayed(() => runOutsideOfGameplay(action, cancellationToken), 1000);
+                Scheduler.AddDelayed(() => runOutsideOfGameplay(action), 1000);
                return;
            }

            action();
        }

-        private void restartToApplyUpdate(Velopack.UpdateManager updateManager, UpdateInfo update) => Task.Run(async () =>
+        private async Task restartToApplyUpdate()
        {
-            await updateManager.WaitExitThenApplyUpdatesAsync(update.TargetFullRelease).ConfigureAwait(false);
+            await updateManager.WaitExitThenApplyUpdatesAsync(pendingUpdate?.TargetFullRelease).ConfigureAwait(false);
            Schedule(() => game.AttemptExit());
-        });
-
-        private static void log(string text) => Logger.Log($"VelopackUpdateManager: {text}");
+        }
    }
 }
@@ -24,9 +24,9 @@
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="10.0.5" />
-    <PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
-    <PackageReference Include="Velopack" Version="0.0.1298" />
+    <PackageReference Include="System.IO.Packaging" Version="9.0.2" />
+    <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
+    <PackageReference Include="Velopack" Version="0.0.1053" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
@@ -12,7 +12,7 @@
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
        <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description>
        <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2025 ppy Pty Ltd</copyright>
+        <copyright>Copyright (c) 2024 ppy Pty Ltd</copyright>
        <language>en-AU</language>
    </metadata>
    <files>
@@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
-using osu.Game.Tests.NonVisual.Filtering;
+using osu.Game.Screens.Select.Carousel;

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

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

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

  <ItemGroup>
@@ -35,9 +35,11 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
-</plist>
+</plist>
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Mods;

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

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

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

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

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

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

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

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

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

        private class TestLegacySkin : LegacySkin
@@ -1,21 +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.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests.Mods
-{
-    public partial class TestSceneCatchModMovingFast : ModTestScene
-    {
-        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
-
-        [Test]
-        public void TestMovingFast() => CreateModTest(new ModTestData
-        {
-            Mod = new CatchModMovingFast(),
-            PassCondition = () => true
-        });
-    }
-}
@@ -0,0 +1,2 @@
+[General]
+// no version specified means v1
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Catch.Tests
        }

        [Test]
-        public void TestTinyDropletMissChangesCatcherState()
+        public void TestTinyDropletMissPreservesCatcherState()
        {
            AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
            {
@@ -165,8 +165,8 @@ namespace osu.Game.Rulesets.Catch.Tests
            }));
            AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
-            // catcher state is changed but hyper dash state is preserved
-            checkState(CatcherAnimationState.Fail);
+            // catcher state and hyper dash state is preserved
+            checkState(CatcherAnimationState.Kiai);
            checkHyperDash(true);
        }

@@ -1,75 +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.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Testing;
-using osu.Framework.Timing;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Replays;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Storyboards;
-using osu.Game.Tests.Visual;
-using osuTK.Input;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    public partial class TestSceneReplayRecording : PlayerTestScene
-    {
-        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
-
-        [Resolved]
-        private AudioManager audioManager { get; set; } = null!;
-
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
-        {
-            HitObjects =
-            {
-                new Fruit { StartTime = 0, },
-                new Fruit { StartTime = 5000, },
-                new Fruit { StartTime = 10000, },
-                new Fruit { StartTime = 15000, }
-            }
-        };
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null) =>
-            new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
-
-        [Test]
-        public void TestRecording()
-        {
-            seekTo(0);
-            AddStep("start moving left", () => InputManager.PressKey(Key.Left));
-            seekTo(5000);
-            AddStep("end moving left", () => InputManager.ReleaseKey(Key.Left));
-            AddAssert("catcher max left", () => this.ChildrenOfType<Catcher>().Single().X, () => Is.EqualTo(0));
-            AddAssert("movement to left recorded to replay", () => Player.Score.Replay.Frames.OfType<CatchReplayFrame>().Any(f => f.Actions.SequenceEqual([CatchAction.MoveLeft])));
-            AddAssert("replay reached left edge", () => Player.Score.Replay.Frames.OfType<CatchReplayFrame>().Any(f => Precision.AlmostEquals(f.Position, 0)));
-
-            AddStep("start dashing right", () =>
-            {
-                InputManager.PressKey(Key.LShift);
-                InputManager.PressKey(Key.Right);
-            });
-            seekTo(10000);
-            AddStep("end dashing right", () =>
-            {
-                InputManager.ReleaseKey(Key.LShift);
-                InputManager.ReleaseKey(Key.Right);
-            });
-            AddAssert("catcher max right", () => this.ChildrenOfType<Catcher>().Single().X, () => Is.EqualTo(CatchPlayfield.WIDTH));
-            AddAssert("dash to right recorded to replay", () => Player.Score.Replay.Frames.OfType<CatchReplayFrame>().Any(f => f.Actions.SequenceEqual([CatchAction.Dash, CatchAction.MoveRight])));
-            AddAssert("replay reached right edge", () => Player.Score.Replay.Frames.OfType<CatchReplayFrame>().Any(f => Precision.AlmostEquals(f.Position, CatchPlayfield.WIDTH)));
-        }
-
-        private void seekTo(double time)
-        {
-            AddStep($"seek to {time}ms", () => Player.GameplayClockContainer.Seek(time));
-            AddUntilStep("wait for seek to finish", () => Player.DrawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(500));
-        }
-    }
-}
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.TestProject.props" />
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
  </ItemGroup>
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Localisation;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Objects;

@@ -24,21 +23,21 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
            {
                new BeatmapStatistic
                {
-                    Name = BeatmapStatisticStrings.Fruits,
+                    Name = @"Fruits",
                    Content = fruits.ToString(),
                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                    BarDisplayLength = fruits / (float)sum,
                },
                new BeatmapStatistic
                {
-                    Name = BeatmapStatisticStrings.JuiceStreams,
+                    Name = @"Juice Streams",
                    Content = juiceStreams.ToString(),
                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                    BarDisplayLength = juiceStreams / (float)sum,
                },
                new BeatmapStatistic
                {
-                    Name = BeatmapStatisticStrings.BananaShowers,
+                    Name = @"Banana Showers",
                    Content = bananaShowers.ToString(),
                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
                    BarDisplayLength = Math.Min(bananaShowers / 10f, 1),
@@ -3,7 +3,6 @@

 using System;
 using System.Collections.Generic;
-using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -12,7 +11,6 @@ using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Graphics;
-using osu.Game.Localisation;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Catch.Edit;
@@ -27,7 +25,6 @@ using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
@@ -36,7 +33,6 @@ using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
-using osu.Game.Utils;
 using osuTK;

 namespace osu.Game.Rulesets.Catch
@@ -154,7 +150,6 @@ namespace osu.Game.Rulesets.Catch
                        new CatchModFloatingFruits(),
                        new CatchModMuted(),
                        new CatchModNoScope(),
-                        new CatchModMovingFast(),
                    };

                case ModType.System:
@@ -176,20 +171,15 @@ namespace osu.Game.Rulesets.Catch

        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetCatch };

-        public override IEnumerable<HitResult> GetValidHitResults()
+        protected override IEnumerable<HitResult> GetValidHitResults()
        {
            return new[]
            {
                HitResult.Great,
-                HitResult.Miss,

                HitResult.LargeTickHit,
-                HitResult.LargeTickMiss,
                HitResult.SmallTickHit,
-                HitResult.SmallTickMiss,
                HitResult.LargeBonus,
-                HitResult.IgnoreHit,
-                HitResult.IgnoreMiss,
            };
        }

@@ -275,10 +265,9 @@ namespace osu.Game.Rulesets.Catch
        }

        /// <seealso cref="CatchHitObject.ApplyDefaultsToSelf"/>
-        public override BeatmapDifficulty GetAdjustedDisplayDifficulty(IBeatmapInfo beatmapInfo, IReadOnlyCollection<Mod> mods)
+        public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
        {
-            BeatmapDifficulty adjustedDifficulty = base.GetAdjustedDisplayDifficulty(beatmapInfo, mods);
-            double rate = ModUtils.CalculateRateWithMods(mods);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);

            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, CatchHitObject.PREEMPT_MAX, CatchHitObject.PREEMPT_MID, CatchHitObject.PREEMPT_MIN);
            preempt /= rate;
@@ -287,33 +276,6 @@ namespace osu.Game.Rulesets.Catch
            return adjustedDifficulty;
        }

-        public override IEnumerable<RulesetBeatmapAttribute> GetBeatmapAttributesForDisplay(IBeatmapInfo beatmapInfo, IReadOnlyCollection<Mod> mods)
-        {
-            var originalDifficulty = beatmapInfo.Difficulty;
-            var effectiveDifficulty = GetAdjustedDisplayDifficulty(beatmapInfo, mods);
-
-            yield return new RulesetBeatmapAttribute(SongSelectStrings.CircleSize, @"CS", originalDifficulty.CircleSize, effectiveDifficulty.CircleSize, 10)
-            {
-                Description = "Affects the size of fruits.",
-                AdditionalMetrics =
-                [
-                    new RulesetBeatmapAttribute.AdditionalMetric("Hit circle radius", (CatchHitObject.OBJECT_RADIUS * LegacyRulesetExtensions.CalculateScaleFromCircleSize(effectiveDifficulty.CircleSize)).ToLocalisableString("0.#"))
-                ]
-            };
-            yield return new RulesetBeatmapAttribute(SongSelectStrings.ApproachRate, @"AR", originalDifficulty.ApproachRate, effectiveDifficulty.ApproachRate, 10)
-            {
-                Description = "Affects how early fruits fade in on the screen.",
-                AdditionalMetrics =
-                [
-                    new RulesetBeatmapAttribute.AdditionalMetric("Fade-in time", LocalisableString.Interpolate($@"{IBeatmapDifficultyInfo.DifficultyRangeInt(effectiveDifficulty.ApproachRate, CatchHitObject.PREEMPT_RANGE):#,0.##} ms"))
-                ]
-            };
-            yield return new RulesetBeatmapAttribute(SongSelectStrings.HPDrain, @"HP", originalDifficulty.DrainRate, effectiveDifficulty.DrainRate, 10)
-            {
-                Description = "Affects the harshness of health drain and the health penalties for missing."
-            };
-        }
-
        public override bool EditorShowScrollSpeed => false;
    }
 }
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Utils;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -23,14 +22,16 @@ namespace osu.Game.Rulesets.Catch.Difficulty
    {
        private const double difficulty_multiplier = 4.59;

-        public override int Version => 20251020;
+        private float halfCatcherWidth;
+
+        public override int Version => 20250306;

        public CatchDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
            : base(ruleset, beatmap)
        {
        }

-        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills)
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
        {
            if (beatmap.HitObjects.Count == 0)
                return new CatchDifficultyAttributes { Mods = mods };
@@ -45,19 +46,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
            return attributes;
        }

-        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, Mod[] mods)
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
        {
            CatchHitObject? lastObject = null;

            List<DifficultyHitObject> objects = new List<DifficultyHitObject>();

-            double clockRate = ModUtils.CalculateRateWithMods(mods);
-
-            float halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.Difficulty) * 0.5f;
-
-            // For circle sizes above 5.5, reduce the catcher width further to simulate imperfect gameplay.
-            halfCatcherWidth *= 1 - (Math.Max(0, beatmap.Difficulty.CircleSize - 5.5f) * 0.0625f);
-
            // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
            foreach (var hitObject in CatchBeatmap.GetPalpableObjects(beatmap.HitObjects))
            {
@@ -74,11 +68,16 @@ namespace osu.Game.Rulesets.Catch.Difficulty
            return objects;
        }

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods)
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
        {
+            halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.Difficulty) * 0.5f;
+
+            // For circle sizes above 5.5, reduce the catcher width further to simulate imperfect gameplay.
+            halfCatcherWidth *= 1 - (Math.Max(0, beatmap.Difficulty.CircleSize - 5.5f) * 0.0625f);
+
            return new Skill[]
            {
-                new Movement(mods),
+                new Movement(mods, halfCatcherWidth, clockRate),
            };
        }

@@ -3,13 +3,13 @@

 using System;
 using System.Linq;
+using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Utils;

 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -51,13 +51,15 @@ namespace osu.Game.Rulesets.Catch.Difficulty

            // Combo scaling
            if (catchAttributes.MaxCombo > 0)
-                value *= Math.Min(Math.Pow(score.MaxCombo, 0.35) / Math.Pow(catchAttributes.MaxCombo, 0.35), 1.0);
+                value *= Math.Min(Math.Pow(score.MaxCombo, 0.8) / Math.Pow(catchAttributes.MaxCombo, 0.8), 1.0);

            var difficulty = score.BeatmapInfo!.Difficulty.Clone();

            score.Mods.OfType<IApplicableToDifficulty>().ForEach(m => m.ApplyToDifficulty(difficulty));

-            double clockRate = ModUtils.CalculateRateWithMods(score.Mods);
+            var track = new TrackVirtual(10000);
+            score.Mods.OfType<IApplicableToTrack>().ForEach(m => m.ApplyToTrack(track));
+            double clockRate = track.Rate;

            // this is the same as osu!, so there's potential to share the implementation... maybe
            double preempt = IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
@@ -1,93 +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 osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Preprocessing;
-
-namespace osu.Game.Rulesets.Catch.Difficulty.Evaluators
-{
-    public static class MovementEvaluator
-    {
-        private const double direction_change_bonus = 21.0;
-
-        public static double EvaluateDifficultyOf(DifficultyHitObject current)
-        {
-            var catchCurrent = (CatchDifficultyHitObject)current;
-            var catchLast = (CatchDifficultyHitObject)current.Previous(0);
-            var catchLastLast = (CatchDifficultyHitObject)current.Previous(1);
-
-            // In catch, clockrate adjustments do not only affect the timings of hitobjects,
-            // but also the speed of the player's catcher, which has an impact on difficulty
-            double catcherSpeedMultiplier = current.ClockRate;
-
-            double weightedStrainTime = catchCurrent.StrainTime + 13 + (3 / catcherSpeedMultiplier);
-
-            double distanceAddition = (Math.Pow(Math.Abs(catchCurrent.DistanceMoved), 1.3) / 510);
-            double sqrtStrain = Math.Sqrt(weightedStrainTime);
-
-            double edgeDashBonus = 0;
-
-            // Direction change bonus.
-            if (Math.Abs(catchCurrent.DistanceMoved) > 0.1)
-            {
-                if (current.Index >= 1 && Math.Abs(catchLast.DistanceMoved) > 0.1 && Math.Sign(catchCurrent.DistanceMoved) != Math.Sign(catchLast.DistanceMoved))
-                {
-                    double bonusFactor = Math.Min(50, Math.Abs(catchCurrent.DistanceMoved)) / 50;
-                    double antiflowFactor = Math.Max(Math.Min(70, Math.Abs(catchLast.DistanceMoved)) / 70, 0.38);
-
-                    distanceAddition += direction_change_bonus / Math.Sqrt(catchLast.StrainTime + 16) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 3), 0);
-                }
-
-                // Base bonus for every movement, giving some weight to streams.
-                distanceAddition += 12.5 * Math.Min(Math.Abs(catchCurrent.DistanceMoved), CatchDifficultyHitObject.NORMALIZED_HALF_CATCHER_WIDTH * 2)
-                                    / (CatchDifficultyHitObject.NORMALIZED_HALF_CATCHER_WIDTH * 6) / sqrtStrain;
-            }
-
-            // Linear spacing nerf.
-            double linearSpacingCount = 0;
-
-            for (int i = 0; i < Math.Min(current.Index, 10); i++)
-            {
-                var catchPrevObj = (CatchDifficultyHitObject)catchCurrent.Previous(i);
-
-                // Only same direction movements matter as they do not take any additional inputs.
-                if (Math.Sign(catchCurrent.DistanceMoved) != Math.Sign(catchPrevObj.DistanceMoved) || catchCurrent.DistanceMoved == 0 || catchPrevObj.DistanceMoved == 0)
-                    break;
-
-                double currentSpacing = Math.Abs(catchCurrent.DistanceMoved / catchCurrent.StrainTime);
-                double prevSpacing = Math.Abs(catchPrevObj.DistanceMoved / catchPrevObj.StrainTime);
-
-                double relativeDifference = Math.Abs(currentSpacing / prevSpacing - 1);
-
-                if (relativeDifference > 0.05)
-                    break;
-
-                linearSpacingCount++;
-            }
-
-            distanceAddition *= Math.Pow(0.7, linearSpacingCount);
-
-            // Bonus for edge dashes.
-            if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f)
-            {
-                if (!catchCurrent.LastObject.HyperDash)
-                    edgeDashBonus += 5.7;
-
-                distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash) / 20)
-                                                        * Math.Pow((Math.Min(catchCurrent.StrainTime * catcherSpeedMultiplier, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
-            }
-
-            // There is an edge case where horizontal back and forth sliders create "buzz" patterns which are repeated "movements" with a distance lower than
-            // the platter's width but high enough to be considered a movement due to the absolute_player_positioning_error and NORMALIZED_HALF_CATCHER_WIDTH offsets
-            // We are detecting this exact scenario. The first back and forth is counted but all subsequent ones are nullified.
-            // To achieve that, we need to store the exact distances (distance ignoring absolute_player_positioning_error and NORMALIZED_HALF_CATCHER_WIDTH)
-            if (current.Index >= 2 && Math.Abs(catchCurrent.ExactDistanceMoved) <= CatchDifficultyHitObject.NORMALIZED_HALF_CATCHER_WIDTH * 2
-                                   && catchCurrent.ExactDistanceMoved == -catchLast.ExactDistanceMoved && catchLast.ExactDistanceMoved == -catchLastLast.ExactDistanceMoved
-                                   && catchCurrent.StrainTime == catchLast.StrainTime && catchLast.StrainTime == catchLastLast.StrainTime)
-                distanceAddition = 0;
-
-            return distanceAddition / weightedStrainTime;
-        }
-    }
-}
@@ -11,49 +11,15 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
 {
    public class CatchDifficultyHitObject : DifficultyHitObject
    {
-        public const float NORMALIZED_HALF_CATCHER_WIDTH = 41.0f;
-        private const float absolute_player_positioning_error = 16.0f;
+        private const float normalized_hitobject_radius = 41.0f;

        public new PalpableCatchHitObject BaseObject => (PalpableCatchHitObject)base.BaseObject;

        public new PalpableCatchHitObject LastObject => (PalpableCatchHitObject)base.LastObject;

-        /// <summary>
-        /// Normalized position of <see cref="BaseObject"/>.
-        /// </summary>
        public readonly float NormalizedPosition;
-
-        /// <summary>
-        /// Normalized position of <see cref="LastObject"/>.
-        /// </summary>
        public readonly float LastNormalizedPosition;

-        /// <summary>
-        /// Normalized position of the player required to catch <see cref="BaseObject"/>, assuming the player moves as little as possible.
-        /// </summary>
-        public float PlayerPosition { get; private set; }
-
-        /// <summary>
-        /// Normalized position of the player after catching <see cref="LastObject"/>.
-        /// </summary>
-        public float LastPlayerPosition { get; private set; }
-
-        /// <summary>
-        /// Normalized distance between <see cref="LastPlayerPosition"/> and <see cref="PlayerPosition"/>.
-        /// </summary>
-        /// <remarks>
-        /// The sign of the value indicates the direction of the movement: negative is left and positive is right.
-        /// </remarks>
-        public float DistanceMoved { get; private set; }
-
-        /// <summary>
-        /// Normalized distance the player has to move from <see cref="LastPlayerPosition"/> in order to catch <see cref="BaseObject"/> at its <see cref="NormalizedPosition"/>.
-        /// </summary>
-        /// <remarks>
-        /// The sign of the value indicates the direction of the movement: negative is left and positive is right.
-        /// </remarks>
-        public float ExactDistanceMoved { get; private set; }
-
        /// <summary>
        /// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 40ms.
        /// </summary>
@@ -63,35 +29,13 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
            : base(hitObject, lastObject, clockRate, objects, index)
        {
            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
-            float scalingFactor = NORMALIZED_HALF_CATCHER_WIDTH / halfCatcherWidth;
+            float scalingFactor = normalized_hitobject_radius / halfCatcherWidth;

            NormalizedPosition = BaseObject.EffectiveX * scalingFactor;
            LastNormalizedPosition = LastObject.EffectiveX * scalingFactor;

            // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
            StrainTime = Math.Max(40, DeltaTime);
-
-            setMovementState();
-        }
-
-        private void setMovementState()
-        {
-            LastPlayerPosition = Index == 0 ? LastNormalizedPosition : ((CatchDifficultyHitObject)Previous(0)).PlayerPosition;
-
-            PlayerPosition = Math.Clamp(
-                LastPlayerPosition,
-                NormalizedPosition - (NORMALIZED_HALF_CATCHER_WIDTH - absolute_player_positioning_error),
-                NormalizedPosition + (NORMALIZED_HALF_CATCHER_WIDTH - absolute_player_positioning_error)
-            );
-
-            DistanceMoved = PlayerPosition - LastPlayerPosition;
-
-            // For the exact position we consider that the catcher is in the correct position for both objects
-            ExactDistanceMoved = NormalizedPosition - LastPlayerPosition;
-
-            // After a hyperdash we ARE in the correct position. Always!
-            if (LastObject.HyperDash)
-                PlayerPosition = NormalizedPosition;
        }
    }
 }
@@ -1,7 +1,8 @@
 // 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.Rulesets.Catch.Difficulty.Evaluators;
+using System;
+using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
@@ -10,6 +11,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
    public class Movement : StrainDecaySkill
    {
+        private const float absolute_player_positioning_error = 16f;
+        private const float normalized_hitobject_radius = 41.0f;
+        private const double direction_change_bonus = 21.0;
+
        protected override double SkillMultiplier => 1;
        protected override double StrainDecayBase => 0.2;

@@ -17,14 +22,107 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills

        protected override int SectionLength => 750;

-        public Movement(Mod[] mods)
+        protected readonly float HalfCatcherWidth;
+
+        private float? lastPlayerPosition;
+        private float lastDistanceMoved;
+        private float lastExactDistanceMoved;
+        private double lastStrainTime;
+        private bool isInBuzzSection;
+
+        /// <summary>
+        /// The speed multiplier applied to the player's catcher.
+        /// </summary>
+        private readonly double catcherSpeedMultiplier;
+
+        public Movement(Mod[] mods, float halfCatcherWidth, double clockRate)
            : base(mods)
        {
+            HalfCatcherWidth = halfCatcherWidth;
+
+            // In catch, clockrate adjustments do not only affect the timings of hitobjects,
+            // but also the speed of the player's catcher, which has an impact on difficulty
+            // TODO: Support variable clockrates caused by mods such as ModTimeRamp
+            //  (perhaps by using IApplicableToRate within the CatchDifficultyHitObject constructor to set a catcher speed for each object before processing)
+            catcherSpeedMultiplier = clockRate;
        }

        protected override double StrainValueOf(DifficultyHitObject current)
        {
-            return MovementEvaluator.EvaluateDifficultyOf(current);
+            var catchCurrent = (CatchDifficultyHitObject)current;
+
+            lastPlayerPosition ??= catchCurrent.LastNormalizedPosition;
+
+            float playerPosition = Math.Clamp(
+                lastPlayerPosition.Value,
+                catchCurrent.NormalizedPosition - (normalized_hitobject_radius - absolute_player_positioning_error),
+                catchCurrent.NormalizedPosition + (normalized_hitobject_radius - absolute_player_positioning_error)
+            );
+
+            float distanceMoved = playerPosition - lastPlayerPosition.Value;
+
+            // For the exact position we consider that the catcher is in the correct position for both objects
+            float exactDistanceMoved = catchCurrent.NormalizedPosition - lastPlayerPosition.Value;
+
+            double weightedStrainTime = catchCurrent.StrainTime + 13 + (3 / catcherSpeedMultiplier);
+
+            double distanceAddition = (Math.Pow(Math.Abs(distanceMoved), 1.3) / 510);
+            double sqrtStrain = Math.Sqrt(weightedStrainTime);
+
+            double edgeDashBonus = 0;
+
+            // Direction change bonus.
+            if (Math.Abs(distanceMoved) > 0.1)
+            {
+                if (Math.Abs(lastDistanceMoved) > 0.1 && Math.Sign(distanceMoved) != Math.Sign(lastDistanceMoved))
+                {
+                    double bonusFactor = Math.Min(50, Math.Abs(distanceMoved)) / 50;
+                    double antiflowFactor = Math.Max(Math.Min(70, Math.Abs(lastDistanceMoved)) / 70, 0.38);
+
+                    distanceAddition += direction_change_bonus / Math.Sqrt(lastStrainTime + 16) * bonusFactor * antiflowFactor * Math.Max(1 - Math.Pow(weightedStrainTime / 1000, 3), 0);
+                }
+
+                // Base bonus for every movement, giving some weight to streams.
+                distanceAddition += 12.5 * Math.Min(Math.Abs(distanceMoved), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtStrain;
+            }
+
+            // Bonus for edge dashes.
+            if (catchCurrent.LastObject.DistanceToHyperDash <= 20.0f)
+            {
+                if (!catchCurrent.LastObject.HyperDash)
+                    edgeDashBonus += 5.7;
+                else
+                {
+                    // After a hyperdash we ARE in the correct position. Always!
+                    playerPosition = catchCurrent.NormalizedPosition;
+                }
+
+                distanceAddition *= 1.0 + edgeDashBonus * ((20 - catchCurrent.LastObject.DistanceToHyperDash) / 20)
+                                                        * Math.Pow((Math.Min(catchCurrent.StrainTime * catcherSpeedMultiplier, 265) / 265), 1.5); // Edge Dashes are easier at lower ms values
+            }
+
+            // There is an edge case where horizontal back and forth sliders create "buzz" patterns which are repeated "movements" with a distance lower than
+            // the platter's width but high enough to be considered a movement due to the absolute_player_positioning_error and normalized_hitobject_radius offsets
+            // We are detecting this exact scenario. The first back and forth is counted but all subsequent ones are nullified.
+            // To achieve that, we need to store the exact distances (distance ignoring absolute_player_positioning_error and normalized_hitobject_radius)
+            if (Math.Abs(exactDistanceMoved) <= HalfCatcherWidth * 2 && exactDistanceMoved == -lastExactDistanceMoved && catchCurrent.StrainTime == lastStrainTime)
+            {
+                if (isInBuzzSection)
+                    distanceAddition = 0;
+                else
+                    isInBuzzSection = true;
+            }
+            else
+            {
+                isInBuzzSection = false;
+            }
+
+            lastPlayerPosition = playerPosition;
+            lastDistanceMoved = distanceMoved;
+            lastStrainTime = catchCurrent.StrainTime;
+            lastExactDistanceMoved = exactDistanceMoved;
+
+            return distanceAddition / weightedStrainTime;
        }
    }
 }
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
        private double placementStartTime;
        private double placementEndTime;

-        protected override bool IsValidForPlacement => base.IsValidForPlacement && (PlacementActive == PlacementState.Waiting || Precision.DefinitelyBigger(HitObject.Duration, 0));
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(HitObject.Duration, 0);

        public BananaShowerPlacementBlueprint()
        {
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints

        private InputManager inputManager = null!;

-        protected override bool IsValidForPlacement => base.IsValidForPlacement && (PlacementActive == PlacementState.Waiting || Precision.DefinitelyBigger(HitObject.Duration, 0));
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(HitObject.Duration, 0);

        public JuiceStreamPlacementBlueprint()
        {
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Catch.Edit.Checks;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;

 namespace osu.Game.Rulesets.Catch.Edit
@@ -14,14 +13,7 @@ namespace osu.Game.Rulesets.Catch.Edit
    {
        private readonly List<ICheck> checks = new List<ICheck>
        {
-            // Compose
            new CheckBananaShowerGap(),
-            new CheckConcurrentObjects(),
-
-            // Spread
-            new CheckCatchLowestDiffDrainTime(),
-
-            // Settings
            new CheckCatchAbnormalDifficultySettings(),
        };

@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.

 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -221,41 +219,5 @@ namespace osu.Game.Rulesets.Catch.Edit
            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
        }
-
-        #region Clipboard handling
-
-        public override string ConvertSelectionToString()
-            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<CatchHitObject>().OrderBy(h => h.StartTime)
-                                             .Select(h => (h.IndexInCurrentCombo + 1).ToString(CultureInfo.InvariantCulture)));
-
-        // 1,2,3,4 ...
-        private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$", RegexOptions.Compiled);
-
-        public override void SelectFromTimestamp(double timestamp, string objectDescription)
-        {
-            if (!selection_regex.IsMatch(objectDescription))
-                return;
-
-            List<CatchHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<CatchHitObject>().Where(h => h.StartTime >= timestamp).ToList();
-            string[] splitDescription = objectDescription.Split(',');
-
-            for (int i = 0; i < splitDescription.Length; i++)
-            {
-                if (!int.TryParse(splitDescription[i], out int combo) || combo < 1)
-                    continue;
-
-                CatchHitObject? current = remainingHitObjects.FirstOrDefault(h => h.IndexInCurrentCombo + 1 == combo);
-
-                if (current == null)
-                    continue;
-
-                EditorBeatmap.SelectedHitObjects.Add(current);
-
-                if (i < splitDescription.Length - 1)
-                    remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
-            }
-        }
-
-        #endregion
    }
 }
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Checks

        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
        {
-            var hitObjects = context.CurrentDifficulty.Playable.HitObjects;
+            var hitObjects = context.Beatmap.HitObjects;
            (int expectedStartDelta, int expectedEndDelta) = spinner_delta_threshold[context.InterpretedDifficulty];

            for (int i = 0; i < hitObjects.Count - 1; ++i)
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Checks

        public override IEnumerable<Issue> Run(BeatmapVerifierContext context)
        {
-            var diff = context.CurrentDifficulty.Playable.Difficulty;
+            var diff = context.Beatmap.Difficulty;
            Issue? issue;

            if (HasMoreThanOneDecimalPlace("Approach rate", diff.ApproachRate, out issue))
@@ -1,21 +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.Collections.Generic;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit.Checks;
-
-namespace osu.Game.Rulesets.Catch.Edit.Checks
-{
-    public class CheckCatchLowestDiffDrainTime : CheckLowestDiffDrainTime
-    {
-        protected override IEnumerable<(DifficultyRating rating, double thresholdMs, string name)> GetThresholds()
-        {
-            // See lowest difficulty requirements in https://osu.ppy.sh/wiki/en/Ranking_criteria/osu%21catch#general
-            yield return (DifficultyRating.Hard, new TimeSpan(0, 2, 30).TotalMilliseconds, "Platter");
-            yield return (DifficultyRating.Insane, new TimeSpan(0, 3, 15).TotalMilliseconds, "Rain");
-            yield return (DifficultyRating.Expert, new TimeSpan(0, 4, 0).TotalMilliseconds, "Overdose");
-        }
-    }
-}
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Mods;
@@ -12,8 +10,6 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
    public class CatchModAutoplay : ModAutoplay
    {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(CatchModMovingFast) }).ToArray();
-
        public override ModReplayData CreateReplayData(IBeatmap beatmap, IReadOnlyList<Mod> mods)
            => new ModReplayData(new CatchAutoGenerator(beatmap).Generate(), new ModCreatedUser { Username = "osu!salad" });
    }
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -13,8 +11,6 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
    public class CatchModCinema : ModCinema<CatchHitObject>
    {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(CatchModMovingFast) }).ToArray();
-
        public override ModReplayData CreateReplayData(IBeatmap beatmap, IReadOnlyList<Mod> mods)
            => new ModReplayData(new CatchAutoGenerator(beatmap).Generate(), new ModCreatedUser { Username = "osu!salad" });
    }
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Extensions;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Mods;

@@ -37,25 +36,6 @@ namespace osu.Game.Rulesets.Catch.Mods
        [SettingSource("Spicy Patterns", "Adjust the patterns as if Hard Rock is enabled.")]
        public BindableBool HardRockOffsets { get; } = new BindableBool();

-        public override string ExtendedIconInformation
-        {
-            get
-            {
-                if (!IsExactlyOneSettingChanged(CircleSize, ApproachRate, OverallDifficulty, DrainRate))
-                    return string.Empty;
-
-                if (!CircleSize.IsDefault) return format("CS", CircleSize);
-                if (!ApproachRate.IsDefault) return format("AR", ApproachRate);
-                if (!OverallDifficulty.IsDefault) return format("OD", OverallDifficulty);
-                if (!DrainRate.IsDefault) return format("HP", DrainRate);
-
-                return string.Empty;
-
-                string format(string acronym, DifficultyBindable bindable)
-                    => $"{acronym}{bindable.Value!.Value.ToStandardFormattedString(1)}";
-            }
-        }
-
        public override IEnumerable<(LocalisableString setting, LocalisableString value)> SettingDescription
        {
            get
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.

 using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;

 namespace osu.Game.Rulesets.Catch.Mods
@@ -10,12 +9,5 @@ namespace osu.Game.Rulesets.Catch.Mods
    public class CatchModEasy : ModEasyWithExtraLives
    {
        public override LocalisableString Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and extra lives!";
-
-        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
-        {
-            base.ApplyToDifficulty(difficulty);
-
-            difficulty.OverallDifficulty *= ADJUST_RATIO;
-        }
    }
 }
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Mods

        public override BindableBool ComboBasedSize { get; } = new BindableBool(true);

-        public override float DefaultFlashlightSize => 203.125f;
+        public override float DefaultFlashlightSize => 325;

        protected override Flashlight CreateFlashlight() => new CatchFlashlight(this, playfield);

@@ -3,7 +3,6 @@

 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -17,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Mods
        public override string Acronym => "FF";
        public override LocalisableString Description => "The fruits are... floating?";
        public override double ScoreMultiplier => 1;
-        public override IconUsage? Icon => OsuIcon.ModFloatingFruits;
+        public override IconUsage? Icon => FontAwesome.Solid.Cloud;

        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
        {
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Catch.Mods
        {
            base.ApplyToDifficulty(difficulty);

-            difficulty.OverallDifficulty = Math.Min(difficulty.OverallDifficulty * ADJUST_RATIO, 10.0f);
            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
        }
@@ -1,82 +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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
-using osuTK;
-
-namespace osu.Game.Rulesets.Catch.Mods
-{
-    public partial class CatchModMovingFast : Mod, IApplicableToDrawableRuleset<CatchHitObject>, IApplicableToPlayer
-    {
-        public override string Name => "Moving Fast";
-        public override string Acronym => "MF";
-        public override LocalisableString Description => "Dashing by default, slow down!";
-        public override ModType Type => ModType.Fun;
-        public override double ScoreMultiplier => 1;
-        public override IconUsage? Icon => OsuIcon.ModMovingFast;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax) };
-
-        private DrawableCatchRuleset drawableRuleset = null!;
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
-        {
-            this.drawableRuleset = (DrawableCatchRuleset)drawableRuleset;
-        }
-
-        public void ApplyToPlayer(Player player)
-        {
-            if (!drawableRuleset.HasReplayLoaded.Value)
-            {
-                var catchPlayfield = (CatchPlayfield)drawableRuleset.Playfield;
-                catchPlayfield.Catcher.Dashing = true;
-                catchPlayfield.CatcherArea.Add(new InvertDashInputHelper(catchPlayfield.CatcherArea));
-            }
-        }
-
-        private partial class InvertDashInputHelper : Drawable, IKeyBindingHandler<CatchAction>
-        {
-            private readonly CatcherArea catcherArea;
-
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
-            public InvertDashInputHelper(CatcherArea catcherArea)
-            {
-                this.catcherArea = catcherArea;
-
-                RelativeSizeAxes = Axes.Both;
-            }
-
-            public bool OnPressed(KeyBindingPressEvent<CatchAction> e)
-            {
-                switch (e.Action)
-                {
-                    case CatchAction.MoveLeft or CatchAction.MoveRight:
-                        break;
-
-                    case CatchAction.Dash:
-                        catcherArea.Catcher.Dashing = false;
-                        return true;
-                }
-
-                return false;
-            }
-
-            public void OnReleased(KeyBindingReleaseEvent<CatchAction> e)
-            {
-                if (e.Action == CatchAction.Dash)
-                    catcherArea.Catcher.Dashing = true;
-            }
-        }
-    }
-}
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

-using System;
-using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -21,8 +19,6 @@ namespace osu.Game.Rulesets.Catch.Mods
    {
        public override LocalisableString Description => @"Use the mouse to control the catcher.";

-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(CatchModMovingFast) }).ToArray();
-
        private DrawableCatchRuleset drawableRuleset = null!;

        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
@@ -54,25 +53,13 @@ namespace osu.Game.Rulesets.Catch.Objects

            public override IEnumerable<string> LookupNames => lookup_names;

-            public BananaHitSampleInfo()
-                : this(string.Empty)
+            public BananaHitSampleInfo(int volume = 100)
+                : base(string.Empty, volume: volume)
            {
            }

-            public BananaHitSampleInfo(HitSampleInfo info)
-                : this(info.Name, info.Bank, info.Suffix, info.Volume, info.EditorAutoBank, info.UseBeatmapSamples)
-            {
-            }
-
-            private BananaHitSampleInfo(string name, string bank = SampleControlPoint.DEFAULT_BANK, string? suffix = null, int volume = 100, bool editorAutoBank = true, bool useBeatmapSamples = false)
-                : base(name, bank, suffix, volume, editorAutoBank, useBeatmapSamples)
-            {
-            }
-
-            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default,
-                                                      Optional<bool> newEditorAutoBank = default, Optional<bool> newUseBeatmapSamples = default)
-                => new BananaHitSampleInfo(newName.GetOr(Name), newBank.GetOr(Bank), newSuffix.GetOr(Suffix), newVolume.GetOr(Volume),
-                    newEditorAutoBank.GetOr(EditorAutoBank), newUseBeatmapSamples.GetOr(UseBeatmapSamples));
+            public sealed override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default, Optional<bool> newEditorAutoBank = default)
+                => new BananaHitSampleInfo(newVolume.GetOr(Volume));

            public bool Equals(BananaHitSampleInfo? other)
                => other != null;
--- a/Show More
+++ b/Show More