From 3ea469813c8cc95396d020a1f145cf0d2c67040e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:25:51 +0900
Subject: [PATCH] Use interface in place of `SkinnableTargetContainer`

---
 osu.Game/Skinning/ISkinnableTarget.cs         | 11 +++++++++++
 osu.Game/Skinning/Skin.cs                     |  4 ++--
 osu.Game/Skinning/SkinnableTargetContainer.cs |  9 ---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 3773b5be24..ba3a9fe228 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,7 +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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Extensions;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -20,6 +25,12 @@ namespace osu.Game.Skinning
         /// </summary>
         IBindableList<ISkinnableDrawable> Components { get; }
 
+        /// <summary>
+        /// Serialise all children as <see cref="SkinnableInfo"/>.
+        /// </summary>
+        /// <returns>The serialised content.</returns>
+        IEnumerable<SkinnableInfo> CreateSkinnableInfo() => Components.Select(d => ((Drawable)d).CreateSkinnableInfo());
+
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 3a16cb5818..0ceca3925e 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void ResetDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void UpdateDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index daf54277fd..52e86f5d86 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -2,12 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Extensions;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -64,12 +61,6 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
-        /// <summary>
-        /// Serialise all children as <see cref="SkinnableInfo"/>.
-        /// </summary>
-        /// <returns>The serialised content.</returns>
-        public IEnumerable<SkinnableInfo> CreateSkinnableInfo() => components.Select(d => ((Drawable)d).CreateSkinnableInfo());
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);