Update dependency caching according to framework

osu.Desktop.VisualTests/Tests/TestCaseBeatSyncedContainer.cs

@@ -177,9 +177,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
                 beatsPerMinute.Value = 60000 / timingPoint.BeatLength;
                 adjustedBeatLength.Value = timingPoint.BeatLength;
 
-                flashLayer.ClearTransforms();
-                flashLayer.FadeTo(1);
-                flashLayer.FadeTo(0, timingPoint.BeatLength);
+                flashLayer.FadeOutFromOne(timingPoint.BeatLength);
             }
         }
 

osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs

@@ -59,20 +59,13 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            using (container.BeginLoopedSequence())
-            {
-                container.MoveTo(new Vector2(0, 100), duration);
-                using (container.BeginDelayedSequence(duration))
-                {
-                    container.MoveTo(new Vector2(100, 100), duration);
-                    using (container.BeginDelayedSequence(duration))
-                    {
-                        container.MoveTo(new Vector2(100, 0), duration);
-                        using (container.BeginDelayedSequence(duration))
-                            container.MoveTo(Vector2.Zero, duration);
-                    }
-                }
-            }
+            // Move box along a square trajectory
+            container.Loop(c => c
+                .MoveTo(new Vector2(0, 100), duration).Then()
+                .MoveTo(new Vector2(100, 100), duration).Then()
+                .MoveTo(new Vector2(100, 0), duration).Then()
+                .MoveTo(Vector2.Zero, duration)
+            );
         }
 
         private class MyContextMenuContainer : Container, IHasContextMenu
@@ -95,10 +88,10 @@ private class AnotherContextMenuContainer : Container, IHasContextMenu
             {
                 new OsuContextMenuItem(@"Simple option"),
                 new OsuContextMenuItem(@"Simple very very long option"),
-                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => ResizeWidthTo(Width * 2, 100, EasingTypes.OutQuint) },
-                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => ResizeHeightTo(Height * 2, 100, EasingTypes.OutQuint) },
-                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => ResizeWidthTo(Width / 2, 100, EasingTypes.OutQuint) },
-                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => ResizeHeightTo(Height / 2, 100, EasingTypes.OutQuint) },
+                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, EasingTypes.OutQuint) },
+                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, EasingTypes.OutQuint) },
+                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, EasingTypes.OutQuint) },
+                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, EasingTypes.OutQuint) },
             };
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -56,10 +56,7 @@ private void sendBarrage(int remaining = 100)
             }
 
             if (remaining > 0)
-            {
-                Delay(80);
-                Schedule(() => sendBarrage(remaining - 1));
-            }
+                Scheduler.AddDelayed(() => sendBarrage(remaining - 1), 80);
         }
 
         protected override void Update()

osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs

@@ -196,7 +196,7 @@ public TestDrawableHitObject(HitObject hitObject)
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                FadeInFromZero(250, EasingTypes.OutQuint);
+                this.FadeInFromZero(250, EasingTypes.OutQuint);
             }
 
             protected override void Update()

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -67,6 +67,8 @@ public TestCaseTaikoPlayfield()
 
         private void changePlayfieldSize(int step)
         {
+            double delay = 0;
+
             // Add new hits
             switch (step)
             {
@@ -84,18 +86,18 @@ private void changePlayfieldSize(int step)
                     break;
                 case 5:
                     addSwell(1000);
-                    playfieldContainer.Delay(scroll_time - 100);
+                    delay = scroll_time - 100;
                     break;
             }
 
             // Tween playfield height
             switch (step)
             {
                 default:
-                    playfieldContainer.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
                     break;
                 case 6:
-                    playfieldContainer.ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
                     break;
             }
         }

osu.Desktop/Overlays/VersionManager.cs

@@ -175,7 +175,7 @@ private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgr
 
         protected override void PopIn()
         {
-            FadeIn(1000);
+            this.FadeIn(1000);
         }
 
         protected override void PopOut()

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -16,8 +16,6 @@
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Input;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Timing;
 using osu.Framework.Configuration;
@@ -235,7 +233,7 @@ protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
 
         private void transformVisibleTimeRangeTo(double newTimeRange, double duration = 0, EasingTypes easing = EasingTypes.None)
         {
-            TransformTo(newTimeRange, duration, easing, new TransformTimeSpan());
+            this.TransformTo(nameof(visibleTimeRange), newTimeRange, duration, easing);
         }
 
         protected override void Update()
@@ -244,23 +242,5 @@ protected override void Update()
             // While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually
             barLineContainer.Width = columns.Width;
         }
-
-        private class TransformTimeSpan : Transform<double, Drawable>
-        {
-            public double CurrentValue
-            {
-                get
-                {
-                    double time = Time?.Current ?? 0;
-                    if (time < StartTime) return StartValue;
-                    if (time >= EndTime) return EndValue;
-
-                    return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
-                }
-            }
-
-            public override void Apply(Drawable d) => ((ManiaPlayfield)d).visibleTimeRange.Value = (float)CurrentValue;
-            public override void ReadIntoStartValue(Drawable d) => StartValue = ((ManiaPlayfield)d).visibleTimeRange.Value;
-        }
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs

@@ -98,8 +98,7 @@ private void update()
 
                             fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
 
-                            fp.Delay(fadeOutTime - fadeInTime);
-                            fp.FadeOut(DrawableOsuHitObject.TIME_FADEIN);
+                            fp.Delay(fadeOutTime - fadeInTime).FadeOut(DrawableOsuHitObject.TIME_FADEIN);
                         }
 
                         fp.Expire(true);

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -112,29 +112,26 @@ protected override void UpdateCurrentState(ArmedState state)
         {
             double duration = ((HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime) - HitObject.StartTime;
 
-            using (glow.BeginDelayedSequence(duration))
-                glow.FadeOut(400);
+            glow.Delay(duration).FadeOut(400);
 
             switch (state)
             {
                 case ArmedState.Idle:
-                    using (BeginDelayedSequence(duration + TIME_PREEMPT))
-                        FadeOut(TIME_FADEOUT);
+                    this.Delay(duration + TIME_PREEMPT).FadeOut(TIME_FADEOUT);
                     Expire(true);
                     break;
                 case ArmedState.Miss:
                     ApproachCircle.FadeOut(50);
-                    FadeOut(TIME_FADEOUT / 5);
+                    this.FadeOut(TIME_FADEOUT / 5);
                     Expire();
                     break;
                 case ArmedState.Hit:
                     ApproachCircle.FadeOut(50);
 
                     const double flash_in = 40;
-
-                    flash.FadeTo(0.8f, flash_in);
-                    using (flash.BeginDelayedSequence(flash_in))
-                        flash.FadeOut(100);
+                    flash.FadeTo(0.8f, flash_in)
+                         .Then()
+                         .FadeOut(100);
 
                     explode.FadeIn(flash_in);
 
@@ -145,8 +142,8 @@ protected override void UpdateCurrentState(ArmedState state)
                         circle.FadeOut();
                         number.FadeOut();
 
-                        FadeOut(800);
-                        ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
+                        this.FadeOut(800)
+                            .ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
                     }
 
                     Expire();

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -24,7 +25,7 @@ protected DrawableOsuHitObject(OsuHitObject hitObject)
 
         protected sealed override void UpdateState(ArmedState state)
         {
-            Flush();
+            FinishTransforms();
 
             using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
             {
@@ -44,7 +45,7 @@ protected virtual void UpdateInitialState()
 
         protected virtual void UpdatePreemptState()
         {
-            FadeIn(TIME_FADEIN);
+            this.FadeIn(TIME_FADEIN);
         }
 
         protected virtual void UpdateCurrentState(ArmedState state)

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -158,14 +158,14 @@ protected override void UpdateCurrentState(ArmedState state)
         {
             ball.FadeIn();
 
-            Delay(slider.Duration, true);
-
-            body.FadeOut(160);
-            ball.FadeOut(160);
-
-            FadeOut(800);
+            using (BeginDelayedSequence(slider.Duration, true))
+            {
+                body.FadeOut(160);
+                ball.FadeOut(160);
 
-            Expire();
+                this.FadeOut(800)
+                    .Expire();
+            }
         }
 
         public Drawable ProxiedLayer => initialCircle.ApproachCircle;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -62,31 +62,28 @@ protected override void UpdatePreemptState()
         {
             var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
 
-            ScaleTo(0.5f);
-            ScaleTo(1.2f, animIn);
-            FadeIn(animIn);
-
-            Delay(animIn);
-            ScaleTo(1, 150, EasingTypes.Out);
-
-            Delay(-animIn);
+            this.Animate(
+                d => d.FadeIn(animIn),
+                d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn)
+            ).Then(
+                d => d.ScaleTo(1, 150, EasingTypes.Out)
+            );
         }
 
         protected override void UpdateCurrentState(ArmedState state)
         {
             switch (state)
             {
                 case ArmedState.Idle:
-                    Delay(FadeOutTime - sliderTick.StartTime);
-                    FadeOut();
+                    this.Delay(FadeOutTime - sliderTick.StartTime).FadeOut();
                     break;
                 case ArmedState.Miss:
-                    FadeOut(160);
-                    FadeColour(Color4.Red, 80);
+                    this.FadeOut(160)
+                        .FadeColour(Color4.Red, 80);
                     break;
                 case ArmedState.Hit:
-                    FadeOut(120, EasingTypes.OutQuint);
-                    ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
+                    this.FadeOut(120, EasingTypes.OutQuint)
+                        .ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
                     break;
             }
         }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -189,30 +189,28 @@ protected override void UpdatePreemptState()
             disc.RotateTo(-720);
             symbol.RotateTo(-720);
 
-            mainContainer.ScaleTo(0);
-            mainContainer.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint);
-
-            mainContainer.Delay(TIME_PREEMPT - 150);
-            mainContainer.ScaleTo(1, 500, EasingTypes.OutQuint);
+            mainContainer
+                .ScaleTo(0)
+                .ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint)
+                .Then()
+                .ScaleTo(1, 500, EasingTypes.OutQuint);
         }
 
         protected override void UpdateCurrentState(ArmedState state)
         {
-            Delay(spinner.Duration, true);
-
-            FadeOut(160);
+            var sequence = this.Delay(spinner.Duration).FadeOut(160);
 
             switch (state)
             {
                 case ArmedState.Hit:
-                    ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
-                    Expire();
+                    sequence.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
                     break;
                 case ArmedState.Miss:
-                    ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
-                    Expire();
+                    sequence.ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
                     break;
             }
+
+            Expire();
         }
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBouncer.cs

@@ -37,8 +37,7 @@ public SliderBouncer(Slider slider, bool isEnd)
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            using (icon.BeginLoopedSequence())
-                icon.RotateTo(360, 1000);
+            icon.Spin(1000, RotationDirection.Clockwise);
         }
 
         public void UpdateProgress(double progress, int repeat)

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using OpenTK;
@@ -127,13 +126,14 @@ protected override void Update()
 
             if (Complete && updateCompleteTick())
             {
-                background.Flush(flushType: typeof(TransformAlpha));
-                background.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo);
-                background.Delay(60);
-                background.FadeTo(tracking_alpha, 250, EasingTypes.OutQuint);
+                background.FinishTransforms(false, nameof(Alpha));
+                background
+                    .FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo)
+                    .Then()
+                    .FadeTo(tracking_alpha, 250, EasingTypes.OutQuint);
             }
 
-            RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, EasingTypes.OutExpo);
+            this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, EasingTypes.OutExpo);
         }
     }
 }