Make an interface for beatmaps

osu.Game/Beatmaps/Beatmap.cs

@@ -12,24 +12,69 @@ using osu.Game.IO.Serialization.Converters;
 
 namespace osu.Game.Beatmaps
 {
+    public interface IBeatmap : IJsonSerializable
+    {
+        /// <summary>
+        /// This beatmap's info.
+        /// </summary>
+        BeatmapInfo BeatmapInfo { get; }
+
+        /// <summary>
+        /// This beatmap's metadata.
+        /// </summary>
+        BeatmapMetadata Metadata { get; }
+
+        /// <summary>
+        /// The control points in this beatmap.
+        /// </summary>
+        ControlPointInfo ControlPointInfo { get; }
+
+        /// <summary>
+        /// The breaks in this beatmap.
+        /// </summary>
+        List<BreakPeriod> Breaks { get; }
+
+        /// <summary>
+        /// Total amount of break time in the beatmap.
+        /// </summary>
+        double TotalBreakTime { get; }
+
+        /// <summary>
+        /// The hitobjects contained by this beatmap.
+        /// </summary>
+        IEnumerable<HitObject> HitObjects { get; }
+
+        /// <summary>
+        /// Creates a shallow-clone of this beatmap and returns it.
+        /// </summary>
+        /// <returns>The shallow-cloned beatmap.</returns>
+        IBeatmap Clone();
+    }
+
     /// <summary>
     /// A Beatmap containing converted HitObjects.
     /// </summary>
-    public class Beatmap<T> : IJsonSerializable
+    public class Beatmap<T> : IBeatmap
         where T : HitObject
     {
-        public BeatmapInfo BeatmapInfo = new BeatmapInfo();
+        public BeatmapInfo BeatmapInfo { get; set; } = new BeatmapInfo
-        public ControlPointInfo ControlPointInfo = new ControlPointInfo();
+        {
-        public List<BreakPeriod> Breaks = new List<BreakPeriod>();
+            Metadata = new BeatmapMetadata
+            {
+                Artist = @"Unknown",
+                Title = @"Unknown",
+                AuthorString = @"Unknown Creator",
+            },
+            Version = @"Normal",
+            BaseDifficulty = new BeatmapDifficulty()
+        };
 
         [JsonIgnore]
         public BeatmapMetadata Metadata => BeatmapInfo?.Metadata ?? BeatmapInfo?.BeatmapSet?.Metadata;
 
-        /// <summary>
+        public ControlPointInfo ControlPointInfo { get; set; } = new ControlPointInfo();
-        /// The HitObjects this Beatmap contains.
+
-        /// </summary>
+        public List<BreakPeriod> Breaks { get; set; } = new List<BreakPeriod>();
-        [JsonConverter(typeof(TypedListConverter<HitObject>))]
-        public List<T> HitObjects = new List<T>();
 
         /// <summary>
         /// Total amount of break time in the beatmap.
@@ -38,51 +83,26 @@ namespace osu.Game.Beatmaps
         public double TotalBreakTime => Breaks.Sum(b => b.Duration);
 
         /// <summary>
-        /// Constructs a new beatmap.
+        /// The HitObjects this Beatmap contains.
         /// </summary>
-        /// <param name="original">The original beatmap to use the parameters of.</param>
+        [JsonConverter(typeof(TypedListConverter<HitObject>))]
-        public Beatmap(Beatmap<T> original = null)
+        public List<T> HitObjects = new List<T>();
-        {
-            BeatmapInfo = original?.BeatmapInfo.DeepClone() ?? BeatmapInfo;
-            ControlPointInfo = original?.ControlPointInfo ?? ControlPointInfo;
-            Breaks = original?.Breaks ?? Breaks;
-            HitObjects = original?.HitObjects ?? HitObjects;
 
-            if (original == null && Metadata == null)
+        IEnumerable<HitObject> IBeatmap.HitObjects => HitObjects;
-            {
+
-                // we may have no metadata in cases we weren't sourced from the database.
+        public Beatmap<T> Clone() => new Beatmap<T>
-                // let's fill it (and other related fields) so we don't need to null-check it in future usages.
+        {
-                BeatmapInfo = new BeatmapInfo
+            BeatmapInfo = BeatmapInfo.DeepClone(),
-                {
+            ControlPointInfo = ControlPointInfo,
-                    Metadata = new BeatmapMetadata
+            Breaks = Breaks,
-                    {
+            HitObjects = HitObjects
-                        Artist = @"Unknown",
+        };
-                        Title = @"Unknown",
+
-                        AuthorString = @"Unknown Creator",
+        IBeatmap IBeatmap.Clone() => Clone();
-                    },
-                    Version = @"Normal",
-                    BaseDifficulty = new BeatmapDifficulty()
-                };
-            }
-        }
     }
 
-    /// <summary>
-    /// A Beatmap containing un-converted HitObjects.
-    /// </summary>
     public class Beatmap : Beatmap<HitObject>
     {
-        /// <summary>
+        public new Beatmap Clone() => (Beatmap)base.Clone();
-        /// Constructs a new beatmap.
-        /// </summary>
-        /// <param name="original">The original beatmap to use the parameters of.</param>
-        public Beatmap(Beatmap original)
-            : base(original)
-        {
-        }
-
-        public Beatmap()
-        {
-        }
     }
 }

osu.Game/Beatmaps/BeatmapConverter.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Beatmaps
         public Beatmap<T> Convert(Beatmap original)
         {
             // We always operate on a clone of the original beatmap, to not modify it game-wide
-            return ConvertBeatmap(new Beatmap(original));
+            return ConvertBeatmap(original.Clone());
         }
 
         void IBeatmapConverter.Convert(Beatmap original) => Convert(original);

osu.Game/Beatmaps/Legacy/LegacyBeatmap.cs

@@ -8,14 +8,5 @@ namespace osu.Game.Beatmaps.Legacy
     /// </summary>
     public class LegacyBeatmap : Beatmap
     {
-        /// <summary>
-        /// Constructs a new beatmap.
-        /// </summary>
-        /// <param name="original">The original beatmap to use the parameters of.</param>
-        internal LegacyBeatmap(Beatmap original = null)
-            : base(original)
-        {
-            HitObjects = original?.HitObjects;
-        }
     }
 }

osu.Game/Screens/Play/BreakOverlay.cs

@@ -18,11 +18,11 @@ namespace osu.Game.Screens.Play
         private const float remaining_time_container_max_size = 0.3f;
         private const int vertical_margin = 25;
 
-        private List<BreakPeriod> breaks;
+        private IReadOnlyList<BreakPeriod> breaks;
 
         private readonly Container fadeContainer;
 
-        public List<BreakPeriod> Breaks
+        public IReadOnlyList<BreakPeriod> Breaks
         {
             get => breaks;
             set

osu.Game/Tests/Beatmaps/TestBeatmap.cs

@@ -12,8 +12,14 @@ namespace osu.Game.Tests.Beatmaps
     public class TestBeatmap : Beatmap
     {
         public TestBeatmap(RulesetInfo ruleset)
-        : base(createTestBeatmap())
         {
+            var baseBeatmap = createTestBeatmap();
+
+            BeatmapInfo = baseBeatmap.BeatmapInfo;
+            ControlPointInfo = baseBeatmap.ControlPointInfo;
+            Breaks = baseBeatmap.Breaks;
+            HitObjects = baseBeatmap.HitObjects;
+
             BeatmapInfo.Ruleset = ruleset;
         }