From fc2330458e81fb871271b47336a3a6eac5471018 Mon Sep 17 00:00:00 2001
From: stacey <57187883+moisterrific@users.noreply.github.com>
Date: Sat, 24 Jul 2021 22:47:28 -0400
Subject: [PATCH] Change to independent checks and use colour differentiation

---
 TShockAPI/Commands.cs | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 8ebea2b9..178c64b7 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -807,19 +807,15 @@ namespace TShockAPI
 			}
 			else
 			{
-				if (TShock.Config.Settings.DisableUUIDLogin)
-				{
-					if (TShock.Config.Settings.AllowLoginAnyUsername)
-					{
-						args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
-						args.Player.SendErrorMessage($"         {Specifier}login <username> <password> - Logs in using your username and password");
-					}
-					else
-						args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
-				}
+				if (!TShock.Config.Settings.DisableUUIDLogin)
+					args.Player.SendMessage($"{Specifier}login - Logs in using your UUID and character name.", Color.White);
+
+				if (TShock.Config.Settings.AllowLoginAnyUsername)
+					args.Player.SendMessage($"{Specifier}login {"username".Color(Utils.GreenHighlight)} {"password".Color(Utils.BoldHighlight)} - Logs in using your username and password.", Color.White);
 				else
-					args.Player.SendErrorMessage($"Syntax: {Specifier}login - Logs in using your UUID and character name");
-				args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it.");
+					args.Player.SendMessage($"{Specifier}login {"password".Color(Utils.BoldHighlight)} - Logs in using your password and character name.", Color.White);
+
+				args.Player.SendWarningMessage("If you forgot your password, there is no way to recover it.");
 				return;
 			}
 			try
@@ -1001,15 +997,13 @@ namespace TShockAPI
 					args.Player.SendSuccessMessage("Account \"{0}\" has been registered.", account.Name);
 					args.Player.SendSuccessMessage("Your password is {0}.", echoPassword);
 					
-					if (TShock.Config.Settings.DisableUUIDLogin)
-					{
-						if (TShock.Config.Settings.AllowLoginAnyUsername)
-							args.Player.SendInfoMessage($"Type {Specifier}login \"{account.Name}\" {echoPassword} to sign in to your account.");
-						else
-							args.Player.SendInfoMessage($"Type {Specifier}login {echoPassword} to sign in to your account.");
-					}
+					if (!TShock.Config.Settings.DisableUUIDLogin)
+						args.Player.SendMessage($"Type {Specifier}login to sign in to your account.", Color.White);
+
+					if (TShock.Config.Settings.AllowLoginAnyUsername)
+						args.Player.SendMessage($"Type {Specifier}login \"{account.Name.Color(Utils.GreenHighlight)}\" {echoPassword.Color(Utils.BoldHighlight)} to sign in to your account.", Color.White);
 					else
-						args.Player.SendSuccessMessage($"Type {Specifier}login to sign in to your account.");
+						args.Player.SendMessage($"Type {Specifier}login {echoPassword.Color(Utils.BoldHighlight)} to sign in to your account.", Color.White);
 					
 					TShock.UserAccounts.AddUserAccount(account);
 					TShock.Log.ConsoleInfo("{0} registered an account: \"{1}\".", args.Player.Name, account.Name);