Merge pull request #2233 from andy840119/upgrade-to-latest-lazer

Upgrade package to the latest.
karaoke-dev · May 19, 2024 · 8d64ec3 · 8d64ec3
2 parents 88a05ee + cb0c889
commit 8d64ec3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs
@@ -1,15 +1,15 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
+using System.Numerics;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterfaceV2;
 
 public partial class LabelledRealTimeSliderBar<TNumber> : LabelledSliderBar<TNumber>
-    where TNumber : struct, IEquatable<TNumber>, IComparable<TNumber>, IConvertible
+    where TNumber : struct, INumber<TNumber>, IMinMaxValue<TNumber>
 {
     protected override SettingsSlider<TNumber> CreateComponent()
         => base.CreateComponent().With(x => x.TransferValueOnCommit = false);

diff --git a/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs b/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs
@@ -11,8 +11,4 @@ public KaraokeSkinComponentLookup(KaraokeSkinComponents component)
         : base(component)
     {
     }
-
-    protected override string RulesetPrefix => KaraokeRuleset.SHORT_NAME;
-
-    protected override string ComponentName => Component.ToString().ToLower();
 }
diff --git a/...ets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs b/...ets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Compose.Toolbar
 
 public partial class PlaybackSwitchButton : CompositeDrawable
 {
-    private readonly IBindable<ITrack> track = new Bindable<ITrack>();
+    private readonly IBindable<Track> track = new Bindable<Track>();
     private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
     public PlaybackSwitchButton()

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs
@@ -7,6 +7,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
@@ -182,6 +183,10 @@ protected override void Dispose(bool isDisposing)
     {
         base.Dispose(isDisposing);
 
+        // todo: not very sure
+        if (!editorBeatmap.IsNull())
+            return;
+
         editorBeatmap.HitObjectAdded -= hitObjectAdded;
         editorBeatmap.HitObjectRemoved -= hitObjectRemoved;
         editorBeatmap.HitObjectUpdated -= hitObjectUpdated;

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -10,18 +10,18 @@
     <PackageReference Include="osu.Game.Rulesets.Karaoke.Resources" Version="2022.611.0" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="LrcParser" Version="2023.524.0" />
-    <PackageReference Include="Octokit" Version="11.0.0" />
+    <PackageReference Include="Octokit" Version="11.0.1" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2024.316.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2024.219.0" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2024.318.0">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2024.517.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Game" Version="2024.412.1" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.517.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.0.3" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
     <!--install because it might cause "Could not load file or assembly" error, might be removed eventually-->
     <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
     <PackageReference Include="WanaKanaSharp" Version="0.2.0" />