From d379d0276115d66b422ee9bc249824ccb8d60fd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Dec 2018 20:12:56 +0900
Subject: [PATCH] Remove unnecessary base class

---
 osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs | 31 +++++++++++-----------
 osu.Game/Rulesets/Mods/ModBlinds.cs        | 24 -----------------
 2 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Mods/ModBlinds.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
index a9379c9133..f216ae5814 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
@@ -1,6 +1,8 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Linq;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -9,30 +11,29 @@
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBlinds : ModBlinds<OsuHitObject>
+    public class OsuModBlinds : Mod, IApplicableToRulesetContainer<OsuHitObject>, IApplicableToScoreProcessor
     {
+        public override string Name => "Blinds";
+        public override string Acronym => "BL";
+        public override FontAwesome Icon => FontAwesome.fa_adjust;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override string Description => "Play with blinds on your screen.";
+        public override bool Ranked => false;
+
         public override double ScoreMultiplier => 1.12;
         private DrawableOsuBlinds flashlight;
 
-        public override void ApplyToRulesetContainer(RulesetContainer<OsuHitObject> rulesetContainer)
+        public void ApplyToRulesetContainer(RulesetContainer<OsuHitObject> rulesetContainer)
         {
-            bool hasEasy = false;
-            bool hasHardrock = false;
-            foreach (var mod in rulesetContainer.ActiveMods)
-            {
-                if (mod is ModEasy)
-                    hasEasy = true;
-                if (mod is ModHardRock)
-                    hasHardrock = true;
-            }
+            bool hasEasy = rulesetContainer.ActiveMods.Any(m => m is ModEasy);
+            bool hasHardrock = rulesetContainer.ActiveMods.Any(m => m is ModHardRock);
+
             rulesetContainer.Overlays.Add(flashlight = new DrawableOsuBlinds(rulesetContainer.Playfield.HitObjectContainer, hasEasy, hasHardrock, rulesetContainer.Beatmap));
         }
 
-        public override void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
+        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
-            scoreProcessor.Health.ValueChanged += val => {
-                flashlight.AnimateTarget((float)val);
-            };
+            scoreProcessor.Health.ValueChanged += val => { flashlight.AnimateTarget((float)val); };
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModBlinds.cs b/osu.Game/Rulesets/Mods/ModBlinds.cs
deleted file mode 100644
index e4a17551ec..0000000000
--- a/osu.Game/Rulesets/Mods/ModBlinds.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public abstract class ModBlinds<T> : Mod, IApplicableToRulesetContainer<T>, IApplicableToScoreProcessor
-            where T : HitObject
-    {
-        public override string Name => "Blinds";
-        public override string Acronym => "BL";
-        public override FontAwesome Icon => FontAwesome.fa_adjust;
-        public override ModType Type => ModType.DifficultyIncrease;
-        public override string Description => "Play with blinds on your screen.";
-        public override bool Ranked => false;
-
-        public abstract void ApplyToRulesetContainer(RulesetContainer<T> rulesetContainer);
-        public abstract void ApplyToScoreProcessor(ScoreProcessor scoreProcessor);
-    }
-}