diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 842f1498..41c96534 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -36,17 +36,17 @@ namespace TShockAPI.DB database = db; var table = new SqlTable("GroupList", - new SqlColumn("GroupName", MySqlDbType.VarChar, 32) {Primary = true}, - new SqlColumn("Parent", MySqlDbType.VarChar, 32), - new SqlColumn("Commands", MySqlDbType.Text), - new SqlColumn("ChatColor", MySqlDbType.Text), - new SqlColumn("Prefix", MySqlDbType.Text), - new SqlColumn("Suffix", MySqlDbType.Text) + new SqlColumn("GroupName", MySqlDbType.VarChar, 32) {Primary = true}, + new SqlColumn("Parent", MySqlDbType.VarChar, 32), + new SqlColumn("Commands", MySqlDbType.Text), + new SqlColumn("ChatColor", MySqlDbType.Text), + new SqlColumn("Prefix", MySqlDbType.Text), + new SqlColumn("Suffix", MySqlDbType.Text) ); var creator = new SqlTableCreator(db, - db.GetSqlType() == SqlType.Sqlite - ? (IQueryBuilder) new SqliteQueryCreator() - : new MysqlQueryCreator()); + db.GetSqlType() == SqlType.Sqlite + ? (IQueryBuilder) new SqliteQueryCreator() + : new MysqlQueryCreator()); if (creator.EnsureExists(table)) { // Add default groups if they don't exist diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 7eee3f7e..d4555fee 100755 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -35,19 +35,19 @@ namespace TShockAPI.DB database = db; var table = new SqlTable("Users", - new SqlColumn("ID", MySqlDbType.Int32) {Primary = true, AutoIncrement = true}, - new SqlColumn("Username", MySqlDbType.VarChar, 32) {Unique = true}, - new SqlColumn("Password", MySqlDbType.VarChar, 128), - new SqlColumn("UUID", MySqlDbType.VarChar, 128), - new SqlColumn("Usergroup", MySqlDbType.Text), + new SqlColumn("ID", MySqlDbType.Int32) {Primary = true, AutoIncrement = true}, + new SqlColumn("Username", MySqlDbType.VarChar, 32) {Unique = true}, + new SqlColumn("Password", MySqlDbType.VarChar, 128), + new SqlColumn("UUID", MySqlDbType.VarChar, 128), + new SqlColumn("Usergroup", MySqlDbType.Text), new SqlColumn("Registered", MySqlDbType.Text), - new SqlColumn("LastAccessed", MySqlDbType.Text), - new SqlColumn("KnownIPs", MySqlDbType.Text) + new SqlColumn("LastAccessed", MySqlDbType.Text), + new SqlColumn("KnownIPs", MySqlDbType.Text) ); var creator = new SqlTableCreator(db, - db.GetSqlType() == SqlType.Sqlite - ? (IQueryBuilder) new SqliteQueryCreator() - : new MysqlQueryCreator()); + db.GetSqlType() == SqlType.Sqlite + ? (IQueryBuilder) new SqliteQueryCreator() + : new MysqlQueryCreator()); creator.EnsureExists(table); } @@ -64,7 +64,7 @@ namespace TShockAPI.DB try { ret = database.Query("INSERT INTO Users (Username, Password, UUID, UserGroup, Registered) VALUES (@0, @1, @2, @3, @4);", user.Name, - TShock.Utils.HashPassword(user.Password), user.UUID, user.Group, DateTime.UtcNow.ToString("s")); + TShock.Utils.HashPassword(user.Password), user.UUID, user.Group, DateTime.UtcNow.ToString("s")); } catch (Exception ex) { @@ -113,7 +113,7 @@ namespace TShockAPI.DB { if ( database.Query("UPDATE Users SET Password = @0 WHERE Username = @1;", TShock.Utils.HashPassword(password), - user.Name) == 0) + user.Name) == 0) throw new UserNotExistException(user.Name); } catch (Exception ex) @@ -133,7 +133,7 @@ namespace TShockAPI.DB { if ( database.Query("UPDATE Users SET UUID = @0 WHERE Username = @1;", uuid, - user.Name) == 0) + user.Name) == 0) throw new UserNotExistException(user.Name); } catch (Exception ex) @@ -170,18 +170,18 @@ namespace TShockAPI.DB } } - public void UpdateLogin(User user) - { - try - { - if (database.Query("UPDATE Users SET LastAccessed = @0, KnownIps = @1 WHERE Username = @2;", DateTime.UtcNow.ToString("s"), user.KnownIps, user.Name) == 0) - throw new UserNotExistException(user.Name); - } - catch (Exception ex) - { - throw new UserManagerException("UpdateLogin SQL returned an error", ex); - } - } + public void UpdateLogin(User user) + { + try + { + if (database.Query("UPDATE Users SET LastAccessed = @0, KnownIps = @1 WHERE Username = @2;", DateTime.UtcNow.ToString("s"), user.KnownIps, user.Name) == 0) + throw new UserNotExistException(user.Name); + } + catch (Exception ex) + { + throw new UserManagerException("UpdateLogin SQL returned an error", ex); + } + } public int GetUserID(string username) { @@ -295,11 +295,11 @@ namespace TShockAPI.DB user.ID = result.Get("ID"); user.Group = result.Get("Usergroup"); user.Password = result.Get("Password"); - user.UUID = result.Get("UUID"); + user.UUID = result.Get("UUID"); user.Name = result.Get("Username"); user.Registered = result.Get("Registered"); - user.LastAccessed = result.Get("LastAccessed"); - user.KnownIps = result.Get("KnownIps"); + user.LastAccessed = result.Get("LastAccessed"); + user.KnownIps = result.Get("KnownIps"); return user; } } @@ -309,32 +309,32 @@ namespace TShockAPI.DB public int ID { get; set; } public string Name { get; set; } public string Password { get; set; } - public string UUID { get; set; } + public string UUID { get; set; } public string Group { get; set; } public string Registered { get; set; } - public string LastAccessed { get; set; } - public string KnownIps { get; set; } + public string LastAccessed { get; set; } + public string KnownIps { get; set; } public User(string name, string pass, string uuid, string group, string registered, string last, string known) { Name = name; Password = pass; - UUID = uuid; + UUID = uuid; Group = group; Registered = registered; - LastAccessed = last; - KnownIps = known; + LastAccessed = last; + KnownIps = known; } public User() { Name = ""; Password = ""; - UUID = ""; + UUID = ""; Group = ""; Registered = ""; - LastAccessed = ""; - KnownIps = ""; + LastAccessed = ""; + KnownIps = ""; } } diff --git a/TShockAPI/GeoIPCountry.cs b/TShockAPI/GeoIPCountry.cs index e9115f2f..764a69a2 100644 --- a/TShockAPI/GeoIPCountry.cs +++ b/TShockAPI/GeoIPCountry.cs @@ -72,126 +72,126 @@ namespace MaxMind private const long COUNTRY_BEGIN = 16776960; private static readonly string[] CountryCodes = { - "--", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", - "AO", "AQ", "AR", "AS", - "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", - "BI", "BJ", "BM", "BN", - "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", - "CF", "CG", "CH", "CI", - "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CY", "CZ", - "DE", "DJ", "DK", "DM", - "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", - "FK", "FM", "FO", "FR", - "FX", "GA", "GB", "GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", - "GP", "GQ", "GR", "GS", - "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", - "IE", "IL", "IN", "IO", - "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", - "KM", "KN", "KP", "KR", - "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", - "LU", "LV", "LY", "MA", - "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", - "MR", "MS", "MT", "MU", - "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", - "NL", "NO", "NP", "NR", - "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", - "PN", "PR", "PS", "PT", - "PW", "PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", - "SE", "SG", "SH", "SI", - "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", - "TC", "TD", "TF", "TG", - "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW", - "TZ", "UA", "UG", "UM", - "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", - "WS", "YE", "YT", "RS", - "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE", - "BL", "MF" - }; + "--", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", + "AO", "AQ", "AR", "AS", + "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", + "BI", "BJ", "BM", "BN", + "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", + "CF", "CG", "CH", "CI", + "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CY", "CZ", + "DE", "DJ", "DK", "DM", + "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", + "FK", "FM", "FO", "FR", + "FX", "GA", "GB", "GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", + "GP", "GQ", "GR", "GS", + "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", + "IE", "IL", "IN", "IO", + "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", + "KM", "KN", "KP", "KR", + "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", + "LU", "LV", "LY", "MA", + "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", + "MR", "MS", "MT", "MU", + "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", + "NL", "NO", "NP", "NR", + "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", + "PN", "PR", "PS", "PT", + "PW", "PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", + "SE", "SG", "SH", "SI", + "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", + "TC", "TD", "TF", "TG", + "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW", + "TZ", "UA", "UG", "UM", + "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", + "WS", "YE", "YT", "RS", + "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE", + "BL", "MF" + }; private static readonly string[] CountryNames = { - "N/A", "Asia/Pacific Region", "Europe", "Andorra", - "United Arab Emirates", "Afghanistan", - "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", - "Netherlands Antilles", "Angola", - "Antarctica", "Argentina", "American Samoa", "Austria", "Australia", - "Aruba", "Azerbaijan", - "Bosnia and Herzegovina", "Barbados", "Bangladesh", "Belgium", - "Burkina Faso", "Bulgaria", - "Bahrain", "Burundi", "Benin", "Bermuda", "Brunei Darussalam", - "Bolivia", "Brazil", "Bahamas", - "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", "Canada", - "Cocos (Keeling) Islands", - "Congo, The Democratic Republic of the", "Central African Republic", - "Congo", "Switzerland", - "Cote D'Ivoire", "Cook Islands", "Chile", "Cameroon", "China", - "Colombia", "Costa Rica", "Cuba", - "Cape Verde", "Christmas Island", "Cyprus", "Czech Republic", - "Germany", "Djibouti", "Denmark", - "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia", - "Egypt", "Western Sahara", - "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji", - "Falkland Islands (Malvinas)", - "Micronesia, Federated States of", "Faroe Islands", "France", - "France, Metropolitan", "Gabon", - "United Kingdom", "Grenada", "Georgia", "French Guiana", "Ghana", - "Gibraltar", "Greenland", - "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", - "South Georgia and the South Sandwich Islands", "Guatemala", "Guam", - "Guinea-Bissau", "Guyana", - "Hong Kong", "Heard Island and McDonald Islands", "Honduras", - "Croatia", "Haiti", "Hungary", - "Indonesia", "Ireland", "Israel", "India", - "British Indian Ocean Territory", "Iraq", - "Iran, Islamic Republic of", "Iceland", "Italy", "Jamaica", "Jordan", - "Japan", "Kenya", - "Kyrgyzstan", "Cambodia", "Kiribati", "Comoros", - "Saint Kitts and Nevis", - "Korea, Democratic People's Republic of", "Korea, Republic of", - "Kuwait", "Cayman Islands", - "Kazakstan", "Lao People's Democratic Republic", "Lebanon", - "Saint Lucia", "Liechtenstein", - "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg", - "Latvia", "Libyan Arab Jamahiriya", - "Morocco", "Monaco", "Moldova, Republic of", "Madagascar", - "Marshall Islands", "Macedonia", - "Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", - "Martinique", "Mauritania", - "Montserrat", "Malta", "Mauritius", "Maldives", "Malawi", "Mexico", - "Malaysia", "Mozambique", - "Namibia", "New Caledonia", "Niger", "Norfolk Island", "Nigeria", - "Nicaragua", "Netherlands", - "Norway", "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", - "Peru", "French Polynesia", - "Papua New Guinea", "Philippines", "Pakistan", "Poland", - "Saint Pierre and Miquelon", - "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", - "Portugal", "Palau", "Paraguay", - "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", - "Saudi Arabia", - "Solomon Islands", "Seychelles", "Sudan", "Sweden", "Singapore", - "Saint Helena", "Slovenia", - "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", - "Senegal", "Somalia", - "Suriname", "Sao Tome and Principe", "El Salvador", - "Syrian Arab Republic", "Swaziland", - "Turks and Caicos Islands", "Chad", "French Southern Territories", - "Togo", "Thailand", - "Tajikistan", "Tokelau", "Turkmenistan", "Tunisia", "Tonga", - "Timor-Leste", "Turkey", - "Trinidad and Tobago", "Tuvalu", "Taiwan", - "Tanzania, United Republic of", "Ukraine", "Uganda", - "United States Minor Outlying Islands", "United States", "Uruguay", - "Uzbekistan", - "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", - "Venezuela", - "Virgin Islands, British", "Virgin Islands, U.S.", "Vietnam", - "Vanuatu", "Wallis and Futuna", - "Samoa", "Yemen", "Mayotte", "Serbia", "South Africa", "Zambia", - "Montenegro", "Zimbabwe", - "Anonymous Proxy", "Satellite Provider", "Other", "Aland Islands", - "Guernsey", "Isle of Man", - "Jersey", "Saint Barthelemy", "Saint Martin" - }; + "N/A", "Asia/Pacific Region", "Europe", "Andorra", + "United Arab Emirates", "Afghanistan", + "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", + "Netherlands Antilles", "Angola", + "Antarctica", "Argentina", "American Samoa", "Austria", "Australia", + "Aruba", "Azerbaijan", + "Bosnia and Herzegovina", "Barbados", "Bangladesh", "Belgium", + "Burkina Faso", "Bulgaria", + "Bahrain", "Burundi", "Benin", "Bermuda", "Brunei Darussalam", + "Bolivia", "Brazil", "Bahamas", + "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", "Canada", + "Cocos (Keeling) Islands", + "Congo, The Democratic Republic of the", "Central African Republic", + "Congo", "Switzerland", + "Cote D'Ivoire", "Cook Islands", "Chile", "Cameroon", "China", + "Colombia", "Costa Rica", "Cuba", + "Cape Verde", "Christmas Island", "Cyprus", "Czech Republic", + "Germany", "Djibouti", "Denmark", + "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia", + "Egypt", "Western Sahara", + "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji", + "Falkland Islands (Malvinas)", + "Micronesia, Federated States of", "Faroe Islands", "France", + "France, Metropolitan", "Gabon", + "United Kingdom", "Grenada", "Georgia", "French Guiana", "Ghana", + "Gibraltar", "Greenland", + "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", + "South Georgia and the South Sandwich Islands", "Guatemala", "Guam", + "Guinea-Bissau", "Guyana", + "Hong Kong", "Heard Island and McDonald Islands", "Honduras", + "Croatia", "Haiti", "Hungary", + "Indonesia", "Ireland", "Israel", "India", + "British Indian Ocean Territory", "Iraq", + "Iran, Islamic Republic of", "Iceland", "Italy", "Jamaica", "Jordan", + "Japan", "Kenya", + "Kyrgyzstan", "Cambodia", "Kiribati", "Comoros", + "Saint Kitts and Nevis", + "Korea, Democratic People's Republic of", "Korea, Republic of", + "Kuwait", "Cayman Islands", + "Kazakstan", "Lao People's Democratic Republic", "Lebanon", + "Saint Lucia", "Liechtenstein", + "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg", + "Latvia", "Libyan Arab Jamahiriya", + "Morocco", "Monaco", "Moldova, Republic of", "Madagascar", + "Marshall Islands", "Macedonia", + "Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", + "Martinique", "Mauritania", + "Montserrat", "Malta", "Mauritius", "Maldives", "Malawi", "Mexico", + "Malaysia", "Mozambique", + "Namibia", "New Caledonia", "Niger", "Norfolk Island", "Nigeria", + "Nicaragua", "Netherlands", + "Norway", "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", + "Peru", "French Polynesia", + "Papua New Guinea", "Philippines", "Pakistan", "Poland", + "Saint Pierre and Miquelon", + "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", + "Portugal", "Palau", "Paraguay", + "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", + "Saudi Arabia", + "Solomon Islands", "Seychelles", "Sudan", "Sweden", "Singapore", + "Saint Helena", "Slovenia", + "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", + "Senegal", "Somalia", + "Suriname", "Sao Tome and Principe", "El Salvador", + "Syrian Arab Republic", "Swaziland", + "Turks and Caicos Islands", "Chad", "French Southern Territories", + "Togo", "Thailand", + "Tajikistan", "Tokelau", "Turkmenistan", "Tunisia", "Tonga", + "Timor-Leste", "Turkey", + "Trinidad and Tobago", "Tuvalu", "Taiwan", + "Tanzania, United Republic of", "Ukraine", "Uganda", + "United States Minor Outlying Islands", "United States", "Uruguay", + "Uzbekistan", + "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", + "Venezuela", + "Virgin Islands, British", "Virgin Islands, U.S.", "Vietnam", + "Vanuatu", "Wallis and Futuna", + "Samoa", "Yemen", "Mayotte", "Serbia", "South Africa", "Zambia", + "Montenegro", "Zimbabwe", + "Anonymous Proxy", "Satellite Provider", "Other", "Aland Islands", + "Guernsey", "Isle of Man", + "Jersey", "Saint Barthelemy", "Saint Martin" + }; // // Constructor diff --git a/TShockAPI/Hooks/GeneralHooks.cs b/TShockAPI/Hooks/GeneralHooks.cs index a6048961..d07c4f4f 100644 --- a/TShockAPI/Hooks/GeneralHooks.cs +++ b/TShockAPI/Hooks/GeneralHooks.cs @@ -18,26 +18,26 @@ along with this program. If not, see . namespace TShockAPI.Hooks { - public class ReloadEventArgs - { - public TSPlayer Player { get; set; } - public ReloadEventArgs(TSPlayer ply) - { - Player = ply; - } - } + public class ReloadEventArgs + { + public TSPlayer Player { get; set; } + public ReloadEventArgs(TSPlayer ply) + { + Player = ply; + } + } - public class GeneralHooks - { - public delegate void ReloadEventD(ReloadEventArgs e); - public static event ReloadEventD ReloadEvent; + public class GeneralHooks + { + public delegate void ReloadEventD(ReloadEventArgs e); + public static event ReloadEventD ReloadEvent; - public static void OnReloadEvent(TSPlayer ply) - { - if(ReloadEvent == null) - return; + public static void OnReloadEvent(TSPlayer ply) + { + if(ReloadEvent == null) + return; - ReloadEvent(new ReloadEventArgs(ply)); - } - } + ReloadEvent(new ReloadEventArgs(ply)); + } + } } diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 2007624b..8fc6a0c1 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -35,17 +35,17 @@ namespace TShockAPI /// public class Utils { - /// - /// The lowest id for a prefix. - /// - private const int FirstItemPrefix = 1; + /// + /// The lowest id for a prefix. + /// + private const int FirstItemPrefix = 1; - /// - /// The highest id for a prefix. - /// - private const int LastItemPrefix = 83; + /// + /// The highest id for a prefix. + /// + private const int LastItemPrefix = 83; - // Utils is a Singleton + // Utils is a Singleton private static readonly Utils instance = new Utils(); private Utils() {} public static Utils Instance { get { return instance; } } @@ -67,7 +67,7 @@ namespace TShockAPI /// Used for some places where a list of players might be used. /// /// String of players seperated by commas. - [Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")] + [Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")] public string GetPlayers() { var sb = new StringBuilder(); @@ -85,56 +85,56 @@ namespace TShockAPI return sb.ToString(); } - /// - /// Returns a list of current players on the server - /// - /// bool includeIDs - whether or not the string of each player name should include ID data - /// List of strings with names - public List GetPlayers(bool includeIDs) - { - var players = new List(); + /// + /// Returns a list of current players on the server + /// + /// bool includeIDs - whether or not the string of each player name should include ID data + /// List of strings with names + public List GetPlayers(bool includeIDs) + { + var players = new List(); - foreach (TSPlayer ply in TShock.Players) - { - if (ply != null && ply.Active) - { - if (includeIDs) - { - players.Add(ply.Name + " (IX: " + ply.Index + ", ID: " + ply.UserID + ")"); - } - else - { - players.Add(ply.Name); - } - } - } + foreach (TSPlayer ply in TShock.Players) + { + if (ply != null && ply.Active) + { + if (includeIDs) + { + players.Add(ply.Name + " (IX: " + ply.Index + ", ID: " + ply.UserID + ")"); + } + else + { + players.Add(ply.Name); + } + } + } - return players; - } + return players; + } - /// - /// Used for some places where a list of players might be used. - /// - /// String of players and their id seperated by commas. - [Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")] - public string GetPlayersWithIds() - { - var sb = new StringBuilder(); - foreach (TSPlayer player in TShock.Players) - { - if (player != null && player.Active) - { - if (sb.Length != 0) - { - sb.Append(", "); - } - sb.Append(player.Name); - string id = "(ID: " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + ", IX:" + player.Index + ")"; - sb.Append(id); - } - } - return sb.ToString(); - } + /// + /// Used for some places where a list of players might be used. + /// + /// String of players and their id seperated by commas. + [Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")] + public string GetPlayersWithIds() + { + var sb = new StringBuilder(); + foreach (TSPlayer player in TShock.Players) + { + if (player != null && player.Active) + { + if (sb.Length != 0) + { + sb.Append(", "); + } + sb.Append(player.Name); + string id = "(ID: " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + ", IX:" + player.Index + ")"; + sb.Append(id); + } + } + return sb.ToString(); + } /// /// Finds a player and gets IP as string @@ -204,20 +204,20 @@ namespace TShockAPI Broadcast(msg, color.R, color.G, color.B); } - /// - /// Broadcasts a message from a player, not TShock - /// - /// TSPlayer ply - the player that will send the packet - /// string msg - the message - /// r - /// g - /// b - public void Broadcast(int ply, string msg, byte red, byte green, byte blue) - { - TSPlayer.All.SendMessageFromPlayer(msg, red, green, blue, ply); - TSPlayer.Server.SendMessage(Main.player[ply].name + ": " + msg, red, green, blue); - Log.Info(string.Format("Broadcast: {0}", Main.player[ply].name + ": " + msg)); - } + /// + /// Broadcasts a message from a player, not TShock + /// + /// TSPlayer ply - the player that will send the packet + /// string msg - the message + /// r + /// g + /// b + public void Broadcast(int ply, string msg, byte red, byte green, byte blue) + { + TSPlayer.All.SendMessageFromPlayer(msg, red, green, blue, ply); + TSPlayer.Server.SendMessage(Main.player[ply].name + ": " + msg, red, green, blue); + Log.Info(string.Format("Broadcast: {0}", Main.player[ply].name + ": " + msg)); + } /// /// Sends message to all players with 'logs' permission. @@ -232,7 +232,7 @@ namespace TShockAPI foreach (TSPlayer player in TShock.Players) { if (player != null && player != excludedPlayer && player.Active && player.Group.HasPermission(Permissions.logs) && - player.DisplayLogs && TShock.Config.DisableSpewLogs == false) + player.DisplayLogs && TShock.Config.DisableSpewLogs == false) player.SendMessage(log, color); } } @@ -293,7 +293,7 @@ namespace TShockAPI /// X location /// Y location public void GetRandomClearTileWithInRange(int startTileX, int startTileY, int tileXRange, int tileYRange, - out int tileX, out int tileY) + out int tileX, out int tileY) { int j = 0; do @@ -509,8 +509,8 @@ namespace TShockAPI } return found; } - - /// + + /// /// Gets a prefix by ID or name /// /// ID or name @@ -635,18 +635,18 @@ namespace TShockAPI { string playerName = player.Name; player.SilentKickInProgress = silent; - if (player.IsLoggedIn && saveSSI) - player.SaveServerCharacter(); + if (player.IsLoggedIn && saveSSI) + player.SaveServerCharacter(); player.Disconnect(string.Format("Kicked: {0}", reason)); Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason)); string verb = force ? "force " : ""; - if (!silent) - { - if (string.IsNullOrWhiteSpace(adminUserName)) - Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green); - else + if (!silent) + { + if (string.IsNullOrWhiteSpace(adminUserName)) + Broadcast(string.Format("{0} was {1}kicked for '{2}'", playerName, verb, reason.ToLower()), Color.Green); + else Broadcast(string.Format("{0} {1}kicked {2} for '{3}'", adminUserName, verb, playerName, reason.ToLower()), Color.Green); - } + } return true; } return false; @@ -687,28 +687,28 @@ namespace TShockAPI return false; } - public bool HasBanExpired(Ban ban, bool byName = false) - { - DateTime exp; - bool expirationExists = DateTime.TryParse(ban.Expiration, out exp); + public bool HasBanExpired(Ban ban, bool byName = false) + { + DateTime exp; + bool expirationExists = DateTime.TryParse(ban.Expiration, out exp); - if (!string.IsNullOrWhiteSpace(ban.Expiration) && (expirationExists) && - (DateTime.UtcNow >= exp)) - { - if (byName) - { - TShock.Bans.RemoveBan(ban.Name, true, true, false); - } - else - { - TShock.Bans.RemoveBan(ban.IP, false, false, false); - } - - return true; - } + if (!string.IsNullOrWhiteSpace(ban.Expiration) && (expirationExists) && + (DateTime.UtcNow >= exp)) + { + if (byName) + { + TShock.Bans.RemoveBan(ban.Name, true, true, false); + } + else + { + TShock.Bans.RemoveBan(ban.IP, false, false, false); + } + + return true; + } - return false; - } + return false; + } /// /// Shows a file to the user. @@ -762,7 +762,7 @@ namespace TShockAPI return TShock.Groups.groups[i]; } } - return Group.DefaultGroup; + return Group.DefaultGroup; } /// @@ -796,23 +796,23 @@ namespace TShockAPI ply.SendErrorMessage("Use \"my query\" for items with spaces"); } - /// - /// Default hashing algorithm. - /// - public string HashAlgo = "sha512"; + /// + /// Default hashing algorithm. + /// + public string HashAlgo = "sha512"; - /// - /// A dictionary of hashing algortihms and an implementation object. - /// + /// + /// A dictionary of hashing algortihms and an implementation object. + /// public readonly Dictionary> HashTypes = new Dictionary> - { - {"sha512", () => new SHA512Managed()}, - {"sha256", () => new SHA256Managed()}, - {"md5", () => new MD5Cng()}, - {"sha512-xp", () => SHA512.Create()}, - {"sha256-xp", () => SHA256.Create()}, - {"md5-xp", () => MD5.Create()}, - }; + { + {"sha512", () => new SHA512Managed()}, + {"sha256", () => new SHA256Managed()}, + {"md5", () => new MD5Cng()}, + {"sha512-xp", () => SHA512.Create()}, + {"sha256-xp", () => SHA256.Create()}, + {"md5-xp", () => MD5.Create()}, + }; /// /// Returns a Sha256 string for a given string