Merge pull request #1545 from andy840119/update-package

Update package to the latest.
karaoke-dev · Aug 31, 2022 · 7a41e35 · 7a41e35
2 parents 74e315e + fe4b575
commit 7a41e35
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneSingerScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneSingerScreen.cs
@@ -85,7 +85,7 @@ private void load()
             {
                 Value = Beatmap.Value.BeatmapInfo.BeatDivisor
             };
-            var editorClock = new EditorClock(Beatmap.Value.Beatmap, beatDivisor) { IsCoupled = false };
+            var editorClock = new EditorClock(Beatmap.Value.Beatmap, beatDivisor);
             Dependencies.CacheAs(editorClock);
             Dependencies.Cache(beatDivisor);
             Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);

diff --git a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
@@ -13,6 +13,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.IO.Stores;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -126,7 +127,7 @@ public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) =
                 _ => Array.Empty<KeyBinding>()
             };
 
-        public override string GetVariantName(int variant)
+        public override LocalisableString GetVariantName(int variant)
             => variant switch
             {
                 GAMEPLAY_INPUT_VARIANT => "Gameplay",
@@ -208,7 +209,7 @@ protected override IEnumerable<HitResult> GetValidHitResults()
             };
         }
 
-        public override string GetDisplayNameForHitResult(HitResult result)
+        public override LocalisableString GetDisplayNameForHitResult(HitResult result)
         {
             return result switch
             {

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModAutoplayBySinger.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModAutoplayBySinger.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Karaoke.Graphics.Sprites;
@@ -21,7 +22,7 @@ public class KaraokeModAutoplayBySinger : KaraokeModAutoplay
     {
         public override string Name => "Autoplay by singer";
         public override string Acronym => "ABS";
-        public override string Description => "Autoplay mode but replay's record is by singer's voice.";
+        public override LocalisableString Description => "Autoplay mode but replay's record is by singer's voice.";
 
         public override IconUsage? Icon => KaraokeIcon.ModAutoPlayBySinger;
 

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModDisableNote.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModDisableNote.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Rulesets.Karaoke.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
 using osu.Game.Rulesets.Mods;
@@ -13,7 +14,7 @@ public class KaraokeModDisableNote : Mod, IApplicableToHitObject
     {
         public override string Name => "Disable note";
 
-        public override string Description => "Disable note";
+        public override LocalisableString Description => "Disable note";
         public override string Acronym => "DN";
         public override double ScoreMultiplier => 0;
         public override IconUsage? Icon => KaraokeIcon.ModDisableNote;

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModHiddenNote.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModHiddenNote.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Rulesets.Karaoke.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Objects;
 using osu.Game.Rulesets.Karaoke.Objects.Drawables;
@@ -14,7 +15,7 @@ namespace osu.Game.Rulesets.Karaoke.Mods
 {
     public class KaraokeModHiddenNote : ModHidden
     {
-        public override string Description => @"Notes fade out before you sing them!";
+        public override LocalisableString Description => @"Notes fade out before you sing them!";
         public override double ScoreMultiplier => 1.06;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<KaraokeHitObject>) };
         public override IconUsage? Icon => KaraokeIcon.ModHiddenNote;

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModSnow.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Mods;
@@ -19,7 +20,7 @@ public class KaraokeModSnow : Mod, IApplicableToHUD
     {
         public override string Name => "Snow";
 
-        public override string Description => "Display some snow";
+        public override LocalisableString Description => "Display some snow";
         public override string Acronym => "SW";
         public override double ScoreMultiplier => 1.0f;
         public override IconUsage? Icon => FontAwesome.Regular.Snowflake;

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModWindowsUpdate.cs
@@ -7,6 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
@@ -23,7 +24,7 @@ public class KaraokeModWindowsUpdate : ModSuddenDeath, IApplicableToHUD
         public override string Name => "Windows update";
         public override string Acronym => "WD";
         public override IconUsage? Icon => FontAwesome.Brands.Windows;
-        public override string Description => "Once you missed, windows will upppppdate your osu!";
+        public override LocalisableString Description => "Once you missed, windows will upppppdate your osu!";
 
         private HUDOverlay overlay = null!;
         private WindowsUpdateContainer? windowsUpdateContainer;

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs
@@ -57,7 +57,7 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
         private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDivisor beatDivisor)
         {
             // todo: should re-inject editor clock because it will let track cannot change time because it's in another screen.
-            var clock = new EditorClock(editorBeatmap, beatDivisor) { IsCoupled = false };
+            var clock = new EditorClock(editorBeatmap, beatDivisor);
 
             var loadableBeatmap = Beatmap.Value;
             clock.ChangeSource(loadableBeatmap.Track);

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -11,14 +11,14 @@
     <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="2022.529.1" />
-    <PackageReference Include="Octokit" Version="2.0.0" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.806.1-alpha" />
+    <PackageReference Include="Octokit" Version="2.0.1" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.827.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.806.0" />
     <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.809.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Game" Version="2022.821.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.901.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />