Merge pull request #2334 from andy840119/update-package-to-latest-one

Update package to latest one.

Author: andy840119

osu.Game.Rulesets.Karaoke/Edit/Checks/CheckBeatmapProperty.cs

@@ -29,8 +29,10 @@ public IEnumerable<Issue> Run(BeatmapVerifierContext context)
             return Array.Empty<Issue>();
 
         var issues = CheckProperty(property);
-        var hitObjectIssues = context.Beatmap.HitObjects.OfType<THitObject>().SelectMany(x => CheckHitObject(property, x));
-        var hitObjectsIssues = CheckHitObjects(property, context.Beatmap.HitObjects.OfType<THitObject>().ToList());
+        var hitObjects = context.CurrentDifficulty.Playable.HitObjects;
+
+        var hitObjectIssues = hitObjects.OfType<THitObject>().SelectMany(x => CheckHitObject(property, x));
+        var hitObjectsIssues = CheckHitObjects(property, hitObjects.OfType<THitObject>().ToList());
 
         return issues.Concat(hitObjectIssues).Concat(hitObjectsIssues);
     }
@@ -55,7 +57,7 @@ protected virtual IEnumerable<Issue> CheckHitObjects(TProperty property, IReadOn
     private static KaraokeBeatmap getBeatmap(BeatmapVerifierContext context)
     {
         // follow the usage in the IssueList in osu.Game
-        if (context.Beatmap is EditorBeatmap editorBeatmap)
+        if (context.CurrentDifficulty.Playable is EditorBeatmap editorBeatmap)
             return EditorBeatmapUtils.GetPlayableBeatmap(editorBeatmap);
 
         throw new InvalidOperationException();

osu.Game.Rulesets.Karaoke/Edit/Checks/CheckHitObjectProperty.cs

@@ -19,7 +19,7 @@ public abstract class CheckHitObjectProperty<THitObject> : ICheck where THitObje
 
     public virtual IEnumerable<Issue> Run(BeatmapVerifierContext context)
     {
-        var hitObjects = context.Beatmap.HitObjects.OfType<THitObject>();
+        var hitObjects = context.CurrentDifficulty.Playable.HitObjects.OfType<THitObject>();
 
         return hitObjects.Select(Check).SelectMany(x => x);
     }

osu.Game.Rulesets.Karaoke/Edit/Checks/CheckHitObjectReferenceProperty.cs

@@ -15,8 +15,8 @@ public abstract class CheckHitObjectReferenceProperty<THitObject, TReferencedHit
 {
     public override IEnumerable<Issue> Run(BeatmapVerifierContext context)
     {
-        var hitObjects = context.Beatmap.HitObjects.OfType<THitObject>();
-        var allAvailableReferencedHitObjects = context.Beatmap.HitObjects.OfType<TReferencedHitObject>().ToArray();
+        var hitObjects = context.CurrentDifficulty.Playable.HitObjects.OfType<THitObject>();
+        var allAvailableReferencedHitObjects = context.CurrentDifficulty.Playable.HitObjects.OfType<TReferencedHitObject>().ToArray();
 
         var issues = base.Run(context);
         var referenceIssues = hitObjects.Select(x => CheckReferenceProperty(x, allAvailableReferencedHitObjects)).SelectMany(x => x);

osu.Game.Rulesets.Karaoke/Edit/Checks/CheckStageInfo.cs

@@ -90,7 +90,7 @@ public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         if (property == null)
             return Array.Empty<Issue>();
 
-        var hitObjects = context.Beatmap.HitObjects.OfType<KaraokeHitObject>().ToList();
+        var hitObjects = context.CurrentDifficulty.Playable.HitObjects.OfType<KaraokeHitObject>().ToList();
         var issues = CheckStageInfoWithHitObjects(property, hitObjects).ToList();
 
         foreach (var stageInfoCategoryAction in stageInfoCategoryActions)

osu.Game.Rulesets.Karaoke/Scoring/KaraokeLyricHitWindows.cs

@@ -1,16 +1,17 @@
 // Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Karaoke.Scoring;
 
 public class KaraokeLyricHitWindows : KaraokeHitWindows
 {
-    private static readonly DifficultyRange[] lyric_ranges =
-    {
-        new(HitResult.Perfect, 40, 20, 10),
-    };
+    private static readonly DifficultyRange perfect_window_range = new(40D, 20D, 10D);
+
+    private double perfect;
 
     public override bool IsHitResultAllowed(HitResult result) =>
         result switch
@@ -21,5 +22,24 @@ public override bool IsHitResultAllowed(HitResult result) =>
             _ => false,
         };
 
-    protected override DifficultyRange[] GetRanges() => lyric_ranges;
+    public override void SetDifficulty(double difficulty)
+    {
+        perfect = IBeatmapDifficultyInfo.DifficultyRange(difficulty, perfect_window_range) ;
+    }
+
+    public override double WindowFor(HitResult result)
+    {
+        switch (result)
+        {
+            case HitResult.Perfect:
+                return perfect;
+
+            // todo: add this in order not to throw error in some test cases.
+            case HitResult.Miss:
+                return 1000;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(result), result, null);
+        }
+    }
 }

osu.Game.Rulesets.Karaoke/Scoring/KaraokeNoteHitWindows.cs

@@ -1,18 +1,21 @@
 // Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Karaoke.Scoring;
 
 public class KaraokeNoteHitWindows : KaraokeHitWindows
 {
-    private static readonly DifficultyRange[] karaoke_ranges =
-    {
-        new(HitResult.Perfect, 80, 50, 20),
-        new(HitResult.Meh, 80, 50, 20),
-        new(HitResult.Miss, 2000, 1500, 1000),
-    };
+    private static readonly DifficultyRange perfect_window_range = new(80D, 50D, 20D);
+    private static readonly DifficultyRange meh_window_range = new(80D, 50D, 20D);
+    private static readonly DifficultyRange miss_window_range = new(2000D, 1500D, 1000D);
+
+    private double perfect;
+    private double meh;
+    private double miss;
 
     public override bool IsHitResultAllowed(HitResult result) =>
         result switch
@@ -23,5 +26,28 @@ public override bool IsHitResultAllowed(HitResult result) =>
             _ => false,
         };
 
-    protected override DifficultyRange[] GetRanges() => karaoke_ranges;
+    public override void SetDifficulty(double difficulty)
+    {
+        perfect = IBeatmapDifficultyInfo.DifficultyRange(difficulty, perfect_window_range) ;
+        meh = IBeatmapDifficultyInfo.DifficultyRange(difficulty, meh_window_range);
+        miss = IBeatmapDifficultyInfo.DifficultyRange(difficulty, miss_window_range);
+    }
+
+    public override double WindowFor(HitResult result)
+    {
+        switch (result)
+        {
+            case HitResult.Perfect:
+                return perfect;
+
+            case HitResult.Meh:
+                return meh;
+
+            case HitResult.Miss:
+                return miss;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(result), result, null);
+        }
+    }
 }

osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs

@@ -172,7 +172,7 @@ private IEnumerable<Issue> getIssueByHitObject(KaraokeHitObject karaokeHitObject
     {
         return CreateIssues(context =>
         {
-            if (context.Beatmap is not Beatmap<HitObject> beatmap)
+            if (context.CurrentDifficulty.Playable is not Beatmap<HitObject> beatmap)
                 throw new InvalidCastException();
 
             beatmap.HitObjects.Add(karaokeHitObject);

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="2025.618.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2025.816.0" />
     <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.1.3" />