diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index dfb9bd3a99..918f231a19 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -160,47 +160,6 @@ namespace osu.Game
Name = @"osu!lazer";
}
- public override void SetHost(GameHost host)
- {
- base.SetHost(host);
-
- // may be non-null for certain tests
- Storage ??= host.Storage;
-
- LocalConfig ??= UseDevelopmentServer
- ? new DevelopmentOsuConfigManager(Storage)
- : new OsuConfigManager(Storage);
- }
-
- ///
- /// Use to programatically exit the game as if the user was triggering via alt-f4.
- /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
- ///
- public void GracefullyExit()
- {
- if (!OnExiting())
- Exit();
- else
- Scheduler.AddDelayed(GracefullyExit, 2000);
- }
-
- public void Migrate(string path)
- {
- contextFactory.FlushConnections();
- (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
- }
-
- protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
-
- protected virtual BatteryInfo CreateBatteryInfo() => null;
-
- protected virtual Container CreateScalingContainer() => new DrawSizePreservingFillContainer();
-
- protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
- dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
- protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
-
[BackgroundDependencyLoader]
private void load()
{
@@ -390,6 +349,47 @@ namespace osu.Game
FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
}
+ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
+ dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+ public override void SetHost(GameHost host)
+ {
+ base.SetHost(host);
+
+ // may be non-null for certain tests
+ Storage ??= host.Storage;
+
+ LocalConfig ??= UseDevelopmentServer
+ ? new DevelopmentOsuConfigManager(Storage)
+ : new OsuConfigManager(Storage);
+ }
+
+ ///
+ /// Use to programatically exit the game as if the user was triggering via alt-f4.
+ /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+ ///
+ public void GracefullyExit()
+ {
+ if (!OnExiting())
+ Exit();
+ else
+ Scheduler.AddDelayed(GracefullyExit, 2000);
+ }
+
+ public void Migrate(string path)
+ {
+ contextFactory.FlushConnections();
+ (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
+ }
+
+ protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
+
+ protected virtual BatteryInfo CreateBatteryInfo() => null;
+
+ protected virtual Container CreateScalingContainer() => new DrawSizePreservingFillContainer();
+
+ protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
+
private void onRulesetChanged(ValueChangedEvent r)
{
var dict = new Dictionary>();