h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 05:22:54 +08:00
Code Issues Releases Wiki Activity

General namespace tidy-up

Browse Source
This commit is contained in:
Dean Herbert 2019-06-18 14:51:48 +09:00
parent 4f5abeb79f
commit 96e24ebd20
48 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tournament.Tests/LadderTestScene.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Tests
{

2
osu.Game.Tournament.Tests/TestSceneGroupingsEditorScreen.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Tournament.Screens.Rounds;
using osu.Game.Tournament.Screens.Editors;
namespace osu.Game.Tournament.Tests
{

1
osu.Game.Tournament.Tests/TestSceneMatchPairings.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Ladder.Components;
namespace osu.Game.Tournament.Tests

1
osu.Game.Tournament.Tests/TestSceneSceneManager.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Allocation;
using osu.Framework.Platform;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Screens;
namespace osu.Game.Tournament.Tests
{

2
osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.TeamIntro;
namespace osu.Game.Tournament.Tests

2
osu.Game.Tournament.Tests/TestSceneTeamWin.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.TeamWin;
namespace osu.Game.Tournament.Tests

2
osu.Game.Tournament.Tests/TestSceneTeamsEditorScreen.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Tournament.Screens.Teams;
using osu.Game.Tournament.Screens.Editors;
namespace osu.Game.Tournament.Tests
{

2
osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Online.Chat;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Users;
namespace osu.Game.Tournament.Tests

1
osu.Game.Tournament/Components/DrawableTournamentTeam.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Components
{

2
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -16,7 +16,7 @@ using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;

1
osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics;
using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;

1
osu.Game.Tournament/IPC/FileBasedIPC.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Legacy;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Rulesets;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.IPC
{

2
osu.Game.Tournament/Screens/Ladder/Components/BeatmapChoice.cs → osu.Game.Tournament/Models/BeatmapChoice.cs
View File

@ -4,7 +4,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
public class BeatmapChoice
{

2
osu.Game.Tournament/Screens/Ladder/Components/LadderEditorInfo.cs → osu.Game.Tournament/Models/LadderEditorInfo.cs
View File

@ -3,7 +3,7 @@
using osu.Framework.Bindables;
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
public class LadderEditorInfo
{

4
osu.Game.Tournament/LadderInfo.cs → osu.Game.Tournament/Models/LadderInfo.cs
View File

@ -4,10 +4,8 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
namespace osu.Game.Tournament
namespace osu.Game.Tournament.Models
{
public class LadderInfo
{

4
osu.Game.Tournament/Screens/Ladder/Components/MatchPairing.cs → osu.Game.Tournament/Models/MatchPairing.cs
View File

@ -6,10 +6,10 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using SixLabors.Primitives;
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
/// <summary>
/// A collection of two teams competing in a head-to-head match.

2
osu.Game.Tournament/Screens/Ladder/Components/RoundBeatmap.cs → osu.Game.Tournament/Models/RoundBeatmap.cs
View File

@ -3,7 +3,7 @@
using osu.Game.Beatmaps;
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
public class RoundBeatmap
{

2
osu.Game.Tournament/Screens/Ladder/Components/TournamentProgression.cs → osu.Game.Tournament/Models/TournamentProgression.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
public class TournamentProgression
{

2
osu.Game.Tournament/Screens/Ladder/Components/TournamentRound.cs → osu.Game.Tournament/Models/TournamentRound.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Framework.Bindables;
namespace osu.Game.Tournament.Screens.Ladder.Components
namespace osu.Game.Tournament.Models
{
[Serializable]
public class TournamentRound

2
osu.Game.Tournament/Components/TournamentTeam.cs → osu.Game.Tournament/Models/TournamentTeam.cs
View File

@ -6,7 +6,7 @@ using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Game.Users;
namespace osu.Game.Tournament.Components
namespace osu.Game.Tournament.Models
{
[Serializable]
public class TournamentTeam

1
osu.Game.Tournament/Screens/Drawings/Components/Group.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;

2
osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osuTK;
namespace osu.Game.Tournament.Screens.Drawings.Components

2
osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens.Drawings.Components
{

1
osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading;
using osu.Game.Graphics;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;

2
osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens.Drawings.Components
{

1
osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
View File

@ -17,6 +17,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Drawings.Components;
using osuTK;
using osuTK.Graphics;

4
osu.Game.Tournament/Screens/Ladder/LadderEditorScreen.cs → osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
View File

@ -11,12 +11,14 @@ using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osu.Framework.Input.States;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Ladder;
using osu.Game.Tournament.Screens.Ladder.Components;
using osuTK;
using osuTK.Graphics;
using SixLabors.Primitives;
namespace osu.Game.Tournament.Screens.Ladder
namespace osu.Game.Tournament.Screens.Editors
{
[Cached]
public class LadderEditorScreen : LadderScreen, IHasContextMenu

4
osu.Game.Tournament/Screens/Rounds/RoundEditorScreen.cs → osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
View File

@ -11,10 +11,10 @@ using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Settings;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osuTK;
namespace osu.Game.Tournament.Screens.Rounds
namespace osu.Game.Tournament.Screens.Editors
{
public class RoundEditorScreen : TournamentScreen, IProvideVideo
{

3
osu.Game.Tournament/Screens/Teams/TeamsEditorScreen.cs → osu.Game.Tournament/Screens/Editors/TeamsEditorScreen.cs
View File

@ -14,10 +14,11 @@ using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Overlays.Settings;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Users;
using osuTK;
namespace osu.Game.Tournament.Screens.Teams
namespace osu.Game.Tournament.Screens.Editors
{
public class TeamsEditorScreen : TournamentScreen, IProvideVideo
{

2
osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
View File

@ -11,7 +11,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Showcase;
using osuTK;
using osuTK.Graphics;

1
osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Gameplay.Components

2
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
View File

@ -10,8 +10,8 @@ using osu.Framework.Threading;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Gameplay.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.MapPool;
using osu.Game.Tournament.Screens.TeamWin;
using osuTK;

3
osu.Game.Tournament/Screens/IProvideVideo.cs
View File

@ -3,6 +3,9 @@
namespace osu.Game.Tournament.Screens
{
/// <summary>
/// Marker interface for a screen which provides its own local video background.
/// </summary>
public interface IProvideVideo
{
}

2
osu.Game.Tournament/Screens/Ladder/Components/ConditionalMatchPairing.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens.Ladder.Components
{
/// <summary>

2
osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
View File

@ -9,7 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;

2
osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
View File

@ -14,6 +14,8 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Editors;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;

1
osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Models;
using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Ladder.Components

1
osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Input.Events;
using osu.Game.Overlays.Settings;
using osu.Game.Screens.Play.PlayerSettings;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens.Ladder.Components
{

2
osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
View File

@ -11,6 +11,8 @@ using osu.Framework.Graphics.Lines;
using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Editors;
using osu.Game.Tournament.Screens.Ladder.Components;
using osuTK.Graphics;

2
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -13,9 +13,9 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Gameplay;
using osu.Game.Tournament.Screens.Gameplay.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;

1
osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Ladder.Components;
using osuTK;
using osuTK.Graphics;

2
osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
View File

@ -9,7 +9,7 @@ using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Showcase;
using osuTK;
using osuTK.Graphics;

2
osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
View File

@ -9,7 +9,7 @@ using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.Showcase;
using osuTK;
using osuTK.Graphics;

5
osu.Game.Tournament/Screens/TournamentScreen.cs
View File

@ -4,15 +4,16 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Tournament.Models;
namespace osu.Game.Tournament.Screens
{
public class TournamentScreen : CompositeDrawable
public abstract class TournamentScreen : CompositeDrawable
{
[Resolved]
protected LadderInfo LadderInfo { get; private set; }
public TournamentScreen()
protected TournamentScreen()
{
RelativeSizeAxes = Axes.Both;
}

1
osu.Game.Tournament/TournamentGame.cs
View File

@ -5,7 +5,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Cursor;
using osu.Game.Tournament.Screens;
namespace osu.Game.Tournament
{

3
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -19,9 +19,8 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests;
using osu.Game.Rulesets;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Models;
using osuTK.Input;
namespace osu.Game.Tournament

7
osu.Game.Tournament/Screens/TournamentSceneManager.cs → osu.Game.Tournament/TournamentSceneManager.cs
View File

@ -10,20 +10,21 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens;
using osu.Game.Tournament.Screens.Drawings;
using osu.Game.Tournament.Screens.Editors;
using osu.Game.Tournament.Screens.Gameplay;
using osu.Game.Tournament.Screens.Ladder;
using osu.Game.Tournament.Screens.MapPool;
using osu.Game.Tournament.Screens.Rounds;
using osu.Game.Tournament.Screens.Schedule;
using osu.Game.Tournament.Screens.Showcase;
using osu.Game.Tournament.Screens.TeamIntro;
using osu.Game.Tournament.Screens.Teams;
using osu.Game.Tournament.Screens.TeamWin;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Tournament.Screens
namespace osu.Game.Tournament
{
[Cached]
public class TournamentSceneManager : CompositeDrawable

3
osu.Game.Tournament/osu.Game.Tournament.csproj
View File

@ -10,4 +10,7 @@
<ItemGroup Label="Project References">
<ProjectReference Include="..\osu.Game\osu.Game.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Screens\Rounds" />
</ItemGroup>
</Project>