From 06f4f9391858949be3ced5886cb6df7b8af90b9b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 14 Nov 2016 18:03:20 +0900 Subject: [PATCH] Move play modes to Modes namespace. --- .../Tests/TestCaseGamefield.cs | 12 +-- .../Tests/TestCaseHitObjects.cs | 6 +- .../Tests/TestCasePlaySongSelect.cs | 1 + .../Tests/TestCasePlayer.cs | 4 +- .../Tests/TestCaseScoreCounter.cs | 9 +- .../Beatmaps/Formats/OsuLegacyDecoderTest.cs | 3 +- .../Beatmaps/IO/ImportBeatmapTest.cs | 1 + osu.Game/Beatmaps/Beatmap.cs | 2 +- osu.Game/Beatmaps/Formats/BeatmapDecoder.cs | 2 +- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 3 +- osu.Game/Configuration/OsuConfigManager.cs | 1 + osu.Game/Database/BeatmapInfo.cs | 1 + .../Play => Modes}/Catch/CatchComboCounter.cs | 4 +- .../Play => Modes}/Catch/CatchHitRenderer.cs | 6 +- .../Play => Modes}/Catch/CatchPlayfield.cs | 2 +- .../Play => Modes}/Catch/CatchRuleset.cs | 6 +- .../{Screens/Play => Modes}/ComboCounter.cs | 2 +- .../Play => Modes}/ComboResultCounter.cs | 2 +- .../{Screens/Play => Modes}/HitRenderer.cs | 4 +- .../Play => Modes}/Mania/ManiaComboCounter.cs | 4 +- .../Play => Modes}/Mania/ManiaHitRenderer.cs | 6 +- .../Play => Modes}/Mania/ManiaPlayfield.cs | 2 +- .../Play => Modes}/Mania/ManiaRuleset.cs | 6 +- .../Objects/Catch/CatchBaseHit.cs | 2 +- .../Objects/Catch/CatchConverter.cs | 9 +- .../Objects/Catch/Drawable/DrawableFruit.cs | 12 +-- .../Objects/Catch/Droplet.cs | 2 +- .../Objects/Catch/Fruit.cs | 2 +- .../Objects/DrawableHitObject.cs | 7 +- .../{Beatmaps => Modes}/Objects/HitObject.cs | 5 +- .../Objects/HitObjectConverter.cs | 2 +- .../Objects/Mania/Drawable/DrawableNote.cs | 7 +- .../Objects/Mania/HoldNote.cs | 2 +- .../Objects/Mania/ManiaBaseHit.cs | 2 +- .../Objects/Mania/ManiaConverter.cs | 4 +- .../{Beatmaps => Modes}/Objects/Mania/Note.cs | 2 +- .../{Beatmaps => Modes}/Objects/Osu/Circle.cs | 4 +- .../Objects/Osu/Drawable/DrawableCircle.cs | 4 +- .../Objects/Osu/OsuBaseHit.cs | 4 +- .../Objects/Osu/OsuConverter.cs | 3 +- .../{Beatmaps => Modes}/Objects/Osu/Slider.cs | 2 +- .../Objects/Osu/Spinner.cs | 2 +- .../Taiko/Drawable/DrawableTaikoHit.cs | 7 +- .../Objects/Taiko/TaikoBaseHit.cs | 2 +- .../Objects/Taiko/TaikoConverter.cs | 5 +- .../Play => Modes}/Osu/OsuComboCounter.cs | 2 +- .../Play => Modes}/Osu/OsuHitRenderer.cs | 8 +- .../Play => Modes}/Osu/OsuPlayfield.cs | 2 +- .../{Screens/Play => Modes}/Osu/OsuRuleset.cs | 4 +- .../Play => Modes}/Osu/ScoreOverlayOsu.cs | 2 +- osu.Game/{Screens/Play => Modes}/PlayMode.cs | 2 +- osu.Game/{Screens/Play => Modes}/Playfield.cs | 2 +- osu.Game/{Screens/Play => Modes}/Ruleset.cs | 12 +-- .../{Screens/Play => Modes}/ScoreOverlay.cs | 4 +- .../Play => Modes}/Taiko/TaikoComboCounter.cs | 2 +- .../Play => Modes}/Taiko/TaikoHitRenderer.cs | 6 +- .../Play => Modes}/Taiko/TaikoPlayfield.cs | 2 +- .../Play => Modes}/Taiko/TaikoRuleset.cs | 6 +- osu.Game/OsuGame.cs | 1 + osu.Game/Overlays/Toolbar.cs | 1 + osu.Game/Overlays/ToolbarModeButton.cs | 1 + osu.Game/Overlays/ToolbarModeSelector.cs | 1 + osu.Game/Screens/Menu/MainMenu.cs | 1 + osu.Game/Screens/Play/PlaySongSelect.cs | 1 + osu.Game/Screens/Play/Player.cs | 3 +- osu.Game/osu.Game.csproj | 92 +++++++++---------- 66 files changed, 163 insertions(+), 172 deletions(-) rename osu.Game/{Screens/Play => Modes}/Catch/CatchComboCounter.cs (93%) rename osu.Game/{Screens/Play => Modes}/Catch/CatchHitRenderer.cs (80%) rename osu.Game/{Screens/Play => Modes}/Catch/CatchPlayfield.cs (90%) rename osu.Game/{Screens/Play => Modes}/Catch/CatchRuleset.cs (78%) rename osu.Game/{Screens/Play => Modes}/ComboCounter.cs (96%) rename osu.Game/{Screens/Play => Modes}/ComboResultCounter.cs (95%) rename osu.Game/{Screens/Play => Modes}/HitRenderer.cs (93%) rename osu.Game/{Screens/Play => Modes}/Mania/ManiaComboCounter.cs (94%) rename osu.Game/{Screens/Play => Modes}/Mania/ManiaHitRenderer.cs (86%) rename osu.Game/{Screens/Play => Modes}/Mania/ManiaPlayfield.cs (93%) rename osu.Game/{Screens/Play => Modes}/Mania/ManiaRuleset.cs (78%) rename osu.Game/{Beatmaps => Modes}/Objects/Catch/CatchBaseHit.cs (82%) rename osu.Game/{Beatmaps => Modes}/Objects/Catch/CatchConverter.cs (80%) rename osu.Game/{Beatmaps => Modes}/Objects/Catch/Drawable/DrawableFruit.cs (84%) rename osu.Game/{Beatmaps => Modes}/Objects/Catch/Droplet.cs (80%) rename osu.Game/{Beatmaps => Modes}/Objects/Catch/Fruit.cs (80%) rename osu.Game/{Beatmaps => Modes}/Objects/DrawableHitObject.cs (88%) rename osu.Game/{Beatmaps => Modes}/Objects/HitObject.cs (88%) rename osu.Game/{Beatmaps => Modes}/Objects/HitObjectConverter.cs (91%) rename osu.Game/{Beatmaps => Modes}/Objects/Mania/Drawable/DrawableNote.cs (91%) rename osu.Game/{Beatmaps => Modes}/Objects/Mania/HoldNote.cs (79%) rename osu.Game/{Beatmaps => Modes}/Objects/Mania/ManiaBaseHit.cs (82%) rename osu.Game/{Beatmaps => Modes}/Objects/Mania/ManiaConverter.cs (90%) rename osu.Game/{Beatmaps => Modes}/Objects/Mania/Note.cs (80%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/Circle.cs (73%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/Drawable/DrawableCircle.cs (96%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/OsuBaseHit.cs (94%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/OsuConverter.cs (87%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/Slider.cs (85%) rename osu.Game/{Beatmaps => Modes}/Objects/Osu/Spinner.cs (80%) rename osu.Game/{Beatmaps => Modes}/Objects/Taiko/Drawable/DrawableTaikoHit.cs (91%) rename osu.Game/{Beatmaps => Modes}/Objects/Taiko/TaikoBaseHit.cs (85%) rename osu.Game/{Beatmaps => Modes}/Objects/Taiko/TaikoConverter.cs (87%) rename osu.Game/{Screens/Play => Modes}/Osu/OsuComboCounter.cs (96%) rename osu.Game/{Screens/Play => Modes}/Osu/OsuHitRenderer.cs (76%) rename osu.Game/{Screens/Play => Modes}/Osu/OsuPlayfield.cs (94%) rename osu.Game/{Screens/Play => Modes}/Osu/OsuRuleset.cs (84%) rename osu.Game/{Screens/Play => Modes}/Osu/ScoreOverlayOsu.cs (94%) rename osu.Game/{Screens/Play => Modes}/PlayMode.cs (89%) rename osu.Game/{Screens/Play => Modes}/Playfield.cs (85%) rename osu.Game/{Screens/Play => Modes}/Ruleset.cs (77%) rename osu.Game/{Screens/Play => Modes}/ScoreOverlay.cs (93%) rename osu.Game/{Screens/Play => Modes}/Taiko/TaikoComboCounter.cs (95%) rename osu.Game/{Screens/Play => Modes}/Taiko/TaikoHitRenderer.cs (80%) rename osu.Game/{Screens/Play => Modes}/Taiko/TaikoPlayfield.cs (93%) rename osu.Game/{Screens/Play => Modes}/Taiko/TaikoRuleset.cs (78%) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index db0de0a3f9..4793f9f157 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -7,12 +7,12 @@ using osu.Framework.MathUtils; using osu.Framework.Timing; using osu.Game.Beatmaps; -using osu.Game.Beatmaps.Objects; -using osu.Game.Beatmaps.Objects.Osu; -using osu.Game.Screens.Play.Catch; -using osu.Game.Screens.Play.Mania; -using osu.Game.Screens.Play.Osu; -using osu.Game.Screens.Play.Taiko; +using osu.Game.Modes.Catch; +using osu.Game.Modes.Mania; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Osu; +using osu.Game.Modes.Taiko; using OpenTK; namespace osu.Desktop.VisualTests.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index f1d4e72601..c55b326b82 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -5,11 +5,11 @@ using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; using osu.Framework.Timing; -using osu.Game.Beatmaps.Objects; -using osu.Game.Beatmaps.Objects.Osu; -using osu.Game.Beatmaps.Objects.Osu.Drawable; using OpenTK; using osu.Framework.Allocation; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Objects.Osu.Drawable; namespace osu.Desktop.VisualTests.Tests { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs index 0ef743792d..caf4c90aa7 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs @@ -8,6 +8,7 @@ using SQLiteNetExtensions.Extensions; using osu.Framework; using osu.Game; +using osu.Game.Modes; using osu.Game.Screens.Play; namespace osu.Desktop.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index e69b669335..c3b7034f79 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -7,11 +7,11 @@ using osu.Framework.Timing; using osu.Game.Beatmaps; using osu.Game.Beatmaps.Formats; -using osu.Game.Beatmaps.Objects; -using osu.Game.Beatmaps.Objects.Osu; using OpenTK; using osu.Framework; using osu.Framework.Allocation; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Osu; using osu.Game.Screens.Play; namespace osu.Desktop.VisualTests.Tests diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs index 87a5e1ec45..005124e3c5 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs @@ -7,11 +7,12 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.MathUtils; using osu.Game.Graphics.UserInterface; +using osu.Game.Modes; +using osu.Game.Modes.Catch; +using osu.Game.Modes.Mania; +using osu.Game.Modes.Osu; +using osu.Game.Modes.Taiko; using osu.Game.Screens.Play; -using osu.Game.Screens.Play.Catch; -using osu.Game.Screens.Play.Mania; -using osu.Game.Screens.Play.Osu; -using osu.Game.Screens.Play.Taiko; using OpenTK; using OpenTK.Graphics; diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index f5aee52853..226725b93f 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs @@ -5,8 +5,9 @@ using OpenTK.Graphics; using osu.Game.Beatmaps; using osu.Game.Beatmaps.Formats; -using osu.Game.Beatmaps.Objects.Osu; using osu.Game.Beatmaps.Samples; +using osu.Game.Modes; +using osu.Game.Modes.Objects.Osu; using osu.Game.Screens.Play; using osu.Game.Tests.Resources; diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 28dd5661b1..0c53ef380c 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -8,6 +8,7 @@ using osu.Framework.Platform; using osu.Game.Database; using osu.Game.IPC; +using osu.Game.Modes; using osu.Game.Screens.Play; namespace osu.Game.Tests.Beatmaps.IO diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs index 4769e2fb64..4d6c6a8056 100644 --- a/osu.Game/Beatmaps/Beatmap.cs +++ b/osu.Game/Beatmaps/Beatmap.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using OpenTK.Graphics; -using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Timing; using osu.Game.Database; +using osu.Game.Modes.Objects; namespace osu.Game.Beatmaps { diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs index ca11b97587..7ff3dbac2b 100644 --- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using osu.Game.Beatmaps.Objects; +using osu.Game.Modes.Objects; using OpenTK.Graphics; namespace osu.Game.Beatmaps.Formats diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index 165f1808ee..2cf4e66927 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -5,9 +5,10 @@ using OpenTK.Graphics; using osu.Game.Database; using osu.Game.Beatmaps.Events; -using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Samples; using osu.Game.Beatmaps.Timing; +using osu.Game.Modes; +using osu.Game.Modes.Objects; using osu.Game.Screens.Play; namespace osu.Game.Beatmaps.Formats diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index bf56e10429..86e26048ab 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -3,6 +3,7 @@ using osu.Framework.Configuration; using osu.Framework.Platform; +using osu.Game.Modes; using osu.Game.Online.API; using osu.Game.Screens.Play; diff --git a/osu.Game/Database/BeatmapInfo.cs b/osu.Game/Database/BeatmapInfo.cs index de3ba15508..736f8b9927 100644 --- a/osu.Game/Database/BeatmapInfo.cs +++ b/osu.Game/Database/BeatmapInfo.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using osu.Game.Beatmaps.Samples; +using osu.Game.Modes; using osu.Game.Screens.Play; using SQLite.Net.Attributes; using SQLiteNetExtensions.Attributes; diff --git a/osu.Game/Screens/Play/Catch/CatchComboCounter.cs b/osu.Game/Modes/Catch/CatchComboCounter.cs similarity index 93% rename from osu.Game/Screens/Play/Catch/CatchComboCounter.cs rename to osu.Game/Modes/Catch/CatchComboCounter.cs index 19c9a4ddf2..ee972ac49a 100644 --- a/osu.Game/Screens/Play/Catch/CatchComboCounter.cs +++ b/osu.Game/Modes/Catch/CatchComboCounter.cs @@ -1,10 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Game.Screens.Play.Osu; +using osu.Game.Modes.Osu; using OpenTK.Graphics; -namespace osu.Game.Screens.Play.Catch +namespace osu.Game.Modes.Catch { /// /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch. diff --git a/osu.Game/Screens/Play/Catch/CatchHitRenderer.cs b/osu.Game/Modes/Catch/CatchHitRenderer.cs similarity index 80% rename from osu.Game/Screens/Play/Catch/CatchHitRenderer.cs rename to osu.Game/Modes/Catch/CatchHitRenderer.cs index 114dd0c930..a796d70c0e 100644 --- a/osu.Game/Screens/Play/Catch/CatchHitRenderer.cs +++ b/osu.Game/Modes/Catch/CatchHitRenderer.cs @@ -1,10 +1,10 @@ //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; -using osu.Game.Beatmaps.Objects.Catch; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Catch; -namespace osu.Game.Screens.Play.Catch +namespace osu.Game.Modes.Catch { public class CatchHitRenderer : HitRenderer { diff --git a/osu.Game/Screens/Play/Catch/CatchPlayfield.cs b/osu.Game/Modes/Catch/CatchPlayfield.cs similarity index 90% rename from osu.Game/Screens/Play/Catch/CatchPlayfield.cs rename to osu.Game/Modes/Catch/CatchPlayfield.cs index 92ab69a627..ca323f81d5 100644 --- a/osu.Game/Screens/Play/Catch/CatchPlayfield.cs +++ b/osu.Game/Modes/Catch/CatchPlayfield.cs @@ -5,7 +5,7 @@ using osu.Framework.Graphics.Sprites; using OpenTK; -namespace osu.Game.Screens.Play.Catch +namespace osu.Game.Modes.Catch { public class CatchPlayfield : Playfield { diff --git a/osu.Game/Screens/Play/Catch/CatchRuleset.cs b/osu.Game/Modes/Catch/CatchRuleset.cs similarity index 78% rename from osu.Game/Screens/Play/Catch/CatchRuleset.cs rename to osu.Game/Modes/Catch/CatchRuleset.cs index ab887a23f8..a92518b0db 100644 --- a/osu.Game/Screens/Play/Catch/CatchRuleset.cs +++ b/osu.Game/Modes/Catch/CatchRuleset.cs @@ -2,10 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Beatmaps.Objects; -using osu.Game.Screens.Play.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu; -namespace osu.Game.Screens.Play.Catch +namespace osu.Game.Modes.Catch { class CatchRuleset : Ruleset { diff --git a/osu.Game/Screens/Play/ComboCounter.cs b/osu.Game/Modes/ComboCounter.cs similarity index 96% rename from osu.Game/Screens/Play/ComboCounter.cs rename to osu.Game/Modes/ComboCounter.cs index f634e215b5..cc00ac700a 100644 --- a/osu.Game/Screens/Play/ComboCounter.cs +++ b/osu.Game/Modes/ComboCounter.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics.Transformations; using osu.Framework.MathUtils; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public abstract class ComboCounter : Container { diff --git a/osu.Game/Screens/Play/ComboResultCounter.cs b/osu.Game/Modes/ComboResultCounter.cs similarity index 95% rename from osu.Game/Screens/Play/ComboResultCounter.cs rename to osu.Game/Modes/ComboResultCounter.cs index 0c6eb8f2fe..4ae203363e 100644 --- a/osu.Game/Screens/Play/ComboResultCounter.cs +++ b/osu.Game/Modes/ComboResultCounter.cs @@ -7,7 +7,7 @@ using osu.Framework.MathUtils; using osu.Game.Graphics.UserInterface; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { /// /// Used to display combo with a roll-up animation in results screen. diff --git a/osu.Game/Screens/Play/HitRenderer.cs b/osu.Game/Modes/HitRenderer.cs similarity index 93% rename from osu.Game/Screens/Play/HitRenderer.cs rename to osu.Game/Modes/HitRenderer.cs index 8dd1ab97aa..e73669ff6a 100644 --- a/osu.Game/Screens/Play/HitRenderer.cs +++ b/osu.Game/Modes/HitRenderer.cs @@ -7,9 +7,9 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps.Objects; +using osu.Game.Modes.Objects; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public abstract class HitRenderer : Container { diff --git a/osu.Game/Screens/Play/Mania/ManiaComboCounter.cs b/osu.Game/Modes/Mania/ManiaComboCounter.cs similarity index 94% rename from osu.Game/Screens/Play/Mania/ManiaComboCounter.cs rename to osu.Game/Modes/Mania/ManiaComboCounter.cs index 9be76a112f..26e654622f 100644 --- a/osu.Game/Screens/Play/Mania/ManiaComboCounter.cs +++ b/osu.Game/Modes/Mania/ManiaComboCounter.cs @@ -3,10 +3,10 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; -using osu.Game.Screens.Play.Taiko; +using osu.Game.Modes.Taiko; using OpenTK.Graphics; -namespace osu.Game.Screens.Play.Mania +namespace osu.Game.Modes.Mania { /// /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania. diff --git a/osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs b/osu.Game/Modes/Mania/ManiaHitRenderer.cs similarity index 86% rename from osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs rename to osu.Game/Modes/Mania/ManiaHitRenderer.cs index 73c106949b..82f6bd1e9d 100644 --- a/osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs +++ b/osu.Game/Modes/Mania/ManiaHitRenderer.cs @@ -1,10 +1,10 @@ //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; -using osu.Game.Beatmaps.Objects.Mania; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Mania; -namespace osu.Game.Screens.Play.Mania +namespace osu.Game.Modes.Mania { public class ManiaHitRenderer : HitRenderer { diff --git a/osu.Game/Screens/Play/Mania/ManiaPlayfield.cs b/osu.Game/Modes/Mania/ManiaPlayfield.cs similarity index 93% rename from osu.Game/Screens/Play/Mania/ManiaPlayfield.cs rename to osu.Game/Modes/Mania/ManiaPlayfield.cs index b5f91de664..277927ffde 100644 --- a/osu.Game/Screens/Play/Mania/ManiaPlayfield.cs +++ b/osu.Game/Modes/Mania/ManiaPlayfield.cs @@ -6,7 +6,7 @@ using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Screens.Play.Mania +namespace osu.Game.Modes.Mania { public class ManiaPlayfield : Playfield { diff --git a/osu.Game/Screens/Play/Mania/ManiaRuleset.cs b/osu.Game/Modes/Mania/ManiaRuleset.cs similarity index 78% rename from osu.Game/Screens/Play/Mania/ManiaRuleset.cs rename to osu.Game/Modes/Mania/ManiaRuleset.cs index 193a1b35ac..29935ce6f8 100644 --- a/osu.Game/Screens/Play/Mania/ManiaRuleset.cs +++ b/osu.Game/Modes/Mania/ManiaRuleset.cs @@ -2,10 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Beatmaps.Objects; -using osu.Game.Screens.Play.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu; -namespace osu.Game.Screens.Play.Mania +namespace osu.Game.Modes.Mania { class ManiaRuleset : Ruleset { diff --git a/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs b/osu.Game/Modes/Objects/Catch/CatchBaseHit.cs similarity index 82% rename from osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs rename to osu.Game/Modes/Objects/Catch/CatchBaseHit.cs index 590bd8f5b3..29bc967e01 100644 --- a/osu.Game/Beatmaps/Objects/Catch/CatchBaseHit.cs +++ b/osu.Game/Modes/Objects/Catch/CatchBaseHit.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Catch { public abstract class CatchBaseHit : HitObject { diff --git a/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs b/osu.Game/Modes/Objects/Catch/CatchConverter.cs similarity index 80% rename from osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs rename to osu.Game/Modes/Objects/Catch/CatchConverter.cs index 317a4e9bb1..49d889df23 100644 --- a/osu.Game/Beatmaps/Objects/Catch/CatchConverter.cs +++ b/osu.Game/Modes/Objects/Catch/CatchConverter.cs @@ -1,15 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Game.Beatmaps.Objects.Catch; -using osu.Game.Beatmaps.Objects.Osu; +using osu.Game.Modes.Objects.Osu; -namespace osu.Game.Beatmaps.Objects.Catch +namespace osu.Game.Modes.Objects.Catch { class CatchConverter : HitObjectConverter { diff --git a/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs b/osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs similarity index 84% rename from osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs rename to osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs index 4664bacc30..b0a5a2f16d 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Drawable/DrawableFruit.cs +++ b/osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs @@ -1,20 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using OpenTK; -using osu.Framework.Allocation; -using osu.Framework.Graphics.Textures; -namespace osu.Game.Beatmaps.Objects.Catch.Drawable +namespace osu.Game.Modes.Objects.Catch.Drawable { class DrawableFruit : Sprite { diff --git a/osu.Game/Beatmaps/Objects/Catch/Droplet.cs b/osu.Game/Modes/Objects/Catch/Droplet.cs similarity index 80% rename from osu.Game/Beatmaps/Objects/Catch/Droplet.cs rename to osu.Game/Modes/Objects/Catch/Droplet.cs index fd7967315d..e33dc29138 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Droplet.cs +++ b/osu.Game/Modes/Objects/Catch/Droplet.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Catch { public class Droplet : CatchBaseHit { diff --git a/osu.Game/Beatmaps/Objects/Catch/Fruit.cs b/osu.Game/Modes/Objects/Catch/Fruit.cs similarity index 80% rename from osu.Game/Beatmaps/Objects/Catch/Fruit.cs rename to osu.Game/Modes/Objects/Catch/Fruit.cs index 9ef76de841..ee7bc38c6d 100644 --- a/osu.Game/Beatmaps/Objects/Catch/Fruit.cs +++ b/osu.Game/Modes/Objects/Catch/Fruit.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Catch { public class Fruit : CatchBaseHit { diff --git a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs b/osu.Game/Modes/Objects/DrawableHitObject.cs similarity index 88% rename from osu.Game/Beatmaps/Objects/DrawableHitObject.cs rename to osu.Game/Modes/Objects/DrawableHitObject.cs index 380e527de4..8af7186d63 100644 --- a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs +++ b/osu.Game/Modes/Objects/DrawableHitObject.cs @@ -2,15 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps.Objects.Osu.Drawable; -namespace osu.Game.Beatmaps.Objects +namespace osu.Game.Modes.Objects { public abstract class DrawableHitObject : Container, IStateful { diff --git a/osu.Game/Beatmaps/Objects/HitObject.cs b/osu.Game/Modes/Objects/HitObject.cs similarity index 88% rename from osu.Game/Beatmaps/Objects/HitObject.cs rename to osu.Game/Modes/Objects/HitObject.cs index 597d6b4c6a..fe63579d67 100644 --- a/osu.Game/Beatmaps/Objects/HitObject.cs +++ b/osu.Game/Modes/Objects/HitObject.cs @@ -1,12 +1,11 @@ //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; using osu.Game.Beatmaps.Samples; -using osu.Game.Screens.Play; +using osu.Game.Modes.Objects.Osu; using OpenTK.Graphics; -namespace osu.Game.Beatmaps.Objects +namespace osu.Game.Modes.Objects { /// /// A hitobject describes a point in a beatmap diff --git a/osu.Game/Beatmaps/Objects/HitObjectConverter.cs b/osu.Game/Modes/Objects/HitObjectConverter.cs similarity index 91% rename from osu.Game/Beatmaps/Objects/HitObjectConverter.cs rename to osu.Game/Modes/Objects/HitObjectConverter.cs index 723199d8f1..73a27f9e96 100644 --- a/osu.Game/Beatmaps/Objects/HitObjectConverter.cs +++ b/osu.Game/Modes/Objects/HitObjectConverter.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace osu.Game.Beatmaps.Objects +namespace osu.Game.Modes.Objects { public abstract class HitObjectConverter where T : HitObject diff --git a/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs b/osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs similarity index 91% rename from osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs rename to osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs index ed8b42df61..34c7217dbb 100644 --- a/osu.Game/Beatmaps/Objects/Mania/Drawable/DrawableNote.cs +++ b/osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs @@ -1,15 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using OpenTK; -using osu.Framework.Allocation; -using osu.Framework.Graphics.Textures; -namespace osu.Game.Beatmaps.Objects.Mania.Drawable +namespace osu.Game.Modes.Objects.Mania.Drawable { public class DrawableNote : Sprite { diff --git a/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs b/osu.Game/Modes/Objects/Mania/HoldNote.cs similarity index 79% rename from osu.Game/Beatmaps/Objects/Mania/HoldNote.cs rename to osu.Game/Modes/Objects/Mania/HoldNote.cs index 37e95d8df1..fd6ff8ba6d 100644 --- a/osu.Game/Beatmaps/Objects/Mania/HoldNote.cs +++ b/osu.Game/Modes/Objects/Mania/HoldNote.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Mania { public class HoldNote : Note { diff --git a/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs b/osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs similarity index 82% rename from osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs rename to osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs index d3fe475c6f..09ad613f1b 100644 --- a/osu.Game/Beatmaps/Objects/Mania/ManiaBaseHit.cs +++ b/osu.Game/Modes/Objects/Mania/ManiaBaseHit.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Mania { public abstract class ManiaBaseHit : HitObject { diff --git a/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs b/osu.Game/Modes/Objects/Mania/ManiaConverter.cs similarity index 90% rename from osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs rename to osu.Game/Modes/Objects/Mania/ManiaConverter.cs index cc03244709..06a2481875 100644 --- a/osu.Game/Beatmaps/Objects/Mania/ManiaConverter.cs +++ b/osu.Game/Modes/Objects/Mania/ManiaConverter.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using osu.Game.Beatmaps.Objects.Osu; +using osu.Game.Modes.Objects.Osu; -namespace osu.Game.Beatmaps.Objects.Mania +namespace osu.Game.Modes.Objects.Mania { class ManiaConverter : HitObjectConverter { diff --git a/osu.Game/Beatmaps/Objects/Mania/Note.cs b/osu.Game/Modes/Objects/Mania/Note.cs similarity index 80% rename from osu.Game/Beatmaps/Objects/Mania/Note.cs rename to osu.Game/Modes/Objects/Mania/Note.cs index d6e9b0e66c..df8c06f9bd 100644 --- a/osu.Game/Beatmaps/Objects/Mania/Note.cs +++ b/osu.Game/Modes/Objects/Mania/Note.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Mania { public class Note : ManiaBaseHit { diff --git a/osu.Game/Beatmaps/Objects/Osu/Circle.cs b/osu.Game/Modes/Objects/Osu/Circle.cs similarity index 73% rename from osu.Game/Beatmaps/Objects/Osu/Circle.cs rename to osu.Game/Modes/Objects/Osu/Circle.cs index 9b7f92f29e..7a5a21b710 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Circle.cs +++ b/osu.Game/Modes/Objects/Osu/Circle.cs @@ -1,9 +1,7 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK.Graphics; - -namespace osu.Game.Beatmaps.Objects.Osu +namespace osu.Game.Modes.Objects.Osu { public class Circle : OsuBaseHit { diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Modes/Objects/Osu/Drawable/DrawableCircle.cs similarity index 96% rename from osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs rename to osu.Game/Modes/Objects/Osu/Drawable/DrawableCircle.cs index 65d93ec651..eebe86a847 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs +++ b/osu.Game/Modes/Objects/Osu/Drawable/DrawableCircle.cs @@ -3,6 +3,7 @@ using System; using osu.Framework; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; @@ -11,9 +12,8 @@ using osu.Framework.Input; using osu.Framework.MathUtils; using OpenTK; -using osu.Framework.Allocation; -namespace osu.Game.Beatmaps.Objects.Osu.Drawable +namespace osu.Game.Modes.Objects.Osu.Drawable { public class DrawableCircle : DrawableHitObject { diff --git a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs b/osu.Game/Modes/Objects/Osu/OsuBaseHit.cs similarity index 94% rename from osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs rename to osu.Game/Modes/Objects/Osu/OsuBaseHit.cs index e4bb272404..db479e0ffd 100644 --- a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs +++ b/osu.Game/Modes/Objects/Osu/OsuBaseHit.cs @@ -2,10 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using OpenTK; using osu.Game.Beatmaps.Samples; +using OpenTK; -namespace osu.Game.Beatmaps.Objects.Osu +namespace osu.Game.Modes.Objects.Osu { public abstract class OsuBaseHit : HitObject { diff --git a/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs b/osu.Game/Modes/Objects/Osu/OsuConverter.cs similarity index 87% rename from osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs rename to osu.Game/Modes/Objects/Osu/OsuConverter.cs index 5629fccd5c..29ab69d470 100644 --- a/osu.Game/Beatmaps/Objects/Osu/OsuConverter.cs +++ b/osu.Game/Modes/Objects/Osu/OsuConverter.cs @@ -1,10 +1,9 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -namespace osu.Game.Beatmaps.Objects.Osu +namespace osu.Game.Modes.Objects.Osu { class OsuConverter : HitObjectConverter { diff --git a/osu.Game/Beatmaps/Objects/Osu/Slider.cs b/osu.Game/Modes/Objects/Osu/Slider.cs similarity index 85% rename from osu.Game/Beatmaps/Objects/Osu/Slider.cs rename to osu.Game/Modes/Objects/Osu/Slider.cs index fef9cd858c..1ebadac973 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Slider.cs +++ b/osu.Game/Modes/Objects/Osu/Slider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using OpenTK; -namespace osu.Game.Beatmaps.Objects.Osu +namespace osu.Game.Modes.Objects.Osu { public class Slider : OsuBaseHit { diff --git a/osu.Game/Beatmaps/Objects/Osu/Spinner.cs b/osu.Game/Modes/Objects/Osu/Spinner.cs similarity index 80% rename from osu.Game/Beatmaps/Objects/Osu/Spinner.cs rename to osu.Game/Modes/Objects/Osu/Spinner.cs index e19af7c5ba..64a755ad64 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Spinner.cs +++ b/osu.Game/Modes/Objects/Osu/Spinner.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Osu { public class Spinner : OsuBaseHit { diff --git a/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs b/osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs similarity index 91% rename from osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs rename to osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs index 7113016d51..5a77aa1c58 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/Drawable/DrawableTaikoHit.cs +++ b/osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs @@ -1,15 +1,14 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transformations; using OpenTK; -using osu.Framework.Allocation; -using osu.Framework.Graphics.Textures; -namespace osu.Game.Beatmaps.Objects.Taiko.Drawable +namespace osu.Game.Modes.Objects.Taiko.Drawable { class DrawableTaikoHit : Sprite { diff --git a/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs b/osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs similarity index 85% rename from osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs rename to osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs index 6b8f241306..3805326b2a 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/TaikoBaseHit.cs +++ b/osu.Game/Modes/Objects/Taiko/TaikoBaseHit.cs @@ -1,7 +1,7 @@ //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 +namespace osu.Game.Modes.Objects.Taiko { public class TaikoBaseHit : HitObject { diff --git a/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs b/osu.Game/Modes/Objects/Taiko/TaikoConverter.cs similarity index 87% rename from osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs rename to osu.Game/Modes/Objects/Taiko/TaikoConverter.cs index d70e8f8406..62d90beedc 100644 --- a/osu.Game/Beatmaps/Objects/Taiko/TaikoConverter.cs +++ b/osu.Game/Modes/Objects/Taiko/TaikoConverter.cs @@ -1,11 +1,10 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using System.Collections.Generic; -using osu.Game.Beatmaps.Objects.Osu; +using osu.Game.Modes.Objects.Osu; -namespace osu.Game.Beatmaps.Objects.Taiko +namespace osu.Game.Modes.Objects.Taiko { class TaikoConverter : HitObjectConverter { diff --git a/osu.Game/Screens/Play/Osu/OsuComboCounter.cs b/osu.Game/Modes/Osu/OsuComboCounter.cs similarity index 96% rename from osu.Game/Screens/Play/Osu/OsuComboCounter.cs rename to osu.Game/Modes/Osu/OsuComboCounter.cs index 3a86f79ac1..58edaa096c 100644 --- a/osu.Game/Screens/Play/Osu/OsuComboCounter.cs +++ b/osu.Game/Modes/Osu/OsuComboCounter.cs @@ -3,7 +3,7 @@ using OpenTK; -namespace osu.Game.Screens.Play.Osu +namespace osu.Game.Modes.Osu { /// /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard. diff --git a/osu.Game/Screens/Play/Osu/OsuHitRenderer.cs b/osu.Game/Modes/Osu/OsuHitRenderer.cs similarity index 76% rename from osu.Game/Screens/Play/Osu/OsuHitRenderer.cs rename to osu.Game/Modes/Osu/OsuHitRenderer.cs index b982998c3e..ffed72d8f1 100644 --- a/osu.Game/Screens/Play/Osu/OsuHitRenderer.cs +++ b/osu.Game/Modes/Osu/OsuHitRenderer.cs @@ -1,11 +1,11 @@ //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; -using osu.Game.Beatmaps.Objects.Osu; -using osu.Game.Beatmaps.Objects.Osu.Drawable; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Osu; +using osu.Game.Modes.Objects.Osu.Drawable; -namespace osu.Game.Screens.Play.Osu +namespace osu.Game.Modes.Osu { public class OsuHitRenderer : HitRenderer { diff --git a/osu.Game/Screens/Play/Osu/OsuPlayfield.cs b/osu.Game/Modes/Osu/OsuPlayfield.cs similarity index 94% rename from osu.Game/Screens/Play/Osu/OsuPlayfield.cs rename to osu.Game/Modes/Osu/OsuPlayfield.cs index 291bfd16be..33dc9a7cc4 100644 --- a/osu.Game/Screens/Play/Osu/OsuPlayfield.cs +++ b/osu.Game/Modes/Osu/OsuPlayfield.cs @@ -7,7 +7,7 @@ using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Screens.Play.Osu +namespace osu.Game.Modes.Osu { public class OsuPlayfield : Playfield { diff --git a/osu.Game/Screens/Play/Osu/OsuRuleset.cs b/osu.Game/Modes/Osu/OsuRuleset.cs similarity index 84% rename from osu.Game/Screens/Play/Osu/OsuRuleset.cs rename to osu.Game/Modes/Osu/OsuRuleset.cs index afc461d876..bf7c7498ec 100644 --- a/osu.Game/Screens/Play/Osu/OsuRuleset.cs +++ b/osu.Game/Modes/Osu/OsuRuleset.cs @@ -2,9 +2,9 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Beatmaps.Objects; +using osu.Game.Modes.Objects; -namespace osu.Game.Screens.Play.Osu +namespace osu.Game.Modes.Osu { class OsuRuleset : Ruleset { diff --git a/osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs b/osu.Game/Modes/Osu/ScoreOverlayOsu.cs similarity index 94% rename from osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs rename to osu.Game/Modes/Osu/ScoreOverlayOsu.cs index dda22cbbb6..3654191b8d 100644 --- a/osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs +++ b/osu.Game/Modes/Osu/ScoreOverlayOsu.cs @@ -6,7 +6,7 @@ using OpenTK; using OpenTK.Input; -namespace osu.Game.Screens.Play.Osu +namespace osu.Game.Modes.Osu { class ScoreOverlayOsu : ScoreOverlay { diff --git a/osu.Game/Screens/Play/PlayMode.cs b/osu.Game/Modes/PlayMode.cs similarity index 89% rename from osu.Game/Screens/Play/PlayMode.cs rename to osu.Game/Modes/PlayMode.cs index c1c3f25e72..d1b0f23ee4 100644 --- a/osu.Game/Screens/Play/PlayMode.cs +++ b/osu.Game/Modes/PlayMode.cs @@ -4,7 +4,7 @@ using System.ComponentModel; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public enum PlayMode { diff --git a/osu.Game/Screens/Play/Playfield.cs b/osu.Game/Modes/Playfield.cs similarity index 85% rename from osu.Game/Screens/Play/Playfield.cs rename to osu.Game/Modes/Playfield.cs index 1acd52638b..4fe1887962 100644 --- a/osu.Game/Screens/Play/Playfield.cs +++ b/osu.Game/Modes/Playfield.cs @@ -3,7 +3,7 @@ using osu.Framework.Graphics.Containers; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public class Playfield : Container { diff --git a/osu.Game/Screens/Play/Ruleset.cs b/osu.Game/Modes/Ruleset.cs similarity index 77% rename from osu.Game/Screens/Play/Ruleset.cs rename to osu.Game/Modes/Ruleset.cs index 5deb994309..12d0fbb718 100644 --- a/osu.Game/Screens/Play/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -2,13 +2,13 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Beatmaps.Objects; -using osu.Game.Screens.Play.Catch; -using osu.Game.Screens.Play.Mania; -using osu.Game.Screens.Play.Osu; -using osu.Game.Screens.Play.Taiko; +using osu.Game.Modes.Catch; +using osu.Game.Modes.Mania; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu; +using osu.Game.Modes.Taiko; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public abstract class Ruleset { diff --git a/osu.Game/Screens/Play/ScoreOverlay.cs b/osu.Game/Modes/ScoreOverlay.cs similarity index 93% rename from osu.Game/Screens/Play/ScoreOverlay.cs rename to osu.Game/Modes/ScoreOverlay.cs index f242a97da2..52b42f640f 100644 --- a/osu.Game/Screens/Play/ScoreOverlay.cs +++ b/osu.Game/Modes/ScoreOverlay.cs @@ -4,10 +4,10 @@ using System; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Beatmaps.Objects; using osu.Game.Graphics.UserInterface; +using osu.Game.Modes.Objects; -namespace osu.Game.Screens.Play +namespace osu.Game.Modes { public abstract class ScoreOverlay : Container { diff --git a/osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs b/osu.Game/Modes/Taiko/TaikoComboCounter.cs similarity index 95% rename from osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs rename to osu.Game/Modes/Taiko/TaikoComboCounter.cs index beb96f94f9..ac7211a92e 100644 --- a/osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs +++ b/osu.Game/Modes/Taiko/TaikoComboCounter.cs @@ -4,7 +4,7 @@ using osu.Framework.Graphics.Transformations; using OpenTK; -namespace osu.Game.Screens.Play.Taiko +namespace osu.Game.Modes.Taiko { /// /// Allows tint and scaling animations. Used in osu!taiko. diff --git a/osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs b/osu.Game/Modes/Taiko/TaikoHitRenderer.cs similarity index 80% rename from osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs rename to osu.Game/Modes/Taiko/TaikoHitRenderer.cs index ec02c89d9a..5b6119e2ad 100644 --- a/osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs +++ b/osu.Game/Modes/Taiko/TaikoHitRenderer.cs @@ -1,10 +1,10 @@ //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; -using osu.Game.Beatmaps.Objects.Taiko; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Objects.Taiko; -namespace osu.Game.Screens.Play.Taiko +namespace osu.Game.Modes.Taiko { public class TaikoHitRenderer : HitRenderer { diff --git a/osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs b/osu.Game/Modes/Taiko/TaikoPlayfield.cs similarity index 93% rename from osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs rename to osu.Game/Modes/Taiko/TaikoPlayfield.cs index c8dee06a45..7d999ae213 100644 --- a/osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs +++ b/osu.Game/Modes/Taiko/TaikoPlayfield.cs @@ -8,7 +8,7 @@ using OpenTK; using OpenTK.Graphics; -namespace osu.Game.Screens.Play.Taiko +namespace osu.Game.Modes.Taiko { public class TaikoPlayfield : Playfield { diff --git a/osu.Game/Screens/Play/Taiko/TaikoRuleset.cs b/osu.Game/Modes/Taiko/TaikoRuleset.cs similarity index 78% rename from osu.Game/Screens/Play/Taiko/TaikoRuleset.cs rename to osu.Game/Modes/Taiko/TaikoRuleset.cs index 0ae94a118a..b90c96113d 100644 --- a/osu.Game/Screens/Play/Taiko/TaikoRuleset.cs +++ b/osu.Game/Modes/Taiko/TaikoRuleset.cs @@ -2,10 +2,10 @@ //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; -using osu.Game.Beatmaps.Objects; -using osu.Game.Screens.Play.Osu; +using osu.Game.Modes.Objects; +using osu.Game.Modes.Osu; -namespace osu.Game.Screens.Play.Taiko +namespace osu.Game.Modes.Taiko { class TaikoRuleset : Ruleset { diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index e78c58a656..bccaa398ff 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -19,6 +19,7 @@ using osu.Game.Graphics.UserInterface.Volume; using osu.Game.Database; using osu.Framework.Allocation; +using osu.Game.Modes; using osu.Game.Screens; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs index 77b35740ce..0e343a05dd 100644 --- a/osu.Game/Overlays/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar.cs @@ -12,6 +12,7 @@ using osu.Game.Graphics; using osu.Framework.Graphics.Sprites; using osu.Framework.Allocation; +using osu.Game.Modes; using osu.Game.Screens.Play; namespace osu.Game.Overlays diff --git a/osu.Game/Overlays/ToolbarModeButton.cs b/osu.Game/Overlays/ToolbarModeButton.cs index e2982597f5..c10b8514db 100644 --- a/osu.Game/Overlays/ToolbarModeButton.cs +++ b/osu.Game/Overlays/ToolbarModeButton.cs @@ -6,6 +6,7 @@ using OpenTK.Graphics; using osu.Framework; using osu.Framework.Allocation; +using osu.Game.Modes; using osu.Game.Screens.Play; namespace osu.Game.Overlays diff --git a/osu.Game/Overlays/ToolbarModeSelector.cs b/osu.Game/Overlays/ToolbarModeSelector.cs index a0b8216f98..9b6d8a7fe1 100644 --- a/osu.Game/Overlays/ToolbarModeSelector.cs +++ b/osu.Game/Overlays/ToolbarModeSelector.cs @@ -12,6 +12,7 @@ using osu.Framework.Caching; using osu.Framework.Graphics.Sprites; using osu.Framework.Allocation; +using osu.Game.Modes; using osu.Game.Screens.Play; namespace osu.Game.Overlays diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 11aaf3cc19..8ab8596cd6 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -7,6 +7,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; using osu.Game.Graphics.Containers; +using osu.Game.Modes; using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Charts; using osu.Game.Screens.Direct; diff --git a/osu.Game/Screens/Play/PlaySongSelect.cs b/osu.Game/Screens/Play/PlaySongSelect.cs index 352a307f63..4c4c188e04 100644 --- a/osu.Game/Screens/Play/PlaySongSelect.cs +++ b/osu.Game/Screens/Play/PlaySongSelect.cs @@ -17,6 +17,7 @@ using osu.Game.Beatmaps; using osu.Game.Beatmaps.Drawable; using osu.Game.Database; +using osu.Game.Modes; using osu.Game.Screens.Backgrounds; using OpenTK; using OpenTK.Graphics; diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 62a0e7dce5..4030d02986 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -9,8 +9,9 @@ using osu.Framework.Input; using osu.Framework.Platform; using osu.Framework.Timing; -using osu.Game.Beatmaps.Objects; using osu.Game.Database; +using osu.Game.Modes; +using osu.Game.Modes.Objects; using osu.Game.Screens.Backgrounds; using OpenTK.Input; using MouseState = osu.Framework.Input.MouseState; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 4e056a03e7..9317741df2 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -71,28 +71,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -121,37 +121,37 @@ - - + + - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - + @@ -159,15 +159,15 @@ - + - - + +