Update Legacy components to not require skin in ctor

osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             InternalChildren = new Drawable[]
             {
-                explosion = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                explosion = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Alpha = 0.65f,
                     Blending = BlendingParameters.Additive,
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     Origin = Anchor.Centre,
                     Scale = new Vector2(1.5f),
                 },
-                counter = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                counter = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs

@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
-                    bonusCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    bonusCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Alpha = 0f,
                         Anchor = Anchor.TopCentre,
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Position = new Vector2(-87, 445 + spm_hide_offset),
                     },
-                    spmCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    spmCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopRight,

osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs

@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     if (!this.HasFont(LegacyFont.HitCircle))
                         return null;
 
-                    return new LegacySpriteText(Source, LegacyFont.HitCircle)
+                    return new LegacySpriteText(LegacyFont.HitCircle)
                     {
                         // stable applies a blanket 0.8x scale to hitcircle fonts
                         Scale = new Vector2(0.8f),

osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -14,12 +16,22 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private SkinEditor skinEditor;
 
+        [Resolved]
+        private SkinManager skinManager { get; set; }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("set empty legacy skin", () =>
+            {
+                var imported = skinManager.Import(new SkinInfo { Name = "test skin" }).Result;
+
+                skinManager.CurrentSkinInfo.Value = imported;
+            });
+
             base.SetUpSteps();
 
-            AddStep("add editor overlay", () =>
+            AddStep("reload skin editor", () =>
             {
                 skinEditor?.Expire();
                 Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);

osu.Game/Screens/Play/HUD/LegacyComboCounter.cs

@@ -84,13 +84,13 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                popOutCount = new LegacySpriteText(skin, LegacyFont.Combo)
+                popOutCount = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                     Margin = new MarginPadding(0.05f),
                     Blending = BlendingParameters.Additive,
                 },
-                displayedCountSpriteText = new LegacySpriteText(skin, LegacyFont.Combo)
+                displayedCountSpriteText = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                 },

osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs

@@ -1,12 +1,17 @@
 // 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.Game.Extensions;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        private SkinnableTargetWrapper content;
+
         public SkinnableTarget Target { get; }
 
         public SkinnableElementTargetContainer(SkinnableTarget target)
@@ -14,15 +19,19 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
+            content.Select(d => d.CreateSerialisedInformation());
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
 
-            var loadable = skin.GetDrawableComponent(new SkinnableTargetComponent(Target));
+            content = skin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
 
             ClearInternal();
-            if (loadable != null)
+
-                LoadComponentAsync(loadable, AddInternal);
+            if (content != null)
+                LoadComponentAsync(content, AddInternal);
         }
     }
 }

osu.Game/Skinning/LegacyAccuracyCounter.cs

@@ -12,23 +12,22 @@ namespace osu.Game.Skinning
 {
     public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
 
-        public LegacyAccuracyCounter(ISkin skin)
+        public LegacyAccuracyCounter()
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
             Scale = new Vector2(0.6f);
             Margin = new MarginPadding(10);
-
-            this.skin = skin;
         }
 
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning
         {
             base.Update();
 
-            if (hud?.ScoreCounter.Drawable is LegacyScoreCounter score)
+            if (hud?.ScoreCounter?.Drawable is LegacyScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
                 Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;

osu.Game/Skinning/LegacyHealthDisplay.cs

@@ -20,7 +20,9 @@ namespace osu.Game.Skinning
     {
         private const double epic_cutoff = 0.5;
 
-        private readonly Skin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         private LegacyHealthPiece fill;
         private LegacyHealthPiece marker;
 
@@ -28,11 +30,6 @@ namespace osu.Game.Skinning
 
         private bool isNewStyle;
 
-        public LegacyHealthDisplay(Skin skin)
-        {
-            this.skin = skin;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -79,7 +76,7 @@ namespace osu.Game.Skinning
 
         protected override void Flash(JudgementResult result) => marker.Flash(result);
 
-        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
+        private static Texture getTexture(ISkinSource skin, string name) => skin.GetTexture($"scorebar-{name}");
 
         private static Color4 getFillColour(double hp)
         {
@@ -98,7 +95,7 @@ namespace osu.Game.Skinning
             private readonly Texture dangerTexture;
             private readonly Texture superDangerTexture;
 
-            public LegacyOldStyleMarker(Skin skin)
+            public LegacyOldStyleMarker(ISkinSource skin)
             {
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
@@ -129,9 +126,9 @@ namespace osu.Game.Skinning
 
         public class LegacyNewStyleMarker : LegacyMarker
         {
-            private readonly Skin skin;
+            private readonly ISkinSource skin;
 
-            public LegacyNewStyleMarker(Skin skin)
+            public LegacyNewStyleMarker(ISkinSource skin)
             {
                 this.skin = skin;
             }
@@ -153,7 +150,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyOldStyleFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(Skin skin)
+            public LegacyOldStyleFill(ISkinSource skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -176,7 +173,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyNewStyleFill : LegacyHealthPiece
         {
-            public LegacyNewStyleFill(Skin skin)
+            public LegacyNewStyleFill(ISkinSource skin)
             {
                 InternalChild = new Sprite
                 {

osu.Game/Skinning/LegacyRollingCounter.cs

@@ -12,7 +12,6 @@ namespace osu.Game.Skinning
     /// </summary>
     public class LegacyRollingCounter : RollingCounter<int>
     {
-        private readonly ISkin skin;
         private readonly LegacyFont font;
 
         protected override bool IsRollingProportional => true;
@@ -20,11 +19,9 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Creates a new <see cref="LegacyRollingCounter"/>.
         /// </summary>
-        /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
         /// <param name="font">The legacy font to use for the counter.</param>
-        public LegacyRollingCounter(ISkin skin, LegacyFont font)
+        public LegacyRollingCounter(LegacyFont font)
         {
-            this.skin = skin;
             this.font = font;
         }
 
@@ -33,6 +30,6 @@ namespace osu.Game.Skinning
             return Math.Abs(newValue - currentValue) * 75.0;
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, font);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(font);
     }
 }

osu.Game/Skinning/LegacyScoreCounter.cs

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -10,24 +11,23 @@ namespace osu.Game.Skinning
 {
     public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
-
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public LegacyScoreCounter(ISkin skin)
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
+        public LegacyScoreCounter()
             : base(6)
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
-            this.skin = skin;
-
             Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,

osu.Game/Skinning/LegacySkin.cs

@@ -334,13 +334,13 @@ namespace osu.Game.Skinning
                             return new LegacyComboCounter();
 
                         case HUDSkinComponents.ScoreCounter:
-                            return new LegacyScoreCounter(this);
+                            return new LegacyScoreCounter();
 
                         case HUDSkinComponents.AccuracyCounter:
-                            return new LegacyAccuracyCounter(this);
+                            return new LegacyAccuracyCounter();
 
                         case HUDSkinComponents.HealthDisplay:
-                            return new LegacyHealthDisplay(this);
+                            return new LegacyHealthDisplay();
                     }
 
                     return null;

osu.Game/Skinning/LegacySpriteText.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
@@ -9,19 +10,26 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacySpriteText : OsuSpriteText
+    public sealed class LegacySpriteText : OsuSpriteText
     {
-        private readonly LegacyGlyphStore glyphStore;
+        private readonly LegacyFont font;
+
+        private LegacyGlyphStore glyphStore;
 
         protected override char FixedWidthReferenceCharacter => '5';
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(ISkin skin, LegacyFont font)
+        public LegacySpriteText(LegacyFont font)
         {
+            this.font = font;
             Shadow = false;
             UseFullGlyphHeight = false;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);