Merge branch 'master' into mod_application

2025-03-19 12:07:28 +08:00 · 2017-03-14 12:38:55 +09:00 · 2017-03-14 12:38:55 +09:00 · 879a78156d
commit 879a78156d
parent 6ebd88060a 98f13be7ca
33 changed files with 88 additions and 246 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a50dd75b114da963c75e6a5314099d99140035b8
+Subproject commit e52af1e5ada07468512e19c86b6dcd5a23fe3707
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 39657fc6066ea3a141ac71cabf67ec9ebf24975c
+Subproject commit 4f9ed4e703777ede98737c7e2af31efa4694c395
--- a/osu.Desktop.Deploy/App.config
+++ b/osu.Desktop.Deploy/App.config
@ -21,16 +21,4 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
  </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>
--- a/osu.Desktop.Tests/app.config
+++ b/osu.Desktop.Tests/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj
+++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
@ -100,7 +100,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@ -110,7 +110,7 @@ namespace osu.Desktop.VisualTests.Tests
                Beatmap = beatmap;
            }

-            protected override BeatmapArchiveReader GetReader() => null;
+            protected override ArchiveReader GetReader() => null;
        }
    }
 }
--- a/osu.Desktop.VisualTests/app.config
+++ b/osu.Desktop.VisualTests/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@ -23,6 +23,7 @@
    <SignAssembly>false</SignAssembly>
    <TargetZone>LocalIntranet</TargetZone>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> 
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@ -114,7 +115,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="packages.config" />
    <None Include="OpenTK.dll.config" />
  </ItemGroup>
--- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
+++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
@ -13,7 +13,7 @@ namespace osu.Desktop.Beatmaps.IO
    /// <summary>
    /// Reads an extracted legacy beatmap from disk.
    /// </summary>
-    public class LegacyFilesystemReader : BeatmapArchiveReader
+    public class LegacyFilesystemReader : ArchiveReader
    {
        public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));

--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@ -12,7 +12,6 @@ using System.Drawing;
 using System.IO;
 using System.Threading.Tasks;
 using osu.Game.Screens.Menu;
-using osu.Game.Beatmaps.IO;

 namespace osu.Desktop
 {
@ -31,9 +30,9 @@ namespace osu.Desktop
            base.LoadComplete();

            versionManager.LoadAsync(this);
-            ModeChanged += m =>
+            ScreenChanged += s =>
            {
-                if (!versionManager.IsAlive && m is Intro)
+                if (!versionManager.IsAlive && s is Intro)
                    Add(versionManager);
            };
        }
@ -58,7 +57,7 @@ namespace osu.Desktop
            var dropData = (object[])e.Data.GetData(DataFormats.FileDrop);
            var filePaths = dropData.Select(f => f.ToString()).ToArray();

-            if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OSZ_EXTENSION))
+            if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
                Task.Run(() => BeatmapDatabase.Import(filePaths));
            else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
                Task.Run(() =>
@ -68,7 +67,7 @@ namespace osu.Desktop
                });
        }

-        private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OSZ_EXTENSION, @".osr" };
+        private static readonly string[] allowed_extensions = { @".osz", @".osr" };

        private void dragEnter(DragEventArgs e)
        {
--- a/osu.Desktop/app.config
+++ b/osu.Desktop/app.config
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@ -23,6 +23,7 @@
    <SignAssembly>false</SignAssembly>
    <TargetZone>LocalIntranet</TargetZone>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> 
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@ -153,7 +154,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="osu!.res" />
    <None Include="packages.config" />
    <None Include="Properties\app.manifest" />
--- a/osu.Game.Modes.Mania/app.config
+++ b/osu.Game.Modes.Mania/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
+++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
@ -81,7 +81,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="OpenTK.dll.config" />
    <None Include="packages.config" />
  </ItemGroup>
--- a/osu.Game.Modes.Osu/app.config
+++ b/osu.Game.Modes.Osu/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
--- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
+++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
@ -100,7 +100,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="OpenTK.dll.config" />
    <None Include="packages.config" />
  </ItemGroup>
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@ -17,7 +17,6 @@ using osu.Game.Modes.Catch;
 using osu.Game.Modes.Mania;
 using osu.Game.Modes.Osu;
 using osu.Game.Modes.Taiko;
-using osu.Game.Beatmaps.IO;

 namespace osu.Game.Tests.Beatmaps.IO
 {
@ -107,7 +106,7 @@ namespace osu.Game.Tests.Beatmaps.IO

        private string prepareTempCopy(string path)
        {
-            var temp = Path.GetTempPath() + Guid.NewGuid() + BeatmapArchiveReader.OSZ_EXTENSION;
+            var temp = Path.GetTempFileName();
            return new FileInfo(path).CopyTo(temp, true).FullName;
        }

--- a/osu.Game.Tests/app.config
+++ b/osu.Game.Tests/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@ -52,7 +52,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="packages.config" />
    <None Include="OpenTK.dll.config" />
  </ItemGroup>
--- a/osu.Game/Beatmaps/IO/ArchiveReader.cs
+++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs
@ -6,22 +6,23 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
+using osu.Game.Database;

-namespace osu.Game.IO
+namespace osu.Game.Beatmaps.IO
 {
    public abstract class ArchiveReader : IDisposable, IResourceStore<byte[]>
    {
-        protected class Reader
+        private class Reader
        {
            public Func<Storage, string, bool> Test { get; set; }
            public Type Type { get; set; }
        }

-        protected static List<Reader> Readers { get; } = new List<Reader>();
+        private static List<Reader> readers { get; } = new List<Reader>();

        public static ArchiveReader GetReader(Storage storage, string path)
        {
-            foreach (var reader in Readers)
+            foreach (var reader in readers)
            {
                if (reader.Test(storage, path))
                    return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path));
@ -31,9 +32,24 @@ namespace osu.Game.IO

        protected static void AddReader<T>(Func<Storage, string, bool> test) where T : ArchiveReader
        {
-            Readers.Add(new Reader { Test = test, Type = typeof(T) });
+            readers.Add(new Reader { Test = test, Type = typeof(T) });
        }

+        /// <summary>
+        /// Reads the beatmap metadata from this archive.
+        /// </summary>
+        public abstract BeatmapMetadata ReadMetadata();
+
+        /// <summary>
+        /// Gets a list of beatmap file names.
+        /// </summary>
+        public string[] BeatmapFilenames { get; protected set; }
+
+        /// <summary>
+        /// The storyboard filename. Null if no storyboard is present.
+        /// </summary>
+        public string StoryboardFilename { get; protected set; }
+
        /// <summary>
        /// Opens a stream for reading a specific file from this archive.
        /// </summary>
--- a/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs
+++ b/osu.Game/Beatmaps/IO/BeatmapArchiveReader.cs
@ -1,44 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Beatmaps.IO
-{
-    public abstract class BeatmapArchiveReader : ArchiveReader
-    {
-        public const string OSZ_EXTENSION = @".osz";
-
-        public static BeatmapArchiveReader GetBeatmapArchiveReader(Storage storage, string path)
-        {
-            try
-            {
-                return (BeatmapArchiveReader)GetReader(storage, path);
-            }
-            catch (InvalidCastException e)
-            {
-                Logger.Error(e, "A tricky  " + $@"{nameof(ArchiveReader)}" + " instance passed the test to be a " + $@"{nameof(BeatmapArchiveReader)}" + ", but it's really not");
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Reads the beatmap metadata from this archive.
-        /// </summary>
-        public abstract BeatmapMetadata ReadMetadata();
-
-        /// <summary>
-        /// Gets a list of beatmap file names.
-        /// </summary>
-        public string[] BeatmapFilenames { get; protected set; }
-
-        /// <summary>
-        /// The storyboard filename. Null if no storyboard is present.
-        /// </summary>
-        public string StoryboardFilename { get; protected set; }
-    }
-}
--- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs
+++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs
@ -9,14 +9,14 @@ using osu.Game.Database;

 namespace osu.Game.Beatmaps.IO
 {
-    public sealed class OszArchiveReader : BeatmapArchiveReader
+    public sealed class OszArchiveReader : ArchiveReader
    {
        public static void Register()
        {
            AddReader<OszArchiveReader>((storage, path) =>
            {
                using (var stream = storage.GetStream(path))
-                    return Path.GetExtension(path) == OSZ_EXTENSION && ZipFile.IsZipFile(stream, false);
+                    return ZipFile.IsZipFile(stream, false);
            });
            OsuLegacyDecoder.Register();
        }
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@ -33,7 +33,7 @@ namespace osu.Game.Beatmaps

        public readonly bool WithStoryboard;

-        protected abstract BeatmapArchiveReader GetReader();
+        protected abstract ArchiveReader GetReader();

        protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
        {
@ -101,7 +101,7 @@ namespace osu.Game.Beatmaps
            set { lock (beatmapLock) beatmap = value; }
        }

-        private BeatmapArchiveReader trackReader;
+        private ArchiveReader trackReader;
        private Track track;
        private object trackLock = new object();
        public Track Track
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@ -177,7 +177,7 @@ namespace osu.Game.Database

            BeatmapMetadata metadata;

-            using (var reader = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path))
+            using (var reader = ArchiveReader.GetReader(storage, path))
                metadata = reader.ReadMetadata();

            if (File.Exists(path)) // Not always the case, i.e. for LegacyFilesystemReader
@ -186,7 +186,7 @@ namespace osu.Game.Database
                {
                    hash = input.GetMd5Hash();
                    input.Seek(0, SeekOrigin.Begin);
-                    path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash + BeatmapArchiveReader.OSZ_EXTENSION);
+                    path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash);
                    if (!storage.Exists(path))
                        using (var output = storage.GetStream(path, FileAccess.Write))
                            input.CopyTo(output);
@ -216,7 +216,7 @@ namespace osu.Game.Database
                Metadata = metadata
            };

-            using (var archive = BeatmapArchiveReader.GetBeatmapArchiveReader(storage, path))
+            using (var archive = ArchiveReader.GetReader(storage, path))
            {
                string[] mapNames = archive.BeatmapFilenames;
                foreach (var name in mapNames)
@ -268,12 +268,12 @@ namespace osu.Game.Database
            BeatmapSetRemoved?.Invoke(beatmapSet);
        }

-        public BeatmapArchiveReader GetReader(BeatmapSetInfo beatmapSet)
+        public ArchiveReader GetReader(BeatmapSetInfo beatmapSet)
        {
            if (string.IsNullOrEmpty(beatmapSet.Path))
                return null;

-            return BeatmapArchiveReader.GetBeatmapArchiveReader(storage, beatmapSet.Path);
+            return ArchiveReader.GetReader(storage, beatmapSet.Path);
        }

        public BeatmapSetInfo GetBeatmapSet(int id)
@ -354,7 +354,7 @@ namespace osu.Game.Database
                this.database = database;
            }

-            protected override BeatmapArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+            protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
        }
    }
 }
--- a/osu.Game/Modes/LegacyReplay.cs
+++ b/osu.Game/Modes/LegacyReplay.cs
@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Input.Handlers;
@ -95,24 +96,17 @@ namespace osu.Game.Modes

            public override List<InputState> GetPendingStates()
            {
+                var buttons = new HashSet<MouseButton>();
+                if (CurrentFrame?.MouseLeft ?? false)
+                    buttons.Add(MouseButton.Left);
+                if (CurrentFrame?.MouseRight ?? false)
+                    buttons.Add(MouseButton.Right);
+
                return new List<InputState>
                {
                    new InputState
                    {
-                        Mouse = new ReplayMouseState(
-                            ToScreenSpace(position ?? Vector2.Zero),
-                            new List<MouseState.ButtonState>
-                            {
-                                new MouseState.ButtonState(MouseButton.Left)
-                                {
-                                    State = CurrentFrame?.MouseLeft ?? false
-                                },
-                                new MouseState.ButtonState(MouseButton.Right)
-                                {
-                                    State = CurrentFrame?.MouseRight ?? false
-                                },
-                            }
-                        ),
+                        Mouse = new ReplayMouseState(ToScreenSpace(position ?? Vector2.Zero), buttons),
                        Keyboard = new ReplayKeyboardState(new List<Key>())
                    }
                };
@ -171,10 +165,10 @@ namespace osu.Game.Modes

            private class ReplayMouseState : MouseState
            {
-                public ReplayMouseState(Vector2 position, List<ButtonState> list)
+                public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
                {
                    Position = position;
-                    ButtonStates = list;
+                    list.ForEach(b => PressedButtons.Add(b));
                }
            }

--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@ -258,13 +258,13 @@ namespace osu.Game
            return false;
        }

-        public event Action<Screen> ModeChanged;
+        public event Action<Screen> ScreenChanged;

        private Container mainContent;

        private Container overlayContent;

-        private void modeChanged(Screen newScreen)
+        private void screenChanged(Screen newScreen)
        {
            //central game mode change logic.
            if ((newScreen as OsuScreen)?.ShowOverlays != true)
@ -281,7 +281,7 @@ namespace osu.Game
            if (newScreen is MainMenu)
                Cursor.FadeIn(100);

-            ModeChanged?.Invoke(newScreen);
+            ScreenChanged?.Invoke(newScreen);

            if (newScreen == null)
                Exit();
@ -315,12 +315,12 @@ namespace osu.Game
            newScreen.ModePushed += screenAdded;
            newScreen.Exited += screenRemoved;

-            modeChanged(newScreen);
+            screenChanged(newScreen);
        }

        private void screenRemoved(Screen newScreen)
        {
-            modeChanged(newScreen);
+            screenChanged(newScreen);
        }
    }
 }
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@ -210,7 +210,7 @@ namespace osu.Game.Overlays
                    }
                }
            };
