Refactor commands + add more commands

src/main/java/me/vlod/pinto/PintoServer.java

@@ -420,7 +420,7 @@ public void sendHeartbeat() {
 
 			int onlineClients = 0;
 			for (NetworkHandler client : this.clients) {
-				if (client.loggedIn && NetHandlerUtils
+				if (client.userName != null && NetHandlerUtils
 						.getToOthersStatus(client.databaseEntry.status) != UserStatus.OFFLINE) {
 					onlineClients++;
 				}

src/main/java/me/vlod/pinto/Utils.java

@@ -160,7 +160,7 @@ public static String[] splitBySpace(String str) {
 	/**
 	 * Gets a salted MD5 hash from the specified string
 	 * 
-	 * @param salt the salt to use
+	 * @param salt the salt to use (can be empty)
 	 * @param content the string to hash
 	 * @return the MD5 hash or empty on error
 	 */
@@ -174,6 +174,24 @@ public static String getMD5HashFromStr(String salt, String content) {
 		}
 	}
 
+
+	/**
+	 * Gets a salted SHA256 hash from the specified string
+	 * 
+	 * @param salt the salt to use (can be empty)
+	 * @param content the string to hash
+	 * @return the SHA256 hash or empty on error
+	 */
+	public static String getSHA256HashFromStr(String salt, String content) {
+		try {
+			MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+			messageDigest.update((salt + content).getBytes());
+			return (new BigInteger(1, messageDigest.digest())).toString(16);	
+		} catch (Exception ex) {
+			return "";
+		}
+	}
+
 	/**
 	 * Splits the specified string into chunks<br>
 	 * From <a href="https://stackoverflow.com/a/3760193">https://stackoverflow.com/a/3760193</a>

src/main/java/me/vlod/pinto/consolehandler/ConsoleHandler.java

@@ -8,16 +8,18 @@
 import me.vlod.pinto.PintoServer;
 import me.vlod.pinto.Tuple;
 import me.vlod.pinto.Utils;
-import me.vlod.pinto.consolehandler.commands.BanCMD;
-import me.vlod.pinto.consolehandler.commands.BanIPCMD;
-import me.vlod.pinto.consolehandler.commands.GetIPCMD;
-import me.vlod.pinto.consolehandler.commands.KickCMD;
-import me.vlod.pinto.consolehandler.commands.KickIPCMD;
-import me.vlod.pinto.consolehandler.commands.NotificationCMD;
-import me.vlod.pinto.consolehandler.commands.ReloadCMD;
-import me.vlod.pinto.consolehandler.commands.StopCMD;
-import me.vlod.pinto.consolehandler.commands.UnbanCMD;
-import me.vlod.pinto.consolehandler.commands.UnbanIPCMD;
+import me.vlod.pinto.consolehandler.commands.Ban;
+import me.vlod.pinto.consolehandler.commands.BanIP;
+import me.vlod.pinto.consolehandler.commands.ChangePassword;
+import me.vlod.pinto.consolehandler.commands.GetIP;
+import me.vlod.pinto.consolehandler.commands.Kick;
+import me.vlod.pinto.consolehandler.commands.KickIP;
+import me.vlod.pinto.consolehandler.commands.ListUsers;
+import me.vlod.pinto.consolehandler.commands.Notification;
+import me.vlod.pinto.consolehandler.commands.Reload;
+import me.vlod.pinto.consolehandler.commands.Stop;
+import me.vlod.pinto.consolehandler.commands.Unban;
+import me.vlod.pinto.consolehandler.commands.UnbanIP;
 
 public class ConsoleHandler {
 	protected PintoServer server;
@@ -28,16 +30,18 @@ public class ConsoleHandler {
     public ConsoleHandler(PintoServer server, ConsoleCaller caller) {
     	this.server = server;
     	this.caller = caller;
-    	this.commands.add(new BanCMD());
-    	this.commands.add(new BanIPCMD());
-    	this.commands.add(new GetIPCMD());
-    	this.commands.add(new KickCMD());
-    	this.commands.add(new KickIPCMD());
-    	this.commands.add(new ReloadCMD());
-    	this.commands.add(new UnbanCMD());
-    	this.commands.add(new UnbanIPCMD());
-    	this.commands.add(new StopCMD());
-    	this.commands.add(new NotificationCMD());
+    	this.commands.add(new Ban());
+    	this.commands.add(new BanIP());
+    	this.commands.add(new GetIP());
+    	this.commands.add(new Kick());
+    	this.commands.add(new KickIP());
+    	this.commands.add(new Reload());
+    	this.commands.add(new Unban());
+    	this.commands.add(new UnbanIP());
+    	this.commands.add(new Stop());
+    	this.commands.add(new ListUsers());
+    	this.commands.add(new Notification());
+    	this.commands.add(new ChangePassword());
     }
 
 	public void handleInput(String input) {

src/main/java/me/vlod/pinto/consolehandler/commands/BanCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Ban.java

@@ -4,7 +4,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class BanCMD implements ConsoleCommand {
+public class Ban implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "ban";

src/main/java/me/vlod/pinto/consolehandler/commands/BanIPCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/BanIP.java

@@ -4,10 +4,10 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class BanIPCMD implements ConsoleCommand {
+public class BanIP implements ConsoleCommand {
 	@Override
 	public String getName() {
-		return "banip";
+		return "ban-ip";
 	}
 
 	@Override
@@ -17,7 +17,7 @@ public String getDescription() {
 
 	@Override
 	public String getUsage() {
-		return "banip <ip> <reason>";
+		return "ban-ip <ip> <reason>";
 	}
 
 	@Override

src/main/java/me/vlod/pinto/consolehandler/commands/ChangePassword.java

@@ -0,0 +1,57 @@
+package me.vlod.pinto.consolehandler.commands;
+
+import me.vlod.pinto.PintoServer;
+import me.vlod.pinto.UserDatabaseEntry;
+import me.vlod.pinto.Utils;
+import me.vlod.pinto.consolehandler.ConsoleCaller;
+import me.vlod.pinto.consolehandler.ConsoleCommand;
+import me.vlod.pinto.networking.NetworkHandler;
+
+public class ChangePassword implements ConsoleCommand {
+	@Override
+	public String getName() {
+		return "change-password";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Changes a user's password, they will be kicked";
+	}
+
+	@Override
+	public String getUsage() {
+		return "change-password <user> <new password>";
+	}
+
+	@Override
+	public int getMinArgsCount() {
+		return 2;
+	}
+
+	@Override
+	public int getMaxArgsCount() {
+		return 2;
+	}
+
+	@Override
+	public void execute(PintoServer server, ConsoleCaller caller, String[] args) throws Exception {
+		String user = args[0];
+		String password = args[1];
+
+		if (!UserDatabaseEntry.isRegistered(server, user)) {
+			PintoServer.logger.error("The account %s is not registered", user);
+			return;
+		}
+
+		UserDatabaseEntry userDatabaseEntry = new UserDatabaseEntry(server, user);
+		userDatabaseEntry.load();
+		userDatabaseEntry.passwordHash = Utils.getSHA256HashFromStr("", password);
+		userDatabaseEntry.save();
+		PintoServer.logger.info("Successfully changed %s's password", user);
+
+		NetworkHandler netHandler = server.getHandlerByName(user);
+		if (netHandler != null) {
+			netHandler.kick("Your password has been modified!");
+		}
+	}
+}

src/main/java/me/vlod/pinto/consolehandler/commands/GetIPCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/GetIP.java

@@ -5,10 +5,10 @@
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 import me.vlod.pinto.networking.NetworkHandler;
 
-public class GetIPCMD implements ConsoleCommand {
+public class GetIP implements ConsoleCommand {
 	@Override
 	public String getName() {
-		return "getip";
+		return "get-ip";
 	}
 
 	@Override
@@ -18,7 +18,7 @@ public String getDescription() {
 
 	@Override
 	public String getUsage() {
-		return "getip <user>";
+		return "get-ip <user>";
 	}
 
 	@Override

src/main/java/me/vlod/pinto/consolehandler/commands/KickCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Kick.java

@@ -5,7 +5,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 import me.vlod.pinto.networking.NetworkHandler;
 
-public class KickCMD implements ConsoleCommand {
+public class Kick implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "kick";

src/main/java/me/vlod/pinto/consolehandler/commands/KickIPCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/KickIP.java

@@ -5,10 +5,10 @@
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 import me.vlod.pinto.networking.NetworkHandler;
 
-public class KickIPCMD implements ConsoleCommand {
+public class KickIP implements ConsoleCommand {
 	@Override
 	public String getName() {
-		return "kickip";
+		return "kick-ip";
 	}
 
 	@Override
@@ -18,7 +18,7 @@ public String getDescription() {
 
 	@Override
 	public String getUsage() {
-		return "kickip <user> <reason>";
+		return "kick-ip <user> <reason>";
 	}
 
 	@Override

src/main/java/me/vlod/pinto/consolehandler/commands/ListUsers.java

@@ -0,0 +1,45 @@
+package me.vlod.pinto.consolehandler.commands;
+
+import me.vlod.pinto.PintoServer;
+import me.vlod.pinto.configuration.MainConfig;
+import me.vlod.pinto.consolehandler.ConsoleCaller;
+import me.vlod.pinto.consolehandler.ConsoleCommand;
+import me.vlod.pinto.networking.NetworkHandler;
+
+public class ListUsers implements ConsoleCommand {
+	@Override
+	public String getName() {
+		return "list-users";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Lists all connected users";
+	}
+
+	@Override
+	public String getUsage() {
+		return "list-users";
+	}
+
+	@Override
+	public int getMinArgsCount() {
+		return 0;
+	}
+
+	@Override
+	public int getMaxArgsCount() {
+		return 0;
+	}
+
+	@Override
+	public void execute(PintoServer server, ConsoleCaller caller, String[] args) throws Exception {
+		PintoServer.logger.info("There are %d clients out of the max of %d connected%s", 
+				server.clients.size(), MainConfig.instance.maxUsers, server.clients.size() > 0 ? ":" : "");
+
+		for (NetworkHandler client : server.clients.toArray(new NetworkHandler[0])) {
+			PintoServer.logger.info("- %s (%s)", client.networkAddress,
+					client.userName != null ? client.userName : "** UNAUTHENTICATED **");
+		}
+	}
+}

src/main/java/me/vlod/pinto/consolehandler/commands/NotificationCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Notification.java

@@ -5,7 +5,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 import me.vlod.pinto.networking.packet.PacketPopup;
 
-public class NotificationCMD implements ConsoleCommand {
+public class Notification implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "notification";

src/main/java/me/vlod/pinto/consolehandler/commands/ReloadCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Reload.java

@@ -4,7 +4,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class ReloadCMD implements ConsoleCommand {
+public class Reload implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "reload";

src/main/java/me/vlod/pinto/consolehandler/commands/StopCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Stop.java

@@ -4,7 +4,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class StopCMD implements ConsoleCommand {
+public class Stop implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "stop";

src/main/java/me/vlod/pinto/consolehandler/commands/UnbanCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/Unban.java

@@ -4,7 +4,7 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class UnbanCMD implements ConsoleCommand {
+public class Unban implements ConsoleCommand {
 	@Override
 	public String getName() {
 		return "unban";

src/main/java/me/vlod/pinto/consolehandler/commands/UnbanIPCMD.java → src/main/java/me/vlod/pinto/consolehandler/commands/UnbanIP.java

@@ -4,10 +4,10 @@
 import me.vlod.pinto.consolehandler.ConsoleCaller;
 import me.vlod.pinto.consolehandler.ConsoleCommand;
 
-public class UnbanIPCMD implements ConsoleCommand {
+public class UnbanIP implements ConsoleCommand {
 	@Override
 	public String getName() {
-		return "unbanip";
+		return "unban-ip";
 	}
 
 	@Override
@@ -17,7 +17,7 @@ public String getDescription() {
 
 	@Override
 	public String getUsage() {
-		return "unbanip <ip>";
+		return "unban-ip <ip>";
 	}
 
 	@Override