diff --git a/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs b/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs index 7dc31478f..82ce115ef 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs @@ -5,7 +5,7 @@ namespace osu.Game.Rulesets.Karaoke; -public class KaraokeSkinComponentLookup : GameplaySkinComponentLookup +public class KaraokeSkinComponentLookup : SkinComponentLookup { public KaraokeSkinComponentLookup(KaraokeSkinComponents component) : base(component) diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Default/KaraokeDefaultSkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/Default/KaraokeDefaultSkinTransformer.cs index fdc2b5bde..00f2f7d2c 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Default/KaraokeDefaultSkinTransformer.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Default/KaraokeDefaultSkinTransformer.cs @@ -28,14 +28,14 @@ public KaraokeDefaultSkinTransformer(ISkin skin, IBeatmap beatmap) { switch (lookup) { - case SkinComponentsContainerLookup containerLookup: + case GlobalSkinnableContainerLookup containerLookup: // Only handle ruleset level defaults for now. if (containerLookup.Ruleset == null) return base.GetDrawableComponent(lookup); - switch (containerLookup.Target) + switch (containerLookup.Lookup) { - case SkinComponentsContainerLookup.TargetArea.MainHUDComponents: + case GlobalSkinnableContainers.MainHUDComponents: // see the fall-back strategy in the SkinManager.AllSources. // will receive the: // 1. Legacy beatmap skin. @@ -59,7 +59,7 @@ public KaraokeDefaultSkinTransformer(ISkin skin, IBeatmap beatmap) return component; - case SkinComponentsContainerLookup.TargetArea.SongSelect: + case GlobalSkinnableContainers.SongSelect: default: return base.GetDrawableComponent(lookup); } diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs index 217943968..737fcf735 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs @@ -35,7 +35,7 @@ public KaraokeLegacySkinTransformer(ISkin skin, IBeatmap beatmap) { switch (lookup) { - case GameplaySkinComponentLookup resultComponent: + case SkinComponentLookup resultComponent: return getResult(resultComponent.Component); case KaraokeSkinComponentLookup karaokeComponent: diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index a8fa9a479..60521c87d 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - +