Merge pull request #15627 from peppy/playlist-item-iruleset

Update `PlaylistItem` to use `IRulesetInfo`

osu.Game/Online/Rooms/MultiplayerScore.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json.Converters;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -62,7 +63,7 @@ namespace osu.Game.Online.Rooms
         [CanBeNull]
         public MultiplayerScoresAround ScoresAround { get; set; }
 
-        public ScoreInfo CreateScoreInfo(PlaylistItem playlistItem, [NotNull] BeatmapInfo beatmap)
+        public ScoreInfo CreateScoreInfo(RulesetStore rulesets, PlaylistItem playlistItem, [NotNull] BeatmapInfo beatmap)
         {
             var rulesetInstance = playlistItem.Ruleset.Value.CreateInstance();
 
@@ -73,7 +74,7 @@ namespace osu.Game.Online.Rooms
                 MaxCombo = MaxCombo,
                 BeatmapInfo = beatmap,
                 BeatmapInfoID = playlistItem.BeatmapID,
-                Ruleset = playlistItem.Ruleset.Value,
+                Ruleset = rulesets.GetRuleset(playlistItem.RulesetID),
                 RulesetID = playlistItem.RulesetID,
                 Statistics = Statistics,
                 User = User,

osu.Game/Online/Rooms/PlaylistItem.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Online.Rooms
         public readonly Bindable<IBeatmapInfo> Beatmap = new Bindable<IBeatmapInfo>();
 
         [JsonIgnore]
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public readonly Bindable<IRulesetInfo> Ruleset = new Bindable<IRulesetInfo>();
 
         [JsonIgnore]
         public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>();
@@ -66,7 +66,7 @@ namespace osu.Game.Online.Rooms
         public PlaylistItem()
         {
             Beatmap.BindValueChanged(beatmap => BeatmapID = beatmap.NewValue?.OnlineID ?? -1);
-            Ruleset.BindValueChanged(ruleset => RulesetID = ruleset.NewValue?.ID ?? 0);
+            Ruleset.BindValueChanged(ruleset => RulesetID = ruleset.NewValue?.OnlineID ?? 0);
         }
 
         public void MapObjects(RulesetStore rulesets)

osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay
         private ModDisplay modDisplay;
 
         private readonly Bindable<IBeatmapInfo> beatmap = new Bindable<IBeatmapInfo>();
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly Bindable<IRulesetInfo> ruleset = new Bindable<IRulesetInfo>();
         private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
 
         public readonly PlaylistItem Item;

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

@@ -18,6 +18,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
@@ -59,6 +60,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         [Resolved(canBeNull: true)]
         protected OnlinePlayScreen ParentScreen { get; private set; }
 
@@ -344,7 +348,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             UpdateMods();
 
-            Ruleset.Value = selected.Ruleset.Value;
+            Ruleset.Value = rulesets.GetRuleset(selected.RulesetID);
 
             if (!selected.AllowedMods.Any())
             {

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

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
@@ -35,6 +36,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         public PlaylistsResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
@@ -169,7 +173,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         /// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
         private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> callback, [NotNull] List<MultiplayerScore> scores, [CanBeNull] MultiplayerScores pivot = null)
         {
-            var scoreInfos = scores.Select(s => s.CreateScoreInfo(playlistItem, Beatmap.Value.BeatmapInfo)).ToArray();
+            var scoreInfos = scores.Select(s => s.CreateScoreInfo(rulesets, playlistItem, Beatmap.Value.BeatmapInfo)).ToArray();
 
             // Score panels calculate total score before displaying, which can take some time. In order to count that calculation as part of the loading spinner display duration,
             // calculate the total scores locally before invoking the success callback.