framework upgrades

depends on karaoke-dev/osu-framework-font#321
WebFreak001 · Mar 19, 2023 · 316e8a5 · 316e8a5
1 parent c635514
commit 316e8a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSetupSection.cs
@@ -20,9 +20,13 @@ public partial class KaraokeSetupSection : RulesetSetupSection
         private LabelledSwitchButton scorable;
         private LabelledSingerList singerList;
 
+        [Cached(typeof(IKaraokeBeatmapResourcesProvider))]
+        private KaraokeBeatmapResourcesProvider karaokeBeatmapResourcesProvider;
+
         public KaraokeSetupSection()
             : base(new KaraokeRuleset().RulesetInfo)
         {
+            AddInternal(karaokeBeatmapResourcesProvider = new KaraokeBeatmapResourcesProvider());
         }
 
         [BackgroundDependencyLoader]

diff --git a/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs b/osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs
@@ -12,6 +12,7 @@ public class KaraokeLyricHitWindows : KaraokeHitWindows
         private static readonly DifficultyRange[] lyric_ranges =
         {
             new(DEFAULT_HIT_RESULT, 40, 20, 10),
+            new(HitResult.Miss, 400, 200, 100),
         };
 
         public override bool IsHitResultAllowed(HitResult result) =>

diff --git a/...ets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/RecordTimeTagActionReceiver.cs b/...ets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/TimeTags/RecordTimeTagActionReceiver.cs
@@ -34,7 +34,7 @@ public bool OnPressed(KeyBindingPressEvent<KaraokeEditAction> e)
         {
             var caretPosition = lyricCaretState.CaretPosition;
             if (caretPosition is not TimeTagCaretPosition timeTagCaretPosition)
-                throw new NotSupportedException(nameof(caretPosition));
+                throw new NotSupportedException(caretPosition?.GetType().Name ?? "(null)");
 
             var currentTimeTag = timeTagCaretPosition.TimeTag;
 

diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Tools/SkinConverterTool.cs b/osu.Game.Rulesets.Karaoke/Skinning/Tools/SkinConverterTool.cs
@@ -37,14 +37,11 @@ public static ICustomizedShader[] ConvertRightSideShader(ShaderManager? shaderMa
 
         private static void attachShaders(ShaderManager shaderManager, IEnumerable<ICustomizedShader> shaders)
         {
+            // TODO: StepShader should not inherit from ICustomizedShader
             foreach (var shader in shaders)
             {
                 switch (shader)
                 {
-                    case InternalShader internalShader:
-                        shaderManager.AttachShader(internalShader);
-                        break;
-
                     case StepShader stepShader:
                         attachShaders(shaderManager, stepShader.StepShaders.ToArray());
                         break;
@@ -53,7 +50,8 @@ private static void attachShaders(ShaderManager shaderManager, IEnumerable<ICust
                         throw new InvalidCastException("shader cannot be null.");
 
                     default:
-                        throw new InvalidCastException($"{shader.GetType()} cannot attach shader.");
+                        shaderManager.AttachShader(shader);
+                        break;
                 }
             }
         }