From 9dcd0bf311a7a869256cf3bd54965b9664b044fd Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 17 Jun 2021 10:07:52 +0900
Subject: [PATCH] Remove `IPlayfieldProvider` by caching `Playfield`

---
 .../Editor/ManiaSelectionBlueprintTestScene.cs       |  5 ++---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs       |  5 +++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs          | 11 +++++++++--
 osu.Game/Rulesets/Edit/IPlayfieldProvider.cs         | 12 ------------
 4 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/IPlayfieldProvider.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index e5abbc7246..124e1a35f9 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI;
@@ -14,13 +13,13 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Editor
 {
-    [Cached(typeof(IPlayfieldProvider))]
-    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene, IPlayfieldProvider
+    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene
     {
         protected override Container<Drawable> Content => blueprints ?? base.Content;
 
         private readonly Container blueprints;
 
+        [Cached(typeof(Playfield))]
         public Playfield Playfield { get; }
 
         private readonly ScrollingTestContainer scrollingTestContainer;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 1b5cb03204..955336db57 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
@@ -14,12 +15,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         where T : ManiaHitObject
     {
         [Resolved]
-        private IPlayfieldProvider playfieldProvider { get; set; }
+        private Playfield playfield { get; set; }
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        protected ScrollingHitObjectContainer HitObjectContainer => ((ManiaPlayfield)playfieldProvider.Playfield).GetColumn(HitObject.Column).HitObjectContainer;
+        protected ScrollingHitObjectContainer HitObjectContainer => ((ManiaPlayfield)playfield).GetColumn(HitObject.Column).HitObjectContainer;
 
         protected ManiaSelectionBlueprint(T hitObject)
             : base(hitObject)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 67c18b7e3c..a7005954b2 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected readonly Ruleset Ruleset;
 
+        // Provides `Playfield`
+        private DependencyContainer dependencies;
+
         [Resolved]
         protected EditorClock EditorClock { get; private set; }
 
@@ -69,6 +72,9 @@ namespace osu.Game.Rulesets.Edit
             Ruleset = ruleset;
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
+            dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -88,6 +94,8 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
+            dependencies.CacheAs(Playfield);
+
             const float toolbar_width = 200;
 
             InternalChildren = new Drawable[]
@@ -415,8 +423,7 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     [Cached(typeof(HitObjectComposer))]
     [Cached(typeof(IPositionSnapProvider))]
-    [Cached(typeof(IPlayfieldProvider))]
-    public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider, IPlayfieldProvider
+    public abstract class HitObjectComposer : CompositeDrawable, IPositionSnapProvider
     {
         protected HitObjectComposer()
         {
diff --git a/osu.Game/Rulesets/Edit/IPlayfieldProvider.cs b/osu.Game/Rulesets/Edit/IPlayfieldProvider.cs
deleted file mode 100644
index 4bfd4d2728..0000000000
--- a/osu.Game/Rulesets/Edit/IPlayfieldProvider.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Rulesets.UI;
-
-namespace osu.Game.Rulesets.Edit
-{
-    public interface IPlayfieldProvider
-    {
-        Playfield Playfield { get; }
-    }
-}