-        
+
            this.beatmaps = beatmaps;
            trackManager = osuGame.Audio.Track;
            preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
@ -247,6 +247,8 @@ namespace osu.Game.Overlays

                if (current.Track.HasCompleted && !current.Track.Looping) next();
            }
+            else
+                playButton.Icon = FontAwesome.fa_play_circle_o;
        }

        private void preferUnicode_changed(object sender, EventArgs e)
@ -337,12 +339,16 @@ namespace osu.Game.Overlays
                Task.Run(() =>
                {
                    if (beatmap?.Beatmap == null)
-                        //todo: we may need to display some default text here (currently in the constructor).
-                        return;
-
-                    BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata;
-                    title.Text = unicodeString(metadata.Title, metadata.TitleUnicode);
-                    artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode);
+                    {
+                        title.Text = @"Nothing to play";
+                        artist.Text = @"Nothing to play";
+                    }
+                    else
+                    {
+                        BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata;
+                        title.Text = unicodeString(metadata.Title, metadata.TitleUnicode);
+                        artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode);
+                    }
                });

                MusicControllerBackground newBackground;
--- a/osu.Game/Screens/Play/PlayerInputManager.cs
+++ b/osu.Game/Screens/Play/PlayerInputManager.cs
@ -70,14 +70,14 @@ namespace osu.Game.Screens.Play
            {
                if (mouseDisabled.Value)
                {
-                    mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = false;
-                    mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = false;
+                    mouse.PressedButtons.Remove(MouseButton.Left);
+                    mouse.PressedButtons.Remove(MouseButton.Right);
                }

                if (leftViaKeyboard)
-                    mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = true;
+                    mouse.PressedButtons.Add(MouseButton.Left);
                if (rightViaKeyboard)
-                    mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = true;
+                    mouse.PressedButtons.Add(MouseButton.Right);
            }
        }

--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@ -16,7 +16,6 @@ using osu.Game.Database;
 using osu.Framework.Graphics.Colour;
 using osu.Game.Beatmaps.Drawables;
 using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@ -56,8 +55,15 @@ namespace osu.Game.Screens.Select
        public void UpdateBeatmap(WorkingBeatmap beatmap)
        {
            if (beatmap?.BeatmapInfo == null)
+            {
+                FadeOut(250);
+                beatmapInfoContainer?.FadeOut(250);
+                beatmapInfoContainer?.Expire();
+                beatmapInfoContainer = null;
                return;
+            }

+            FadeIn(250);
            var lastContainer = beatmapInfoContainer;

            float newDepth = lastContainer?.Depth + 1 ?? 0;
@ -84,7 +90,7 @@ namespace osu.Game.Screens.Select
                }));

                //get statistics fromt he current ruleset.
-                Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).ForEach(s => labels.Add(new InfoLabel(s)));
+                labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s)));
            }

            (beatmapInfoContainer = new BufferedContainer
@ -191,7 +197,7 @@ namespace osu.Game.Screens.Select

        private string getBPMRange(Beatmap beatmap)
        {
-            double bpmMax = beatmap.BPMMaximum; 
+            double bpmMax = beatmap.BPMMaximum;
            double bpmMin = beatmap.BPMMinimum;

            if (Precision.AlmostEquals(bpmMin, bpmMax)) return Math.Round(bpmMin) + "bpm";
--- a/osu.Game/Screens/Select/CarouselContainer.cs
+++ b/osu.Game/Screens/Select/CarouselContainer.cs
@ -57,6 +57,7 @@ namespace osu.Game.Screens.Select
        public void RemoveGroup(BeatmapGroup group)
        {
            groups.Remove(group);
+            panels.Remove(group.Header);
            foreach (var p in group.BeatmapPanels)
                panels.Remove(p);

--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@ -326,8 +326,7 @@ namespace osu.Game.Screens.Select
                backgroundModeBeatmap.FadeTo(1, 250);
            }

-            if (beatmap != null)
-                beatmapInfoWedge.UpdateBeatmap(beatmap);
+            beatmapInfoWedge.UpdateBeatmap(beatmap);
        }

        /// <summary>
@ -337,11 +336,11 @@ namespace osu.Game.Screens.Select
        {
            base.OnBeatmapChanged(beatmap);

-            beatmap.Mods.BindTo(modSelect.SelectedMods);
+            beatmap?.Mods.BindTo(modSelect.SelectedMods);

            //todo: change background in selectionChanged instead; support per-difficulty backgrounds.
            changeBackground(beatmap);
-            carousel.SelectBeatmap(beatmap.BeatmapInfo);
+            carousel.SelectBeatmap(beatmap?.BeatmapInfo);
        }

        /// <summary>
--- a/osu.Game/app.config
+++ b/osu.Game/app.config
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -240,7 +240,7 @@
    <Compile Include="Users\User.cs" />
    <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
    <Compile Include="Database\BeatmapDatabase.cs" />
-    <Compile Include="Beatmaps\IO\BeatmapArchiveReader.cs" />
+    <Compile Include="Beatmaps\IO\ArchiveReader.cs" />
    <Compile Include="Beatmaps\Formats\BeatmapDecoder.cs" />
    <Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
    <Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
@ -328,7 +328,6 @@
    <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
    <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
    <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
-    <Compile Include="IO\ArchiveReader.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
@ -344,7 +343,6 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup />