make performance attributes a struct

osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceAttributes.cs

@@ -1,11 +1,23 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
-    public class CatchPerformanceAttributes : PerformanceAttributes
+    public struct CatchPerformanceAttributes : IPerformanceAttributes
     {
+        /// <summary>
+        /// Calculated score performance points.
+        /// </summary>
+        [JsonProperty("pp")]
+        public double Total { get; set; }
+
+        public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
+        {
+            yield return new PerformanceDisplayAttribute(nameof(Total), "Achieved PP", Total);
+        }
     }
 }

osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         {
         }
 
-        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
+        protected override IPerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
         {
             var catchAttributes = (CatchDifficultyAttributes)attributes;
 

osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs

@@ -7,16 +7,20 @@ using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
-    public class ManiaPerformanceAttributes : PerformanceAttributes
+    public struct ManiaPerformanceAttributes : IPerformanceAttributes
     {
+        /// <summary>
+        /// Calculated score performance points.
+        /// </summary>
+        [JsonProperty("pp")]
+        public double Total { get; set; }
+
         [JsonProperty("difficulty")]
         public double Difficulty { get; set; }
 
-        public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
+        public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
         {
-            foreach (var attribute in base.GetAttributesForDisplay())
+            yield return new PerformanceDisplayAttribute(nameof(Total), "Achieved PP", Total);
-                yield return attribute;
-
             yield return new PerformanceDisplayAttribute(nameof(Difficulty), "Difficulty", Difficulty);
         }
     }

osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
         }
 
-        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
+        protected override IPerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
         {
             var maniaAttributes = (ManiaDifficultyAttributes)attributes;
 

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceAttributes.cs

@@ -7,8 +7,14 @@ using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
-    public class OsuPerformanceAttributes : PerformanceAttributes
+    public struct OsuPerformanceAttributes : IPerformanceAttributes
     {
+        /// <summary>
+        /// Calculated score performance points.
+        /// </summary>
+        [JsonProperty("pp")]
+        public double Total { get; set; }
+
         [JsonProperty("aim")]
         public double Aim { get; set; }
 
@@ -24,11 +30,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         [JsonProperty("effective_miss_count")]
         public double EffectiveMissCount { get; set; }
 
-        public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
+        public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
         {
-            foreach (var attribute in base.GetAttributesForDisplay())
+            yield return new PerformanceDisplayAttribute(nameof(Total), "Achieved PP", Total);
-                yield return attribute;
-
             yield return new PerformanceDisplayAttribute(nameof(Aim), "Aim", Aim);
             yield return new PerformanceDisplayAttribute(nameof(Speed), "Speed", Speed);
             yield return new PerformanceDisplayAttribute(nameof(Accuracy), "Accuracy", Accuracy);

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         {
         }
 
-        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
+        protected override IPerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
         {
             var osuAttributes = (OsuDifficultyAttributes)attributes;
 

osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceAttributes.cs

@@ -7,8 +7,14 @@ using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
-    public class TaikoPerformanceAttributes : PerformanceAttributes
+    public struct TaikoPerformanceAttributes : IPerformanceAttributes
     {
+        /// <summary>
+        /// Calculated score performance points.
+        /// </summary>
+        [JsonProperty("pp")]
+        public double Total { get; set; }
+
         [JsonProperty("difficulty")]
         public double Difficulty { get; set; }
 
@@ -21,11 +27,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         [JsonProperty("estimated_unstable_rate")]
         public double? EstimatedUnstableRate { get; set; }
 
-        public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
+        public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
         {
-            foreach (var attribute in base.GetAttributesForDisplay())
+            yield return new PerformanceDisplayAttribute(nameof(Total), "Achieved PP", Total);
-                yield return attribute;
-
             yield return new PerformanceDisplayAttribute(nameof(Difficulty), "Difficulty", Difficulty);
             yield return new PerformanceDisplayAttribute(nameof(Accuracy), "Accuracy", Accuracy);
         }

osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
         }
 
-        protected override PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
+        protected override IPerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes)
         {
             var taikoAttributes = (TaikoDifficultyAttributes)attributes;
 

osu.Game/Rulesets/Difficulty/PerformanceAttributes.cs

@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Difficulty
 {
-    public class PerformanceAttributes
+    public interface IPerformanceAttributes
     {
         /// <summary>
         /// Calculated score performance points.
@@ -19,9 +19,6 @@ namespace osu.Game.Rulesets.Difficulty
         /// Some attributes may be omitted if they are not meant for display.
         /// </summary>
         /// <returns></returns>
-        public virtual IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
+        public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay();
-        {
-            yield return new PerformanceDisplayAttribute(nameof(Total), "Achieved PP", Total);
-        }
     }
 }

osu.Game/Rulesets/Difficulty/PerformanceBreakdown.cs

@@ -11,19 +11,19 @@ namespace osu.Game.Rulesets.Difficulty
         /// <summary>
         /// Actual gameplay performance.
         /// </summary>
-        public PerformanceAttributes Performance { get; set; }
+        public IPerformanceAttributes Performance { get; set; }
 
         /// <summary>
         /// Performance of a perfect play for comparison.
         /// </summary>
-        public PerformanceAttributes PerfectPerformance { get; set; }
+        public IPerformanceAttributes PerfectPerformance { get; set; }
 
         /// <summary>
         /// Create a new performance breakdown.
         /// </summary>
         /// <param name="performance">Actual gameplay performance.</param>
         /// <param name="perfectPerformance">Performance of a perfect play for comparison.</param>
-        public PerformanceBreakdown(PerformanceAttributes performance, PerformanceAttributes perfectPerformance)
+        public PerformanceBreakdown(IPerformanceAttributes performance, IPerformanceAttributes perfectPerformance)
         {
             Performance = performance;
             PerfectPerformance = perfectPerformance;

osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs

@@ -41,18 +41,18 @@ namespace osu.Game.Rulesets.Difficulty
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            PerformanceAttributes[] performanceArray = await Task.WhenAll(
+            IPerformanceAttributes[] performanceArray = await Task.WhenAll(
                 // compute actual performance
                 performanceCalculator.CalculateAsync(score, attributes.Value.Attributes, cancellationToken),
                 // compute performance for perfect play
                 getPerfectPerformance(score, cancellationToken)
             ).ConfigureAwait(false);
 
-            return new PerformanceBreakdown(performanceArray[0] ?? new PerformanceAttributes(), performanceArray[1] ?? new PerformanceAttributes());
+            return new PerformanceBreakdown(performanceArray[0] ?? new EmptyPerformanceAttributes(), performanceArray[1] ?? new EmptyPerformanceAttributes());
         }
 
         [ItemCanBeNull]
-        private Task<PerformanceAttributes> getPerfectPerformance(ScoreInfo score, CancellationToken cancellationToken = default)
+        private Task<IPerformanceAttributes> getPerfectPerformance(ScoreInfo score, CancellationToken cancellationToken = default)
         {
             return Task.Run(async () =>
             {
@@ -117,5 +117,12 @@ namespace osu.Game.Rulesets.Difficulty
 
             yield return hitObject.Judgement.MaxResult;
         }
+
+        public class EmptyPerformanceAttributes : IPerformanceAttributes
+        {
+            public double Total { get; set; } = 0;
+
+            public IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay() => [];
+        }
     }
 }

osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs

@@ -17,20 +17,20 @@ namespace osu.Game.Rulesets.Difficulty
             Ruleset = ruleset;
         }
 
-        public Task<PerformanceAttributes> CalculateAsync(ScoreInfo score, DifficultyAttributes attributes, CancellationToken cancellationToken)
+        public Task<IPerformanceAttributes> CalculateAsync(ScoreInfo score, DifficultyAttributes attributes, CancellationToken cancellationToken)
             => Task.Run(() => CreatePerformanceAttributes(score, attributes), cancellationToken);
 
-        public PerformanceAttributes Calculate(ScoreInfo score, DifficultyAttributes attributes)
+        public IPerformanceAttributes Calculate(ScoreInfo score, DifficultyAttributes attributes)
             => CreatePerformanceAttributes(score, attributes);
 
-        public PerformanceAttributes Calculate(ScoreInfo score, IWorkingBeatmap beatmap)
+        public IPerformanceAttributes Calculate(ScoreInfo score, IWorkingBeatmap beatmap)
             => Calculate(score, Ruleset.CreateDifficultyCalculator(beatmap).Calculate(score.Mods));
 
         /// <summary>
-        /// Creates <see cref="PerformanceAttributes"/> to describe a score's performance.
+        /// Creates <see cref="IPerformanceAttributes"/> to describe a score's performance.
         /// </summary>
         /// <param name="score">The score to create the attributes for.</param>
         /// <param name="attributes">The difficulty attributes for the beatmap relating to the score.</param>
-        protected abstract PerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes);
+        protected abstract IPerformanceAttributes CreatePerformanceAttributes(ScoreInfo score, DifficultyAttributes attributes);
     }
 }

osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs

@@ -156,8 +156,8 @@ namespace osu.Game.Screens.Ranking.Statistics
             var perfectDisplayAttributes = breakdown.PerfectPerformance.GetAttributesForDisplay();
 
             setTotalValues(
-                displayAttributes.First(a => a.PropertyName == nameof(PerformanceAttributes.Total)),
+                displayAttributes.First(a => a.PropertyName == nameof(IPerformanceAttributes.Total)),
-                perfectDisplayAttributes.First(a => a.PropertyName == nameof(PerformanceAttributes.Total))
+                perfectDisplayAttributes.First(a => a.PropertyName == nameof(IPerformanceAttributes.Total))
             );
 
             var rowDimensions = new List<Dimension>();
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             foreach (PerformanceDisplayAttribute attr in displayAttributes)
             {
-                if (attr.PropertyName == nameof(PerformanceAttributes.Total)) continue;
+                if (attr.PropertyName == nameof(IPerformanceAttributes.Total)) continue;
 
                 var row = createAttributeRow(attr, perfectDisplayAttributes.First(a => a.PropertyName == attr.PropertyName));