From 18ca858e87569d68a4403a3f672b065e1cbc2c0e Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <UnknownShadow200@gmail.com>
Date: Sun, 29 Nov 2015 22:54:32 +1100
Subject: [PATCH] Print more helpful message for /client and /client help
 (Thanks FabTheZen)

---
 ClassicalSharp/Commands/CommandManager.cs  | 24 +++++++++++++++++++++-
 ClassicalSharp/Commands/DefaultCommands.cs | 21 ++++---------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ClassicalSharp/Commands/CommandManager.cs b/ClassicalSharp/Commands/CommandManager.cs
index 4cb335382..aa5b83d9f 100644
--- a/ClassicalSharp/Commands/CommandManager.cs
+++ b/ClassicalSharp/Commands/CommandManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 
 namespace ClassicalSharp.Commands {
 	
@@ -53,7 +54,9 @@ namespace ClassicalSharp.Commands {
 		public void Execute( string text ) {
 			CommandReader reader = new CommandReader( text );
 			if( reader.TotalArgs == 0 ) {
-				game.Chat.Add( "&e/client: No command name specified. See /client commands for a list of commands." );
+				game.Chat.Add( "&eList of client commands:" );
+				PrintDefinedCommands( game );
+				game.Chat.Add( "&eTo see a particular command's help, type /client help [cmd name]" );
 				return;
 			}
 			string commandName = reader.Next();
@@ -62,5 +65,24 @@ namespace ClassicalSharp.Commands {
 				cmd.Execute( reader );
 			}
 		}
+		
+		public void PrintDefinedCommands( Game game ) {
+			List<string> lines = new List<string>();
+			StringBuilder buffer = new StringBuilder( 64 );
+			foreach( Command cmd in game.CommandManager.RegisteredCommands ) {
+				string name = cmd.Name;
+				if( buffer.Length + name.Length > 64 ) {
+					lines.Add( buffer.ToString() );
+					buffer.Length = 0;
+				}
+				buffer.Append( name );
+				buffer.Append( ", " );
+			}
+			if( buffer.Length > 0 )
+				lines.Add( buffer.ToString() );
+			foreach( string part in lines ) {
+				game.Chat.Add( part );
+			}
+		}
 	}
 }
diff --git a/ClassicalSharp/Commands/DefaultCommands.cs b/ClassicalSharp/Commands/DefaultCommands.cs
index 07622d601..96340e1e7 100644
--- a/ClassicalSharp/Commands/DefaultCommands.cs
+++ b/ClassicalSharp/Commands/DefaultCommands.cs
@@ -18,22 +18,7 @@ namespace ClassicalSharp.Commands {
 		}
 		
 		public override void Execute( CommandReader reader ) {
-			List<string> commandNames = new List<string>();
-			StringBuilder buffer = new StringBuilder( 64 );
-			foreach( Command cmd in game.CommandManager.RegisteredCommands ) {
-				string name = cmd.Name;
-				if( buffer.Length + name.Length > 64 ) {
-					commandNames.Add( buffer.ToString() );
-					buffer.Length = 0;
-				}
-				buffer.Append( name + ", " );
-			}
-			if( buffer.Length > 0 ) {
-				commandNames.Add( buffer.ToString() );
-			}
-			foreach( string part in commandNames ) {
-				game.Chat.Add( part );
-			}
+			game.CommandManager.PrintDefinedCommands( game );
 		}
 	}
 	
@@ -51,7 +36,9 @@ namespace ClassicalSharp.Commands {
 		public override void Execute( CommandReader reader ) {
 			string cmdName = reader.Next();
 			if( cmdName == null ) {
-				game.Chat.Add( "&e/client help: No command name specified. See /client commands for a list of commands." );
+				game.Chat.Add( "&eList of client commands:" );
+				game.CommandManager.PrintDefinedCommands( game );
+				game.Chat.Add( "&eTo see a particular command's help, type /client help [cmd name]" );
 			} else {
 				Command cmd = game.CommandManager.GetMatchingCommand( cmdName );
 				if( cmd != null ) {