From e61d2d571c1b23c6f1e0d4df9f35fdc2f5b93053 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Feb 2023 16:35:23 +0900
Subject: [PATCH] Move the lookup type out of `ISserialisableDrawableContainer`

---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs          | 6 +++---
 osu.Game/Skinning/ISerialisableDrawableContainer.cs | 5 -----
 osu.Game/Skinning/Skin.cs                           | 6 +++---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 39187d6471..25448906b2 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Overlays.SkinEditor
                 settingsSidebar.Add(new SkinSettingsToolbox(component));
         }
 
-        private IEnumerable<ISerialisableDrawableContainer> availableTargets => targetScreen.ChildrenOfType<ISerialisableDrawableContainer>();
+        private IEnumerable<SkinnableTargetContainer> availableTargets => targetScreen.ChildrenOfType<SkinnableTargetContainer>();
 
         private ISerialisableDrawableContainer? getFirstTarget() => availableTargets.FirstOrDefault();
 
@@ -350,7 +350,7 @@ namespace osu.Game.Overlays.SkinEditor
 
         private void revert()
         {
-            ISerialisableDrawableContainer[] targetContainers = availableTargets.ToArray();
+            SkinnableTargetContainer[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -370,7 +370,7 @@ namespace osu.Game.Overlays.SkinEditor
             if (!hasBegunMutating)
                 return;
 
-            ISerialisableDrawableContainer[] targetContainers = availableTargets.ToArray();
+            SkinnableTargetContainer[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
diff --git a/osu.Game/Skinning/ISerialisableDrawableContainer.cs b/osu.Game/Skinning/ISerialisableDrawableContainer.cs
index 386ebee085..54d8a68c95 100644
--- a/osu.Game/Skinning/ISerialisableDrawableContainer.cs
+++ b/osu.Game/Skinning/ISerialisableDrawableContainer.cs
@@ -15,11 +15,6 @@ namespace osu.Game.Skinning
     /// </summary>
     public interface ISerialisableDrawableContainer : IDrawable
     {
-        /// <summary>
-        /// The definition of this target.
-        /// </summary>
-        GlobalSkinComponentLookup.LookupType Target { get; }
-
         /// <summary>
         /// A bindable list of components which are being tracked by this skinnable target.
         /// </summary>
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index ebe9d2bdd3..b97b167419 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -143,7 +143,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(ISerialisableDrawableContainer targetContainer)
+        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -152,9 +152,9 @@ 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(ISerialisableDrawableContainer targetContainer)
+        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
         {
-            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedInfo().ToArray();
+            DrawableComponentInfo[targetContainer.Target] = ((ISerialisableDrawableContainer)targetContainer).CreateSerialisedInfo().ToArray();
         }
 
         public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup)