Make FindProvider non-default

osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs

@@ -102,6 +102,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
 
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
+
             public event Action SourceChanged
             {
                 add { }

osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs

@@ -113,6 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public Drawable GetDrawableComponent(ISkinComponent component) => null;
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
             public ISample GetSample(ISampleInfo sampleInfo) => null;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {

osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs

@@ -166,6 +166,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration => default;
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
 
             public event Action SourceChanged;
 

osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs

@@ -123,6 +123,8 @@ namespace osu.Game.Tests.Gameplay
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
+
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
                 switch (lookup)

osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs

@@ -61,6 +61,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
         }
 
         private class TestAnimationTimeReference : IAnimationTimeReference

osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.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 System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -222,6 +223,8 @@ namespace osu.Game.Tests.Skins
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => skin.GetConfig<TLookup, TValue>(lookup);
+
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => skin.FindProvider(lookupFunction);
         }
     }
 }

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

@@ -301,6 +301,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
+
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => throw new NotImplementedException();
         }
 
         private class SecondarySource : ISkin
@@ -312,6 +314,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
+
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => throw new NotImplementedException();
         }
 
         [Cached(typeof(ISkinSource))]
@@ -325,6 +329,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => throw new NotImplementedException();
+
             public event Action SourceChanged
             {
                 add { }

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

@@ -147,6 +147,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
             public ISample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => source?.FindProvider(lookupFunction);
 
             public void TriggerSourceChanged()
             {

osu.Game/Skinning/ISkin.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 System;
 using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -64,6 +65,6 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <returns>The skin to be used for subsequent lookups, or <c>null</c> if none is available.</returns>
         [CanBeNull]
-        ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
+        ISkin FindProvider(Func<ISkin, bool> lookupFunction);
     }
 }

osu.Game/Skinning/LegacyBeatmapSkin.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 System;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,7 +19,7 @@ namespace osu.Game.Skinning
         protected override bool UseCustomSampleBanks => true;
 
         public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path, fallbackToDefault: false)
+            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
         {
             // Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
             Configuration.AllowDefaultComboColoursFallback = false;
@@ -70,6 +71,15 @@ namespace osu.Game.Skinning
             return base.GetSample(sampleInfo);
         }
 
+        public override ISkin FindProvider(Func<ISkin, bool> lookupFunction)
+        {
+            if (lookupFunction(this))
+                return this;
+
+            // beatmap skins don't do lookups on the default skin. this allows fallback to user / game default skins.
+            return null;
+        }
+
         private static SkinInfo createSkinInfo(BeatmapInfo beatmap) =>
             new SkinInfo { Name = beatmap.ToString(), Creator = beatmap.Metadata?.AuthorString };
     }

osu.Game/Skinning/LegacySkin.cs

@@ -24,10 +24,8 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacySkin : Skin, ISkin
+    public class LegacySkin : Skin
     {
-        private readonly bool fallbackToDefault;
-
         [CanBeNull]
         protected TextureStore Textures;
 
@@ -61,7 +59,7 @@ namespace osu.Game.Skinning
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
-            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini", true)
+            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {
         }
 
@@ -72,11 +70,9 @@ namespace osu.Game.Skinning
         /// <param name="storage">A storage for looking up files within this skin using user-facing filenames.</param>
         /// <param name="resources">Access to raw game resources.</param>
         /// <param name="configurationFilename">The user-facing filename of the configuration file to be parsed. Can accept an .osu or skin.ini file.</param>
-        /// <param name="fallbackToDefault">Whether lookups via <see cref="ISkin.FindProvider"/> fallback to the <see cref="DefaultLegacySkin"/> implementations if not provided locally.</param>
+        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string configurationFilename)
-        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string configurationFilename, bool fallbackToDefault = false)
             : base(skin, resources)
         {
-            this.fallbackToDefault = fallbackToDefault;
             legacyDefaultFallback = CreateFallbackSkin(storage, resources);
 
             using (var stream = storage?.GetStream(configurationFilename))
@@ -529,6 +525,16 @@ namespace osu.Game.Skinning
             return legacyDefaultFallback?.GetSample(sampleInfo);
         }
 
+        public override ISkin FindProvider(Func<ISkin, bool> lookupFunction)
+        {
+            var source = base.FindProvider(lookupFunction);
+
+            if (source != null)
+                return source;
+
+            return legacyDefaultFallback?.FindProvider(lookupFunction);
+        }
+
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
         {
             var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
@@ -566,16 +572,5 @@ namespace osu.Game.Skinning
             Textures?.Dispose();
             Samples?.Dispose();
         }
-
-        ISkin ISkin.FindProvider(Func<ISkin, bool> lookupFunction)
-        {
-            if (lookupFunction(this))
-                return this;
-
-            if (!fallbackToDefault)
-                return null;
-
-            return (legacyDefaultFallback as ISkin)?.FindProvider(lookupFunction);
-        }
     }
 }

osu.Game/Skinning/LegacySkinTransformer.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 System;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -47,5 +48,7 @@ namespace osu.Game.Skinning
         }
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+
+        public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => Source.FindProvider(lookupFunction);
     }
 }

osu.Game/Skinning/Skin.cs

@@ -35,6 +35,8 @@ namespace osu.Game.Skinning
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
 
+        public virtual ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
+
         protected Skin(SkinInfo skin, IStorageResourceProvider resources)
         {
             SkinInfo = skin;

osu.Game/Skinning/SkinManager.cs

@@ -212,6 +212,8 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
+        public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => CurrentSkin.Value.FindProvider(lookupFunction);
+
         #region IResourceStorageProvider
 
         AudioManager IStorageResourceProvider.AudioManager => audio;