src/main/java/buttondevteam/chat/commands/ChatonlyCommand.java

@@ -8,7 +8,7 @@ import buttondevteam.chat.ChatPlayer;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import buttondevteam.lib.player.TBMCPlayer;
 
-public final class ChatonlyCommand extends TBMCCommandBase {
+public final class ChatonlyCommand extends TBMCCommandBase { //TODO: Add annotation
 
 	@Override
 	public String[] GetHelpText(String alias) {
@@ -29,19 +29,4 @@ public final class ChatonlyCommand extends TBMCCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetCommandPath() {
-		return "chatonly";
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
-
 }

src/main/java/buttondevteam/chat/commands/MWikiCommand.java

@@ -5,8 +5,10 @@ import java.net.URLEncoder;
 
 import org.bukkit.command.CommandSender;
 
+import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
+@CommandClass(modOnly = false)
 public class MWikiCommand extends TBMCCommandBase {
 
 	@Override
@@ -37,19 +39,4 @@ public class MWikiCommand extends TBMCCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetCommandPath() {
-		return "mwiki";
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
-
 }

src/main/java/buttondevteam/chat/commands/OOCCommand.java

@@ -4,10 +4,13 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import buttondevteam.chat.ChatPlayer;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.PlayerCommandBase;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import buttondevteam.lib.player.TBMCPlayer;
 
-public final class OOCCommand extends TBMCCommandBase {
+@CommandClass(modOnly = false)
+public final class OOCCommand extends PlayerCommandBase {
 
 	@Override
 	public String[] GetHelpText(String alias) {
@@ -17,8 +20,7 @@ public final class OOCCommand extends TBMCCommandBase {
 	}
 
 	@Override
-	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
-		Player player = (Player) sender;
+	public boolean OnCommand(Player player, String alias, String[] args) {
 		if (args.length == 0) {
 			return false;
 		} else {
@@ -33,19 +35,4 @@ public final class OOCCommand extends TBMCCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetCommandPath() {
-		return "ooc";
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return true;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
-
 }

src/main/java/buttondevteam/chat/commands/UnlolCommand.java

@@ -6,8 +6,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;
 
+@CommandClass(modOnly = false)
 public final class UnlolCommand extends TBMCCommandBase {
 
 	public static CommandSender Lastlol = null;
@@ -35,19 +37,4 @@ public final class UnlolCommand extends TBMCCommandBase {
 		}
 		return true;
 	}
-
-	@Override
-	public String GetCommandPath() {
-		return "unlol";
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
 }

src/main/java/buttondevteam/chat/commands/WaitWhatCommand.java

@@ -4,20 +4,26 @@ import java.util.Arrays;
 import java.util.stream.Collectors;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 
 import buttondevteam.chat.ChatPlayer;
+import buttondevteam.chat.listener.PlayerListener;
 import buttondevteam.lib.chat.Channel;
+import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import buttondevteam.lib.player.TBMCPlayer;
 
+@CommandClass(modOnly = false)
 public class WaitWhatCommand extends TBMCCommandBase {
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
 		Channel channel;
 		if (sender instanceof Player && ((Player) sender).isOnline())
 			channel = TBMCPlayer.getPlayer(((Player) sender).getUniqueId(), ChatPlayer.class).CurrentChannel;
+		else if (sender instanceof ConsoleCommandSender)
+			channel = PlayerListener.ConsoleChannel;
 		else
 			channel = Channel.GlobalChat;
 		final String message;
@@ -36,14 +42,4 @@ public class WaitWhatCommand extends TBMCCommandBase {
 				"Wait what" //
 		};
 	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
 }

src/main/java/buttondevteam/chat/commands/YeehawCommand.java

@@ -4,9 +4,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import buttondevteam.lib.player.TBMCYEEHAWEvent;
 
+@CommandClass(modOnly = false)
 public class YeehawCommand extends TBMCCommandBase {
 
 	@Override
@@ -26,19 +28,4 @@ public class YeehawCommand extends TBMCCommandBase {
 		Bukkit.getPluginManager().callEvent(new TBMCYEEHAWEvent(sender));
 		return true;
 	}
-
-	@Override
-	public String GetCommandPath() {
-		return "yeehaw";
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
 }

src/main/java/buttondevteam/chat/commands/appendtext/AppendTextCommandBase.java

@@ -6,10 +6,12 @@ import org.bukkit.entity.Player;
 import buttondevteam.chat.ChatPlayer;
 import buttondevteam.chat.listener.PlayerListener;
 import buttondevteam.lib.chat.Channel;
+import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import buttondevteam.lib.player.TBMCPlayer;
 
+@CommandClass(modOnly = false)
 public abstract class AppendTextCommandBase extends TBMCCommandBase {
 
 	public abstract String[] GetHelpText(String alias);
@@ -31,14 +33,4 @@ public abstract class AppendTextCommandBase extends TBMCCommandBase {
 			TBMCChatAPI.SendChatMessage(Channel.GlobalChat, sender, msg);
 		return true;
 	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
 }

src/main/java/buttondevteam/chat/commands/appendtext/ShrugCommand.java

@@ -4,10 +4,10 @@ public final class ShrugCommand extends AppendTextCommandBase {
 
 	@Override
 	public String[] GetHelpText(String alias) {
-		return new String[] { "§6---- Shrug ----",
-				"This command appends a shrug after your message",
-				"Or just makes you shrug",
-				"Use either /" + alias + " <message> or just /" + alias };
+		return new String[] { "§6---- Shrug ----", //
+				"This command appends a shrug after your message", //
+				"Or just makes you shrug", //
+				"Use either /" + alias + " <message> or just /" + alias }; //
 	}
 
 	@Override
@@ -15,9 +15,4 @@ public final class ShrugCommand extends AppendTextCommandBase {
 		return "¯\\\\\\_(ツ)\\_/¯";
 	}
 
-	@Override
-	public String GetCommandPath() {
-		return "shrug";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/appendtext/TableflipCommand.java

@@ -4,9 +4,9 @@ public final class TableflipCommand extends AppendTextCommandBase {
 
 	@Override
 	public String[] GetHelpText(String alias) {
-		return new String[] { "§6---- Tableflip ----",
-				"This command appends a tableflip after your message",
-				"Or just makes you tableflip",
+		return new String[] { "§6---- Tableflip ----", //
+				"This command appends a tableflip after your message", //
+				"Or just makes you tableflip", //
 				"Use either /" + alias + " <message> or just /" + alias };
 	}
 
@@ -14,9 +14,4 @@ public final class TableflipCommand extends AppendTextCommandBase {
 	public String GetAppendedText() {
 		return "(╯°□°）╯︵ ┻━┻";
 	}
-
-	@Override
-	public String GetCommandPath() {
-		return "tableflip";
-	}
 }

src/main/java/buttondevteam/chat/commands/appendtext/UnflipCommand.java

@@ -4,9 +4,9 @@ public final class UnflipCommand extends AppendTextCommandBase {
 
 	@Override
 	public String[] GetHelpText(String alias) {
-		return new String[] { "§6---- Unflip ----",
-				"This command appends an unflip after your message",
-				"Or just unflips as you",
+		return new String[] { "§6---- Unflip ----", //
+				"This command appends an unflip after your message", //
+				"Or just unflips as you", //
 				"Use either /" + alias + " <message> or just /" + alias };
 	}
 
@@ -15,9 +15,4 @@ public final class UnflipCommand extends AppendTextCommandBase {
 		return "┬─┬ ノ( ゜-゜ノ)";
 	}
 
-	@Override
-	public String GetCommandPath() {
-		return "unflip";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/AcceptCommand.java

@@ -10,8 +10,12 @@ import buttondevteam.chat.FlairStates;
 import buttondevteam.chat.PlayerJoinTimerTask;
 import buttondevteam.chat.PluginMain;
 import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.OptionallyPlayerCommandClass;
 import buttondevteam.lib.player.TBMCPlayer;
 
+@CommandClass(modOnly = false)
+@OptionallyPlayerCommandClass(playerOnly = false)
 public class AcceptCommand extends UCommandBase {
 
 	@Override
@@ -92,9 +96,4 @@ public class AcceptCommand extends UCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetUCommandPath() {
-		return "accept";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/CCommand.java

@@ -54,9 +54,4 @@ public class CCommand extends UCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetUCommandPath() {
-		return "c";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/UCommandBase.java

@@ -1,25 +1,13 @@
 package buttondevteam.chat.commands.ucmds;
 
-import buttondevteam.lib.chat.TBMCCommandBase;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.OptionallyPlayerCommandBase;
+import buttondevteam.lib.chat.OptionallyPlayerCommandClass;
 
-public abstract class UCommandBase extends TBMCCommandBase {
+@CommandClass(modOnly = false, path = "u")
+@OptionallyPlayerCommandClass(playerOnly = false)
+public abstract class UCommandBase extends OptionallyPlayerCommandBase {
 
 	public abstract String[] GetHelpText(String alias);
 
-	@Override
-	public String GetCommandPath() {
-		return "u " + GetUCommandPath();
-	}
-
-	public abstract String GetUCommandPath();
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return true;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return false;
-	}
 }

src/main/java/buttondevteam/chat/commands/ucmds/admin/AdminCommandBase.java

@@ -1,25 +1,11 @@
 package buttondevteam.chat.commands.ucmds.admin;
 
 import buttondevteam.chat.commands.ucmds.UCommandBase;
+import buttondevteam.lib.chat.CommandClass;
 
+@CommandClass(modOnly = true)
 public abstract class AdminCommandBase extends UCommandBase {
 
 	public abstract String[] GetHelpText(String alias);
 
-	@Override
-	public String GetUCommandPath() {
-		return "admin " + GetAdminCommandPath();
-	}
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false; // Allow admin commands in console
-	}
-
-	public abstract String GetAdminCommandPath();
-
-	@Override
-	public boolean GetModOnly() {
-		return true;
-	}
 }

src/main/java/buttondevteam/chat/commands/ucmds/admin/DebugCommand.java

@@ -13,11 +13,6 @@ public class DebugCommand extends AdminCommandBase {
 				"Toggles debug mode, which prints debug messages to the console." };
 	}
 
-	@Override
-	public String GetAdminCommandPath() {
-		return "debug";
-	}
-
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
 		sender.sendMessage("§eDebug mode " + ((DebugMode = !DebugMode) ? "§aenabled." : "§cdisabled."));

src/main/java/buttondevteam/chat/commands/ucmds/admin/PlayerInfoCommand.java

@@ -40,9 +40,4 @@ public class PlayerInfoCommand extends AdminCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAdminCommandPath() {
-		return "playerinfo";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/admin/SaveCommand.java

@@ -20,9 +20,4 @@ public class SaveCommand extends AdminCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAdminCommandPath() {
-		return "save";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/admin/SetFlairCommand.java

@@ -68,9 +68,4 @@ public class SetFlairCommand extends AdminCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAdminCommandPath() {
-		return "setflair";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/admin/UpdatePlugin.java

@@ -39,9 +39,4 @@ public class UpdatePlugin extends AdminCommandBase {
 		}
 	}
 
-	@Override
-	public String GetAdminCommandPath() {
-		return "updateplugin";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/AddCommand.java

@@ -34,9 +34,4 @@ public class AddCommand extends AnnounceCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAnnounceCommandPath() {
-		return "add";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/AnnounceCommandBase.java

@@ -1,25 +1,13 @@
 package buttondevteam.chat.commands.ucmds.announce;
 
 import buttondevteam.chat.commands.ucmds.UCommandBase;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.OptionallyPlayerCommandClass;
 
+@CommandClass(modOnly = true)
+@OptionallyPlayerCommandClass(playerOnly = false)
 public abstract class AnnounceCommandBase extends UCommandBase {
 
 	public abstract String[] GetHelpText(String alias);
 
-	@Override
-	public String GetUCommandPath() {
-		return "announce " + GetAnnounceCommandPath();
-	}
-
-	public abstract String GetAnnounceCommandPath();
-
-	@Override
-	public boolean GetPlayerOnly() {
-		return false;
-	}
-
-	@Override
-	public boolean GetModOnly() {
-		return true;
-	}
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/EditCommand.java

@@ -42,9 +42,4 @@ public class EditCommand extends AnnounceCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAnnounceCommandPath() {
-		return "edit";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/ListCommand.java

@@ -25,9 +25,4 @@ public class ListCommand extends AnnounceCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAnnounceCommandPath() {
-		return "list";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/RemoveCommand.java

@@ -27,9 +27,4 @@ public class RemoveCommand extends AnnounceCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAnnounceCommandPath() {
-		return "remove";
-	}
-
 }

src/main/java/buttondevteam/chat/commands/ucmds/announce/SetTimeCommand.java

@@ -30,9 +30,4 @@ public class SetTimeCommand extends AnnounceCommandBase {
 		return true;
 	}
 
-	@Override
-	public String GetAnnounceCommandPath() {
-		return "settime";
-	}
-
 }