From 98044c108e7f7e9e8723c61ff1ca3823a95feaeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Nov 2024 17:41:00 +0900
Subject: [PATCH] Revert "Ensure `DrawableMedal` loading doesn't ever block on
 online resources"

This reverts commit 8585327858a00b6c15612bf29e446ccb733773d9.
---
 .../Overlays/MedalSplash/DrawableMedal.cs     | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
index 460239f620..2beed6645a 100644
--- a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
+++ b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
@@ -28,14 +28,16 @@ namespace osu.Game.Overlays.MedalSplash
         [CanBeNull]
         public event Action<DisplayState> StateChanged;
 
+        private readonly Medal medal;
         private readonly Container medalContainer;
-        private readonly Sprite medalGlow;
+        private readonly Sprite medalSprite, medalGlow;
         private readonly OsuSpriteText unlocked, name;
         private readonly TextFlowContainer description;
         private DisplayState state;
 
         public DrawableMedal(Medal medal)
         {
+            this.medal = medal;
             Position = new Vector2(0f, MedalAnimation.DISC_SIZE / 2);
 
             FillFlowContainer infoFlow;
@@ -49,7 +51,7 @@ namespace osu.Game.Overlays.MedalSplash
                     Alpha = 0f,
                     Children = new Drawable[]
                     {
-                        new DelayedLoadWrapper(() => new MedalOnlineSprite(medal), 0)
+                        medalSprite = new Sprite
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -120,8 +122,9 @@ namespace osu.Game.Overlays.MedalSplash
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, TextureStore textures)
+        private void load(OsuColour colours, TextureStore textures, LargeTextureStore largeTextures)
         {
+            medalSprite.Texture = largeTextures.Get(medal.ImageUrl);
             medalGlow.Texture = textures.Get(@"MedalSplash/medal-glow");
             description.Colour = colours.BlueLight;
         }
@@ -188,31 +191,6 @@ namespace osu.Game.Overlays.MedalSplash
                     break;
             }
         }
-
-        private partial class MedalOnlineSprite : Sprite
-        {
-            private readonly Medal medal;
-
-            public MedalOnlineSprite(Medal medal)
-            {
-                this.medal = medal;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours, TextureStore textures, LargeTextureStore largeTextures)
-            {
-                Texture = largeTextures.Get(medal.ImageUrl);
-
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                this.FadeInFromZero(150, Easing.OutQuint);
-            }
-        }
     }
 
     public enum DisplayState