Merge pull request #177 from Altenhh/dependabot/nuget/ppy.osu.Game-20…

…21.523.0 Bump ppy.osu.Game from 2021.514.0 to 2021.523.0
taulazer · May 22, 2021 · 8b25cf8 · 8b25cf8
2 parents 180d678 + e5644b9
commit 8b25cf8
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 14 deletions.
diff --git a/osu.Game.Rulesets.Tau/Edit/Blueprints/BeatSelectionBlueprint.cs b/osu.Game.Rulesets.Tau/Edit/Blueprints/BeatSelectionBlueprint.cs
@@ -12,11 +12,10 @@ namespace osu.Game.Rulesets.Tau.Edit.Blueprints
     public class BeatSelectionBlueprint : TauSelectionBlueprint<Beat>
     {
         protected new DrawableBeat DrawableObject => (DrawableBeat)base.DrawableObject;
-
         protected readonly HitPiece SelectionPiece;
         protected readonly Box Distance;
 
-        public BeatSelectionBlueprint(DrawableBeat hitObject)
+        public BeatSelectionBlueprint(Beat hitObject)
             : base(hitObject)
         {
             InternalChildren = new Drawable[]

diff --git a/osu.Game.Rulesets.Tau/Edit/Blueprints/HardBeatSelectionBlueprint.cs b/osu.Game.Rulesets.Tau/Edit/Blueprints/HardBeatSelectionBlueprint.cs
@@ -11,7 +11,7 @@ public class HardBeatSelectionBlueprint : TauSelectionBlueprint<HardBeat>
 
         protected readonly HitPiece SelectionPiece;
 
-        public HardBeatSelectionBlueprint(DrawableHardBeat hitObject)
+        public HardBeatSelectionBlueprint(HardBeat hitObject)
             : base(hitObject)
         {
             InternalChild = SelectionPiece = new HitPiece();

diff --git a/osu.Game.Rulesets.Tau/Edit/Blueprints/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Tau/Edit/Blueprints/SliderSelectionBlueprint.cs
@@ -0,0 +1,28 @@
+using osu.Framework.Graphics.Primitives;
+using osu.Game.Rulesets.Tau.Objects;
+using osu.Game.Rulesets.Tau.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Tau.Edit.Blueprints
+{
+    public class SliderSelectionBlueprint : TauSelectionBlueprint<Slider>
+    {
+        protected new DrawableSlider DrawableObject => (DrawableSlider)base.DrawableObject;
+
+        public SliderSelectionBlueprint(Slider hitObject)
+            : base(hitObject)
+        {
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+        }
+
+        public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => false;
+
+        public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad.AABB;
+    }
+}
diff --git a/osu.Game.Rulesets.Tau/Edit/Blueprints/TauSelectionBlueprint.cs b/osu.Game.Rulesets.Tau/Edit/Blueprints/TauSelectionBlueprint.cs
@@ -5,7 +5,7 @@
 
 namespace osu.Game.Rulesets.Tau.Edit.Blueprints
 {
-    public class TauSelectionBlueprint<T> : OverlaySelectionBlueprint
+    public class TauSelectionBlueprint<T> : HitObjectSelectionBlueprint<T>
         where T : TauHitObject
     {
         protected new T HitObject => (T)DrawableObject.HitObject;
@@ -15,8 +15,8 @@ public class TauSelectionBlueprint<T> : OverlaySelectionBlueprint
         protected override bool ShouldBeAlive =>
             (DrawableObject.IsAlive && DrawableObject.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        protected TauSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
+        protected TauSelectionBlueprint(T hitObject)
+            : base(hitObject)
         {
         }
     }

diff --git a/osu.Game.Rulesets.Tau/Edit/TauBlueprintContainer.cs b/osu.Game.Rulesets.Tau/Edit/TauBlueprintContainer.cs
@@ -2,6 +2,7 @@
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Tau.Edit.Blueprints;
+using osu.Game.Rulesets.Tau.Objects;
 using osu.Game.Rulesets.Tau.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -16,18 +17,21 @@ public TauBlueprintContainer(HitObjectComposer composer)
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TauSelectionHandler();
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case DrawableBeat beat:
+                case Beat beat:
                     return new BeatSelectionBlueprint(beat);
 
-                case DrawableHardBeat hardBeat:
+                case HardBeat hardBeat:
                     return new HardBeatSelectionBlueprint(hardBeat);
+
+                case Slider slider:
+                    return new SliderSelectionBlueprint(slider);
             }
 
-            return base.CreateBlueprintFor(hitObject);
+            return base.CreateHitObjectBlueprintFor(hitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/Mods/TauModHidden.cs b/osu.Game.Rulesets.Tau/Mods/TauModHidden.cs
@@ -57,8 +57,9 @@ protected override void ApplyNormalVisibilityState(DrawableHitObject drawable, A
 
                     break;
             }
-
-            base.ApplyNormalVisibilityState(drawable, state);
+        }
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
         }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/Objects/Slider.cs b/osu.Game.Rulesets.Tau/Objects/Slider.cs
@@ -10,7 +10,7 @@ public class Slider : TauHitObject, IHasDuration
         public double Duration
         {
             get => Nodes.Max(n => n.Time);
-            set => throw new NotSupportedException();
+            set { }
         }
 
         public double EndTime => StartTime + Duration;

diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
@@ -14,7 +14,7 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.514.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.523.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />
-Original file line number
+Diff line change
@@ Expand Up @@
                         break;
                 }
-                base.ApplyNormalVisibilityState(drawable, state);
+            }
+            protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+            {
             }
         }
     }