From 512cec3458f53c29b135d65d49a4af8b86be8fe2 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 00:08:16 +0800
Subject: [PATCH 01/25] Use unicode for playlists

---
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 23c713a2c1..4fccf45fda 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,11 +13,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
@@ -105,10 +107,18 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
+            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            var text = new List<SpriteText>
+            {
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
+                new OsuSpriteText { Text = " - " },
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
+                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
+            };
+            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From cfaaf2e83e3112ea16e786c9a7487a58e794cd17 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:52:25 +0800
Subject: [PATCH 02/25] Add ToRomanisableString()

---
 osu.Game/Beatmaps/BeatmapInfo.cs                     | 12 ++++++++----
 osu.Game/Beatmaps/BeatmapMetadata.cs                 |  7 +++++++
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 11 ++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index bf7906bd5c..c5c5bd208c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO.Serialization;
@@ -127,6 +128,8 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
+        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
 
@@ -143,11 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString()
-        {
-            string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
 
-            return $"{Metadata ?? BeatmapSet?.Metadata} {version}".Trim();
+        public RomanisableString ToRomanisableString()
+        {
+            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 858da8e602..02d1349794 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Users;
@@ -71,6 +72,12 @@ namespace osu.Game.Beatmaps
             return $"{Artist} - {Title} {author}".Trim();
         }
 
+        public RomanisableString ToRomanisableString()
+        {
+            string author = Author == null ? string.Empty : $"({Author})";
+            return new RomanisableString($"{ArtistUnicode} - {TitleUnicode} {author}".Trim(), $"{Artist} - {Title} {author}".Trim());
+        }
+
         [JsonIgnore]
         public string[] SearchableTerms => new[]
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 4fccf45fda..69173bd53b 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -107,18 +107,11 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
-            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            var text = new List<SpriteText>
-            {
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
-                new OsuSpriteText { Text = " - " },
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
-                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
-            };
-            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
+            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 1339c126a49d9d52def6ef031959812f3ea48794 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:54:50 +0800
Subject: [PATCH 03/25] Remove unused using

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 69173bd53b..ca8e13d10a 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;

From 646403b826da7d5b3e2600ea93ac2ab2c01e9346 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:00:17 +0800
Subject: [PATCH 04/25] Fix CI errors

---
 osu.Game/Beatmaps/BeatmapInfo.cs                        | 2 +-
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c5c5bd208c..d5a1e2491b 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Beatmaps
 
         public RomanisableString ToRomanisableString()
         {
-            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
             return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index ca8e13d10a..fe5876e732 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,8 +109,8 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
-            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 38a7c590c4d07ac17c9746c8feac2aa4a59c63af Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:57:25 +0800
Subject: [PATCH 05/25] Make versionString private

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index d5a1e2491b..36cb97e8d7 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
-        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        private string versionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
 
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
@@ -146,12 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {versionString}".Trim();
 
         public RomanisableString ToRomanisableString()
         {
             var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
-            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
+            return new RomanisableString($"{metadata.GetPreferred(true)} {versionString}".Trim(), $"{metadata.GetPreferred(false)} {versionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)

From 488001d5701b51db7405e5ebd7c3ab4174e9a699 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:58:08 +0800
Subject: [PATCH 06/25] Support SpriteText for LinkFlowContainer

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 23 +++++++++++++++++++
 osu.Game/Online/Chat/DrawableLinkCompiler.cs  |  5 ++++
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 914c8ff78d..32efcce80c 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -67,6 +67,13 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
+        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
+        {
+            AddArbitraryDrawable(text);
+
+            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
+        }
+
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -86,6 +93,22 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
+        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
+        {
+            AddInternal(new DrawableLinkCompiler(drawable)
+            {
+                RelativeSizeAxes = Axes.Both,
+                TooltipText = tooltipText,
+                Action = () =>
+                {
+                    if (action != null)
+                        action();
+                    else
+                        game?.HandleLink(link);
+                },
+            });
+        }
+
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index d27a3fbffe..7675eab4c0 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
+        public DrawableLinkCompiler(Drawable part)
+        {
+            Parts = new List<Drawable> { part };
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index fe5876e732..a92ca610f3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
                 LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();

From ef3801b5dd619d1fb0c5edf32c4d683ad26bd4ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:29:26 +0900
Subject: [PATCH 07/25] Add helper method supporting RomanisableString

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 34 ++++++-------------
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  4 +--
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 32efcce80c..3a2f9d5a78 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -7,7 +7,10 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 
 namespace osu.Game.Graphics.Containers
@@ -59,6 +62,14 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
+        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        {
+            var spriteText = new OsuSpriteText { Text = text };
+
+            AddText(spriteText, creationParameters);
+            createLink(spriteText.Yield(), new LinkDetails(action, argument), tooltipText);
+        }
+
         public void AddLink(IEnumerable<SpriteText> text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
         {
             foreach (var t in text)
@@ -67,13 +78,6 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
-        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
-        {
-            AddArbitraryDrawable(text);
-
-            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
-        }
-
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -93,22 +97,6 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
-        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
-        {
-            AddInternal(new DrawableLinkCompiler(drawable)
-            {
-                RelativeSizeAxes = Axes.Both,
-                TooltipText = tooltipText,
-                Action = () =>
-                {
-                    if (action != null)
-                        action();
-                    else
-                        game?.HandleLink(link);
-                },
-            });
-        }
-
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a92ca610f3..38a9ace619 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -18,7 +18,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
@@ -109,8 +108,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
-                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(Item.Beatmap.Value.ToRomanisableString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 25c7dc9ef0f7716a08878733b9cba18063cfef48 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:30:11 +0900
Subject: [PATCH 08/25] Revert unnecessary change

---
 osu.Game/Online/Chat/DrawableLinkCompiler.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index 7675eab4c0..d27a3fbffe 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,11 +31,6 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
-        public DrawableLinkCompiler(Drawable part)
-        {
-            Parts = new List<Drawable> { part };
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From 2a7ef1f80f037cbf393acbf23f1bd06ee4cbc4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Apr 2021 19:27:35 +0200
Subject: [PATCH 09/25] Use more general type

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 3a2f9d5a78..054febeec3 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
-        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        public void AddLink(LocalisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
         {
             var spriteText = new OsuSpriteText { Text = text };
 

From 67dfeeb1b77eaa009aff89aa666fdf3ad12ec365 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:23:56 +0800
Subject: [PATCH 10/25] Cleanup code in ModHidden

---
 .../Mods/CatchModHidden.cs                    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    | 14 ++++----
 osu.Game/Rulesets/Mods/ModHidden.cs           | 35 -------------------
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index bba42dea97..ba3e8f9a8f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             var offset = hitObject.TimePreempt * fade_out_offset_multiplier;
             var duration = offset - hitObject.TimePreempt * fade_out_duration_multiplier;
 
-            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset, true))
+            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset))
                 drawable.FadeOut(duration);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 45f314af7b..b0f3f49939 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -65,13 +65,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         drawableObject.FadeOut(fadeOut.duration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
 
@@ -88,22 +88,22 @@ namespace osu.Game.Rulesets.Osu.Mods
                     else
                     {
                         // we don't want to see the approach circle
-                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt, true))
+                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         fadeTarget.FadeOut(fadeOut.duration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
                         slider.Body.FadeOut(fadeOut.duration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
                         sliderTick.FadeOut(fadeOut.duration);
 
                     break;
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
                         spinner.FadeOut(fadeOut.duration);
 
                     break;
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index df421adbe5..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
@@ -18,14 +17,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 
-        /// <summary>
-        /// Check whether the provided hitobject should be considered the "first" hideable object.
-        /// Can be used to skip spinners, for instance.
-        /// </summary>
-        /// <param name="hitObject">The hitobject to check.</param>
-        [Obsolete("Use IsFirstAdjustableObject() instead.")] // Can be removed 20210506
-        protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
-
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             // Default value of ScoreProcessor's Rank in Hidden Mod should be SS+
@@ -49,36 +40,10 @@ namespace osu.Game.Rulesets.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyFirstObjectIncreaseVisibilityState(hitObject, state);
-#pragma warning restore 618
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyHiddenState(hitObject, state);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Apply a special visibility state to the first object in a beatmap, if the user chooses to turn on the "increase first object visibility" setting.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        /// <summary>
-        /// Apply a hidden state to the provided object.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyNormalVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
-        {
         }
     }
 }

From 393ac4fdd1d6ab2ea08b0658f9d907696f1937d1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:30:58 +0800
Subject: [PATCH 11/25] Destruct declaration

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index b0f3f49939..4f1e91974a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -60,20 +60,20 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double duration) fadeOut = getFadeOutParameters(drawableOsuObject);
+            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        drawableObject.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
-                        sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
+                        sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
                     break;
 
@@ -92,19 +92,19 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        fadeTarget.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
-                        slider.Body.FadeOut(fadeOut.duration, Easing.Out);
+                    using (slider.BeginAbsoluteSequence(startTime))
+                        slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
-                        sliderTick.FadeOut(fadeOut.duration);
+                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                        sliderTick.FadeOut(fadeDuration);
 
                     break;
 
@@ -112,14 +112,14 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
-                        spinner.FadeOut(fadeOut.duration);
+                    using (spinner.BeginAbsoluteSequence(startTime))
+                        spinner.FadeOut(fadeDuration);
 
                     break;
             }
         }
 
-        private (double startTime, double duration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double duration) getParameters(OsuHitObject hitObject)
+            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From a86a4bab9137ef6781404dc116101662c4c6d858 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:53:59 +0800
Subject: [PATCH 12/25] Remove empty override

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 2 --
 osu.Game/Rulesets/Mods/ModHidden.cs        | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4f1e91974a..c2ddeb5fcc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -43,13 +43,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyIncreasedVisibilityState(hitObject, state);
             applyState(hitObject, true);
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
             applyState(hitObject, false);
         }
 
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From a4c1b9a1a7195dca0f4b5f5f078774f306c0c916 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:56:13 +0800
Subject: [PATCH 13/25] Rename startTime to fadeStartTime

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index c2ddeb5fcc..4168293749 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -58,18 +58,18 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
+            (double fadeStartTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
@@ -90,18 +90,18 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(startTime))
+                    using (slider.BeginAbsoluteSequence(fadeStartTime))
                         slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                    using (sliderTick.BeginAbsoluteSequence(fadeStartTime))
                         sliderTick.FadeOut(fadeDuration);
 
                     break;
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(startTime))
+                    using (spinner.BeginAbsoluteSequence(fadeStartTime))
                         spinner.FadeOut(fadeDuration);
 
                     break;

From 63ac430386a631ea683496527aa7f8cb47b5f065 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:26:16 +0800
Subject: [PATCH 14/25] Rename startTime in parameters

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4168293749..2752feb0a1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double fadeStartTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
+            static (double fadeStartTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From 6e5c4ed7c6c3e4890c1480d7ccac1d52b131c8cf Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:37:04 +0800
Subject: [PATCH 15/25] Revert "Remove empty override"

This reverts commit a86a4bab9137ef6781404dc116101662c4c6d858.
---
 osu.Game/Rulesets/Mods/ModHidden.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 238612b3d2..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -36,5 +37,13 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }

From 166974506ea25739eb3ad48c7e9206370a684b4b Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:51:39 +0800
Subject: [PATCH 16/25] Duplicate implementions

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs         | 6 ++++--
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs         | 9 +++++++++
 osu.Game/Rulesets/Mods/ModHidden.cs                    | 9 ---------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index ba3e8f9a8f..7bad4c79cb 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -28,10 +28,12 @@ namespace osu.Game.Rulesets.Catch.Mods
             catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-
             if (!(hitObject is DrawableCatchHitObject catchDrawable))
                 return;
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 87501d07a5..3c24e91d54 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
@@ -39,5 +40,13 @@ namespace osu.Game.Rulesets.Mania.Mods
                 }));
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index a6f902208c..7739ecaf5b 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
@@ -10,5 +11,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Beats fade out before you hit them!";
         public override double ScoreMultiplier => 1.06;
         public override bool HasImplementation => false;
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From a91f2d3dbad5e4a41dec719fa57ba5279b64ccd2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 10:17:04 +0800
Subject: [PATCH 17/25] Change "judgment" to "judgement"

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ea3eb5eb5c..8993a9b18a 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             var hitWindows = new OsuHitWindows();
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
-                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
+                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgementLoaded));
 
             AddRangeInternal(poolDictionary.Values);
 
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.UI
             }
         }
 
-        private void onJudgmentLoaded(DrawableOsuJudgement judgement)
+        private void onJudgementLoaded(DrawableOsuJudgement judgement)
         {
             judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
         }

From 3519398a224ba44f2f2e91ba6dd3aa921741a6a9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:16:12 +0800
Subject: [PATCH 18/25] Added "flip" mod for taiko

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 32 ++++++++++++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs      |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
new file mode 100644
index 0000000000..1f2f2c4784
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -0,0 +1,32 @@
+// 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.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
+        public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            var taikoBeatmap = (TaikoBeatmap)beatmap;
+
+            foreach (var obj in taikoBeatmap.HitObjects)
+            {
+                if (obj is Hit hit)
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f4e158ec32..26dc1bd416 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModRandom(),
+                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From da13be6dd0d9ec1dca90b46649e9a3e6a3f6c31d Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:28:11 +0800
Subject: [PATCH 19/25] Trimmed trailing white space

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 1f2f2c4784..e2de6ccc3d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
             foreach (var obj in taikoBeatmap.HitObjects)
             {
                 if (obj is Hit hit)
-                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre;
             }
         }
     }

From 3d83741a23c6c0be53c71000148a3d7531e580c2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:03:03 +0800
Subject: [PATCH 20/25] Separate Flip and Random

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs   | 3 +++
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs | 3 +++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs        | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index e2de6ccc3d..22e627ef06 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.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 System;
+using System.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -17,6 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index 1cf19ac18e..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.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 System;
+using System.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -12,6 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 26dc1bd416..52088b7ac4 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,8 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
+                        new TaikoModFlip(),
+                        new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From cbc2a38b590429ccf07d4aea7e8d4083899aba01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:06 +0900
Subject: [PATCH 21/25] Move new mod to end to avoid reordering

---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 52088b7ac4..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,10 +133,10 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModFlip(),
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:

From 422a3b76b64532f69b1432ff01d2c0d39aa68f12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:19 +0900
Subject: [PATCH 22/25] Remove unused using statements

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 22e627ef06..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;

From 5972e43bc2a038df5e8c2c8f97e17ae28fe79399 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:51:40 +0800
Subject: [PATCH 23/25] Renamed TaikoModFlip to TaikoModInvert

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +-----------
 .../Mods/{TaikoModFlip.cs => TaikoModInvert.cs}  |  6 +-----
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 18 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModInvert.cs} (77%)
 create mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 1ea45c295c..0366c0f374 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -13,19 +12,10 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
     {
-        public override string Name => "Invert";
-
-        public override string Acronym => "IN";
-        public override double ScoreMultiplier => 1;
-
         public override string Description => "Hold the keys. To the beat.";
 
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-
-        public override ModType Type => ModType.Conversion;
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
index bfab98fbf8..a6ccebaa61 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
@@ -10,13 +10,9 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
-        public override ModType Type => ModType.Conversion;
-        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a5ab176176 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..8a716bf56e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModInvert(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
new file mode 100644
index 0000000000..6c211d2173
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModInvert.cs
@@ -0,0 +1,16 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModInvert : Mod
+    {
+        public override string Name => "Invert";
+        public override string Acronym => "IN";
+        public override ModType Type => ModType.Conversion;
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+        public override double ScoreMultiplier => 1;
+    }
+}

From c4ae70a82720a04a82502d8bacf158040ac412d9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 10:59:56 +0800
Subject: [PATCH 24/25] Revert "Renamed TaikoModFlip to TaikoModInvert"

This reverts commit 5972e43bc2a038df5e8c2c8f97e17ae28fe79399.
---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +++++++++++-
 .../Mods/{TaikoModInvert.cs => TaikoModFlip.cs}  |  6 +++++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ----------------
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModInvert.cs => TaikoModFlip.cs} (77%)
 delete mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 0366c0f374..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -12,10 +13,19 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
     {
+        public override string Name => "Invert";
+
+        public override string Acronym => "IN";
+        public override double ScoreMultiplier => 1;
+
         public override string Description => "Hold the keys. To the beat.";
 
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+
+        public override ModType Type => ModType.Conversion;
+
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index a6ccebaa61..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -10,9 +10,13 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
     {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index a5ab176176..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 8a716bf56e..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModInvert(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
deleted file mode 100644
index 6c211d2173..0000000000
--- a/osu.Game/Rulesets/Mods/ModInvert.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Graphics.Sprites;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public abstract class ModInvert : Mod
-    {
-        public override string Name => "Invert";
-        public override string Acronym => "IN";
-        public override ModType Type => ModType.Conversion;
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-        public override double ScoreMultiplier => 1;
-    }
-}

From f34637ea9c06a7e3a00b45f3fc762a025548dfe5 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 11:04:01 +0800
Subject: [PATCH 25/25] Renamed TaikoModFlip to TaikoModSwap

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs              | 2 +-
 .../Mods/{TaikoModFlip.cs => TaikoModSwap.cs}               | 6 +++---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModSwap.cs} (86%)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a22f189d5e 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModSwap)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
similarity index 86%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
index bfab98fbf8..3cb337c41d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
@@ -10,10 +10,10 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModSwap : Mod, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
+        public override string Name => "Swap";
+        public override string Acronym => "SW";
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..5854d4770c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModSwap(),
                     };
 
                 case ModType.Automation: