Merge pull request #59 from goodtrailer/dependabot/nuget/ppy.osu.Game…

…-2022.205.0
goodtrailer · Feb 8, 2022 · 245dba8 · 245dba8
2 parents 4b65c54 + 8de300f
commit 245dba8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/osu.Game.Rulesets.Soyokaze/Replays/SoyokazeFramedReplayInputHandler.cs b/osu.Game.Rulesets.Soyokaze/Replays/SoyokazeFramedReplayInputHandler.cs
@@ -20,7 +20,7 @@ public SoyokazeFramedReplayInputHandler(Replay replay)
 
         protected override bool IsImportant(SoyokazeReplayFrame frame) => true;
 
-        public override void CollectPendingInputs(List<IInput> inputs)
+        protected override void CollectReplayInputs(List<IInput> inputs)
         {
             Vector2 position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
             inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(position) });

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/SkinnableKiaiVisualizer.cs b/osu.Game.Rulesets.Soyokaze/Skinning/SkinnableKiaiVisualizer.cs
@@ -8,7 +8,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Soyokaze.Configuration;
 using osu.Game.Rulesets.Soyokaze.Skinning.Defaults;

diff --git a/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs b/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs
@@ -74,31 +74,32 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
                 HitEventsLists[(int)soyokazeObject.Button].Add(hitEvent);
             }
 
-            Container accuracyGraphsContainer = new Container()
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Both,
-            };
-
-            Vector2[] positions = PositionExtensions.GetPositions(250, 130, true, Anchor.Centre);
-            for (int i = 0; i < positions.Length; i++)
-                accuracyGraphsContainer.Add(new AccuracyGraph(HitEventsLists[i]) { Position = positions[i] });
-
             return new StatisticRow[]
             {
                 new StatisticRow
                 {
                     Columns = new StatisticItem[]
                     {
-                        new StatisticItem("Button Accuracies", accuracyGraphsContainer),
+                        new StatisticItem("Button Accuracies", () =>
+                        {
+                            Container accuracyGraphsContainer = new Container()
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                AutoSizeAxes = Axes.Both,
+                            };
+                            Vector2[] positions = PositionExtensions.GetPositions(250, 130, true, Anchor.Centre);
+                            for (int i = 0; i < positions.Length; i++)
+                                accuracyGraphsContainer.Add(new AccuracyGraph(HitEventsLists[i]) { Position = positions[i] });
+                            return accuracyGraphsContainer;
+                        }),
                     },
                 },
                 new StatisticRow
                 {
                     Columns = new StatisticItem[]
                     {
-                        new StatisticItem("Overall Distribution", new HitEventTimingDistributionGraph(score.HitEvents)
+                        new StatisticItem("Overall Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents)
                         {
                             RelativeSizeAxes = Axes.X,
                             Size = new Vector2(1f, 100f)
@@ -109,7 +110,12 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
                 {
                     Columns = new StatisticItem[]
                     {
-                        new StatisticItem("", new UnstableRate(score.HitEvents){ AutoSizeAxes = Axes.None, RelativeSizeAxes = Axes.X, Size = new Vector2(0.2f, 10f) }),
+                        new StatisticItem("", () => new UnstableRate(score.HitEvents)
+                        {
+                            AutoSizeAxes = Axes.None,
+                            RelativeSizeAxes = Axes.X,
+                            Size = new Vector2(0.2f, 10f)
+                        }),
                     },
                 },
             };

diff --git a/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj b/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj
@@ -10,7 +10,7 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2022.126.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.205.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />