From 7c6f4b798bc66d5936e689ab6d7b4d26005db91a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jul 2022 05:16:59 +0300
Subject: [PATCH 1/3] Replace `countries.json` with country enum and acronym
 extension

---
 osu.Game.Tournament/CountryExtensions.cs      |  770 ++++++++++
 osu.Game.Tournament/Resources/countries.json  | 1252 -----------------
 .../Screens/Editors/TeamEditorScreen.cs       |   18 +-
 3 files changed, 782 insertions(+), 1258 deletions(-)
 create mode 100644 osu.Game.Tournament/CountryExtensions.cs
 delete mode 100644 osu.Game.Tournament/Resources/countries.json

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
new file mode 100644
index 0000000000..180c7a96af
--- /dev/null
+++ b/osu.Game.Tournament/CountryExtensions.cs
@@ -0,0 +1,770 @@
+// 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 System;
+using osu.Game.Users;
+
+namespace osu.Game.Tournament
+{
+    public static class CountryExtensions
+    {
+        public static string GetAcronym(this Country country)
+        {
+            switch (country)
+            {
+                case Country.BD:
+                    return "BGD";
+
+                case Country.BE:
+                    return "BEL";
+
+                case Country.BF:
+                    return "BFA";
+
+                case Country.BG:
+                    return "BGR";
+
+                case Country.BA:
+                    return "BIH";
+
+                case Country.BB:
+                    return "BRB";
+
+                case Country.WF:
+                    return "WLF";
+
+                case Country.BL:
+                    return "BLM";
+
+                case Country.BM:
+                    return "BMU";
+
+                case Country.BN:
+                    return "BRN";
+
+                case Country.BO:
+                    return "BOL";
+
+                case Country.BH:
+                    return "BHR";
+
+                case Country.BI:
+                    return "BDI";
+
+                case Country.BJ:
+                    return "BEN";
+
+                case Country.BT:
+                    return "BTN";
+
+                case Country.JM:
+                    return "JAM";
+
+                case Country.BV:
+                    return "BVT";
+
+                case Country.BW:
+                    return "BWA";
+
+                case Country.WS:
+                    return "WSM";
+
+                case Country.BQ:
+                    return "BES";
+
+                case Country.BR:
+                    return "BRA";
+
+                case Country.BS:
+                    return "BHS";
+
+                case Country.JE:
+                    return "JEY";
+
+                case Country.BY:
+                    return "BLR";
+
+                case Country.BZ:
+                    return "BLZ";
+
+                case Country.RU:
+                    return "RUS";
+
+                case Country.RW:
+                    return "RWA";
+
+                case Country.RS:
+                    return "SRB";
+
+                case Country.TL:
+                    return "TLS";
+
+                case Country.RE:
+                    return "REU";
+
+                case Country.TM:
+                    return "TKM";
+
+                case Country.TJ:
+                    return "TJK";
+
+                case Country.RO:
+                    return "ROU";
+
+                case Country.TK:
+                    return "TKL";
+
+                case Country.GW:
+                    return "GNB";
+
+                case Country.GU:
+                    return "GUM";
+
+                case Country.GT:
+                    return "GTM";
+
+                case Country.GS:
+                    return "SGS";
+
+                case Country.GR:
+                    return "GRC";
+
+                case Country.GQ:
+                    return "GNQ";
+
+                case Country.GP:
+                    return "GLP";
+
+                case Country.JP:
+                    return "JPN";
+
+                case Country.GY:
+                    return "GUY";
+
+                case Country.GG:
+                    return "GGY";
+
+                case Country.GF:
+                    return "GUF";
+
+                case Country.GE:
+                    return "GEO";
+
+                case Country.GD:
+                    return "GRD";
+
+                case Country.GB:
+                    return "GBR";
+
+                case Country.GA:
+                    return "GAB";
+
+                case Country.SV:
+                    return "SLV";
+
+                case Country.GN:
+                    return "GIN";
+
+                case Country.GM:
+                    return "GMB";
+
+                case Country.GL:
+                    return "GRL";
+
+                case Country.GI:
+                    return "GIB";
+
+                case Country.GH:
+                    return "GHA";
+
+                case Country.OM:
+                    return "OMN";
+
+                case Country.TN:
+                    return "TUN";
+
+                case Country.JO:
+                    return "JOR";
+
+                case Country.HR:
+                    return "HRV";
+
+                case Country.HT:
+                    return "HTI";
+
+                case Country.HU:
+                    return "HUN";
+
+                case Country.HK:
+                    return "HKG";
+
+                case Country.HN:
+                    return "HND";
+
+                case Country.HM:
+                    return "HMD";
+
+                case Country.VE:
+                    return "VEN";
+
+                case Country.PR:
+                    return "PRI";
+
+                case Country.PS:
+                    return "PSE";
+
+                case Country.PW:
+                    return "PLW";
+
+                case Country.PT:
+                    return "PRT";
+
+                case Country.SJ:
+                    return "SJM";
+
+                case Country.PY:
+                    return "PRY";
+
+                case Country.IQ:
+                    return "IRQ";
+
+                case Country.PA:
+                    return "PAN";
+
+                case Country.PF:
+                    return "PYF";
+
+                case Country.PG:
+                    return "PNG";
+
+                case Country.PE:
+                    return "PER";
+
+                case Country.PK:
+                    return "PAK";
+
+                case Country.PH:
+                    return "PHL";
+
+                case Country.PN:
+                    return "PCN";
+
+                case Country.PL:
+                    return "POL";
+
+                case Country.PM:
+                    return "SPM";
+
+                case Country.ZM:
+                    return "ZMB";
+
+                case Country.EH:
+                    return "ESH";
+
+                case Country.EE:
+                    return "EST";
+
+                case Country.EG:
+                    return "EGY";
+
+                case Country.ZA:
+                    return "ZAF";
+
+                case Country.EC:
+                    return "ECU";
+
+                case Country.IT:
+                    return "ITA";
+
+                case Country.VN:
+                    return "VNM";
+
+                case Country.SB:
+                    return "SLB";
+
+                case Country.ET:
+                    return "ETH";
+
+                case Country.SO:
+                    return "SOM";
+
+                case Country.ZW:
+                    return "ZWE";
+
+                case Country.SA:
+                    return "SAU";
+
+                case Country.ES:
+                    return "ESP";
+
+                case Country.ER:
+                    return "ERI";
+
+                case Country.ME:
+                    return "MNE";
+
+                case Country.MD:
+                    return "MDA";
+
+                case Country.MG:
+                    return "MDG";
+
+                case Country.MF:
+                    return "MAF";
+
+                case Country.MA:
+                    return "MAR";
+
+                case Country.MC:
+                    return "MCO";
+
+                case Country.UZ:
+                    return "UZB";
+
+                case Country.MM:
+                    return "MMR";
+
+                case Country.ML:
+                    return "MLI";
+
+                case Country.MO:
+                    return "MAC";
+
+                case Country.MN:
+                    return "MNG";
+
+                case Country.MH:
+                    return "MHL";
+
+                case Country.MK:
+                    return "MKD";
+
+                case Country.MU:
+                    return "MUS";
+
+                case Country.MT:
+                    return "MLT";
+
+                case Country.MW:
+                    return "MWI";
+
+                case Country.MV:
+                    return "MDV";
+
+                case Country.MQ:
+                    return "MTQ";
+
+                case Country.MP:
+                    return "MNP";
+
+                case Country.MS:
+                    return "MSR";
+
+                case Country.MR:
+                    return "MRT";
+
+                case Country.IM:
+                    return "IMN";
+
+                case Country.UG:
+                    return "UGA";
+
+                case Country.TZ:
+                    return "TZA";
+
+                case Country.MY:
+                    return "MYS";
+
+                case Country.MX:
+                    return "MEX";
+
+                case Country.IL:
+                    return "ISR";
+
+                case Country.FR:
+                    return "FRA";
+
+                case Country.IO:
+                    return "IOT";
+
+                case Country.SH:
+                    return "SHN";
+
+                case Country.FI:
+                    return "FIN";
+
+                case Country.FJ:
+                    return "FJI";
+
+                case Country.FK:
+                    return "FLK";
+
+                case Country.FM:
+                    return "FSM";
+
+                case Country.FO:
+                    return "FRO";
+
+                case Country.NI:
+                    return "NIC";
+
+                case Country.NL:
+                    return "NLD";
+
+                case Country.NO:
+                    return "NOR";
+
+                case Country.NA:
+                    return "NAM";
+
+                case Country.VU:
+                    return "VUT";
+
+                case Country.NC:
+                    return "NCL";
+
+                case Country.NE:
+                    return "NER";
+
+                case Country.NF:
+                    return "NFK";
+
+                case Country.NG:
+                    return "NGA";
+
+                case Country.NZ:
+                    return "NZL";
+
+                case Country.NP:
+                    return "NPL";
+
+                case Country.NR:
+                    return "NRU";
+
+                case Country.NU:
+                    return "NIU";
+
+                case Country.CK:
+                    return "COK";
+
+                case Country.XK:
+                    return "XKX";
+
+                case Country.CI:
+                    return "CIV";
+
+                case Country.CH:
+                    return "CHE";
+
+                case Country.CO:
+                    return "COL";
+
+                case Country.CN:
+                    return "CHN";
+
+                case Country.CM:
+                    return "CMR";
+
+                case Country.CL:
+                    return "CHL";
+
+                case Country.CC:
+                    return "CCK";
+
+                case Country.CA:
+                    return "CAN";
+
+                case Country.CG:
+                    return "COG";
+
+                case Country.CF:
+                    return "CAF";
+
+                case Country.CD:
+                    return "COD";
+
+                case Country.CZ:
+                    return "CZE";
+
+                case Country.CY:
+                    return "CYP";
+
+                case Country.CX:
+                    return "CXR";
+
+                case Country.CR:
+                    return "CRI";
+
+                case Country.CW:
+                    return "CUW";
+
+                case Country.CV:
+                    return "CPV";
+
+                case Country.CU:
+                    return "CUB";
+
+                case Country.SZ:
+                    return "SWZ";
+
+                case Country.SY:
+                    return "SYR";
+
+                case Country.SX:
+                    return "SXM";
+
+                case Country.KG:
+                    return "KGZ";
+
+                case Country.KE:
+                    return "KEN";
+
+                case Country.SS:
+                    return "SSD";
+
+                case Country.SR:
+                    return "SUR";
+
+                case Country.KI:
+                    return "KIR";
+
+                case Country.KH:
+                    return "KHM";
+
+                case Country.KN:
+                    return "KNA";
+
+                case Country.KM:
+                    return "COM";
+
+                case Country.ST:
+                    return "STP";
+
+                case Country.SK:
+                    return "SVK";
+
+                case Country.KR:
+                    return "KOR";
+
+                case Country.SI:
+                    return "SVN";
+
+                case Country.KP:
+                    return "PRK";
+
+                case Country.KW:
+                    return "KWT";
+
+                case Country.SN:
+                    return "SEN";
+
+                case Country.SM:
+                    return "SMR";
+
+                case Country.SL:
+                    return "SLE";
+
+                case Country.SC:
+                    return "SYC";
+
+                case Country.KZ:
+                    return "KAZ";
+
+                case Country.KY:
+                    return "CYM";
+
+                case Country.SG:
+                    return "SGP";
+
+                case Country.SE:
+                    return "SWE";
+
+                case Country.SD:
+                    return "SDN";
+
+                case Country.DO:
+                    return "DOM";
+
+                case Country.DM:
+                    return "DMA";
+
+                case Country.DJ:
+                    return "DJI";
+
+                case Country.DK:
+                    return "DNK";
+
+                case Country.VG:
+                    return "VGB";
+
+                case Country.DE:
+                    return "DEU";
+
+                case Country.YE:
+                    return "YEM";
+
+                case Country.DZ:
+                    return "DZA";
+
+                case Country.US:
+                    return "USA";
+
+                case Country.UY:
+                    return "URY";
+
+                case Country.YT:
+                    return "MYT";
+
+                case Country.UM:
+                    return "UMI";
+
+                case Country.LB:
+                    return "LBN";
+
+                case Country.LC:
+                    return "LCA";
+
+                case Country.LA:
+                    return "LAO";
+
+                case Country.TV:
+                    return "TUV";
+
+                case Country.TW:
+                    return "TWN";
+
+                case Country.TT:
+                    return "TTO";
+
+                case Country.TR:
+                    return "TUR";
+
+                case Country.LK:
+                    return "LKA";
+
+                case Country.LI:
+                    return "LIE";
+
+                case Country.LV:
+                    return "LVA";
+
+                case Country.TO:
+                    return "TON";
+
+                case Country.LT:
+                    return "LTU";
+
+                case Country.LU:
+                    return "LUX";
+
+                case Country.LR:
+                    return "LBR";
+
+                case Country.LS:
+                    return "LSO";
+
+                case Country.TH:
+                    return "THA";
+
+                case Country.TF:
+                    return "ATF";
+
+                case Country.TG:
+                    return "TGO";
+
+                case Country.TD:
+                    return "TCD";
+
+                case Country.TC:
+                    return "TCA";
+
+                case Country.LY:
+                    return "LBY";
+
+                case Country.VA:
+                    return "VAT";
+
+                case Country.VC:
+                    return "VCT";
+
+                case Country.AE:
+                    return "ARE";
+
+                case Country.AD:
+                    return "AND";
+
+                case Country.AG:
+                    return "ATG";
+
+                case Country.AF:
+                    return "AFG";
+
+                case Country.AI:
+                    return "AIA";
+
+                case Country.VI:
+                    return "VIR";
+
+                case Country.IS:
+                    return "ISL";
+
+                case Country.IR:
+                    return "IRN";
+
+                case Country.AM:
+                    return "ARM";
+
+                case Country.AL:
+                    return "ALB";
+
+                case Country.AO:
+                    return "AGO";
+
+                case Country.AQ:
+                    return "ATA";
+
+                case Country.AS:
+                    return "ASM";
+
+                case Country.AR:
+                    return "ARG";
+
+                case Country.AU:
+                    return "AUS";
+
+                case Country.AT:
+                    return "AUT";
+
+                case Country.AW:
+                    return "ABW";
+
+                case Country.IN:
+                    return "IND";
+
+                case Country.AX:
+                    return "ALA";
+
+                case Country.AZ:
+                    return "AZE";
+
+                case Country.IE:
+                    return "IRL";
+
+                case Country.ID:
+                    return "IDN";
+
+                case Country.UA:
+                    return "UKR";
+
+                case Country.QA:
+                    return "QAT";
+
+                case Country.MZ:
+                    return "MOZ";
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(country));
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Resources/countries.json b/osu.Game.Tournament/Resources/countries.json
deleted file mode 100644
index 7306a8bec5..0000000000
--- a/osu.Game.Tournament/Resources/countries.json
+++ /dev/null
@@ -1,1252 +0,0 @@
-[
-    {
-        "FlagName": "BD",
-        "FullName": "Bangladesh",
-        "Acronym": "BGD"
-    },
-    {
-        "FlagName": "BE",
-        "FullName": "Belgium",
-        "Acronym": "BEL"
-    },
-    {
-        "FlagName": "BF",
-        "FullName": "Burkina Faso",
-        "Acronym": "BFA"
-    },
-    {
-        "FlagName": "BG",
-        "FullName": "Bulgaria",
-        "Acronym": "BGR"
-    },
-    {
-        "FlagName": "BA",
-        "FullName": "Bosnia and Herzegovina",
-        "Acronym": "BIH"
-    },
-    {
-        "FlagName": "BB",
-        "FullName": "Barbados",
-        "Acronym": "BRB"
-    },
-    {
-        "FlagName": "WF",
-        "FullName": "Wallis and Futuna",
-        "Acronym": "WLF"
-    },
-    {
-        "FlagName": "BL",
-        "FullName": "Saint Barthelemy",
-        "Acronym": "BLM"
-    },
-    {
-        "FlagName": "BM",
-        "FullName": "Bermuda",
-        "Acronym": "BMU"
-    },
-    {
-        "FlagName": "BN",
-        "FullName": "Brunei",
-        "Acronym": "BRN"
-    },
-    {
-        "FlagName": "BO",
-        "FullName": "Bolivia",
-        "Acronym": "BOL"
-    },
-    {
-        "FlagName": "BH",
-        "FullName": "Bahrain",
-        "Acronym": "BHR"
-    },
-    {
-        "FlagName": "BI",
-        "FullName": "Burundi",
-        "Acronym": "BDI"
-    },
-    {
-        "FlagName": "BJ",
-        "FullName": "Benin",
-        "Acronym": "BEN"
-    },
-    {
-        "FlagName": "BT",
-        "FullName": "Bhutan",
-        "Acronym": "BTN"
-    },
-    {
-        "FlagName": "JM",
-        "FullName": "Jamaica",
-        "Acronym": "JAM"
-    },
-    {
-        "FlagName": "BV",
-        "FullName": "Bouvet Island",
-        "Acronym": "BVT"
-    },
-    {
-        "FlagName": "BW",
-        "FullName": "Botswana",
-        "Acronym": "BWA"
-    },
-    {
-        "FlagName": "WS",
-        "FullName": "Samoa",
-        "Acronym": "WSM"
-    },
-    {
-        "FlagName": "BQ",
-        "FullName": "Bonaire, Saint Eustatius and Saba",
-        "Acronym": "BES"
-    },
-    {
-        "FlagName": "BR",
-        "FullName": "Brazil",
-        "Acronym": "BRA"
-    },
-    {
-        "FlagName": "BS",
-        "FullName": "Bahamas",
-        "Acronym": "BHS"
-    },
-    {
-        "FlagName": "JE",
-        "FullName": "Jersey",
-        "Acronym": "JEY"
-    },
-    {
-        "FlagName": "BY",
-        "FullName": "Belarus",
-        "Acronym": "BLR"
-    },
-    {
-        "FlagName": "BZ",
-        "FullName": "Belize",
-        "Acronym": "BLZ"
-    },
-    {
-        "FlagName": "RU",
-        "FullName": "Russia",
-        "Acronym": "RUS"
-    },
-    {
-        "FlagName": "RW",
-        "FullName": "Rwanda",
-        "Acronym": "RWA"
-    },
-    {
-        "FlagName": "RS",
-        "FullName": "Serbia",
-        "Acronym": "SRB"
-    },
-    {
-        "FlagName": "TL",
-        "FullName": "East Timor",
-        "Acronym": "TLS"
-    },
-    {
-        "FlagName": "RE",
-        "FullName": "Reunion",
-        "Acronym": "REU"
-    },
-    {
-        "FlagName": "TM",
-        "FullName": "Turkmenistan",
-        "Acronym": "TKM"
-    },
-    {
-        "FlagName": "TJ",
-        "FullName": "Tajikistan",
-        "Acronym": "TJK"
-    },
-    {
-        "FlagName": "RO",
-        "FullName": "Romania",
-        "Acronym": "ROU"
-    },
-    {
-        "FlagName": "TK",
-        "FullName": "Tokelau",
-        "Acronym": "TKL"
-    },
-    {
-        "FlagName": "GW",
-        "FullName": "Guinea-Bissau",
-        "Acronym": "GNB"
-    },
-    {
-        "FlagName": "GU",
-        "FullName": "Guam",
-        "Acronym": "GUM"
-    },
-    {
-        "FlagName": "GT",
-        "FullName": "Guatemala",
-        "Acronym": "GTM"
-    },
-    {
-        "FlagName": "GS",
-        "FullName": "South Georgia and the South Sandwich Islands",
-        "Acronym": "SGS"
-    },
-    {
-        "FlagName": "GR",
-        "FullName": "Greece",
-        "Acronym": "GRC"
-    },
-    {
-        "FlagName": "GQ",
-        "FullName": "Equatorial Guinea",
-        "Acronym": "GNQ"
-    },
-    {
-        "FlagName": "GP",
-        "FullName": "Guadeloupe",
-        "Acronym": "GLP"
-    },
-    {
-        "FlagName": "JP",
-        "FullName": "Japan",
-        "Acronym": "JPN"
-    },
-    {
-        "FlagName": "GY",
-        "FullName": "Guyana",
-        "Acronym": "GUY"
-    },
-    {
-        "FlagName": "GG",
-        "FullName": "Guernsey",
-        "Acronym": "GGY"
-    },
-    {
-        "FlagName": "GF",
-        "FullName": "French Guiana",
-        "Acronym": "GUF"
-    },
-    {
-        "FlagName": "GE",
-        "FullName": "Georgia",
-        "Acronym": "GEO"
-    },
-    {
-        "FlagName": "GD",
-        "FullName": "Grenada",
-        "Acronym": "GRD"
-    },
-    {
-        "FlagName": "GB",
-        "FullName": "United Kingdom",
-        "Acronym": "GBR"
-    },
-    {
-        "FlagName": "GA",
-        "FullName": "Gabon",
-        "Acronym": "GAB"
-    },
-    {
-        "FlagName": "SV",
-        "FullName": "El Salvador",
-        "Acronym": "SLV"
-    },
-    {
-        "FlagName": "GN",
-        "FullName": "Guinea",
-        "Acronym": "GIN"
-    },
-    {
-        "FlagName": "GM",
-        "FullName": "Gambia",
-        "Acronym": "GMB"
-    },
-    {
-        "FlagName": "GL",
-        "FullName": "Greenland",
-        "Acronym": "GRL"
-    },
-    {
-        "FlagName": "GI",
-        "FullName": "Gibraltar",
-        "Acronym": "GIB"
-    },
-    {
-        "FlagName": "GH",
-        "FullName": "Ghana",
-        "Acronym": "GHA"
-    },
-    {
-        "FlagName": "OM",
-        "FullName": "Oman",
-        "Acronym": "OMN"
-    },
-    {
-        "FlagName": "TN",
-        "FullName": "Tunisia",
-        "Acronym": "TUN"
-    },
-    {
-        "FlagName": "JO",
-        "FullName": "Jordan",
-        "Acronym": "JOR"
-    },
-    {
-        "FlagName": "HR",
-        "FullName": "Croatia",
-        "Acronym": "HRV"
-    },
-    {
-        "FlagName": "HT",
-        "FullName": "Haiti",
-        "Acronym": "HTI"
-    },
-    {
-        "FlagName": "HU",
-        "FullName": "Hungary",
-        "Acronym": "HUN"
-    },
-    {
-        "FlagName": "HK",
-        "FullName": "Hong Kong",
-        "Acronym": "HKG"
-    },
-    {
-        "FlagName": "HN",
-        "FullName": "Honduras",
-        "Acronym": "HND"
-    },
-    {
-        "FlagName": "HM",
-        "FullName": "Heard Island and McDonald Islands",
-        "Acronym": "HMD"
-    },
-    {
-        "FlagName": "VE",
-        "FullName": "Venezuela",
-        "Acronym": "VEN"
-    },
-    {
-        "FlagName": "PR",
-        "FullName": "Puerto Rico",
-        "Acronym": "PRI"
-    },
-    {
-        "FlagName": "PS",
-        "FullName": "Palestinian Territory",
-        "Acronym": "PSE"
-    },
-    {
-        "FlagName": "PW",
-        "FullName": "Palau",
-        "Acronym": "PLW"
-    },
-    {
-        "FlagName": "PT",
-        "FullName": "Portugal",
-        "Acronym": "PRT"
-    },
-    {
-        "FlagName": "SJ",
-        "FullName": "Svalbard and Jan Mayen",
-        "Acronym": "SJM"
-    },
-    {
-        "FlagName": "PY",
-        "FullName": "Paraguay",
-        "Acronym": "PRY"
-    },
-    {
-        "FlagName": "IQ",
-        "FullName": "Iraq",
-        "Acronym": "IRQ"
-    },
-    {
-        "FlagName": "PA",
-        "FullName": "Panama",
-        "Acronym": "PAN"
-    },
-    {
-        "FlagName": "PF",
-        "FullName": "French Polynesia",
-        "Acronym": "PYF"
-    },
-    {
-        "FlagName": "PG",
-        "FullName": "Papua New Guinea",
-        "Acronym": "PNG"
-    },
-    {
-        "FlagName": "PE",
-        "FullName": "Peru",
-        "Acronym": "PER"
-    },
-    {
-        "FlagName": "PK",
-        "FullName": "Pakistan",
-        "Acronym": "PAK"
-    },
-    {
-        "FlagName": "PH",
-        "FullName": "Philippines",
-        "Acronym": "PHL"
-    },
-    {
-        "FlagName": "PN",
-        "FullName": "Pitcairn",
-        "Acronym": "PCN"
-    },
-    {
-        "FlagName": "PL",
-        "FullName": "Poland",
-        "Acronym": "POL"
-    },
-    {
-        "FlagName": "PM",
-        "FullName": "Saint Pierre and Miquelon",
-        "Acronym": "SPM"
-    },
-    {
-        "FlagName": "ZM",
-        "FullName": "Zambia",
-        "Acronym": "ZMB"
-    },
-    {
-        "FlagName": "EH",
-        "FullName": "Western Sahara",
-        "Acronym": "ESH"
-    },
-    {
-        "FlagName": "EE",
-        "FullName": "Estonia",
-        "Acronym": "EST"
-    },
-    {
-        "FlagName": "EG",
-        "FullName": "Egypt",
-        "Acronym": "EGY"
-    },
-    {
-        "FlagName": "ZA",
-        "FullName": "South Africa",
-        "Acronym": "ZAF"
-    },
-    {
-        "FlagName": "EC",
-        "FullName": "Ecuador",
-        "Acronym": "ECU"
-    },
-    {
-        "FlagName": "IT",
-        "FullName": "Italy",
-        "Acronym": "ITA"
-    },
-    {
-        "FlagName": "VN",
-        "FullName": "Vietnam",
-        "Acronym": "VNM"
-    },
-    {
-        "FlagName": "SB",
-        "FullName": "Solomon Islands",
-        "Acronym": "SLB"
-    },
-    {
-        "FlagName": "ET",
-        "FullName": "Ethiopia",
-        "Acronym": "ETH"
-    },
-    {
-        "FlagName": "SO",
-        "FullName": "Somalia",
-        "Acronym": "SOM"
-    },
-    {
-        "FlagName": "ZW",
-        "FullName": "Zimbabwe",
-        "Acronym": "ZWE"
-    },
-    {
-        "FlagName": "SA",
-        "FullName": "Saudi Arabia",
-        "Acronym": "SAU"
-    },
-    {
-        "FlagName": "ES",
-        "FullName": "Spain",
-        "Acronym": "ESP"
-    },
-    {
-        "FlagName": "ER",
-        "FullName": "Eritrea",
-        "Acronym": "ERI"
-    },
-    {
-        "FlagName": "ME",
-        "FullName": "Montenegro",
-        "Acronym": "MNE"
-    },
-    {
-        "FlagName": "MD",
-        "FullName": "Moldova",
-        "Acronym": "MDA"
-    },
-    {
-        "FlagName": "MG",
-        "FullName": "Madagascar",
-        "Acronym": "MDG"
-    },
-    {
-        "FlagName": "MF",
-        "FullName": "Saint Martin",
-        "Acronym": "MAF"
-    },
-    {
-        "FlagName": "MA",
-        "FullName": "Morocco",
-        "Acronym": "MAR"
-    },
-    {
-        "FlagName": "MC",
-        "FullName": "Monaco",
-        "Acronym": "MCO"
-    },
-    {
-        "FlagName": "UZ",
-        "FullName": "Uzbekistan",
-        "Acronym": "UZB"
-    },
-    {
-        "FlagName": "MM",
-        "FullName": "Myanmar",
-        "Acronym": "MMR"
-    },
-    {
-        "FlagName": "ML",
-        "FullName": "Mali",
-        "Acronym": "MLI"
-    },
-    {
-        "FlagName": "MO",
-        "FullName": "Macao",
-        "Acronym": "MAC"
-    },
-    {
-        "FlagName": "MN",
-        "FullName": "Mongolia",
-        "Acronym": "MNG"
-    },
-    {
-        "FlagName": "MH",
-        "FullName": "Marshall Islands",
-        "Acronym": "MHL"
-    },
-    {
-        "FlagName": "MK",
-        "FullName": "North Macedonia",
-        "Acronym": "MKD"
-    },
-    {
-        "FlagName": "MU",
-        "FullName": "Mauritius",
-        "Acronym": "MUS"
-    },
-    {
-        "FlagName": "MT",
-        "FullName": "Malta",
-        "Acronym": "MLT"
-    },
-    {
-        "FlagName": "MW",
-        "FullName": "Malawi",
-        "Acronym": "MWI"
-    },
-    {
-        "FlagName": "MV",
-        "FullName": "Maldives",
-        "Acronym": "MDV"
-    },
-    {
-        "FlagName": "MQ",
-        "FullName": "Martinique",
-        "Acronym": "MTQ"
-    },
-    {
-        "FlagName": "MP",
-        "FullName": "Northern Mariana Islands",
-        "Acronym": "MNP"
-    },
-    {
-        "FlagName": "MS",
-        "FullName": "Montserrat",
-        "Acronym": "MSR"
-    },
-    {
-        "FlagName": "MR",
-        "FullName": "Mauritania",
-        "Acronym": "MRT"
-    },
-    {
-        "FlagName": "IM",
-        "FullName": "Isle of Man",
-        "Acronym": "IMN"
-    },
-    {
-        "FlagName": "UG",
-        "FullName": "Uganda",
-        "Acronym": "UGA"
-    },
-    {
-        "FlagName": "TZ",
-        "FullName": "Tanzania",
-        "Acronym": "TZA"
-    },
-    {
-        "FlagName": "MY",
-        "FullName": "Malaysia",
-        "Acronym": "MYS"
-    },
-    {
-        "FlagName": "MX",
-        "FullName": "Mexico",
-        "Acronym": "MEX"
-    },
-    {
-        "FlagName": "IL",
-        "FullName": "Israel",
-        "Acronym": "ISR"
-    },
-    {
-        "FlagName": "FR",
-        "FullName": "France",
-        "Acronym": "FRA"
-    },
-    {
-        "FlagName": "IO",
-        "FullName": "British Indian Ocean Territory",
-        "Acronym": "IOT"
-    },
-    {
-        "FlagName": "SH",
-        "FullName": "Saint Helena",
-        "Acronym": "SHN"
-    },
-    {
-        "FlagName": "FI",
-        "FullName": "Finland",
-        "Acronym": "FIN"
-    },
-    {
-        "FlagName": "FJ",
-        "FullName": "Fiji",
-        "Acronym": "FJI"
-    },
-    {
-        "FlagName": "FK",
-        "FullName": "Falkland Islands",
-        "Acronym": "FLK"
-    },
-    {
-        "FlagName": "FM",
-        "FullName": "Micronesia",
-        "Acronym": "FSM"
-    },
-    {
-        "FlagName": "FO",
-        "FullName": "Faroe Islands",
-        "Acronym": "FRO"
-    },
-    {
-        "FlagName": "NI",
-        "FullName": "Nicaragua",
-        "Acronym": "NIC"
-    },
-    {
-        "FlagName": "NL",
-        "FullName": "Netherlands",
-        "Acronym": "NLD"
-    },
-    {
-        "FlagName": "NO",
-        "FullName": "Norway",
-        "Acronym": "NOR"
-    },
-    {
-        "FlagName": "NA",
-        "FullName": "Namibia",
-        "Acronym": "NAM"
-    },
-    {
-        "FlagName": "VU",
-        "FullName": "Vanuatu",
-        "Acronym": "VUT"
-    },
-    {
-        "FlagName": "NC",
-        "FullName": "New Caledonia",
-        "Acronym": "NCL"
-    },
-    {
-        "FlagName": "NE",
-        "FullName": "Niger",
-        "Acronym": "NER"
-    },
-    {
-        "FlagName": "NF",
-        "FullName": "Norfolk Island",
-        "Acronym": "NFK"
-    },
-    {
-        "FlagName": "NG",
-        "FullName": "Nigeria",
-        "Acronym": "NGA"
-    },
-    {
-        "FlagName": "NZ",
-        "FullName": "New Zealand",
-        "Acronym": "NZL"
-    },
-    {
-        "FlagName": "NP",
-        "FullName": "Nepal",
-        "Acronym": "NPL"
-    },
-    {
-        "FlagName": "NR",
-        "FullName": "Nauru",
-        "Acronym": "NRU"
-    },
-    {
-        "FlagName": "NU",
-        "FullName": "Niue",
-        "Acronym": "NIU"
-    },
-    {
-        "FlagName": "CK",
-        "FullName": "Cook Islands",
-        "Acronym": "COK"
-    },
-    {
-        "FlagName": "XK",
-        "FullName": "Kosovo",
-        "Acronym": "XKX"
-    },
-    {
-        "FlagName": "CI",
-        "FullName": "Ivory Coast",
-        "Acronym": "CIV"
-    },
-    {
-        "FlagName": "CH",
-        "FullName": "Switzerland",
-        "Acronym": "CHE"
-    },
-    {
-        "FlagName": "CO",
-        "FullName": "Colombia",
-        "Acronym": "COL"
-    },
-    {
-        "FlagName": "CN",
-        "FullName": "China",
-        "Acronym": "CHN"
-    },
-    {
-        "FlagName": "CM",
-        "FullName": "Cameroon",
-        "Acronym": "CMR"
-    },
-    {
-        "FlagName": "CL",
-        "FullName": "Chile",
-        "Acronym": "CHL"
-    },
-    {
-        "FlagName": "CC",
-        "FullName": "Cocos Islands",
-        "Acronym": "CCK"
-    },
-    {
-        "FlagName": "CA",
-        "FullName": "Canada",
-        "Acronym": "CAN"
-    },
-    {
-        "FlagName": "CG",
-        "FullName": "Republic of the Congo",
-        "Acronym": "COG"
-    },
-    {
-        "FlagName": "CF",
-        "FullName": "Central African Republic",
-        "Acronym": "CAF"
-    },
-    {
-        "FlagName": "CD",
-        "FullName": "Democratic Republic of the Congo",
-        "Acronym": "COD"
-    },
-    {
-        "FlagName": "CZ",
-        "FullName": "Czech Republic",
-        "Acronym": "CZE"
-    },
-    {
-        "FlagName": "CY",
-        "FullName": "Cyprus",
-        "Acronym": "CYP"
-    },
-    {
-        "FlagName": "CX",
-        "FullName": "Christmas Island",
-        "Acronym": "CXR"
-    },
-    {
-        "FlagName": "CR",
-        "FullName": "Costa Rica",
-        "Acronym": "CRI"
-    },
-    {
-        "FlagName": "CW",
-        "FullName": "Curacao",
-        "Acronym": "CUW"
-    },
-    {
-        "FlagName": "CV",
-        "FullName": "Cabo Verde",
-        "Acronym": "CPV"
-    },
-    {
-        "FlagName": "CU",
-        "FullName": "Cuba",
-        "Acronym": "CUB"
-    },
-    {
-        "FlagName": "SZ",
-        "FullName": "Eswatini",
-        "Acronym": "SWZ"
-    },
-    {
-        "FlagName": "SY",
-        "FullName": "Syria",
-        "Acronym": "SYR"
-    },
-    {
-        "FlagName": "SX",
-        "FullName": "Sint Maarten",
-        "Acronym": "SXM"
-    },
-    {
-        "FlagName": "KG",
-        "FullName": "Kyrgyzstan",
-        "Acronym": "KGZ"
-    },
-    {
-        "FlagName": "KE",
-        "FullName": "Kenya",
-        "Acronym": "KEN"
-    },
-    {
-        "FlagName": "SS",
-        "FullName": "South Sudan",
-        "Acronym": "SSD"
-    },
-    {
-        "FlagName": "SR",
-        "FullName": "Suriname",
-        "Acronym": "SUR"
-    },
-    {
-        "FlagName": "KI",
-        "FullName": "Kiribati",
-        "Acronym": "KIR"
-    },
-    {
-        "FlagName": "KH",
-        "FullName": "Cambodia",
-        "Acronym": "KHM"
-    },
-    {
-        "FlagName": "KN",
-        "FullName": "Saint Kitts and Nevis",
-        "Acronym": "KNA"
-    },
-    {
-        "FlagName": "KM",
-        "FullName": "Comoros",
-        "Acronym": "COM"
-    },
-    {
-        "FlagName": "ST",
-        "FullName": "Sao Tome and Principe",
-        "Acronym": "STP"
-    },
-    {
-        "FlagName": "SK",
-        "FullName": "Slovakia",
-        "Acronym": "SVK"
-    },
-    {
-        "FlagName": "KR",
-        "FullName": "South Korea",
-        "Acronym": "KOR"
-    },
-    {
-        "FlagName": "SI",
-        "FullName": "Slovenia",
-        "Acronym": "SVN"
-    },
-    {
-        "FlagName": "KP",
-        "FullName": "North Korea",
-        "Acronym": "PRK"
-    },
-    {
-        "FlagName": "KW",
-        "FullName": "Kuwait",
-        "Acronym": "KWT"
-    },
-    {
-        "FlagName": "SN",
-        "FullName": "Senegal",
-        "Acronym": "SEN"
-    },
-    {
-        "FlagName": "SM",
-        "FullName": "San Marino",
-        "Acronym": "SMR"
-    },
-    {
-        "FlagName": "SL",
-        "FullName": "Sierra Leone",
-        "Acronym": "SLE"
-    },
-    {
-        "FlagName": "SC",
-        "FullName": "Seychelles",
-        "Acronym": "SYC"
-    },
-    {
-        "FlagName": "KZ",
-        "FullName": "Kazakhstan",
-        "Acronym": "KAZ"
-    },
-    {
-        "FlagName": "KY",
-        "FullName": "Cayman Islands",
-        "Acronym": "CYM"
-    },
-    {
-        "FlagName": "SG",
-        "FullName": "Singapore",
-        "Acronym": "SGP"
-    },
-    {
-        "FlagName": "SE",
-        "FullName": "Sweden",
-        "Acronym": "SWE"
-    },
-    {
-        "FlagName": "SD",
-        "FullName": "Sudan",
-        "Acronym": "SDN"
-    },
-    {
-        "FlagName": "DO",
-        "FullName": "Dominican Republic",
-        "Acronym": "DOM"
-    },
-    {
-        "FlagName": "DM",
-        "FullName": "Dominica",
-        "Acronym": "DMA"
-    },
-    {
-        "FlagName": "DJ",
-        "FullName": "Djibouti",
-        "Acronym": "DJI"
-    },
-    {
-        "FlagName": "DK",
-        "FullName": "Denmark",
-        "Acronym": "DNK"
-    },
-    {
-        "FlagName": "VG",
-        "FullName": "British Virgin Islands",
-        "Acronym": "VGB"
-    },
-    {
-        "FlagName": "DE",
-        "FullName": "Germany",
-        "Acronym": "DEU"
-    },
-    {
-        "FlagName": "YE",
-        "FullName": "Yemen",
-        "Acronym": "YEM"
-    },
-    {
-        "FlagName": "DZ",
-        "FullName": "Algeria",
-        "Acronym": "DZA"
-    },
-    {
-        "FlagName": "US",
-        "FullName": "United States",
-        "Acronym": "USA"
-    },
-    {
-        "FlagName": "UY",
-        "FullName": "Uruguay",
-        "Acronym": "URY"
-    },
-    {
-        "FlagName": "YT",
-        "FullName": "Mayotte",
-        "Acronym": "MYT"
-    },
-    {
-        "FlagName": "UM",
-        "FullName": "United States Minor Outlying Islands",
-        "Acronym": "UMI"
-    },
-    {
-        "FlagName": "LB",
-        "FullName": "Lebanon",
-        "Acronym": "LBN"
-    },
-    {
-        "FlagName": "LC",
-        "FullName": "Saint Lucia",
-        "Acronym": "LCA"
-    },
-    {
-        "FlagName": "LA",
-        "FullName": "Laos",
-        "Acronym": "LAO"
-    },
-    {
-        "FlagName": "TV",
-        "FullName": "Tuvalu",
-        "Acronym": "TUV"
-    },
-    {
-        "FlagName": "TW",
-        "FullName": "Taiwan",
-        "Acronym": "TWN"
-    },
-    {
-        "FlagName": "TT",
-        "FullName": "Trinidad and Tobago",
-        "Acronym": "TTO"
-    },
-    {
-        "FlagName": "TR",
-        "FullName": "Turkey",
-        "Acronym": "TUR"
-    },
-    {
-        "FlagName": "LK",
-        "FullName": "Sri Lanka",
-        "Acronym": "LKA"
-    },
-    {
-        "FlagName": "LI",
-        "FullName": "Liechtenstein",
-        "Acronym": "LIE"
-    },
-    {
-        "FlagName": "LV",
-        "FullName": "Latvia",
-        "Acronym": "LVA"
-    },
-    {
-        "FlagName": "TO",
-        "FullName": "Tonga",
-        "Acronym": "TON"
-    },
-    {
-        "FlagName": "LT",
-        "FullName": "Lithuania",
-        "Acronym": "LTU"
-    },
-    {
-        "FlagName": "LU",
-        "FullName": "Luxembourg",
-        "Acronym": "LUX"
-    },
-    {
-        "FlagName": "LR",
-        "FullName": "Liberia",
-        "Acronym": "LBR"
-    },
-    {
-        "FlagName": "LS",
-        "FullName": "Lesotho",
-        "Acronym": "LSO"
-    },
-    {
-        "FlagName": "TH",
-        "FullName": "Thailand",
-        "Acronym": "THA"
-    },
-    {
-        "FlagName": "TF",
-        "FullName": "French Southern Territories",
-        "Acronym": "ATF"
-    },
-    {
-        "FlagName": "TG",
-        "FullName": "Togo",
-        "Acronym": "TGO"
-    },
-    {
-        "FlagName": "TD",
-        "FullName": "Chad",
-        "Acronym": "TCD"
-    },
-    {
-        "FlagName": "TC",
-        "FullName": "Turks and Caicos Islands",
-        "Acronym": "TCA"
-    },
-    {
-        "FlagName": "LY",
-        "FullName": "Libya",
-        "Acronym": "LBY"
-    },
-    {
-        "FlagName": "VA",
-        "FullName": "Vatican",
-        "Acronym": "VAT"
-    },
-    {
-        "FlagName": "VC",
-        "FullName": "Saint Vincent and the Grenadines",
-        "Acronym": "VCT"
-    },
-    {
-        "FlagName": "AE",
-        "FullName": "United Arab Emirates",
-        "Acronym": "ARE"
-    },
-    {
-        "FlagName": "AD",
-        "FullName": "Andorra",
-        "Acronym": "AND"
-    },
-    {
-        "FlagName": "AG",
-        "FullName": "Antigua and Barbuda",
-        "Acronym": "ATG"
-    },
-    {
-        "FlagName": "AF",
-        "FullName": "Afghanistan",
-        "Acronym": "AFG"
-    },
-    {
-        "FlagName": "AI",
-        "FullName": "Anguilla",
-        "Acronym": "AIA"
-    },
-    {
-        "FlagName": "VI",
-        "FullName": "U.S. Virgin Islands",
-        "Acronym": "VIR"
-    },
-    {
-        "FlagName": "IS",
-        "FullName": "Iceland",
-        "Acronym": "ISL"
-    },
-    {
-        "FlagName": "IR",
-        "FullName": "Iran",
-        "Acronym": "IRN"
-    },
-    {
-        "FlagName": "AM",
-        "FullName": "Armenia",
-        "Acronym": "ARM"
-    },
-    {
-        "FlagName": "AL",
-        "FullName": "Albania",
-        "Acronym": "ALB"
-    },
-    {
-        "FlagName": "AO",
-        "FullName": "Angola",
-        "Acronym": "AGO"
-    },
-    {
-        "FlagName": "AQ",
-        "FullName": "Antarctica",
-        "Acronym": "ATA"
-    },
-    {
-        "FlagName": "AS",
-        "FullName": "American Samoa",
-        "Acronym": "ASM"
-    },
-    {
-        "FlagName": "AR",
-        "FullName": "Argentina",
-        "Acronym": "ARG"
-    },
-    {
-        "FlagName": "AU",
-        "FullName": "Australia",
-        "Acronym": "AUS"
-    },
-    {
-        "FlagName": "AT",
-        "FullName": "Austria",
-        "Acronym": "AUT"
-    },
-    {
-        "FlagName": "AW",
-        "FullName": "Aruba",
-        "Acronym": "ABW"
-    },
-    {
-        "FlagName": "IN",
-        "FullName": "India",
-        "Acronym": "IND"
-    },
-    {
-        "FlagName": "AX",
-        "FullName": "Aland Islands",
-        "Acronym": "ALA"
-    },
-    {
-        "FlagName": "AZ",
-        "FullName": "Azerbaijan",
-        "Acronym": "AZE"
-    },
-    {
-        "FlagName": "IE",
-        "FullName": "Ireland",
-        "Acronym": "IRL"
-    },
-    {
-        "FlagName": "ID",
-        "FullName": "Indonesia",
-        "Acronym": "IDN"
-    },
-    {
-        "FlagName": "UA",
-        "FullName": "Ukraine",
-        "Acronym": "UKR"
-    },
-    {
-        "FlagName": "QA",
-        "FullName": "Qatar",
-        "Acronym": "QAT"
-    },
-    {
-        "FlagName": "MZ",
-        "FullName": "Mozambique",
-        "Acronym": "MOZ"
-    }
-]
\ No newline at end of file
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 111893d18c..02c0a0d7e1 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -3,13 +3,13 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -45,11 +45,17 @@ private void load()
 
         private void addAllCountries()
         {
-            List<TournamentTeam> countries;
+            var countries = new List<TournamentTeam>();
 
-            using (Stream stream = game.Resources.GetStream("Resources/countries.json"))
-            using (var sr = new StreamReader(stream))
-                countries = JsonConvert.DeserializeObject<List<TournamentTeam>>(sr.ReadToEnd());
+            foreach (var country in Enum.GetValues(typeof(Country)).Cast<Country>().Skip(1))
+            {
+                countries.Add(new TournamentTeam
+                {
+                    FlagName = { Value = country.ToString() },
+                    FullName = { Value = country.GetDescription() },
+                    Acronym = { Value = country.GetAcronym() },
+                });
+            }
 
             Debug.Assert(countries != null);
 

From a10c398cd58516ce85dbc4e7072047f392b48272 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jul 2022 06:40:53 +0300
Subject: [PATCH 2/3] Remove no longer necessary DI

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 02c0a0d7e1..0f806a2403 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -25,9 +25,6 @@ namespace osu.Game.Tournament.Screens.Editors
 {
     public class TeamEditorScreen : TournamentEditorScreen<TeamEditorScreen.TeamRow, TournamentTeam>
     {
-        [Resolved]
-        private TournamentGameBase game { get; set; }
-
         protected override BindableList<TournamentTeam> Storage => LadderInfo.Teams;
 
         [BackgroundDependencyLoader]

From caa44ce01e6ac413a0366b0ab22e1cce363de791 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jul 2022 16:40:11 +0900
Subject: [PATCH 3/3] Update naming

---
 osu.Game.Tournament/CountryExtensions.cs      | 502 +++++++++---------
 .../Screens/Editors/TeamEditorScreen.cs       |   2 +-
 2 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
index 180c7a96af..f2a583c8a5 100644
--- a/osu.Game.Tournament/CountryExtensions.cs
+++ b/osu.Game.Tournament/CountryExtensions.cs
@@ -8,758 +8,758 @@ namespace osu.Game.Tournament
 {
     public static class CountryExtensions
     {
-        public static string GetAcronym(this Country country)
+        public static string GetAcronym(this CountryCode country)
         {
             switch (country)
             {
-                case Country.BD:
+                case CountryCode.BD:
                     return "BGD";
 
-                case Country.BE:
+                case CountryCode.BE:
                     return "BEL";
 
-                case Country.BF:
+                case CountryCode.BF:
                     return "BFA";
 
-                case Country.BG:
+                case CountryCode.BG:
                     return "BGR";
 
-                case Country.BA:
+                case CountryCode.BA:
                     return "BIH";
 
-                case Country.BB:
+                case CountryCode.BB:
                     return "BRB";
 
-                case Country.WF:
+                case CountryCode.WF:
                     return "WLF";
 
-                case Country.BL:
+                case CountryCode.BL:
                     return "BLM";
 
-                case Country.BM:
+                case CountryCode.BM:
                     return "BMU";
 
-                case Country.BN:
+                case CountryCode.BN:
                     return "BRN";
 
-                case Country.BO:
+                case CountryCode.BO:
                     return "BOL";
 
-                case Country.BH:
+                case CountryCode.BH:
                     return "BHR";
 
-                case Country.BI:
+                case CountryCode.BI:
                     return "BDI";
 
-                case Country.BJ:
+                case CountryCode.BJ:
                     return "BEN";
 
-                case Country.BT:
+                case CountryCode.BT:
                     return "BTN";
 
-                case Country.JM:
+                case CountryCode.JM:
                     return "JAM";
 
-                case Country.BV:
+                case CountryCode.BV:
                     return "BVT";
 
-                case Country.BW:
+                case CountryCode.BW:
                     return "BWA";
 
-                case Country.WS:
+                case CountryCode.WS:
                     return "WSM";
 
-                case Country.BQ:
+                case CountryCode.BQ:
                     return "BES";
 
-                case Country.BR:
+                case CountryCode.BR:
                     return "BRA";
 
-                case Country.BS:
+                case CountryCode.BS:
                     return "BHS";
 
-                case Country.JE:
+                case CountryCode.JE:
                     return "JEY";
 
-                case Country.BY:
+                case CountryCode.BY:
                     return "BLR";
 
-                case Country.BZ:
+                case CountryCode.BZ:
                     return "BLZ";
 
-                case Country.RU:
+                case CountryCode.RU:
                     return "RUS";
 
-                case Country.RW:
+                case CountryCode.RW:
                     return "RWA";
 
-                case Country.RS:
+                case CountryCode.RS:
                     return "SRB";
 
-                case Country.TL:
+                case CountryCode.TL:
                     return "TLS";
 
-                case Country.RE:
+                case CountryCode.RE:
                     return "REU";
 
-                case Country.TM:
+                case CountryCode.TM:
                     return "TKM";
 
-                case Country.TJ:
+                case CountryCode.TJ:
                     return "TJK";
 
-                case Country.RO:
+                case CountryCode.RO:
                     return "ROU";
 
-                case Country.TK:
+                case CountryCode.TK:
                     return "TKL";
 
-                case Country.GW:
+                case CountryCode.GW:
                     return "GNB";
 
-                case Country.GU:
+                case CountryCode.GU:
                     return "GUM";
 
-                case Country.GT:
+                case CountryCode.GT:
                     return "GTM";
 
-                case Country.GS:
+                case CountryCode.GS:
                     return "SGS";
 
-                case Country.GR:
+                case CountryCode.GR:
                     return "GRC";
 
-                case Country.GQ:
+                case CountryCode.GQ:
                     return "GNQ";
 
-                case Country.GP:
+                case CountryCode.GP:
                     return "GLP";
 
-                case Country.JP:
+                case CountryCode.JP:
                     return "JPN";
 
-                case Country.GY:
+                case CountryCode.GY:
                     return "GUY";
 
-                case Country.GG:
+                case CountryCode.GG:
                     return "GGY";
 
-                case Country.GF:
+                case CountryCode.GF:
                     return "GUF";
 
-                case Country.GE:
+                case CountryCode.GE:
                     return "GEO";
 
-                case Country.GD:
+                case CountryCode.GD:
                     return "GRD";
 
-                case Country.GB:
+                case CountryCode.GB:
                     return "GBR";
 
-                case Country.GA:
+                case CountryCode.GA:
                     return "GAB";
 
-                case Country.SV:
+                case CountryCode.SV:
                     return "SLV";
 
-                case Country.GN:
+                case CountryCode.GN:
                     return "GIN";
 
-                case Country.GM:
+                case CountryCode.GM:
                     return "GMB";
 
-                case Country.GL:
+                case CountryCode.GL:
                     return "GRL";
 
-                case Country.GI:
+                case CountryCode.GI:
                     return "GIB";
 
-                case Country.GH:
+                case CountryCode.GH:
                     return "GHA";
 
-                case Country.OM:
+                case CountryCode.OM:
                     return "OMN";
 
-                case Country.TN:
+                case CountryCode.TN:
                     return "TUN";
 
-                case Country.JO:
+                case CountryCode.JO:
                     return "JOR";
 
-                case Country.HR:
+                case CountryCode.HR:
                     return "HRV";
 
-                case Country.HT:
+                case CountryCode.HT:
                     return "HTI";
 
-                case Country.HU:
+                case CountryCode.HU:
                     return "HUN";
 
-                case Country.HK:
+                case CountryCode.HK:
                     return "HKG";
 
-                case Country.HN:
+                case CountryCode.HN:
                     return "HND";
 
-                case Country.HM:
+                case CountryCode.HM:
                     return "HMD";
 
-                case Country.VE:
+                case CountryCode.VE:
                     return "VEN";
 
-                case Country.PR:
+                case CountryCode.PR:
                     return "PRI";
 
-                case Country.PS:
+                case CountryCode.PS:
                     return "PSE";
 
-                case Country.PW:
+                case CountryCode.PW:
                     return "PLW";
 
-                case Country.PT:
+                case CountryCode.PT:
                     return "PRT";
 
-                case Country.SJ:
+                case CountryCode.SJ:
                     return "SJM";
 
-                case Country.PY:
+                case CountryCode.PY:
                     return "PRY";
 
-                case Country.IQ:
+                case CountryCode.IQ:
                     return "IRQ";
 
-                case Country.PA:
+                case CountryCode.PA:
                     return "PAN";
 
-                case Country.PF:
+                case CountryCode.PF:
                     return "PYF";
 
-                case Country.PG:
+                case CountryCode.PG:
                     return "PNG";
 
-                case Country.PE:
+                case CountryCode.PE:
                     return "PER";
 
-                case Country.PK:
+                case CountryCode.PK:
                     return "PAK";
 
-                case Country.PH:
+                case CountryCode.PH:
                     return "PHL";
 
-                case Country.PN:
+                case CountryCode.PN:
                     return "PCN";
 
-                case Country.PL:
+                case CountryCode.PL:
                     return "POL";
 
-                case Country.PM:
+                case CountryCode.PM:
                     return "SPM";
 
-                case Country.ZM:
+                case CountryCode.ZM:
                     return "ZMB";
 
-                case Country.EH:
+                case CountryCode.EH:
                     return "ESH";
 
-                case Country.EE:
+                case CountryCode.EE:
                     return "EST";
 
-                case Country.EG:
+                case CountryCode.EG:
                     return "EGY";
 
-                case Country.ZA:
+                case CountryCode.ZA:
                     return "ZAF";
 
-                case Country.EC:
+                case CountryCode.EC:
                     return "ECU";
 
-                case Country.IT:
+                case CountryCode.IT:
                     return "ITA";
 
-                case Country.VN:
+                case CountryCode.VN:
                     return "VNM";
 
-                case Country.SB:
+                case CountryCode.SB:
                     return "SLB";
 
-                case Country.ET:
+                case CountryCode.ET:
                     return "ETH";
 
-                case Country.SO:
+                case CountryCode.SO:
                     return "SOM";
 
-                case Country.ZW:
+                case CountryCode.ZW:
                     return "ZWE";
 
-                case Country.SA:
+                case CountryCode.SA:
                     return "SAU";
 
-                case Country.ES:
+                case CountryCode.ES:
                     return "ESP";
 
-                case Country.ER:
+                case CountryCode.ER:
                     return "ERI";
 
-                case Country.ME:
+                case CountryCode.ME:
                     return "MNE";
 
-                case Country.MD:
+                case CountryCode.MD:
                     return "MDA";
 
-                case Country.MG:
+                case CountryCode.MG:
                     return "MDG";
 
-                case Country.MF:
+                case CountryCode.MF:
                     return "MAF";
 
-                case Country.MA:
+                case CountryCode.MA:
                     return "MAR";
 
-                case Country.MC:
+                case CountryCode.MC:
                     return "MCO";
 
-                case Country.UZ:
+                case CountryCode.UZ:
                     return "UZB";
 
-                case Country.MM:
+                case CountryCode.MM:
                     return "MMR";
 
-                case Country.ML:
+                case CountryCode.ML:
                     return "MLI";
 
-                case Country.MO:
+                case CountryCode.MO:
                     return "MAC";
 
-                case Country.MN:
+                case CountryCode.MN:
                     return "MNG";
 
-                case Country.MH:
+                case CountryCode.MH:
                     return "MHL";
 
-                case Country.MK:
+                case CountryCode.MK:
                     return "MKD";
 
-                case Country.MU:
+                case CountryCode.MU:
                     return "MUS";
 
-                case Country.MT:
+                case CountryCode.MT:
                     return "MLT";
 
-                case Country.MW:
+                case CountryCode.MW:
                     return "MWI";
 
-                case Country.MV:
+                case CountryCode.MV:
                     return "MDV";
 
-                case Country.MQ:
+                case CountryCode.MQ:
                     return "MTQ";
 
-                case Country.MP:
+                case CountryCode.MP:
                     return "MNP";
 
-                case Country.MS:
+                case CountryCode.MS:
                     return "MSR";
 
-                case Country.MR:
+                case CountryCode.MR:
                     return "MRT";
 
-                case Country.IM:
+                case CountryCode.IM:
                     return "IMN";
 
-                case Country.UG:
+                case CountryCode.UG:
                     return "UGA";
 
-                case Country.TZ:
+                case CountryCode.TZ:
                     return "TZA";
 
-                case Country.MY:
+                case CountryCode.MY:
                     return "MYS";
 
-                case Country.MX:
+                case CountryCode.MX:
                     return "MEX";
 
-                case Country.IL:
+                case CountryCode.IL:
                     return "ISR";
 
-                case Country.FR:
+                case CountryCode.FR:
                     return "FRA";
 
-                case Country.IO:
+                case CountryCode.IO:
                     return "IOT";
 
-                case Country.SH:
+                case CountryCode.SH:
                     return "SHN";
 
-                case Country.FI:
+                case CountryCode.FI:
                     return "FIN";
 
-                case Country.FJ:
+                case CountryCode.FJ:
                     return "FJI";
 
-                case Country.FK:
+                case CountryCode.FK:
                     return "FLK";
 
-                case Country.FM:
+                case CountryCode.FM:
                     return "FSM";
 
-                case Country.FO:
+                case CountryCode.FO:
                     return "FRO";
 
-                case Country.NI:
+                case CountryCode.NI:
                     return "NIC";
 
-                case Country.NL:
+                case CountryCode.NL:
                     return "NLD";
 
-                case Country.NO:
+                case CountryCode.NO:
                     return "NOR";
 
-                case Country.NA:
+                case CountryCode.NA:
                     return "NAM";
 
-                case Country.VU:
+                case CountryCode.VU:
                     return "VUT";
 
-                case Country.NC:
+                case CountryCode.NC:
                     return "NCL";
 
-                case Country.NE:
+                case CountryCode.NE:
                     return "NER";
 
-                case Country.NF:
+                case CountryCode.NF:
                     return "NFK";
 
-                case Country.NG:
+                case CountryCode.NG:
                     return "NGA";
 
-                case Country.NZ:
+                case CountryCode.NZ:
                     return "NZL";
 
-                case Country.NP:
+                case CountryCode.NP:
                     return "NPL";
 
-                case Country.NR:
+                case CountryCode.NR:
                     return "NRU";
 
-                case Country.NU:
+                case CountryCode.NU:
                     return "NIU";
 
-                case Country.CK:
+                case CountryCode.CK:
                     return "COK";
 
-                case Country.XK:
+                case CountryCode.XK:
                     return "XKX";
 
-                case Country.CI:
+                case CountryCode.CI:
                     return "CIV";
 
-                case Country.CH:
+                case CountryCode.CH:
                     return "CHE";
 
-                case Country.CO:
+                case CountryCode.CO:
                     return "COL";
 
-                case Country.CN:
+                case CountryCode.CN:
                     return "CHN";
 
-                case Country.CM:
+                case CountryCode.CM:
                     return "CMR";
 
-                case Country.CL:
+                case CountryCode.CL:
                     return "CHL";
 
-                case Country.CC:
+                case CountryCode.CC:
                     return "CCK";
 
-                case Country.CA:
+                case CountryCode.CA:
                     return "CAN";
 
-                case Country.CG:
+                case CountryCode.CG:
                     return "COG";
 
-                case Country.CF:
+                case CountryCode.CF:
                     return "CAF";
 
-                case Country.CD:
+                case CountryCode.CD:
                     return "COD";
 
-                case Country.CZ:
+                case CountryCode.CZ:
                     return "CZE";
 
-                case Country.CY:
+                case CountryCode.CY:
                     return "CYP";
 
-                case Country.CX:
+                case CountryCode.CX:
                     return "CXR";
 
-                case Country.CR:
+                case CountryCode.CR:
                     return "CRI";
 
-                case Country.CW:
+                case CountryCode.CW:
                     return "CUW";
 
-                case Country.CV:
+                case CountryCode.CV:
                     return "CPV";
 
-                case Country.CU:
+                case CountryCode.CU:
                     return "CUB";
 
-                case Country.SZ:
+                case CountryCode.SZ:
                     return "SWZ";
 
-                case Country.SY:
+                case CountryCode.SY:
                     return "SYR";
 
-                case Country.SX:
+                case CountryCode.SX:
                     return "SXM";
 
-                case Country.KG:
+                case CountryCode.KG:
                     return "KGZ";
 
-                case Country.KE:
+                case CountryCode.KE:
                     return "KEN";
 
-                case Country.SS:
+                case CountryCode.SS:
                     return "SSD";
 
-                case Country.SR:
+                case CountryCode.SR:
                     return "SUR";
 
-                case Country.KI:
+                case CountryCode.KI:
                     return "KIR";
 
-                case Country.KH:
+                case CountryCode.KH:
                     return "KHM";
 
-                case Country.KN:
+                case CountryCode.KN:
                     return "KNA";
 
-                case Country.KM:
+                case CountryCode.KM:
                     return "COM";
 
-                case Country.ST:
+                case CountryCode.ST:
                     return "STP";
 
-                case Country.SK:
+                case CountryCode.SK:
                     return "SVK";
 
-                case Country.KR:
+                case CountryCode.KR:
                     return "KOR";
 
-                case Country.SI:
+                case CountryCode.SI:
                     return "SVN";
 
-                case Country.KP:
+                case CountryCode.KP:
                     return "PRK";
 
-                case Country.KW:
+                case CountryCode.KW:
                     return "KWT";
 
-                case Country.SN:
+                case CountryCode.SN:
                     return "SEN";
 
-                case Country.SM:
+                case CountryCode.SM:
                     return "SMR";
 
-                case Country.SL:
+                case CountryCode.SL:
                     return "SLE";
 
-                case Country.SC:
+                case CountryCode.SC:
                     return "SYC";
 
-                case Country.KZ:
+                case CountryCode.KZ:
                     return "KAZ";
 
-                case Country.KY:
+                case CountryCode.KY:
                     return "CYM";
 
-                case Country.SG:
+                case CountryCode.SG:
                     return "SGP";
 
-                case Country.SE:
+                case CountryCode.SE:
                     return "SWE";
 
-                case Country.SD:
+                case CountryCode.SD:
                     return "SDN";
 
-                case Country.DO:
+                case CountryCode.DO:
                     return "DOM";
 
-                case Country.DM:
+                case CountryCode.DM:
                     return "DMA";
 
-                case Country.DJ:
+                case CountryCode.DJ:
                     return "DJI";
 
-                case Country.DK:
+                case CountryCode.DK:
                     return "DNK";
 
-                case Country.VG:
+                case CountryCode.VG:
                     return "VGB";
 
-                case Country.DE:
+                case CountryCode.DE:
                     return "DEU";
 
-                case Country.YE:
+                case CountryCode.YE:
                     return "YEM";
 
-                case Country.DZ:
+                case CountryCode.DZ:
                     return "DZA";
 
-                case Country.US:
+                case CountryCode.US:
                     return "USA";
 
-                case Country.UY:
+                case CountryCode.UY:
                     return "URY";
 
-                case Country.YT:
+                case CountryCode.YT:
                     return "MYT";
 
-                case Country.UM:
+                case CountryCode.UM:
                     return "UMI";
 
-                case Country.LB:
+                case CountryCode.LB:
                     return "LBN";
 
-                case Country.LC:
+                case CountryCode.LC:
                     return "LCA";
 
-                case Country.LA:
+                case CountryCode.LA:
                     return "LAO";
 
-                case Country.TV:
+                case CountryCode.TV:
                     return "TUV";
 
-                case Country.TW:
+                case CountryCode.TW:
                     return "TWN";
 
-                case Country.TT:
+                case CountryCode.TT:
                     return "TTO";
 
-                case Country.TR:
+                case CountryCode.TR:
                     return "TUR";
 
-                case Country.LK:
+                case CountryCode.LK:
                     return "LKA";
 
-                case Country.LI:
+                case CountryCode.LI:
                     return "LIE";
 
-                case Country.LV:
+                case CountryCode.LV:
                     return "LVA";
 
-                case Country.TO:
+                case CountryCode.TO:
                     return "TON";
 
-                case Country.LT:
+                case CountryCode.LT:
                     return "LTU";
 
-                case Country.LU:
+                case CountryCode.LU:
                     return "LUX";
 
-                case Country.LR:
+                case CountryCode.LR:
                     return "LBR";
 
-                case Country.LS:
+                case CountryCode.LS:
                     return "LSO";
 
-                case Country.TH:
+                case CountryCode.TH:
                     return "THA";
 
-                case Country.TF:
+                case CountryCode.TF:
                     return "ATF";
 
-                case Country.TG:
+                case CountryCode.TG:
                     return "TGO";
 
-                case Country.TD:
+                case CountryCode.TD:
                     return "TCD";
 
-                case Country.TC:
+                case CountryCode.TC:
                     return "TCA";
 
-                case Country.LY:
+                case CountryCode.LY:
                     return "LBY";
 
-                case Country.VA:
+                case CountryCode.VA:
                     return "VAT";
 
-                case Country.VC:
+                case CountryCode.VC:
                     return "VCT";
 
-                case Country.AE:
+                case CountryCode.AE:
                     return "ARE";
 
-                case Country.AD:
+                case CountryCode.AD:
                     return "AND";
 
-                case Country.AG:
+                case CountryCode.AG:
                     return "ATG";
 
-                case Country.AF:
+                case CountryCode.AF:
                     return "AFG";
 
-                case Country.AI:
+                case CountryCode.AI:
                     return "AIA";
 
-                case Country.VI:
+                case CountryCode.VI:
                     return "VIR";
 
-                case Country.IS:
+                case CountryCode.IS:
                     return "ISL";
 
-                case Country.IR:
+                case CountryCode.IR:
                     return "IRN";
 
-                case Country.AM:
+                case CountryCode.AM:
                     return "ARM";
 
-                case Country.AL:
+                case CountryCode.AL:
                     return "ALB";
 
-                case Country.AO:
+                case CountryCode.AO:
                     return "AGO";
 
-                case Country.AQ:
+                case CountryCode.AQ:
                     return "ATA";
 
-                case Country.AS:
+                case CountryCode.AS:
                     return "ASM";
 
-                case Country.AR:
+                case CountryCode.AR:
                     return "ARG";
 
-                case Country.AU:
+                case CountryCode.AU:
                     return "AUS";
 
-                case Country.AT:
+                case CountryCode.AT:
                     return "AUT";
 
-                case Country.AW:
+                case CountryCode.AW:
                     return "ABW";
 
-                case Country.IN:
+                case CountryCode.IN:
                     return "IND";
 
-                case Country.AX:
+                case CountryCode.AX:
                     return "ALA";
 
-                case Country.AZ:
+                case CountryCode.AZ:
                     return "AZE";
 
-                case Country.IE:
+                case CountryCode.IE:
                     return "IRL";
 
-                case Country.ID:
+                case CountryCode.ID:
                     return "IDN";
 
-                case Country.UA:
+                case CountryCode.UA:
                     return "UKR";
 
-                case Country.QA:
+                case CountryCode.QA:
                     return "QAT";
 
-                case Country.MZ:
+                case CountryCode.MZ:
                     return "MOZ";
 
                 default:
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 0f806a2403..da27c09e01 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -44,7 +44,7 @@ private void addAllCountries()
         {
             var countries = new List<TournamentTeam>();
 
-            foreach (var country in Enum.GetValues(typeof(Country)).Cast<Country>().Skip(1))
+            foreach (var country in Enum.GetValues(typeof(CountryCode)).Cast<CountryCode>().Skip(1))
             {
                 countries.Add(new TournamentTeam
                 {