Move leagcy resource store construction local to DefaultLegacySkin

osu.Game/Skinning/DefaultLegacySkin.cs

@@ -11,14 +11,14 @@ namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+        public DefaultLegacySkin(IStorageResourceProvider resources)
-            : this(Info, storage, resources)
+            : this(Info, resources)
         {
         }
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
-        public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+        public DefaultLegacySkin(SkinInfo skin, IStorageResourceProvider resources)
-            : base(skin, storage, resources, string.Empty)
+            : base(skin, new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy"), resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(

osu.Game/Skinning/SkinInfo.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Extensions;
@@ -28,16 +27,13 @@ namespace osu.Game.Skinning
 
         public string InstantiationInfo { get; set; }
 
-        public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
+        public virtual Skin CreateInstance(IStorageResourceProvider resources)
         {
             var type = string.IsNullOrEmpty(InstantiationInfo)
                 // handle the case of skins imported before InstantiationInfo was added.
                 ? typeof(LegacySkin)
                 : Type.GetType(InstantiationInfo).AsNonNull();
 
-            if (type == typeof(DefaultLegacySkin))
-                return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);
-
             return (Skin)Activator.CreateInstance(type, this, resources);
         }
 

osu.Game/Skinning/SkinManager.cs

@@ -39,8 +39,6 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> resources;
 
-        private readonly IResourceStore<byte[]> legacyDefaultResources;
-
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin(null));
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
@@ -57,8 +55,6 @@ namespace osu.Game.Skinning
             this.host = host;
             this.resources = resources;
 
-            legacyDefaultResources = new NamespacedResourceStore<byte[]>(resources, "Skins/Legacy");
-
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
             CurrentSkin.ValueChanged += skin =>
             {
@@ -155,7 +151,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
-        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
+        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(this);
 
         /// <summary>
         /// Ensure that the current skin is in a state it can accept user modifications.

osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs

@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.IO.Stores;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 
@@ -17,9 +16,9 @@ namespace osu.Game.Tests.Visual
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, SkinManager skins)
+        private void load(SkinManager skins)
         {
-            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), skins);
+            var legacySkin = new DefaultLegacySkin(skins);
             legacySkinSource = new SkinProvidingContainer(legacySkin);
         }
 

osu.Game/Tests/Visual/SkinnableTestScene.cs

@@ -40,12 +40,12 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, SkinManager skinManager, OsuGameBase game)
+        private void load(AudioManager audio, SkinManager skinManager)
         {
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
-            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), this);
+            defaultSkin = new DefaultLegacySkin(this);
             specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
             oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }