From 3cbdaf5960a992e21b4fff30ad8660987edf005a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 8 Dec 2020 10:30:23 +0900
Subject: [PATCH] Make resolved properties protected

---
 .../Skinning/Default/CatchHitObjectPiece.cs      | 12 ++++++------
 .../Skinning/Default/FruitPiece.cs               |  7 +++----
 .../Skinning/LegacyCatchHitObjectPiece.cs        | 16 +++++++---------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
index 3c3cb5b0ee..be6cf0fc05 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs
@@ -18,10 +18,8 @@ public class CatchHitObjectPiece : CompositeDrawable
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
         [Resolved(canBeNull: true)]
-        private DrawableHitObject drawableHitObject { get; set; }
-
         [CanBeNull]
-        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+        protected DrawableHitObject DrawableHitObject { get; private set; }
 
         [CanBeNull]
         protected BorderPiece BorderPiece;
@@ -33,10 +31,12 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
+            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
+
+            if (hitObject != null)
             {
-                AccentColour.BindTo(DrawableHitObject.AccentColour);
-                HyperDash.BindTo(DrawableHitObject.HyperDash);
+                AccentColour.BindTo(hitObject.AccentColour);
+                HyperDash.BindTo(hitObject.HyperDash);
             }
 
             HyperDash.BindValueChanged(hyper =>
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
index 05b924eb75..45d688c4e5 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs
@@ -36,11 +36,10 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
-            {
-                var fruit = (DrawableFruit)DrawableHitObject;
+            var fruit = (DrawableFruit)DrawableHitObject;
+
+            if (fruit != null)
                 VisualRepresentation.BindTo(fruit.VisualRepresentation);
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
index 4bcb92b9be..1e68439402 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyCatchHitObjectPiece.cs
@@ -27,15 +27,11 @@ public abstract class LegacyCatchHitObjectPiece : PoolableDrawable
         private readonly Sprite hyperSprite;
 
         [Resolved]
-        private ISkinSource skin { get; set; }
-
-        protected ISkinSource Skin => skin;
+        protected ISkinSource Skin { get; private set; }
 
         [Resolved(canBeNull: true)]
-        private DrawableHitObject drawableHitObject { get; set; }
-
         [CanBeNull]
-        protected DrawablePalpableCatchHitObject DrawableHitObject => (DrawablePalpableCatchHitObject)drawableHitObject;
+        protected DrawableHitObject DrawableHitObject { get; private set; }
 
         protected LegacyCatchHitObjectPiece()
         {
@@ -69,10 +65,12 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (DrawableHitObject != null)
+            var hitObject = (DrawablePalpableCatchHitObject)DrawableHitObject;
+
+            if (hitObject != null)
             {
-                AccentColour.BindTo(DrawableHitObject.AccentColour);
-                HyperDash.BindTo(DrawableHitObject.HyperDash);
+                AccentColour.BindTo(hitObject.AccentColour);
+                HyperDash.BindTo(hitObject.HyperDash);
             }
 
             hyperSprite.Colour = Skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashFruit)?.Value ??