Merge branch 'master' into null-assignment-warning-enable

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.513.0" />
   </ItemGroup>
 </Project>

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs

@@ -11,11 +11,13 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Playlists;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
@@ -24,8 +26,6 @@ namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsRoomSubScreen : RoomTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [Cached(typeof(IRoomManager))]
         private readonly TestRoomManager roomManager = new TestRoomManager();
 
@@ -41,6 +41,18 @@ namespace osu.Game.Tests.Visual.Playlists
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
 
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
+
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CreateRoomScoreRequest createRoomScoreRequest:
+                        createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
+                        return true;
+                }
+
+                return false;
+            };
         }
 
         [SetUpSteps]
@@ -59,12 +71,16 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.Name.Value = "my awesome room";
                 Room.Host.Value = new User { Id = 2, Username = "peppy" };
                 Room.RecentParticipants.Add(Room.Host.Value);
+                Room.EndDate.Value = DateTimeOffset.Now.AddMinutes(5);
                 Room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             });
+
+            AddStep("start match", () => match.ChildrenOfType<PlaylistsReadyButton>().First().Click());
+            AddUntilStep("player loader loaded", () => Stack.CurrentScreen is PlayerLoader);
         }
 
         [Test]

osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs

@@ -150,7 +150,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay()
         {
             sampleStart?.Play();
-            ParentScreen?.Push(CreateGameplayScreen());
+
+            // fallback is to allow this class to operate when there is no parent OnlineScreen (testing purposes).
+            var targetScreen = (Screen)ParentScreen ?? this;
+
+            targetScreen.Push(CreateGameplayScreen());
         }
 
         /// <summary>

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs

@@ -27,6 +27,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -452,7 +453,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     return new MultiSpectatorScreen(userIds);
 
                 default:
-                    return new MultiplayerPlayer(SelectedItem.Value, userIds);
+                    return new PlayerLoader(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
             }
         }
 

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

@@ -13,6 +13,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -271,9 +272,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        protected override Screen CreateGameplayScreen() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
-        };
+        });
     }
 }

osu.Game/Skinning/Editor/SkinComponentToolbox.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -29,8 +30,8 @@ namespace osu.Game.Skinning.Editor
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor
         {
-            Combo = { Value = 727 },
+            Combo = { Value = RNG.Next(1, 1000) },
-            TotalScore = { Value = 1337377 }
+            TotalScore = { Value = RNG.Next(1000, 10000000) }
         };
 
         [Cached(typeof(HealthProcessor))]

osu.Game/Skinning/Editor/SkinEditor.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -193,14 +194,16 @@ namespace osu.Game.Skinning.Editor
             SelectedComponents.Add(component);
         }
 
+        private IEnumerable<ISkinnableTarget> availableTargets => targetScreen.ChildrenOfType<ISkinnableTarget>();
+
         private ISkinnableTarget getTarget(SkinnableTarget target)
         {
-            return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
+            return availableTargets.FirstOrDefault(c => c.Target == target);
         }
 
         private void revert()
         {
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -216,7 +219,7 @@ namespace osu.Game.Skinning.Editor
             if (!hasBegunMutating)
                 return;
 
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
@@ -237,5 +240,11 @@ namespace osu.Game.Skinning.Editor
         {
             this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
         }
+
+        public void DeleteItems(ISkinnableDrawable[] items)
+        {
+            foreach (var item in items)
+                availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
+        }
     }
 }

osu.Game/Skinning/Editor/SkinSelectionHandler.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
@@ -17,6 +18,9 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
+        [Resolved]
+        private SkinEditor skinEditor { get; set; }
+
         public override bool HandleRotation(float angle)
         {
             // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
@@ -72,14 +76,8 @@ namespace osu.Game.Skinning.Editor
             SelectionBox.CanReverse = false;
         }
 
-        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items)
+        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items) =>
-        {
+            skinEditor.DeleteItems(items.ToArray());
-            foreach (var i in items)
-            {
-                ((Drawable)i).Expire();
-                SelectedItems.Remove(i);
-            }
-        }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
         {

osu.Game/Skinning/ISkinnableTarget.cs

@@ -37,8 +37,15 @@ namespace osu.Game.Skinning
         void Reload();
 
         /// <summary>
-        /// Add the provided item to this target.
+        /// Add a new skinnable component to this target.
         /// </summary>
+        /// <param name="drawable">The component to add.</param>
         void Add(ISkinnableDrawable drawable);
+
+        /// <summary>
+        /// Remove an existing skinnable component from this target.
+        /// </summary>
+        /// <param name="component">The component to remove.</param>
+        public void Remove(ISkinnableDrawable component);
     }
 }

osu.Game/Skinning/SkinnableTargetContainer.cs

@@ -43,10 +43,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        /// <summary>
+        /// <inheritdoc cref="ISkinnableTarget"/>
-        /// Add a new skinnable component to this target.
-        /// </summary>
-        /// <param name="component">The component to add.</param>
         /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
         /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
         public void Add(ISkinnableDrawable component)
@@ -55,12 +52,27 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
             content.Add(drawable);
             components.Add(component);
         }
 
+        /// <inheritdoc cref="ISkinnableTarget"/>
+        /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
+        /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
+        public void Remove(ISkinnableDrawable component)
+        {
+            if (content == null)
+                throw new NotSupportedException("Attempting to remove a new component from a target container which is not supported by the current skin.");
+
+            if (!(component is Drawable drawable))
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
+
+            content.Remove(drawable);
+            components.Remove(component);
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

osu.Game/osu.Game.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />

osu.iOS.props

@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />