Merge pull request #183 from stanriders/update-and-fix-mod-select

Update packages and improve mod selection in GUI
ppy · Oct 5, 2023 · eb0deb8 · eb0deb8
2 parents 86184b3 + 1e3fd0e
commit eb0deb8
Show file tree

Hide file tree

Showing 19 changed files with 169 additions and 61 deletions.
diff --git a/PerformanceCalculator/Performance/ScorePerformanceCommand.cs b/PerformanceCalculator/Performance/ScorePerformanceCommand.cs
@@ -28,7 +28,7 @@ public override void Execute()
 
             var ruleset = LegacyHelper.GetRulesetFromLegacyID(apiScore.RulesetID);
             var score = apiScore.ToScoreInfo(apiScore.Mods.Select(m => m.ToMod(ruleset)).ToArray(), apiBeatmap);
-            score.BeatmapInfo.Metadata = new BeatmapMetadata
+            score.BeatmapInfo!.Metadata = new BeatmapMetadata
             {
                 Title = apiBeatmap.Metadata.Title,
                 Artist = apiBeatmap.Metadata.Artist,

diff --git a/PerformanceCalculator/PerformanceCalculator.csproj b/PerformanceCalculator/PerformanceCalculator.csproj
@@ -7,10 +7,10 @@
   <ItemGroup>
     <PackageReference Include="Alba.CsConsoleFormat" Version="1.0.0" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
-    <PackageReference Include="ppy.osu.Game" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.621.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1004.0" />
   </ItemGroup>
 </Project>
diff --git a/PerformanceCalculator/ProcessorCommand.cs b/PerformanceCalculator/ProcessorCommand.cs
@@ -47,8 +47,8 @@ public void OutputPerformance(ScoreInfo score, PerformanceAttributes performance
                 Score = new ScoreStatistics
                 {
                     RulesetId = score.Ruleset.OnlineID,
-                    BeatmapId = score.BeatmapInfo.OnlineID,
-                    Beatmap = score.BeatmapInfo.ToString(),
+                    BeatmapId = score.BeatmapInfo?.OnlineID ?? -1,
+                    Beatmap = score.BeatmapInfo?.ToString() ?? "Unknown beatmap",
                     Mods = score.Mods.Select(m => new APIMod(m)).ToList(),
                     Score = score.TotalScore,
                     Accuracy = score.Accuracy * 100,

diff --git a/PerformanceCalculatorGUI/Components/ExtendedOsuFileSelector.cs b/PerformanceCalculatorGUI/Components/ExtendedOsuFileSelector.cs
@@ -32,7 +32,7 @@ public ExtendedOsuFileSelector(string initialPath = null, string[] validFileExte
         /// <summary>
         /// Metadata decoder is created once to not recreate it for every file
         /// </summary>
-        private readonly LegacyBeatmapMetadataDecoder beatmapDecoder = new();
+        private readonly LegacyBeatmapMetadataDecoder beatmapDecoder = new LegacyBeatmapMetadataDecoder();
 
         protected override DirectoryListingFile CreateFileItem(FileInfo file) => new ExtendedOsuDirectoryListingFile(file, beatmapDecoder);
 

diff --git a/PerformanceCalculatorGUI/Components/ExtendedProfileScore.cs b/PerformanceCalculatorGUI/Components/ExtendedProfileScore.cs
@@ -35,8 +35,8 @@ public class ExtendedScore
         public SoloScoreInfo SoloScore { get; }
         public double LivePP { get; }
 
-        public Bindable<int> Position { get; } = new();
-        public Bindable<int> PositionChange { get; } = new();
+        public Bindable<int> Position { get; } = new Bindable<int>();
+        public Bindable<int> PositionChange { get; } = new Bindable<int>();
 
         public PerformanceAttributes PerformanceAttributes { get; }
 
@@ -282,7 +282,7 @@ private void load(RulesetStore rulesets)
                                         {
                                             var ruleset = rulesets.GetRuleset(Score.SoloScore.RulesetID) ?? throw new InvalidOperationException();
 
-                                            return new ModIcon(ruleset.CreateInstance().CreateModFromAcronym(mod.Acronym))
+                                            return new ModIcon(ruleset.CreateInstance().CreateModFromAcronym(mod.Acronym)!)
                                             {
                                                 Scale = new Vector2(0.35f)
                                             };

diff --git a/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs b/PerformanceCalculatorGUI/Components/ExtendedUserModSelectOverlay.cs
@@ -9,7 +9,7 @@ namespace PerformanceCalculatorGUI.Components
 {
     public partial class ExtendedUserModSelectOverlay : UserModSelectOverlay
     {
-        protected override bool ShowTotalMultiplier => false;
+        protected override bool ShowModEffects => false;
 
         public ExtendedUserModSelectOverlay()
             : base(OverlayColourScheme.Blue)

diff --git a/PerformanceCalculatorGUI/Components/StrainVisualizer.cs b/PerformanceCalculatorGUI/Components/StrainVisualizer.cs
@@ -73,11 +73,11 @@ public partial class StrainBarGraph : FillFlowContainer<StrainBar>
 
     public partial class StrainVisualizer : Container
     {
-        public readonly Bindable<Skill[]> Skills = new();
+        public readonly Bindable<Skill[]> Skills = new Bindable<Skill[]>();
 
-        private readonly List<Bindable<bool>> graphToggles = new();
+        private readonly List<Bindable<bool>> graphToggles = new List<Bindable<bool>>();
 
-        public readonly Bindable<int> TimeUntilFirstStrain = new();
+        public readonly Bindable<int> TimeUntilFirstStrain = new Bindable<int>();
 
         private ZoomableScrollContainer graphsContainer;
         private FillFlowContainer legendContainer;
@@ -109,7 +109,7 @@ private void updateGraphs(ValueChangedEvent<Skill[]> val)
 
             var graphAlpha = Math.Min(1.5f / skills.Length, 0.9f);
 
-            List<(float val, string tooltip)[]> strainLists = new();
+            List<(float val, string tooltip)[]> strainLists = new List<(float val, string tooltip)[]>();
 
             foreach (var skill in skills)
             {

diff --git a/PerformanceCalculatorGUI/Components/TextBoxes/FileChooserLabelledTextBox.cs b/PerformanceCalculatorGUI/Components/TextBoxes/FileChooserLabelledTextBox.cs
@@ -33,7 +33,7 @@ public partial class FileChooserLabelledTextBox : ExtendedLabelledTextBox, ICanA
 
         public IEnumerable<string> HandledExtensions => handledExtensions;
 
-        private readonly Bindable<FileInfo> currentFile = new();
+        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
 
         [Resolved]
         private OsuGameBase game { get; set; }

diff --git a/PerformanceCalculatorGUI/Components/UserCard.cs b/PerformanceCalculatorGUI/Components/UserCard.cs
@@ -33,7 +33,7 @@ public partial class UserCard : UserListPanel
         private OsuSpriteText differenceLabel;
         private OsuSpriteText playcountLabel;
 
-        public Bindable<UserCardData> Data = new();
+        public Bindable<UserCardData> Data = new Bindable<UserCardData>();
 
         public UserCard(APIUser user)
             : base(user)

diff --git a/PerformanceCalculatorGUI/Configuration/SettingsManager.cs b/PerformanceCalculatorGUI/Configuration/SettingsManager.cs
@@ -30,7 +30,7 @@ protected override void InitialiseDefaults()
             SetDefault(Settings.ClientId, string.Empty);
             SetDefault(Settings.ClientSecret, string.Empty);
             SetDefault(Settings.DefaultPath, Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
-            SetDefault(Settings.CachePath, Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "cache"));
+            SetDefault(Settings.CachePath, Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "cache"));
         }
     }
 }
diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.621.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.621.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1004.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1004.0" />
   </ItemGroup>
 </Project>
diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorGame.cs b/PerformanceCalculatorGUI/PerformanceCalculatorGame.cs
@@ -26,7 +26,7 @@ public partial class PerformanceCalculatorGame : OsuGameBase
         // This overwrites OsuGameBase's SelectedMods to make sure it can't tweak mods when we don't want it to
         [Cached]
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
-        private readonly Bindable<IReadOnlyList<Mod>> mods = new(Array.Empty<Mod>());
+        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         [Resolved]
         private FrameworkConfigManager frameworkConfig { get; set; }

diff --git a/PerformanceCalculatorGUI/ProcessorWorkingBeatmap.cs b/PerformanceCalculatorGUI/ProcessorWorkingBeatmap.cs
@@ -58,7 +58,7 @@ private static Beatmap readFromFile(string filename)
 
         public static ProcessorWorkingBeatmap FromFileOrId(string fileOrId, AudioManager audioManager = null, string cachePath = "cache")
         {
-            if (fileOrId.EndsWith(".osu"))
+            if (fileOrId.EndsWith(".osu", StringComparison.Ordinal))
             {
                 if (!File.Exists(fileOrId))
                     throw new ArgumentException($"Beatmap file {fileOrId} does not exist.");

diff --git a/PerformanceCalculatorGUI/Screens/BeatmapLeaderboardScreen.cs b/PerformanceCalculatorGUI/Screens/BeatmapLeaderboardScreen.cs
@@ -43,7 +43,7 @@ public partial class BeatmapLeaderboardScreen : PerformanceCalculatorScreen
         private CancellationTokenSource calculationCancellatonToken;
 
         [Cached]
-        private OverlayColourProvider colourProvider = new(OverlayColourScheme.Orange);
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Orange);
 
         [Resolved]
         private NotificationDisplay notificationDisplay { get; set; }

diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectDifficultyValuesContainer.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectDifficultyValuesContainer.cs
@@ -32,7 +32,7 @@ public partial class ObjectDifficultyValuesContainer : Container
 
         private FillFlowContainer flowContainer;
 
-        public Bindable<DifficultyHitObject> CurrentDifficultyHitObject { get; } = new();
+        public Bindable<DifficultyHitObject> CurrentDifficultyHitObject { get; } = new Bindable<DifficultyHitObject>();
 
         private const int hit_object_type_container_height = 50;
 

diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectInspector.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/ObjectInspector.cs
@@ -35,7 +35,7 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
         [Cached]
-        private BindableBeatDivisor beatDivisor = new();
+        private BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }

diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs
@@ -72,8 +72,8 @@ private void updateState(DrawableHitObject hitObject, ArmedState state)
                 // adjust the visuals of top-level object types to make them stay on screen for longer than usual.
                 switch (hitObject)
                 {
-                    case DrawableSlider _:
-                    case DrawableHitCircle _:
+                    case DrawableSlider:
+                    case DrawableHitCircle:
                         var nextHitObject = difficultyHitObjects.FirstOrDefault(x => x.StartTime > hitObject.StartTimeBindable.Value)?.BaseObject;
 
                         if (nextHitObject != null)

diff --git a/PerformanceCalculatorGUI/Screens/SimulateScreen.cs b/PerformanceCalculatorGUI/Screens/SimulateScreen.cs
@@ -68,7 +68,7 @@ public partial class SimulateScreen : PerformanceCalculatorScreen
         private PerformanceCalculator performanceCalculator;
 
         [Cached]
-        private Bindable<DifficultyCalculator> difficultyCalculator = new();
+        private Bindable<DifficultyCalculator> difficultyCalculator = new Bindable<DifficultyCalculator>();
 
         private FillFlowContainer beatmapDataContainer;
         private Container beatmapTitle;
@@ -108,6 +108,7 @@ public partial class SimulateScreen : PerformanceCalculatorScreen
 
         private const int file_selection_container_height = 40;
         private const int map_title_container_height = 40;
+        private const float mod_selection_container_scale = 0.7f;
 
         public SimulateScreen()
         {
@@ -300,21 +301,14 @@ private void load()
                                                         modDisplay = new ModDisplay()
                                                     }
                                                 },
-                                                new ScalingContainer(ScalingMode.Everything)
+                                                userModsSelectOverlay = new ExtendedUserModSelectOverlay
                                                 {
-                                                    Name = "Mod selection overlay",
                                                     RelativeSizeAxes = Axes.X,
-                                                    Height = 300,
-                                                    Width = 0.75f,
-                                                    Scale = new Vector2(1.5f),
-                                                    Child = userModsSelectOverlay = new ExtendedUserModSelectOverlay
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Anchor = Anchor.TopLeft,
-                                                        Origin = Anchor.TopLeft,
-                                                        IsValidMod = mod => mod.HasImplementation && ModUtils.FlattenMod(mod).All(m => m.UserPlayable),
-                                                        SelectedMods = { BindTarget = appliedMods }
-                                                    }
+                                                    Height = 460 / mod_selection_container_scale,
+                                                    Width = 1f / mod_selection_container_scale,
+                                                    Scale = new Vector2(mod_selection_container_scale),
+                                                    IsValidMod = mod => mod.HasImplementation && ModUtils.FlattenMod(mod).All(m => m.UserPlayable),
+                                                    SelectedMods = { BindTarget = appliedMods }
                                                 }
                                             }
                                         }
@@ -594,7 +588,7 @@ private void calculateDifficulty()
             if (difficultyCalculator.Value is IExtendedDifficultyCalculator extendedDifficultyCalculator)
             {
                 // StrainSkill always skips the first object
-                if (working.Beatmap?.HitObjects?.Count > 1)
+                if (working.Beatmap?.HitObjects.Count > 1)
                     strainVisualizer.TimeUntilFirstStrain.Value = (int)working.Beatmap.HitObjects[1].StartTime;
 
                 strainVisualizer.Skills.Value = extendedDifficultyCalculator.GetSkills();
@@ -629,7 +623,7 @@ private void calculatePerformance()
                 var beatmap = working.GetPlayableBeatmap(ruleset.Value, appliedMods.Value);
 
                 var accuracy = accuracyTextBox.Value.Value / 100.0;
-                Dictionary<HitResult, int> statistics = null;
+                Dictionary<HitResult, int> statistics = new Dictionary<HitResult, int>();
 
                 if (ruleset.Value.OnlineID != -1)
                 {