From 2c8820a357e43079c7e1f3cec23bc556f62dabf7 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Sat, 7 Sep 2024 01:41:41 +0700
Subject: [PATCH] Upgrade the package to the latest.

Also, follow https://github.com/ppy/osu/pull/29564/files to fix the skin breaking change.
---
 osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs   | 2 +-
 .../Skinning/Default/KaraokeDefaultSkinTransformer.cs     | 8 ++++----
 .../Skinning/Legacy/KaraokeLegacySkinTransformer.cs       | 2 +-
 .../osu.Game.Rulesets.Karaoke.csproj                      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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<KaraokeSkinComponents>
+public class KaraokeSkinComponentLookup : SkinComponentLookup<KaraokeSkinComponents>
 {
     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<HitResult> resultComponent:
+            case SkinComponentLookup<HitResult> 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 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.906.1" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="SixLabors.Fonts" Version="2.0.4" />