warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

C# 9 Cleanup (#325)

Browse source 
- [X] Removes EventArgs - not needed
- [X] Merges sequential checks
- [X] Removes redundant type declarations
This commit is contained in:
Kamron Batman 2020-11-27 00:29:21 -08:00 • committed by GitHub
parent 351611a23a
commit 3551d962f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 2209 additions and 2213 deletions
Download patch file Download diff file Expand all files Collapse all files

274
Projects/UOContent/Misc/LanguageStatistics.cs
View file

@ -23,141 +23,141 @@ namespace Server.Misc
{
private static readonly InternationalCode[] InternationalCodes =
{
new InternationalCode("ARA", "Arabic", "Saudi Arabia", "العربية", "السعودية"),
new InternationalCode("ARI", "Arabic", "Iraq", "العربية", "العراق"),
new InternationalCode("ARE", "Arabic", "Egypt", "العربية", "مصر"),
new InternationalCode("ARL", "Arabic", "Libya", "العربية", "ليبيا"),
new InternationalCode("ARG", "Arabic", "Algeria", "العربية", "الجزائر"),
new InternationalCode("ARM", "Arabic", "Morocco", "العربية", "المغرب"),
new InternationalCode("ART", "Arabic", "Tunisia", "العربية", "تونس"),
new InternationalCode("ARO", "Arabic", "Oman", "العربية", "عمان"),
new InternationalCode("ARY", "Arabic", "Yemen", "العربية", "اليمن"),
new InternationalCode("ARS", "Arabic", "Syria", "العربية", "سورية"),
new InternationalCode("ARJ", "Arabic", "Jordan", "العربية", "الأردن"),
new InternationalCode("ARB", "Arabic", "Lebanon", "العربية", "لبنان"),
new InternationalCode("ARK", "Arabic", "Kuwait", "العربية", "الكويت"),
new InternationalCode("ARU", "Arabic", "U.A.E.", "العربية", "الامارات"),
new InternationalCode("ARH", "Arabic", "Bahrain", "العربية", "البحرين"),
new InternationalCode("ARQ", "Arabic", "Qatar", "العربية", "قطر"),
new InternationalCode("BGR", "Bulgarian", "Bulgaria", "Български", "България"),
new InternationalCode("CAT", "Catalan", "Spain", "Català", "Espanya"),
new InternationalCode("CHT", "Chinese", "Taiwan", "台語", "臺灣"),
new InternationalCode("CHS", "Chinese", "PRC", "中文", "中国"),
new InternationalCode("ZHH", "Chinese", "Hong Kong", "中文", "香港"),
new InternationalCode("ZHI", "Chinese", "Singapore", "中文", "新加坡"),
new InternationalCode("ZHM", "Chinese", "Macau", "中文", "澳門"),
new InternationalCode("CSY", "Czech", "Czech Republic", "Čeština", "Česká republika"),
new InternationalCode("DAN", "Danish", "Denmark", "Dansk", "Danmark"),
new InternationalCode("DEU", "German", "Germany", "Deutsch", "Deutschland"),
new InternationalCode("DES", "German", "Switzerland", "Deutsch", "der Schweiz"),
new InternationalCode("DEA", "German", "Austria", "Deutsch", "Österreich"),
new InternationalCode("DEL", "German", "Luxembourg", "Deutsch", "Luxembourg"),
new InternationalCode("DEC", "German", "Liechtenstein", "Deutsch", "Liechtenstein"),
new InternationalCode("ELL", "Greek", "Greece", "Ελληνικά", "Ελλάδα"),
new InternationalCode("ENU", "English", "United States"),
new InternationalCode("ENG", "English", "United Kingdom"),
new InternationalCode("ENA", "English", "Australia"),
new InternationalCode("ENC", "English", "Canada"),
new InternationalCode("ENZ", "English", "New Zealand"),
new InternationalCode("ENI", "English", "Ireland"),
new InternationalCode("ENS", "English", "South Africa"),
new InternationalCode("ENJ", "English", "Jamaica"),
new InternationalCode("ENB", "English", "Caribbean"),
new InternationalCode("ENL", "English", "Belize"),
new InternationalCode("ENT", "English", "Trinidad"),
new InternationalCode("ENW", "English", "Zimbabwe"),
new InternationalCode("ENP", "English", "Philippines"),
new InternationalCode("ESP", "Spanish", "Spain (Traditional Sort)", "Español", "España (tipo tradicional)"),
new InternationalCode("ESM", "Spanish", "Mexico", "Español", "México"),
new InternationalCode("ESN", "Spanish", "Spain (International Sort)", "Español", "España (tipo internacional)"),
new InternationalCode("ESG", "Spanish", "Guatemala", "Español", "Guatemala"),
new InternationalCode("ESC", "Spanish", "Costa Rica", "Español", "Costa Rica"),
new InternationalCode("ESA", "Spanish", "Panama", "Español", "Panama"),
new InternationalCode("ESD", "Spanish", "Dominican Republic", "Español", "Republica Dominicana"),
new InternationalCode("ESV", "Spanish", "Venezuela", "Español", "Venezuela"),
new InternationalCode("ESO", "Spanish", "Colombia", "Español", "Colombia"),
new InternationalCode("ESR", "Spanish", "Peru", "Español", "Peru"),
new InternationalCode("ESS", "Spanish", "Argentina", "Español", "Argentina"),
new InternationalCode("ESF", "Spanish", "Ecuador", "Español", "Ecuador"),
new InternationalCode("ESL", "Spanish", "Chile", "Español", "Chile"),
new InternationalCode("ESY", "Spanish", "Uruguay", "Español", "Uruguay"),
new InternationalCode("ESZ", "Spanish", "Paraguay", "Español", "Paraguay"),
new InternationalCode("ESB", "Spanish", "Bolivia", "Español", "Bolivia"),
new InternationalCode("ESE", "Spanish", "El Salvador", "Español", "El Salvador"),
new InternationalCode("ESH", "Spanish", "Honduras", "Español", "Honduras"),
new InternationalCode("ESI", "Spanish", "Nicaragua", "Español", "Nicaragua"),
new InternationalCode("ESU", "Spanish", "Puerto Rico", "Español", "Puerto Rico"),
new InternationalCode("FIN", "Finnish", "Finland", "Suomi", "Suomi"),
new InternationalCode("FRA", "French", "France", "Français", "France"),
new InternationalCode("FRB", "French", "Belgium", "Français", "Belgique"),
new InternationalCode("FRC", "French", "Canada", "Français", "Canada"),
new InternationalCode("FRS", "French", "Switzerland", "Français", "Suisse"),
new InternationalCode("FRL", "French", "Luxembourg", "Français", "Luxembourg"),
new InternationalCode("FRM", "French", "Monaco", "Français", "Monaco"),
new InternationalCode("HEB", "Hebrew", "Israel", "עִבְרִית", "ישׂראל"),
new InternationalCode("HUN", "Hungarian", "Hungary", "Magyar", "Magyarország"),
new InternationalCode("ISL", "Icelandic", "Iceland", "Íslenska", "Ísland"),
new InternationalCode("ITA", "Italian", "Italy", "Italiano", "Italia"),
new InternationalCode("ITS", "Italian", "Switzerland", "Italiano", "Svizzera"),
new InternationalCode("JPN", "Japanese", "Japan", "日本語", "日本"),
new InternationalCode("KOR", "Korean (Extended Wansung)", "Korea", "한국어", "한국"),
new InternationalCode("NLD", "Dutch", "Netherlands", "Nederlands", "Nederland"),
new InternationalCode("NLB", "Dutch", "Belgium", "Nederlands", "België"),
new InternationalCode("NOR", "Norwegian", "Norway (Bokmål)", "Norsk", "Norge (Bokmål)"),
new InternationalCode("NON", "Norwegian", "Norway (Nynorsk)", "Norsk", "Norge (Nynorsk)"),
new InternationalCode("PLK", "Polish", "Poland", "Polski", "Polska"),
new InternationalCode("PTB", "Portuguese", "Brazil", "Português", "Brasil"),
new InternationalCode("PTG", "Portuguese", "Portugal", "Português", "Brasil"),
new InternationalCode("ROM", "Romanian", "Romania", "Limba Română", "România"),
new InternationalCode("RUS", "Russian", "Russia", "Русский", "Россия"),
new InternationalCode("HRV", "Croatian", "Croatia", "Hrvatski", "Hrvatska"),
new InternationalCode("SRL", "Serbian", "Serbia (Latin)", "Srpski", "Srbija i Crna Gora"),
new InternationalCode("SRB", "Serbian", "Serbia (Cyrillic)", "Српски", "Србија и Црна Гора"),
new InternationalCode("SKY", "Slovak", "Slovakia", "Slovenčina", "Slovensko"),
new InternationalCode("SQI", "Albanian", "Albania", "Shqip", "Shqipëria"),
new InternationalCode("SVE", "Swedish", "Sweden", "Svenska", "Sverige"),
new InternationalCode("SVF", "Swedish", "Finland", "Svenska", "Finland"),
new InternationalCode("THA", "Thai", "Thailand", "ภาษาไทย", "ประเทศไทย"),
new InternationalCode("TRK", "Turkish", "Turkey", "Türkçe", "Türkiye"),
new InternationalCode("URP", "Urdu", "Pakistan", "اردو", "پاکستان"),
new InternationalCode("IND", "Indonesian", "Indonesia", "Bahasa Indonesia", "Indonesia"),
new InternationalCode("UKR", "Ukrainian", "Ukraine", "Українська", "Украина"),
new InternationalCode("BEL", "Belarusian", "Belarus", "Беларускі", "Беларусь"),
new InternationalCode("SLV", "Slovene", "Slovenia", "Slovenščina", "Slovenija"),
new InternationalCode("ETI", "Estonian", "Estonia", "Eesti", "Eesti"),
new InternationalCode("LVI", "Latvian", "Latvia", "Latviešu", "Latvija"),
new InternationalCode("LTH", "Lithuanian", "Lithuania", "Lietuvių", "Lietuva"),
new InternationalCode("LTC", "Classic Lithuanian", "Lithuania", "Lietuviškai", "Lietuva"),
new InternationalCode("FAR", "Farsi", "Iran", "فارسى", "ايران"),
new InternationalCode("VIT", "Vietnamese", "Viet Nam", "tiếng Việt", "Việt Nam"),
new InternationalCode("HYE", "Armenian", "Armenia", "Հայերէն", "Հայաստան"),
new InternationalCode("AZE", "Azeri", "Azerbaijan (Latin)", "Azərbaycanca", "Azərbaycan"),
new InternationalCode("AZE", "Azeri", "Azerbaijan (Cyrillic)", "Азәрбајҹанҹа", "Азәрбајҹан"),
new InternationalCode("EUQ", "Basque", "Spain", "Euskera", "Espainia"),
new InternationalCode("MKI", "Macedonian", "Macedonia", "Македонски", "Македонија"),
new InternationalCode("AFK", "Afrikaans", "South Africa", "Afrikaans", "Republiek van Suid-Afrika"),
new InternationalCode("KAT", "Georgian", "Georgia", "ქართული", "საკარტველო"),
new InternationalCode("FOS", "Faeroese", "Faeroe Islands", "Føroyska", "Føroya"),
new InternationalCode("HIN", "Hindi", "India", "हिन्दी", "भारत"),
new InternationalCode("MSL", "Malay", "Malaysia", "Bahasa melayu", "Malaysia"),
new InternationalCode("MSB", "Malay", "Brunei Darussalam", "Bahasa melayu", "Negara Brunei Darussalam"),
new InternationalCode("KAZ", "Kazak", "Kazakstan", "Қазақ", "Қазақстан"),
new InternationalCode("SWK", "Swahili", "Kenya", "Kiswahili", "Kenya"),
new InternationalCode("UZB", "Uzbek", "Uzbekistan (Latin)", "O'zbek", "O'zbekiston"),
new InternationalCode("UZB", "Uzbek", "Uzbekistan (Cyrillic)", "Ўзбек", "Ўзбекистон"),
new InternationalCode("TAT", "Tatar", "Tatarstan", "Татарча", "Татарстан"),
new InternationalCode("BEN", "Bengali", "India", "বাংলা", "ভারত"),
new InternationalCode("PAN", "Punjabi", "India", "ਪੰਜਾਬੀ", "ਭਾਰਤ"),
new InternationalCode("GUJ", "Gujarati", "India", "ગુજરાતી", "ભારત"),
new InternationalCode("ORI", "Oriya", "India", "ଓଡ଼ିଆ", "ଭାରତ"),
new InternationalCode("TAM", "Tamil", "India", "தமிழ்", "இந்தியா"),
new InternationalCode("TEL", "Telugu", "India", "తెలుగు", "భారత"),
new InternationalCode("KAN", "Kannada", "India", "ಕನ್ನಡ", "ಭಾರತ"),
new InternationalCode("MAL", "Malayalam", "India", "മലയാളം", "ഭാരത"),
new InternationalCode("ASM", "Assamese", "India", "অসমিয়া", "Bhārat"), // missing correct country name
new InternationalCode("MAR", "Marathi", "India", "मराठी", "भारत"),
new InternationalCode("SAN", "Sanskrit", "India", "संस्कृत", "भारतम्"),
new InternationalCode("KOK", "Konkani", "India", "कोंकणी", "भारत")
new("ARA", "Arabic", "Saudi Arabia", "العربية", "السعودية"),
new("ARI", "Arabic", "Iraq", "العربية", "العراق"),
new("ARE", "Arabic", "Egypt", "العربية", "مصر"),
new("ARL", "Arabic", "Libya", "العربية", "ليبيا"),
new("ARG", "Arabic", "Algeria", "العربية", "الجزائر"),
new("ARM", "Arabic", "Morocco", "العربية", "المغرب"),
new("ART", "Arabic", "Tunisia", "العربية", "تونس"),
new("ARO", "Arabic", "Oman", "العربية", "عمان"),
new("ARY", "Arabic", "Yemen", "العربية", "اليمن"),
new("ARS", "Arabic", "Syria", "العربية", "سورية"),
new("ARJ", "Arabic", "Jordan", "العربية", "الأردن"),
new("ARB", "Arabic", "Lebanon", "العربية", "لبنان"),
new("ARK", "Arabic", "Kuwait", "العربية", "الكويت"),
new("ARU", "Arabic", "U.A.E.", "العربية", "الامارات"),
new("ARH", "Arabic", "Bahrain", "العربية", "البحرين"),
new("ARQ", "Arabic", "Qatar", "العربية", "قطر"),
new("BGR", "Bulgarian", "Bulgaria", "Български", "България"),
new("CAT", "Catalan", "Spain", "Català", "Espanya"),
new("CHT", "Chinese", "Taiwan", "台語", "臺灣"),
new("CHS", "Chinese", "PRC", "中文", "中国"),
new("ZHH", "Chinese", "Hong Kong", "中文", "香港"),
new("ZHI", "Chinese", "Singapore", "中文", "新加坡"),
new("ZHM", "Chinese", "Macau", "中文", "澳門"),
new("CSY", "Czech", "Czech Republic", "Čeština", "Česká republika"),
new("DAN", "Danish", "Denmark", "Dansk", "Danmark"),
new("DEU", "German", "Germany", "Deutsch", "Deutschland"),
new("DES", "German", "Switzerland", "Deutsch", "der Schweiz"),
new("DEA", "German", "Austria", "Deutsch", "Österreich"),
new("DEL", "German", "Luxembourg", "Deutsch", "Luxembourg"),
new("DEC", "German", "Liechtenstein", "Deutsch", "Liechtenstein"),
new("ELL", "Greek", "Greece", "Ελληνικά", "Ελλάδα"),
new("ENU", "English", "United States"),
new("ENG", "English", "United Kingdom"),
new("ENA", "English", "Australia"),
new("ENC", "English", "Canada"),
new("ENZ", "English", "New Zealand"),
new("ENI", "English", "Ireland"),
new("ENS", "English", "South Africa"),
new("ENJ", "English", "Jamaica"),
new("ENB", "English", "Caribbean"),
new("ENL", "English", "Belize"),
new("ENT", "English", "Trinidad"),
new("ENW", "English", "Zimbabwe"),
new("ENP", "English", "Philippines"),
new("ESP", "Spanish", "Spain (Traditional Sort)", "Español", "España (tipo tradicional)"),
new("ESM", "Spanish", "Mexico", "Español", "México"),
new("ESN", "Spanish", "Spain (International Sort)", "Español", "España (tipo internacional)"),
new("ESG", "Spanish", "Guatemala", "Español", "Guatemala"),
new("ESC", "Spanish", "Costa Rica", "Español", "Costa Rica"),
new("ESA", "Spanish", "Panama", "Español", "Panama"),
new("ESD", "Spanish", "Dominican Republic", "Español", "Republica Dominicana"),
new("ESV", "Spanish", "Venezuela", "Español", "Venezuela"),
new("ESO", "Spanish", "Colombia", "Español", "Colombia"),
new("ESR", "Spanish", "Peru", "Español", "Peru"),
new("ESS", "Spanish", "Argentina", "Español", "Argentina"),
new("ESF", "Spanish", "Ecuador", "Español", "Ecuador"),
new("ESL", "Spanish", "Chile", "Español", "Chile"),
new("ESY", "Spanish", "Uruguay", "Español", "Uruguay"),
new("ESZ", "Spanish", "Paraguay", "Español", "Paraguay"),
new("ESB", "Spanish", "Bolivia", "Español", "Bolivia"),
new("ESE", "Spanish", "El Salvador", "Español", "El Salvador"),
new("ESH", "Spanish", "Honduras", "Español", "Honduras"),
new("ESI", "Spanish", "Nicaragua", "Español", "Nicaragua"),
new("ESU", "Spanish", "Puerto Rico", "Español", "Puerto Rico"),
new("FIN", "Finnish", "Finland", "Suomi", "Suomi"),
new("FRA", "French", "France", "Français", "France"),
new("FRB", "French", "Belgium", "Français", "Belgique"),
new("FRC", "French", "Canada", "Français", "Canada"),
new("FRS", "French", "Switzerland", "Français", "Suisse"),
new("FRL", "French", "Luxembourg", "Français", "Luxembourg"),
new("FRM", "French", "Monaco", "Français", "Monaco"),
new("HEB", "Hebrew", "Israel", "עִבְרִית", "ישׂראל"),
new("HUN", "Hungarian", "Hungary", "Magyar", "Magyarország"),
new("ISL", "Icelandic", "Iceland", "Íslenska", "Ísland"),
new("ITA", "Italian", "Italy", "Italiano", "Italia"),
new("ITS", "Italian", "Switzerland", "Italiano", "Svizzera"),
new("JPN", "Japanese", "Japan", "日本語", "日本"),
new("KOR", "Korean (Extended Wansung)", "Korea", "한국어", "한국"),
new("NLD", "Dutch", "Netherlands", "Nederlands", "Nederland"),
new("NLB", "Dutch", "Belgium", "Nederlands", "België"),
new("NOR", "Norwegian", "Norway (Bokmål)", "Norsk", "Norge (Bokmål)"),
new("NON", "Norwegian", "Norway (Nynorsk)", "Norsk", "Norge (Nynorsk)"),
new("PLK", "Polish", "Poland", "Polski", "Polska"),
new("PTB", "Portuguese", "Brazil", "Português", "Brasil"),
new("PTG", "Portuguese", "Portugal", "Português", "Brasil"),
new("ROM", "Romanian", "Romania", "Limba Română", "România"),
new("RUS", "Russian", "Russia", "Русский", "Россия"),
new("HRV", "Croatian", "Croatia", "Hrvatski", "Hrvatska"),
new("SRL", "Serbian", "Serbia (Latin)", "Srpski", "Srbija i Crna Gora"),
new("SRB", "Serbian", "Serbia (Cyrillic)", "Српски", "Србија и Црна Гора"),
new("SKY", "Slovak", "Slovakia", "Slovenčina", "Slovensko"),
new("SQI", "Albanian", "Albania", "Shqip", "Shqipëria"),
new("SVE", "Swedish", "Sweden", "Svenska", "Sverige"),
new("SVF", "Swedish", "Finland", "Svenska", "Finland"),
new("THA", "Thai", "Thailand", "ภาษาไทย", "ประเทศไทย"),
new("TRK", "Turkish", "Turkey", "Türkçe", "Türkiye"),
new("URP", "Urdu", "Pakistan", "اردو", "پاکستان"),
new("IND", "Indonesian", "Indonesia", "Bahasa Indonesia", "Indonesia"),
new("UKR", "Ukrainian", "Ukraine", "Українська", "Украина"),
new("BEL", "Belarusian", "Belarus", "Беларускі", "Беларусь"),
new("SLV", "Slovene", "Slovenia", "Slovenščina", "Slovenija"),
new("ETI", "Estonian", "Estonia", "Eesti", "Eesti"),
new("LVI", "Latvian", "Latvia", "Latviešu", "Latvija"),
new("LTH", "Lithuanian", "Lithuania", "Lietuvių", "Lietuva"),
new("LTC", "Classic Lithuanian", "Lithuania", "Lietuviškai", "Lietuva"),
new("FAR", "Farsi", "Iran", "فارسى", "ايران"),
new("VIT", "Vietnamese", "Viet Nam", "tiếng Việt", "Việt Nam"),
new("HYE", "Armenian", "Armenia", "Հայերէն", "Հայաստան"),
new("AZE", "Azeri", "Azerbaijan (Latin)", "Azərbaycanca", "Azərbaycan"),
new("AZE", "Azeri", "Azerbaijan (Cyrillic)", "Азәрбајҹанҹа", "Азәрбајҹан"),
new("EUQ", "Basque", "Spain", "Euskera", "Espainia"),
new("MKI", "Macedonian", "Macedonia", "Македонски", "Македонија"),
new("AFK", "Afrikaans", "South Africa", "Afrikaans", "Republiek van Suid-Afrika"),
new("KAT", "Georgian", "Georgia", "ქართული", "საკარტველო"),
new("FOS", "Faeroese", "Faeroe Islands", "Føroyska", "Føroya"),
new("HIN", "Hindi", "India", "हिन्दी", "भारत"),
new("MSL", "Malay", "Malaysia", "Bahasa melayu", "Malaysia"),
new("MSB", "Malay", "Brunei Darussalam", "Bahasa melayu", "Negara Brunei Darussalam"),
new("KAZ", "Kazak", "Kazakstan", "Қазақ", "Қазақстан"),
new("SWK", "Swahili", "Kenya", "Kiswahili", "Kenya"),
new("UZB", "Uzbek", "Uzbekistan (Latin)", "O'zbek", "O'zbekiston"),
new("UZB", "Uzbek", "Uzbekistan (Cyrillic)", "Ўзбек", "Ўзбекистон"),
new("TAT", "Tatar", "Tatarstan", "Татарча", "Татарстан"),
new("BEN", "Bengali", "India", "বাংলা", "ভারত"),
new("PAN", "Punjabi", "India", "ਪੰਜਾਬੀ", "ਭਾਰਤ"),
new("GUJ", "Gujarati", "India", "ગુજરાતી", "ભારત"),
new("ORI", "Oriya", "India", "ଓଡ଼ିଆ", "ଭାରତ"),
new("TAM", "Tamil", "India", "தமிழ்", "இந்தியா"),
new("TEL", "Telugu", "India", "తెలుగు", "భారత"),
new("KAN", "Kannada", "India", "ಕನ್ನಡ", "ಭಾರತ"),
new("MAL", "Malayalam", "India", "മലയാളം", "ഭാരത"),
new("ASM", "Assamese", "India", "অসমিয়া", "Bhārat"), // missing correct country name
new("MAR", "Marathi", "India", "मराठी", "भारत"),
new("SAN", "Sanskrit", "India", "संस्कृत", "भारतम्"),
new("KOK", "Konkani", "India", "कोंकणी", "भारत")
};
private static readonly bool DefaultLocalNames = false;
@ -166,7 +166,7 @@ namespace Server.Misc
private static string GetFormattedInfo(string code)
{
if (code == null || code.Length != 3)
if (code?.Length != 3)
{
return $"Unknown code {code}";
}
@ -341,7 +341,7 @@ namespace Server.Misc
private class InternationalCodeComparer : IComparer<InternationalCodeCounter>
{
public static readonly InternationalCodeComparer Instance = new InternationalCodeComparer();
public static readonly InternationalCodeComparer Instance = new();
public int Compare(InternationalCodeCounter x, InternationalCodeCounter y)
{