Move remaining osu-specific implementations to OsuLegacySkin

osu.Game.Rulesets.Osu/Skinning/LegacyCursor.cs

@@ -0,0 +1,42 @@
+// 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.Framework.Graphics.Containers;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public class LegacyCursor : CompositeDrawable
+    {
+        public LegacyCursor()
+        {
+            Size = new Vector2(50);
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new NonPlayfieldSprite
+                {
+                    Texture = skin.GetTexture("cursormiddle"),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new NonPlayfieldSprite
+                {
+                    Texture = skin.GetTexture("cursor"),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/NonPlayfieldSprite.cs

@@ -0,0 +1,28 @@
+// 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.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    /// <summary>
+    /// A sprite which is displayed within the playfield, but historically was not considered part of the playfield.
+    /// Performs scale adjustment to undo the scale applied by <see cref="PlayfieldAdjustmentContainer"/> (osu! ruleset specifically).
+    /// </summary>
+    public class NonPlayfieldSprite : Sprite
+    {
+        public override Texture Texture
+        {
+            get => base.Texture;
+            set
+            {
+                if (value != null)
+                    // stable "magic ratio". see OsuPlayfieldAdjustmentContainer for full explanation.
+                    value.ScaleAdjust *= 1.6f;
+                base.Texture = value;
+            }
+        }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/OsuLegacySkin.cs

@@ -82,6 +82,26 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         return new LegacyMainCirclePiece();
 
                     return null;
+
+                case "Play/osu/cursor":
+                    if (GetTexture("cursor") != null)
+                        return new LegacyCursor();
+
+                    return null;
+
+                case "Play/osu/number-text":
+
+                    string font = GetValue<SkinConfiguration, string>(config => config.HitCircleFont);
+                    var overlap = GetValue<SkinConfiguration, float>(config => config.HitCircleOverlap);
+
+                    return !hasFont(font)
+                        ? null
+                        : new LegacySpriteText(this, font)
+                        {
+                            // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size
+                            Scale = new Vector2(0.96f),
+                            Spacing = new Vector2(-overlap * 0.89f, 0)
+                        };
             }
 
             return null;
@@ -93,5 +113,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration
             => configuration.Value is TConfiguration conf ? query.Invoke(conf) : default;
+
+        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
     }
 }

osu.Game/Skinning/LegacySkin.cs

@@ -3,17 +3,12 @@
 
 using System.IO;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
-using osu.Game.Rulesets.UI;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -59,12 +54,6 @@ namespace osu.Game.Skinning
 
             switch (componentName)
             {
-                case "Play/osu/cursor":
-                    if (GetTexture("cursor") != null)
-                        return new LegacyCursor();
-
-                    return null;
-
                 case "Play/osu/sliderfollowcircle":
                     animatable = true;
                     break;
@@ -92,16 +81,6 @@ namespace osu.Game.Skinning
                     animatable = true;
                     looping = false;
                     break;
-
-                case "Play/osu/number-text":
-                    return !hasFont(Configuration.HitCircleFont)
-                        ? null
-                        : new LegacySpriteText(this, Configuration.HitCircleFont)
-                        {
-                            Scale = new Vector2(0.96f),
-                            // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size
-                            Spacing = new Vector2(-Configuration.HitCircleOverlap * 0.89f, 0)
-                        };
             }
 
             return this.GetAnimation(componentName, animatable, looping);
@@ -143,62 +122,10 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
-
         private string getFallbackName(string componentName)
         {
             string lastPiece = componentName.Split('/').Last();
             return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
         }
-
-        public class LegacyCursor : CompositeDrawable
-        {
-            public LegacyCursor()
-            {
-                Size = new Vector2(50);
-
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(ISkinSource skin)
-            {
-                InternalChildren = new Drawable[]
-                {
-                    new NonPlayfieldSprite
-                    {
-                        Texture = skin.GetTexture("cursormiddle"),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
-                    new NonPlayfieldSprite
-                    {
-                        Texture = skin.GetTexture("cursor"),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
-                };
-            }
-        }
-
-        /// <summary>
-        /// A sprite which is displayed within the playfield, but historically was not considered part of the playfield.
-        /// Performs scale adjustment to undo the scale applied by <see cref="PlayfieldAdjustmentContainer"/> (osu! ruleset specifically).
-        /// </summary>
-        private class NonPlayfieldSprite : Sprite
-        {
-            public override Texture Texture
-            {
-                get => base.Texture;
-                set
-                {
-                    if (value != null)
-                        // stable "magic ratio". see OsuPlayfieldAdjustmentContainer for full explanation.
-                        value.ScaleAdjust *= 1.6f;
-                    base.Texture = value;
-                }
-            }
-        }
     }
 }