Merge pull request #183 from Beamographic/dependabot/nuget/ppy.osu.Ga…

…me-2021.916.0

Bump ppy.osu.Game from 2021.820.0 to 2021.916.0

osu.Game.Rulesets.Rush.Tests/Visual/TestSceneOsuGame.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Platform;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
 
@@ -13,20 +12,17 @@ namespace osu.Game.Rulesets.Rush.Tests.Visual
     public class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
-        private void load(GameHost host, OsuGameBase gameBase)
+        private void load()
         {
-            OsuGame game = new OsuGame();
-            game.SetHost(host);
-
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black,
                 },
-                game
             };
+            AddGame(new OsuGame());
         }
     }
 }

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
@@ -78,7 +79,7 @@ protected override void UpdateInitialTransforms()
         }
 
         // Input are handled by the DualHit parts, since they still act like normal minions
-        public override bool OnPressed(RushAction action) => false;
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e) => false;
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableLanedHit.cs

@@ -5,6 +5,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -53,12 +54,12 @@ protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection>
                 Anchor = LaneAnchor;
         }
 
-        public override bool OnPressed(RushAction action)
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e)
         {
-            if (!action.IsLaneAction())
+            if (!e.Action.IsLaneAction())
                 return false;
 
-            if (!LaneMatchesAction(action) || AllJudged)
+            if (!LaneMatchesAction(e.Action) || AllJudged)
                 return false;
 
             if (!CheckHittable(this))

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBoss.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
@@ -90,11 +91,7 @@ protected override void UpdateInitialTransforms()
             mainPiece.Scale = new Vector2(base_sprite_scale);
         }
 
-        public override bool OnPressed(RushAction action) => action.IsLaneAction() && UpdateResult(true);
-
-        public override void OnReleased(RushAction action)
-        {
-        }
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e) => e.Action.IsLaneAction() && UpdateResult(true);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBossTick.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
@@ -32,6 +33,6 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
         }
 
-        public override bool OnPressed(RushAction action) => false;
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e) => false;
     }
 }

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushHitObject.cs

@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -76,9 +77,9 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
-        public virtual bool OnPressed(RushAction action) => false;
+        public virtual bool OnPressed(KeyBindingPressEvent<RushAction> e) => false;
 
-        public virtual void OnReleased(RushAction action)
+        public virtual void OnReleased(KeyBindingReleaseEvent<RushAction> e)
         {
         }
 

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs

@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
 using osu.Game.Rulesets.Scoring;
@@ -64,7 +65,7 @@ protected override void OnApply()
         }
 
         // Sawblade doesn't handle user presses at all.
-        public override bool OnPressed(RushAction action) => false;
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e) => false;
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs

@@ -6,6 +6,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
@@ -170,12 +171,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
 
-        public override bool OnPressed(RushAction action)
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e)
         {
-            if (!action.IsLaneAction())
+            if (!e.Action.IsLaneAction())
                 return false;
 
-            if (!LaneMatchesAction(action) || Head.Judged)
+            if (!LaneMatchesAction(e.Action) || Head.Judged)
                 return false;
 
             if (!CheckHittable(this))
@@ -185,13 +186,13 @@ public override bool OnPressed(RushAction action)
             return Head.Judged;
         }
 
-        public override void OnReleased(RushAction action)
+        public override void OnReleased(KeyBindingReleaseEvent<RushAction> e)
         {
             // Note sheet not held yet (i.e. not our time yet) or already broken / finished.
             if (Judged || !Head.IsHit)
                 return;
 
-            if (!LaneMatchesAction(action))
+            if (!LaneMatchesAction(e.Action))
                 return;
 
             // Check if there was also another action holding the same star sheet,

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetCap.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -68,10 +69,6 @@ protected override void UpdateHitStateTransforms(ArmedState state)
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e) => Anchor = CapAnchor;
 
-        public override bool OnPressed(RushAction action) => false; // Handled by the star sheet object itself.
-
-        public override void OnReleased(RushAction action)
-        {
-        }
+        public override bool OnPressed(KeyBindingPressEvent<RushAction> e) => false; // Handled by the star sheet object itself.
     }
 }

osu.Game.Rulesets.Rush/UI/RushPlayfield.cs

@@ -8,6 +8,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -218,15 +219,15 @@ private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
             }
         }
 
-        public bool OnPressed(RushAction action)
+        public bool OnPressed(KeyBindingPressEvent<RushAction> e)
         {
-            if (action == RushAction.Fever)
+            if (e.Action == RushAction.Fever)
                 return feverProcessor.TryActivateFever();
 
-            return PlayerSprite.HandleAction(action);
+            return PlayerSprite.HandleAction(e.Action);
         }
 
-        public void OnReleased(RushAction action)
+        public void OnReleased(KeyBindingReleaseEvent<RushAction> e)
         {
         }
     }

osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj

@@ -33,6 +33,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.820.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.916.0" />
   </ItemGroup>
 </Project>