同步更新，调整mod代码，调整空判系统代码防报错。

待解决：游戏不结束，空判不扣血，空判降低acc

CONTRIBUTING.md

@@ -73,6 +73,9 @@ Aside from the above, below is a brief checklist of things to watch out when you
 After you're done with your changes and you wish to open the PR, please observe the following recommendations:
 
 - Please submit the pull request from a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) (not `master`), and keep the *Allow edits from maintainers* check box selected, so that we can push fixes to your PR if necessary.
+- Please pick the following target branch for your pull request:
+    - `pp-dev`, if the change impacts star rating or performance points calculations for any of the rulesets,
+    - `master`, otherwise.
 - Please avoid pushing untested or incomplete code.
 - Please do not force-push or rebase unless we ask you to.
 - Please do not merge `master` continually if there are no conflicts to resolve. We will do this for you when the change is ready for merge.

osu.Android.props

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

osu.Desktop/osu.Desktop.csproj

@@ -4,8 +4,8 @@
     <OutputType>WinExe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>A free-to-win rhythm game. Rhythm is just a *click* away!</Description>
-    <AssemblyName>Ez2osu!</AssemblyName>
-    <AssemblyTitle>osu!(Ez2lazer)</AssemblyTitle>
+    <AssemblyName>osu!</AssemblyName>
+    <AssemblyTitle>osu!(lazer)</AssemblyTitle>
     <Title>Ez2lazer!</Title>
     <Product>osu!(Ez2lazer)</Product>
     <ApplicationIcon>lazer.ico</ApplicationIcon>

osu.Game.Rulesets.Catch.Tests.iOS/Entitlements.plist

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-ios</TargetFramework>

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

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Framework.Allocation;
@@ -224,7 +225,8 @@ namespace osu.Game.Rulesets.Catch.Edit
         #region Clipboard handling
 
         public override string ConvertSelectionToString()
-            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<CatchHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
+            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<CatchHitObject>().OrderBy(h => h.StartTime)
+                                             .Select(h => (h.IndexInCurrentCombo + 1).ToString(CultureInfo.InvariantCulture)));
 
         // 1,2,3,4 ...
         private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$", RegexOptions.Compiled);

osu.Game.Rulesets.Mania.Tests.iOS/Entitlements.plist

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-ios</TargetFramework>

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

@@ -18,15 +18,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         public void TestNormalSelection()
         {
             addStepClickLink("00:05:920 (5920|3,6623|3,6857|2,7326|1)");
-            AddAssert("selected group", () => checkSnapAndSelectColumn(5_920, new List<(int, int)>
-                { (5_920, 3), (6_623, 3), (6_857, 2), (7_326, 1) }
-            ));
+            AddAssert("selected group", () => checkSnapAndSelectColumn(5_920, [(5_920, 3), (6_623, 3), (6_857, 2), (7_326, 1)]));
 
             addReset();
             addStepClickLink("00:42:716 (42716|3,43420|2,44123|0,44357|1,45295|1)");
-            AddAssert("selected ungrouped", () => checkSnapAndSelectColumn(42_716, new List<(int, int)>
-                { (42_716, 3), (43_420, 2), (44_123, 0), (44_357, 1), (45_295, 1) }
-            ));
+            AddAssert("selected ungrouped", () => checkSnapAndSelectColumn(42_716, [(42_716, 3), (43_420, 2), (44_123, 0), (44_357, 1), (45_295, 1)]));
 
             addReset();
             AddStep("add notes to row", () =>
@@ -41,15 +37,20 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 EditorBeatmap.AddRange(new[] { second, third, forth });
             });
             addStepClickLink("00:11:545 (11545|0,11545|1,11545|2,11545|3)");
-            AddAssert("selected in row", () => checkSnapAndSelectColumn(11_545, new List<(int, int)>
-                { (11_545, 0), (11_545, 1), (11_545, 2), (11_545, 3) }
-            ));
+            AddAssert("selected in row", () => checkSnapAndSelectColumn(11_545, [(11_545, 0), (11_545, 1), (11_545, 2), (11_545, 3)]));
 
             addReset();
             addStepClickLink("01:36:623 (96623|1,97560|1,97677|1,97795|1,98966|1)");
-            AddAssert("selected in column", () => checkSnapAndSelectColumn(96_623, new List<(int, int)>
-                { (96_623, 1), (97_560, 1), (97_677, 1), (97_795, 1), (98_966, 1) }
-            ));
+            AddAssert("selected in column", () => checkSnapAndSelectColumn(96_623, [(96_623, 1), (97_560, 1), (97_677, 1), (97_795, 1), (98_966, 1)]));
+        }
+
+        [Test]
+        public void TestRoundingToNearestMillisecondApplied()
+        {
+            AddStep("resnap note to have fractional coordinates",
+                () => EditorBeatmap.HitObjects.OfType<ManiaHitObject>().Single(ho => ho.StartTime == 85_373 && ho.Column == 1).StartTime = 85_373.125);
+            addStepClickLink("01:25:373 (85373|1)");
+            AddAssert("selected note", () => checkSnapAndSelectColumn(85_373.125, [(85_373.125, 1)]));
         }
 
         [Test]
@@ -75,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         private void addReset() => addStepClickLink("00:00:000", "reset", false);
 
-        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
+        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(double, int)>? columnPairs = null)
         {
             bool checkColumns = columnPairs != null
                 ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))

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

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.LAsEzExtensions.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
@@ -17,7 +18,6 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Utils;
 using osuTK;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Rulesets.Mania.Objects.EzCurrentHitObject;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps

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

@@ -1,10 +1,12 @@
 // 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.Text.RegularExpressions;
 using osu.Framework.Allocation;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -54,7 +56,8 @@ namespace osu.Game.Rulesets.Mania.Edit
         };
 
         public override string ConvertSelectionToString()
-            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
+            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime)
+                                             .Select(h => FormattableString.Invariant($"{Math.Round(h.StartTime)}|{h.Column}")));
 
         // 123|0,456|1,789|2 ...
         private static readonly Regex selection_regex = new Regex(@"^\d+\|\d+(,\d+\|\d+)*$", RegexOptions.Compiled);
@@ -73,10 +76,10 @@ namespace osu.Game.Rulesets.Mania.Edit
                 if (split.Length != 2)
                     continue;
 
-                if (!double.TryParse(split[0], out double time) || !int.TryParse(split[1], out int column))
+                if (!int.TryParse(split[0], out int time) || !int.TryParse(split[1], out int column))
                     continue;
 
-                ManiaHitObject? current = remainingHitObjects.FirstOrDefault(h => h.StartTime == time && h.Column == column);
+                ManiaHitObject? current = remainingHitObjects.FirstOrDefault(h => Precision.AlmostEquals(h.StartTime, time, 0.5) && h.Column == column);
 
                 if (current == null)
                     continue;

osu.Game.Rulesets.Mania/LAsEZMania/EzHitTimingGraphByColumn.cs

@@ -10,11 +10,12 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.LAsEzExtensions.Analysis.UI.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
 
-namespace osu.Game.Rulesets.Mania.UI
+namespace osu.Game.Rulesets.Mania.LAsEZMania
 {
     /// <summary>
     /// A graph which displays the distribution of hit timing for each column in a series of <see cref="HitEvent"/>s.

osu.Game.Rulesets.Mania/LAsEZMania/EzManiaHitModeConvertor.cs

@@ -22,7 +22,6 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.LAsEzExtensions;
 
 namespace osu.Game.Rulesets.Mania.LAsEZMania
 {

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -14,6 +14,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.LAsEzExtensions.Analysis;
+using osu.Game.LAsEzExtensions.Background;
+using osu.Game.LAsEzExtensions.Configuration;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Configuration;
@@ -46,7 +49,6 @@ using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
@@ -350,7 +352,6 @@ namespace osu.Game.Rulesets.Mania
                         // new ManiaModJudgmentStyle(),
                         new ManiaModNiceBPM(),
                         new ManiaModSpaceBody(),
-                        // new ManiaModAdjust(),
                     };
 
                 case ModType.YuLiangSSS_Mod:
@@ -358,7 +359,7 @@ namespace osu.Game.Rulesets.Mania
                     {
                         new ManiaModAdjust(),
                         new ManiaModChangeSpeedByAccuracy(),
-                        new ManiaModCleaner(),
+                        // new ManiaModCleaner(),
                         new ManiaModDeleteSpace(),
                         new ManiaModDoublePlay(),
                         new ManiaModDuplicate(),
@@ -379,7 +380,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModNtoMAnother(),
                         new ManiaModO2Health(),
                         new ManiaModO2Judgement(),
-                        new ManiaModPlayfieldTransformation(),
+                        // new ManiaModPlayfieldTransformation(), //加载有问题
                         new ManiaModReleaseAdjust(),
                         new ManiaModRemedy(),
                         new StarRatingRebirth(),

osu.Game.Rulesets.Mania/Objects/EzCurrentHitObject/Ez2AcHitWindows.cs

@@ -142,6 +142,9 @@ namespace osu.Game.Rulesets.Mania.Objects.EzCurrentHitObject
                 case HitResult.Miss:
                     return miss;
 
+                case HitResult.Pool:
+                    return pool;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(result), result, null);
             }

osu.Game.Rulesets.Mania/Objects/EzCurrentHitObject/Ez2AcHoldNote.cs

@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Objects.EzCurrentHitObject
 
         private class Ez2AcHeadJudgement : ManiaJudgement
         {
-            public override HitResult MinResult => HitResult.IgnoreHit;
+            // public override HitResult MinResult => HitResult.IgnoreHit;
         }
     }
 
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.Objects.EzCurrentHitObject
 
         private class Ez2AcNoteJudgement : ManiaJudgement
         {
-            public override HitResult MinResult => HitResult.Pool;
+            // public override HitResult MinResult => HitResult.Pool;
         }
     }
 }

osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Scoring
                     break;
 
                 case HitResult.Pool:
-                    return -(Beatmap.Difficulty.DrainRate + 1) * 0.01; // Strict health deduction for pool
+                    return -(Beatmap.Difficulty.DrainRate + 1) * 0.02; // Strict health deduction for pool
             }
 
             return HpMultiplierNormal * increase;

osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.LAsEzExtensions.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Judgements;
@@ -13,7 +14,6 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.LAsEzExtensions;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzHitExplosion.cs

@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.LAsEzExtensions;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning.EzStylePro

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzHoldNoteTail.cs

@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osuTK;
 using osuTK.Graphics;
 

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzJudgementLine.cs

@@ -12,8 +12,8 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osuTK;
+using EzLocalTextureFactory = osu.Game.LAsEzExtensions.EzLocalTextureFactory;
 
 namespace osu.Game.Rulesets.Mania.Skinning.EzStylePro
 {

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzKeyArea.cs

@@ -15,9 +15,9 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning.Legacy;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Screens.Play;
 using osuTK;
+using EzLocalTextureFactory = osu.Game.LAsEzExtensions.EzLocalTextureFactory;
 
 namespace osu.Game.Rulesets.Mania.Skinning.EzStylePro
 {

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzNoteBase.cs

@@ -9,8 +9,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osuTK;
+using EzLocalTextureFactory = osu.Game.LAsEzExtensions.EzLocalTextureFactory;
 
 namespace osu.Game.Rulesets.Mania.Skinning.EzStylePro
 {

osu.Game.Rulesets.Mania/Skinning/EzStylePro/EzStageBottom.cs

@@ -9,9 +9,9 @@ using osu.Framework.Logging;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Skinning;
 using osuTK;
+using EzLocalTextureFactory = osu.Game.LAsEzExtensions.EzLocalTextureFactory;
 
 namespace osu.Game.Rulesets.Mania.Skinning.EzStylePro
 {

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

@@ -19,6 +19,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Input.Handlers;
+using osu.Game.LAsEzExtensions.Configuration;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
@@ -33,7 +34,6 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Scoring;
 using osu.Game.Screens;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
@@ -41,6 +41,7 @@ using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.EzCurrentHitObject;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Mania.Scoring;
+using EzLocalTextureFactory = osu.Game.LAsEzExtensions.EzLocalTextureFactory;
 
 namespace osu.Game.Rulesets.Mania.UI
 {

osu.Game.Rulesets.Osu.Tests.iOS/Entitlements.plist

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-ios</TargetFramework>

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

@@ -245,13 +245,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("grid spacing is distance to slider tail", () =>
             {
                 var composer = Editor.ChildrenOfType<RectangularPositionSnapGrid>().Single();
-                return Precision.AlmostEquals(composer.Spacing.Value.X, 32.05, 0.01)
+                return Precision.AlmostEquals(composer.Spacing.Value.X, 32.05, 0.1)
                        && Precision.AlmostEquals(composer.Spacing.Value.X, composer.Spacing.Value.Y);
             });
             AddAssert("grid rotation points to slider tail", () =>
             {
                 var composer = Editor.ChildrenOfType<RectangularPositionSnapGrid>().Single();
-                return Precision.AlmostEquals(composer.GridLineRotation.Value, 0.09, 0.01);
+                return Precision.AlmostEquals(composer.GridLineRotation.Value, 0.09, 0.1);
             });
 
             AddStep("start grid placement", () => InputManager.Key(Key.Number5));
@@ -280,9 +280,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("grid spacing and rotation unchanged", () =>
             {
                 var composer = Editor.ChildrenOfType<RectangularPositionSnapGrid>().Single();
-                return Precision.AlmostEquals(composer.Spacing.Value.X, 32.05, 0.01)
+                return Precision.AlmostEquals(composer.Spacing.Value.X, 32.05, 0.1)
                        && Precision.AlmostEquals(composer.Spacing.Value.X, composer.Spacing.Value.Y)
-                       && Precision.AlmostEquals(composer.GridLineRotation.Value, 0.09, 0.01);
+                       && Precision.AlmostEquals(composer.GridLineRotation.Value, 0.09, 0.1);
             });
         }
 

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

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
@@ -10,6 +11,7 @@ using osu.Framework.Input.States;
 using osu.Framework.Logging;
 using osu.Framework.Testing.Input;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -58,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 foreach (var smokeContainer in smokeContainers)
                 {
-                    if (smokeContainer.Children.Count != 0)
+                    if (smokeContainer.Children.OfType<SkinnableDrawable>().Any())
                         return false;
                 }
 

osu.Game.Rulesets.Osu/Edit/Blueprints/GridPlacementBlueprint.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
         {
             this.gridToolboxGroup = gridToolboxGroup;
             originalOrigin = gridToolboxGroup.StartPosition.Value;
-            originalSpacing = gridToolboxGroup.Spacing.Value;
+            originalSpacing = gridToolboxGroup.GridLineSpacing.Value;
             originalRotation = gridToolboxGroup.GridLinesRotation.Value;
         }
 
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
             {
                 // Reset the grid to the default values.
                 gridToolboxGroup.StartPosition.Value = gridToolboxGroup.StartPosition.Default;
-                gridToolboxGroup.Spacing.Value = gridToolboxGroup.Spacing.Default;
+                gridToolboxGroup.GridLineSpacing.Value = gridToolboxGroup.GridLineSpacing.Default;
                 if (!gridToolboxGroup.GridLinesRotation.Disabled)
                     gridToolboxGroup.GridLinesRotation.Value = gridToolboxGroup.GridLinesRotation.Default;
                 EndPlacement(true);
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
                 // Default to the original spacing and rotation if the distance is too small.
                 if (Vector2.Distance(gridToolboxGroup.StartPosition.Value, pos) < 2)
                 {
-                    gridToolboxGroup.Spacing.Value = originalSpacing;
+                    gridToolboxGroup.GridLineSpacing.Value = originalSpacing;
                     if (!gridToolboxGroup.GridLinesRotation.Disabled)
                         gridToolboxGroup.GridLinesRotation.Value = originalRotation;
                 }
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
         private void resetGridState()
         {
             gridToolboxGroup.StartPosition.Value = originalOrigin;
-            gridToolboxGroup.Spacing.Value = originalSpacing;
+            gridToolboxGroup.GridLineSpacing.Value = originalSpacing;
             if (!gridToolboxGroup.GridLinesRotation.Disabled)
                 gridToolboxGroup.GridLinesRotation.Value = originalRotation;
         }

osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs

@@ -5,8 +5,10 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
@@ -42,25 +44,31 @@ namespace osu.Game.Rulesets.Osu.Edit
         private readonly BindableInt displayTolerance = new BindableInt(90)
         {
             MinValue = 5,
-            MaxValue = 100
+            MaxValue = 100,
+            Precision = 1,
         };
 
         private readonly BindableInt displayCornerThreshold = new BindableInt(40)
         {
             MinValue = 5,
-            MaxValue = 100
+            MaxValue = 100,
+            Precision = 1,
         };
 
         private readonly BindableInt displayCircleThreshold = new BindableInt(30)
         {
             MinValue = 0,
-            MaxValue = 100
+            MaxValue = 100,
+            Precision = 1,
         };
 
         private ExpandableSlider<int> toleranceSlider = null!;
         private ExpandableSlider<int> cornerThresholdSlider = null!;
         private ExpandableSlider<int> circleThresholdSlider = null!;
 
+        [Resolved]
+        private IExpandingContainer? expandingContainer { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -68,15 +76,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             {
                 toleranceSlider = new ExpandableSlider<int>
                 {
-                    Current = displayTolerance
+                    Current = displayTolerance,
+                    ExpandedLabelText = "Control point spacing",
                 },
                 cornerThresholdSlider = new ExpandableSlider<int>
                 {
-                    Current = displayCornerThreshold
+                    Current = displayCornerThreshold,
+                    ExpandedLabelText = "Corner bias",
                 },
                 circleThresholdSlider = new ExpandableSlider<int>
                 {
-                    Current = displayCircleThreshold
+                    Current = displayCircleThreshold,
+                    ExpandedLabelText = "Perfect curve bias"
                 }
             };
         }
@@ -88,24 +99,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             displayTolerance.BindValueChanged(tolerance =>
             {
                 toleranceSlider.ContractedLabelText = $"C. P. S.: {tolerance.NewValue:N0}";
-                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {tolerance.NewValue:N0}";
-
                 Tolerance.Value = displayToInternalTolerance(tolerance.NewValue);
             }, true);
 
             displayCornerThreshold.BindValueChanged(threshold =>
             {
-                cornerThresholdSlider.ContractedLabelText = $"C. T.: {threshold.NewValue:N0}";
-                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {threshold.NewValue:N0}";
-
+                cornerThresholdSlider.ContractedLabelText = $"C. B.: {threshold.NewValue:N0}";
                 CornerThreshold.Value = displayToInternalCornerThreshold(threshold.NewValue);
             }, true);
 
             displayCircleThreshold.BindValueChanged(threshold =>
             {
-                circleThresholdSlider.ContractedLabelText = $"P. C. T.: {threshold.NewValue:N0}";
-                circleThresholdSlider.ExpandedLabelText = $"Perfect Curve Threshold: {threshold.NewValue:N0}";
-
+                circleThresholdSlider.ContractedLabelText = $"P. C. B.: {threshold.NewValue:N0}";
                 CircleThreshold.Value = displayToInternalCircleThreshold(threshold.NewValue);
             }, true);
 
@@ -119,6 +124,11 @@ namespace osu.Game.Rulesets.Osu.Edit
                 displayCircleThreshold.Value = internalToDisplayCircleThreshold(threshold.NewValue)
             );
 
+            expandingContainer?.Expanded.BindValueChanged(v =>
+            {
+                Spacing = v.NewValue ? new Vector2(5) : new Vector2(15);
+            }, true);
+
             float displayToInternalTolerance(float v) => v / 50f;
             int internalToDisplayTolerance(float v) => (int)Math.Round(v * 50f);
 

osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = 0f,
             MaxValue = OsuPlayfield.BASE_SIZE.X,
-            Precision = 0.01f,
+            Precision = 0.1f,
         };
 
         /// <summary>
@@ -48,17 +48,17 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = 0f,
             MaxValue = OsuPlayfield.BASE_SIZE.Y,
-            Precision = 0.01f,
+            Precision = 0.1f,
         };
 
         /// <summary>
         /// The spacing between grid lines.
         /// </summary>
-        public BindableFloat Spacing { get; } = new BindableFloat(4f)
+        public BindableFloat GridLineSpacing { get; } = new BindableFloat(4f)
         {
             MinValue = 4f,
             MaxValue = 256f,
-            Precision = 0.01f,
+            Precision = 0.1f,
         };
 
         /// <summary>
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = -180f,
             MaxValue = 180f,
-            Precision = 0.01f,
+            Precision = 0.1f,
         };
 
         /// <summary>
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             float dist = Vector2.Distance(point1, point2);
             while (dist >= max_automatic_spacing)
                 dist /= 2;
-            Spacing.Value = dist;
+            GridLineSpacing.Value = dist;
         }
 
         [BackgroundDependencyLoader]
@@ -127,21 +127,25 @@ namespace osu.Game.Rulesets.Osu.Edit
                 {
                     Current = StartPositionX,
                     KeyboardStep = 1,
+                    ExpandedLabelText = "X offset",
                 },
                 startPositionYSlider = new ExpandableSlider<float>
                 {
                     Current = StartPositionY,
                     KeyboardStep = 1,
+                    ExpandedLabelText = "Y offset",
                 },
                 spacingSlider = new ExpandableSlider<float>
                 {
-                    Current = Spacing,
+                    Current = GridLineSpacing,
                     KeyboardStep = 1,
+                    ExpandedLabelText = "Spacing",
                 },
                 gridLinesRotationSlider = new ExpandableSlider<float>
                 {
                     Current = GridLinesRotation,
                     KeyboardStep = 1,
+                    ExpandedLabelText = "Rotation",
                 },
                 new FillFlowContainer
                 {
@@ -170,7 +174,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 },
             };
 
-            Spacing.Value = editorBeatmap.GridSize;
+            GridLineSpacing.Value = editorBeatmap.GridSize;
         }
 
         protected override void LoadComplete()
@@ -182,14 +186,12 @@ namespace osu.Game.Rulesets.Osu.Edit
             StartPositionX.BindValueChanged(x =>
             {
                 startPositionXSlider.ContractedLabelText = $"X: {x.NewValue:#,0.##}";
-                startPositionXSlider.ExpandedLabelText = $"X Offset: {x.NewValue:#,0.##}";
                 StartPosition.Value = new Vector2(x.NewValue, StartPosition.Value.Y);
             }, true);
 
             StartPositionY.BindValueChanged(y =>
             {
                 startPositionYSlider.ContractedLabelText = $"Y: {y.NewValue:#,0.##}";
-                startPositionYSlider.ExpandedLabelText = $"Y Offset: {y.NewValue:#,0.##}";
                 StartPosition.Value = new Vector2(StartPosition.Value.X, y.NewValue);
             }, true);
 
@@ -199,10 +201,9 @@ namespace osu.Game.Rulesets.Osu.Edit
                 StartPositionY.Value = pos.NewValue.Y;
             });
 
-            Spacing.BindValueChanged(spacing =>
+            GridLineSpacing.BindValueChanged(spacing =>
             {
                 spacingSlider.ContractedLabelText = $"S: {spacing.NewValue:#,0.##}";
-                spacingSlider.ExpandedLabelText = $"Spacing: {spacing.NewValue:#,0.##}";
                 SpacingVector.Value = new Vector2(spacing.NewValue);
                 editorBeatmap.GridSize = (int)spacing.NewValue;
             }, true);
@@ -210,7 +211,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             GridLinesRotation.BindValueChanged(rotation =>
             {
                 gridLinesRotationSlider.ContractedLabelText = $"R: {rotation.NewValue:#,0.##}";
-                gridLinesRotationSlider.ExpandedLabelText = $"Rotation: {rotation.NewValue:#,0.##}";
             }, true);
 
             GridType.BindValueChanged(v =>
@@ -239,6 +239,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             {
                 gridTypeButtons.FadeTo(v.NewValue ? 1f : 0f, 500, Easing.OutQuint);
                 gridTypeButtons.BypassAutoSizeAxes = !v.NewValue ? Axes.Y : Axes.None;
+
+                Spacing = v.NewValue ? new Vector2(5) : new Vector2(15);
             }, true);
         }
 
@@ -252,7 +254,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             switch (e.Action)
             {
                 case GlobalAction.EditorCycleGridSpacing:
-                    Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2;
+                    GridLineSpacing.Value = GridLineSpacing.Value * 2 >= max_automatic_spacing ? GridLineSpacing.Value / 8 : GridLineSpacing.Value * 2;
                     return true;
 
                 case GlobalAction.EditorCycleGridType:

osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
@@ -142,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 case PositionSnapGridType.Triangle:
                     var triangularPositionSnapGrid = new TriangularPositionSnapGrid();
 
-                    triangularPositionSnapGrid.Spacing.BindTo(OsuGridToolboxGroup.Spacing);
+                    triangularPositionSnapGrid.Spacing.BindTo(OsuGridToolboxGroup.GridLineSpacing);
                     triangularPositionSnapGrid.GridLineRotation.BindTo(OsuGridToolboxGroup.GridLinesRotation);
 
                     positionSnapGrid = triangularPositionSnapGrid;
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 case PositionSnapGridType.Circle:
                     var circularPositionSnapGrid = new CircularPositionSnapGrid();
 
-                    circularPositionSnapGrid.Spacing.BindTo(OsuGridToolboxGroup.Spacing);
+                    circularPositionSnapGrid.Spacing.BindTo(OsuGridToolboxGroup.GridLineSpacing);
 
                     positionSnapGrid = circularPositionSnapGrid;
                     break;
@@ -171,7 +172,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             => new OsuBlueprintContainer(this);
 
         public override string ConvertSelectionToString()
-            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
+            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime)
+                                                  .Select(h => (h.IndexInCurrentCombo + 1).ToString(CultureInfo.InvariantCulture)));
 
         // 1,2,3,4 ...
         private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$", RegexOptions.Compiled);

osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs

@@ -67,6 +67,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (LastAcceptedAction != null && nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
                 LastAcceptedAction = null;
+
+            if (LastAcceptedAction != null && gameplayClock.IsRewinding)
+                LastAcceptedAction = null;
         }
 
         protected abstract bool CheckValidNewAction(OsuAction action);

osu.Game.Rulesets.Osu/Mods/OsuModAlternate.cs

@@ -16,6 +16,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => @"Don't use the same key twice in a row!";
         public override IconUsage? Icon => OsuIcon.ModAlternate;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModSingleTap) }).ToArray();
+        public override bool Ranked => true;
 
         protected override bool CheckValidNewAction(OsuAction action) => LastAcceptedAction != action;
     }

osu.Game.Rulesets.Osu/Mods/OsuModSingleTap.cs

@@ -16,6 +16,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override IconUsage? Icon => OsuIcon.ModSingleTap;
         public override LocalisableString Description => @"You must only use one key!";
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAlternate) }).ToArray();
+        public override bool Ranked => true;
 
         protected override bool CheckValidNewAction(OsuAction action) => LastAcceptedAction == null || LastAcceptedAction == action;
     }

osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs

@@ -77,9 +77,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             RelativeSizeAxes = Axes.Both;
+        }
 
-            LifetimeStart = smokeStartTime = Time.Current;
-
+        public void StartDrawing(double time)
+        {
+            LifetimeStart = smokeStartTime = time;
+            LifetimeEnd = smokeEndTime = double.MaxValue;
+            SmokePoints.Clear();
+            lastPosition = null;
             totalDistance = pointInterval;
         }
 

osu.Game.Rulesets.Osu/UI/ReplayAnalysis/CursorPathContainer.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Performance;
 using osu.Game.Graphics;
@@ -12,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
 {
-    public partial class CursorPathContainer : Path
+    public partial class CursorPathContainer : SmoothPath
     {
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
         private readonly SortedSet<AnalysisFrameEntry> aliveEntries = new SortedSet<AnalysisFrameEntry>(new AimLinePointComparator());
@@ -22,14 +21,13 @@ namespace osu.Game.Rulesets.Osu.UI.ReplayAnalysis
             lifetimeManager.EntryBecameAlive += entryBecameAlive;
             lifetimeManager.EntryBecameDead += entryBecameDead;
 
-            PathRadius = 0.5f;
+            PathRadius = 1f;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             Colour = colours.Pink2;
-            BackgroundColour = colours.Pink2.Opacity(0);
         }
 
         protected override void Update()

osu.Game.Rulesets.Osu/UI/SmokeContainer.cs

@@ -1,9 +1,9 @@
 // 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.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
@@ -19,17 +19,24 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public partial class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
+        private DrawablePool<SmokeSkinnableDrawable> segmentPool = null!;
         private SmokeSkinnableDrawable? currentSegmentSkinnable;
 
         private Vector2 lastMousePosition;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(segmentPool = new DrawablePool<SmokeSkinnableDrawable>(10));
+        }
+
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
         {
             if (e.Action == OsuAction.Smoke)
             {
-                AddInternal(currentSegmentSkinnable = new SmokeSkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment()));
+                AddInternal(currentSegmentSkinnable = segmentPool.Get(segment => segment.Segment?.StartDrawing(Time.Current)));
 
                 // Add initial position immediately.
                 addPosition();
@@ -59,17 +66,19 @@ namespace osu.Game.Rulesets.Osu.UI
             return base.OnMouseMove(e);
         }
 
-        private void addPosition() => (currentSegmentSkinnable?.Drawable as SmokeSegment)?.AddPosition(lastMousePosition, Time.Current);
+        private void addPosition() => currentSegmentSkinnable?.Segment?.AddPosition(lastMousePosition, Time.Current);
 
         private partial class SmokeSkinnableDrawable : SkinnableDrawable
         {
+            public SmokeSegment? Segment => Drawable as SmokeSegment;
+
             public override bool RemoveWhenNotAlive => true;
 
             public override double LifetimeStart => Drawable.LifetimeStart;
             public override double LifetimeEnd => Drawable.LifetimeEnd;
 
-            public SmokeSkinnableDrawable(ISkinComponentLookup lookup, Func<ISkinComponentLookup, Drawable>? defaultImplementation = null, ConfineMode confineMode = ConfineMode.NoScaling)
-                : base(lookup, defaultImplementation, confineMode)
+            public SmokeSkinnableDrawable()
+                : base(new OsuSkinComponentLookup(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment())
             {
             }
         }

osu.Game.Rulesets.Taiko.Tests.iOS/Entitlements.plist

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-ios</TargetFramework>

osu.Game.Rulesets.Taiko/Edit/Checks/CheckTaikoLowestDiffDrainTime.cs

@@ -13,9 +13,9 @@ namespace osu.Game.Rulesets.Taiko.Edit.Checks
         protected override IEnumerable<(DifficultyRating rating, double thresholdMs, string name)> GetThresholds()
         {
             // See lowest difficulty requirements in https://osu.ppy.sh/wiki/en/Ranking_criteria/osu%21taiko#general
-            yield return (DifficultyRating.Hard, new TimeSpan(0, 3, 30).TotalMilliseconds, "Muzukashii");
-            yield return (DifficultyRating.Insane, new TimeSpan(0, 4, 15).TotalMilliseconds, "Oni");
-            yield return (DifficultyRating.Expert, new TimeSpan(0, 5, 0).TotalMilliseconds, "Inner Oni");
+            yield return (DifficultyRating.Hard, new TimeSpan(0, 2, 30).TotalMilliseconds, "Muzukashii");
+            yield return (DifficultyRating.Insane, new TimeSpan(0, 3, 15).TotalMilliseconds, "Oni");
+            yield return (DifficultyRating.Expert, new TimeSpan(0, 4, 0).TotalMilliseconds, "Inner Oni");
         }
     }
 }

osu.Game.Rulesets.Taiko/Mods/TaikoModSingleTap.cs

@@ -29,6 +29,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override IconUsage? Icon => OsuIcon.ModSingleTap;
         public override LocalisableString Description => @"One key for dons, one key for kats.";
 
+        public override bool Ranked => true;
         public override double ScoreMultiplier => 1.0;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(TaikoModCinema) };
         public override ModType Type => ModType.Conversion;

osu.Game.Tests.iOS/Entitlements.plist

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.iOS.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>

osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs

@@ -738,6 +738,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
             new object[] { "submitted=99999", false },
             new object[] { "submitted>=2012-03-05-04", false },
             new object[] { "submitted>=2012/03.05-04", false },
+
+            new object[] { "created<2012", true },
+            new object[] { "created<2012.03", true },
+            new object[] { "created<2012/03/05", true },
+            new object[] { "created<2012-3-5", true },
+
+            new object[] { "created<0", false },
+            new object[] { "created=99999", false },
+            new object[] { "created>=2012-03-05-04", false },
+            new object[] { "created>=2012/03.05-04", false },
         };
 
         [Test]

osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs

@@ -266,7 +266,11 @@ namespace osu.Game.Tests.Visual.Background
 
             FadeAccessibleResults results = null;
 
-            AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(TestResources.CreateTestScoreInfo())));
+            AddStep("Transition to Results", () =>
+            {
+                player.ValidForResume = false;
+                player.Push(results = new FadeAccessibleResults(TestResources.CreateTestScoreInfo()));
+            });
 
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
 

osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs

@@ -220,10 +220,13 @@ namespace osu.Game.Tests.Visual.Components
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
                 if (registerAsOwner)
-                    dependencies.CacheAs<IPreviewTrackOwner>(this);
-                return dependencies;
+                {
+                    // Automatically handled by interface caching.
+                    return base.CreateChildDependencies(parent);
+                }
+
+                return new DependencyContainer();
             }
         }
 

osu.Game.Tests/Visual/Gameplay/TestSceneDrawableGameplayLeaderboardScore.cs

@@ -0,0 +1,71 @@
+// 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.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Select.Leaderboards;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneDrawableGameplayLeaderboardScore : OsuTestScene
+    {
+        private readonly APIUser user = new APIUser { Username = "user" };
+        private readonly BindableLong totalScore = new BindableLong();
+        private readonly Bindable<int?> position = new Bindable<int?>();
+        private readonly BindableBool quit = new BindableBool();
+        private readonly BindableBool expanded = new BindableBool();
+
+        public TestSceneDrawableGameplayLeaderboardScore()
+        {
+            AddSliderStep("total score", 0, 1_000_000, 500_000, s => totalScore.Value = s);
+            AddSliderStep("position", 1, 100, 5, s => position.Value = s);
+            AddToggleStep("toggle quit", q => quit.Value = q);
+            AddToggleStep("toggle expanded", e => expanded.Value = e);
+        }
+
+        private static readonly OsuColour osu_colour = new OsuColour();
+
+        private static readonly object?[][] leaderboard_variants =
+        {
+            new object?[] { false, null },
+            new object?[] { true, null },
+            new object?[] { false, osu_colour.TeamColourRed },
+            new object?[] { true, osu_colour.TeamColourRed },
+            new object?[] { false, osu_colour.TeamColourBlue },
+            new object?[] { true, osu_colour.TeamColourBlue },
+        };
+
+        [TestCaseSource(nameof(leaderboard_variants))]
+        public void TestVariants(bool tracked, Color4? teamColour)
+        {
+            AddStep("show", () =>
+            {
+                GameplayLeaderboardScore score = new GameplayLeaderboardScore(user, tracked, totalScore)
+                {
+                    Position = { BindTarget = position },
+                    HasQuit = { BindTarget = quit },
+                    TeamColour = teamColour,
+                };
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 250,
+                    Child = new DrawableGameplayLeaderboardScore(score)
+                    {
+                        Expanded = { BindTarget = expanded },
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+            });
+        }
+    }
+}

osu.Game.Tests/Visual/Matchmaking/MatchmakingTestScene.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Screens;
+using osu.Game.Screens.OnlinePlay.Matchmaking.Match;
+using osu.Game.Tests.Visual.Multiplayer;
+
+namespace osu.Game.Tests.Visual.Matchmaking
+{
+    public abstract partial class MatchmakingTestScene : MultiplayerTestScene
+    {
+        protected override Container<Drawable> Content { get; }
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
+
+        protected MatchmakingTestScene()
+        {
+            BackgroundScreenStack backgroundStack;
+
+            base.Content.AddRange(new Drawable[]
+            {
+                backgroundStack = new BackgroundScreenStack(),
+                Content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+
+            backgroundStack.Push(new MatchmakingBackgroundScreen(colourProvider));
+        }
+    }
+}

osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -13,15 +14,15 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect;
-using osu.Game.Tests.Visual.OnlinePlay;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneBeatmapSelectGrid : OnlinePlayTestScene
+    public partial class TestSceneBeatmapSelectGrid : MatchmakingTestScene
     {
-        private MultiplayerPlaylistItem[] items = null!;
+        private MatchmakingPlaylistItem[] items = null!;
 
         private BeatmapSelectGrid grid = null!;
 
@@ -36,24 +37,44 @@ namespace osu.Game.Tests.Visual.Matchmaking
                                          .Take(50)
                                          .ToArray();
 
+            IEnumerable<MatchmakingPlaylistItem> playlistItems;
+
             if (beatmaps.Length > 0)
             {
-                items = Enumerable.Range(1, 50).Select(i => new MultiplayerPlaylistItem
+                playlistItems = Enumerable.Range(1, 50).Select(i =>
                 {
-                    ID = i,
-                    BeatmapID = beatmaps[i % beatmaps.Length].OnlineID,
-                    StarRating = i / 10.0,
-                }).ToArray();
+                    var beatmap = beatmaps[i % beatmaps.Length];
+
+                    return new MatchmakingPlaylistItem(
+                        new MultiplayerPlaylistItem
+                        {
+                            ID = i,
+                            BeatmapID = beatmap.OnlineID,
+                            StarRating = i / 10.0,
+                        },
+                        CreateAPIBeatmap(beatmap),
+                        Array.Empty<Mod>()
+                    );
+                });
             }
             else
             {
-                items = Enumerable.Range(1, 50).Select(i => new MultiplayerPlaylistItem
-                {
-                    ID = i,
-                    BeatmapID = i,
-                    StarRating = i / 10.0,
-                }).ToArray();
+                playlistItems = Enumerable.Range(1, 50).Select(i => new MatchmakingPlaylistItem(
+                    new MultiplayerPlaylistItem
+                    {
+                        ID = i,
+                        BeatmapID = i,
+                        StarRating = i / 10.0,
+                    },
+                    CreateAPIBeatmap(),
+                    Array.Empty<Mod>()
+                ));
             }
+
+            foreach (var item in playlistItems)
+                item.Beatmap.StarRating = item.PlaylistItem.StarRating;
+
+            items = playlistItems.ToArray();
         }
 
         public override void SetUpSteps()
@@ -70,8 +91,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
             AddStep("add items", () =>
             {
-                foreach (var item in items)
-                    grid.AddItem(item);
+                grid.AddItems(items);
             });
 
             AddWaitStep("wait for panels", 3);
@@ -85,17 +105,17 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 // test scene is weird.
             });
 
-            AddStep("add selection 1", () => grid.ChildrenOfType<BeatmapSelectPanel>().First().AddUser(new APIUser
+            AddStep("add selection 1", () => grid.ChildrenOfType<MatchmakingSelectPanel>().First().AddUser(new APIUser
             {
                 Id = DummyAPIAccess.DUMMY_USER_ID,
                 Username = "Maarvin",
             }));
-            AddStep("add selection 2", () => grid.ChildrenOfType<BeatmapSelectPanel>().Skip(5).First().AddUser(new APIUser
+            AddStep("add selection 2", () => grid.ChildrenOfType<MatchmakingSelectPanel>().Skip(5).First().AddUser(new APIUser
             {
                 Id = 2,
                 Username = "peppy",
             }));
-            AddStep("add selection 3", () => grid.ChildrenOfType<BeatmapSelectPanel>().Skip(10).First().AddUser(new APIUser
+            AddStep("add selection 3", () => grid.ChildrenOfType<MatchmakingSelectPanel>().Skip(10).First().AddUser(new APIUser
             {
                 Id = 1040328,
                 Username = "smoogipoo",
@@ -109,7 +129,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
             {
                 var (candidateItems, finalItem) = pickRandomItems(5);
 
-                grid.RollAndDisplayFinalBeatmap(candidateItems, finalItem);
+                grid.RollAndDisplayFinalBeatmap(candidateItems, finalItem, finalItem);
             });
         }
 
@@ -138,7 +158,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
                 grid.PlayRollAnimation(finalItem, duration: 0);
 
-                Scheduler.AddDelayed(() => grid.PresentRolledBeatmap(finalItem), 500);
+                Scheduler.AddDelayed(() => grid.PresentRolledBeatmap(finalItem, finalItem), 500);
             });
         }
 
@@ -153,7 +173,25 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
                 grid.PlayRollAnimation(finalItem, duration: 0);
 
-                Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(finalItem), 500);
+                Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(finalItem, finalItem), 500);
+            });
+        }
+
+        [Test]
+        public void TestPresentRandomItem()
+        {
+            AddStep("present random item panel", () =>
+            {
+                var (candidateItems, finalItem) = pickRandomItems(4);
+
+                grid.TransferCandidatePanelsToRollContainer(candidateItems.Append(-1).ToArray(), duration: 0);
+                grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
+                grid.PlayRollAnimation(-1, duration: 0);
+
+                Scheduler.AddDelayed(() =>
+                {
+                    grid.PresentRolledBeatmap(-1, finalItem);
+                }, 500);
             });
         }
 
@@ -180,7 +218,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
             AddStep("display roll order", () =>
             {
-                var panels = grid.ChildrenOfType<BeatmapSelectPanel>().ToArray();
+                var panels = grid.ChildrenOfType<MatchmakingSelectPanel>().ToArray();
 
                 for (int i = 0; i < panels.Length; i++)
                 {
@@ -197,23 +235,6 @@ namespace osu.Game.Tests.Visual.Matchmaking
             });
         }
 
-        [Test]
-        public void TestPresentRandomItem()
-        {
-            AddStep("present random item panel", () =>
-            {
-                grid.TransferCandidatePanelsToRollContainer(pickRandomItems(4).candidateItems.Append(-1).ToArray(), duration: 0);
-                grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
-                grid.PlayRollAnimation(-1, duration: 0);
-
-                Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(-1), 500);
-            });
-
-            AddWaitStep("wait for animation", 5);
-
-            AddStep("reveal beatmap", () => grid.RevealRandomItem(new MultiplayerPlaylistItem()));
-        }
-
         private (long[] candidateItems, long finalItem) pickRandomItems(int count)
         {
             long[] candidateItems = items.Select(it => it.ID).ToArray();

osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectPanel.cs

@@ -1,24 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneBeatmapSelectPanel : MultiplayerTestScene
+    public partial class TestSceneBeatmapSelectPanel : MatchmakingTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -44,14 +41,14 @@ namespace osu.Game.Tests.Visual.Matchmaking
         [Test]
         public void TestBeatmapPanel()
         {
-            BeatmapSelectPanel? panel = null;
+            MatchmakingSelectPanel? panel = null;
 
             AddStep("add panel", () =>
             {
                 Child = new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
+                    Child = panel = new MatchmakingSelectPanelBeatmap(new MatchmakingPlaylistItem(new MultiplayerPlaylistItem(), CreateAPIBeatmap(), []))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -81,53 +78,17 @@ namespace osu.Game.Tests.Visual.Matchmaking
             AddToggleStep("allow selection", value => panel!.AllowSelection = value);
         }
 
-        [Test]
-        public void TestFailedBeatmapLookup()
-        {
-            AddStep("setup request handle", () =>
-            {
-                var api = (DummyAPIAccess)API;
-                var handler = api.HandleRequest;
-                api.HandleRequest = req =>
-                {
-                    switch (req)
-                    {
-                        case GetBeatmapRequest:
-                        case GetBeatmapsRequest:
-                            req.TriggerFailure(new InvalidOperationException());
-                            return false;
-
-                        default:
-                            return handler?.Invoke(req) ?? false;
-                    }
-                };
-            });
-
-            AddStep("add panel", () =>
-            {
-                Child = new OsuContextMenuContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
-                };
-            });
-        }
-
         [Test]
         public void TestRandomPanel()
         {
-            BeatmapSelectPanel? panel = null;
+            MatchmakingSelectPanelRandom? panel = null;
 
             AddStep("add panel", () =>
             {
                 Child = new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem { ID = -1 })
+                    Child = panel = new MatchmakingSelectPanelRandom(new MultiplayerPlaylistItem { ID = -1 })
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -137,7 +98,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
             AddToggleStep("allow selection", value => panel!.AllowSelection = value);
 
-            AddStep("reveal beatmap", () => panel!.DisplayItem(new MultiplayerPlaylistItem()));
+            AddStep("reveal beatmap", () => panel!.PresentAsChosenBeatmap(new MatchmakingPlaylistItem(new MultiplayerPlaylistItem(), CreateAPIBeatmap(), [])));
         }
 
         [Test]
@@ -145,15 +106,12 @@ namespace osu.Game.Tests.Visual.Matchmaking
         {
             AddStep("add panel", () =>
             {
-                BeatmapSelectPanel? panel;
+                MatchmakingSelectPanel? panel;
 
                 Child = new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem
-                    {
-                        RequiredMods = [new APIMod(new OsuModHardRock()), new APIMod(new OsuModDoubleTime())]
-                    })
+                    Child = panel = new MatchmakingSelectPanelBeatmap(new MatchmakingPlaylistItem(new MultiplayerPlaylistItem(), CreateAPIBeatmap(), [new OsuModHardRock(), new OsuModDoubleTime()]))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingChatDisplay.cs

@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneMatchmakingChatDisplay : ScreenTestScene
+    public partial class TestSceneMatchmakingChatDisplay : MatchmakingTestScene
     {
         private MatchmakingChatDisplay? chat;
 

osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingPoolSelector.cs

@@ -22,11 +22,11 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 {
                     Value =
                     [
-                        new MatchmakingPool { Id = 0, RulesetId = 0, Name = "osu!" },
-                        new MatchmakingPool { Id = 1, RulesetId = 1, Name = "osu!taiko" },
-                        new MatchmakingPool { Id = 2, RulesetId = 2, Name = "osu!catch" },
-                        new MatchmakingPool { Id = 3, RulesetId = 3, Variant = 4, Name = "osu!mania (4k)" },
-                        new MatchmakingPool { Id = 4, RulesetId = 3, Variant = 7, Name = "osu!mania (7k)" },
+                        new MatchmakingPool { Id = 0, RulesetId = 0, Name = "Free-for-all" },
+                        new MatchmakingPool { Id = 1, RulesetId = 1, Name = "1v1" },
+                        new MatchmakingPool { Id = 2, RulesetId = 2, Name = "1v1" },
+                        new MatchmakingPool { Id = 3, RulesetId = 3, Variant = 4, Name = "1v1" },
+                        new MatchmakingPool { Id = 4, RulesetId = 3, Variant = 7, Name = "1v1" },
                     ]
                 }
             });

osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingScreen.cs

@@ -110,6 +110,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
                     state.CandidateItems = beatmaps.Select(b => b.ID).ToArray();
                     state.CandidateItem = beatmaps[0].ID;
+                    state.GameplayItem = beatmaps[0].ID;
                 }, waitTime: 35);
 
                 changeStage(MatchmakingStage.WaitingForClientsBeatmapDownload);

osu.Game.Tests/Visual/Matchmaking/TestScenePanelRoomAward.cs

@@ -3,11 +3,10 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestScenePanelRoomAward : MultiplayerTestScene
+    public partial class TestScenePanelRoomAward : MatchmakingTestScene
     {
         public override void SetUpSteps()
         {

osu.Game.Tests/Visual/Matchmaking/TestScenePickScreen.cs

@@ -6,16 +6,16 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestScenePickScreen : MultiplayerTestScene
+    public partial class TestScenePickScreen : MatchmakingTestScene
     {
         private readonly IReadOnlyList<APIUser> users = new[]
         {
@@ -104,8 +104,28 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 long[] candidateItems = selectedItems.ToArray();
                 long finalItem = candidateItems[Random.Shared.Next(candidateItems.Length)];
 
-                screen.RollFinalBeatmap(candidateItems, finalItem);
+                screen.RollFinalBeatmap(candidateItems, finalItem, finalItem);
             });
         }
+
+        [Test]
+        public void TestExpiredBeatmapNotShown()
+        {
+            SubScreenBeatmapSelect screen = null!;
+
+            AddStep("add screen with expired items", () =>
+            {
+                MultiplayerClient.ClientRoom!.Playlist =
+                [
+                    new MultiplayerPlaylistItem(items[0]) { Expired = true },
+                    new MultiplayerPlaylistItem(items[1])
+                ];
+
+                Child = new ScreenStack(screen = new SubScreenBeatmapSelect());
+            });
+
+            AddUntilStep("items displayed", () => screen.ChildrenOfType<MatchmakingSelectPanelBeatmap>().Any());
+            AddAssert("expired item not shown", () => screen.ChildrenOfType<MatchmakingSelectPanelBeatmap>().Count(), () => Is.EqualTo(1));
+        }
     }
 }

osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanel.cs

@@ -11,12 +11,11 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match;
-using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestScenePlayerPanel : MultiplayerTestScene
+    public partial class TestScenePlayerPanel : MatchmakingTestScene
     {
         private PlayerPanel panel = null!;
 

osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanelOverlay.cs

@@ -15,12 +15,11 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match;
-using osu.Game.Tests.Visual.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestScenePlayerPanelOverlay : MultiplayerTestScene
+    public partial class TestScenePlayerPanelOverlay : MatchmakingTestScene
     {
         private PlayerPanelOverlay list = null!;
 

osu.Game.Tests/Visual/Matchmaking/TestSceneResultsScreen.cs

@@ -11,12 +11,11 @@ using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results;
-using osu.Game.Tests.Visual.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneResultsScreen : MultiplayerTestScene
+    public partial class TestSceneResultsScreen : MatchmakingTestScene
     {
         public override void SetUpSteps()
         {

osu.Game.Tests/Visual/Matchmaking/TestSceneRoundResultsScreen.cs

@@ -14,12 +14,11 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.RoundResults;
-using osu.Game.Tests.Visual.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneRoundResultsScreen : MultiplayerTestScene
+    public partial class TestSceneRoundResultsScreen : MatchmakingTestScene
     {
         public override void SetUpSteps()
         {

osu.Game.Tests/Visual/Matchmaking/TestSceneStageDisplay.cs

@@ -9,11 +9,10 @@ using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match;
-using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Matchmaking
 {
-    public partial class TestSceneStageDisplay : MultiplayerTestScene
+    public partial class TestSceneStageDisplay : MatchmakingTestScene
     {
         [Cached]
         protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);

osu.Game.Tests/Visual/Online/TestSceneDrawableChannel.cs

@@ -146,5 +146,165 @@ namespace osu.Game.Tests.Visual.Online
                 checkCount++;
             }, 10);
         }
+
+        [Test]
+        public void TestAlternatingBackgroundDoesNotChangeAtMaxHistory()
+        {
+            AddStep("fill up the channel", () =>
+            {
+                for (int i = 0; i < Channel.MAX_HISTORY; i++)
+                {
+                    channel.AddNewMessages(new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = $"Message {i}",
+                        Timestamp = DateTimeOffset.Now,
+                        Sender = new APIUser
+                        {
+                            Id = 3,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    });
+                }
+            });
+
+            AddUntilStep($"{Channel.MAX_HISTORY} messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(Channel.MAX_HISTORY));
+
+            ChatLine? lastLine = null;
+            bool lastLineAlternatingBackground = false;
+
+            AddStep("grab last line", () =>
+            {
+                lastLine = drawableChannel.ChildrenOfType<ChatLine>().Last();
+                lastLineAlternatingBackground = lastLine.AlternatingBackground;
+            });
+
+            AddStep("add another message", () => channel.AddNewMessages(new Message
+            {
+                ChannelId = channel.Id,
+                Content = "One final message",
+                Timestamp = DateTimeOffset.Now,
+                Sender = new APIUser
+                {
+                    Id = 3,
+                    Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                }
+            }));
+
+            AddAssert("second-last message has same background", () => lastLine!.AlternatingBackground, () => Is.EqualTo(lastLineAlternatingBackground));
+        }
+
+        [Test]
+        public void TestAlternatingBackgroundUpdatedOnRemoval()
+        {
+            AddStep("add 3 messages", () =>
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    channel.AddNewMessages(new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = $"Message {i}",
+                        Timestamp = DateTimeOffset.Now,
+                        Sender = new APIUser
+                        {
+                            Id = i,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    });
+                }
+            });
+
+            AddUntilStep("3 messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(3));
+            assertAlternatingBackground(0, false);
+            assertAlternatingBackground(1, true);
+            assertAlternatingBackground(2, false);
+
+            AddStep("remove middle message", () => channel.RemoveMessagesFromUser(1));
+            AddUntilStep("2 messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(2));
+            assertAlternatingBackground(0, true);
+            assertAlternatingBackground(1, false);
+
+            void assertAlternatingBackground(int lineIndex, bool shouldBeAlternating)
+                => AddAssert($"line {lineIndex} {(shouldBeAlternating ? "has" : "does not have")} alternating background",
+                    () => drawableChannel.ChildrenOfType<ChatLine>().ElementAt(lineIndex).AlternatingBackground,
+                    () => Is.EqualTo(shouldBeAlternating));
+        }
+
+        [Test]
+        public void TestTimestampsUpdateOnRemoval()
+        {
+            AddStep("add 3 messages", () =>
+            {
+                channel.AddNewMessages(
+                    new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = "Message 0",
+                        Timestamp = new DateTimeOffset(2022, 11, 21, 20, 0, 0, TimeSpan.Zero),
+                        Sender = new APIUser
+                        {
+                            Id = 0,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    },
+                    new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = "Message 1",
+                        Timestamp = new DateTimeOffset(2022, 11, 21, 20, 0, 0, TimeSpan.Zero).AddSeconds(1),
+                        Sender = new APIUser
+                        {
+                            Id = 1,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    },
+                    new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = "Message 2",
+                        Timestamp = new DateTimeOffset(2022, 11, 21, 20, 0, 0, TimeSpan.Zero).AddMinutes(1),
+                        Sender = new APIUser
+                        {
+                            Id = 2,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    },
+                    new Message
+                    {
+                        ChannelId = channel.Id,
+                        Content = "Message 3",
+                        Timestamp = new DateTimeOffset(2022, 11, 21, 20, 0, 0, TimeSpan.Zero).AddMinutes(1).AddSeconds(1),
+                        Sender = new APIUser
+                        {
+                            Id = 3,
+                            Username = "LocalUser " + RNG.Next(0, int.MaxValue - 100).ToString("N")
+                        }
+                    }
+                );
+            });
+
+            AddUntilStep("4 messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(4));
+            assertTimestamp(0, true);
+            assertTimestamp(1, false);
+            assertTimestamp(2, true);
+            assertTimestamp(3, false);
+
+            AddStep("remove message 0", () => channel.RemoveMessagesFromUser(0));
+            AddUntilStep("3 messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(3));
+            assertTimestamp(0, true);
+            assertTimestamp(1, true);
+            assertTimestamp(2, false);
+
+            AddStep("remove message 2", () => channel.RemoveMessagesFromUser(2));
+            AddUntilStep("2 messages present", () => drawableChannel.ChildrenOfType<ChatLine>().Count(), () => Is.EqualTo(2));
+            assertTimestamp(0, true);
+            assertTimestamp(1, true);
+
+            void assertTimestamp(int lineIndex, bool shouldHaveTimestamp)
+                => AddAssert($"line {lineIndex} {(shouldHaveTimestamp ? "has" : "does not have")} timestamp",
+                    () => drawableChannel.ChildrenOfType<ChatLine>().ElementAt(lineIndex).RequiresTimestamp,
+                    () => Is.EqualTo(shouldHaveTimestamp));
+        }
     }
 }

osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs

@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddStep("schedule button clicks", () =>
             {
-                var clearButton = firstRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+                var clearButton = firstRow.ChildrenOfType<DangerousRoundedButton>().Single();
 
                 InputManager.MoveMouseTo(clearButton);
 
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 AddStep("click clear button", () =>
                 {
-                    var clearButton = multiBindingRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+                    var clearButton = multiBindingRow.ChildrenOfType<DangerousRoundedButton>().Single();
 
                     InputManager.MoveMouseTo(clearButton);
                     InputManager.Click(MouseButton.Left);
@@ -386,7 +386,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("clear binding", () =>
             {
                 var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
-                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+                row.ChildrenOfType<DangerousRoundedButton>().Single().TriggerClick();
             });
             scrollToAndStartBinding("Left (rim)");
             AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
@@ -462,7 +462,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("clear binding", () =>
             {
                 var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
-                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+                row.ChildrenOfType<DangerousRoundedButton>().Single().TriggerClick();
             });
         }
 

osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs

@@ -22,7 +22,6 @@ using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
-using osu.Game.Screens.Select.Filter;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
@@ -144,41 +143,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             void onScreenPushed(IScreen lastScreen, IScreen newScreen) => screensPushed.Add(lastScreen);
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestHoveringLeftSideReexpandsGroupSelectionIsIn(bool mouseOverPanel)
-        {
-            ImportBeatmapForRuleset(0);
-
-            LoadSongSelect();
-            SortAndGroupBy(SortMode.Difficulty, GroupMode.Difficulty);
-
-            AddStep("move mouse to carousel", () => InputManager.MoveMouseTo(Carousel));
-
-            AddUntilStep("expanded group is below 1 star",
-                () => (Carousel.ChildrenOfType<PanelGroupStarDifficulty>().SingleOrDefault(p => p.Expanded.Value)?.Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars,
-                () => Is.EqualTo(0));
-
-            AddStep("select next group", () =>
-            {
-                InputManager.PressKey(Key.ShiftLeft);
-                InputManager.Key(Key.Right);
-                InputManager.ReleaseKey(Key.ShiftLeft);
-            });
-            AddUntilStep("expanded group is 3 star",
-                () => (Carousel.ChildrenOfType<PanelGroupStarDifficulty>().SingleOrDefault(p => p.Expanded.Value)?.Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars,
-                () => Is.EqualTo(3));
-
-            if (mouseOverPanel)
-                AddStep("move mouse over left panel", () => InputManager.MoveMouseTo(this.ChildrenOfType<BeatmapTitleWedge>().Single()));
-            else
-                AddStep("move mouse to left side container", () => InputManager.MoveMouseTo(this.ChildrenOfType<Screens.Select.SongSelect.LeftSideInteractionContainer>().Single()));
-
-            AddUntilStep("expanded group is below 1 star",
-                () => (Carousel.ChildrenOfType<PanelGroupStarDifficulty>().Single(p => p.Expanded.Value).Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars,
-                () => Is.EqualTo(0));
-        }
-
         #region Hotkeys
 
         [Test]

osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs

@@ -4,12 +4,12 @@
 #nullable disable
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Settings.Sections;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -19,9 +19,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         private TestExpandingContainer container;
         private SettingsToolboxGroup toolboxGroup;
 
-        private ExpandableSlider<float, SizeSlider<float>> slider1;
+        private ExpandableSlider<float> slider1;
         private ExpandableSlider<double> slider2;
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -36,7 +39,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Width = 1,
                     Children = new Drawable[]
                     {
-                        slider1 = new ExpandableSlider<float, SizeSlider<float>>
+                        slider1 = new ExpandableSlider<float>
                         {
                             Current = new BindableFloat
                             {
@@ -62,13 +65,13 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             slider1.Current.BindValueChanged(v =>
             {
-                slider1.ExpandedLabelText = $"Slider One ({v.NewValue:0.##x})";
+                slider1.ExpandedLabelText = "Slider One";
                 slider1.ContractedLabelText = $"S. 1. ({v.NewValue:0.##x})";
             }, true);
 
             slider2.Current.BindValueChanged(v =>
             {
-                slider2.ExpandedLabelText = $"Slider Two ({v.NewValue:N2})";
+                slider2.ExpandedLabelText = "Slider Two";
                 slider2.ContractedLabelText = $"S. 2. ({v.NewValue:N2})";
             }, true);
         });

osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs

@@ -5,6 +5,10 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 
@@ -52,6 +56,7 @@ namespace osu.Game.Tournament.Tests.Components
                 beatmap.ApproachRate = 6.8f;
                 beatmap.OverallDifficulty = 5.5f;
                 beatmap.StarRating = 4.56f;
+                beatmap.DrainRate = 1.23f;
                 beatmap.Length = 123456;
                 beatmap.BPM = 133;
                 beatmap.OnlineID = ladderBeatmap.OnlineID;
@@ -61,11 +66,18 @@ namespace osu.Game.Tournament.Tests.Components
 
             AddStep("set mods to HR", () => songBar.Mods = LegacyMods.HardRock);
             AddStep("set mods to DT", () => songBar.Mods = LegacyMods.DoubleTime);
+            AddStep("set mods to HDHRDT", () => songBar.Mods = LegacyMods.Hidden | LegacyMods.HardRock | LegacyMods.DoubleTime);
+
             AddStep("unset mods", () => songBar.Mods = LegacyMods.None);
 
             AddToggleStep("toggle expanded", expanded => songBar.Expanded = expanded);
 
             AddStep("set null beatmap", () => songBar.Beatmap = null);
+
+            AddStep("set ruleset to osu", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddStep("set ruleset to taiko", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("set ruleset to catch", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
+            AddStep("set ruleset to mania", () => Ruleset.Value = new ManiaRuleset().RulesetInfo);
         }
     }
 }

osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs

@@ -6,6 +6,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat;
@@ -61,14 +63,33 @@ namespace osu.Game.Tournament.Tests.Components
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
-
-            chatDisplay.Channel.Value = testChannel;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            AddStep("set up API", () =>
+            {
+                ((DummyAPIAccess)API).HandleRequest = req =>
+                {
+                    switch (req)
+                    {
+                        case JoinChannelRequest joinChannelRequest:
+                            joinChannelRequest.TriggerSuccess();
+                            return true;
+
+                        case LeaveChannelRequest leaveChannelRequest:
+                            leaveChannelRequest.TriggerSuccess();
+                            return true;
+
+                        default:
+                            return false;
+                    }
+                };
+            });
+            AddStep("set channel", () => chatDisplay.Channel.Value = testChannel);
+
             AddStep("message from admin", () => testChannel.AddNewMessages(new Message(nextMessageId())
             {
                 Sender = admin,

osu.Game.Tournament/Components/SongBar.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -14,6 +15,7 @@ using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Models;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Utils;
 using osuTK;
@@ -123,27 +125,19 @@ namespace osu.Game.Tournament.Components
                 },
             };
 
-            double bpm = beatmap.BPM;
-            double length = beatmap.Length;
-            string hardRockExtra = "";
+            var rulesetInstance = ruleset.Value.CreateInstance();
+
+            var convertedMods = rulesetInstance.ConvertFromLegacyMods(mods).ToList();
+            var adjustedDifficulty = rulesetInstance.GetAdjustedDisplayDifficulty(beatmap, convertedMods);
+
+            double rate = ModUtils.CalculateRateWithMods(convertedMods);
+            double bpm = FormatUtils.RoundBPM(beatmap.BPM, rate);
+            double length = beatmap.Length / rate;
+
             string srExtra = "";
 
-            float ar = beatmap.Difficulty.ApproachRate;
-
-            if ((mods & LegacyMods.HardRock) > 0)
+            if (convertedMods.Any(x => x is ModHardRock) || convertedMods.Any(x => x is ModDoubleTime))
             {
-                hardRockExtra = "*";
-                srExtra = "*";
-            }
-
-            if ((mods & LegacyMods.DoubleTime) > 0)
-            {
-                // temporary local calculation (taken from OsuDifficultyCalculator)
-                double preempt = (int)IBeatmapDifficultyInfo.DifficultyRange(ar, 1800, 1200, 450) / 1.5;
-                ar = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
-
-                bpm *= 1.5f;
-                length /= 1.5f;
                 srExtra = "*";
             }
 
@@ -154,9 +148,9 @@ namespace osu.Game.Tournament.Components
                 default:
                     stats = new (string heading, string content)[]
                     {
-                        ("CS", $"{beatmap.Difficulty.CircleSize:0.#}{hardRockExtra}"),
-                        ("AR", $"{ar:0.#}{hardRockExtra}"),
-                        ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}{hardRockExtra}"),
+                        ("CS", $"{adjustedDifficulty.CircleSize:0.#}"),
+                        ("AR", $"{adjustedDifficulty.ApproachRate:0.#}"),
+                        ("OD", $"{adjustedDifficulty.OverallDifficulty:0.#}"),
                     };
                     break;
 
@@ -164,16 +158,16 @@ namespace osu.Game.Tournament.Components
                 case 3:
                     stats = new (string heading, string content)[]
                     {
-                        ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}{hardRockExtra}"),
-                        ("HP", $"{beatmap.Difficulty.DrainRate:0.#}{hardRockExtra}")
+                        ("OD", $"{adjustedDifficulty.OverallDifficulty:0.#}"),
+                        ("HP", $"{adjustedDifficulty.DrainRate:0.#}")
                     };
                     break;
 
                 case 2:
                     stats = new (string heading, string content)[]
                     {
-                        ("CS", $"{beatmap.Difficulty.CircleSize:0.#}{hardRockExtra}"),
-                        ("AR", $"{ar:0.#}"),
+                        ("CS", $"{adjustedDifficulty.CircleSize:0.#}"),
+                        ("AR", $"{adjustedDifficulty.ApproachRate:0.#}"),
                     };
                     break;
             }

osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class TournamentMatchChatDisplay : StandAloneChatDisplay
     {
-        private readonly Bindable<string> chatChannel = new Bindable<string>();
+        private readonly Bindable<string> channelName = new Bindable<string>();
 
         private ChannelManager? manager;
 
@@ -34,39 +34,33 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(MatchIPCInfo? ipc, IAPIProvider api)
+        private void load(MatchIPCInfo ipc, IAPIProvider api)
         {
-            if (ipc != null)
+            AddInternal(manager = new ChannelManager(api));
+            Channel.BindTo(manager.CurrentChannel);
+
+            channelName.BindTo(ipc.ChatChannel);
+            channelName.BindValueChanged(c =>
             {
-                chatChannel.BindTo(ipc.ChatChannel);
-                chatChannel.BindValueChanged(c =>
+                if (int.TryParse(c.OldValue, out int oldChannelId) && oldChannelId > 0)
                 {
-                    if (string.IsNullOrWhiteSpace(c.NewValue))
-                        return;
-
-                    int id = int.Parse(c.NewValue);
-
-                    if (id <= 0) return;
-
-                    if (manager == null)
-                    {
-                        AddInternal(manager = new ChannelManager(api));
-                        Channel.BindTo(manager.CurrentChannel);
-                    }
-
-                    foreach (var ch in manager.JoinedChannels.ToList())
-                        manager.LeaveChannel(ch);
+                    var joinedChannel = manager.JoinedChannels.SingleOrDefault(ch => ch.Id == oldChannelId);
+                    if (joinedChannel != null)
+                        manager.LeaveChannel(joinedChannel);
+                }
 
+                if (int.TryParse(c.NewValue, out int newChannelId) && newChannelId > 0)
+                {
                     var channel = new Channel
                     {
-                        Id = id,
+                        Id = newChannelId,
                         Type = ChannelType.Public
                     };
 
                     manager.JoinChannel(channel);
                     manager.CurrentChannel.Value = channel;
-                }, true);
-            }
+                }
+            }, true);
         }
 
         public void Expand() => this.FadeIn(300);

osu.Game.Tournament/Models/TournamentBeatmap.cs

@@ -6,6 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
+using static osu.Game.Online.API.Requests.Responses.APIBeatmap;
 
 namespace osu.Game.Tournament.Models
 {
@@ -31,6 +32,8 @@ namespace osu.Game.Tournament.Models
 
         public BeatmapSetOnlineCovers Covers { get; set; }
 
+        public IRulesetInfo Ruleset { get; set; } = new APIRuleset();
+
         public TournamentBeatmap()
         {
         }
@@ -47,6 +50,7 @@ namespace osu.Game.Tournament.Models
             Covers = beatmap.BeatmapSet?.Covers ?? new BeatmapSetOnlineCovers();
             EndTimeObjectCount = beatmap.EndTimeObjectCount;
             TotalObjectCount = beatmap.TotalObjectCount;
+            Ruleset = beatmap.Ruleset;
         }
 
         public bool Equals(IBeatmapInfo? other) => other is TournamentBeatmap b && this.MatchesOnlineID(b);
@@ -83,7 +87,7 @@ namespace osu.Game.Tournament.Models
 
         string IBeatmapInfo.MD5Hash => throw new NotImplementedException();
 
-        IRulesetInfo IBeatmapInfo.Ruleset => throw new NotImplementedException();
+        IRulesetInfo IBeatmapInfo.Ruleset => Ruleset;
 
         DateTimeOffset IBeatmapSetOnlineInfo.Submitted => throw new NotImplementedException();
 

osu.Game/Audio/IPreviewTrackOwner.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
+
 namespace osu.Game.Audio
 {
     /// <summary>
@@ -10,6 +12,7 @@ namespace osu.Game.Audio
     /// <see cref="IPreviewTrackOwner"/>s can cancel the currently playing <see cref="PreviewTrack"/> through the
     /// global <see cref="PreviewTrackManager"/> if they're the owner of the playing <see cref="PreviewTrack"/>.
     /// </remarks>
+    [Cached]
     public interface IPreviewTrackOwner
     {
     }

osu.Game/Beatmaps/Beatmap.cs

@@ -105,6 +105,7 @@ namespace osu.Game.Beatmaps
                                     return (beatLength: t.BeatLength, duration: nextTime - currentTime);
                                 })
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
+                                // Rounding is applied here (to 1e-3 milliseconds) to neutralise potential effects of floating point inaccuracies
                                 .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
                                 // Get the most common one, or 0 as a suitable default (see handling below)
@@ -113,7 +114,12 @@ namespace osu.Game.Beatmaps
             if (mostCommon.beatLength == 0)
                 return TimingControlPoint.DEFAULT_BEAT_LENGTH;
 
-            return mostCommon.beatLength;
+            // Because of the rounding applied to the beat length above, it is possible for the "most common" beat length as determined by the linq query above
+            // to actually be less or more than the raw range of unrounded beat lengths present in the map
+            // To ensure this does not become a problem anywhere else further, clamp the result to the known raw range
+            double minBeatLength = ControlPointInfo.TimingPoints.Min(t => t.BeatLength);
+            double maxBeatLength = ControlPointInfo.TimingPoints.Max(t => t.BeatLength);
+            return Math.Clamp(mostCommon.beatLength, minBeatLength, maxBeatLength);
         }
 
         public double AudioLeadIn { get; set; }

osu.Game/Configuration/OsuConfigManager.cs

@@ -15,13 +15,13 @@ using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
+using osu.Game.LAsEzExtensions.Configuration;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods.Input;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.LAsEzExtensions;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
@@ -167,6 +167,7 @@ namespace osu.Game.Configuration
             //新增自定义
             SetDefault(OsuSetting.EzSelectCsMode, CsItemIds.ALL.First().Id);
             SetDefault(OsuSetting.HitMode, EzMUGHitMode.EZ2AC);
+            SetDefault(OsuSetting.CustomHealthFormHitMode, true);
             SetDefault(OsuSetting.AccuracyCutoffS, 0.95, 0.95, 1, 0.005);
             SetDefault(OsuSetting.AccuracyCutoffA, 0.9, 0.9, 1, 0.005);
 
@@ -442,6 +443,7 @@ namespace osu.Game.Configuration
         AccuracyCutoffS,
         AccuracyCutoffA,
         HitMode,
+        CustomHealthFormHitMode,
         // //mania用自定义
         // SelectManiaRulesetSubset,
         // ScrollBaseSpeed,

osu.Game/Graphics/Containers/ExpandingContainer.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
+using osu.Framework.Input;
 using osu.Framework.Threading;
 
 namespace osu.Game.Graphics.Containers
@@ -58,6 +58,19 @@ namespace osu.Game.Graphics.Containers
 
         protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();
 
+        private InputManager inputManager = null!;
+
+        /// <summary>
+        /// Tracks whether the mouse was in bounds of this expanding container in the last frame.
+        /// </summary>
+        private bool? lastMouseInBounds;
+
+        /// <summary>
+        /// Tracks whether the last expansion of the container was caused by the mouse moving into its bounds
+        /// (as opposed to an external set of `Expanded`, in which case moving the mouse outside of its bounds should not contract).
+        /// </summary>
+        private bool? expandedByMouse;
+
         private ScheduledDelegate? hoverExpandEvent;
 
         protected override void LoadComplete()
@@ -68,37 +81,43 @@ namespace osu.Game.Graphics.Containers
             {
                 this.ResizeWidthTo(v.NewValue ? expandedWidth : contractedWidth, TRANSITION_DURATION, Easing.OutQuint);
             }, true);
+
+            inputManager = GetContainingInputManager()!;
         }
 
-        protected override bool OnHover(HoverEvent e)
+        protected override void Update()
         {
-            updateHoverExpansion();
-            return true;
+            base.Update();
+
+            bool mouseInBounds = Contains(inputManager.CurrentState.Mouse.Position);
+
+            if (lastMouseInBounds != mouseInBounds)
+                updateExpansionState(mouseInBounds);
+
+            lastMouseInBounds = mouseInBounds;
         }
 
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            if (hoverExpandEvent != null)
-            {
-                hoverExpandEvent?.Cancel();
-                hoverExpandEvent = null;
-
-                Expanded.Value = false;
-                return;
-            }
-
-            base.OnHoverLost(e);
-        }
-
-        private void updateHoverExpansion()
+        private void updateExpansionState(bool mouseInBounds)
         {
             if (!ExpandOnHover)
                 return;
 
             hoverExpandEvent?.Cancel();
+            hoverExpandEvent = null;
 
-            if (IsHovered && !Expanded.Value)
+            if (mouseInBounds && !Expanded.Value)
+            {
                 hoverExpandEvent = Scheduler.AddDelayed(() => Expanded.Value = true, HoverExpansionDelay);
+                expandedByMouse = true;
+            }
+
+            if (!mouseInBounds && Expanded.Value)
+            {
+                if (expandedByMouse == true)
+                    Expanded.Value = false;
+
+                expandedByMouse = false;
+            }
         }
     }
 }

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -15,7 +15,6 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
-    [Cached(typeof(IPreviewTrackOwner))]
     public abstract partial class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPreviewTrackOwner, IKeyBindingHandler<GlobalAction>
     {
         protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);

osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs

@@ -6,7 +6,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public partial class DangerousRoundedButton : RoundedButton
+    public sealed partial class DangerousRoundedButton : RoundedButton
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)

osu.Game/Graphics/UserInterface/ExpandableSlider.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
 using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Graphics.UserInterface
@@ -19,49 +20,27 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public partial class ExpandableSlider<T, TSlider> : CompositeDrawable, IExpandable, IHasCurrentValue<T>
         where T : struct, INumber<T>, IMinMaxValue<T>
-        where TSlider : RoundedSliderBar<T>, new()
+        where TSlider : FormSliderBar<T>, new()
     {
-        private readonly OsuSpriteText label;
+        private readonly OsuSpriteText contractedLabel;
         private readonly TSlider slider;
 
-        private LocalisableString contractedLabelText;
-
         /// <summary>
         /// The label text to display when this slider is in a contracted state.
         /// </summary>
         public LocalisableString ContractedLabelText
         {
-            get => contractedLabelText;
-            set
-            {
-                if (value == contractedLabelText)
-                    return;
-
-                contractedLabelText = value;
-
-                if (!Expanded.Value)
-                    label.Text = value;
-            }
+            get => contractedLabel.Text;
+            set => contractedLabel.Text = value;
         }
 
-        private LocalisableString expandedLabelText;
-
         /// <summary>
         /// The label text to display when this slider is in an expanded state.
         /// </summary>
         public LocalisableString ExpandedLabelText
         {
-            get => expandedLabelText;
-            set
-            {
-                if (value == expandedLabelText)
-                    return;
-
-                expandedLabelText = value;
-
-                if (Expanded.Value)
-                    label.Text = value;
-            }
+            get => slider.Caption;
+            set => slider.Caption = value;
         }
 
         public Bindable<T> Current
@@ -95,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
                 Spacing = new Vector2(0f, 10f),
                 Children = new Drawable[]
                 {
-                    label = new OsuSpriteText(),
+                    contractedLabel = new OsuSpriteText(),
                     slider = new TSlider
                     {
                         RelativeSizeAxes = Axes.X,
@@ -118,7 +97,8 @@ namespace osu.Game.Graphics.UserInterface
 
             Expanded.BindValueChanged(v =>
             {
-                label.Text = v.NewValue ? expandedLabelText : contractedLabelText;
+                contractedLabel.FadeTo(v.NewValue ? 0 : 1);
+
                 slider.FadeTo(v.NewValue ? Current.Disabled ? 0.3f : 1f : 0f, 500, Easing.OutQuint);
                 slider.BypassAutoSizeAxes = !v.NewValue ? Axes.Y : Axes.None;
             }, true);
@@ -133,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// An <see cref="IExpandable"/> implementation for the UI slider bar control.
     /// </summary>
-    public partial class ExpandableSlider<T> : ExpandableSlider<T, RoundedSliderBar<T>>
+    public partial class ExpandableSlider<T> : ExpandableSlider<T, FormSliderBar<T>>
         where T : struct, INumber<T>, IMinMaxValue<T>
     {
     }

osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs

@@ -56,7 +56,8 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                CornerRadius = 5,
+                CornerRadius = 10,
+                CornerExponent = 2.5f,
                 Masking = true,
                 EdgeEffect = new EdgeEffectParameters
                 {

osu.Game/Graphics/UserInterface/OsuDropdown.cs

@@ -357,7 +357,8 @@ namespace osu.Game.Graphics.UserInterface
                                 Icon = FontAwesome.Solid.ChevronDown,
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
-                                Size = new Vector2(16),
+                                Size = new Vector2(10),
+                                Margin = new MarginPadding { Right = 2 },
                             },
                         }
                     }

osu.Game/Graphics/UserInterface/ProgressBar.cs

@@ -13,7 +13,10 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ProgressBar : SliderBar<double>
     {
+        public bool Seeking { get; private set; }
+
         public Action<double> OnSeek;
+        public Action<double> OnCommit;
 
         private readonly Box fill;
         private readonly Box background;
@@ -75,6 +78,18 @@ namespace osu.Game.Graphics.UserInterface
             fill.Width = value * UsableWidth;
         }
 
-        protected override void OnUserChange(double value) => OnSeek?.Invoke(value);
+        protected override void OnUserChange(double value)
+        {
+            Seeking = true;
+            OnSeek?.Invoke(value);
+            base.OnUserChange(value);
+        }
+
+        protected override bool Commit()
+        {
+            Seeking = false;
+            OnCommit?.Invoke(CurrentNumber.Value);
+            return base.Commit();
+        }
     }
 }

osu.Game/Graphics/UserInterfaceV2/FormColourPalette.cs

@@ -178,7 +178,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 Size = new Vector2(70);
 
                 Masking = true;
-                CornerRadius = 35;
+                CornerRadius = 10;
+                CornerExponent = 2.5f;
                 Action = this.ShowPopover;
 
                 Children = new Drawable[]

osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs

@@ -26,18 +26,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         private Color4? triangleGradientSecondColour;
 
-        public override float Height
-        {
-            get => base.Height;
-            set
-            {
-                base.Height = value;
-
-                if (IsLoaded)
-                    updateCornerRadius();
-            }
-        }
-
         public override Color4 BackgroundColour
         {
             get => base.BackgroundColour;
@@ -61,7 +49,10 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             base.LoadComplete();
 
-            updateCornerRadius();
+            // This doesn't match the latest design spec (should be 5) but is an in-between that feels right to the eye
+            // until we move everything over to Form controls.
+            Content.CornerRadius = 10;
+            Content.CornerExponent = 2.5f;
 
             Add(Triangles = new TrianglesV2
             {
@@ -98,8 +89,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
             base.OnHoverLost(e);
         }
 
-        private void updateCornerRadius() => Content.CornerRadius = DrawHeight / 2;
-
         public virtual IEnumerable<LocalisableString> FilterTerms => new[] { Text };
 
         public bool MatchingFilter

osu.Game/LAsEzExtensions/Analysis/EzAnalysisOptionsPopover.cs

@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Analysis
 {
     public partial class EzAnalysisOptionsPopover : OsuPopover
     {

osu.Game/LAsEzExtensions/Analysis/EzAnalysisScoreButton.cs

@@ -14,7 +14,7 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using Realms;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Analysis
 {
     public partial class EzAnalysisScoreButton : GrayButton, IHasPopover
     {

osu.Game/LAsEzExtensions/Analysis/EzBeatmapCalculator.cs

@@ -7,7 +7,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Analysis
 {
     public class EzBeatmapCalculator
     {

osu.Game/LAsEzExtensions/Analysis/EzHitEventHeatmapGraph.cs

@@ -12,7 +12,7 @@ using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Analysis
 {
     public partial class EzHitEventHeatmapGraph : CompositeDrawable
     {

osu.Game/LAsEzExtensions/Analysis/HitEventTimingDistributionDot.cs

@@ -9,10 +9,11 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Ranking.Statistics
+namespace osu.Game.LAsEzExtensions.Analysis.UI.Components
 {
     public partial class HitEventTimingDistributionDot : CompositeDrawable
     {

osu.Game/LAsEzExtensions/Analysis/OptimizedBeatmapCalculator.cs

@@ -4,7 +4,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Analysis
 {
     public static class OptimizedBeatmapCalculator
     {

osu.Game/LAsEzExtensions/Background/VideoBackgroundScreen.cs

@@ -3,11 +3,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Video;
 using osu.Game.Configuration;
-using osu.Game.Graphics.Backgrounds;
+using osu.Game.Screens;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Background
 {
-    public partial class VideoBackgroundScreen : Background
+    public partial class VideoBackgroundScreen : Graphics.Backgrounds.Background
     {
         private readonly string videoPath;
 
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.LAsEzExtensions
         public static EzSkinSettingsManager? EzConfig { get; set; }
     }
 
-    public partial class StreamVideoBackgroundScreen : Background
+    public partial class StreamVideoBackgroundScreen : Graphics.Backgrounds.Background
     {
         private readonly Stream videoStream;
 

osu.Game/LAsEzExtensions/Configuration/EzColumnTypeManager.cs

@@ -1,7 +1,9 @@
 // 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.
 
-namespace osu.Game.Screens.LAsEzExtensions
+using osu.Game.Screens;
+
+namespace osu.Game.LAsEzExtensions.Configuration
 {
     public static class EzColumnTypeManager
     {

osu.Game/LAsEzExtensions/Configuration/EzEditorSidebar.cs

@@ -6,9 +6,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens;
 using osu.Game.Screens.Edit.Components;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Configuration
 {
     internal partial class EzEditorSidebar : EditorSidebar
     {

osu.Game/LAsEzExtensions/Configuration/EzMUGHitMode.cs

@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Configuration
 {
     public enum EzMUGHitMode
     {

osu.Game/LAsEzExtensions/Configuration/EzSelectorColour.cs

@@ -10,10 +10,11 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Configuration
 {
     public partial class EzSelectorColour : CompositeDrawable
     {

osu.Game/LAsEzExtensions/Configuration/EzSettingsColour.cs

@@ -18,7 +18,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Configuration
 {
     public partial class EzSettingsColour : SettingsItem<Colour4>
     {

osu.Game/LAsEzExtensions/Extensions/OsuSpriteTextExtensions.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Extensions
 {
     public static class OsuSpriteTextExtensions
     {

osu.Game/LAsEzExtensions/Extensions/SettingsColourExtensions.cs

@@ -11,10 +11,11 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.LAsEzExtensions.Configuration;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions.Extensions
 {
     public static partial class SettingsColourExtensions
     {

osu.Game/LAsEzExtensions/EzLocalTextureFactory.Preload.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Logging;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions
 {
     public partial class EzLocalTextureFactory
     {
@@ -25,6 +23,7 @@ namespace osu.Game.Screens.LAsEzExtensions
             if (preloadCompleted || isPreloading) return;
 
             isPreloading = true;
+
             try
             {
                 string currentNoteSetName = noteSetName.Value;

osu.Game/LAsEzExtensions/EzLocalTextureFactory.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -15,10 +12,11 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Game.Screens;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions
 {
     [Cached]
     public partial class EzLocalTextureFactory : CompositeDrawable

osu.Game/LAsEzExtensions/EzToCollection.cs

@@ -20,7 +20,7 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using Realms;
 
-namespace osu.Game.Screens.LAsEzExtensions
+namespace osu.Game.LAsEzExtensions
 {
     public partial class EzToCollection : OsuDropdown<CollectionFilterMenuItem>
     {