From 2d6e667c7c3c2d39d9899fd8251ff0bedffb04c7 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 10 Mar 2017 13:40:44 +0900
Subject: [PATCH] Renaming + use IEnumerable.

---
 osu.Game.Modes.Catch/CatchRuleset.cs    | 3 ++-
 osu.Game.Modes.Mania/ManiaRuleset.cs    | 2 +-
 osu.Game.Modes.Osu/OsuRuleset.cs        | 2 +-
 osu.Game.Modes.Taiko/TaikoRuleset.cs    | 2 +-
 osu.Game/Modes/Ruleset.cs               | 2 +-
 osu.Game/Modes/UI/HUDOverlay.cs         | 5 +++--
 osu.Game/Modes/UI/StandardHUDOverlay.cs | 3 ++-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index b552278cec..32dcedb784 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -80,7 +80,8 @@ namespace osu.Game.Modes.Catch
 
         public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o;
 
-        public override KeyCounter[] GameplayKeys => new KeyCounter[]
+
+        public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
         {
             new KeyCounterKeyboard(Key.ShiftLeft),
             new KeyCounterMouse(MouseButton.Left),
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 51a33ce7bc..d31588f92c 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Modes.Mania
 
         public override FontAwesome Icon => FontAwesome.fa_osu_mania_o;
 
-        public override KeyCounter[] GameplayKeys => new KeyCounter[] { /* Todo: Should be keymod specific */ };
+        public override KeyCounter[] CreateGameplayKeys => new KeyCounter[] { /* Todo: Should be keymod specific */ };
 
         public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
 
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index 72c4b6988c..e6d828fb9a 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Modes.Osu
 
         protected override PlayMode PlayMode => PlayMode.Osu;
 
-        public override KeyCounter[] GameplayKeys => new KeyCounter[]
+        public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
         {
             new KeyCounterKeyboard(Key.Z),
             new KeyCounterKeyboard(Key.X),
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index 19432e5383..733c89c7c1 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Modes.Taiko
 
         public override FontAwesome Icon => FontAwesome.fa_osu_taiko_o;
 
-        public override KeyCounter[] GameplayKeys => new KeyCounter[]
+        public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
         {
             new KeyCounterKeyboard(Key.D),
             new KeyCounterKeyboard(Key.F),
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index d373b62a21..69b0d2fbb3 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Modes
 
     public abstract class Ruleset
     {
-        public abstract KeyCounter[] GameplayKeys { get; }
+        public abstract KeyCounter[] CreateGameplayKeys { get; }
 
         private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
 
diff --git a/osu.Game/Modes/UI/HUDOverlay.cs b/osu.Game/Modes/UI/HUDOverlay.cs
index d392765e47..e9b31dc519 100644
--- a/osu.Game/Modes/UI/HUDOverlay.cs
+++ b/osu.Game/Modes/UI/HUDOverlay.cs
@@ -10,6 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Modes.Objects;
 using osu.Game.Screens.Play;
 using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.UI
 {
@@ -23,7 +24,7 @@ namespace osu.Game.Modes.UI
 
         private Bindable<bool> showKeyCounter;
 
-        protected abstract KeyCounterCollection CreateKeyCounter(KeyCounter[] keyCounters);
+        protected abstract KeyCounterCollection CreateKeyCounter(IEnumerable<KeyCounter> keyCounters);
         protected abstract ComboCounter CreateComboCounter();
         protected abstract PercentageCounter CreateAccuracyCounter();
         protected abstract ScoreCounter CreateScoreCounter();
@@ -48,7 +49,7 @@ namespace osu.Game.Modes.UI
 
             Children = new Drawable[]
             {
-                KeyCounter = CreateKeyCounter(ruleset.GameplayKeys),
+                KeyCounter = CreateKeyCounter(ruleset.CreateGameplayKeys),
                 ComboCounter = CreateComboCounter(),
                 ScoreCounter = CreateScoreCounter(),
                 AccuracyCounter = CreateAccuracyCounter(),
diff --git a/osu.Game/Modes/UI/StandardHUDOverlay.cs b/osu.Game/Modes/UI/StandardHUDOverlay.cs
index 5d39d518d3..b67a1d72b1 100644
--- a/osu.Game/Modes/UI/StandardHUDOverlay.cs
+++ b/osu.Game/Modes/UI/StandardHUDOverlay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.UI
 {
@@ -39,7 +40,7 @@ namespace osu.Game.Modes.UI
             Margin = new MarginPadding { Top = 20 }
         };
 
-        protected override KeyCounterCollection CreateKeyCounter(KeyCounter[] keyCounters) => new KeyCounterCollection
+        protected override KeyCounterCollection CreateKeyCounter(IEnumerable<KeyCounter> keyCounters) => new KeyCounterCollection
         {
             IsCounting = true,
             FadeTime = 50,