Let's not use Country for drawings-specific stuff...

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using osu.Framework.Testing;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
-using osu.Game.Users;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -25,57 +24,57 @@ namespace osu.Desktop.VisualTests.Tests
 
         private class TestTeamList : ITeamList
         {
-            public IEnumerable<Country> Teams { get; } = new[]
+            public IEnumerable<Team> Teams { get; } = new[]
             {
-                new Country
+                new Team
                 {
                     FlagName = "GB",
                     FullName = "United Kingdom",
                     Acronym = "UK"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "FR",
                     FullName = "France",
                     Acronym = "FRA"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "CN",
                     FullName = "China",
                     Acronym = "CHN"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "AU",
                     FullName = "Australia",
                     Acronym = "AUS"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "JP",
                     FullName = "Japan",
                     Acronym = "JPN"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "RO",
                     FullName = "Romania",
                     Acronym = "ROM"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "IT",
                     FullName = "Italy",
                     Acronym = "PIZZA"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "VE",
                     FullName = "Venezuela",
                     Acronym = "VNZ"
                 },
-                new Country
+                new Team
                 {
                     FlagName = "US",
                     FullName = "United States of America",

osu.Game/Screens/Tournament/Drawings.cs

@@ -21,7 +21,7 @@ using osu.Game.Screens.Tournament.Components;
 using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Users;
+using osu.Framework.IO.Stores;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Tournament
         private GroupContainer groupsContainer;
         private OsuSpriteText fullTeamNameText;
 
-        private readonly List<Country> allTeams = new List<Country>();
+        private readonly List<Team> allTeams = new List<Team>();
 
         private DrawingsConfigManager drawingsConfig;
 
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Tournament
             reset(true);
         }
 
-        private void onTeamSelected(Country team)
+        private void onTeamSelected(Team team)
         {
             groupsContainer.AddTeam(team);
 
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Tournament
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (Country t in TeamList.Teams)
+            foreach (Team t in TeamList.Teams)
             {
                 if (groupsContainer.ContainsTeam(t.FullName))
                     continue;
@@ -312,7 +312,7 @@ namespace osu.Game.Screens.Tournament
                             if (line.ToUpper().StartsWith("GROUP"))
                                 continue;
 
-                            Country teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
+                            Team teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
 
                             if (teamToAdd == null)
                                 continue;

osu.Game/Screens/Tournament/Group.cs

@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Users;
+using osu.Game.Screens.Tournament.Teams;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Tournament
             };
         }
 
-        public void AddTeam(Country team)
+        public void AddTeam(Team team)
         {
             GroupTeam gt = new GroupTeam(team);
 
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament
             return allTeams.Any(t => t.Team.FullName == fullName);
         }
 
-        public bool RemoveTeam(Country team)
+        public bool RemoveTeam(Team team)
         {
             allTeams.RemoveAll(gt => gt.Team == team);
 
@@ -122,12 +122,12 @@ namespace osu.Game.Screens.Tournament
 
         private class GroupTeam : Container
         {
-            public readonly Country Team;
+            public readonly Team Team;
 
             private readonly FillFlowContainer innerContainer;
             private readonly Sprite flagSprite;
 
-            public GroupTeam(Country team)
+            public GroupTeam(Team team)
             {
                 Team = team;
 

osu.Game/Screens/Tournament/GroupContainer.cs

@@ -8,7 +8,7 @@ using System.Text;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using OpenTK;
-using osu.Game.Users;
+using osu.Game.Screens.Tournament.Teams;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Country team)
+        public void AddTeam(Team team)
         {
             if (groups[currentGroup].TeamsCount == maxTeams)
                 return;

osu.Game/Screens/Tournament/ScrollingTeamContainer.cs

@@ -15,16 +15,16 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Threading;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Users;
+using osu.Game.Screens.Tournament.Teams;
 
 namespace osu.Game.Screens.Tournament
 {
     public class ScrollingTeamContainer : Container
     {
         public event Action OnScrollStarted;
-        public event Action<Country> OnSelected;
+        public event Action<Team> OnSelected;
 
-        private readonly List<Country> availableTeams = new List<Country>();
+        private readonly List<Team> availableTeams = new List<Team>();
 
         private readonly Container tracker;
 
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Country team)
+        public void AddTeam(Team team)
         {
             if (availableTeams.Contains(team))
                 return;
@@ -169,12 +169,12 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void AddTeams(IEnumerable<Country> teams)
+        public void AddTeams(IEnumerable<Team> teams)
         {
             if (teams == null)
                 return;
 
-            foreach (Country t in teams)
+            foreach (Team t in teams)
                 AddTeam(t);
         }
 
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void RemoveTeam(Country team)
+        public void RemoveTeam(Team team)
         {
             availableTeams.Remove(team);
 
@@ -270,7 +270,7 @@ namespace osu.Game.Screens.Tournament
 
         private void addFlags()
         {
-            foreach (Country t in availableTeams)
+            foreach (Team t in availableTeams)
             {
                 Add(new ScrollingTeam(t)
                 {
@@ -320,7 +320,7 @@ namespace osu.Game.Screens.Tournament
             public const float WIDTH = 58;
             public const float HEIGHT = 41;
 
-            public Country Team;
+            public Team Team;
 
             private readonly Sprite flagSprite;
             private readonly Box outline;
@@ -340,7 +340,7 @@ namespace osu.Game.Screens.Tournament
                 }
             }
 
-            public ScrollingTeam(Country team)
+            public ScrollingTeam(Team team)
             {
                 Team = team;
 

osu.Game/Screens/Tournament/Teams/ITeamList.cs

@@ -2,12 +2,11 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament.Teams
 {
     public interface ITeamList
     {
-        IEnumerable<Country> Teams { get; }
+        IEnumerable<Team> Teams { get; }
     }
 }

osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament.Teams
 {
@@ -21,16 +20,16 @@ namespace osu.Game.Screens.Tournament.Teams
             this.storage = storage;
         }
 
-        public IEnumerable<Country> Teams
+        public IEnumerable<Team> Teams
         {
             get
             {
-                var teams = new List<Country>();
+                var teams = new List<Team>();
 
                 try
                 {
                     using (Stream stream = storage.GetStream(teams_filename, FileAccess.Read, FileMode.Open))
-                    using (StreamReader sr = new StreamReader(stream))
+                    using (var sr = new StreamReader(stream))
                     {
                         while (sr.Peek() != -1)
                         {
@@ -53,7 +52,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
                             acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
 
-                            teams.Add(new Country
+                            teams.Add(new Team
                             {
                                 FlagName = flagName,
                                 FullName = teamName,

osu.Game/Screens/Tournament/Teams/Team.cs

@@ -0,0 +1,15 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Tournament.Teams
+{
+    public class Team : Country
+    {
+        /// <summary>
+        /// Short acronym which appears in the group boxes post-selection.
+        /// </summary>
+        public string Acronym;
+    }
+}

osu.Game/Users/Country.cs

@@ -18,11 +18,6 @@ namespace osu.Game.Users
         [JsonProperty(@"name")]
         public string FullName;
 
-        /// <summary>
-        /// Short acronym which appears in the group boxes post-selection.
-        /// </summary>
-        public string Acronym;
-
         /// <summary>
         /// Two-letter flag acronym (ISO 3166 standard)
         /// </summary>

osu.Game/Users/Team.cs

@@ -3,7 +3,7 @@
 
 namespace osu.Game.Users
 {
-    public class Team
+    public class Team : Country
     {
         public string Name;
     }

osu.Game/osu.Game.csproj

@@ -325,6 +325,7 @@
     <Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
     <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
     <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
+    <Compile Include="Screens\Tournament\Teams\Team.cs" />
     <Compile Include="Users\UpdateableAvatar.cs" />
     <Compile Include="Users\User.cs" />
     <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />