Merge branch 'master' into squirrel-log-safety

osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs

@@ -63,8 +63,10 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             get
             {
-                var first = (OsuHitObject)Objects.First();
+                if (Objects.FirstOrDefault() is OsuHitObject first)
-                return first.StartTime - Math.Max(2000, first.TimePreempt);
+                    return first.StartTime - Math.Max(2000, first.TimePreempt);
+
+                return 0;
             }
         }
     }

osu.Game.Tests/Visual/TestCaseOsuGame.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -23,6 +22,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
 using osu.Game.Skinning;
@@ -43,8 +43,6 @@ namespace osu.Game.Tests.Visual
         {
             typeof(OsuGame),
             typeof(RavenLogger),
-            typeof(Bindable<RulesetInfo>),
-            typeof(IBindable<RulesetInfo>),
             typeof(OsuLogo),
             typeof(IdleTracker),
             typeof(OnScreenDisplay),
@@ -60,12 +58,17 @@ namespace osu.Game.Tests.Visual
             typeof(MusicController),
             typeof(AccountCreationOverlay),
             typeof(DialogOverlay),
+            typeof(ScreenshotManager)
         };
 
         private IReadOnlyList<Type> requiredGameBaseDependencies => new[]
         {
             typeof(OsuGameBase),
             typeof(DatabaseContextFactory),
+            typeof(Bindable<RulesetInfo>),
+            typeof(IBindable<RulesetInfo>),
+            typeof(Bindable<IReadOnlyList<Mod>>),
+            typeof(IBindable<IReadOnlyList<Mod>>),
             typeof(LargeTextureStore),
             typeof(OsuConfigManager),
             typeof(SkinManager),
@@ -86,7 +89,7 @@ namespace osu.Game.Tests.Visual
         };
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host)
+        private void load(GameHost host, OsuGameBase gameBase)
         {
             OsuGame game = new OsuGame();
             game.SetHost(host);
@@ -103,8 +106,22 @@ namespace osu.Game.Tests.Visual
 
             AddUntilStep("wait for load", () => game.IsLoaded);
 
-            AddAssert("check OsuGame DI members", () => requiredGameDependencies.All(d => game.Dependencies.Get(d) != null));
+            AddAssert("check OsuGame DI members", () =>
-            AddAssert("check OsuGameBase DI members", () => requiredGameBaseDependencies.All(d => Dependencies.Get(d) != null));
+            {
+                foreach (var type in requiredGameDependencies)
+                    if (game.Dependencies.Get(type) == null)
+                        throw new Exception($"{type} has not been cached");
+
+                return true;
+            });
+            AddAssert("check OsuGameBase DI members", () =>
+            {
+                foreach (var type in requiredGameBaseDependencies)
+                    if (gameBase.Dependencies.Get(type) == null)
+                        throw new Exception($"{type} has not been cached");
+
+                return true;
+            });
         }
     }
 }

osu.Game/OsuGame.cs

@@ -31,11 +31,9 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Chat;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 using osu.Game.Overlays.Volume;
@@ -89,7 +87,6 @@ namespace osu.Game
         private Intro introScreen;
 
         private Bindable<int> configRuleset;
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         private Bindable<int> configSkin;
 
@@ -103,11 +100,6 @@ namespace osu.Game
 
         private readonly List<OverlayContainer> visibleBlockingOverlays = new List<OverlayContainer>();
 
-        // todo: move this to SongSelect once Screen has the ability to unsuspend.
-        [Cached]
-        [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
-        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
-
         public OsuGame(string[] args = null)
         {
             this.args = args;
@@ -176,15 +168,12 @@ namespace osu.Game
 
             dependencies.Cache(RavenLogger);
 
-            dependencies.CacheAs(ruleset);
-            dependencies.CacheAs<IBindable<RulesetInfo>>(ruleset);
-
             dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
 
             // bind config int to database RulesetInfo
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
-            ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
+            Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
-            ruleset.ValueChanged += r => configRuleset.Value = r.NewValue.ID ?? 0;
+            Ruleset.ValueChanged += r => configRuleset.Value = r.NewValue.ID ?? 0;
 
             // bind config int to database SkinInfo
             configSkin = LocalConfig.GetBindable<int>(OsuSetting.Skin);
@@ -255,9 +244,9 @@ namespace osu.Game
                 }
 
                 // Use first beatmap available for current ruleset, else switch ruleset.
-                var first = databasedSet.Beatmaps.Find(b => b.Ruleset == ruleset.Value) ?? databasedSet.Beatmaps.First();
+                var first = databasedSet.Beatmaps.Find(b => b.Ruleset == Ruleset.Value) ?? databasedSet.Beatmaps.First();
 
-                ruleset.Value = first.Ruleset;
+                Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
             }, $"load {beatmap}", bypassScreenAllowChecks: true, targetScreen: typeof(PlaySongSelect));
         }
@@ -287,9 +276,9 @@ namespace osu.Game
 
             performFromMainMenu(() =>
             {
-                ruleset.Value = databasedScoreInfo.Ruleset;
+                Ruleset.Value = databasedScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
-                mods.Value = databasedScoreInfo.Mods;
+                Mods.Value = databasedScoreInfo.Mods;
 
                 menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
             }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);

osu.Game/OsuGameBase.cs

@@ -29,6 +29,7 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK.Input;
@@ -69,7 +70,16 @@ namespace osu.Game
 
         protected override Container<Drawable> Content => content;
 
-        private Bindable<WorkingBeatmap> beatmap;
+        private Bindable<WorkingBeatmap> beatmap; // cached via load() method
+
+        [Cached]
+        [Cached(typeof(IBindable<RulesetInfo>))]
+        protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+
+        // todo: move this to SongSelect once Screen has the ability to unsuspend.
+        [Cached]
+        [Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
+        protected readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         protected Bindable<WorkingBeatmap> Beatmap => beatmap;