Merge pull request #2313 from andy840119/updage-package-to-latest

Upgrade osu.game to the latest.
karaoke-dev · Dec 8, 2024 · 1100ff7 · 1100ff7
2 parents 420d4f6 + b165c40
commit 1100ff7
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/StageInfoConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/StageInfoConverterTest.cs
@@ -19,7 +19,7 @@ public void TestClassicStageInfoSerializer()
         var stageInfo = new ClassicStageInfo();
 
         const string expected =
-            "{\"$type\":\"classic\",\"style_category\":{},\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
+            "{\"$type\":\"classic\",\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"style_category\":{},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
         string actual = JsonConvert.SerializeObject(stageInfo, CreateSettings());
         Assert.AreEqual(expected, actual);
     }
@@ -29,7 +29,7 @@ public void TestClassicStageInfoSerializer()
     public void TestClassicStageInfoDeserializer()
     {
         const string json =
-            "{\"$type\":\"classic\",\"style_category\":{},\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
+            "{\"$type\":\"classic\",\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"style_category\":{},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
 
         var expected = new ClassicStageInfo();
         var actual = (ClassicStageInfo)JsonConvert.DeserializeObject<StageInfo>(json, CreateSettings())!;

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs
@@ -21,7 +21,7 @@ public void TestCreateModWithStage()
         CreateModTest(new ModTestData
         {
             Mod = new TModStage(),
-            Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+            CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
             PassCondition = () => true,
         });
     }
@@ -33,7 +33,7 @@ public void TestCreateModWithoutStage()
         {
             Mod = new TModStage(),
             // todo: add the stage info to beatmap.
-            Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+            CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
             PassCondition = () => true,
         });
     }

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs
@@ -14,7 +14,7 @@ public void TestMod() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModAutoplay(),
         Autoplay = true,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () => true,
     });
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs
@@ -14,7 +14,7 @@ public void TestMod() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModAutoplayBySinger(),
         Autoplay = true,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () => true,
     });
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs
@@ -16,7 +16,7 @@ public void TestCheckNoteExistInPlayfield() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModDisableNote(),
         Autoplay = true,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () =>
         {
             var lyricPlayfield = Player.GetLyricPlayfield();

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs
@@ -17,7 +17,7 @@ public void TestFlashlightExist() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModFlashlight(),
         Autoplay = true,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () =>
         {
             var drawableRuleset = Player.GetDrawableRuleset();

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs
@@ -14,7 +14,7 @@ public void TestSnowMod() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModSnow(),
         Autoplay = false,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () => true,
     });
 
@@ -23,7 +23,7 @@ public void TestWindowsUpdateMod() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModWindowsUpdate(),
         Autoplay = false,
-        Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
+        CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
         PassCondition = () => true,
     });
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModLyricConfiguration.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModLyricConfiguration.cs
@@ -14,7 +14,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModLyricConfiguration(),
         Autoplay = false,
-        Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
+        CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
         PassCondition = () => true,
     });
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs
@@ -17,7 +17,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModPractice(),
         Autoplay = false,
-        Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
+        CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
         PassCondition = () =>
         {
             // just need to check has setting button display area.

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModSuddenDeath.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModSuddenDeath.cs
@@ -32,7 +32,7 @@ public void TestGreatHit() => CreateModTest(new ModTestData
         Mod = new KaraokeModSuddenDeath(),
         PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
         Autoplay = false,
-        Beatmap = new Beatmap
+        CreateBeatmap = () => new Beatmap
         {
             HitObjects = new List<HitObject>
             {
@@ -57,7 +57,7 @@ public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
         Mod = new KaraokeModSuddenDeath(),
         PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
         Autoplay = false,
-        Beatmap = new Beatmap
+        CreateBeatmap = () => new Beatmap
         {
             HitObjects = new List<HitObject>
             {

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModTranslation.cs b/osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModTranslation.cs
@@ -14,7 +14,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
     {
         Mod = new KaraokeModTranslation(),
         Autoplay = false,
-        Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
+        CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
         PassCondition = () => true,
     });
 }
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs
@@ -27,7 +27,7 @@ public abstract partial class GenericEditor<TScreenMode> : ScreenWithBeatmapBack
 {
     public override float BackgroundParallaxAmount => 0.1f;
 
-    public override bool AllowBackButton => false;
+    public override bool AllowUserExit => false;
 
     public override bool HideOverlaysOnEnter => true;
 

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs
@@ -12,7 +12,7 @@ public partial class LyricImporter : ScreenWithBeatmapBackground
 {
     private readonly ImportLyricOverlay importLyricOverlay;
 
-    public override bool AllowBackButton => false;
+    public override bool AllowUserExit => false;
 
     public override bool HideOverlaysOnEnter => true;
 

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/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="2024.1115.3" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.1205.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.6" />