Converted all the modules that were still using Command Strings to use

Command Files

src/com/redstoner/modules/abot/Abot.cmd

@@ -0,0 +1,7 @@
+command abot {
+	reload {
+		help Reloads answers from the .json file.;
+		run abot_reload;
+		perm utils.abot.reload;
+	}
+}

src/com/redstoner/modules/abot/Abot.java

@@ -19,9 +19,9 @@ import com.redstoner.misc.JsonManager;
 import com.redstoner.misc.Main;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Abot implements Module, Listener
 {
 	private File answerFile = new File(Main.plugin.getDataFolder(), "abot.json");
@@ -65,18 +65,4 @@ public class Abot implements Module, Listener
 		loadAnswers(Bukkit.getConsoleSender());
 		return true;
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command abot {\n" +
-				"	reload {" +
-				"		help Reloads answers from the .json file.;\n" +
-				"		run abot_reload;\n" +
-				"		perm utils.abot.reload;" +
-				"	}\n" +
-				"}";
-	}
-	// format
 }

src/com/redstoner/modules/adminchat/Adminchat.cmd

@@ -0,0 +1,42 @@
+command ac {
+	[string:message...] {
+		help Sends a message in Admin Chat;
+		perm utils.ac;
+		run ac_msg message;
+	}
+}
+command acn {
+	[string:name] [string:message...] {
+		help Sends a message in Admin Chat;
+		perm utils.ac;
+		type console;
+		run acn_msg name message;
+	}
+}
+		
+command ackey {
+	[string:key] {
+		help Sets your Admin Chat key;
+		perm utils.ac;
+		type player;
+		run setackey key;
+	}
+}
+
+command act {
+	on {
+		help Turns on act;
+		perm utils.ac;
+		run act_on;
+	}
+	off {
+		help Turns off act;
+		perm utils.ac;
+		run act_off;
+	}
+	[empty] {
+		help toggles Admin Chat;
+		perm utils.ac;
+		run act;
+	}
+}

src/com/redstoner/modules/adminchat/Adminchat.java

@@ -28,9 +28,9 @@ import net.nemez.chatapi.ChatAPI;
 /** AdminChat module. Allows staff to chat to other staff using /ac \<message\> as well as a one char prefix or a toggle.
  * 
  * @author Pepich */
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 1, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Adminchat implements Module, Listener
 {
 	private static final char defaultKey = ',';
@@ -51,55 +51,6 @@ public class Adminchat implements Module, Listener
 		return true;
 	}
 	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command ac {\n" + 
-				"	[string:message...] {\n" + 
-				"		help Sends a message in Admin Chat;\n" + 
-				"		perm utils.ac;\n" + 
-				"		run ac_msg message;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"command acn {\n" + 
-				"	[string:name] [string:message...] {\n" + 
-				"		help Sends a message in Admin Chat;\n" + 
-				"		perm utils.ac;\n" + 
-				"		type console;\n" +
-				"		run acn_msg name message;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"		\n" + 
-				"command ackey {\n" + 
-				"	[string:key] {\n" + 
-				"		help Sets your Admin Chat key;\n" + 
-				"		perm utils.ac;\n" + 
-				"		type player;\n" + 
-				"		run setackey key;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command act {\n" + 
-				"	on {\n" + 
-				"		help Turns on act;\n" + 
-				"		perm utils.ac;\n" + 
-				"		run act_on;\n" + 
-				"	}\n" + 
-				"	off {\n" + 
-				"		help Turns off act;\n" + 
-				"		perm utils.ac;\n" + 
-				"		run act_off;\n" + 
-				"	}\n" + 
-				"	[empty] {\n" + 
-				"		help toggles Admin Chat;\n" + 
-				"		perm utils.ac;\n" + 
-				"		run act;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
-	
 	@Command(hook = "ac_msg")
 	public boolean acSay(CommandSender sender, String message)
 	{

src/com/redstoner/modules/buildchat/BuildChat.cmd

@@ -0,0 +1,42 @@
+command bc {
+	[string:message...] {
+		help Sends a message in BuildTeam Chat;
+		perm utils.bc;
+		run bc_msg message;
+	}
+}
+command bcn {
+	[string:name] [string:message...] {
+		help Sends a message in BuildTeam Chat;
+		perm utils.bc;
+		type console;
+		run bcn_msg name message;
+	}
+}
+		
+command bckey {
+	[string:key] {
+		help Sets your BuildTeam Chat key;
+		perm utils.bc;
+		type player;
+		run setbckey key;
+	}
+}
+
+command bct {
+	on {
+		help Turns on bct;
+		perm utils.bc;
+		run bct_on;
+	}
+	off {
+		help Turns off bct;
+		perm utils.bc;
+		run bct_off;
+	}
+	[empty] {
+		help toggles BuildTeam Chat;
+		perm utils.bc;
+		run bct;
+	}
+}";

src/com/redstoner/modules/buildchat/BuildChat.java

@@ -26,9 +26,9 @@ import com.redstoner.modules.Module;
 /** BuildTeamChat module. Allows the build team to chat privately using /bc \<message\> as well as a one char prefix or a toggle.
  * 
  * @author Pepich */
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 1, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class BuildChat implements Module, Listener
 {
 	private static final char defaultKey = ';';
@@ -49,55 +49,6 @@ public class BuildChat implements Module, Listener
 		return true;
 	}
 	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command bc {\n" + 
-				"	[string:message...] {\n" + 
-				"		help Sends a message in BuildTeam Chat;\n" + 
-				"		perm utils.bc;\n" + 
-				"		run bc_msg message;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"command bcn {\n" + 
-				"	[string:name] [string:message...] {\n" + 
-				"		help Sends a message in BuildTeam Chat;\n" + 
-				"		perm utils.bc;\n" + 
-				"		type console;\n" +
-				"		run bcn_msg name message;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"		\n" + 
-				"command bckey {\n" + 
-				"	[string:key] {\n" + 
-				"		help Sets your BuildTeam Chat key;\n" + 
-				"		perm utils.bc;\n" + 
-				"		type player;\n" + 
-				"		run setbckey key;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command bct {\n" + 
-				"	on {\n" + 
-				"		help Turns on bct;\n" + 
-				"		perm utils.bc;\n" + 
-				"		run bct_on;\n" + 
-				"	}\n" + 
-				"	off {\n" + 
-				"		help Turns off bct;\n" + 
-				"		perm utils.bc;\n" + 
-				"		run bct_off;\n" + 
-				"	}\n" + 
-				"	[empty] {\n" + 
-				"		help toggles BuildTeam Chat;\n" + 
-				"		perm utils.bc;\n" + 
-				"		run bct;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
-	
 	@Command(hook = "bc_msg")
 	public boolean bcSay(CommandSender sender, String message)
 	{

src/com/redstoner/modules/chatalias/Chatalias.cmd

@@ -0,0 +1,16 @@
+command alias {
+    add [flag:-r] [string:keyword] [string:replacement...] {
+        help Adds a new alias. Set -r to make it a regex-alias.;
+        run addalias -r keyword replacement;
+    }
+    del [flag:-r] [string:keyword] {
+        help Deletes an alias. -r indicates if it was a regex-alias.;
+        run delalias -r keyword;
+    }
+    list {
+        help Lists your aliases.;
+        run listaliases;
+    }
+    perm utils.alias;
+    type player;
+}

src/com/redstoner/modules/chatalias/Chatalias.java

@@ -30,9 +30,9 @@ import com.redstoner.modules.Module;
 
 import net.nemez.chatapi.ChatAPI;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 3, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Chatalias implements Module, Listener
 {
 	private final String[] commands = new String[] {"e?r", "e?m .+?", "e?t", "e?w", "e?msg .+?", "e?message .+?",
@@ -314,27 +314,4 @@ public class Chatalias implements Module, Listener
 		temp.put("data", aliases.get(uuid.toString()));
 		JsonManager.save(temp, new File(Main.plugin.getDataFolder(), "aliases/" + uuid.toString() + ".json"));
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command alias {\n" + 
-				"    add [flag:-r] [string:keyword] [string:replacement...] {\n" + 
-				"        help Adds a new alias. Set -r to make it a regex-alias.;\n" + 
-				"        run addalias -r keyword replacement;\n" + 
-				"    }\n" + 
-				"    del [flag:-r] [string:keyword] {\n" + 
-				"        help Deletes an alias. -r indicates if it was a regex-alias.;\n" + 
-				"        run delalias -r keyword;\n" + 
-				"    }\n" + 
-				"    list {\n" + 
-				"        help Lists your aliases.;\n" + 
-				"        run listaliases;\n" + 
-				"    }\n" + 
-				"    perm utils.alias;\n" + 
-				"    type player;\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/chatgroups/Chatgroups.cmd

@@ -0,0 +1,35 @@
+command cgt {
+	[empty] {
+		help Toggles your cgtoggle status.;
+		type player;
+		run cgtoggle;
+	}
+}
+command cgkey {
+	[string:key] {
+		help Sets your chatgroup key.;
+		run setcgkey key;
+		type player;
+	}
+}
+command cgsay {
+	[string:message...] {
+		help Chats in your chatgroup.;
+		run cgsay message;
+	}
+}
+command cg {
+	join [string:group] {
+		help Joins a chatgroup.;
+		run cgjoin group;
+	}
+	leave {
+		help Leaves your chatgroup.;
+		run cgleave;
+	}
+	info {
+		help Displays info about your chatgroup.;
+		run cginfo;
+	}
+				
+}

src/com/redstoner/modules/chatgroups/Chatgroups.java

@@ -32,9 +32,9 @@ import net.nemez.chatapi.ChatAPI;
 /** The ChatGroups module. Allows people to have private sub-chats that can be accessed via a single char prefix or a toggle.
  * 
  * @author Pepich */
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 2, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Chatgroups implements Module, Listener
 {
 	private static final char defaultKey = ':';
@@ -69,48 +69,6 @@ public class Chatgroups implements Module, Listener
 		saveGroups();
 	}
 	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return  "command cgt {\n" +
-				"	[empty] {\n" +
-				"		help Toggles your cgtoggle status.;\n"+
-				"		type player;\n" +
-				"		run cgtoggle;\n" +
-				"	}\n" +
-				"}\n" +
-				"command cgkey {\n" +
-				"	[string:key] {\n" +
-				"		help Sets your chatgroup key.;\n" +
-				"		run setcgkey key;\n" +
-				"		type player;\n" +
-				"	}\n" +
-				"}\n" +
-				"command cgsay {\n" +
-				"	[string:message...] {\n" +
-				"		help Chats in your chatgroup.;\n"+
-				"		run cgsay message;\n" +
-				"	}\n" +
-				"}\n" +
-				"command cg {\n" +
-				"	join [string:group] {\n" +
-				"		help Joins a chatgroup.;\n" +
-				"		run cgjoin group;\n" +
-				"	}\n" +
-				"	leave {\n" +
-				"		help Leaves your chatgroup.;\n" +
-				"		run cgleave;\n" +
-				"	}\n" +
-				"	info {\n" +
-				"		help Displays info about your chatgroup.;\n" +
-				"		run cginfo;\n" +
-				"	}\n" +
-				
-				"}";
-	}
-	// @format
-	
 	/** Prints chatgroup info (like players in the group, groupname) to the sender.
 	 * 
 	 * @param sender the issuer of the command.

src/com/redstoner/modules/check/Check.cmd

@@ -0,0 +1,8 @@
+command check {
+	perm utils.check;
+	
+	[string:player] {
+		run checkCommand player;
+		help Get info on a player;
+	}
+}

src/com/redstoner/modules/check/Check.java

@@ -22,8 +22,10 @@ import org.json.simple.parser.JSONParser;
 import com.nemez.cmdmgr.Command;
 import com.nemez.cmdmgr.Command.AsyncType;
 import com.nemez.cmdmgr.CommandManager;
+import com.redstoner.annotations.Commands;
 import com.redstoner.annotations.Version;
 import com.redstoner.coremods.moduleLoader.ModuleLoader;
+import com.redstoner.misc.CommandHolderType;
 import com.redstoner.misc.Main;
 import com.redstoner.misc.mysql.JSONManager;
 import com.redstoner.misc.mysql.MysqlHandler;
@@ -35,7 +37,8 @@ import com.redstoner.modules.Module;
 
 import net.nemez.chatapi.click.Message;
 
-@Version(major = 4, minor = 0, revision = 3, compatible = 4)
+@Commands(CommandHolderType.File)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Check implements Module, Listener
 {
 	MysqlTable table;
@@ -241,19 +244,4 @@ public class Check implements Module, Listener
 			e.printStackTrace();
 		}
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command check {\n" + 
-				"	perm utils.check;\n" + 
-				"	\n" + 
-				"	[string:player] {\n" + 
-				"		run checkCommand player;\n" + 
-				"		help Get info on a player;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/clear/Clear.cmd

@@ -0,0 +1,13 @@
+command clear{
+    [empty] {
+        help Clears your inventory;
+        type player;
+        perm utils.clear;
+        run clear;
+    }
+    [string:player] {
+        help Clears someone elses inventory;
+        perm utils.admin.clear;
+        run clearother player;
+    }
+}

src/com/redstoner/modules/clear/Clear.java

@@ -11,8 +11,8 @@ import com.redstoner.annotations.Version;
 import com.redstoner.misc.CommandHolderType;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Clear implements Module
 {
 	@Command(hook = "clear")
@@ -41,24 +41,4 @@ public class Clear implements Module
 		}
 		return true;
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command clear{\n" + 
-				"    [empty] {\n" + 
-				"        help Clears your inventory;\n" + 
-				"        type player;\n" + 
-				"        perm utils.clear;\n" + 
-				"        run clear;\n" + 
-				"    }\n" + 
-				"    [string:player] {\n" + 
-				"        help Clears someone elses inventory;\n" + 
-				"        perm utils.admin.clear;\n" + 
-				"        run clearother player;\n" + 
-				"    }\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/cycle/Cycle.cmd

@@ -0,0 +1,12 @@
+command cycle {
+    on {
+        help Turns on cycle;
+        type player;
+        run cycle_on;
+    }
+    off {
+        help Turns off cycle;
+        type player;
+        run cycle_off;
+    }
+}

src/com/redstoner/modules/cycle/Cycle.java

@@ -22,9 +22,9 @@ import com.redstoner.misc.JsonManager;
 import com.redstoner.misc.Main;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Cycle implements Module, Listener
 {
 	private File cycleFile = new File(Main.plugin.getDataFolder(), "cycle.json");
@@ -139,23 +139,4 @@ public class Cycle implements Module, Listener
 			result[i + offset] = items2[i];
 		return result;
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command cycle {\n" + 
-				"    on {\n" + 
-				"        help Turns on cycle;\n" + 
-				"        type player;\n" + 
-				"        run cycle_on;\n" + 
-				"    }\n" + 
-				"    off {\n" + 
-				"        help Turns off cycle;\n" + 
-				"        type player;\n" + 
-				"        run cycle_off;\n" + 
-				"    }\n" + 
-				"}";
-	}
-	// format
 }

src/com/redstoner/modules/damnspam/DamnSpam.cmd

@@ -0,0 +1,15 @@
+command damnspam {
+	perm utils.damnspam;
+	
+	[double:seconds] {
+		run damnspamSingle seconds;
+		help Set single input cooldown for button or lever.;
+		type player;
+	}
+	
+	[double:secondsOff] [double:secondsOn] {
+		run damnspamDouble secondsOff secondsOn;
+		help Set input cooldown after it's been turned off and turned on (for lever only).;
+		type player;
+	}
+}

src/com/redstoner/modules/damnspam/DamnSpam.java

@@ -37,9 +37,9 @@ import com.redstoner.misc.CommandHolderType;
 import com.redstoner.misc.Main;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class DamnSpam implements Module, Listener
 {
 	File configFile = new File(Main.plugin.getDataFolder(), "DamnSpam.json");
@@ -346,26 +346,4 @@ public class DamnSpam implements Module, Listener
 			}
 		}
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command damnspam {\n" + 
-				"	perm utils.damnspam;\n" + 
-				"	\n" + 
-				"	[double:seconds] {\n" + 
-				"		run damnspamSingle seconds;\n" + 
-				"		help Set single input cooldown for button or lever.;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	[double:secondsOff] [double:secondsOn] {\n" + 
-				"		run damnspamDouble secondsOff secondsOn;\n" + 
-				"		help Set input cooldown after it's been turned off and turned on (for lever only).;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/lagchunks/LagChunks.cmd

@@ -0,0 +1,19 @@
+"command lc {
+	perm utils.lagchunks;
+	
+	list {
+		run list_cmd;
+		help re-lists already scanned chunks;
+	}
+		
+	[int:amount] {
+		run scan_cmd amount;
+		help scans for laggy chunks;
+	}
+	
+	tp [int:number] {
+		run tp number;
+		help teleports to the specified chunk;
+		type player;
+	}
+}

src/com/redstoner/modules/lagchunks/LagChunks.java

@@ -17,8 +17,8 @@ import com.redstoner.annotations.Version;
 import com.redstoner.misc.CommandHolderType;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class LagChunks implements Module
 {
 	private List<LaggyChunk> laggyChunks = new ArrayList<LaggyChunk>();
@@ -79,31 +79,4 @@ public class LagChunks implements Module
 			getLogger().message(sender, true, "§4Invalid chunk number! Use §e/lc list §4to show laggy chunks!");
 		}
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command lc {\n" + 
-				"	perm utils.lagchunks;\n" + 
-				"	\n" + 
-				"	list {\n" + 
-				"		run list_cmd;\n" + 
-				"		help re-lists already scanned chunks;\n" + 
-				"	}\n" + 
-				"		\n" + 
-				"	[int:amount] {\n" + 
-				"		run scan_cmd amount;\n" + 
-				"		help scans for laggy chunks;\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	tp [int:number] {\n" + 
-				"		run tp number;\n" + 
-				"		help teleports to the specified chunk;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"	";
-	}
-	// @format
 }

src/com/redstoner/modules/loginsecurity/LoginSecurity.cmd

@@ -0,0 +1,49 @@
+command register {
+	perm utils.loginsecurity;
+	
+	[string:password] {
+		run register password;
+		help Protects your account with a password;
+		type player;
+	}
+}
+
+command login {
+	perm utils.loginsecurity;
+	
+	[string:password] {
+		run login password;
+		help Logs you in;
+		type player;
+	}
+}
+
+command cgpass {
+	perm utils.loginsecurity;
+	
+	[string:oldPassword] [string:newPassword] {
+		run cgpass oldPassword newPassword;
+		help Changes your password to the specified one;
+		type player;
+	}
+}
+
+command rmpass {
+	perm utils.loginsecurity;
+	
+	[string:oldPassword] {
+		run rmpass oldPassword;
+		help Removes the password of your account;
+		type player;
+	}
+}
+
+command rmotherpass {
+	perm utils.loginsecurity.admin;
+	
+	[string:playerName] {
+		run rmotherpass playerName;
+		help removes the password of another player;
+		perm utils.loginsecurity.admin;
+	}
+}

src/com/redstoner/modules/loginsecurity/LoginSecurity.java

@@ -34,9 +34,9 @@ import com.redstoner.misc.mysql.elements.MysqlTable;
 import com.redstoner.misc.mysql.types.text.VarChar;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class LoginSecurity implements Module, Listener
 {
 	protected static Map<UUID, Location> loggingIn;
@@ -260,60 +260,4 @@ public class LoginSecurity implements Module, Listener
 		String toInsert = "$pbkdf2-sha256$200000$" + salt + "$" + hash;
 		return table.insert(player.getUniqueId().toString(), toInsert);
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command register {\n" + 
-				"	perm utils.loginsecurity;\n" + 
-				"	\n" + 
-				"	[string:password] {\n" + 
-				"		run register password;\n" + 
-				"		help Protects your account with a password;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command login {\n" + 
-				"	perm utils.loginsecurity;\n" + 
-				"	\n" + 
-				"	[string:password] {\n" + 
-				"		run login password;\n" + 
-				"		help Logs you in;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command cgpass {\n" + 
-				"	perm utils.loginsecurity;\n" + 
-				"	\n" + 
-				"	[string:oldPassword] [string:newPassword] {\n" + 
-				"		run cgpass oldPassword newPassword;\n" + 
-				"		help Changes your password to the specified one;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command rmpass {\n" + 
-				"	perm utils.loginsecurity;\n" + 
-				"	\n" + 
-				"	[string:oldPassword] {\n" + 
-				"		run rmpass oldPassword;\n" + 
-				"		help Removes the password of your account;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command rmotherpass {\n" + 
-				"	perm utils.loginsecurity.admin;\n" + 
-				"	\n" + 
-				"	[string:playerName] {\n" + 
-				"		run rmotherpass playerName;\n" + 
-				"		help removes the password of another player;\n" + 
-				"		perm utils.loginsecurity.admin;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/mentio/Mentio.cmd

@@ -0,0 +1,16 @@
+command mentio {
+    add [string:trigger] {
+        help Triggers you when the trigger gets said.;
+        run addmentio trigger;
+    }
+    delete [string:trigger] {
+        help Deletes a mentio.;
+        run delmentio trigger;
+    }
+    list {
+        help Lists your mentios.;
+        run listmentios;
+    }
+    perm utils.mentio;
+    type player;
+}

src/com/redstoner/modules/mentio/Mentio.java

@@ -28,9 +28,9 @@ import com.redstoner.modules.ignore.Ignore;
 
 import net.nemez.chatapi.click.Message;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 3, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Mentio implements Module, Listener
 {
 	private File mentioLocation = new File(Main.plugin.getDataFolder(), "mentio.json");
@@ -177,27 +177,4 @@ public class Mentio implements Module, Listener
 	{
 		JsonManager.save(mentios, mentioLocation);
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command mentio {\n" + 
-				"    add [string:trigger] {\n" + 
-				"        help Triggers you when the trigger gets said.;\n" + 
-				"        run addmentio trigger;\n" + 
-				"    }\n" + 
-				"    delete [string:trigger] {\n" + 
-				"        help Deletes a mentio.;\n" + 
-				"        run delmentio trigger;\n" + 
-				"    }\n" + 
-				"    list {\n" + 
-				"        help Lists your mentios.;\n" + 
-				"        run listmentios;\n" + 
-				"    }\n" + 
-				"    perm utils.mentio;\n" + 
-				"    type player;\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/motd/Motd.cmd

@@ -0,0 +1,14 @@
+command setmotd {
+    [string:motd...] {
+        help Sets the motd. Use --reset to reset to default;
+        run setmotd motd;
+    	perm utils.setmotd;
+    }
+}
+command getmotd {
+    [empty] {
+        help Returns the motd;
+        run getmotd;
+    	perm utils.getmotd;
+    }
+}

src/com/redstoner/modules/motd/Motd.java

@@ -14,9 +14,9 @@ import com.redstoner.annotations.Version;
 import com.redstoner.misc.CommandHolderType;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Motd implements Module, Listener
 {
 	private String default_motd, motd;
@@ -56,25 +56,4 @@ public class Motd implements Module, Listener
 		motd = default_motd;
 		return true;
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command setmotd {\n" + 
-				"    [string:motd...] {\n" + 
-				"        help Sets the motd. Use --reset to reset to default;\n" + 
-				"        run setmotd motd;\n" + 
-				"    	perm utils.setmotd;" +
-				"    }\n" + 
-				"}\n" + 
-				"command getmotd {\n" + 
-				"    [empty] {\n" + 
-				"        help Returns the motd;\n" + 
-				"        run getmotd;\n" + 
-				"    	perm utils.getmotd;" +
-				"    }\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/nametags/Nametags.cmd

@@ -0,0 +1,11 @@
+command tab {
+    sort {
+        help Resorts the entirety of tab.;
+        run sort;
+    }
+    sort [string:player] {
+        help Resorts one player.;
+        run sortspecific player;
+    }
+    perm utils.tab.admin;
+}

src/com/redstoner/modules/nametags/Nametags.java

@@ -19,9 +19,9 @@ import com.redstoner.misc.CommandHolderType;
 import com.redstoner.misc.Main;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @AutoRegisterListener
-@Version(major = 4, minor = 0, revision = 2, compatible = 4)
+@Version(major = 4, minor = 1, revision = 2, compatible = 4)
 public class Nametags implements Module, Listener
 {
 	@EventHandler
@@ -127,22 +127,4 @@ public class Nametags implements Module, Listener
 		}
 		return (prefix - 1) + "_" + teams[teams.length - 1];
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command tab {\n" + 
-				"    sort {\n" + 
-				"        help Resorts the entirety of tab.;\n" + 
-				"        run sort;\n" + 
-				"    }\n" + 
-				"    sort [string:player] {\n" + 
-				"        help Resorts one player.;\n" + 
-				"        run sortspecific player;\n" + 
-				"    }\n" + 
-				"    perm utils.tab.admin;\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/naming/Naming.cmd

@@ -0,0 +1,24 @@
+command anvil {
+	[empty] {
+		run anvil;
+		type player;
+		help Opens anvil GUI.;
+		perm utils.anvil;
+	}
+}
+command name {
+	[string:name...] {
+		run name name;
+		type player;
+		help Names item in hand.;
+		perm utils.name;
+	}
+}
+command lore {
+    [optional:-a] [string:lore...] {
+		run lore -a lore;
+		type player;
+		help Adds lore to item in hand.;
+		perm utils.lore;
+	}
+}

src/com/redstoner/modules/naming/Naming.java

@@ -19,8 +19,8 @@ import com.redstoner.modules.Module;
 
 import net.md_5.bungee.api.ChatColor;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Naming implements Module
 {
 	@Command(hook = "anvil")
@@ -72,35 +72,4 @@ public class Naming implements Module
 		getLogger().message(sender, "Lore set to " + lore);
 		((Player) sender).updateInventory();
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command anvil {\n" + 
-		"	[empty] {\n" + 
-		"		run anvil;\n" + 
-		"		type player;\n" + 
-		"		help Opens anvil GUI.;\n" + 
-		"		perm utils.anvil;\n" + 
-		"	}\n" + 
-		"}\n" +
-		"command name {\n" + 
-		"	[string:name...] {\n" + 
-		"		run name name;\n" + 
-		"		type player;\n" + 
-		"		help Names item in hand.;\n" + 
-		"		perm utils.name;\n" + 
-		"	}\n" + 
-		"}\n" +
-		"command lore {\n" + 
-		"    [optional:-a] [string:lore...] {\n" + 
-		"		run lore -a lore;\n" + 
-		"		type player;\n" + 
-		"		help Adds lore to item in hand.;\n" + 
-		"		perm utils.lore;\n" + 
-		"	}\n" + 
-		"}";
-	}
-	// @format
 }

src/com/redstoner/modules/reports/Reports.cmd

@@ -0,0 +1,24 @@
+command report {
+   [string:message...] {
+      type player;
+      help Report a player or incident;
+      run report message;
+   }
+}
+command rp {
+   perm utils.report;
+
+   open {
+      help List all open reports;
+      run report_open;
+   }
+   close [int:id] {
+      help Close a report;
+      run report_close id;
+   }
+   tp [int:id] {
+      help Teleport to the location of a report;
+      run report_tp id;
+      type player;
+   }
+}

src/com/redstoner/modules/reports/Reports.java

@@ -25,8 +25,8 @@ import net.md_5.bungee.api.ChatColor;
 /** Report module. Allows reports to be created and handled by staff
  * 
  * @author Redempt */
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 1, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Reports implements Module
 {
 	private int task = 0;
@@ -73,16 +73,6 @@ public class Reports implements Module
 		JsonManager.save(archived, new File(Main.plugin.getDataFolder(), "archived_reports.json"));
 	}
 	
-	@Override
-	public String getCommandString()
-	{
-		return "command report {" + "[string:message...] {" + "type player;" + "help Report a player or incident;"
-				+ "run report message;" + "}" + "}" + "command rp {" + "perm utils.report;" + "open {"
-				+ "help List all open reports;" + "run report_open;" + "}" + "close [int:id] {" + "help Close a report;"
-				+ "run report_close id;" + "}" + "tp [int:id] {" + "help Teleport to the location of a report;"
-				+ "run report_tp id;" + "type player;" + "}" + "}";
-	}
-	
 	@Command(hook = "report_tp")
 	public void tpReport(CommandSender sender, int id)
 	{

src/com/redstoner/modules/saylol/Saylol.cmd

@@ -0,0 +1,47 @@
+command lol {
+    add [string:text...] {
+        help Lols a text.;
+        run addlol text;
+        perm utils.lol.admin;
+    }
+    del [int:id] {
+        help Unlols a lol.;
+        run dellol id;
+        perm utils.lol.admin;
+    }
+    set [int:id] [string:text...] {
+        help Relols a lol.;
+        run setlol id text;
+        perm utils.lol.admin;
+    }
+    id [int:id] {
+        help Lols specifically.;
+        run lolid id;
+        perm utils.lol.id;
+    }
+    list [int:page] {
+        help Shows lols.;
+        run listlols page;
+        perm utils.lol.list;
+    }
+    list {
+        help Shows lols.;
+        run listlolsdef;
+        perm utils.lol.list;
+    }
+    search [flag:-i] [string:text...] {
+        help Search lols.;
+        run searchlol -i text;
+        perm utils.lol.search;
+    }
+    match [flag:-i] [string:regex...] {
+        help Search lols. But better.;
+        run matchlol -i regex;
+        perm utils.lol.match;
+    }
+    [empty] {
+        help Lols.;
+        run saylol;
+        perm utils.lol;
+    }
+}

src/com/redstoner/modules/saylol/Saylol.java

@@ -24,8 +24,8 @@ import net.nemez.chatapi.ChatAPI;
 import net.nemez.chatapi.click.ClickCallback;
 import net.nemez.chatapi.click.Message;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 1, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Saylol implements Module
 {
 	private long lastLol = 0;
@@ -297,58 +297,4 @@ public class Saylol implements Module
 		if (player.hasPermission("utils.lol.id"))
 			Bukkit.dispatchCommand(player, "lol id " + index);
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command lol {\n" + 
-				"    add [string:text...] {\n" + 
-				"        help Lols a text.;\n" + 
-				"        run addlol text;\n" + 
-				"        perm utils.lol.admin;\n" + 
-				"    }\n" + 
-				"    del [int:id] {\n" + 
-				"        help Unlols a lol.;\n" + 
-				"        run dellol id;\n" + 
-				"        perm utils.lol.admin;\n" + 
-				"    }\n" + 
-				"    set [int:id] [string:text...] {\n" + 
-				"        help Relols a lol.;\n" + 
-				"        run setlol id text;\n" + 
-				"        perm utils.lol.admin;\n" + 
-				"    }\n" + 
-				"    id [int:id] {\n" + 
-				"        help Lols specifically.;\n" + 
-				"        run lolid id;\n" + 
-				"        perm utils.lol.id;\n" + 
-				"    }\n" + 
-				"    list [int:page] {\n" + 
-				"        help Shows lols.;\n" + 
-				"        run listlols page;\n" + 
-				"        perm utils.lol.list;\n" + 
-				"    }\n" + 
-				"    list {\n" + 
-				"        help Shows lols.;\n" + 
-				"        run listlolsdef;\n" + 
-				"        perm utils.lol.list;\n" + 
-				"    }\n" + 
-				"    search [flag:-i] [string:text...] {\n" + 
-				"        help Search lols.;\n" + 
-				"        run searchlol -i text;\n" + 
-				"        perm utils.lol.search;\n" + 
-				"    }\n" + 
-				"    match [flag:-i] [string:regex...] {\n" + 
-				"        help Search lols. But better.;\n" + 
-				"        run matchlol -i regex;\n" + 
-				"        perm utils.lol.match;\n" + 
-				"    }\n" + 
-				"    [empty] {\n" + 
-				"        help Lols.;\n" + 
-				"        run saylol;\n" + 
-				"        perm utils.lol;\n" + 
-				"    }\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/scriptutils/Scriptutils.cmd

@@ -0,0 +1,119 @@
+command script_restart {
+    [string:timeout] [string:name] [string:reason] {
+        help Prints bukkit restart message;
+        type console;
+        run script_restart timeout name reason;
+    }
+}
+command script_stop {
+    [string:timeout] [string:name] [string:reason] {
+        help Prints bukkit shut down message;
+        type console;
+        run script_stop timeout name reason;
+    }
+}
+command script_restart_abort {
+    [empty] {
+        help Prints the restart abort message;
+        type console;
+        run script_restart_abort;
+    }
+}
+command script_stop_abort {
+    [empty] {
+        help Prints the shut down abort message;
+        type console;
+        run script_stop_abort;
+    }
+}
+command script_backup_begin {
+    [empty] {
+        help Prints the backup started message, saves all worlds and turns off world saving;
+        type console;
+        run script_backup_begin;
+    }
+}
+command script_backup_end {
+    [empty] {
+        help Prints the backup finished message and turns on world saving;
+        type console;
+        run script_backup_end;
+    }
+}
+command script_backup_error {
+    [empty] {
+        help Prints the backup error message and turns on world saving;
+        type console;
+        run script_backup_error;
+    }
+}
+command script_trim {
+    [empty] {
+        help Prints the world trimming started message and starts trimming;
+        type console;
+        run script_trim;
+    }
+}
+command script_trim_result {
+    [string:size] [string:data...] {
+        help Prints the trimming finished message;
+        type console;
+        run script_trim_result size data;
+    }
+}
+command script_backup_database_begin {
+    [empty] {
+        help Prints the database backup started message and admin-chat warning;
+        type console;
+        run script_backup_database_begin;
+    }
+}
+command script_backup_database_dumps {
+    [empty] {
+        help Prints the database dumps cmpression started message;
+        type console;
+        run script_backup_database_dumps;
+    }
+}
+command script_backup_database_end {
+    [string:size] {
+        help Prints the database finished message and backup size in admin-chat;
+        type console;
+        run script_backup_database_end size;
+    }
+}
+command script_backup_database_error {
+    [empty] {
+        help Prints the database backup error message;
+        type console;
+        run script_backup_database_error;
+    }
+}
+command script_backup_database_abort {
+    [empty] {
+        help Prints the database backup abort message;
+        type console;
+        run script_backup_database_abort;
+    }
+}
+command script_spigot_update {
+    [empty] {
+        help Prints the spigot update message;
+        type console;
+        run script_spigot_update;
+    }
+}
+command script_disk_filled {
+    [string:percentage] {
+        help Prints the admin-chat warning for disk is filled;
+        type console;
+        run script_disk_filled percentage;
+    }
+}
+command script_shutdown {
+    [string:reason] {
+        help Saves all worlds, kicks players and shuts down the server;
+        type console;
+        run script_shutdown reason;
+    }
+}

src/com/redstoner/modules/scriptutils/Scriptutils.java

@@ -10,8 +10,8 @@ import com.redstoner.misc.CommandHolderType;
 import com.redstoner.misc.Utils;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class Scriptutils implements Module
 {
 	/** Prints Bukkit restart message
@@ -174,130 +174,4 @@ public class Scriptutils implements Module
 		Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "kickall " + reason);
 		Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "stop");
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command script_restart {\n" + 
-				"    [string:timeout] [string:name] [string:reason] {\n" + 
-				"        help Prints bukkit restart message;\n" + 
-				"        type console;\n" + 
-				"        run script_restart timeout name reason;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_stop {\n" + 
-				"    [string:timeout] [string:name] [string:reason] {\n" + 
-				"        help Prints bukkit shut down message;\n" + 
-				"        type console;\n" + 
-				"        run script_stop timeout name reason;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_restart_abort {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the restart abort message;\n" + 
-				"        type console;\n" + 
-				"        run script_restart_abort;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_stop_abort {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the shut down abort message;\n" + 
-				"        type console;\n" + 
-				"        run script_stop_abort;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_begin {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the backup started message, saves all worlds and turns off world saving;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_begin;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_end {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the backup finished message and turns on world saving;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_end;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_error {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the backup error message and turns on world saving;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_error;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_trim {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the world trimming started message and starts trimming;\n" + 
-				"        type console;\n" + 
-				"        run script_trim;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_trim_result {\n" + 
-				"    [string:size] [string:data...] {\n" + 
-				"        help Prints the trimming finished message;\n" + 
-				"        type console;\n" + 
-				"        run script_trim_result size data;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_database_begin {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the database backup started message and admin-chat warning;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_database_begin;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_database_dumps {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the database dumps cmpression started message;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_database_dumps;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_database_end {\n" + 
-				"    [string:size] {\n" + 
-				"        help Prints the database finished message and backup size in admin-chat;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_database_end size;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_database_error {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the database backup error message;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_database_error;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_backup_database_abort {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the database backup abort message;\n" + 
-				"        type console;\n" + 
-				"        run script_backup_database_abort;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_spigot_update {\n" + 
-				"    [empty] {\n" + 
-				"        help Prints the spigot update message;\n" + 
-				"        type console;\n" + 
-				"        run script_spigot_update;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_disk_filled {\n" + 
-				"    [string:percentage] {\n" + 
-				"        help Prints the admin-chat warning for disk is filled;\n" + 
-				"        type console;\n" + 
-				"        run script_disk_filled percentage;\n" + 
-				"    }\n" + 
-				"}\n" + 
-				"command script_shutdown {\n" + 
-				"    [string:reason] {\n" + 
-				"        help Saves all worlds, kicks players and shuts down the server;\n" + 
-				"        type console;\n" + 
-				"        run script_shutdown reason;\n" + 
-				"    }\n" + 
-				"}";
-	}
-	// @format
 }

src/com/redstoner/modules/tilechunks/TileChunks.cmd

@@ -0,0 +1,19 @@
+command lct {
+	perm utils.tilechunks;
+	
+	list {
+		run list_cmd;
+		help re-lists already scanned chunks;
+	}
+		
+	[int:amount] {
+		run scan_cmd amount;
+		help scans for laggy chunks;
+	}
+	
+	tp [int:number] {
+		run tp number;
+		help teleports to the specified chunk;
+		type player;
+	}
+}

src/com/redstoner/modules/tilechunks/TileChunks.java

@@ -17,8 +17,8 @@ import com.redstoner.annotations.Version;
 import com.redstoner.misc.CommandHolderType;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class TileChunks implements Module
 {
 	private List<LaggyTileChunk> laggyChunks = new ArrayList<>();
@@ -80,31 +80,4 @@ public class TileChunks implements Module
 			getLogger().message(sender, true, "§4Invalid chunk number! Use §e/lc list §4to show laggy chunks!");
 		}
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command lct {\n" + 
-				"	perm utils.tilechunks;\n" + 
-				"	\n" + 
-				"	list {\n" + 
-				"		run list_cmd;\n" + 
-				"		help re-lists already scanned chunks;\n" + 
-				"	}\n" + 
-				"		\n" + 
-				"	[int:amount] {\n" + 
-				"		run scan_cmd amount;\n" + 
-				"		help scans for laggy chunks;\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	tp [int:number] {\n" + 
-				"		run tp number;\n" + 
-				"		help teleports to the specified chunk;\n" + 
-				"		type player;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"	";
-	}
-	// @format
 }

src/com/redstoner/modules/warn/Warn.cmd

@@ -0,0 +1,15 @@
+command warn {
+	[empty] {
+		run warn;
+		help Warns other players about definite lag;
+		perm utils.warn;
+	}
+}
+
+command warnp {
+	[empty] {
+		run warnp;
+		help Warns other players about possible lag;
+		perm utils.warn;
+	}
+}

src/com/redstoner/modules/warn/Warn.java

@@ -9,7 +9,7 @@ import com.redstoner.misc.CommandHolderType;
 import com.redstoner.misc.Utils;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
 @Version(major = 4, minor = 0, revision = 1, compatible = 4)
 public class Warn implements Module
 {
@@ -26,26 +26,4 @@ public class Warn implements Module
 		String name = Utils.getName(sender);
 		Utils.broadcast(null, "§2Possible lag incoming! - §9" + name, null);
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command warn {\n" + 
-				"	[empty] {\n" + 
-				"		run warn;\n" + 
-				"		help Warns other players about definite lag;\n" + 
-				"		perm utils.warn;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command warnp {\n" + 
-				"	[empty] {\n" + 
-				"		run warnp;\n" + 
-				"		help Warns other players about possible lag;\n" + 
-				"		perm utils.warn;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	//@format
 }

src/com/redstoner/modules/webtoken/WebToken.cmd

@@ -0,0 +1,21 @@
+command token {
+	perm utils.webtoken;
+	
+	[empty] {
+		help Displays an already generated token;
+		type player;
+		perm utils.webtoken;
+		run token;
+	}
+}
+
+command gettoken {
+	perm utils.webtoken;
+	
+	[string:email...] {
+		help Generates a token used for website authentication;
+		type player;
+		perm utils.webtoken;
+		run gettoken email;
+	}
+}

src/com/redstoner/modules/webtoken/WebToken.java

@@ -23,8 +23,8 @@ import com.redstoner.misc.mysql.elements.MysqlDatabase;
 import com.redstoner.misc.mysql.elements.MysqlTable;
 import com.redstoner.modules.Module;
 
-@Commands(CommandHolderType.String)
+@Commands(CommandHolderType.File)
-@Version(major = 4, minor = 0, revision = 0, compatible = 4)
+@Version(major = 4, minor = 1, revision = 0, compatible = 4)
 public class WebToken implements Module
 {
 	private static final int TOKEN_LENGTH = 6;
@@ -222,32 +222,4 @@ public class WebToken implements Module
 			getLogger().message(player, true, "Hmm... That doesn't look like a valid email!");
 		}
 	}
-	
-	// @noformat
-	@Override
-	public String getCommandString()
-	{
-		return "command token {\n" + 
-				"	perm utils.webtoken;\n" + 
-				"	\n" + 
-				"	[empty] {\n" + 
-				"		help Displays an already generated token;\n" + 
-				"		type player;\n" + 
-				"		perm utils.webtoken;\n" + 
-				"		run token;\n" + 
-				"	}\n" + 
-				"}\n" + 
-				"\n" + 
-				"command gettoken {\n" + 
-				"	perm utils.webtoken;\n" + 
-				"	\n" + 
-				"	[string:email...] {\n" + 
-				"		help Generates a token used for website authentication;\n" + 
-				"		type player;\n" + 
-				"		perm utils.webtoken;\n" + 
-				"		run gettoken email;\n" + 
-				"	}\n" + 
-				"}";
-	}
-	// @format
 }