Remove obsolete fucks

.github/workflows/ci.yml

@@ -82,18 +82,8 @@ jobs:
         run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
 
       - name: Test
-        run: >
-          dotnet test
-          osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll
-          osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll
-          osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll
-          osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll
-          osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll
-          osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll
-          Templates/**/*.Tests/bin/Debug/**/*.Tests.dll
-          --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
-          --
-          NUnit.ConsoleOut=0
+        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" -- NUnit.ConsoleOut=0
+        shell: pwsh
 
       # Attempt to upload results even if test fails.
       # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
@@ -124,7 +114,10 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Install .NET workloads
-        run: dotnet workload install android
+        # since windows image 20241113.3.0, not specifying a version here
+        # installs the .NET 7 version of android workload for very unknown reasons.
+        # revisit once we upgrade to .NET 9, it's probably fixed there.
+        run: dotnet workload install android --version (dotnet --version)
 
       - name: Compile
         run: dotnet build -c Debug osu.Android.slnf
@@ -146,4 +139,4 @@ jobs:
         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
+        run: dotnet build -c Debug osu.iOS

.idea/.idea.osu.Android/.idea/deploymentTargetSelector.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="osu.Android">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

CodeAnalysis/BannedSymbols.txt

@@ -18,6 +18,3 @@ M:Humanizer.InflectorExtensions.Pascalize(System.String);Humanizer's .Pascalize(
 M:Humanizer.InflectorExtensions.Camelize(System.String);Humanizer's .Camelize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToCamelCase() instead.
 M:Humanizer.InflectorExtensions.Underscore(System.String);Humanizer's .Underscore() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToSnakeCase() instead.
 M:Humanizer.InflectorExtensions.Kebaberize(System.String);Humanizer's .Kebaberize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToKebabCase() instead.
-M:osuTK.MathHelper.Clamp(System.Int32,System.Int32,System.Int32)~System.Int32;Use Math.Clamp() instead.
-M:osuTK.MathHelper.Clamp(System.Single,System.Single,System.Single)~System.Single;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.
-M:osuTK.MathHelper.Clamp(System.Double,System.Double,System.Double)~System.Double;This osuTK helper has unsafe semantics when one of the bounds provided is NaN. Use Math.Clamp() instead.

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj

@@ -9,7 +9,7 @@
       <GenerateProgramFile>false</GenerateProgramFile>
     </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -9,7 +9,7 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj

@@ -9,7 +9,7 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -9,7 +9,7 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -10,6 +9,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Pippidon.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.Beatmaps
 {
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Pippidon.Beatmaps
             };
         }
 
-        private int getLane(HitObject hitObject) => (int)Math.Clamp(
+        private int getLane(HitObject hitObject) => (int)MathHelper.Clamp(
             (getUsablePosition(hitObject) - minPosition) / (maxPosition - minPosition) * PippidonPlayfield.LANE_COUNT, 0, PippidonPlayfield.LANE_COUNT - 1);
 
         private float getUsablePosition(HitObject h) => (h as IHasYPosition)?.Y ?? ((IHasXPosition)h).X;

osu.Android.props

@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.419.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.115.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

osu.Android/GameplayScreenRotationLocker.cs

@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Android.Content.PM;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Play;
+
+namespace osu.Android
+{
+    public partial class GameplayScreenRotationLocker : Component
+    {
+        private IBindable<LocalUserPlayingState> localUserPlaying = null!;
+
+        [Resolved]
+        private OsuGameActivity gameActivity { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(ILocalUserPlayInfo localUserPlayInfo)
+        {
+            localUserPlaying = localUserPlayInfo.PlayingState.GetBoundCopy();
+            localUserPlaying.BindValueChanged(updateLock, true);
+        }
+
+        private void updateLock(ValueChangedEvent<LocalUserPlayingState> userPlaying)
+        {
+            gameActivity.RunOnUiThread(() =>
+            {
+                gameActivity.RequestedOrientation = userPlaying.NewValue == LocalUserPlayingState.Playing ? ScreenOrientation.Locked : gameActivity.DefaultOrientation;
+            });
+        }
+    }
+}

osu.Android/OsuGameActivity.cs

@@ -49,8 +49,6 @@ namespace osu.Android
         /// <remarks>Adjusted on startup to match expected UX for the current device type (phone/tablet).</remarks>
         public ScreenOrientation DefaultOrientation = ScreenOrientation.Unspecified;
 
-        public new bool IsTablet { get; private set; }
-
         private readonly OsuGameAndroid game;
 
         private bool gameCreated;
@@ -91,9 +89,9 @@ namespace osu.Android
             WindowManager.DefaultDisplay.GetSize(displaySize);
 #pragma warning restore CA1422
             float smallestWidthDp = Math.Min(displaySize.X, displaySize.Y) / Resources.DisplayMetrics.Density;
-            IsTablet = smallestWidthDp >= 600f;
+            bool isTablet = smallestWidthDp >= 600f;
 
-            RequestedOrientation = DefaultOrientation = IsTablet ? ScreenOrientation.FullUser : ScreenOrientation.SensorLandscape;
+            RequestedOrientation = DefaultOrientation = isTablet ? ScreenOrientation.FullUser : ScreenOrientation.SensorLandscape;
 
             // Currently (SDK 6.0.200), BundleAssemblies is not runnable for net6-android.
             // The assembly files are not available as files either after native AOT.

osu.Android/OsuGameAndroid.cs

@@ -3,16 +3,13 @@
 
 using System;
 using Android.App;
-using Android.Content.PM;
 using Microsoft.Maui.Devices;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Game;
-using osu.Game.Screens;
 using osu.Game.Updater;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Android
 {
@@ -21,8 +18,6 @@ namespace osu.Android
         [Cached]
         private readonly OsuGameActivity gameActivity;
 
-        public override Vector2 ScalingContainerTargetDrawSize => new Vector2(1024, 1024 * DrawHeight / DrawWidth);
-
         public OsuGameAndroid(OsuGameActivity activity)
             : base(null)
         {
@@ -76,35 +71,7 @@ namespace osu.Android
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            UserPlayingState.BindValueChanged(_ => updateOrientation());
-        }
-
-        protected override void ScreenChanged(IOsuScreen? current, IOsuScreen? newScreen)
-        {
-            base.ScreenChanged(current, newScreen);
-
-            if (newScreen != null)
-                updateOrientation();
-        }
-
-        private void updateOrientation()
-        {
-            var orientation = MobileUtils.GetOrientation(this, (IOsuScreen)ScreenStack.CurrentScreen, gameActivity.IsTablet);
-
-            switch (orientation)
-            {
-                case MobileUtils.Orientation.Locked:
-                    gameActivity.RequestedOrientation = ScreenOrientation.Locked;
-                    break;
-
-                case MobileUtils.Orientation.Portrait:
-                    gameActivity.RequestedOrientation = ScreenOrientation.Portrait;
-                    break;
-
-                case MobileUtils.Orientation.Default:
-                    gameActivity.RequestedOrientation = gameActivity.DefaultOrientation;
-                    break;
-            }
+            LoadComponentAsync(new GameplayScreenRotationLocker(), Add);
         }
 
         public override void SetHost(GameHost host)

osu.Desktop/DiscordRichPresence.cs

@@ -82,7 +82,7 @@ namespace osu.Desktop
             };
 
             client.OnReady += onReady;
-            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Message} ({e.Code})", LoggingTarget.Network);
+            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Message} ({e.Code})", LoggingTarget.Network, LogLevel.Error);
 
             try
             {
@@ -173,7 +173,7 @@ namespace osu.Desktop
                         new Button
                         {
                             Label = "View beatmap",
-                            Url = $@"{api.Endpoints.WebsiteUrl}/beatmaps/{beatmapId}?mode={ruleset.Value.ShortName}"
+                            Url = $@"{api.WebsiteRootUrl}/beatmaps/{beatmapId}?mode={ruleset.Value.ShortName}"
                         }
                     };
                 }

osu.Desktop/Security/ElevatedPrivilegesChecker.cs

@@ -30,6 +30,8 @@ namespace osu.Desktop.Security
 
         private partial class ElevatedPrivilegesNotification : SimpleNotification
         {
+            public override bool IsImportant => true;
+
             public ElevatedPrivilegesNotification()
             {
                 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.";

osu.Desktop/osu.Desktop.csproj

@@ -24,7 +24,7 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="9.0.2" />
+    <PackageReference Include="System.IO.Packaging" Version="9.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageReference Include="Velopack" Version="0.0.1053" />
   </ItemGroup>

osu.Game.Rulesets.Catch.Tests/Editor/CatchPlacementBlueprintTestScene.cs

@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
@@ -22,8 +23,6 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
     public abstract partial class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
     {
-        protected sealed override Ruleset CreateRuleset() => new CatchRuleset();
-
         protected const double TIME_SNAP = 100;
 
         protected DrawableCatchHitObject LastObject;
@@ -72,11 +71,11 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             contentContainer.Playfield.HitObjectContainer.Add(hitObject);
         }
 
-        protected override void UpdatePlacementTimeAndPosition()
+        protected override SnapResult SnapForBlueprint(HitObjectPlacementBlueprint blueprint)
         {
-            var position = InputManager.CurrentState.Mouse.Position;
-            double time = Math.Round(HitObjectContainer.TimeAtScreenSpacePosition(position) / TIME_SNAP) * TIME_SNAP;
-            CurrentBlueprint.UpdateTimeAndPosition(position, time);
+            var result = base.SnapForBlueprint(blueprint);
+            result.Time = Math.Round(HitObjectContainer.TimeAtScreenSpacePosition(result.ScreenSpacePosition) / TIME_SNAP) * TIME_SNAP;
+            return result;
         }
     }
 }

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -17,30 +16,26 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             int fruits = HitObjects.Count(s => s is Fruit);
             int juiceStreams = HitObjects.Count(s => s is JuiceStream);
             int bananaShowers = HitObjects.Count(s => s is BananaShower);
-            int sum = Math.Max(1, fruits + juiceStreams);
 
             return new[]
             {
                 new BeatmapStatistic
                 {
-                    Name = @"Fruits",
+                    Name = @"Fruit Count",
                     Content = fruits.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
-                    BarDisplayLength = fruits / (float)sum,
                 },
                 new BeatmapStatistic
                 {
-                    Name = @"Juice Streams",
+                    Name = @"Juice Stream Count",
                     Content = juiceStreams.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
-                    BarDisplayLength = juiceStreams / (float)sum,
                 },
                 new BeatmapStatistic
                 {
-                    Name = @"Banana Showers",
+                    Name = @"Banana Shower Count",
                     Content = bananaShowers.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
-                    BarDisplayLength = Math.Min(bananaShowers / 10f, 1),
                 }
             };
         }

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
                         // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
                         // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
-                        TickDistanceMultiplier = beatmap.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(obj.StartTime).SliderVelocity : 1,
+                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(obj.StartTime).SliderVelocity : 1,
                         SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
 

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -14,7 +14,6 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Catch.Edit;
-using osu.Game.Rulesets.Catch.Edit.Setup;
 using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -229,7 +228,7 @@ namespace osu.Game.Rulesets.Catch
         public override IEnumerable<Drawable> CreateEditorSetupSections() =>
         [
             new MetadataSection(),
-            new CatchDifficultySection(),
+            new DifficultySection(),
             new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Y,

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 
@@ -9,6 +10,15 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
     public class CatchDifficultyAttributes : DifficultyAttributes
     {
+        /// <summary>
+        /// The perceived approach rate inclusive of rate-adjusting mods (DT/HT/etc).
+        /// </summary>
+        /// <remarks>
+        /// Rate-adjusting mods don't directly affect the approach rate difficulty value, but have a perceived effect as a result of adjusting audio timing.
+        /// </remarks>
+        [JsonProperty("approach_rate")]
+        public double ApproachRate { get; set; }
+
         public override IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             foreach (var v in base.ToDatabaseAttributes())
@@ -16,6 +26,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             // Todo: osu!catch should not output star rating in the 'aim' attribute.
             yield return (ATTRIB_ID_AIM, StarRating);
+            yield return (ATTRIB_ID_APPROACH_RATE, ApproachRate);
         }
 
         public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
@@ -23,6 +34,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             base.FromDatabaseAttributes(values, onlineInfo);
 
             StarRating = values[ATTRIB_ID_AIM];
+            ApproachRate = values[ATTRIB_ID_APPROACH_RATE];
         }
     }
 }

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
@@ -24,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         private float halfCatcherWidth;
 
-        public override int Version => 20250306;
+        public override int Version => 20220701;
 
         public CatchDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
@@ -36,10 +35,14 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (beatmap.HitObjects.Count == 0)
                 return new CatchDifficultyAttributes { Mods = mods };
 
+            // this is the same as osu!, so there's potential to share the implementation... maybe
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
+
             CatchDifficultyAttributes attributes = new CatchDifficultyAttributes
             {
-                StarRating = Math.Sqrt(skills.OfType<Movement>().Single().DifficultyValue()) * difficulty_multiplier,
+                StarRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier,
                 Mods = mods,
+                ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
                 MaxCombo = beatmap.GetMaxCombo(),
             };
 

osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs

@@ -3,9 +3,6 @@
 
 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;
@@ -53,19 +50,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (catchAttributes.MaxCombo > 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));
-
-            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;
-
-            double approachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0;
-
+            double approachRate = catchAttributes.ApproachRate;
             double approachRateFactor = 1.0;
             if (approachRate > 9.0)
                 approachRateFactor += 0.1 * (approachRate - 9.0); // 10% for each AR above 9

osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs

@@ -26,9 +26,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
         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.
@@ -61,9 +59,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
             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);
@@ -97,30 +92,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
                     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;
+                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
             }
 
             lastPlayerPosition = playerPosition;
             lastDistanceMoved = distanceMoved;
             lastStrainTime = catchCurrent.StrainTime;
-            lastExactDistanceMoved = exactDistanceMoved;
 
             return distanceAddition / weightedStrainTime;
         }

osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs

@@ -7,7 +7,6 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
@@ -60,13 +59,11 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
             return base.OnMouseDown(e);
         }
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double fallbackTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var result = Composer?.FindSnappedPositionAndTime(screenSpacePosition) ?? new SnapResult(screenSpacePosition, fallbackTime);
+            base.UpdateTimeAndPosition(result);
 
-            base.UpdateTimeAndPosition(result.ScreenSpacePosition, result.Time ?? fallbackTime);
-
-            if (!(result.Time is double time)) return result;
+            if (!(result.Time is double time)) return;
 
             switch (PlacementActive)
             {
@@ -81,7 +78,6 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 
             HitObject.StartTime = Math.Min(placementStartTime, placementEndTime);
             HitObject.EndTime = Math.Max(placementStartTime, placementEndTime);
-            return result;
         }
     }
 }

osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs

@@ -9,7 +9,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public abstract partial class CatchPlacementBlueprint<THitObject> : HitObjectPlacementBlueprint
+    public partial class CatchPlacementBlueprint<THitObject> : HitObjectPlacementBlueprint
         where THitObject : CatchHitObject, new()
     {
         protected new THitObject HitObject => (THitObject)base.HitObject;
@@ -19,10 +19,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
         [Resolved]
         private Playfield playfield { get; set; } = null!;
 
-        [Resolved]
-        protected CatchHitObjectComposer? Composer { get; private set; }
-
-        protected CatchPlacementBlueprint()
+        public CatchPlacementBlueprint()
             : base(new THitObject())
         {
         }

osu.Game.Rulesets.Catch/Edit/Blueprints/Components/SelectionEditablePath.cs

@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
         {
             base.UpdateHitObjectFromPath(hitObject);
 
-            if (hitObject.Path.ControlPoints.Count <= 1 || !hitObject.Path.HasValidLengthForPlacement)
+            if (hitObject.Path.ControlPoints.Count <= 1 || !hitObject.Path.HasValidLength)
                 EditorBeatmap?.Remove(hitObject);
         }
     }

osu.Game.Rulesets.Catch/Edit/Blueprints/FruitPlacementBlueprint.cs

@@ -5,7 +5,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
@@ -42,20 +41,11 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
             return true;
         }
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double fallbackTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var gridSnapResult = Composer?.FindSnappedPositionAndTime(screenSpacePosition) ?? new SnapResult(screenSpacePosition, fallbackTime);
-            gridSnapResult.ScreenSpacePosition.X = screenSpacePosition.X;
-            var distanceSnapResult = Composer?.TryDistanceSnap(gridSnapResult.ScreenSpacePosition);
-
-            var result = distanceSnapResult != null && Vector2.Distance(gridSnapResult.ScreenSpacePosition, distanceSnapResult.ScreenSpacePosition) < CatchHitObjectComposer.DISTANCE_SNAP_RADIUS
-                ? distanceSnapResult
-                : gridSnapResult;
-
-            base.UpdateTimeAndPosition(result.ScreenSpacePosition, result.Time ?? fallbackTime);
+            base.UpdateTimeAndPosition(result);
 
             HitObject.X = ToLocalSpace(result.ScreenSpacePosition).X;
-            return result;
         }
     }
 }

osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs

@@ -83,16 +83,8 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
             return base.OnMouseDown(e);
         }
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double fallbackTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var gridSnapResult = Composer?.FindSnappedPositionAndTime(screenSpacePosition) ?? new SnapResult(screenSpacePosition, fallbackTime);
-            gridSnapResult.ScreenSpacePosition.X = screenSpacePosition.X;
-            var distanceSnapResult = Composer?.TryDistanceSnap(gridSnapResult.ScreenSpacePosition);
-
-            var result = distanceSnapResult != null && Vector2.Distance(gridSnapResult.ScreenSpacePosition, distanceSnapResult.ScreenSpacePosition) < CatchHitObjectComposer.DISTANCE_SNAP_RADIUS
-                ? distanceSnapResult
-                : gridSnapResult;
-
             switch (PlacementActive)
             {
                 case PlacementState.Waiting:
@@ -107,7 +99,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
                     break;
 
                 default:
-                    return result;
+                    return;
             }
 
             // Make sure the up-to-date position is used for outlines.
@@ -121,7 +113,6 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
             ApplyDefaultsToHitObject();
             scrollingPath.UpdatePathFrom(HitObjectContainer, HitObject);
             nestedOutlineContainer.UpdateNestedObjectsFrom(HitObjectContainer, HitObject);
-            return result;
         }
 
         private double positionToTime(float relativeYPosition)

osu.Game.Rulesets.Catch/Edit/CatchBlueprintContainer.cs

@@ -1,22 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Catch.Edit.Blueprints;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
     public partial class CatchBlueprintContainer : ComposeBlueprintContainer
     {
-        public new CatchHitObjectComposer Composer => (CatchHitObjectComposer)base.Composer;
-
         public CatchBlueprintContainer(CatchHitObjectComposer composer)
             : base(composer)
         {
@@ -42,28 +36,5 @@ namespace osu.Game.Rulesets.Catch.Edit
         }
 
         protected sealed override DragBox CreateDragBox() => new ScrollingDragBox(Composer.Playfield);
-
-        protected override bool TryMoveBlueprints(DragEvent e, IList<(SelectionBlueprint<HitObject> blueprint, Vector2[] originalSnapPositions)> blueprints)
-        {
-            Vector2 distanceTravelled = e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
-
-            // The final movement position, relative to movementBlueprintOriginalPosition.
-            Vector2 movePosition = blueprints.First().originalSnapPositions.First() + distanceTravelled;
-
-            // Retrieve a snapped position.
-            var gridSnapResult = Composer.FindSnappedPositionAndTime(movePosition);
-            gridSnapResult.ScreenSpacePosition.X = movePosition.X;
-            var distanceSnapResult = Composer.TryDistanceSnap(gridSnapResult.ScreenSpacePosition);
-
-            var result = distanceSnapResult != null && Vector2.Distance(gridSnapResult.ScreenSpacePosition, distanceSnapResult.ScreenSpacePosition) < CatchHitObjectComposer.DISTANCE_SNAP_RADIUS
-                ? distanceSnapResult
-                : gridSnapResult;
-
-            var referenceBlueprint = blueprints.First().blueprint;
-            bool moved = SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(referenceBlueprint, result.ScreenSpacePosition - referenceBlueprint.ScreenSpaceSelectionPoint));
-            if (moved)
-                ApplySnapResultTime(result, referenceBlueprint.Item.StartTime);
-            return moved;
-        }
     }
 }

osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             //
             // The implementation below is probably correct but should be checked if/when exposed via controls.
 
-            float expectedDistance = DurationToDistance(after.StartTime - before.GetEndTime(), before.StartTime);
+            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
 
             float previousEndX = (before as JuiceStream)?.EndX ?? ((CatchHitObject)before).EffectiveX;
             float actualDistance = Math.Abs(previousEndX - ((CatchHitObject)after).EffectiveX);

osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs

@@ -23,10 +23,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
-    [Cached]
     public partial class CatchHitObjectComposer : ScrollingHitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
     {
-        public const float DISTANCE_SNAP_RADIUS = 50;
+        private const float distance_snap_radius = 50;
 
         private CatchDistanceSnapGrid distanceSnapGrid = null!;
 
@@ -136,12 +135,22 @@ namespace osu.Game.Rulesets.Catch.Edit
             DistanceSnapProvider.HandleToggleViaKey(key);
         }
 
-        public SnapResult? TryDistanceSnap(Vector2 screenSpacePosition)
+        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
         {
-            if (distanceSnapGrid.IsPresent && distanceSnapGrid.GetSnappedPosition(screenSpacePosition) is SnapResult snapResult)
-                return snapResult;
+            var result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);
 
-            return null;
+            result.ScreenSpacePosition.X = screenSpacePosition.X;
+
+            if (snapType.HasFlag(SnapType.RelativeGrids))
+            {
+                if (distanceSnapGrid.IsPresent && distanceSnapGrid.GetSnappedPosition(result.ScreenSpacePosition) is SnapResult snapResult &&
+                    Vector2.Distance(snapResult.ScreenSpacePosition, result.ScreenSpacePosition) < distance_snap_radius)
+                {
+                    result = snapResult;
+                }
+            }
+
+            return result;
         }
 
         private PalpableCatchHitObject? getLastSnappableHitObject(double time)

osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
@@ -13,7 +12,6 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
-using osuTK.Input;
 using Direction = osu.Framework.Graphics.Direction;
 
 namespace osu.Game.Rulesets.Catch.Edit
@@ -40,13 +38,6 @@ namespace osu.Game.Rulesets.Catch.Edit
                 return true;
             }
 
-            moveSelection(deltaX);
-
-            return true;
-        }
-
-        private void moveSelection(float deltaX)
-        {
             EditorBeatmap.PerformOnSelection(h =>
             {
                 if (!(h is CatchHitObject catchObject)) return;
@@ -57,60 +48,7 @@ namespace osu.Game.Rulesets.Catch.Edit
                 foreach (var nested in catchObject.NestedHitObjects.OfType<CatchHitObject>())
                     nested.OriginalX += deltaX;
             });
-        }
 
-        private bool nudgeMovementActive;
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            // Until the keys below are global actions, this will prevent conflicts with "seek between sample points"
-            // which has a default of ctrl+shift+arrows.
-            if (e.ShiftPressed)
-                return false;
-
-            if (e.ControlPressed)
-            {
-                switch (e.Key)
-                {
-                    case Key.Left:
-                        return nudgeSelection(-1);
-
-                    case Key.Right:
-                        return nudgeSelection(1);
-                }
-            }
-
-            return false;
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            base.OnKeyUp(e);
-
-            if (nudgeMovementActive && !e.ControlPressed)
-            {
-                EditorBeatmap.EndChange();
-                nudgeMovementActive = false;
-            }
-        }
-
-        /// <summary>
-        /// Move the current selection spatially by the specified delta, in gamefield coordinates (ie. the same coordinates as the blueprints).
-        /// </summary>
-        private bool nudgeSelection(float deltaX)
-        {
-            if (!nudgeMovementActive)
-            {
-                nudgeMovementActive = true;
-                EditorBeatmap.BeginChange();
-            }
-
-            var firstBlueprint = SelectedBlueprints.FirstOrDefault();
-
-            if (firstBlueprint == null)
-                return false;
-
-            moveSelection(deltaX);
             return true;
         }
 

osu.Game.Rulesets.Catch/Edit/Setup/CatchDifficultySection.cs

@@ -1,127 +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 osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Localisation;
-using osu.Game.Resources.Localisation.Web;
-using osu.Game.Screens.Edit.Setup;
-
-namespace osu.Game.Rulesets.Catch.Edit.Setup
-{
-    public partial class CatchDifficultySection : SetupSection
-    {
-        private FormSliderBar<float> circleSizeSlider { get; set; } = null!;
-        private FormSliderBar<float> healthDrainSlider { get; set; } = null!;
-        private FormSliderBar<float> approachRateSlider { get; set; } = null!;
-        private FormSliderBar<double> baseVelocitySlider { get; set; } = null!;
-        private FormSliderBar<double> tickRateSlider { get; set; } = null!;
-
-        public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Children = new Drawable[]
-            {
-                circleSizeSlider = new FormSliderBar<float>
-                {
-                    Caption = BeatmapsetsStrings.ShowStatsCs,
-                    HintText = EditorSetupStrings.CircleSizeDescription,
-                    Current = new BindableFloat(Beatmap.Difficulty.CircleSize)
-                    {
-                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
-                        MinValue = 0,
-                        MaxValue = 10,
-                        Precision = 0.1f,
-                    },
-                    TransferValueOnCommit = true,
-                    TabbableContentContainer = this,
-                },
-                healthDrainSlider = new FormSliderBar<float>
-                {
-                    Caption = BeatmapsetsStrings.ShowStatsDrain,
-                    HintText = EditorSetupStrings.DrainRateDescription,
-                    Current = new BindableFloat(Beatmap.Difficulty.DrainRate)
-                    {
-                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
-                        MinValue = 0,
-                        MaxValue = 10,
-                        Precision = 0.1f,
-                    },
-                    TransferValueOnCommit = true,
-                    TabbableContentContainer = this,
-                },
-                approachRateSlider = new FormSliderBar<float>
-                {
-                    Caption = BeatmapsetsStrings.ShowStatsAr,
-                    HintText = EditorSetupStrings.ApproachRateDescription,
-                    Current = new BindableFloat(Beatmap.Difficulty.ApproachRate)
-                    {
-                        Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
-                        MinValue = 0,
-                        MaxValue = 10,
-                        Precision = 0.1f,
-                    },
-                    TransferValueOnCommit = true,
-                    TabbableContentContainer = this,
-                },
-                baseVelocitySlider = new FormSliderBar<double>
-                {
-                    Caption = EditorSetupStrings.BaseVelocity,
-                    HintText = EditorSetupStrings.BaseVelocityDescription,
-                    KeyboardStep = 0.1f,
-                    Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
-                    {
-                        Default = 1.4,
-                        MinValue = 0.4,
-                        MaxValue = 3.6,
-                        Precision = 0.01f,
-                    },
-                    TransferValueOnCommit = true,
-                    TabbableContentContainer = this,
-                },
-                tickRateSlider = new FormSliderBar<double>
-                {
-                    Caption = EditorSetupStrings.TickRate,
-                    HintText = EditorSetupStrings.TickRateDescription,
-                    KeyboardStep = 1,
-                    Current = new BindableDouble(Beatmap.Difficulty.SliderTickRate)
-                    {
-                        Default = 1,
-                        MinValue = 1,
-                        MaxValue = 4,
-                        Precision = 1,
-                    },
-                    TransferValueOnCommit = true,
-                    TabbableContentContainer = this,
-                },
-            };
-
-            foreach (var item in Children.OfType<FormSliderBar<float>>())
-                item.Current.ValueChanged += _ => updateValues();
-
-            foreach (var item in Children.OfType<FormSliderBar<double>>())
-                item.Current.ValueChanged += _ => updateValues();
-        }
-
-        private void updateValues()
-        {
-            // for now, update these on commit rather than making BeatmapMetadata bindables.
-            // after switching database engines we can reconsider if switching to bindables is a good direction.
-            Beatmap.Difficulty.CircleSize = circleSizeSlider.Current.Value;
-            Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
-            Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
-            Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;
-            Beatmap.Difficulty.SliderTickRate = tickRateSlider.Current.Value;
-
-            Beatmap.UpdateAllHitObjects();
-            Beatmap.SaveState();
-        }
-    }
-}

osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs

@@ -1,9 +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 System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Beatmaps;
@@ -36,21 +35,21 @@ 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 IEnumerable<(LocalisableString setting, LocalisableString value)> SettingDescription
+        public override string SettingDescription
         {
             get
             {
-                if (!CircleSize.IsDefault)
-                    yield return ("Circle size", $"{CircleSize.Value:N1}");
+                string circleSize = CircleSize.IsDefault ? string.Empty : $"CS {CircleSize.Value:N1}";
+                string approachRate = ApproachRate.IsDefault ? string.Empty : $"AR {ApproachRate.Value:N1}";
+                string spicyPatterns = HardRockOffsets.IsDefault ? string.Empty : "Spicy patterns";
 
-                foreach (var setting in base.SettingDescription)
-                    yield return setting;
-
-                if (!ApproachRate.IsDefault)
-                    yield return ("Approach rate", $"{ApproachRate.Value:N1}");
-
-                if (!HardRockOffsets.IsDefault)
-                    yield return ("Spicy patterns", "On");
+                return string.Join(", ", new[]
+                {
+                    circleSize,
+                    base.SettingDescription,
+                    approachRate,
+                    spicyPatterns,
+                }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
 

osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs

@@ -8,6 +8,6 @@ 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 LocalisableString Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and three lives!";
     }
 }

osu.Game.Rulesets.Catch/Skinning/Argon/ArgonBananaPiece.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -111,7 +110,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
 
             double duration = ObjectState.HitObject.StartTime - ObjectState.DisplayStartTime;
 
-            fadeContent.Alpha = Math.Clamp(
+            fadeContent.Alpha = MathHelper.Clamp(
                 Interpolation.ValueAt(
                     Time.Current, 1f, 0f,
                     ObjectState.DisplayStartTime + duration * lens_flare_start,

osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -48,7 +47,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                             return new DefaultSkinComponentsContainer(container =>
                             {
                                 var keyCounter = container.OfType<LegacyKeyCounterDisplay>().FirstOrDefault();
-                                var spectatorList = container.OfType<SpectatorList>().FirstOrDefault();
 
                                 if (keyCounter != null)
                                 {
@@ -57,19 +55,11 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                                     keyCounter.Origin = Anchor.TopRight;
                                     keyCounter.Position = new Vector2(0, -40) * 1.6f;
                                 }
-
-                                if (spectatorList != null)
-                                {
-                                    spectatorList.Anchor = Anchor.BottomLeft;
-                                    spectatorList.Origin = Anchor.BottomLeft;
-                                    spectatorList.Position = new Vector2(10, -10);
-                                }
                             })
                             {
                                 Children = new Drawable[]
                                 {
                                     new LegacyKeyCounterDisplay(),
-                                    new SpectatorList(),
                                 }
                             };
                     }

osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.UI;
@@ -16,8 +15,6 @@ namespace osu.Game.Rulesets.Catch.UI
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        private readonly Container scaleContainer;
-
         public CatchPlayfieldAdjustmentContainer()
         {
             const float base_game_width = 1024f;
@@ -29,49 +26,30 @@ namespace osu.Game.Rulesets.Catch.UI
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            InternalChild = scaleContainer = new Container
+            InternalChild = new Container
             {
+                // This container limits vertical visibility of the playfield to ensure fairness between wide and tall resolutions (i.e. tall resolutions should not see more fruits).
+                // Note that the container still extends across the screen horizontally, so that hit explosions at the sides of the playfield do not get cut off.
+                Name = "Visible area",
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.X,
+                Height = base_game_height + extra_bottom_space,
+                Y = extra_bottom_space / 2,
+                Masking = true,
                 Child = new Container
                 {
-                    // This container limits vertical visibility of the playfield to ensure fairness between wide and tall resolutions (i.e. tall resolutions should not see more fruits).
-                    // Note that the container still extends across the screen horizontally, so that hit explosions at the sides of the playfield do not get cut off.
-                    Name = "Visible area",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Height = base_game_height + extra_bottom_space,
-                    Y = extra_bottom_space / 2,
-                    Masking = true,
-                    Child = new Container
-                    {
-                        Name = "Playable area",
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
-                        Y = base_game_height * ((1 - playfield_size_adjust) / 4 * 3),
-                        Size = new Vector2(base_game_width, base_game_height) * playfield_size_adjust,
-                        Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
-                    },
-                }
+                    Name = "Playable area",
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
+                    Y = base_game_height * ((1 - playfield_size_adjust) / 4 * 3),
+                    Size = new Vector2(base_game_width, base_game_height) * playfield_size_adjust,
+                    Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
+                },
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuGame? osuGame)
-        {
-            if (osuGame != null)
-            {
-                // on mobile platforms where the base aspect ratio is wider, the catch playfield
-                // needs to be scaled down to remain playable.
-                const float base_aspect_ratio = 1024f / 768f;
-                float aspectRatio = osuGame.ScalingContainerTargetDrawSize.X / osuGame.ScalingContainerTargetDrawSize.Y;
-                scaleContainer.Scale = new Vector2(base_aspect_ratio / aspectRatio);
-            }
-        }
-
         /// <summary>
         /// A <see cref="Container"/> which scales its content relative to a target width.
         /// </summary>

osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs

@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -22,8 +23,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
     public abstract partial class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene
     {
-        protected sealed override Ruleset CreateRuleset() => new ManiaRuleset();
-
         private readonly Column column;
 
         [Cached(typeof(IReadOnlyList<Mod>))]
@@ -48,11 +47,12 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        protected override void UpdatePlacementTimeAndPosition()
+        protected override SnapResult SnapForBlueprint(HitObjectPlacementBlueprint blueprint)
         {
             double time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
             var pos = column.ScreenSpacePositionAtTime(time);
-            CurrentBlueprint.UpdateTimeAndPosition(pos, time);
+
+            return new SnapResult(pos, time, column);
         }
 
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };

osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs

@@ -20,6 +20,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
@@ -99,5 +100,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         {
             set => InternalChild = value;
         }
+
+        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaEditorSaving.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             {
                 keyCount.Current.Value = 8;
             });
-            AddUntilStep("dialog visible", () => Game.ChildrenOfType<IDialogOverlay>().SingleOrDefault()?.CurrentDialog, Is.InstanceOf<SaveAndReloadEditorDialog>);
+            AddUntilStep("dialog visible", () => Game.ChildrenOfType<IDialogOverlay>().SingleOrDefault()?.CurrentDialog, Is.InstanceOf<ReloadEditorDialog>);
             AddStep("refuse", () => InputManager.Key(Key.Number2));
             AddAssert("key count is 5", () => keyCount.Current.Value, () => Is.EqualTo(5));
 
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             {
                 keyCount.Current.Value = 8;
             });
-            AddUntilStep("dialog visible", () => Game.ChildrenOfType<IDialogOverlay>().Single().CurrentDialog, Is.InstanceOf<SaveAndReloadEditorDialog>);
+            AddUntilStep("dialog visible", () => Game.ChildrenOfType<IDialogOverlay>().Single().CurrentDialog, Is.InstanceOf<ReloadEditorDialog>);
             AddStep("acquiesce", () => InputManager.Key(Key.Number1));
             AddUntilStep("beatmap became 8K", () => Game.Beatmap.Value.BeatmapInfo.Difficulty.CircleSize, () => Is.EqualTo(8));
         }

osu.Game.Rulesets.Mania.Tests/ManiaFilterCriteriaTest.cs

@@ -1,187 +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.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
-using osu.Game.Screens.Select;
-using osu.Game.Screens.Select.Filter;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class ManiaFilterCriteriaTest
-    {
-        [TestCase]
-        public void TestKeysEqualSingleValue()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.Equal, "1");
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 1 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 2 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new RulesetInfo { OnlineID = 0 }, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria
-                {
-                    Mods = [new ManiaModKey1()]
-                }));
-        }
-
-        [TestCase]
-        public void TestKeysEqualMultipleValues()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.Equal, "1,3,5,7");
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 1 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 2 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new RulesetInfo { OnlineID = 0 }, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria
-                {
-                    Mods = [new ManiaModKey1()]
-                }));
-        }
-
-        [TestCase]
-        public void TestKeysNotEqualSingleValue()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.NotEqual, "1");
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 1 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 2 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new RulesetInfo { OnlineID = 0 }, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria
-                {
-                    Mods = [new ManiaModKey1()]
-                }));
-        }
-
-        [TestCase]
-        public void TestKeysNotEqualMultipleValues()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.NotEqual, "1,3,5,7");
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 1 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 2 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new RulesetInfo { OnlineID = 0 }, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria
-                {
-                    Mods = [new ManiaModKey1()]
-                }));
-        }
-
-        [TestCase]
-        public void TestKeysGreaterOrEqualThan()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.GreaterOrEqual, "4");
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 1 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 2 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 5 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new RulesetInfo { OnlineID = 0 }, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria
-                {
-                    Mods = [new ManiaModKey7()]
-                }));
-        }
-
-        [TestCase]
-        public void TestFilterIntersection()
-        {
-            var criteria = new ManiaFilterCriteria();
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.Greater, "4");
-            criteria.TryParseCustomKeywordCriteria("keys", Operator.NotEqual, "7");
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 3 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 4 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 5 }),
-                new FilterCriteria()));
-
-            Assert.False(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 7 }),
-                new FilterCriteria()));
-
-            Assert.True(criteria.Matches(
-                new BeatmapInfo(new ManiaRuleset().RulesetInfo, new BeatmapDifficulty { CircleSize = 9 }),
-                new FilterCriteria()));
-        }
-
-        [TestCase]
-        public void TestInvalidFilters()
-        {
-            var criteria = new ManiaFilterCriteria();
-
-            Assert.False(criteria.TryParseCustomKeywordCriteria("keys", Operator.Equal, "some text"));
-            Assert.False(criteria.TryParseCustomKeywordCriteria("keys", Operator.NotEqual, "4,some text"));
-            Assert.False(criteria.TryParseCustomKeywordCriteria("keys", Operator.GreaterOrEqual, "4,5,6"));
-        }
-    }
-}

osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         {
             CreateModTest(new ModTestData
             {
-                Mod = new ManiaModFadeIn(),
+                Mod = new ManiaModHidden(),
                 PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
             });
         }
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         {
             CreateModTest(new ModTestData
             {
-                Mod = new ManiaModFadeIn(),
+                Mod = new ManiaModHidden(),
                 PassCondition = () => checkCoverage(ManiaModHidden.MIN_COVERAGE)
             });
 
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         {
             CreateModTest(new ModTestData
             {
-                Mod = new ManiaModFadeIn(),
+                Mod = new ManiaModHidden(),
                 PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
             });
 
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         {
             CreateModTest(new ModTestData
             {
-                Mod = new ManiaModFadeIn(),
+                Mod = new ManiaModHidden(),
                 PassCondition = () => checkCoverage(ManiaModHidden.MAX_COVERAGE)
             });
 
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         {
             CreateModTest(new ModTestData
             {
-                Mod = new ManiaModFadeIn(),
+                Mod = new ManiaModHidden(),
                 CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),

osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnHitObjectArea.cs

@@ -28,20 +28,18 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new ColumnHitObjectArea
+                        Child = new ColumnHitObjectArea(new HitObjectContainer())
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Child = new HitObjectContainer(),
+                            RelativeSizeAxes = Axes.Both
                         }
                     },
                     new ColumnTestContainer(1, ManiaAction.Key2)
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new ColumnHitObjectArea
+                        Child = new ColumnHitObjectArea(new HitObjectContainer())
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Child = new HitObjectContainer(),
+                            RelativeSizeAxes = Axes.Both
                         }
                     }
                 }

osu.Game.Rulesets.Mania.Tests/TestSceneLegacyReplayPlayback.cs

@@ -1,470 +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.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osu.Game.Tests.Visual;
-using osuTK;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [Ignore("These tests are expected to fail until an acceptable solution for various replay playback issues concerning rounding of replay frame times & hit windows is found.")]
-    public partial class TestSceneLegacyReplayPlayback : LegacyReplayPlaybackTestScene
-    {
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
-
-        protected override string? ExportLocation => null;
-
-        private static readonly object[][] score_v2_test_cases =
-        {
-            // With respect to notation,
-            // square brackets `[]` represent *closed* or *inclusive* bounds,
-            // while round brackets `()` represent *open* or *exclusive* bounds.
-
-            // Note that mania hitwindows are heavily idiosyncratic,
-            // and if you *think* a number here is wrong, probably double check.
-
-            // Known issues / complexities:
-            // - There is a disparate set of hitwindow ranges for: score V1 non-converts, score V1 converts, and score V2 (regardless of convert)
-            // - It is NEVER POSSIBLE to get a MEH result when late; exceeding the OK hit windows will result in a MISS.
-            //   Additionally, the OK hit window when late is EXCLUSIVE / OPEN rather than INCLUSIVE / CLOSED.
-            //   Relevant stable source: https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameplayElements/HitObjectManagerMania.cs#L737-L751
-            // - There is also a seemingly mania-specific issue wherein key inputs registered before time instant 0 get truncated to time 0,
-            //   which is why the beatmaps used below make sure not to cross that boundary (the note starts at t=300ms).
-            //   This is not an issue in osu! or taiko.
-            //   The source of this behaviour has not been investigated in detail.
-
-            // OD = 5 test cases.
-            // PERFECT hit window is [ -19ms,  19ms]
-            // GREAT   hit window is [ -49ms,  49ms]
-            // GOOD    hit window is [ -82ms,  82ms]
-            // OK      hit window is [-112ms, 112ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-136ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 5f, -18d, HitResult.Perfect },
-            new object[] { 5f, -19d, HitResult.Perfect },
-            new object[] { 5f, -20d, HitResult.Great },
-            new object[] { 5f, -21d, HitResult.Great },
-            new object[] { 5f, -48d, HitResult.Great },
-            new object[] { 5f, -49d, HitResult.Great },
-            new object[] { 5f, -50d, HitResult.Good },
-            new object[] { 5f, -51d, HitResult.Good },
-            new object[] { 5f, -81d, HitResult.Good },
-            new object[] { 5f, -82d, HitResult.Good },
-            new object[] { 5f, -83d, HitResult.Ok },
-            new object[] { 5f, -84d, HitResult.Ok },
-            new object[] { 5f, -111d, HitResult.Ok },
-            new object[] { 5f, -112d, HitResult.Ok },
-            new object[] { 5f, -113d, HitResult.Meh },
-            new object[] { 5f, -114d, HitResult.Meh },
-            new object[] { 5f, -135d, HitResult.Meh },
-            new object[] { 5f, -136d, HitResult.Meh },
-            new object[] { 5f, -137d, HitResult.Miss },
-            new object[] { 5f, -138d, HitResult.Miss },
-            new object[] { 5f, 111d, HitResult.Ok },
-            new object[] { 5f, 112d, HitResult.Miss },
-            new object[] { 5f, 113d, HitResult.Miss },
-            new object[] { 5f, 114d, HitResult.Miss },
-            new object[] { 5f, 135d, HitResult.Miss },
-            new object[] { 5f, 136d, HitResult.Miss },
-            new object[] { 5f, 137d, HitResult.Miss },
-            new object[] { 5f, 138d, HitResult.Miss },
-
-            // OD = 9.3 test cases.
-            // PERFECT hit window is [ -14ms,  14ms]
-            // GREAT   hit window is [ -36ms,  36ms]
-            // GOOD    hit window is [ -69ms,  69ms]
-            // OK      hit window is [ -99ms,  99ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-123ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 9.3f, 13d, HitResult.Perfect },
-            new object[] { 9.3f, 14d, HitResult.Perfect },
-            new object[] { 9.3f, 15d, HitResult.Great },
-            new object[] { 9.3f, 16d, HitResult.Great },
-            new object[] { 9.3f, 35d, HitResult.Great },
-            new object[] { 9.3f, 36d, HitResult.Great },
-            new object[] { 9.3f, 37d, HitResult.Good },
-            new object[] { 9.3f, 38d, HitResult.Good },
-            new object[] { 9.3f, 68d, HitResult.Good },
-            new object[] { 9.3f, 69d, HitResult.Good },
-            new object[] { 9.3f, 70d, HitResult.Ok },
-            new object[] { 9.3f, 71d, HitResult.Ok },
-            new object[] { 9.3f, 98d, HitResult.Ok },
-            new object[] { 9.3f, 99d, HitResult.Miss },
-            new object[] { 9.3f, 100d, HitResult.Miss },
-            new object[] { 9.3f, 101d, HitResult.Miss },
-            new object[] { 9.3f, 122d, HitResult.Miss },
-            new object[] { 9.3f, 123d, HitResult.Miss },
-            new object[] { 9.3f, 124d, HitResult.Miss },
-            new object[] { 9.3f, 125d, HitResult.Miss },
-            new object[] { 9.3f, -98d, HitResult.Ok },
-            new object[] { 9.3f, -99d, HitResult.Ok },
-            new object[] { 9.3f, -100d, HitResult.Meh },
-            new object[] { 9.3f, -101d, HitResult.Meh },
-            new object[] { 9.3f, -122d, HitResult.Meh },
-            new object[] { 9.3f, -123d, HitResult.Meh },
-            new object[] { 9.3f, -124d, HitResult.Miss },
-            new object[] { 9.3f, -125d, HitResult.Miss },
-        };
-
-        private static readonly object[][] score_v1_non_convert_test_cases =
-        {
-            // OD = 5 test cases.
-            // PERFECT hit window is [ -16ms,  16ms]
-            // GREAT   hit window is [ -49ms,  49ms]
-            // GOOD    hit window is [ -82ms,  82ms]
-            // OK      hit window is [-112ms, 112ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-136ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 5f, -15d, HitResult.Perfect },
-            new object[] { 5f, -16d, HitResult.Perfect },
-            new object[] { 5f, -17d, HitResult.Great },
-            new object[] { 5f, -18d, HitResult.Great },
-            new object[] { 5f, -48d, HitResult.Great },
-            new object[] { 5f, -49d, HitResult.Great },
-            new object[] { 5f, -50d, HitResult.Good },
-            new object[] { 5f, -51d, HitResult.Good },
-            new object[] { 5f, -81d, HitResult.Good },
-            new object[] { 5f, -82d, HitResult.Good },
-            new object[] { 5f, -83d, HitResult.Ok },
-            new object[] { 5f, -84d, HitResult.Ok },
-            new object[] { 5f, -111d, HitResult.Ok },
-            new object[] { 5f, -112d, HitResult.Ok },
-            new object[] { 5f, -113d, HitResult.Meh },
-            new object[] { 5f, -114d, HitResult.Meh },
-            new object[] { 5f, -135d, HitResult.Meh },
-            new object[] { 5f, -136d, HitResult.Meh },
-            new object[] { 5f, -137d, HitResult.Miss },
-            new object[] { 5f, -138d, HitResult.Miss },
-            new object[] { 5f, 111d, HitResult.Ok },
-            new object[] { 5f, 112d, HitResult.Miss },
-            new object[] { 5f, 113d, HitResult.Miss },
-            new object[] { 5f, 114d, HitResult.Miss },
-            new object[] { 5f, 135d, HitResult.Miss },
-            new object[] { 5f, 136d, HitResult.Miss },
-            new object[] { 5f, 137d, HitResult.Miss },
-            new object[] { 5f, 138d, HitResult.Miss },
-
-            // OD = 9.3 test cases.
-            // PERFECT hit window is [ -16ms,  16ms]
-            // GREAT   hit window is [ -36ms,  36ms]
-            // GOOD    hit window is [ -69ms,  69ms]
-            // OK      hit window is [ -99ms,  99ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-123ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 9.3f, 15d, HitResult.Perfect },
-            new object[] { 9.3f, 16d, HitResult.Perfect },
-            new object[] { 9.3f, 17d, HitResult.Great },
-            new object[] { 9.3f, 18d, HitResult.Great },
-            new object[] { 9.3f, 35d, HitResult.Great },
-            new object[] { 9.3f, 36d, HitResult.Great },
-            new object[] { 9.3f, 37d, HitResult.Good },
-            new object[] { 9.3f, 38d, HitResult.Good },
-            new object[] { 9.3f, 68d, HitResult.Good },
-            new object[] { 9.3f, 69d, HitResult.Good },
-            new object[] { 9.3f, 70d, HitResult.Ok },
-            new object[] { 9.3f, 71d, HitResult.Ok },
-            new object[] { 9.3f, 98d, HitResult.Ok },
-            new object[] { 9.3f, 99d, HitResult.Miss },
-            new object[] { 9.3f, 100d, HitResult.Miss },
-            new object[] { 9.3f, 101d, HitResult.Miss },
-            new object[] { 9.3f, 122d, HitResult.Miss },
-            new object[] { 9.3f, 123d, HitResult.Miss },
-            new object[] { 9.3f, 124d, HitResult.Miss },
-            new object[] { 9.3f, 125d, HitResult.Miss },
-            new object[] { 9.3f, -98d, HitResult.Ok },
-            new object[] { 9.3f, -99d, HitResult.Ok },
-            new object[] { 9.3f, -100d, HitResult.Meh },
-            new object[] { 9.3f, -101d, HitResult.Meh },
-            new object[] { 9.3f, -122d, HitResult.Meh },
-            new object[] { 9.3f, -123d, HitResult.Meh },
-            new object[] { 9.3f, -124d, HitResult.Miss },
-            new object[] { 9.3f, -125d, HitResult.Miss },
-
-            // OD = 3.1 test cases.
-            // PERFECT hit window is [ -16ms,  16ms]
-            // GREAT   hit window is [ -54ms,  54ms]
-            // GOOD    hit window is [ -87ms,  87ms]
-            // OK      hit window is [-117ms, 117ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-141ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 3.1f, 15d, HitResult.Perfect },
-            new object[] { 3.1f, 16d, HitResult.Perfect },
-            new object[] { 3.1f, 17d, HitResult.Great },
-            new object[] { 3.1f, 18d, HitResult.Great },
-            new object[] { 3.1f, 53d, HitResult.Great },
-            new object[] { 3.1f, 54d, HitResult.Great },
-            new object[] { 3.1f, 55d, HitResult.Good },
-            new object[] { 3.1f, 56d, HitResult.Good },
-            new object[] { 3.1f, 86d, HitResult.Good },
-            new object[] { 3.1f, 87d, HitResult.Good },
-            new object[] { 3.1f, 88d, HitResult.Ok },
-            new object[] { 3.1f, 89d, HitResult.Ok },
-            new object[] { 3.1f, 116d, HitResult.Ok },
-            new object[] { 3.1f, 117d, HitResult.Miss },
-            new object[] { 3.1f, 118d, HitResult.Miss },
-            new object[] { 3.1f, 119d, HitResult.Miss },
-            new object[] { 3.1f, 140d, HitResult.Miss },
-            new object[] { 3.1f, 141d, HitResult.Miss },
-            new object[] { 3.1f, 142d, HitResult.Miss },
-            new object[] { 3.1f, 143d, HitResult.Miss },
-            new object[] { 3.1f, -116d, HitResult.Ok },
-            new object[] { 3.1f, -117d, HitResult.Ok },
-            new object[] { 3.1f, -118d, HitResult.Meh },
-            new object[] { 3.1f, -119d, HitResult.Meh },
-            new object[] { 3.1f, -140d, HitResult.Meh },
-            new object[] { 3.1f, -141d, HitResult.Meh },
-            new object[] { 3.1f, -142d, HitResult.Miss },
-            new object[] { 3.1f, -143d, HitResult.Miss },
-        };
-
-        private static readonly object[][] score_v1_convert_test_cases =
-        {
-            // OD = 5 test cases.
-            // PERFECT hit window is [ -16ms,  16ms]
-            // GREAT   hit window is [ -34ms,  34ms]
-            // GOOD    hit window is [ -67ms,  67ms]
-            // OK      hit window is [ -97ms,  97ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-121ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 5f, -15d, HitResult.Perfect },
-            new object[] { 5f, -16d, HitResult.Perfect },
-            new object[] { 5f, -17d, HitResult.Great },
-            new object[] { 5f, -18d, HitResult.Great },
-            new object[] { 5f, -33d, HitResult.Great },
-            new object[] { 5f, -34d, HitResult.Great },
-            new object[] { 5f, -35d, HitResult.Good },
-            new object[] { 5f, -36d, HitResult.Good },
-            new object[] { 5f, -66d, HitResult.Good },
-            new object[] { 5f, -67d, HitResult.Good },
-            new object[] { 5f, -68d, HitResult.Ok },
-            new object[] { 5f, -69d, HitResult.Ok },
-            new object[] { 5f, -96d, HitResult.Ok },
-            new object[] { 5f, -97d, HitResult.Ok },
-            new object[] { 5f, -98d, HitResult.Meh },
-            new object[] { 5f, -99d, HitResult.Meh },
-            new object[] { 5f, -120d, HitResult.Meh },
-            new object[] { 5f, -121d, HitResult.Meh },
-            new object[] { 5f, -122d, HitResult.Miss },
-            new object[] { 5f, -123d, HitResult.Miss },
-            new object[] { 5f, 96d, HitResult.Ok },
-            new object[] { 5f, 97d, HitResult.Miss },
-            new object[] { 5f, 98d, HitResult.Miss },
-            new object[] { 5f, 99d, HitResult.Miss },
-            new object[] { 5f, 120d, HitResult.Miss },
-            new object[] { 5f, 121d, HitResult.Miss },
-            new object[] { 5f, 122d, HitResult.Miss },
-            new object[] { 5f, 123d, HitResult.Miss },
-
-            // OD = 3.1 test cases.
-            // PERFECT hit window is [ -16ms,  16ms]
-            // GREAT   hit window is [ -47ms,  47ms]
-            // GOOD    hit window is [ -77ms,  77ms]
-            // OK      hit window is [ -97ms,  97ms) <- not a typo, this side of the interval is OPEN!
-            // MEH     hit window is [-121ms, -----) <- it is NOT POSSIBLE to get a MEH result on a late hit!
-            new object[] { 3.1f, 15d, HitResult.Perfect },
-            new object[] { 3.1f, 16d, HitResult.Perfect },
-            new object[] { 3.1f, 17d, HitResult.Great },
-            new object[] { 3.1f, 18d, HitResult.Great },
-            new object[] { 3.1f, 46d, HitResult.Great },
-            new object[] { 3.1f, 47d, HitResult.Great },
-            new object[] { 3.1f, 48d, HitResult.Good },
-            new object[] { 3.1f, 49d, HitResult.Good },
-            new object[] { 3.1f, 76d, HitResult.Good },
-            new object[] { 3.1f, 77d, HitResult.Good },
-            new object[] { 3.1f, 78d, HitResult.Ok },
-            new object[] { 3.1f, 79d, HitResult.Ok },
-            new object[] { 3.1f, 96d, HitResult.Ok },
-            new object[] { 3.1f, 97d, HitResult.Miss },
-            new object[] { 3.1f, 98d, HitResult.Miss },
-            new object[] { 3.1f, 99d, HitResult.Miss },
-            new object[] { 3.1f, 120d, HitResult.Miss },
-            new object[] { 3.1f, 121d, HitResult.Miss },
-            new object[] { 3.1f, 122d, HitResult.Miss },
-            new object[] { 3.1f, 123d, HitResult.Miss },
-            new object[] { 3.1f, -96d, HitResult.Ok },
-            new object[] { 3.1f, -97d, HitResult.Ok },
-            new object[] { 3.1f, -98d, HitResult.Meh },
-            new object[] { 3.1f, -99d, HitResult.Meh },
-            new object[] { 3.1f, -120d, HitResult.Meh },
-            new object[] { 3.1f, -121d, HitResult.Meh },
-            new object[] { 3.1f, -122d, HitResult.Miss },
-            new object[] { 3.1f, -123d, HitResult.Miss },
-        };
-
-        [TestCaseSource(nameof(score_v2_test_cases))]
-        public void TestHitWindowTreatmentWithScoreV2(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double note_time = 300;
-
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
-            var beatmap = new ManiaBeatmap(new StageDefinition(1))
-            {
-                HitObjects =
-                {
-                    new Note
-                    {
-                        StartTime = note_time,
-                        Column = 0,
-                    }
-                },
-                Difficulty = new BeatmapDifficulty
-                {
-                    OverallDifficulty = overallDifficulty,
-                    CircleSize = 1,
-                },
-                BeatmapInfo =
-                {
-                    Ruleset = new ManiaRuleset().RulesetInfo,
-                },
-                ControlPointInfo = cpi,
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    new ManiaReplayFrame(0),
-                    new ManiaReplayFrame(note_time + hitOffset, ManiaAction.Key1),
-                    new ManiaReplayFrame(note_time + hitOffset + 20),
-                }
-            };
-
-            var score = new Score
-            {
-                Replay = replay,
-                ScoreInfo = new ScoreInfo
-                {
-                    Ruleset = CreateRuleset().RulesetInfo,
-                    Mods = [new ModScoreV2()]
-                }
-            };
-
-            RunTest($@"SV2 single note @ OD{overallDifficulty}", beatmap, $@"SV2 {hitOffset}ms @ OD{overallDifficulty} = {expectedResult}", score, [expectedResult]);
-        }
-
-        [TestCaseSource(nameof(score_v1_non_convert_test_cases))]
-        public void TestHitWindowTreatmentWithScoreV1NonConvert(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double note_time = 300;
-
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
-            var beatmap = new ManiaBeatmap(new StageDefinition(1))
-            {
-                HitObjects =
-                {
-                    new Note
-                    {
-                        StartTime = note_time,
-                        Column = 0,
-                    }
-                },
-                Difficulty = new BeatmapDifficulty
-                {
-                    OverallDifficulty = overallDifficulty,
-                    CircleSize = 1,
-                },
-                BeatmapInfo =
-                {
-                    Ruleset = new ManiaRuleset().RulesetInfo,
-                },
-                ControlPointInfo = cpi,
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    new ManiaReplayFrame(0),
-                    new ManiaReplayFrame(note_time + hitOffset, ManiaAction.Key1),
-                    new ManiaReplayFrame(note_time + hitOffset + 20),
-                }
-            };
-
-            var score = new Score
-            {
-                Replay = replay,
-                ScoreInfo = new ScoreInfo
-                {
-                    Ruleset = CreateRuleset().RulesetInfo,
-                }
-            };
-
-            RunTest($@"SV1 single note @ OD{overallDifficulty}", beatmap, $@"SV1 {hitOffset}ms @ OD{overallDifficulty} = {expectedResult}", score, [expectedResult]);
-        }
-
-        [TestCaseSource(nameof(score_v1_convert_test_cases))]
-        public void TestHitWindowTreatmentWithScoreV1Convert(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double note_time = 300;
-
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
-            var beatmap = new Beatmap
-            {
-                HitObjects =
-                {
-                    new FakeCircle
-                    {
-                        StartTime = note_time,
-                    }
-                },
-                Difficulty = new BeatmapDifficulty
-                {
-                    OverallDifficulty = overallDifficulty,
-                },
-                BeatmapInfo =
-                {
-                    Ruleset = new RulesetInfo { OnlineID = 0 }
-                },
-                ControlPointInfo = cpi,
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    new ManiaReplayFrame(0),
-                    new ManiaReplayFrame(note_time + hitOffset, ManiaAction.Key1),
-                    new ManiaReplayFrame(note_time + hitOffset + 20),
-                }
-            };
-
-            var score = new Score
-            {
-                Replay = replay,
-                ScoreInfo = new ScoreInfo
-                {
-                    Ruleset = CreateRuleset().RulesetInfo,
-                    Mods = [new ManiaModKey1()],
-                }
-            };
-
-            RunTest($@"SV1 convert single note @ OD{overallDifficulty}", beatmap, $@"SV1 convert {hitOffset}ms @ OD{overallDifficulty} = {expectedResult}", score, [expectedResult]);
-        }
-
-        private class FakeCircle : HitObject, IHasPosition
-        {
-            public float X
-            {
-                get => Position.X;
-                set => Position = new Vector2(value, Position.Y);
-            }
-
-            public float Y
-            {
-                get => Position.Y;
-                set => Position = new Vector2(Position.X, value);
-            }
-
-            public Vector2 Position { get; set; }
-        }
-    }
-}

osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInput.cs

@@ -1,149 +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.Graphics.Containers;
-using osu.Framework.Input;
-using osu.Framework.Testing;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Tests.Visual;
-using osuTK;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    public partial class TestSceneManiaTouchInput : PlayerTestScene
-    {
-        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
-
-        [SetUp]
-        public void SetUp() => Schedule(() => toggleTouchControls(false));
-
-        #region Without touch controls
-
-        [Test]
-        public void TestTouchInput()
-        {
-            for (int i = 0; i < 4; i++)
-            {
-                int index = i;
-
-                AddStep($"touch column {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getColumn(index).ScreenSpaceDrawQuad.Centre)));
-
-                AddAssert("action sent",
-                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                    () => Does.Contain(getColumn(index).Action.Value));
-
-                AddStep($"release column {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getColumn(index).ScreenSpaceDrawQuad.Centre)));
-
-                AddAssert("action released",
-                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                    () => Does.Not.Contain(getColumn(index).Action.Value));
-            }
-        }
-
-        [Test]
-        public void TestOneColumnMultipleTouches()
-        {
-            AddStep("touch column 0", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getColumn(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("action sent",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Contain(getColumn(0).Action.Value));
-
-            AddStep("touch another finger", () => InputManager.BeginTouch(new Touch(TouchSource.Touch2, getColumn(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("action still pressed",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Contain(getColumn(0).Action.Value));
-
-            AddStep("release first finger", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getColumn(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("action still pressed",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Contain(getColumn(0).Action.Value));
-
-            AddStep("release second finger", () => InputManager.EndTouch(new Touch(TouchSource.Touch2, getColumn(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("action released",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Not.Contain(getColumn(0).Action.Value));
-        }
-
-        #endregion
-
-        #region With touch controls
-
-        [Test]
-        public void TestTouchAreaNotInitiallyVisible()
-        {
-            AddStep("enable touch controls", () => toggleTouchControls(true));
-            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
-        }
-
-        [Test]
-        public void TestPressReceptors()
-        {
-            AddStep("enable touch controls", () => toggleTouchControls(true));
-            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
-
-            for (int i = 0; i < 4; i++)
-            {
-                int index = i;
-
-                AddStep($"touch receptor {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
-
-                AddAssert("action sent",
-                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                    () => Does.Contain(getReceptor(index).Action.Value));
-
-                AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
-
-                AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
-            }
-        }
-
-        [Test]
-        public void TestColumnsNotTouchableWithTouchControls()
-        {
-            AddStep("enable touch controls", () => toggleTouchControls(true));
-
-            AddStep("touch receptor 0", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getReceptor(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("action sent",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Contain(getReceptor(0).Action.Value));
-
-            AddStep("release receptor 0", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(0).ScreenSpaceDrawQuad.Centre)));
-
-            AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
-
-            AddStep("touch column 0", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getColumn(0).ScreenSpaceDrawQuad.Centre + new Vector2(0f, -50f))));
-
-            AddAssert("action not sent",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Not.Contain(getColumn(0).Action.Value));
-
-            AddStep("release column 0", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getColumn(0).ScreenSpaceDrawQuad.Centre + new Vector2(0f, -50f))));
-
-            AddAssert("action not sent",
-                () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                () => Does.Not.Contain(getColumn(0).Action.Value));
-        }
-
-        #endregion
-
-        private void toggleTouchControls(bool enabled)
-        {
-            var maniaConfig = (ManiaRulesetConfigManager)RulesetConfigs.GetConfigFor(CreatePlayerRuleset())!;
-            maniaConfig.SetValue(ManiaRulesetSetting.MobileLayout, enabled ? ManiaMobileLayout.LandscapeWithOverlay : ManiaMobileLayout.Portrait);
-        }
-
-        private ManiaTouchInputArea? getTouchOverlay() => this.ChildrenOfType<ManiaTouchInputArea>().SingleOrDefault();
-
-        private ManiaTouchInputArea.ColumnInputReceptor getReceptor(int index) => this.ChildrenOfType<ManiaTouchInputArea.ColumnInputReceptor>().ElementAt(index);
-
-        private Column getColumn(int index) => this.ChildrenOfType<Column>().ElementAt(index);
-    }
-}

osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInputArea.cs

@@ -0,0 +1,49 @@
+// 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.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public partial class TestSceneManiaTouchInputArea : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestTouchAreaNotInitiallyVisible()
+        {
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestPressReceptors()
+        {
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
+
+            for (int i = 0; i < 4; i++)
+            {
+                int index = i;
+
+                AddStep($"touch receptor {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+
+                AddAssert("action sent",
+                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
+                    () => Does.Contain(getReceptor(index).Action.Value));
+
+                AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+
+                AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
+            }
+        }
+
+        private ManiaTouchInputArea? getTouchOverlay() => this.ChildrenOfType<ManiaTouchInputArea>().SingleOrDefault();
+
+        private ManiaTouchInputArea.ColumnInputReceptor getReceptor(int index) => this.ChildrenOfType<ManiaTouchInputArea.ColumnInputReceptor>().ElementAt(index);
+    }
+}

osu.Game.Rulesets.Mania.Tests/TestSceneReplayStability.cs

@@ -1,149 +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.Beatmaps;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [Ignore("These tests are expected to fail until an acceptable solution for various replay playback issues concerning rounding of replay frame times & hit windows is found.")]
-    public partial class TestSceneReplayStability : ReplayStabilityTestScene
-    {
-        private static readonly object[][] test_cases =
-        {
-            // With respect to notation,
-            // square brackets `[]` represent *closed* or *inclusive* bounds,
-            // while round brackets `()` represent *open* or *exclusive* bounds.
-
-            // OD = 5 test cases.
-            // PERFECT hit window is [ -19.4ms,  19.4ms]
-            // GREAT   hit window is [ -49.0ms,  49.0ms]
-            // GOOD    hit window is [ -82.0ms,  82.0ms]
-            // OK      hit window is [-112.0ms, 112.0ms]
-            // MEH     hit window is [-136.0ms, 136.0ms]
-            // MISS    hit window is [-173.0ms, 173.0ms]
-            new object[] { 5f, -19d, HitResult.Perfect },
-            new object[] { 5f, -19.2d, HitResult.Perfect },
-            new object[] { 5f, -19.38d, HitResult.Perfect },
-            // new object[] { 5f, -19.4d, HitResult.Perfect }, <- in theory this should work, in practice it does not (fails even before encode & rounding due to floating point precision issues)
-            new object[] { 5f, -19.44d, HitResult.Great },
-            new object[] { 5f, -19.7d, HitResult.Great },
-            new object[] { 5f, -20d, HitResult.Great },
-            new object[] { 5f, -48d, HitResult.Great },
-            new object[] { 5f, -48.4d, HitResult.Great },
-            new object[] { 5f, -48.7d, HitResult.Great },
-            new object[] { 5f, -49d, HitResult.Great },
-            new object[] { 5f, -49.2d, HitResult.Good },
-            new object[] { 5f, -49.7d, HitResult.Good },
-            new object[] { 5f, -50d, HitResult.Good },
-            new object[] { 5f, -81d, HitResult.Good },
-            new object[] { 5f, -81.2d, HitResult.Good },
-            new object[] { 5f, -81.7d, HitResult.Good },
-            new object[] { 5f, -82d, HitResult.Good },
-            new object[] { 5f, -82.2d, HitResult.Ok },
-            new object[] { 5f, -82.7d, HitResult.Ok },
-            new object[] { 5f, -83d, HitResult.Ok },
-            new object[] { 5f, -111d, HitResult.Ok },
-            new object[] { 5f, -111.2d, HitResult.Ok },
-            new object[] { 5f, -111.7d, HitResult.Ok },
-            new object[] { 5f, -112d, HitResult.Ok },
-            new object[] { 5f, -112.2d, HitResult.Meh },
-            new object[] { 5f, -112.7d, HitResult.Meh },
-            new object[] { 5f, -113d, HitResult.Meh },
-            new object[] { 5f, -135d, HitResult.Meh },
-            new object[] { 5f, -135.2d, HitResult.Meh },
-            new object[] { 5f, -135.8d, HitResult.Meh },
-            new object[] { 5f, -136d, HitResult.Meh },
-            new object[] { 5f, -136.2d, HitResult.Miss },
-            new object[] { 5f, -136.7d, HitResult.Miss },
-            new object[] { 5f, -137d, HitResult.Miss },
-
-            // OD = 9.3 test cases.
-            // PERFECT hit window is [ -14.67ms,  14.67ms]
-            // GREAT   hit window is [ -36.10ms,  36.10ms]
-            // GOOD    hit window is [ -69.10ms,  69.10ms]
-            // OK      hit window is [ -99.10ms,  99.10ms]
-            // MEH     hit window is [-123.10ms, 123.10ms]
-            // MISS    hit window is [-160.10ms, 160.10ms]
-            new object[] { 9.3f, 14d, HitResult.Perfect },
-            new object[] { 9.3f, 14.2d, HitResult.Perfect },
-            new object[] { 9.3f, 14.6d, HitResult.Perfect },
-            // new object[] { 9.3f, 14.67d, HitResult.Perfect }, <- in theory this should work, in practice it does not (fails even before encode & rounding due to floating point precision issues)
-            new object[] { 9.3f, 14.7d, HitResult.Great },
-            new object[] { 9.3f, 15d, HitResult.Great },
-            new object[] { 9.3f, 35d, HitResult.Great },
-            new object[] { 9.3f, 35.3d, HitResult.Great },
-            new object[] { 9.3f, 35.8d, HitResult.Great },
-            new object[] { 9.3f, 36.05d, HitResult.Great },
-            new object[] { 9.3f, 36.3d, HitResult.Good },
-            new object[] { 9.3f, 36.7d, HitResult.Good },
-            new object[] { 9.3f, 37d, HitResult.Good },
-            new object[] { 9.3f, 68d, HitResult.Good },
-            new object[] { 9.3f, 68.4d, HitResult.Good },
-            new object[] { 9.3f, 68.9d, HitResult.Good },
-            new object[] { 9.3f, 69.07d, HitResult.Good },
-            new object[] { 9.3f, 69.25d, HitResult.Ok },
-            new object[] { 9.3f, 69.85d, HitResult.Ok },
-            new object[] { 9.3f, 70d, HitResult.Ok },
-            new object[] { 9.3f, 98d, HitResult.Ok },
-            new object[] { 9.3f, 98.3d, HitResult.Ok },
-            new object[] { 9.3f, 98.6d, HitResult.Ok },
-            new object[] { 9.3f, 99d, HitResult.Ok },
-            new object[] { 9.3f, 99.3d, HitResult.Meh },
-            new object[] { 9.3f, 99.7d, HitResult.Meh },
-            new object[] { 9.3f, 100d, HitResult.Meh },
-            new object[] { 9.3f, 122d, HitResult.Meh },
-            new object[] { 9.3f, 122.34d, HitResult.Meh },
-            new object[] { 9.3f, 122.57d, HitResult.Meh },
-            new object[] { 9.3f, 123.04d, HitResult.Meh },
-            new object[] { 9.3f, 123.45d, HitResult.Miss },
-            new object[] { 9.3f, 123.95d, HitResult.Miss },
-            new object[] { 9.3f, 124d, HitResult.Miss },
-        };
-
-        [TestCaseSource(nameof(test_cases))]
-        public void TestHitWindowStability(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double note_time = 100;
-
-            var beatmap = new ManiaBeatmap(new StageDefinition(1))
-            {
-                HitObjects =
-                {
-                    new Note
-                    {
-                        StartTime = note_time,
-                        Column = 0,
-                    }
-                },
-                Difficulty = new BeatmapDifficulty
-                {
-                    OverallDifficulty = overallDifficulty,
-                    CircleSize = 1,
-                },
-                BeatmapInfo =
-                {
-                    Ruleset = new ManiaRuleset().RulesetInfo,
-                },
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    new ManiaReplayFrame(0),
-                    new ManiaReplayFrame(note_time + hitOffset, ManiaAction.Key1),
-                    new ManiaReplayFrame(note_time + hitOffset + 20),
-                }
-            };
-
-            RunTest(beatmap, replay, [expectedResult]);
-        }
-    }
-}

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs

@@ -36,23 +36,20 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         {
             int notes = HitObjects.Count(s => s is Note);
             int holdNotes = HitObjects.Count(s => s is HoldNote);
-            int sum = Math.Max(1, notes + holdNotes);
 
             return new[]
             {
                 new BeatmapStatistic
                 {
-                    Name = @"Notes",
+                    Name = @"Note Count",
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
                     Content = notes.ToString(),
-                    BarDisplayLength = notes / (float)sum,
                 },
                 new BeatmapStatistic
                 {
-                    Name = @"Hold Notes",
+                    Name = @"Hold Note Count",
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
                     Content = holdNotes.ToString(),
-                    BarDisplayLength = holdNotes / (float)sum,
                 },
             };
         }

osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs

@@ -1,6 +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 osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
 using osu.Game.Localisation;
@@ -23,7 +24,17 @@ namespace osu.Game.Rulesets.Mania.Configuration
             SetDefault(ManiaRulesetSetting.ScrollSpeed, 8.0, 1.0, 40.0, 0.1);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
             SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
-            SetDefault(ManiaRulesetSetting.MobileLayout, ManiaMobileLayout.Portrait);
+
+#pragma warning disable CS0618
+            // Although obsolete, this is still required to populate the bindable from the database in case migration is required.
+            SetDefault<double?>(ManiaRulesetSetting.ScrollTime, null);
+
+            if (Get<double?>(ManiaRulesetSetting.ScrollTime) is double scrollTime)
+            {
+                SetValue(ManiaRulesetSetting.ScrollSpeed, Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime));
+                SetValue<double?>(ManiaRulesetSetting.ScrollTime, null);
+            }
+#pragma warning restore CS0618
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -40,9 +51,10 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
     public enum ManiaRulesetSetting
     {
+        [Obsolete("Use ScrollSpeed instead.")] // Can be removed 2023-11-30
+        ScrollTime,
         ScrollSpeed,
         ScrollDirection,
-        TimingBasedNoteColouring,
-        MobileLayout,
+        TimingBasedNoteColouring
     }
 }

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 
@@ -9,12 +10,22 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 {
     public class ManiaDifficultyAttributes : DifficultyAttributes
     {
+        /// <summary>
+        /// The hit window for a GREAT hit inclusive of rate-adjusting mods (DT/HT/etc).
+        /// </summary>
+        /// <remarks>
+        /// Rate-adjusting mods do not affect the hit window at all in osu-stable.
+        /// </remarks>
+        [JsonProperty("great_hit_window")]
+        public double GreatHitWindow { get; set; }
+
         public override IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             foreach (var v in base.ToDatabaseAttributes())
                 yield return v;
 
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
+            yield return (ATTRIB_ID_GREAT_HIT_WINDOW, GreatHitWindow);
         }
 
         public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
@@ -22,6 +33,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             base.FromDatabaseAttributes(values, onlineInfo);
 
             StarRating = values[ATTRIB_ID_DIFFICULTY];
+            GreatHitWindow = values[ATTRIB_ID_GREAT_HIT_WINDOW];
         }
     }
 }

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs

@@ -27,6 +27,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         private const double difficulty_multiplier = 0.018;
 
         private readonly bool isForCurrentRuleset;
+        private readonly double originalOverallDifficulty;
 
         public override int Version => 20241007;
 
@@ -34,6 +35,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             : base(ruleset, beatmap)
         {
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.MatchesOnlineID(ruleset);
+            originalOverallDifficulty = beatmap.BeatmapInfo.Difficulty.OverallDifficulty;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -46,8 +48,11 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
             ManiaDifficultyAttributes attributes = new ManiaDifficultyAttributes
             {
-                StarRating = skills.OfType<Strain>().Single().DifficultyValue() * difficulty_multiplier,
+                StarRating = skills[0].DifficultyValue() * difficulty_multiplier,
                 Mods = mods,
+                // In osu-stable mania, rate-adjustment mods don't affect the hit window.
+                // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
+                GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
             };
 
@@ -119,5 +124,29 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 }).ToArray();
             }
         }
+
+        private double getHitWindow300(Mod[] mods)
+        {
+            if (isForCurrentRuleset)
+            {
+                double od = Math.Min(10.0, Math.Max(0, 10.0 - originalOverallDifficulty));
+                return applyModAdjustments(34 + 3 * od, mods);
+            }
+
+            if (Math.Round(originalOverallDifficulty) > 4)
+                return applyModAdjustments(34, mods);
+
+            return applyModAdjustments(47, mods);
+
+            static double applyModAdjustments(double value, Mod[] mods)
+            {
+                if (mods.Any(m => m is ManiaModHardRock))
+                    value /= 1.4;
+                else if (mods.Any(m => m is ManiaModEasy))
+                    value *= 1.4;
+
+                return value;
+            }
+        }
     }
 }

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs

@@ -98,9 +98,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private double originalStartTime;
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double fallbackTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var result = base.UpdateTimeAndPosition(screenSpacePosition, fallbackTime);
+            base.UpdateTimeAndPosition(result);
 
             if (PlacementActive == PlacementState.Active)
             {
@@ -121,8 +121,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 if (result.Time is double startTime)
                     originalStartTime = HitObject.StartTime = startTime;
             }
-
-            return result;
         }
     }
 }

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs

@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private EditorBeatmap? editorBeatmap { get; set; }
 
         [Resolved]
-        private ManiaHitObjectComposer? positionSnapProvider { get; set; }
+        private IPositionSnapProvider? positionSnapProvider { get; set; }
 
         private EditBodyPiece body = null!;
         private EditHoldNoteEndPiece head = null!;

osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs

@@ -1,8 +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 System;
-using osu.Framework.Allocation;
+#nullable disable
+
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
@@ -20,18 +20,13 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         protected new T HitObject => (T)base.HitObject;
 
-        [Resolved]
-        private ManiaHitObjectComposer? composer { get; set; }
+        private Column column;
 
-        private Column? column;
-
-        public Column? Column
+        public Column Column
         {
             get => column;
             set
             {
-                ArgumentNullException.ThrowIfNull(value);
-
                 if (value == column)
                     return;
 
@@ -58,11 +53,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double fallbackTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var result = composer?.FindSnappedPositionAndTime(screenSpacePosition) ?? new SnapResult(screenSpacePosition, fallbackTime);
-
-            base.UpdateTimeAndPosition(result.ScreenSpacePosition, result.Time ?? fallbackTime);
+            base.UpdateTimeAndPosition(result);
 
             if (result.Playfield is Column col)
             {
@@ -83,8 +76,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 if (PlacementActive == PlacementState.Waiting)
                     Column = col;
             }
-
-            return result;
         }
 
         private float getNoteHeight(Column resultPlayfield) =>

osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs

@@ -8,7 +8,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
@@ -36,17 +35,15 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             };
         }
 
-        public override SnapResult UpdateTimeAndPosition(Vector2 screenSpacePosition, double referenceTime)
+        public override void UpdateTimeAndPosition(SnapResult result)
         {
-            var result = base.UpdateTimeAndPosition(screenSpacePosition, referenceTime);
+            base.UpdateTimeAndPosition(result);
 
             if (result.Playfield != null)
             {
                 piece.Width = result.Playfield.DrawWidth;
                 piece.Position = ToLocalSpace(result.ScreenSpacePosition);
             }
-
-            return result;
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs

@@ -1,23 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class ManiaBlueprintContainer : ComposeBlueprintContainer
     {
-        public new ManiaHitObjectComposer Composer => (ManiaHitObjectComposer)base.Composer;
-
-        public ManiaBlueprintContainer(ManiaHitObjectComposer composer)
+        public ManiaBlueprintContainer(HitObjectComposer composer)
             : base(composer)
         {
         }
@@ -39,22 +33,5 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
 
         protected sealed override DragBox CreateDragBox() => new ScrollingDragBox(Composer.Playfield);
-
-        protected override bool TryMoveBlueprints(DragEvent e, IList<(SelectionBlueprint<HitObject> blueprint, Vector2[] originalSnapPositions)> blueprints)
-        {
-            Vector2 distanceTravelled = e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
-
-            // The final movement position, relative to movementBlueprintOriginalPosition.
-            Vector2 movePosition = blueprints.First().originalSnapPositions.First() + distanceTravelled;
-
-            // Retrieve a snapped position.
-            var result = Composer.FindSnappedPositionAndTime(movePosition);
-
-            var referenceBlueprint = blueprints.First().blueprint;
-            bool moved = SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(referenceBlueprint, result.ScreenSpacePosition - referenceBlueprint.ScreenSpaceSelectionPoint));
-            if (moved)
-                ApplySnapResultTime(result, referenceBlueprint.Item.StartTime);
-            return moved;
-        }
     }
 }

osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs

@@ -19,7 +19,6 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    [Cached]
     public partial class ManiaHitObjectComposer : ScrollingHitObjectComposer<ManiaHitObject>
     {
         private DrawableManiaEditorRuleset drawableRuleset = null!;
@@ -65,11 +64,11 @@ namespace osu.Game.Rulesets.Mania.Edit
                 return;
 
             List<ManiaHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<ManiaHitObject>().Where(h => h.StartTime >= timestamp).ToList();
-            string[] objectDescriptions = objectDescription.Split(',');
+            string[] objectDescriptions = objectDescription.Split(',').ToArray();
 
             for (int i = 0; i < objectDescriptions.Length; i++)
             {
-                string[] split = objectDescriptions[i].Split('|');
+                string[] split = objectDescriptions[i].Split('|').ToArray();
                 if (split.Length != 2)
                     continue;
 

osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs

@@ -89,7 +89,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
                 {
                     Caption = EditorSetupStrings.BaseVelocity,
                     HintText = EditorSetupStrings.BaseVelocityDescription,
-                    KeyboardStep = 0.1f,
                     Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
                     {
                         Default = 1.4,
@@ -104,7 +103,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
                 {
                     Caption = EditorSetupStrings.TickRate,
                     HintText = EditorSetupStrings.TickRateDescription,
-                    KeyboardStep = 1,
                     Current = new BindableDouble(Beatmap.Difficulty.SliderTickRate)
                     {
                         Default = 1,
@@ -136,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Setup
 
             updatingKeyCount = true;
 
-            editor.SaveAndReload().ContinueWith(t =>
+            editor.Reload().ContinueWith(t =>
             {
                 if (!t.GetResultSafely())
                 {

osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
@@ -18,72 +17,20 @@ namespace osu.Game.Rulesets.Mania
 {
     public class ManiaFilterCriteria : IRulesetFilterCriteria
     {
-        private readonly HashSet<int> includedKeyCounts = Enumerable.Range(1, LegacyBeatmapDecoder.MAX_MANIA_KEY_COUNT).ToHashSet();
+        private FilterCriteria.OptionalRange<float> keys;
 
         public bool Matches(BeatmapInfo beatmapInfo, FilterCriteria criteria)
         {
-            int keyCount = ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo), criteria.Mods);
-
-            return includedKeyCounts.Contains(keyCount);
+            return !keys.HasFilter || keys.IsInRange(ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo), criteria.Mods));
         }
 
-        public bool TryParseCustomKeywordCriteria(string key, Operator op, string strValues)
+        public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
         {
             switch (key)
             {
                 case "key":
                 case "keys":
-                {
-                    var keyCounts = new HashSet<int>();
-
-                    foreach (string strValue in strValues.Split(','))
-                    {
-                        if (!int.TryParse(strValue, out int keyCount))
-                            return false;
-
-                        keyCounts.Add(keyCount);
-                    }
-
-                    int? singleKeyCount = keyCounts.Count == 1 ? keyCounts.Single() : null;
-
-                    switch (op)
-                    {
-                        case Operator.Equal:
-                            includedKeyCounts.IntersectWith(keyCounts);
-                            return true;
-
-                        case Operator.NotEqual:
-                            includedKeyCounts.ExceptWith(keyCounts);
-                            return true;
-
-                        case Operator.Less:
-                            if (singleKeyCount == null) return false;
-
-                            includedKeyCounts.RemoveWhere(k => k >= singleKeyCount.Value);
-                            return true;
-
-                        case Operator.LessOrEqual:
-                            if (singleKeyCount == null) return false;
-
-                            includedKeyCounts.RemoveWhere(k => k > singleKeyCount.Value);
-                            return true;
-
-                        case Operator.Greater:
-                            if (singleKeyCount == null) return false;
-
-                            includedKeyCounts.RemoveWhere(k => k <= singleKeyCount.Value);
-                            return true;
-
-                        case Operator.GreaterOrEqual:
-                            if (singleKeyCount == null) return false;
-
-                            includedKeyCounts.RemoveWhere(k => k < singleKeyCount.Value);
-                            return true;
-
-                        default:
-                            return false;
-                    }
-                }
+                    return FilterQueryParser.TryUpdateCriteriaRange(ref keys, op, value);
             }
 
             return false;
@@ -91,7 +38,7 @@ namespace osu.Game.Rulesets.Mania
 
         public bool FilterMayChangeFromMods(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
-            if (includedKeyCounts.Count != LegacyBeatmapDecoder.MAX_MANIA_KEY_COUNT)
+            if (keys.HasFilter)
             {
                 // Interpreting as the Mod type is required for equality comparison.
                 HashSet<Mod> oldSet = mods.OldValue.OfType<ManiaKeyMod>().AsEnumerable<Mod>().ToHashSet();

osu.Game.Rulesets.Mania/ManiaInputManager.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania
 {
-    [Cached] // Used for touch input, see Column.OnTouchDown/OnTouchUp.
+    [Cached] // Used for touch input, see ColumnTouchInputArea.
     public partial class ManiaInputManager : RulesetInputManager<ManiaAction>
     {
         public ManiaInputManager(RulesetInfo ruleset, int variant)

osu.Game.Rulesets.Mania/ManiaMobileLayout.cs

@@ -1,20 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Localisation;
-using osu.Game.Localisation;
-
-namespace osu.Game.Rulesets.Mania
-{
-    public enum ManiaMobileLayout
-    {
-        [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.PortraitExpandedColumns))]
-        Portrait,
-
-        [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.LandscapeExpandedColumns))]
-        Landscape,
-
-        [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.LandscapeTouchOverlay))]
-        LandscapeWithOverlay,
-    }
-}

osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -45,17 +44,8 @@ namespace osu.Game.Rulesets.Mania
                     Keywords = new[] { "color" },
                     LabelText = RulesetSettingsStrings.TimingBasedColouring,
                     Current = config.GetBindable<bool>(ManiaRulesetSetting.TimingBasedNoteColouring),
-                },
+                }
             };
-
-            if (RuntimeInfo.IsMobile)
-            {
-                Add(new SettingsEnumDropdown<ManiaMobileLayout>
-                {
-                    LabelText = RulesetSettingsStrings.MobileLayout,
-                    Current = config.GetBindable<ManiaMobileLayout>(ManiaRulesetSetting.MobileLayout),
-                });
-            }
         }
 
         private partial class ManiaScrollSlider : RoundedSliderBar<double>

osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs

@@ -8,6 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModEasy : ModEasyWithExtraLives
     {
-        public override LocalisableString Description => @"More forgiving HP drain, less accuracy required, and extra lives!";
+        public override LocalisableString Description => @"More forgiving HP drain, less accuracy required, and three lives!";
     }
 }

osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs

@@ -42,7 +42,8 @@ namespace osu.Game.Rulesets.Mania.Mods
                 var locations = column.OfType<Note>().Select(n => (startTime: n.StartTime, samples: n.Samples))
                                       .Concat(column.OfType<HoldNote>().SelectMany(h => new[]
                                       {
-                                          (startTime: h.StartTime, samples: h.GetNodeSamples(0))
+                                          (startTime: h.StartTime, samples: h.GetNodeSamples(0)),
+                                          (startTime: h.EndTime, samples: h.GetNodeSamples(1))
                                       }))
                                       .OrderBy(h => h.startTime).ToList();
 

osu.Game.Rulesets.Mania/Mods/ManiaModWithPlayfieldCover.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
-                HitObjectContainer hoc = column.HitObjectContainer;
+                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
                 Container hocParent = (Container)hoc.Parent!;
 
                 hocParent.Remove(hoc, false);

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs

@@ -26,10 +26,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             : base(barLine)
         {
             RelativeSizeAxes = Axes.X;
-            Height = 1;
         }
 
-        [BackgroundDependencyLoader(true)]
+        [BackgroundDependencyLoader]
         private void load()
         {
             AddInternal(new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.BarLine), _ => new DefaultBarLine())
@@ -37,6 +36,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
+
+            Major.BindValueChanged(major => Height = major.NewValue ? 1.7f : 1.2f, true);
         }
 
         protected override void OnApply()

osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -13,7 +12,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
 
@@ -21,29 +19,25 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public partial class ArgonJudgementPiece : TextJudgementPiece, IAnimatableJudgement
     {
-        private const float judgement_y_position = -180f;
+        private const float judgement_y_position = 160;
 
         private RingExplosion? ringExplosion;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        private IBindable<ScrollingDirection> direction = null!;
-
         public ArgonJudgementPiece(HitResult result)
             : base(result)
         {
             AutoSizeAxes = Axes.Both;
 
             Origin = Anchor.Centre;
+            Y = judgement_y_position;
         }
 
         [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
+        private void load()
         {
-            direction = scrollingInfo.Direction.GetBoundCopy();
-            direction.BindValueChanged(_ => onDirectionChanged(), true);
-
             if (Result.IsHit())
             {
                 AddInternal(ringExplosion = new RingExplosion(Result)
@@ -53,12 +47,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             }
         }
 
-        private void onDirectionChanged()
-        {
-            Anchor = direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-            Y = direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position;
-        }
-
         protected override SpriteText CreateJudgementText() =>
             new OsuSpriteText
             {
@@ -90,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
-                    this.MoveToY(direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position);
+                    this.MoveToY(judgement_y_position);
                     this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
 
                     this.RotateTo(0);

osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs

@@ -9,9 +9,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Argon
@@ -41,7 +39,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                             return new DefaultSkinComponentsContainer(container =>
                             {
                                 var combo = container.ChildrenOfType<ArgonManiaComboCounter>().FirstOrDefault();
-                                var spectatorList = container.OfType<SpectatorList>().FirstOrDefault();
 
                                 if (combo != null)
                                 {
@@ -50,17 +47,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                     combo.Origin = Anchor.Centre;
                                     combo.Y = 200;
                                 }
-
-                                if (spectatorList != null)
-                                    spectatorList.Position = new Vector2(36, -66);
                             })
                             {
                                 new ArgonManiaComboCounter(),
-                                new SpectatorList
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                }
                             };
                     }
 

osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject)
         {
-            RelativeSizeAxes = Axes.X;
+            RelativeSizeAxes = Axes.Both;
 
             // Avoid flickering due to no anti-aliasing of boxes by default.
             var edgeSmoothness = new Vector2(0.3f);
@@ -75,8 +75,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
 
         private void updateMajor(ValueChangedEvent<bool> major)
         {
-            Height = major.NewValue ? 1.7f : 1.2f;
-
             mainLine.Alpha = major.NewValue ? 0.5f : 0.2f;
             leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? mainLine.Alpha * 0.3f : 0;
         }

osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBarLine.cs

@@ -1,38 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Skinning;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Skinning.Legacy
-{
-    public partial class LegacyBarLine : CompositeDrawable
-    {
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
-        {
-            float skinHeight = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.BarLineHeight)?.Value ?? 1;
-
-            RelativeSizeAxes = Axes.X;
-            Height = 1.2f * skinHeight;
-            Colour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.BarLineColour)?.Value ?? Color4.White;
-
-            // Avoid flickering due to no anti-aliasing of boxes by default.
-            var edgeSmoothness = new Vector2(0.3f);
-
-            AddInternal(new Box
-            {
-                Name = "Bar line",
-                EdgeSmoothness = edgeSmoothness,
-                Anchor = Anchor.BottomCentre,
-                Origin = Anchor.BottomCentre,
-                RelativeSizeAxes = Axes.Both,
-            });
-        }
-    }
-}

osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs

@@ -2,14 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
@@ -24,21 +23,21 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             this.result = result;
             this.animation = animation;
 
+            Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Both;
         }
 
-        private IBindable<ScrollingDirection> direction = null!;
-
-        [Resolved]
-        private ISkinSource skin { get; set; } = null!;
-
         [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin)
         {
-            direction = scrollingInfo.Direction.GetBoundCopy();
-            direction.BindValueChanged(_ => onDirectionChanged(), true);
+            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value;
+
+            if (scorePosition != null)
+                scorePosition -= Stage.HIT_TARGET_POSITION + 150;
+
+            Y = scorePosition ?? 0;
 
             InternalChild = animation.With(d =>
             {
@@ -47,25 +46,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             });
         }
 
-        private void onDirectionChanged()
-        {
-            float hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? 0;
-            float scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value ?? 0;
-
-            float hitPositionFromTop = 480f * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR - hitPosition;
-
-            if (scorePosition > hitPositionFromTop / 2f)
-            {
-                Anchor = direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-                Y = direction.Value == ScrollingDirection.Up ? hitPositionFromTop - scorePosition : scorePosition - hitPositionFromTop;
-            }
-            else
-            {
-                Anchor = direction.Value == ScrollingDirection.Up ? Anchor.BottomCentre : Anchor.TopCentre;
-                Y = direction.Value == ScrollingDirection.Up ? -scorePosition : scorePosition;
-            }
-        }
-
         public void PlayAnimation()
         {
             (animation as IFramedAnimation)?.GotoFrame(0);

osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs

@@ -15,9 +15,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
@@ -97,7 +95,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                             return new DefaultSkinComponentsContainer(container =>
                             {
                                 var combo = container.ChildrenOfType<LegacyManiaComboCounter>().FirstOrDefault();
-                                var spectatorList = container.OfType<SpectatorList>().FirstOrDefault();
 
                                 if (combo != null)
                                 {
@@ -105,17 +102,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                                     combo.Origin = Anchor.Centre;
                                     combo.Y = this.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ComboPosition)?.Value ?? 0;
                                 }
-
-                                if (spectatorList != null)
-                                {
-                                    spectatorList.Anchor = Anchor.BottomLeft;
-                                    spectatorList.Origin = Anchor.BottomLeft;
-                                    spectatorList.Position = new Vector2(10, -10);
-                                }
                             })
                             {
                                 new LegacyManiaComboCounter(),
-                                new SpectatorList(),
                             };
                     }
 
@@ -163,7 +152,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                             return new LegacyStageForeground();
 
                         case ManiaSkinComponents.BarLine:
-                            return new LegacyBarLine();
+                            return null; // Not yet implemented.
 
                         default:
                             throw new UnsupportedSkinComponentException(lookup);

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -1,9 +1,10 @@
 // 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.
 
+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
@@ -12,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Skinning;
@@ -45,11 +45,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
         internal readonly Container TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both };
 
-        private DrawablePool<PoolableHitExplosion> hitExplosionPool = null!;
+        private DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
-        private GameplaySampleTriggerSource sampleTriggerSource = null!;
+        private GameplaySampleTriggerSource sampleTriggerSource;
 
         /// <summary>
         /// Whether this is a special (ie. scratch) column.
@@ -58,8 +58,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public readonly Bindable<Color4> AccentColour = new Bindable<Color4>(Color4.Black);
 
-        private IBindable<ManiaMobileLayout> mobilePlayStyle = null!;
-
         public Column(int index, bool isSpecial)
         {
             Index = index;
@@ -69,18 +67,14 @@ namespace osu.Game.Rulesets.Mania.UI
             Width = COLUMN_WIDTH;
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
-            HitObjectArea = new ColumnHitObjectArea
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = HitObjectContainer,
-            };
+            HitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both };
         }
 
         [Resolved]
-        private ISkinSource skin { get; set; } = null!;
+        private ISkinSource skin { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host, ManiaRulesetConfigManager? rulesetConfig)
+        private void load(GameHost host)
         {
             SkinnableDrawable keyArea;
 
@@ -118,9 +112,6 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
             RegisterPool<HoldNoteBody, DrawableHoldNoteBody>(10, 50);
-
-            if (rulesetConfig != null)
-                mobilePlayStyle = rulesetConfig.GetBindable<ManiaMobileLayout>(ManiaRulesetSetting.MobileLayout);
         }
 
         private void onSourceChanged()
@@ -141,7 +132,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             base.Dispose(isDisposing);
 
-            if (skin.IsNotNull())
+            if (skin != null)
                 skin.SourceChanged -= onSourceChanged;
         }
 
@@ -189,33 +180,5 @@ namespace osu.Game.Rulesets.Mania.UI
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
-
-        #region Touch Input
-
-        [Resolved]
-        private ManiaInputManager? maniaInputManager { get; set; }
-
-        private int touchActivationCount;
-
-        protected override bool OnTouchDown(TouchDownEvent e)
-        {
-            // if touch overlay is visible, disallow columns from handling touch directly.
-            if (mobilePlayStyle.Value == ManiaMobileLayout.LandscapeWithOverlay)
-                return false;
-
-            maniaInputManager?.KeyBindingContainer.TriggerPressed(Action.Value);
-            touchActivationCount++;
-            return true;
-        }
-
-        protected override void OnTouchUp(TouchUpEvent e)
-        {
-            touchActivationCount--;
-
-            if (touchActivationCount == 0)
-                maniaInputManager?.KeyBindingContainer.TriggerReleased(Action.Value);
-        }
-
-        #endregion
     }
 }

osu.Game.Rulesets.Mania/UI/ColumnFlow.cs

@@ -1,19 +1,14 @@
 // 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;
+#nullable disable
+
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Layout;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -39,8 +34,6 @@ namespace osu.Game.Rulesets.Mania.UI
             set => base.Masking = value;
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
-
         public ColumnFlow(StageDefinition stageDefinition)
         {
             this.stageDefinition = stageDefinition;
@@ -59,32 +52,42 @@ namespace osu.Game.Rulesets.Mania.UI
 
             for (int i = 0; i < stageDefinition.Columns; i++)
                 columns.Add(new Container<TContent> { RelativeSizeAxes = Axes.Y });
-
-            AddLayout(layout);
         }
 
-        [Resolved]
-        private ISkinSource skin { get; set; } = null!;
-
-        private readonly Bindable<ManiaMobileLayout> mobileLayout = new Bindable<ManiaMobileLayout>();
+        private ISkinSource currentSkin;
 
         [BackgroundDependencyLoader]
-        private void load(ManiaRulesetConfigManager? rulesetConfig)
+        private void load(ISkinSource skin)
         {
-            rulesetConfig?.BindWith(ManiaRulesetSetting.MobileLayout, mobileLayout);
+            currentSkin = skin;
 
-            mobileLayout.BindValueChanged(_ => invalidateLayout());
-            skin.SourceChanged += invalidateLayout;
+            skin.SourceChanged += onSkinChanged;
+            onSkinChanged();
         }
 
-        protected override void Update()
+        private void onSkinChanged()
         {
-            base.Update();
-
-            if (!layout.IsValid)
+            for (int i = 0; i < stageDefinition.Columns; i++)
             {
-                updateColumnSize();
-                layout.Validate();
+                if (i > 0)
+                {
+                    float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
+                                               ?.Value ?? Stage.COLUMN_SPACING;
+
+                    columns[i].Margin = new MarginPadding { Left = spacing };
+                }
+
+                float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
+                                          ?.Value;
+
+                bool isSpecialColumn = stageDefinition.IsSpecialColumn(i);
+
+                // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
+                width ??= isSpecialColumn ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
+
+                columns[i].Width = width.Value;
             }
         }
 
@@ -98,60 +101,12 @@ namespace osu.Game.Rulesets.Mania.UI
             Content[column] = columns[column].Child = content;
         }
 
-        private void invalidateLayout() => layout.Invalidate();
-
-        private void updateColumnSize()
-        {
-            float mobileAdjust = 1f;
-
-            if (RuntimeInfo.IsMobile && mobileLayout.Value == ManiaMobileLayout.Landscape)
-            {
-                // GridContainer+CellContainer containing this stage (gets split up for dual stages).
-                Vector2? containingCell = this.FindClosestParent<Stage>()?.Parent?.DrawSize;
-
-                // Will be null in tests.
-                if (containingCell != null && containingCell.Value.X >= containingCell.Value.Y)
-                {
-                    float aspectRatio = containingCell.Value.X / containingCell.Value.Y;
-
-                    // 2.83 is a mostly arbitrary scale-up (170 / 60, based on original implementation for argon)
-                    mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
-                    // 1.92 is a "reference" mobile screen aspect ratio for phones.
-                    // We should scale it back for cases like tablets which aren't so extreme.
-                    mobileAdjust *= aspectRatio / 1.92f;
-                }
-            }
-
-            for (int i = 0; i < stageDefinition.Columns; i++)
-            {
-                if (i > 0)
-                {
-                    float spacing = skin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                            new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
-                                        ?.Value ?? Stage.COLUMN_SPACING;
-
-                    columns[i].Margin = new MarginPadding { Left = spacing };
-                }
-
-                float? width = skin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                       new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
-                                   ?.Value;
-
-                bool isSpecialColumn = stageDefinition.IsSpecialColumn(i);
-
-                // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
-                width ??= isSpecialColumn ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
-
-                columns[i].Width = width.Value * mobileAdjust;
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
-            if (skin.IsNotNull())
-                skin.SourceChanged -= invalidateLayout;
+            if (currentSkin != null)
+                currentSkin.SourceChanged -= onSkinChanged;
         }
     }
 }

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -3,12 +3,13 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
-    public partial class ColumnHitObjectArea : HitPositionPaddedContainer
+    public partial class ColumnHitObjectArea : HitObjectArea
     {
         public readonly Container Explosions;
 
@@ -16,29 +17,25 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         private readonly Drawable hitTarget;
 
-        protected override Container<Drawable> Content => content;
-
-        private readonly Container content;
-
-        public ColumnHitObjectArea()
+        public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
+            : base(hitObjectContainer)
         {
             AddRangeInternal(new[]
             {
                 UnderlayElements = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Depth = 2,
                 },
                 hitTarget = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
-                },
-                content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1
                 },
                 Explosions = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Depth = -1,
                 }
             });
         }

osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs

@@ -1,38 +1,52 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Skinning;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
-    public partial class HitPositionPaddedContainer : Container
+    public partial class HitObjectArea : SkinReloadableDrawable
     {
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+        public readonly HitObjectContainer HitObjectContainer;
 
-        [Resolved]
-        private ISkinSource skin { get; set; } = null!;
+        public HitObjectArea(HitObjectContainer hitObjectContainer)
+        {
+            InternalChild = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = HitObjectContainer = hitObjectContainer
+            };
+        }
 
         [BackgroundDependencyLoader]
         private void load(IScrollingInfo scrollingInfo)
         {
             Direction.BindTo(scrollingInfo.Direction);
-            Direction.BindValueChanged(_ => UpdateHitPosition(), true);
-
-            skin.SourceChanged += onSkinChanged;
+            Direction.BindValueChanged(onDirectionChanged, true);
         }
 
-        private void onSkinChanged() => UpdateHitPosition();
+        protected override void SkinChanged(ISkinSource skin)
+        {
+            base.SkinChanged(skin);
+            UpdateHitPosition();
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            UpdateHitPosition();
+        }
 
         protected virtual void UpdateHitPosition()
         {
-            float hitPosition = skin.GetConfig<ManiaSkinConfigurationLookup, float>(
+            float hitPosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
                                     new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
                                 ?? Stage.HIT_TARGET_POSITION;
 
@@ -40,13 +54,5 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 ? new MarginPadding { Top = hitPosition }
                 : new MarginPadding { Bottom = hitPosition };
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (skin.IsNotNull())
-                skin.SourceChanged -= onSkinChanged;
-        }
     }
 }

osu.Game.Rulesets.Mania/UI/DefaultManiaJudgementPiece.cs

@@ -1,79 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public partial class DefaultManiaJudgementPiece : DefaultJudgementPiece
-    {
-        private const float judgement_y_position = -180f;
-
-        private IBindable<ScrollingDirection> direction = null!;
-
-        public DefaultManiaJudgementPiece(HitResult result)
-            : base(result)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(IScrollingInfo scrollingInfo)
-        {
-            direction = scrollingInfo.Direction.GetBoundCopy();
-            direction.BindValueChanged(_ => onDirectionChanged(), true);
-        }
-
-        private void onDirectionChanged()
-        {
-            Anchor = direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
-            Y = direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            JudgementText.Font = JudgementText.Font.With(size: 25);
-        }
-
-        public override void PlayAnimation()
-        {
-            switch (Result)
-            {
-                case HitResult.None:
-                    this.FadeOutFromOne(800);
-                    break;
-
-                case HitResult.Miss:
-                    this.ScaleTo(1.6f);
-                    this.ScaleTo(1, 100, Easing.In);
-
-                    this.MoveToY(direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position);
-                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-
-                    this.RotateTo(0);
-                    this.RotateTo(40, 800, Easing.InQuint);
-
-                    this.FadeOutFromOne(800);
-                    break;
-
-                default:
-                    this.ScaleTo(0.8f);
-                    this.ScaleTo(1, 250, Easing.OutElastic);
-
-                    this.Delay(50)
-                        .ScaleTo(0.75f, 250)
-                        .FadeOut(200);
-
-                    // osu!mania uses a custom fade length, so the base call is intentionally omitted.
-                    break;
-            }
-        }
-    }
-}

osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs

@@ -6,22 +6,48 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public partial class DrawableManiaJudgement : DrawableJudgement
     {
-        public DrawableManiaJudgement()
-        {
-            // Extend the dimensions of this drawable to the entire parenting container.
-            // This allows skin implementations (i.e. LegacyManiaJudgementPiece) to freely choose the anchor based on skin settings.
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(1f);
-        }
-
         protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
+
+        private partial class DefaultManiaJudgementPiece : DefaultJudgementPiece
+        {
+            public DefaultManiaJudgementPiece(HitResult result)
+                : base(result)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                JudgementText.Font = JudgementText.Font.With(size: 25);
+            }
+
+            public override void PlayAnimation()
+            {
+                switch (Result)
+                {
+                    case HitResult.None:
+                    case HitResult.Miss:
+                        base.PlayAnimation();
+                        break;
+
+                    default:
+                        this.ScaleTo(0.8f);
+                        this.ScaleTo(1, 250, Easing.OutElastic);
+
+                        this.Delay(50)
+                            .ScaleTo(0.75f, 250)
+                            .FadeOut(200);
+
+                        // osu!mania uses a custom fade length, so the base call is intentionally omitted.
+                        break;
+                }
+            }
+        }
     }
 }

osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs

@@ -32,6 +32,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    [Cached]
     public partial class DrawableManiaRuleset : DrawableScrollingRuleset<ManiaHitObject>
     {
         /// <summary>
@@ -50,19 +51,15 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public IEnumerable<BarLine> BarLines;
 
-        public override bool RequiresPortraitOrientation => Beatmap.Stages.Count == 1 && mobileLayout.Value == ManiaMobileLayout.Portrait;
-
         protected override bool RelativeScaleBeatLengths => true;
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly BindableDouble configScrollSpeed = new BindableDouble();
-        private readonly Bindable<ManiaMobileLayout> mobileLayout = new Bindable<ManiaMobileLayout>();
-
-        public double TargetTimeRange { get; protected set; }
 
         private double currentTimeRange;
+        protected double TargetTimeRange;
 
         // Stores the current speed adjustment active in gameplay.
         private readonly Track speedAdjustmentTrack = new TrackVirtual(0);
@@ -110,37 +107,11 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollSpeed, configScrollSpeed);
-            configScrollSpeed.BindValueChanged(speed =>
-            {
-                if (!AllowScrollSpeedAdjustment)
-                    return;
-
-                TargetTimeRange = ComputeScrollTime(speed.NewValue);
-            });
+            configScrollSpeed.BindValueChanged(speed => TargetTimeRange = ComputeScrollTime(speed.NewValue));
 
             TimeRange.Value = TargetTimeRange = currentTimeRange = ComputeScrollTime(configScrollSpeed.Value);
 
-            Config.BindWith(ManiaRulesetSetting.MobileLayout, mobileLayout);
-            mobileLayout.BindValueChanged(_ => updateMobileLayout(), true);
-        }
-
-        private ManiaTouchInputArea? touchInputArea;
-
-        private void updateMobileLayout()
-        {
-            switch (mobileLayout.Value)
-            {
-                case ManiaMobileLayout.LandscapeWithOverlay:
-                    KeyBindingInputManager.Add(touchInputArea = new ManiaTouchInputArea(this));
-                    break;
-
-                default:
-                    if (touchInputArea != null)
-                        KeyBindingInputManager.Remove(touchInputArea, true);
-
-                    touchInputArea = null;
-                    break;
-            }
+            KeyBindingInputManager.Add(new ManiaTouchInputArea());
         }
 
         protected override void AdjustScrollSpeed(int amount) => configScrollSpeed.Value += amount;
@@ -191,7 +162,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <returns>The scroll time.</returns>
         public static double ComputeScrollTime(double scrollSpeed) => MAX_TIME_RANGE / scrollSpeed;
 
-        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer(this);
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 
         protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);
 

osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs

@@ -1,63 +1,17 @@
 // 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.Containers;
 using osu.Game.Rulesets.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public partial class ManiaPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
-        protected override Container<Drawable> Content { get; }
-
-        private readonly DrawSizePreservingFillContainer scalingContainer;
-
-        private readonly DrawableManiaRuleset drawableManiaRuleset;
-
-        public ManiaPlayfieldAdjustmentContainer(DrawableManiaRuleset drawableManiaRuleset)
+        public ManiaPlayfieldAdjustmentContainer()
         {
-            this.drawableManiaRuleset = drawableManiaRuleset;
-            InternalChild = scalingContainer = new DrawSizePreservingFillContainer
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Child = Content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                }
-            };
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            float aspectRatio = DrawWidth / DrawHeight;
-            bool isPortrait = aspectRatio < 1f;
-
-            if (isPortrait && drawableManiaRuleset.Beatmap.Stages.Count == 1)
-            {
-                // Scale playfield up by 25% to become playable on mobile devices,
-                // and leave a 10% horizontal gap if the playfield is scaled down due to being too wide.
-                const float base_scale = 1.25f;
-                const float base_width = 768f / base_scale;
-                const float side_gap = 0.9f;
-
-                scalingContainer.Strategy = DrawSizePreservationStrategy.Maximum;
-                float stageWidth = drawableManiaRuleset.Playfield.Stages[0].DrawWidth;
-                scalingContainer.TargetDrawSize = new Vector2(1024, base_width * Math.Max(stageWidth / aspectRatio / (base_width * side_gap), 1f));
-            }
-            else
-            {
-                scalingContainer.Strategy = DrawSizePreservationStrategy.Minimum;
-                scalingContainer.Scale = new Vector2(1f);
-                scalingContainer.Size = new Vector2(1f);
-                scalingContainer.TargetDrawSize = new Vector2(1024, 768);
-            }
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
         }
     }
 }

osu.Game.Rulesets.Mania/UI/ManiaTouchInputArea.cs

@@ -18,8 +18,6 @@ namespace osu.Game.Rulesets.Mania.UI
     /// </summary>
     public partial class ManiaTouchInputArea : VisibilityContainer
     {
-        private readonly DrawableManiaRuleset drawableRuleset;
-
         // visibility state affects our child. we always want to handle input.
         public override bool PropagatePositionalInputSubTree => true;
         public override bool PropagateNonPositionalInputSubTree => true;
@@ -40,12 +38,13 @@ namespace osu.Game.Rulesets.Mania.UI
             MaxValue = 1
         };
 
+        [Resolved]
+        private DrawableManiaRuleset drawableRuleset { get; set; } = null!;
+
         private GridContainer gridContainer = null!;
 
-        public ManiaTouchInputArea(DrawableManiaRuleset drawableRuleset)
+        public ManiaTouchInputArea()
         {
-            this.drawableRuleset = drawableRuleset;
-
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
 
@@ -71,10 +70,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         receptorGridDimensions.Add(new Dimension(GridSizeMode.AutoSize));
                     }
 
-                    receptorGridContent.Add(new ColumnInputReceptor
-                    {
-                        Action = { BindTarget = column.Action },
-                    });
+                    receptorGridContent.Add(new ColumnInputReceptor { Action = { BindTarget = column.Action } });
                     receptorGridDimensions.Add(new Dimension());
 
                     first = false;

osu.Game.Rulesets.Mania/UI/Stage.cs

@@ -103,13 +103,12 @@ namespace osu.Game.Rulesets.Mania.UI
                             Width = 1366, // Bar lines should only be masked on the vertical axis
                             BypassAutoSizeAxes = Axes.Both,
                             Masking = true,
-                            Child = barLineContainer = new HitPositionPaddedContainer
+                            Child = barLineContainer = new HitObjectArea(HitObjectContainer)
                             {
                                 Name = "Bar lines",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 RelativeSizeAxes = Axes.Y,
-                                Child = HitObjectContainer,
                             }
                         },
                         columnFlow = new ColumnFlow<Column>(definition)
@@ -120,13 +119,12 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        new HitPositionPaddedContainer
+                        judgements = new JudgementContainer<DrawableManiaJudgement>
                         {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
-                            Child = judgements = new JudgementContainer<DrawableManiaJudgement>
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                            },
+                            Y = HIT_TARGET_POSITION + 150
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
@@ -216,7 +214,13 @@ namespace osu.Game.Rulesets.Mania.UI
                 return;
 
             judgements.Clear(false);
-            judgements.Add(judgementPooler.Get(result.Type, j => j.Apply(result, judgedObject))!);
+            judgements.Add(judgementPooler.Get(result.Type, j =>
+            {
+                j.Apply(result, judgedObject);
+
+                j.Anchor = Anchor.Centre;
+                j.Origin = Anchor.Centre;
+            })!);
         }
 
         protected override void Update()

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCirclePlacementBlueprint.cs

@@ -13,7 +13,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public partial class TestSceneHitCirclePlacementBlueprint : PlacementBlueprintTestScene
     {
-        protected sealed override Ruleset CreateRuleset() => new OsuRuleset();
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHitCircle((HitCircle)hitObject);
         protected override HitObjectPlacementBlueprint CreateBlueprint() => new HitCirclePlacementBlueprint();
     }

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs

@@ -23,8 +23,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public partial class TestSceneSliderPlacementBlueprint : PlacementBlueprintTestScene
     {
-        protected sealed override Ruleset CreateRuleset() => new OsuRuleset();
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerPlacementBlueprint.cs

@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public partial class TestSceneSpinnerPlacementBlueprint : PlacementBlueprintTestScene
     {
-        protected sealed override Ruleset CreateRuleset() => new OsuRuleset();
-
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSpinner((Spinner)hitObject);
 
         protected override HitObjectPlacementBlueprint CreateBlueprint() => new SpinnerPlacementBlueprint();

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs

@@ -24,15 +24,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestMissTail(bool tailMiss) => CreateModTest(new ModTestData
+        [Test]
+        public void TestMissTail() => CreateModTest(new ModTestData
         {
-            Mod = new OsuModSuddenDeath
-            {
-                FailOnSliderTail = { Value = tailMiss }
-            },
-            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(tailMiss),
+            Mod = new OsuModSuddenDeath(),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
             CreateBeatmap = () => new Beatmap
             {

osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs

@@ -15,22 +15,22 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu.Tests";
 
-        [TestCase(6.7331304290522747d, 239, "diffcalc-test")]
-        [TestCase(1.4602604078137214d, 54, "zero-length-sliders")]
-        [TestCase(0.43052813047866129d, 4, "very-fast-slider")]
+        [TestCase(6.7171144000821119d, 239, "diffcalc-test")]
+        [TestCase(1.4485749025771304d, 54, "zero-length-sliders")]
+        [TestCase(0.42630400627180914d, 4, "very-fast-slider")]
         [TestCase(0.14143808967817237d, 2, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(9.6779746353001634d, 239, "diffcalc-test")]
-        [TestCase(1.7691451263718989d, 54, "zero-length-sliders")]
-        [TestCase(0.55785578988249407d, 4, "very-fast-slider")]
+        [TestCase(8.9825709931204205d, 239, "diffcalc-test")]
+        [TestCase(1.7550169162648608d, 54, "zero-length-sliders")]
+        [TestCase(0.55231632896800109d, 4, "very-fast-slider")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.7331304290522747d, 239, "diffcalc-test")]
-        [TestCase(1.4602604078137214d, 54, "zero-length-sliders")]
-        [TestCase(0.43052813047866129d, 4, "very-fast-slider")]
+        [TestCase(6.7171144000821119d, 239, "diffcalc-test")]
+        [TestCase(1.4485749025771304d, 54, "zero-length-sliders")]
+        [TestCase(0.42630400627180914d, 4, "very-fast-slider")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 

osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs

@@ -759,9 +759,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                     BeatmapInfo =
                     {
                         Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapVersion = LegacyBeatmapEncoder.FIRST_LAZER_VERSION // for correct offset treatment by score encoder
                     },
-                    ControlPointInfo = cpi,
-                    BeatmapVersion = LegacyBeatmapEncoder.FIRST_LAZER_VERSION // for correct offset treatment by score encoder
+                    ControlPointInfo = cpi
                 });
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(new OsuRuleset().RulesetInfo);
             });

osu.Game.Rulesets.Osu.Tests/TestSceneLegacyReplayPlayback.cs

@@ -1,118 +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.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Osu.Beatmaps;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Replays;
-using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osu.Game.Tests.Visual;
-using osuTK;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    [Ignore("These tests are expected to fail until an acceptable solution for various replay playback issues concerning rounding of replay frame times & hit windows is found.")]
-    public partial class TestSceneLegacyReplayPlayback : LegacyReplayPlaybackTestScene
-    {
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
-
-        protected override string? ExportLocation => null;
-
-        private static readonly object[][] test_cases =
-        {
-            // With respect to notation,
-            // square brackets `[]` represent *closed* or *inclusive* bounds,
-            // while round brackets `()` represent *open* or *exclusive* bounds.
-            // Additionally, note that offsets provided in double will be rounded to the nearest integer.
-
-            // OD = 5 test cases.
-            // GREAT hit window is ( -50ms,  50ms)
-            // OK    hit window is (-100ms, 100ms)
-            // MEH   hit window is (-150ms, 150ms)
-            new object[] { 5f, 48d, HitResult.Great },
-            new object[] { 5f, 49d, HitResult.Great },
-            new object[] { 5f, 50d, HitResult.Ok },
-            new object[] { 5f, 51d, HitResult.Ok },
-            new object[] { 5f, 98d, HitResult.Ok },
-            new object[] { 5f, 99d, HitResult.Ok },
-            new object[] { 5f, 100d, HitResult.Meh },
-            new object[] { 5f, 101d, HitResult.Meh },
-            new object[] { 5f, 148d, HitResult.Meh },
-            new object[] { 5f, 149d, HitResult.Meh },
-            new object[] { 5f, 150d, HitResult.Miss },
-            new object[] { 5f, 151d, HitResult.Miss },
-
-            // OD = 5.7 test cases.
-            // GREAT hit window is ( -45ms,  45ms)
-            // OK    hit window is ( -94ms,  94ms)
-            // MEH   hit window is (-143ms, 143ms)
-            new object[] { 5.7f, 43d, HitResult.Great },
-            new object[] { 5.7f, 44d, HitResult.Great },
-            new object[] { 5.7f, 45d, HitResult.Ok },
-            new object[] { 5.7f, 46d, HitResult.Ok },
-            new object[] { 5.7f, 92d, HitResult.Ok },
-            new object[] { 5.7f, 93d, HitResult.Ok },
-            new object[] { 5.7f, 94d, HitResult.Meh },
-            new object[] { 5.7f, 95d, HitResult.Meh },
-            new object[] { 5.7f, 141d, HitResult.Meh },
-            new object[] { 5.7f, 142d, HitResult.Meh },
-            new object[] { 5.7f, 143d, HitResult.Miss },
-            new object[] { 5.7f, 144d, HitResult.Miss },
-        };
-
-        [TestCaseSource(nameof(test_cases))]
-        public void TestHitWindowTreatment(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double hit_circle_time = 100;
-
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
-            var beatmap = new OsuBeatmap
-            {
-                HitObjects =
-                {
-                    new HitCircle
-                    {
-                        StartTime = hit_circle_time,
-                        Position = OsuPlayfield.BASE_SIZE / 2
-                    }
-                },
-                Difficulty = new BeatmapDifficulty { OverallDifficulty = overallDifficulty },
-                BeatmapInfo =
-                {
-                    Ruleset = new OsuRuleset().RulesetInfo,
-                },
-                ControlPointInfo = cpi,
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    // required for correct playback in stable
-                    new OsuReplayFrame(0, new Vector2(256, -500)),
-                    new OsuReplayFrame(0, new Vector2(256, -500)),
-                    new OsuReplayFrame(0, OsuPlayfield.BASE_SIZE / 2),
-                    new OsuReplayFrame(hit_circle_time + hitOffset, OsuPlayfield.BASE_SIZE / 2, OsuAction.LeftButton),
-                    new OsuReplayFrame(hit_circle_time + hitOffset + 20, OsuPlayfield.BASE_SIZE / 2),
-                }
-            };
-
-            var score = new Score
-            {
-                Replay = replay,
-                ScoreInfo = new ScoreInfo
-                {
-                    Ruleset = CreateRuleset().RulesetInfo,
-                }
-            };
-
-            RunTest($@"single circle @ OD{overallDifficulty}", beatmap, $@"{hitOffset}ms @ OD{overallDifficulty} = {expectedResult}", score, [expectedResult]);
-        }
-    }
-}

osu.Game.Rulesets.Osu.Tests/TestSceneReplayStability.cs

@@ -1,113 +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.Beatmaps;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Osu.Beatmaps;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Replays;
-using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    [Ignore("These tests are expected to fail until an acceptable solution for various replay playback issues concerning rounding of replay frame times & hit windows is found.")]
-    public partial class TestSceneReplayStability : ReplayStabilityTestScene
-    {
-        private static readonly object[][] test_cases =
-        {
-            // With respect to notation,
-            // square brackets `[]` represent *closed* or *inclusive* bounds,
-            // while round brackets `()` represent *open* or *exclusive* bounds.
-
-            // OD = 5 test cases.
-            // GREAT hit window is [ -50ms,  50ms]
-            // OK    hit window is [-100ms, 100ms]
-            // MEH   hit window is [-150ms, 150ms]
-            // MISS  hit window is [-400ms, 400ms]
-            new object[] { 5f, 49d, HitResult.Great },
-            new object[] { 5f, 49.2d, HitResult.Great },
-            new object[] { 5f, 49.7d, HitResult.Great },
-            new object[] { 5f, 50d, HitResult.Great },
-            new object[] { 5f, 50.4d, HitResult.Ok },
-            new object[] { 5f, 50.9d, HitResult.Ok },
-            new object[] { 5f, 51d, HitResult.Ok },
-            new object[] { 5f, 99d, HitResult.Ok },
-            new object[] { 5f, 99.2d, HitResult.Ok },
-            new object[] { 5f, 99.7d, HitResult.Ok },
-            new object[] { 5f, 100d, HitResult.Ok },
-            new object[] { 5f, 100.4d, HitResult.Meh },
-            new object[] { 5f, 100.9d, HitResult.Meh },
-            new object[] { 5f, 101d, HitResult.Meh },
-            new object[] { 5f, 149d, HitResult.Meh },
-            new object[] { 5f, 149.2d, HitResult.Meh },
-            new object[] { 5f, 149.7d, HitResult.Meh },
-            new object[] { 5f, 150d, HitResult.Meh },
-            new object[] { 5f, 150.4d, HitResult.Miss },
-            new object[] { 5f, 150.9d, HitResult.Miss },
-            new object[] { 5f, 151d, HitResult.Miss },
-
-            // OD = 5.7 test cases.
-            // GREAT hit window is [ -45.8ms,  45.8ms]
-            // OK    hit window is [ -94.4ms,  94.4ms]
-            // MEH   hit window is [-143.0ms, 143.0ms]
-            // MISS  hit window is [-400.0ms, 400.0ms]
-            new object[] { 5.7f, 45d, HitResult.Great },
-            new object[] { 5.7f, 45.2d, HitResult.Great },
-            new object[] { 5.7f, 45.8d, HitResult.Great },
-            new object[] { 5.7f, 45.9d, HitResult.Ok },
-            new object[] { 5.7f, 46d, HitResult.Ok },
-            new object[] { 5.7f, 46.4d, HitResult.Ok },
-            new object[] { 5.7f, 94d, HitResult.Ok },
-            new object[] { 5.7f, 94.2d, HitResult.Ok },
-            new object[] { 5.7f, 94.4d, HitResult.Ok },
-            new object[] { 5.7f, 94.48d, HitResult.Ok },
-            new object[] { 5.7f, 94.9d, HitResult.Meh },
-            new object[] { 5.7f, 95d, HitResult.Meh },
-            new object[] { 5.7f, 95.4d, HitResult.Meh },
-            new object[] { 5.7f, 142d, HitResult.Meh },
-            new object[] { 5.7f, 142.7d, HitResult.Meh },
-            new object[] { 5.7f, 143d, HitResult.Meh },
-            new object[] { 5.7f, 143.4d, HitResult.Miss },
-            new object[] { 5.7f, 143.9d, HitResult.Miss },
-            new object[] { 5.7f, 144d, HitResult.Miss },
-        };
-
-        [TestCaseSource(nameof(test_cases))]
-        public void TestHitWindowStability(float overallDifficulty, double hitOffset, HitResult expectedResult)
-        {
-            const double hit_circle_time = 100;
-
-            var beatmap = new OsuBeatmap
-            {
-                HitObjects =
-                {
-                    new HitCircle
-                    {
-                        StartTime = hit_circle_time,
-                        Position = OsuPlayfield.BASE_SIZE / 2
-                    }
-                },
-                Difficulty = new BeatmapDifficulty { OverallDifficulty = overallDifficulty },
-                BeatmapInfo =
-                {
-                    Ruleset = new OsuRuleset().RulesetInfo,
-                },
-            };
-
-            var replay = new Replay
-            {
-                Frames =
-                {
-                    new OsuReplayFrame(0, OsuPlayfield.BASE_SIZE / 2),
-                    new OsuReplayFrame(hit_circle_time + hitOffset, OsuPlayfield.BASE_SIZE / 2, OsuAction.LeftButton),
-                    new OsuReplayFrame(hit_circle_time + hitOffset + 20, OsuPlayfield.BASE_SIZE / 2),
-                }
-            };
-
-            RunTest(beatmap, replay, [expectedResult]);
-        }
-    }
-}

osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs

@@ -86,12 +86,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestSpinningSamplePitchShift()
         {
-            PausableSkinnableSound spinSample = null;
-
             AddStep("Add spinner", () => SetContents(_ => testSingle(5, true, 4000)));
-            AddUntilStep("wait for spin sample", () => (spinSample = getSpinningSample()) != null);
-            AddUntilStep("Pitch starts low", () => spinSample.Frequency.Value < 0.8);
-            AddUntilStep("Pitch increases", () => spinSample.Frequency.Value > 0.8);
+            AddUntilStep("Pitch starts low", () => getSpinningSample().Frequency.Value < 0.8);
+            AddUntilStep("Pitch increases", () => getSpinningSample().Frequency.Value > 0.8);
 
             PausableSkinnableSound getSpinningSample() =>
                 drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs

@@ -1,10 +1,10 @@
 // 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.Resources.Localisation.Web;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Beatmaps
@@ -16,30 +16,26 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
             int circles = HitObjects.Count(c => c is HitCircle);
             int sliders = HitObjects.Count(s => s is Slider);
             int spinners = HitObjects.Count(s => s is Spinner);
-            int sum = Math.Max(1, circles + sliders);
 
             return new[]
             {
                 new BeatmapStatistic
                 {
-                    Name = "Circles",
+                    Name = BeatmapsetsStrings.ShowStatsCountCircles,
                     Content = circles.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles),
-                    BarDisplayLength = circles / (float)sum,
                 },
                 new BeatmapStatistic
                 {
-                    Name = "Sliders",
+                    Name = BeatmapsetsStrings.ShowStatsCountSliders,
                     Content = sliders.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders),
-                    BarDisplayLength = sliders / (float)sum,
                 },
                 new BeatmapStatistic
                 {
-                    Name = @"Spinners",
+                    Name = @"Spinner Count",
                     Content = spinners.ToString(),
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Spinners),
-                    BarDisplayLength = Math.Min(spinners / 10f, 1),
                 }
             };
         }

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
                         // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
-                        TickDistanceMultiplier = beatmap.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
+                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
                         GenerateTicks = generateTicksData?.GenerateTicks ?? true,
                         SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1,
                     }.Yield();

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 foreach (var h in hitObjects)
                     h.StackHeight = 0;
 
-                if (beatmap.BeatmapVersion >= 6)
+                if (beatmap.BeatmapInfo.BeatmapVersion >= 6)
                     applyStacking(beatmap, hitObjects, 0, hitObjects.Count - 1);
                 else
                     applyStackingOld(beatmap, hitObjects);

osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs

@@ -12,10 +12,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
     public static class AimEvaluator
     {
         private const double wide_angle_multiplier = 1.5;
-        private const double acute_angle_multiplier = 2.6;
+        private const double acute_angle_multiplier = 1.95;
         private const double slider_multiplier = 1.35;
         private const double velocity_change_multiplier = 0.75;
-        private const double wiggle_multiplier = 1.02;
 
         /// <summary>
         /// Evaluates the difficulty of aiming the current object, based on:
@@ -65,16 +64,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             double acuteAngleBonus = 0;
             double sliderBonus = 0;
             double velocityChangeBonus = 0;
-            double wiggleBonus = 0;
 
             double aimStrain = currVelocity; // Start strain with regular velocity.
 
             if (Math.Max(osuCurrObj.StrainTime, osuLastObj.StrainTime) < 1.25 * Math.Min(osuCurrObj.StrainTime, osuLastObj.StrainTime)) // If rhythms are the same.
             {
-                if (osuCurrObj.Angle != null && osuLastObj.Angle != null)
+                if (osuCurrObj.Angle != null && osuLastObj.Angle != null && osuLastLastObj.Angle != null)
                 {
                     double currAngle = osuCurrObj.Angle.Value;
                     double lastAngle = osuLastObj.Angle.Value;
+                    double lastLastAngle = osuLastLastObj.Angle.Value;
 
                     // Rewarding angles, take the smaller velocity as base.
                     double angleBonus = Math.Min(currVelocity, prevVelocity);
@@ -82,27 +81,20 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                     wideAngleBonus = calcWideAngleBonus(currAngle);
                     acuteAngleBonus = calcAcuteAngleBonus(currAngle);
 
-                    // Penalize angle repetition.
-                    wideAngleBonus *= 1 - Math.Min(wideAngleBonus, Math.Pow(calcWideAngleBonus(lastAngle), 3));
-                    acuteAngleBonus *= 0.08 + 0.92 * (1 - Math.Min(acuteAngleBonus, Math.Pow(calcAcuteAngleBonus(lastAngle), 3)));
+                    if (DifficultyCalculationUtils.MillisecondsToBPM(osuCurrObj.StrainTime, 2) < 300) // Only buff deltaTime exceeding 300 bpm 1/2.
+                        acuteAngleBonus = 0;
+                    else
+                    {
+                        acuteAngleBonus *= calcAcuteAngleBonus(lastAngle) // Multiply by previous angle, we don't want to buff unless this is a wiggle type pattern.
+                                           * Math.Min(angleBonus, diameter * 1.25 / osuCurrObj.StrainTime) // The maximum velocity we buff is equal to 125 / strainTime
+                                           * Math.Pow(Math.Sin(Math.PI / 2 * Math.Min(1, (100 - osuCurrObj.StrainTime) / 25)), 2) // scale buff from 150 bpm 1/4 to 200 bpm 1/4
+                                           * Math.Pow(Math.Sin(Math.PI / 2 * (Math.Clamp(osuCurrObj.LazyJumpDistance, radius, diameter) - radius) / radius), 2); // Buff distance exceeding radius up to diameter.
+                    }
 
-                    // Apply full wide angle bonus for distance more than one diameter
-                    wideAngleBonus *= angleBonus * DifficultyCalculationUtils.Smootherstep(osuCurrObj.LazyJumpDistance, 0, diameter);
-
-                    // Apply acute angle bonus for BPM above 300 1/2 and distance more than one diameter
-                    acuteAngleBonus *= angleBonus *
-                                       DifficultyCalculationUtils.Smootherstep(DifficultyCalculationUtils.MillisecondsToBPM(osuCurrObj.StrainTime, 2), 300, 400) *
-                                       DifficultyCalculationUtils.Smootherstep(osuCurrObj.LazyJumpDistance, diameter, diameter * 2);
-
-                    // Apply wiggle bonus for jumps that are [radius, 3*diameter] in distance, with < 110 angle
-                    // https://www.desmos.com/calculator/dp0v0nvowc
-                    wiggleBonus = angleBonus
-                                  * DifficultyCalculationUtils.Smootherstep(osuCurrObj.LazyJumpDistance, radius, diameter)
-                                  * Math.Pow(DifficultyCalculationUtils.ReverseLerp(osuCurrObj.LazyJumpDistance, diameter * 3, diameter), 1.8)
-                                  * DifficultyCalculationUtils.Smootherstep(currAngle, double.DegreesToRadians(110), double.DegreesToRadians(60))
-                                  * DifficultyCalculationUtils.Smootherstep(osuLastObj.LazyJumpDistance, radius, diameter)
-                                  * Math.Pow(DifficultyCalculationUtils.ReverseLerp(osuLastObj.LazyJumpDistance, diameter * 3, diameter), 1.8)
-                                  * DifficultyCalculationUtils.Smootherstep(lastAngle, double.DegreesToRadians(110), double.DegreesToRadians(60));
+                    // Penalize wide angles if they're repeated, reducing the penalty as the lastAngle gets more acute.
+                    wideAngleBonus *= angleBonus * (1 - Math.Min(wideAngleBonus, Math.Pow(calcWideAngleBonus(lastAngle), 3)));
+                    // Penalize acute angles if they're repeated, reducing the penalty as the lastLastAngle gets more obtuse.
+                    acuteAngleBonus *= 0.5 + 0.5 * (1 - Math.Min(acuteAngleBonus, Math.Pow(calcAcuteAngleBonus(lastLastAngle), 3)));
                 }
             }
 
@@ -130,8 +122,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 sliderBonus = osuLastObj.TravelDistance / osuLastObj.TravelTime;
             }
 
-            aimStrain += wiggleBonus * wiggle_multiplier;
-
             // Add in acute angle bonus or wide angle bonus + velocity change bonus, whichever is larger.
             aimStrain += Math.Max(acuteAngleBonus * acute_angle_multiplier, wideAngleBonus * wide_angle_multiplier + velocityChangeBonus * velocity_change_multiplier);
 
@@ -142,8 +132,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             return aimStrain;
         }
 
-        private static double calcWideAngleBonus(double angle) => DifficultyCalculationUtils.Smoothstep(angle, double.DegreesToRadians(40), double.DegreesToRadians(140));
+        private static double calcWideAngleBonus(double angle) => Math.Pow(Math.Sin(3.0 / 4 * (Math.Min(5.0 / 6 * Math.PI, Math.Max(Math.PI / 6, angle)) - Math.PI / 6)), 2);
 
-        private static double calcAcuteAngleBonus(double angle) => DifficultyCalculationUtils.Smoothstep(angle, double.DegreesToRadians(140), double.DegreesToRadians(40));
+        private static double calcAcuteAngleBonus(double angle) => 1 - calcWideAngleBonus(angle);
     }
 }

osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs

@@ -52,12 +52,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 var currentObj = (OsuDifficultyHitObject)current.Previous(i);
                 var currentHitObject = (OsuHitObject)(currentObj.BaseObject);
 
-                cumulativeStrainTime += lastObj.StrainTime;
-
                 if (!(currentObj.BaseObject is Spinner))
                 {
                     double jumpDistance = (osuHitObject.StackedPosition - currentHitObject.StackedEndPosition).Length;
 
+                    cumulativeStrainTime += lastObj.StrainTime;
+
                     // We want to nerf objects that can be easily seen within the Flashlight circle radius.
                     if (i == 0)
                         smallDistNerf = Math.Min(1.0, jumpDistance / 75.0);