From 4edd9b0cb3e7a82aceed9a9d795f9d6180b2b51e Mon Sep 17 00:00:00 2001 From: John Leuenhagen Date: Thu, 13 Oct 2016 16:39:56 -0400 Subject: [PATCH] Converted all files to use CRLF line endings. --- README.md | 56 +- osu-framework | 1 - osu-resources | 1 - osu.Desktop.VisualTests/Program.cs | 2 +- .../Tests/TestCaseChatDisplay.cs | 2 +- .../Tests/TestCaseGamefield.cs | 2 +- .../Tests/TestCaseKeyCounter.cs | 2 +- .../Tests/TestCaseMenuButtonSystem.cs | 2 +- .../Tests/TestCaseTextAwesome.cs | 2 +- osu.Desktop.VisualTests/VisualTestGame.cs | 2 +- .../osu.Desktop.VisualTests.csproj | 2 +- .../Beatmaps/IO/LegacyFilesystemReader.cs | 67 +- osu.Desktop/Program.cs | 2 +- osu.Desktop/osu.Desktop.csproj | 2 +- .../Beatmaps/Formats/OsuLegacyDecoderTest.cs | 246 ++--- .../Beatmaps/IO/OszArchiveReaderTest.cs | 145 +-- osu.Game.Tests/Resources/Resource.cs | 26 +- osu.Game.Tests/packages.config | 8 +- osu.Game/Beatmaps/BaseDifficulty.cs | 32 +- osu.Game/Beatmaps/BeatmapMetadata.cs | 2 +- osu.Game/Beatmaps/BeatmapSet.cs | 2 +- osu.Game/Beatmaps/Events/EventType.cs | 26 +- osu.Game/Beatmaps/Formats/BeatmapDecoder.cs | 45 +- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 2 +- osu.Game/Beatmaps/IO/ArchiveReader.cs | 82 +- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 73 +- .../Beatmaps/Objects/Catch/CatchBaseHit.cs | 2 +- .../Beatmaps/Objects/Catch/CatchConverter.cs | 2 +- .../Objects/Catch/Drawable/DrawableFruit.cs | 2 +- osu.Game/Beatmaps/Objects/Catch/Droplet.cs | 2 +- osu.Game/Beatmaps/Objects/Catch/Fruit.cs | 2 +- osu.Game/Beatmaps/Objects/HitObject.cs | 2 +- .../Beatmaps/Objects/HitObjectConverter.cs | 2 +- .../Objects/Mania/Drawable/DrawableNote.cs | 2 +- osu.Game/Beatmaps/Objects/Mania/HoldNote.cs | 2 +- .../Beatmaps/Objects/Mania/ManiaBaseHit.cs | 2 +- .../Beatmaps/Objects/Mania/ManiaConverter.cs | 2 +- osu.Game/Beatmaps/Objects/Mania/Note.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/Circle.cs | 2 +- .../Objects/Osu/Drawable/DrawableCircle.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/Slider.cs | 2 +- osu.Game/Beatmaps/Objects/Osu/Spinner.cs | 2 +- .../Taiko/Drawable/DrawableTaikoHit.cs | 2 +- .../Beatmaps/Objects/Taiko/TaikoBaseHit.cs | 2 +- .../Beatmaps/Objects/Taiko/TaikoConverter.cs | 2 +- osu.Game/Beatmaps/Samples/HitSampleInfo.cs | 2 +- osu.Game/Beatmaps/Samples/SampleInfo.cs | 2 +- osu.Game/Beatmaps/Timing/ControlPoint.cs | 2 +- osu.Game/Beatmaps/Timing/SampleChange.cs | 2 +- osu.Game/Beatmaps/Timing/TimingChange.cs | 2 +- osu.Game/Configuration/OsuConfigManager.cs | 2 +- osu.Game/Database/BeatmapDatabase.cs | 77 +- osu.Game/GameModes/BackgroundMode.cs | 2 +- .../Backgrounds/BackgroundModeCustom.cs | 2 +- .../Backgrounds/BackgroundModeDefault.cs | 2 +- .../Backgrounds/BackgroundModeEmpty.cs | 2 +- osu.Game/GameModes/Charts/ChartInfo.cs | 2 +- osu.Game/GameModes/Charts/ChartListing.cs | 2 +- osu.Game/GameModes/Direct/OnlineListing.cs | 2 +- osu.Game/GameModes/Edit/EditSongSelect.cs | 2 +- osu.Game/GameModes/Edit/Editor.cs | 2 +- osu.Game/GameModes/GameModeWhiteBox.cs | 2 +- osu.Game/GameModes/Menu/Button.cs | 2 +- osu.Game/GameModes/Menu/ButtonSystem.cs | 2 +- .../GameModes/Menu/FlowContainerWithOrigin.cs | 2 +- osu.Game/GameModes/Menu/Intro.cs | 2 +- osu.Game/GameModes/Menu/MenuVisualisation.cs | 2 +- osu.Game/GameModes/Menu/OsuLogo.cs | 2 +- osu.Game/GameModes/Multiplayer/Lobby.cs | 2 +- osu.Game/GameModes/Multiplayer/Match.cs | 2 +- osu.Game/GameModes/Multiplayer/MatchCreate.cs | 2 +- .../GameModes/Multiplayer/MatchSongSelect.cs | 2 +- osu.Game/GameModes/OsuGameMode.cs | 2 +- .../GameModes/Play/Catch/CatchHitRenderer.cs | 2 +- .../GameModes/Play/Catch/CatchPlayfield.cs | 2 +- osu.Game/GameModes/Play/HitRenderer.cs | 2 +- .../GameModes/Play/Mania/ManiaHitRenderer.cs | 2 +- .../GameModes/Play/Mania/ManiaPlayfield.cs | 2 +- osu.Game/GameModes/Play/ModSelect.cs | 2 +- osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs | 2 +- osu.Game/GameModes/Play/Osu/OsuPlayfield.cs | 2 +- osu.Game/GameModes/Play/PlayMode.cs | 2 +- osu.Game/GameModes/Play/PlaySongSelect.cs | 2 +- osu.Game/GameModes/Play/Player.cs | 2 +- osu.Game/GameModes/Play/Playfield.cs | 2 +- osu.Game/GameModes/Play/Results.cs | 2 +- .../GameModes/Play/Taiko/TaikoHitRenderer.cs | 2 +- .../GameModes/Play/Taiko/TaikoPlayfield.cs | 2 +- osu.Game/Graphics/Background/Background.cs | 2 +- osu.Game/Graphics/Components/FpsDisplay.cs | 2 +- .../Graphics/Containers/ParallaxContainer.cs | 2 +- .../Graphics/Cursor/OsuCursorContainer.cs | 2 +- osu.Game/Graphics/Processing/RatioAdjust.cs | 2 +- osu.Game/Graphics/UserInterface/KeyCounter.cs | 2 +- .../UserInterface/KeyCounterCollection.cs | 2 +- .../UserInterface/KeyCounterKeyboard.cs | 2 +- .../Graphics/UserInterface/KeyCounterMouse.cs | 2 +- osu.Game/Input/GlobalHotkeys.cs | 2 +- osu.Game/Online/API/APIAccess.cs | 2 +- osu.Game/Online/API/APIRequest.cs | 2 +- osu.Game/Online/API/OAuth.cs | 2 +- osu.Game/Online/API/OAuthToken.cs | 2 +- .../Online/API/Requests/GetMessagesRequest.cs | 2 +- osu.Game/Online/API/Requests/ListChannels.cs | 2 +- osu.Game/Online/API/SecurePassword.cs | 2 +- .../Online/Chat/Display/ChannelDisplay.cs | 2 +- osu.Game/Online/Chat/Display/ChatLine.cs | 2 +- osu.Game/Online/User.cs | 2 +- osu.Game/OsuGame.cs | 2 +- osu.Game/OsuGameBase.cs | 2 +- osu.Game/Overlays/ChatConsole.cs | 2 +- osu.Game/Overlays/Options.cs | 2 +- osu.Game/Overlays/Toolbar.cs | 2 +- osu.Game/Overlays/ToolbarButton.cs | 2 +- osu.Game/Overlays/ToolbarModeButton.cs | 2 +- osu.Game/Overlays/ToolbarModeSelector.cs | 2 +- osu.Game/Properties/AssemblyInfo.cs | 2 +- osu.Game/Users/User.cs | 2 +- osu.Game/VolumeControl.cs | 2 +- osu.Game/osu.Game.csproj | 2 +- osu.Game/packages.config | 34 +- osu.licenseheader | 2 +- osu.sln | 2 +- osu.sln.DotSettings | 860 +++++++++--------- 126 files changed, 1002 insertions(+), 997 deletions(-) delete mode 160000 osu-framework delete mode 160000 osu-resources diff --git a/README.md b/README.md index 6b719f3140..adc4f9f657 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,28 @@ -# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu) - - - -[osu! on the web](https://osu.ppy.sh) | [dev chat](https://discord.gg/ppy) - -Rhythm is just a *click* away. The future of osu! and the beginning of an open era! - -# Requirements - -- A desktop platform which can compile .NET 4.5. -- Visual Studio or MonoDevelop is recommended. - -# Contributing - -We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention on having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time, to ensure no effort is wasted. - -Contributions can be made via pull requests to this repository. We hope to credit and reward larger contributions via a [bounty system](https://goo.gl/nFdoyI). If you're unsure of what you can help with, check out the [list](https://github.com/ppy/osu/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Abounty) of available issues with bounty. - -Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. I welcome all feedback so we can make contributing to this project as pain-free as possible. - -# Licence - -The osu! client code and framework are licensed under the [MIT licence](https://opensource.org/licenses/MIT). Please see [the licence file](LICENCE) for more information. [tl;dr](https://tldrlegal.com/license/mit-license) you can do whatever you want as long as you include the original copyright and license notice in any copy of the software/source. - -Please note that this *does not cover* the usage of the "osu!" or "ppy" branding in any software, resources, advertising or promotion, as this is protected by trademark law. - -Please also note that game resources are covered by a separate licence. Please see the [ppy/osu-resources](https://github.com/ppy/osu-resources) repository for clarifications. +# osu! [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu) + + + +[osu! on the web](https://osu.ppy.sh) | [dev chat](https://discord.gg/ppy) + +Rhythm is just a *click* away. The future of osu! and the beginning of an open era! + +# Requirements + +- A desktop platform which can compile .NET 4.5. +- Visual Studio or MonoDevelop is recommended. + +# Contributing + +We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention on having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time, to ensure no effort is wasted. + +Contributions can be made via pull requests to this repository. We hope to credit and reward larger contributions via a [bounty system](https://goo.gl/nFdoyI). If you're unsure of what you can help with, check out the [list](https://github.com/ppy/osu/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Abounty) of available issues with bounty. + +Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. I welcome all feedback so we can make contributing to this project as pain-free as possible. + +# Licence + +The osu! client code and framework are licensed under the [MIT licence](https://opensource.org/licenses/MIT). Please see [the licence file](LICENCE) for more information. [tl;dr](https://tldrlegal.com/license/mit-license) you can do whatever you want as long as you include the original copyright and license notice in any copy of the software/source. + +Please note that this *does not cover* the usage of the "osu!" or "ppy" branding in any software, resources, advertising or promotion, as this is protected by trademark law. + +Please also note that game resources are covered by a separate licence. Please see the [ppy/osu-resources](https://github.com/ppy/osu-resources) repository for clarifications. diff --git a/osu-framework b/osu-framework deleted file mode 160000 index 30ff0e1a99..0000000000 --- a/osu-framework +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30ff0e1a99a10e735611bb3ffa35352061f52d8a diff --git a/osu-resources b/osu-resources deleted file mode 160000 index 0505cf0d3b..0000000000 --- a/osu-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0505cf0d3b317667dbc95346f57b67fdbcdb4dee diff --git a/osu.Desktop.VisualTests/Program.cs b/osu.Desktop.VisualTests/Program.cs index 4dcfaff987..c2bba5a39b 100644 --- a/osu.Desktop.VisualTests/Program.cs +++ b/osu.Desktop.VisualTests/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2016 ppy Pty Ltd . +// Copyright (c) 2007-2016 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE using System; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs index 32135a06f2..eb027e1faf 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index 316a099e38..48ef1b9b04 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs index 7be7d24860..badd6e7389 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs index ef8e5e5b12..52b048d90c 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs index d7aba30c3e..2a43cf23d7 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs index bc4c59c4e3..b5c9ad7561 100644 --- a/osu.Desktop.VisualTests/VisualTestGame.cs +++ b/osu.Desktop.VisualTests/VisualTestGame.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2016 ppy Pty Ltd . +// Copyright (c) 2007-2016 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index c54140b267..615a73f031 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -1,4 +1,4 @@ - + {69051C69-12AE-4E7D-A3E6-460D2E282312} diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index a6367ebfab..5ec9f9eb86 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -1,38 +1,38 @@ -using System; -using System.IO; +using System; +using System.IO; using System.Collections.Generic; using System.Linq; using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.IO; using osu.Game.Beatmaps; -namespace osu.Desktop.Beatmaps.IO -{ - /// - /// Reads an extracted legacy beatmap from disk. - /// - public class LegacyFilesystemReader : ArchiveReader - { - static LegacyFilesystemReader() - { - AddReader((storage, path) => Directory.Exists(path)); - } - - private string basePath { get; set; } - private string[] beatmaps { get; set; } - private Beatmap firstMap { get; set; } - - public LegacyFilesystemReader(string path) - { - basePath = path; - beatmaps = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray(); - if (beatmaps.Length == 0) - throw new FileNotFoundException(@"This directory contains no beatmaps"); - using (var stream = new StreamReader(ReadFile(beatmaps[0]))) - { - var decoder = BeatmapDecoder.GetDecoder(stream); - firstMap = decoder.Decode(stream); - } +namespace osu.Desktop.Beatmaps.IO +{ + /// + /// Reads an extracted legacy beatmap from disk. + /// + public class LegacyFilesystemReader : ArchiveReader + { + static LegacyFilesystemReader() + { + AddReader((storage, path) => Directory.Exists(path)); + } + + private string basePath { get; set; } + private string[] beatmaps { get; set; } + private Beatmap firstMap { get; set; } + + public LegacyFilesystemReader(string path) + { + basePath = path; + beatmaps = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray(); + if (beatmaps.Length == 0) + throw new FileNotFoundException(@"This directory contains no beatmaps"); + using (var stream = new StreamReader(ReadFile(beatmaps[0]))) + { + var decoder = BeatmapDecoder.GetDecoder(stream); + firstMap = decoder.Decode(stream); + } } public override string[] ReadBeatmaps() @@ -48,10 +48,11 @@ namespace osu.Desktop.Beatmaps.IO public override BeatmapMetadata ReadMetadata() { return firstMap.Metadata; - } - + } + public override void Dispose() - { + { // no-op - } } + } + } } \ No newline at end of file diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index a1a29b918f..041d7c559c 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 86ca44e381..fd4a32dd0c 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -1,4 +1,4 @@ - + {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D} diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index 7eddb2a7dc..3b8ea1cd26 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs @@ -1,6 +1,6 @@ -using System; +using System; using System.IO; -using NUnit.Framework; +using NUnit.Framework; using OpenTK; using OpenTK.Graphics; using osu.Game.Beatmaps.Formats; @@ -9,135 +9,137 @@ using osu.Game.Beatmaps.Samples; using osu.Game.GameModes.Play; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Beatmaps.Formats -{ - [TestFixture] - public class OsuLegacyDecoderTest - { - [TestFixtureSetUp] - public void SetUp() - { - OsuLegacyDecoder.Register(); - } - [Test] - public void TestDecodeMetadata() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); - var meta = beatmap.Metadata; - Assert.AreEqual(241526, meta.BeatmapSetID); - Assert.AreEqual("Soleily", meta.Artist); - Assert.AreEqual("Soleily", meta.ArtistUnicode); - Assert.AreEqual("03. Renatus - Soleily 192kbps.mp3", meta.AudioFile); - Assert.AreEqual("Gamu", meta.Author); - Assert.AreEqual("machinetop_background.jpg", meta.BackgroundFile); - Assert.AreEqual(164471, meta.PreviewTime); - Assert.AreEqual(string.Empty, meta.Source); - Assert.AreEqual("MBC7 Unisphere 地球ヤバイEP Chikyu Yabai", meta.Tags); - Assert.AreEqual("Renatus", meta.Title); - Assert.AreEqual("Renatus", meta.TitleUnicode); - } +namespace osu.Game.Tests.Beatmaps.Formats +{ + [TestFixture] + public class OsuLegacyDecoderTest + { + [TestFixtureSetUp] + public void SetUp() + { + OsuLegacyDecoder.Register(); } - [Test] - public void TestDecodeGeneral() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); - Assert.AreEqual(0, beatmap.AudioLeadIn); - Assert.AreEqual(false, beatmap.Countdown); - Assert.AreEqual(SampleSet.Soft, beatmap.SampleSet); - Assert.AreEqual(0.7f, beatmap.StackLeniency); - Assert.AreEqual(false, beatmap.SpecialStyle); - Assert.AreEqual(PlayMode.Osu, beatmap.Mode); - Assert.AreEqual(false, beatmap.LetterboxInBreaks); - Assert.AreEqual(false, beatmap.WidescreenStoryboard); - } + [Test] + public void TestDecodeMetadata() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); + var meta = beatmap.Metadata; + Assert.AreEqual(241526, meta.BeatmapSetID); + Assert.AreEqual("Soleily", meta.Artist); + Assert.AreEqual("Soleily", meta.ArtistUnicode); + Assert.AreEqual("03. Renatus - Soleily 192kbps.mp3", meta.AudioFile); + Assert.AreEqual("Gamu", meta.Author); + Assert.AreEqual("machinetop_background.jpg", meta.BackgroundFile); + Assert.AreEqual(164471, meta.PreviewTime); + Assert.AreEqual(string.Empty, meta.Source); + Assert.AreEqual("MBC7 Unisphere 地球ヤバイEP Chikyu Yabai", meta.Tags); + Assert.AreEqual("Renatus", meta.Title); + Assert.AreEqual("Renatus", meta.TitleUnicode); + } } - [Test] - public void TestDecodeEditor() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); - int[] expectedBookmarks = - { - 11505, 22054, 32604, 43153, 53703, 64252, 74802, 85351, - 95901, 106450, 116999, 119637, 130186, 140735, 151285, - 161834, 164471, 175020, 185570, 196119, 206669, 209306 - }; - Assert.AreEqual(expectedBookmarks.Length, beatmap.Bookmarks.Length); - for (int i = 0; i < expectedBookmarks.Length; i++) - Assert.AreEqual(expectedBookmarks[i], beatmap.Bookmarks[i]); - Assert.AreEqual(1.8, beatmap.DistanceSpacing); - Assert.AreEqual(4, beatmap.BeatDivisor); - Assert.AreEqual(4, beatmap.GridSize); - Assert.AreEqual(2, beatmap.TimelineZoom); - } + [Test] + public void TestDecodeGeneral() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); + Assert.AreEqual(0, beatmap.AudioLeadIn); + Assert.AreEqual(false, beatmap.Countdown); + Assert.AreEqual(SampleSet.Soft, beatmap.SampleSet); + Assert.AreEqual(0.7f, beatmap.StackLeniency); + Assert.AreEqual(false, beatmap.SpecialStyle); + Assert.AreEqual(PlayMode.Osu, beatmap.Mode); + Assert.AreEqual(false, beatmap.LetterboxInBreaks); + Assert.AreEqual(false, beatmap.WidescreenStoryboard); + } } - [Test] - public void TestDecodeDifficulty() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); - var difficulty = beatmap.BaseDifficulty; - Assert.AreEqual(6.5f, difficulty.DrainRate); - Assert.AreEqual(4, difficulty.CircleSize); - Assert.AreEqual(8, difficulty.OverallDifficulty); - Assert.AreEqual(9, difficulty.ApproachRate); - Assert.AreEqual(1.8f, difficulty.SliderMultiplier); - Assert.AreEqual(2, difficulty.SliderTickRate); - } + [Test] + public void TestDecodeEditor() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); + int[] expectedBookmarks = + { + 11505, 22054, 32604, 43153, 53703, 64252, 74802, 85351, + 95901, 106450, 116999, 119637, 130186, 140735, 151285, + 161834, 164471, 175020, 185570, 196119, 206669, 209306 + }; + Assert.AreEqual(expectedBookmarks.Length, beatmap.Bookmarks.Length); + for (int i = 0; i < expectedBookmarks.Length; i++) + Assert.AreEqual(expectedBookmarks[i], beatmap.Bookmarks[i]); + Assert.AreEqual(1.8, beatmap.DistanceSpacing); + Assert.AreEqual(4, beatmap.BeatDivisor); + Assert.AreEqual(4, beatmap.GridSize); + Assert.AreEqual(2, beatmap.TimelineZoom); + } } - [Test] - public void TestDecodeColors() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); + [Test] + public void TestDecodeDifficulty() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); + var difficulty = beatmap.BaseDifficulty; + Assert.AreEqual(6.5f, difficulty.DrainRate); + Assert.AreEqual(4, difficulty.CircleSize); + Assert.AreEqual(8, difficulty.OverallDifficulty); + Assert.AreEqual(9, difficulty.ApproachRate); + Assert.AreEqual(1.8f, difficulty.SliderMultiplier); + Assert.AreEqual(2, difficulty.SliderTickRate); + } + } + + [Test] + public void TestDecodeColors() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); Color4[] expected = - { - new Color4(142, 199, 255, 255), - new Color4(255, 128, 128, 255), - new Color4(128, 255, 255, 255), - new Color4(128, 255, 128, 255), - new Color4(255, 187, 255, 255), - new Color4(255, 177, 140, 255), - }; - Assert.AreEqual(expected.Length, beatmap.ComboColors.Count); - for (int i = 0; i < expected.Length; i++) - Assert.AreEqual(expected[i], beatmap.ComboColors[i]); - } + { + new Color4(142, 199, 255, 255), + new Color4(255, 128, 128, 255), + new Color4(128, 255, 255, 255), + new Color4(128, 255, 128, 255), + new Color4(255, 187, 255, 255), + new Color4(255, 177, 140, 255), + }; + Assert.AreEqual(expected.Length, beatmap.ComboColors.Count); + for (int i = 0; i < expected.Length; i++) + Assert.AreEqual(expected[i], beatmap.ComboColors[i]); + } } - - [Test] public void TestDecodeHitObjects() - { - var decoder = new OsuLegacyDecoder(); - using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) - { - var beatmap = decoder.Decode(new StreamReader(stream)); - var slider = beatmap.HitObjects[0] as Slider; - Assert.IsNotNull(slider); - Assert.AreEqual(new Vector2(192, 168), slider.Position); - Assert.AreEqual(956, slider.StartTime); - Assert.AreEqual(SampleType.None, slider.Sample.Type); - var circle = beatmap.HitObjects[1] as Circle; - Assert.IsNotNull(circle); - Assert.AreEqual(new Vector2(304, 56), circle.Position); - Assert.AreEqual(1285, circle.StartTime); + + [Test] + public void TestDecodeHitObjects() + { + var decoder = new OsuLegacyDecoder(); + using (var stream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu")) + { + var beatmap = decoder.Decode(new StreamReader(stream)); + var slider = beatmap.HitObjects[0] as Slider; + Assert.IsNotNull(slider); + Assert.AreEqual(new Vector2(192, 168), slider.Position); + Assert.AreEqual(956, slider.StartTime); + Assert.AreEqual(SampleType.None, slider.Sample.Type); + var circle = beatmap.HitObjects[1] as Circle; + Assert.IsNotNull(circle); + Assert.AreEqual(new Vector2(304, 56), circle.Position); + Assert.AreEqual(1285, circle.StartTime); Assert.AreEqual(SampleType.Clap, circle.Sample.Type); - } - } - } + } + } + } } \ No newline at end of file diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index e224bf3db4..602709d478 100644 --- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs @@ -1,81 +1,82 @@ -using System; +using System; using System.IO; using NUnit.Framework; using osu.Game.Beatmaps.IO; using osu.Game.GameModes.Play; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Beatmaps.IO -{ - [TestFixture] - public class OszArchiveReaderTest - { - [TestFixtureSetUp] - public void SetUp() - { - OszArchiveReader.Register(); - } - - [Test] - public void TestReadBeatmaps() - { - using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) - { - var reader = new OszArchiveReader(osz); - string[] expected = - { - "Soleily - Renatus (Deif) [Platter].osu", - "Soleily - Renatus (Deif) [Rain].osu", - "Soleily - Renatus (Deif) [Salad].osu", - "Soleily - Renatus (ExPew) [Another].osu", - "Soleily - Renatus (ExPew) [Hyper].osu", - "Soleily - Renatus (ExPew) [Normal].osu", - "Soleily - Renatus (Gamu) [Hard].osu", - "Soleily - Renatus (Gamu) [Insane].osu", - "Soleily - Renatus (Gamu) [Normal].osu", - "Soleily - Renatus (MMzz) [Futsuu].osu", - "Soleily - Renatus (MMzz) [Muzukashii].osu", - "Soleily - Renatus (MMzz) [Oni].osu" - }; - var maps = reader.ReadBeatmaps(); - foreach (var map in expected) - Assert.Contains(map, maps); - } +namespace osu.Game.Tests.Beatmaps.IO +{ + [TestFixture] + public class OszArchiveReaderTest + { + [TestFixtureSetUp] + public void SetUp() + { + OszArchiveReader.Register(); + } + + [Test] + public void TestReadBeatmaps() + { + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) + { + var reader = new OszArchiveReader(osz); + string[] expected = + { + "Soleily - Renatus (Deif) [Platter].osu", + "Soleily - Renatus (Deif) [Rain].osu", + "Soleily - Renatus (Deif) [Salad].osu", + "Soleily - Renatus (ExPew) [Another].osu", + "Soleily - Renatus (ExPew) [Hyper].osu", + "Soleily - Renatus (ExPew) [Normal].osu", + "Soleily - Renatus (Gamu) [Hard].osu", + "Soleily - Renatus (Gamu) [Insane].osu", + "Soleily - Renatus (Gamu) [Normal].osu", + "Soleily - Renatus (MMzz) [Futsuu].osu", + "Soleily - Renatus (MMzz) [Muzukashii].osu", + "Soleily - Renatus (MMzz) [Oni].osu" + }; + var maps = reader.ReadBeatmaps(); + foreach (var map in expected) + Assert.Contains(map, maps); + } } - [Test] - public void TestReadMetadata() - { - using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) - { - var reader = new OszArchiveReader(osz); - var meta = reader.ReadMetadata(); - Assert.AreEqual(241526, meta.BeatmapSetID); - Assert.AreEqual("Soleily", meta.Artist); - Assert.AreEqual("Soleily", meta.ArtistUnicode); - Assert.AreEqual("03. Renatus - Soleily 192kbps.mp3", meta.AudioFile); - Assert.AreEqual("Deif", meta.Author); - Assert.AreEqual("machinetop_background.jpg", meta.BackgroundFile); - Assert.AreEqual(164471, meta.PreviewTime); - Assert.AreEqual(string.Empty, meta.Source); - Assert.AreEqual("MBC7 Unisphere 地球ヤバイEP Chikyu Yabai", meta.Tags); - Assert.AreEqual("Renatus", meta.Title); - Assert.AreEqual("Renatus", meta.TitleUnicode); - } + [Test] + public void TestReadMetadata() + { + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) + { + var reader = new OszArchiveReader(osz); + var meta = reader.ReadMetadata(); + Assert.AreEqual(241526, meta.BeatmapSetID); + Assert.AreEqual("Soleily", meta.Artist); + Assert.AreEqual("Soleily", meta.ArtistUnicode); + Assert.AreEqual("03. Renatus - Soleily 192kbps.mp3", meta.AudioFile); + Assert.AreEqual("Deif", meta.Author); + Assert.AreEqual("machinetop_background.jpg", meta.BackgroundFile); + Assert.AreEqual(164471, meta.PreviewTime); + Assert.AreEqual(string.Empty, meta.Source); + Assert.AreEqual("MBC7 Unisphere 地球ヤバイEP Chikyu Yabai", meta.Tags); + Assert.AreEqual("Renatus", meta.Title); + Assert.AreEqual("Renatus", meta.TitleUnicode); + } } - [Test] - public void TestReadFile() - { - using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) - { - var reader = new OszArchiveReader(osz); - using (var stream = new StreamReader( - reader.ReadFile("Soleily - Renatus (Deif) [Platter].osu"))) - { - Assert.AreEqual("osu file format v13", stream.ReadLine().Trim()); - } - } - } - } -} - + + [Test] + public void TestReadFile() + { + using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz")) + { + var reader = new OszArchiveReader(osz); + using (var stream = new StreamReader( + reader.ReadFile("Soleily - Renatus (Deif) [Platter].osu"))) + { + Assert.AreEqual("osu file format v13", stream.ReadLine().Trim()); + } + } + } + } +} + diff --git a/osu.Game.Tests/Resources/Resource.cs b/osu.Game.Tests/Resources/Resource.cs index 46c51da5ef..2416b9b74f 100644 --- a/osu.Game.Tests/Resources/Resource.cs +++ b/osu.Game.Tests/Resources/Resource.cs @@ -1,17 +1,17 @@ -using System; +using System; using System.IO; using System.Reflection; -namespace osu.Game.Tests.Resources -{ - public static class Resource - { - public static Stream OpenResource(string name) - { - return Assembly.GetExecutingAssembly().GetManifestResourceStream( - $@"osu.Game.Tests.Resources.{name}") ?? - Assembly.LoadFrom("osu.Game.Resources.dll").GetManifestResourceStream( - $@"osu.Game.Resources.{name}"); - } - } +namespace osu.Game.Tests.Resources +{ + public static class Resource + { + public static Stream OpenResource(string name) + { + return Assembly.GetExecutingAssembly().GetManifestResourceStream( + $@"osu.Game.Tests.Resources.{name}") ?? + Assembly.LoadFrom("osu.Game.Resources.dll").GetManifestResourceStream( + $@"osu.Game.Resources.{name}"); + } + } } \ No newline at end of file diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config index 46387efcc6..c610afc08a 100644 --- a/osu.Game.Tests/packages.config +++ b/osu.Game.Tests/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/osu.Game/Beatmaps/BaseDifficulty.cs b/osu.Game/Beatmaps/BaseDifficulty.cs index 62acf07695..53479f348d 100644 --- a/osu.Game/Beatmaps/BaseDifficulty.cs +++ b/osu.Game/Beatmaps/BaseDifficulty.cs @@ -1,18 +1,18 @@ -using System; +using System; using SQLite; -namespace osu.Game.Beatmaps -{ - public class BaseDifficulty - { - [PrimaryKey, AutoIncrement] - public int ID { get; set; } - public float DrainRate { get; set; } - public float CircleSize { get; set; } - public float OverallDifficulty { get; set; } - public float ApproachRate { get; set; } - public float SliderMultiplier { get; set; } - public float SliderTickRate { get; set; } - } -} - +namespace osu.Game.Beatmaps +{ + public class BaseDifficulty + { + [PrimaryKey, AutoIncrement] + public int ID { get; set; } + public float DrainRate { get; set; } + public float CircleSize { get; set; } + public float OverallDifficulty { get; set; } + public float ApproachRate { get; set; } + public float SliderMultiplier { get; set; } + public float SliderTickRate { get; set; } + } +} + diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs index 1499dde323..3c284d2793 100644 --- a/osu.Game/Beatmaps/BeatmapMetadata.cs +++ b/osu.Game/Beatmaps/BeatmapMetadata.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.GameModes.Play; diff --git a/osu.Game/Beatmaps/BeatmapSet.cs b/osu.Game/Beatmaps/BeatmapSet.cs index 5f1be7f9b0..b4afdfab92 100644 --- a/osu.Game/Beatmaps/BeatmapSet.cs +++ b/osu.Game/Beatmaps/BeatmapSet.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Beatmaps/Events/EventType.cs b/osu.Game/Beatmaps/Events/EventType.cs index cb66a42f2d..4650da7c5c 100644 --- a/osu.Game/Beatmaps/Events/EventType.cs +++ b/osu.Game/Beatmaps/Events/EventType.cs @@ -1,14 +1,14 @@ -using System; -namespace osu.Game.Beatmaps.Events -{ - public enum EventType - { - Background = 0, - Video = 1, - Break = 2, - Colour = 3, - Sprite = 4, - Sample = 5, - Animation = 6 - } +using System; +namespace osu.Game.Beatmaps.Events +{ + public enum EventType + { + Background = 0, + Video = 1, + Break = 2, + Colour = 3, + Sprite = 4, + Sample = 5, + Animation = 6 + } } \ No newline at end of file diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs index 7302e2a4c5..ed57be6bdc 100644 --- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs @@ -1,25 +1,26 @@ -using System; +using System; using System.Collections.Generic; -using System.IO; - -namespace osu.Game.Beatmaps.Formats -{ - public abstract class BeatmapDecoder - { - private static Dictionary decoders { get; } = new Dictionary(); - - public static BeatmapDecoder GetDecoder(TextReader stream) - { - var line = stream.ReadLine().Trim(); - if (!decoders.ContainsKey(line)) - throw new IOException(@"Unknown file format"); - return (BeatmapDecoder)Activator.CreateInstance(decoders[line]); +using System.IO; + +namespace osu.Game.Beatmaps.Formats +{ + public abstract class BeatmapDecoder + { + private static Dictionary decoders { get; } = new Dictionary(); + + public static BeatmapDecoder GetDecoder(TextReader stream) + { + var line = stream.ReadLine().Trim(); + if (!decoders.ContainsKey(line)) + throw new IOException(@"Unknown file format"); + return (BeatmapDecoder)Activator.CreateInstance(decoders[line]); } - protected static void AddDecoder(string magic) where T : BeatmapDecoder - { - decoders[magic] = typeof(T); - } - - public abstract Beatmap Decode(TextReader stream); - } + + protected static void AddDecoder(string magic) where T : BeatmapDecoder + { + decoders[magic] = typeof(T); + } + + public abstract Beatmap Decode(TextReader stream); + } } \ No newline at end of file diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index 89451c1233..93916b17c4 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.IO; diff --git a/osu.Game/Beatmaps/IO/ArchiveReader.cs b/osu.Game/Beatmaps/IO/ArchiveReader.cs index 77315d4a21..cd747b7b0c 100644 --- a/osu.Game/Beatmaps/IO/ArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/ArchiveReader.cs @@ -1,48 +1,48 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using osu.Framework.Platform; -namespace osu.Game.Beatmaps.IO -{ - public abstract class ArchiveReader : IDisposable - { - private class Reader - { - public Func Test { get; set; } - public Type Type { get; set; } - } - - private static List readers { get; } = new List(); - - public static ArchiveReader GetReader(BasicStorage storage, string path) - { - foreach (var reader in readers) - { - if (reader.Test(storage, path)) - return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); - } - throw new IOException(@"Unknown file format"); - } - - protected static void AddReader(Func test) where T : ArchiveReader - { - readers.Add(new Reader { Test = test, Type = typeof(T) }); - } - - /// - /// Reads the beatmap metadata from this archive. - /// - public abstract BeatmapMetadata ReadMetadata(); - /// - /// Gets a list of beatmap file names. - /// - public abstract string[] ReadBeatmaps(); - /// - /// Opens a stream for reading a specific file from this archive. - /// +namespace osu.Game.Beatmaps.IO +{ + public abstract class ArchiveReader : IDisposable + { + private class Reader + { + public Func Test { get; set; } + public Type Type { get; set; } + } + + private static List readers { get; } = new List(); + + public static ArchiveReader GetReader(BasicStorage storage, string path) + { + foreach (var reader in readers) + { + if (reader.Test(storage, path)) + return (ArchiveReader)Activator.CreateInstance(reader.Type, storage.GetStream(path)); + } + throw new IOException(@"Unknown file format"); + } + + protected static void AddReader(Func test) where T : ArchiveReader + { + readers.Add(new Reader { Test = test, Type = typeof(T) }); + } + + /// + /// Reads the beatmap metadata from this archive. + /// + public abstract BeatmapMetadata ReadMetadata(); + /// + /// Gets a list of beatmap file names. + /// + public abstract string[] ReadBeatmaps(); + /// + /// Opens a stream for reading a specific file from this archive. + /// public abstract Stream ReadFile(string name); - public abstract void Dispose(); - } + public abstract void Dispose(); + } } \ No newline at end of file diff --git a/osu.Game/Beatmaps/IO/OszArchiveReader.cs b/osu.Game/Beatmaps/IO/OszArchiveReader.cs index b70bee076c..b0314c2325 100644 --- a/osu.Game/Beatmaps/IO/OszArchiveReader.cs +++ b/osu.Game/Beatmaps/IO/OszArchiveReader.cs @@ -1,39 +1,39 @@ -using System; +using System; using System.IO; using System.Linq; using Ionic.Zip; using osu.Game.Beatmaps.Formats; -namespace osu.Game.Beatmaps.IO -{ - public sealed class OszArchiveReader : ArchiveReader - { - public static void Register() - { +namespace osu.Game.Beatmaps.IO +{ + public sealed class OszArchiveReader : ArchiveReader + { + public static void Register() + { AddReader((storage, path) => - { - using (var stream = storage.GetStream(path)) + { + using (var stream = storage.GetStream(path)) return ZipFile.IsZipFile(stream, false); - }); - OsuLegacyDecoder.Register(); - } - - private ZipFile archive { get; set; } - private string[] beatmaps { get; set; } - private Beatmap firstMap { get; set; } - - public OszArchiveReader(Stream archiveStream) - { - archive = ZipFile.Read(archiveStream); - beatmaps = archive.Entries.Where(e => e.FileName.EndsWith(@".osu")) - .Select(e => e.FileName).ToArray(); - if (beatmaps.Length == 0) - throw new FileNotFoundException(@"This directory contains no beatmaps"); - using (var stream = new StreamReader(ReadFile(beatmaps[0]))) - { - var decoder = BeatmapDecoder.GetDecoder(stream); - firstMap = decoder.Decode(stream); - } + }); + OsuLegacyDecoder.Register(); + } + + private ZipFile archive { get; set; } + private string[] beatmaps { get; set; } + private Beatmap firstMap { get; set; } + + public OszArchiveReader(Stream archiveStream) + { + archive = ZipFile.Read(archiveStream); + beatmaps = archive.Entries.Where(e => e.FileName.EndsWith(@".osu")) + .Select(e => e.FileName).ToArray(); + if (beatmaps.Length == 0) + throw new FileNotFoundException(@"This directory contains no beatmaps"); + using (var stream = new StreamReader(ReadFile(beatmaps[0]))) + { + var decoder = BeatmapDecoder.GetDecoder(stream); + firstMap = decoder.Decode(stream); + } } public override string[] ReadBeatmaps() @@ -43,9 +43,9 @@ namespace osu.Game.Beatmaps.IO public override Stream ReadFile(string name) { - ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name); - if (entry == null) - throw new FileNotFoundException(); + ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name); + if (entry == null) + throw new FileNotFoundException(); return entry.OpenReader(); } @@ -53,9 +53,10 @@ namespace osu.Game.Beatmaps.IO { return firstMap.Metadata; } - public override void Dispose() - { - archive.Dispose(); + + public override void Dispose() + { + archive.Dispose(); } - } + } } \ No newline at end of file diff --git a/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs b/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs index 590bd8f5b3..df6ec0c8a0 100644 --- a/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs +++ b/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Catch diff --git a/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs b/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs index dbd97e90bc..792a72c6db 100644 --- a/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs +++ b/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs b/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs index 028afff5cc..9fc785718d 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs +++ b/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Catch/Droplet.cs b/osu.Game/Beatmaps/Objects/Catch/Droplet.cs index fd7967315d..30697ee5ed 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Droplet.cs +++ b/osu.Game/Beatmaps/Objects/Catch/Droplet.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Catch diff --git a/osu.Game/Beatmaps/Objects/Catch/Fruit.cs b/osu.Game/Beatmaps/Objects/Catch/Fruit.cs index 9ef76de841..d31eb6b4f7 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Fruit.cs +++ b/osu.Game/Beatmaps/Objects/Catch/Fruit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Catch diff --git a/osu.Game/Beatmaps/Objects/HitObject.cs b/osu.Game/Beatmaps/Objects/HitObject.cs index 16f0bb8a43..d773401d5b 100644 --- a/osu.Game/Beatmaps/Objects/HitObject.cs +++ b/osu.Game/Beatmaps/Objects/HitObject.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Beatmaps.Objects.Osu; diff --git a/osu.Game/Beatmaps/Objects/HitObjectConverter.cs b/osu.Game/Beatmaps/Objects/HitObjectConverter.cs index a70526e85a..62e7ddcef1 100644 --- a/osu.Game/Beatmaps/Objects/HitObjectConverter.cs +++ b/osu.Game/Beatmaps/Objects/HitObjectConverter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs b/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs index 132fb6ce36..b88967992a 100644 --- a/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs +++ b/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs b/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs index 37e95d8df1..30e8b0446a 100644 --- a/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs +++ b/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Mania diff --git a/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs b/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs index d3fe475c6f..d286bf7c45 100644 --- a/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs +++ b/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Mania diff --git a/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs b/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs index 22d8f9ae9c..fb82112d0f 100644 --- a/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs +++ b/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Mania/Note.cs b/osu.Game/Beatmaps/Objects/Mania/Note.cs index d6e9b0e66c..75c8baf1fa 100644 --- a/osu.Game/Beatmaps/Objects/Mania/Note.cs +++ b/osu.Game/Beatmaps/Objects/Mania/Note.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Mania diff --git a/osu.Game/Beatmaps/Objects/Osu/Circle.cs b/osu.Game/Beatmaps/Objects/Osu/Circle.cs index 81974949b0..bcf9f340db 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Circle.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Circle.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Osu diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs index f4297970e8..e782132278 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs b/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs index 2f94c70a0e..42bcfc9ebe 100644 --- a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs +++ b/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs b/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs index 5629fccd5c..272c73a995 100644 --- a/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs +++ b/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Objects/Osu/Slider.cs b/osu.Game/Beatmaps/Objects/Osu/Slider.cs index fef9cd858c..5179f47f70 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Slider.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Slider.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Beatmaps/Objects/Osu/Spinner.cs b/osu.Game/Beatmaps/Objects/Osu/Spinner.cs index e19af7c5ba..78eb284429 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Spinner.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Spinner.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Osu diff --git a/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs b/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs index dafbe33415..227e17cd96 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs +++ b/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs b/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs index 6b8f241306..51c4122bef 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs +++ b/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Objects.Taiko diff --git a/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs b/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs index 3189a0dec7..cab4b804d8 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs +++ b/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Samples/HitSampleInfo.cs b/osu.Game/Beatmaps/Samples/HitSampleInfo.cs index 2598669336..b86f1ab9e2 100644 --- a/osu.Game/Beatmaps/Samples/HitSampleInfo.cs +++ b/osu.Game/Beatmaps/Samples/HitSampleInfo.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Samples diff --git a/osu.Game/Beatmaps/Samples/SampleInfo.cs b/osu.Game/Beatmaps/Samples/SampleInfo.cs index 0b595b3d74..c09b618893 100644 --- a/osu.Game/Beatmaps/Samples/SampleInfo.cs +++ b/osu.Game/Beatmaps/Samples/SampleInfo.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Beatmaps.Samples diff --git a/osu.Game/Beatmaps/Timing/ControlPoint.cs b/osu.Game/Beatmaps/Timing/ControlPoint.cs index 89eac572ec..4b46f22fa6 100644 --- a/osu.Game/Beatmaps/Timing/ControlPoint.cs +++ b/osu.Game/Beatmaps/Timing/ControlPoint.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Timing/SampleChange.cs b/osu.Game/Beatmaps/Timing/SampleChange.cs index 488d8f0a3b..0c24d84bc7 100644 --- a/osu.Game/Beatmaps/Timing/SampleChange.cs +++ b/osu.Game/Beatmaps/Timing/SampleChange.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Beatmaps/Timing/TimingChange.cs b/osu.Game/Beatmaps/Timing/TimingChange.cs index dd2b9cdc7c..0e370ff812 100644 --- a/osu.Game/Beatmaps/Timing/TimingChange.cs +++ b/osu.Game/Beatmaps/Timing/TimingChange.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index e1b3397c42..95c2bc8382 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Configuration; diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs index 36f8776eb0..57bf5407c0 100644 --- a/osu.Game/Database/BeatmapDatabase.cs +++ b/osu.Game/Database/BeatmapDatabase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using osu.Framework.Platform; @@ -7,44 +7,45 @@ using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.IO; using SQLite; -namespace osu.Game.Database -{ - public class BeatmapDatabase - { - private static SQLiteConnection connection { get; set; } - - public BeatmapDatabase(BasicStorage storage) - { - if (connection == null) - { - connection = storage.GetDatabase(@"beatmaps"); - connection.CreateTable(); - connection.CreateTable(); - connection.CreateTable(); - connection.CreateTable(); - } +namespace osu.Game.Database +{ + public class BeatmapDatabase + { + private static SQLiteConnection connection { get; set; } + + public BeatmapDatabase(BasicStorage storage) + { + if (connection == null) + { + connection = storage.GetDatabase(@"beatmaps"); + connection.CreateTable(); + connection.CreateTable(); + connection.CreateTable(); + connection.CreateTable(); + } } - public void AddBeatmap(ArchiveReader input) - { - var metadata = input.ReadMetadata(); + + public void AddBeatmap(ArchiveReader input) + { + var metadata = input.ReadMetadata(); if (connection.Table().Count(b => b.BeatmapSetID == metadata.BeatmapSetID) != 0) - return; - string[] mapNames = input.ReadBeatmaps(); - var beatmapSet = new BeatmapSet { BeatmapSetID = metadata.BeatmapSetID }; - var maps = new List(); - foreach (var name in mapNames) - { - using (var stream = new StreamReader(input.ReadFile(name))) + return; + string[] mapNames = input.ReadBeatmaps(); + var beatmapSet = new BeatmapSet { BeatmapSetID = metadata.BeatmapSetID }; + var maps = new List(); + foreach (var name in mapNames) + { + using (var stream = new StreamReader(input.ReadFile(name))) { - var decoder = BeatmapDecoder.GetDecoder(stream); - var beatmap = decoder.Decode(stream); - maps.Add(beatmap); - beatmap.BaseDifficultyID = connection.Insert(beatmap.BaseDifficulty); - } - } - beatmapSet.BeatmapMetadataID = connection.Insert(metadata); - connection.Insert(beatmapSet); - connection.InsertAll(maps); - } - } + var decoder = BeatmapDecoder.GetDecoder(stream); + var beatmap = decoder.Decode(stream); + maps.Add(beatmap); + beatmap.BaseDifficultyID = connection.Insert(beatmap.BaseDifficulty); + } + } + beatmapSet.BeatmapMetadataID = connection.Insert(metadata); + connection.Insert(beatmapSet); + connection.InsertAll(maps); + } + } } \ No newline at end of file diff --git a/osu.Game/GameModes/BackgroundMode.cs b/osu.Game/GameModes/BackgroundMode.cs index d9b1c1b18f..78170a8c91 100644 --- a/osu.Game/GameModes/BackgroundMode.cs +++ b/osu.Game/GameModes/BackgroundMode.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs b/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs index 7b1756436f..fef10bb133 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs +++ b/osu.Game/GameModes/Backgrounds/BackgroundModeCustom.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs b/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs index 542e9b58b7..07cdf39f77 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs +++ b/osu.Game/GameModes/Backgrounds/BackgroundModeDefault.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs b/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs index 6f38c03010..6a5009d3fd 100644 --- a/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs +++ b/osu.Game/GameModes/Backgrounds/BackgroundModeEmpty.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.GameModes.Backgrounds diff --git a/osu.Game/GameModes/Charts/ChartInfo.cs b/osu.Game/GameModes/Charts/ChartInfo.cs index 67a11e632a..f36c6cace0 100644 --- a/osu.Game/GameModes/Charts/ChartInfo.cs +++ b/osu.Game/GameModes/Charts/ChartInfo.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Charts/ChartListing.cs b/osu.Game/GameModes/Charts/ChartListing.cs index 7be9d09bcf..e72ce29edc 100644 --- a/osu.Game/GameModes/Charts/ChartListing.cs +++ b/osu.Game/GameModes/Charts/ChartListing.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Direct/OnlineListing.cs b/osu.Game/GameModes/Direct/OnlineListing.cs index c30017cb77..ee116ab8c7 100644 --- a/osu.Game/GameModes/Direct/OnlineListing.cs +++ b/osu.Game/GameModes/Direct/OnlineListing.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.GameModes.Direct diff --git a/osu.Game/GameModes/Edit/EditSongSelect.cs b/osu.Game/GameModes/Edit/EditSongSelect.cs index c4686b03ac..4ae25b3646 100644 --- a/osu.Game/GameModes/Edit/EditSongSelect.cs +++ b/osu.Game/GameModes/Edit/EditSongSelect.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Edit/Editor.cs b/osu.Game/GameModes/Edit/Editor.cs index fbefb38752..ade74eebc1 100644 --- a/osu.Game/GameModes/Edit/Editor.cs +++ b/osu.Game/GameModes/Edit/Editor.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/GameModeWhiteBox.cs b/osu.Game/GameModes/GameModeWhiteBox.cs index 121cb20d12..d765fd98ac 100644 --- a/osu.Game/GameModes/GameModeWhiteBox.cs +++ b/osu.Game/GameModes/GameModeWhiteBox.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Menu/Button.cs b/osu.Game/GameModes/Menu/Button.cs index 261af9e78b..634e6c99b9 100644 --- a/osu.Game/GameModes/Menu/Button.cs +++ b/osu.Game/GameModes/Menu/Button.cs @@ -1,4 +1,4 @@ -using OpenTK; +using OpenTK; using OpenTK.Graphics; using OpenTK.Input; using osu.Framework; diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index b4911928a4..2d62d1a9ee 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs b/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs index 890a1948a3..9f6201f669 100644 --- a/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs +++ b/osu.Game/GameModes/Menu/FlowContainerWithOrigin.cs @@ -1,4 +1,4 @@ -using OpenTK; +using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game/GameModes/Menu/Intro.cs b/osu.Game/GameModes/Menu/Intro.cs index f0bba5bddb..c1635c86ba 100644 --- a/osu.Game/GameModes/Menu/Intro.cs +++ b/osu.Game/GameModes/Menu/Intro.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Menu/MenuVisualisation.cs b/osu.Game/GameModes/Menu/MenuVisualisation.cs index 84f150c413..d9aa2425fb 100644 --- a/osu.Game/GameModes/Menu/MenuVisualisation.cs +++ b/osu.Game/GameModes/Menu/MenuVisualisation.cs @@ -1,4 +1,4 @@ -using osu.Framework.Graphics; +using osu.Framework.Graphics; using System; using System.Collections.Generic; using System.Linq; diff --git a/osu.Game/GameModes/Menu/OsuLogo.cs b/osu.Game/GameModes/Menu/OsuLogo.cs index 51446df757..630122f1c9 100644 --- a/osu.Game/GameModes/Menu/OsuLogo.cs +++ b/osu.Game/GameModes/Menu/OsuLogo.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Multiplayer/Lobby.cs b/osu.Game/GameModes/Multiplayer/Lobby.cs index 6700736234..257ee65eff 100644 --- a/osu.Game/GameModes/Multiplayer/Lobby.cs +++ b/osu.Game/GameModes/Multiplayer/Lobby.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Multiplayer/Match.cs b/osu.Game/GameModes/Multiplayer/Match.cs index 0b12ade697..2efdfcab51 100644 --- a/osu.Game/GameModes/Multiplayer/Match.cs +++ b/osu.Game/GameModes/Multiplayer/Match.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Multiplayer/MatchCreate.cs b/osu.Game/GameModes/Multiplayer/MatchCreate.cs index 8d134d170e..89414cf7ae 100644 --- a/osu.Game/GameModes/Multiplayer/MatchCreate.cs +++ b/osu.Game/GameModes/Multiplayer/MatchCreate.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs b/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs index da86641c04..2b564e8b1e 100644 --- a/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs +++ b/osu.Game/GameModes/Multiplayer/MatchSongSelect.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/OsuGameMode.cs b/osu.Game/GameModes/OsuGameMode.cs index b0928d8214..b600b380fb 100644 --- a/osu.Game/GameModes/OsuGameMode.cs +++ b/osu.Game/GameModes/OsuGameMode.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs index d8e5aaaa35..67b2deb837 100644 --- a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs +++ b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs b/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs index fef80e6b4a..49153706f4 100644 --- a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs +++ b/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/GameModes/Play/HitRenderer.cs b/osu.Game/GameModes/Play/HitRenderer.cs index b18d9ebb6d..6315b4ab4c 100644 --- a/osu.Game/GameModes/Play/HitRenderer.cs +++ b/osu.Game/GameModes/Play/HitRenderer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs index 302f40878b..0ba389f60a 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs b/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs index 53de8221eb..12640575b8 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaPlayfield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/GameModes/Play/ModSelect.cs b/osu.Game/GameModes/Play/ModSelect.cs index 525fdeeb94..5ebf5514da 100644 --- a/osu.Game/GameModes/Play/ModSelect.cs +++ b/osu.Game/GameModes/Play/ModSelect.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs index 130d6d212f..fa52232aa1 100644 --- a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs +++ b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs index e232a2af40..2f54ca7822 100644 --- a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs +++ b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/GameModes/Play/PlayMode.cs b/osu.Game/GameModes/Play/PlayMode.cs index 8234baa523..217bdfdf85 100644 --- a/osu.Game/GameModes/Play/PlayMode.cs +++ b/osu.Game/GameModes/Play/PlayMode.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index df120ba8ba..9c4c3f79a9 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Play/Player.cs b/osu.Game/GameModes/Play/Player.cs index 829b3e8db0..1dd1664d1f 100644 --- a/osu.Game/GameModes/Play/Player.cs +++ b/osu.Game/GameModes/Play/Player.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Play/Playfield.cs b/osu.Game/GameModes/Play/Playfield.cs index aee8287be3..d1fd06deaf 100644 --- a/osu.Game/GameModes/Play/Playfield.cs +++ b/osu.Game/GameModes/Play/Playfield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/GameModes/Play/Results.cs b/osu.Game/GameModes/Play/Results.cs index 4974966aa9..ca508124ad 100644 --- a/osu.Game/GameModes/Play/Results.cs +++ b/osu.Game/GameModes/Play/Results.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs index 9fab5998f5..6397bfe0df 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs index 0f2ab70727..768488b6e8 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/Graphics/Background/Background.cs b/osu.Game/Graphics/Background/Background.cs index a0bb99f589..68673e9fae 100644 --- a/osu.Game/Graphics/Background/Background.cs +++ b/osu.Game/Graphics/Background/Background.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Graphics/Components/FpsDisplay.cs b/osu.Game/Graphics/Components/FpsDisplay.cs index c2e5d75059..8e26d83173 100644 --- a/osu.Game/Graphics/Components/FpsDisplay.cs +++ b/osu.Game/Graphics/Components/FpsDisplay.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics.Containers; diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 129997e663..f07844de7b 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -1,4 +1,4 @@ -using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Containers; using osu.Framework.Graphics; using osu.Framework.Input; using OpenTK; diff --git a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs index 3239961eff..08c1e86765 100644 --- a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs +++ b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; diff --git a/osu.Game/Graphics/Processing/RatioAdjust.cs b/osu.Game/Graphics/Processing/RatioAdjust.cs index 9c74f0fc66..59c1fb55fa 100644 --- a/osu.Game/Graphics/Processing/RatioAdjust.cs +++ b/osu.Game/Graphics/Processing/RatioAdjust.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Graphics/UserInterface/KeyCounter.cs b/osu.Game/Graphics/UserInterface/KeyCounter.cs index 5f48de699b..7dd859d76b 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounter.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounter.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; diff --git a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs index c9d22d2f06..524f6827fa 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs b/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs index 9b75924cb6..19a0914727 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK.Input; diff --git a/osu.Game/Graphics/UserInterface/KeyCounterMouse.cs b/osu.Game/Graphics/UserInterface/KeyCounterMouse.cs index 982721c7a7..480d1175ac 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounterMouse.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounterMouse.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; diff --git a/osu.Game/Input/GlobalHotkeys.cs b/osu.Game/Input/GlobalHotkeys.cs index 2a0fa48adf..aff3172c13 100644 --- a/osu.Game/Input/GlobalHotkeys.cs +++ b/osu.Game/Input/GlobalHotkeys.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs index a7b2239355..ceecea17fa 100644 --- a/osu.Game/Online/API/APIAccess.cs +++ b/osu.Game/Online/API/APIAccess.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs index a63530ab79..6b3247b2cc 100644 --- a/osu.Game/Online/API/APIRequest.cs +++ b/osu.Game/Online/API/APIRequest.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs index 3358fac0e8..bbbb68717c 100644 --- a/osu.Game/Online/API/OAuth.cs +++ b/osu.Game/Online/API/OAuth.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/API/OAuthToken.cs b/osu.Game/Online/API/OAuthToken.cs index 6f2ebbff69..3d0b5c7848 100644 --- a/osu.Game/Online/API/OAuthToken.cs +++ b/osu.Game/Online/API/OAuthToken.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs index 96ded02d55..d2b3ca181a 100644 --- a/osu.Game/Online/API/Requests/GetMessagesRequest.cs +++ b/osu.Game/Online/API/Requests/GetMessagesRequest.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Online/API/Requests/ListChannels.cs b/osu.Game/Online/API/Requests/ListChannels.cs index ecee48a938..cdf890e334 100644 --- a/osu.Game/Online/API/Requests/ListChannels.cs +++ b/osu.Game/Online/API/Requests/ListChannels.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; diff --git a/osu.Game/Online/API/SecurePassword.cs b/osu.Game/Online/API/SecurePassword.cs index 17ec2d638f..457617522f 100644 --- a/osu.Game/Online/API/SecurePassword.cs +++ b/osu.Game/Online/API/SecurePassword.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/Chat/Display/ChannelDisplay.cs b/osu.Game/Online/Chat/Display/ChannelDisplay.cs index 714718990e..ccfefa72d5 100644 --- a/osu.Game/Online/Chat/Display/ChannelDisplay.cs +++ b/osu.Game/Online/Chat/Display/ChannelDisplay.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/Chat/Display/ChatLine.cs b/osu.Game/Online/Chat/Display/ChatLine.cs index 5032ff0b9f..4e3a0ff74e 100644 --- a/osu.Game/Online/Chat/Display/ChatLine.cs +++ b/osu.Game/Online/Chat/Display/ChatLine.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Online/User.cs b/osu.Game/Online/User.cs index 27de5d8dc2..57057c243f 100644 --- a/osu.Game/Online/User.cs +++ b/osu.Game/Online/User.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using Newtonsoft.Json; diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 9eb32117c5..9183fa8329 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index ea2fecf7c2..58b5883e92 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -1,4 +1,4 @@ -using osu.Framework; +using osu.Framework; using osu.Framework.GameModes; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatConsole.cs index 5763275486..fe25586961 100644 --- a/osu.Game/Overlays/ChatConsole.cs +++ b/osu.Game/Overlays/ChatConsole.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Overlays/Options.cs b/osu.Game/Overlays/Options.cs index bdab31bc6e..60005187ce 100644 --- a/osu.Game/Overlays/Options.cs +++ b/osu.Game/Overlays/Options.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs index 185123e0e3..cf08ec6b22 100644 --- a/osu.Game/Overlays/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; diff --git a/osu.Game/Overlays/ToolbarButton.cs b/osu.Game/Overlays/ToolbarButton.cs index 79cd79aee0..1468c3ccbf 100644 --- a/osu.Game/Overlays/ToolbarButton.cs +++ b/osu.Game/Overlays/ToolbarButton.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Overlays/ToolbarModeButton.cs b/osu.Game/Overlays/ToolbarModeButton.cs index 678a953fb1..a1cbccc557 100644 --- a/osu.Game/Overlays/ToolbarModeButton.cs +++ b/osu.Game/Overlays/ToolbarModeButton.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Extensions; diff --git a/osu.Game/Overlays/ToolbarModeSelector.cs b/osu.Game/Overlays/ToolbarModeSelector.cs index d73c7dc8a9..7441f4ce0d 100644 --- a/osu.Game/Overlays/ToolbarModeSelector.cs +++ b/osu.Game/Overlays/ToolbarModeSelector.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/Properties/AssemblyInfo.cs b/osu.Game/Properties/AssemblyInfo.cs index fbf2e28498..92066fe256 100644 --- a/osu.Game/Properties/AssemblyInfo.cs +++ b/osu.Game/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs index 33f9e65d51..e52f6a7367 100644 --- a/osu.Game/Users/User.cs +++ b/osu.Game/Users/User.cs @@ -1,4 +1,4 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . +//Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; diff --git a/osu.Game/VolumeControl.cs b/osu.Game/VolumeControl.cs index ff74a767bd..4e3129d417 100644 --- a/osu.Game/VolumeControl.cs +++ b/osu.Game/VolumeControl.cs @@ -1,4 +1,4 @@ -using System; +using System; using OpenTK; using OpenTK.Graphics; using osu.Framework.Configuration; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 068c1e1fd8..ac87bbb784 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -1,4 +1,4 @@ - + diff --git a/osu.Game/packages.config b/osu.Game/packages.config index 1f14b0038d..1cb6ea92b8 100644 --- a/osu.Game/packages.config +++ b/osu.Game/packages.config @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/osu.licenseheader b/osu.licenseheader index 69054d22af..a6ec3d36da 100644 --- a/osu.licenseheader +++ b/osu.licenseheader @@ -1,4 +1,4 @@ -extensions: .cs +extensions: .cs //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE diff --git a/osu.sln b/osu.sln index 3d79d4444f..2092270d09 100644 --- a/osu.sln +++ b/osu.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings index c3f287f6ae..29d67081a8 100644 --- a/osu.sln.DotSettings +++ b/osu.sln.DotSettings @@ -1,430 +1,430 @@ - - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - <?xml version="1.0" encoding="utf-16"?><Profile name="Code Cleanup (peppy)"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseVar><BehavourStyle>CAN_CHANGE_TO_EXPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers></Profile> - True - True - True - True - True - True - True - True - NEXT_LINE - NEXT_LINE - False - False - True - False - False - True - True - False - CHOP_IF_LONG - True - 200 - CHOP_ALWAYS - <?xml version="1.0" encoding="utf-16"?> -<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> - <TypePattern DisplayName="COM interfaces or structs"> - <TypePattern.Match> - <Or> - <And> - <Kind Is="Interface" /> - <Or> - <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> - <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> - </Or> - </And> - <Kind Is="Struct" /> - </Or> - </TypePattern.Match> - </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="Default Pattern"> - <Group DisplayName="Fields/Properties"> - <Group DisplayName="Public Fields"> - <Entry DisplayName="Constant Fields"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Or> - <Kind Is="Constant" /> - <Readonly /> - <And> - <Static /> - <Readonly /> - </And> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Static Fields"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Static /> - <Not> - <Readonly /> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Normal Fields"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Not> - <Or> - <Static /> - <Readonly /> - </Or> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Entry DisplayName="Public Properties"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Property" /> - </And> - </Entry.Match> - </Entry> - <Group DisplayName="Internal Fields"> - <Entry DisplayName="Constant Fields"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Or> - <Kind Is="Constant" /> - <Readonly /> - <And> - <Static /> - <Readonly /> - </And> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Static Fields"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Static /> - <Not> - <Readonly /> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Normal Fields"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Not> - <Or> - <Static /> - <Readonly /> - </Or> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Entry DisplayName="Internal Properties"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Kind Is="Property" /> - </And> - </Entry.Match> - </Entry> - <Group DisplayName="Protected Fields"> - <Entry DisplayName="Constant Fields"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Or> - <Kind Is="Constant" /> - <Readonly /> - <And> - <Static /> - <Readonly /> - </And> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Static Fields"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Static /> - <Not> - <Readonly /> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Normal Fields"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Not> - <Or> - <Static /> - <Readonly /> - </Or> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Entry DisplayName="Protected Properties"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Kind Is="Property" /> - </And> - </Entry.Match> - </Entry> - <Group DisplayName="Private Fields"> - <Entry DisplayName="Constant Fields"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Or> - <Kind Is="Constant" /> - <Readonly /> - <And> - <Static /> - <Readonly /> - </And> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Static Fields"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Static /> - <Not> - <Readonly /> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Normal Fields"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Not> - <Or> - <Static /> - <Readonly /> - </Or> - </Not> - <Kind Is="Field" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Entry DisplayName="Private Properties"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Kind Is="Property" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Group DisplayName="Constructor/Destructor"> - <Entry DisplayName="Ctor"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - </Entry> - <Region Name="Disposal"> - <Entry DisplayName="Dtor"> - <Entry.Match> - <Kind Is="Destructor" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Dispose()"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Method" /> - <Name Is="Dispose" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Dispose(true)"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Or> - <Virtual /> - <Override /> - </Or> - <Kind Is="Method" /> - <Name Is="Dispose" /> - </And> - </Entry.Match> - </Entry> - </Region> - </Group> - <Group DisplayName="Methods"> - <Group DisplayName="Public"> - <Entry DisplayName="Static Methods"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Static /> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Methods"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Not> - <Static /> - </Not> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Group DisplayName="Internal"> - <Entry DisplayName="Static Methods"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Static /> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Methods"> - <Entry.Match> - <And> - <Access Is="Internal" /> - <Not> - <Static /> - </Not> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Group DisplayName="Protected"> - <Entry DisplayName="Static Methods"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Static /> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Methods"> - <Entry.Match> - <And> - <Access Is="Protected" /> - <Not> - <Static /> - </Not> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - </Group> - <Group DisplayName="Private"> - <Entry DisplayName="Static Methods"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Static /> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Methods"> - <Entry.Match> - <And> - <Access Is="Private" /> - <Not> - <Static /> - </Not> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - </Group> - </Group> - </TypePattern> -</Patterns> - <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> - True - True - True - True + + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + <?xml version="1.0" encoding="utf-16"?><Profile name="Code Cleanup (peppy)"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseVar><BehavourStyle>CAN_CHANGE_TO_EXPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers></Profile> + True + True + True + True + True + True + True + True + NEXT_LINE + NEXT_LINE + False + False + True + False + False + True + True + False + CHOP_IF_LONG + True + 200 + CHOP_ALWAYS + <?xml version="1.0" encoding="utf-16"?> +<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <TypePattern DisplayName="COM interfaces or structs"> + <TypePattern.Match> + <Or> + <And> + <Kind Is="Interface" /> + <Or> + <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> + <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> + </Or> + </And> + <Kind Is="Struct" /> + </Or> + </TypePattern.Match> + </TypePattern> + <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> + </And> + </TypePattern.Match> + <Entry DisplayName="Setup/Teardown Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <Or> + <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="All other members" /> + <Entry Priority="100" DisplayName="Test Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + <TypePattern DisplayName="Default Pattern"> + <Group DisplayName="Fields/Properties"> + <Group DisplayName="Public Fields"> + <Entry DisplayName="Constant Fields"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Or> + <Kind Is="Constant" /> + <Readonly /> + <And> + <Static /> + <Readonly /> + </And> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Static Fields"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Static /> + <Not> + <Readonly /> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Normal Fields"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Not> + <Or> + <Static /> + <Readonly /> + </Or> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Entry DisplayName="Public Properties"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Property" /> + </And> + </Entry.Match> + </Entry> + <Group DisplayName="Internal Fields"> + <Entry DisplayName="Constant Fields"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Or> + <Kind Is="Constant" /> + <Readonly /> + <And> + <Static /> + <Readonly /> + </And> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Static Fields"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Static /> + <Not> + <Readonly /> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Normal Fields"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Not> + <Or> + <Static /> + <Readonly /> + </Or> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Entry DisplayName="Internal Properties"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Kind Is="Property" /> + </And> + </Entry.Match> + </Entry> + <Group DisplayName="Protected Fields"> + <Entry DisplayName="Constant Fields"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Or> + <Kind Is="Constant" /> + <Readonly /> + <And> + <Static /> + <Readonly /> + </And> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Static Fields"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Static /> + <Not> + <Readonly /> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Normal Fields"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Not> + <Or> + <Static /> + <Readonly /> + </Or> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Entry DisplayName="Protected Properties"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Kind Is="Property" /> + </And> + </Entry.Match> + </Entry> + <Group DisplayName="Private Fields"> + <Entry DisplayName="Constant Fields"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Or> + <Kind Is="Constant" /> + <Readonly /> + <And> + <Static /> + <Readonly /> + </And> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Static Fields"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Static /> + <Not> + <Readonly /> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Normal Fields"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Not> + <Or> + <Static /> + <Readonly /> + </Or> + </Not> + <Kind Is="Field" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Entry DisplayName="Private Properties"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Kind Is="Property" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Group DisplayName="Constructor/Destructor"> + <Entry DisplayName="Ctor"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + </Entry> + <Region Name="Disposal"> + <Entry DisplayName="Dtor"> + <Entry.Match> + <Kind Is="Destructor" /> + </Entry.Match> + </Entry> + <Entry DisplayName="Dispose()"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Method" /> + <Name Is="Dispose" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Dispose(true)"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Or> + <Virtual /> + <Override /> + </Or> + <Kind Is="Method" /> + <Name Is="Dispose" /> + </And> + </Entry.Match> + </Entry> + </Region> + </Group> + <Group DisplayName="Methods"> + <Group DisplayName="Public"> + <Entry DisplayName="Static Methods"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Static /> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Methods"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Not> + <Static /> + </Not> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Group DisplayName="Internal"> + <Entry DisplayName="Static Methods"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Static /> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Methods"> + <Entry.Match> + <And> + <Access Is="Internal" /> + <Not> + <Static /> + </Not> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Group DisplayName="Protected"> + <Entry DisplayName="Static Methods"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Static /> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Methods"> + <Entry.Match> + <And> + <Access Is="Protected" /> + <Not> + <Static /> + </Not> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + </Group> + <Group DisplayName="Private"> + <Entry DisplayName="Static Methods"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Static /> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Methods"> + <Entry.Match> + <And> + <Access Is="Private" /> + <Not> + <Static /> + </Not> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + </Group> + </Group> + </TypePattern> +</Patterns> + <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + True + True + True + True