Merge pull request #1337 from andy840119/update-package-to-the-latest

Update package to the latest.
karaoke-dev · May 23, 2022 · 5b8c56f · 5b8c56f
2 parents 1f4d654 + 3c11483
commit 5b8c56f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
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.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <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/Edit/KaraokeHitObjectComposer.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs
@@ -111,9 +111,9 @@ protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpaceP
             return null;
         }
 
-        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition)
+        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
         {
-            var result = base.FindSnappedPositionAndTime(screenSpacePosition);
+            var result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);
 
             // should not affect x position and time if dragging object in note playfield.
             return result.Playfield is EditorNotePlayfield

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorKaraokeSpriteText.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorKaraokeSpriteText.cs
@@ -164,14 +164,14 @@ static FontUsage getFont(float? charSize = null)
         public class EditorLyricSpriteText : LyricSpriteText
         {
             public RectangleF GetRubyTagPosition(RubyTag rubyTag)
-                => GetRubyTagPosition(TextTagUtils.ToPositionText(rubyTag));
+                => GetRubyTagDrawRectangle(TextTagUtils.ToPositionText(rubyTag));
 
             public RectangleF GetRomajiTagPosition(RomajiTag romajiTag)
-                => GetRomajiTagPosition(TextTagUtils.ToPositionText(romajiTag));
+                => GetRomajiTagDrawRectangle(TextTagUtils.ToPositionText(romajiTag));
 
             public Vector2 GetTimeTagPosition(TextIndex index)
             {
-                var drawRectangle = GetCharacterRectangle(index.Index);
+                var drawRectangle = GetCharacterDrawRectangle(index.Index);
                 return TextIndexUtils.GetValueByState(index, drawRectangle.BottomLeft, drawRectangle.BottomRight);
             }
         }

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs
@@ -100,7 +100,7 @@ protected override void OnUserScroll(float value, bool animated = true, double?
         public SnapResult FindSnappedPosition(Vector2 screenSpacePosition) =>
             new(screenSpacePosition, null);
 
-        public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition) =>
+        public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All) =>
             new(screenSpacePosition, getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition)));
 
         private double getTimeFromPosition(Vector2 localPosition) =>

diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs
@@ -8,6 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -99,9 +100,9 @@ protected override bool OnClick(ClickEvent e)
                 return true;
             }
 
-            public virtual IEnumerable<string> FilterTerms => new[]
+            public virtual IEnumerable<LocalisableString> FilterTerms => new[]
             {
-                Model.ToString()
+                new LocalisableString(Model.ToString())
             };
 
             protected virtual void CreateDisplayContent(OsuTextFlowContainer textFlowContainer, TModel model)

diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs
@@ -6,6 +6,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Karaoke.Graphics.UserInterface;
@@ -89,12 +90,12 @@ public DrawableLanguageListItem(CultureInfo item)
                     Padding = new MarginPadding { Left = 5 };
                 }
 
-                public override IEnumerable<string> FilterTerms => new[]
+                public override IEnumerable<LocalisableString> FilterTerms => new[]
                 {
-                    Model.Name,
-                    Model.DisplayName,
-                    Model.EnglishName,
-                    Model.NativeName
+                    new LocalisableString(Model.Name),
+                    new LocalisableString(Model.DisplayName),
+                    new LocalisableString(Model.EnglishName),
+                    new LocalisableString(Model.NativeName)
                 };
 
                 protected override void CreateDisplayContent(OsuTextFlowContainer textFlowContainer, CultureInfo model)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -10,9 +10,9 @@
     <PackageReference Include="ILRepack.Lib.MSBuild" Version="2.1.18" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="Octokit" Version="0.51.0" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.517.0" />
-    <PackageReference Include="osu.Framework.Microphone" Version="2022.327.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.515.0" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.522.0" />
+    <PackageReference Include="osu.Framework.Microphone" Version="2022.522.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.523.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />