Use transformers for per-skin key counter implementation

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

@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -28,11 +29,15 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
         {
-            if (lookup is SkinComponentsContainerLookup containerLookup)
+            switch (lookup)
             {
-                switch (containerLookup.Target)
+                case SkinComponentsContainerLookup containerLookup:
+                    if (containerLookup.Target != SkinComponentsContainerLookup.TargetArea.MainHUDComponents)
+                        return base.GetDrawableComponent(lookup);
+
+                    // Modifications for global components.
+                    if (containerLookup.Ruleset == null)
                     {
-                    case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
                         var components = base.GetDrawableComponent(lookup) as Container;
 
                         if (providesComboCounter && components != null)
@@ -45,10 +50,34 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
                         return components;
                     }
-            }
 
-            if (lookup is CatchSkinComponentLookup catchSkinComponent)
+                    // Skin has configuration.
+                    if (base.GetDrawableComponent(lookup) is Drawable d)
+                        return d;
+
+                    // Our own ruleset components default.
+                    return new DefaultSkinComponentsContainer(container =>
                     {
+                        var keyCounter = container.OfType<LegacyKeyCounterDisplay>().FirstOrDefault();
+
+                        if (keyCounter != null)
+                        {
+                            // set the anchor to top right so that it won't squash to the return button to the top
+                            keyCounter.Anchor = Anchor.CentreRight;
+                            keyCounter.Origin = Anchor.CentreRight;
+                            keyCounter.X = 0;
+                            // 340px is the default height inherit from stable
+                            keyCounter.Y = container.ToLocalSpace(new Vector2(0, container.ScreenSpaceDrawQuad.Centre.Y - 340f)).Y;
+                        }
+                    })
+                    {
+                        Children = new Drawable[]
+                        {
+                            new LegacyKeyCounterDisplay(),
+                        }
+                    };
+
+                case CatchSkinComponentLookup catchSkinComponent:
                     switch (catchSkinComponent.Component)
                     {
                         case CatchSkinComponents.Fruit:

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

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
@@ -41,8 +42,46 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
         {
-            if (lookup is OsuSkinComponentLookup osuComponent)
+            switch (lookup)
             {
+                case SkinComponentsContainerLookup containerLookup:
+                    // Only handle per ruleset defaults here.
+                    if (containerLookup.Ruleset == null)
+                        return base.GetDrawableComponent(lookup);
+
+                    // Skin has configuration.
+                    if (base.GetDrawableComponent(lookup) is Drawable d)
+                        return d;
+
+                    // Our own ruleset components default.
+                    switch (containerLookup.Target)
+                    {
+                        case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
+                            return new DefaultSkinComponentsContainer(container =>
+                            {
+                                var keyCounter = container.OfType<LegacyKeyCounterDisplay>().FirstOrDefault();
+
+                                if (keyCounter != null)
+                                {
+                                    // set the anchor to top right so that it won't squash to the return button to the top
+                                    keyCounter.Anchor = Anchor.CentreRight;
+                                    keyCounter.Origin = Anchor.CentreRight;
+                                    keyCounter.X = 0;
+                                    // 340px is the default height inherit from stable
+                                    keyCounter.Y = container.ToLocalSpace(new Vector2(0, container.ScreenSpaceDrawQuad.Centre.Y - 340f)).Y;
+                                }
+                            })
+                            {
+                                Children = new Drawable[]
+                                {
+                                    new LegacyKeyCounterDisplay(),
+                                }
+                            };
+                    }
+
+                    return null;
+
+                case OsuSkinComponentLookup osuComponent:
                     switch (osuComponent.Component)
                     {
                         case OsuSkinComponents.FollowPoint:
@@ -171,10 +210,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         default:
                             throw new UnsupportedSkinComponentException(lookup);
                     }
-            }
 
+                default:
                     return base.GetDrawableComponent(lookup);
             }
+        }
 
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {

osu.Game/Skinning/LegacySkin.cs

@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -356,44 +355,13 @@ namespace osu.Game.Skinning
             switch (lookup)
             {
                 case SkinComponentsContainerLookup containerLookup:
+                    // Only handle global level defaults for now.
+                    if (containerLookup.Ruleset != null)
+                        return null;
 
                     switch (containerLookup.Target)
                     {
                         case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
-                            return createDefaultHUDComponents(containerLookup);
-
-                        default:
-                            return null;
-                    }
-
-                case GameplaySkinComponentLookup<HitResult> resultComponent:
-
-                    // kind of wasteful that we throw this away, but should do for now.
-                    if (getJudgementAnimation(resultComponent.Component) != null)
-                    {
-                        // TODO: this should be inside the judgement pieces.
-                        Func<Drawable> createDrawable = () => getJudgementAnimation(resultComponent.Component).AsNonNull();
-
-                        var particle = getParticleTexture(resultComponent.Component);
-
-                        if (particle != null)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
-
-                        return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
-                    }
-
-                    return null;
-            }
-
-            return null;
-        }
-
-        private static DefaultSkinComponentsContainer? createDefaultHUDComponents(SkinComponentsContainerLookup containerLookup)
-        {
-            switch (containerLookup.Ruleset?.ShortName)
-            {
-                case null:
-                {
                             return new DefaultSkinComponentsContainer(container =>
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
@@ -436,34 +404,28 @@ namespace osu.Game.Skinning
                             };
                     }
 
-                case @"osu":
+                    return null;
-                case @"fruits":
-                {
-                    return new DefaultSkinComponentsContainer(container =>
-                    {
-                        var keyCounter = container.OfType<LegacyKeyCounterDisplay>().FirstOrDefault();
 
-                        if (keyCounter != null)
+                case GameplaySkinComponentLookup<HitResult> resultComponent:
+
+                    // kind of wasteful that we throw this away, but should do for now.
+                    if (getJudgementAnimation(resultComponent.Component) != null)
                     {
-                            // set the anchor to top right so that it won't squash to the return button to the top
+                        // TODO: this should be inside the judgement pieces.
-                            keyCounter.Anchor = Anchor.CentreRight;
+                        Func<Drawable> createDrawable = () => getJudgementAnimation(resultComponent.Component).AsNonNull();
-                            keyCounter.Origin = Anchor.CentreRight;
+
-                            keyCounter.X = 0;
+                        var particle = getParticleTexture(resultComponent.Component);
-                            // 340px is the default height inherit from stable
+
-                            keyCounter.Y = container.ToLocalSpace(new Vector2(0, container.ScreenSpaceDrawQuad.Centre.Y - 340f)).Y;
+                        if (particle != null)
-                        }
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
-                    })
+
-                    {
+                        return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
-                        Children = new Drawable[]
-                        {
-                            new LegacyKeyCounterDisplay(),
-                        }
-                    };
                     }
 
-                default:
                     return null;
             }
+
+            return null;
         }
 
         private Texture? getParticleTexture(HitResult result)