Merge pull request #1096 from andy840119/update-nuget-package

Update package and fix compile error.
karaoke-dev · Feb 5, 2022 · 202fb9e · 202fb9e
2 parents 86190a4 + 9ee6d5d
commit 202fb9e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
@@ -239,17 +239,17 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
                 {
                     Columns = new[]
                     {
-                        new StatisticItem("Info", new BeatmapInfoGraph(playableBeatmap)
+                        new StatisticItem("Info", () => new BeatmapInfoGraph(playableBeatmap)
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = info_height
-                        }, new Dimension(GridSizeMode.Relative, 0.6f)),
-                        new StatisticItem("", new Container(), new Dimension(GridSizeMode.Absolute, 10)),
-                        new StatisticItem("Metadata", new BeatmapMetadataGraph(playableBeatmap)
+                        }, dimension: new Dimension(GridSizeMode.Relative, 0.6f)),
+                        new StatisticItem("", () => new Container(), dimension: new Dimension(GridSizeMode.Absolute, 10)),
+                        new StatisticItem("Metadata", () => new BeatmapMetadataGraph(playableBeatmap)
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = info_height
-                        }, new Dimension())
+                        }, dimension: new Dimension())
                     }
                 },
             };
@@ -263,7 +263,7 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
                 {
                     Columns = new[]
                     {
-                        new StatisticItem("Saiten Result", new SaitenResultGraph(score, playableBeatmap)
+                        new StatisticItem("Saiten Result", () => new SaitenResultGraph(score, playableBeatmap)
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = remain_height - text_size - spacing
@@ -277,7 +277,7 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
                 {
                     Columns = new[]
                     {
-                        new StatisticItem("Result", new NotScorableGraph
+                        new StatisticItem("Result", () => new NotScorableGraph
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = remain_height - text_size - spacing

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModFlashlight.cs
@@ -24,7 +24,7 @@ public class KaraokeModFlashlight : ModFlashlight<KaraokeHitObject>
         public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
 
         [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
-        public override BindableNumber<float> SizeMultiplier { get; } = new()
+        public override BindableFloat SizeMultiplier { get; } = new()
         {
             MinValue = 0.5f,
             MaxValue = 3f,

diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs
@@ -17,7 +17,7 @@ public KaraokeFramedReplayInputHandler(Replay replay)
 
         protected override bool IsImportant(KaraokeReplayFrame frame) => frame.Sound;
 
-        public override void CollectPendingInputs(List<IInput> inputs)
+        protected override void CollectReplayInputs(List<IInput> inputs)
         {
             inputs.Add(new ReplayState<KaraokeSaitenAction>
             {

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.118.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.118.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.127.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.205.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />