From 60c2494b316827c691327a55793750871753a190 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:40:56 +0200
Subject: [PATCH] Make `BeatmapVerifier` an interface

---
 .../Edit/OsuBeatmapVerifier.cs                 | 12 ++----------
 osu.Game.Rulesets.Osu/OsuRuleset.cs            |  2 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs      | 18 ++----------------
 osu.Game/Rulesets/Ruleset.cs                   |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs   |  2 +-
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 2faa239720..1c7ab00bbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -10,21 +10,13 @@
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuBeatmapVerifier : BeatmapVerifier
+    public class OsuBeatmapVerifier : IBeatmapVerifier
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckOffscreenObjects()
         };
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            // Also run mode-invariant checks.
-            foreach (var issue in base.Run(beatmap))
-                yield return issue;
-
-            foreach (var issue in checks.SelectMany(check => check.Run(beatmap)))
-                yield return issue;
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 63da100a04..d6375fa6e3 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override BeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
+        public override IBeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 1d0508705a..2bafacefa3 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -2,27 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class BeatmapVerifier
+    public interface IBeatmapVerifier
     {
-        /// <summary>
-        /// Checks which are performed regardless of ruleset.
-        /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
-        /// </summary>
-        private readonly IReadOnlyList<ICheck> generalChecks = new List<ICheck>
-        {
-            new CheckBackground()
-        };
-
-        public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            return generalChecks.SelectMany(check => check.Run(beatmap));
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 2a29d88c89..b501c55aef 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ public PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap,
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual BeatmapVerifier CreateBeatmapVerifier() => null;
+        public virtual IBeatmapVerifier CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index a3d808ce62..a733c9c176 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static BeatmapVerifier beatmapVerifier;
+        private static IBeatmapVerifier beatmapVerifier;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();