Lots of improvements on command system and general events

.github/README.md

@@ -38,7 +38,7 @@ To add this project as a dependency to your project, add the following to your p
 <dependency>
     <groupId>com.github.Despical</groupId>
     <artifactId>KOTL</artifactId>
-    <version>2.1.3</version>
+    <version>2.2.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -51,7 +51,7 @@ repositories {
 ```
 ```
 dependencies {
-    compileOnly group: "com.github.Despical", name: "KOTL", version: "2.1.3;
+    compileOnly group: "com.github.Despical", name: "KOTL", version: "2.2.0;
 }
 ```
 

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>me.despical</groupId>
 	<artifactId>king-of-the-ladder</artifactId>
-	<version>2.1.3</version>
+	<version>2.2.0</version>
 	<name>King of the Ladder</name>
 
 	<properties>

src/main/java/me/despical/kotl/Main.java

@@ -70,25 +70,24 @@ public class Main extends JavaPlugin {
 
 	@Override
 	public void onEnable() {
-		if (getDescription().getVersion().contains("debug") || getConfig().getBoolean("Debug-Messages")) {
-			LogUtils.setLoggerName("KOTL");
-			LogUtils.enableLogging();
-		}
-
 		if ((forceDisable = !validateIfPluginShouldStart())) {
 			getServer().getPluginManager().disablePlugin(this);
 			return;
 		}
 
+		if (getConfig().getBoolean("Debug-Messages")) {
+			LogUtils.setLoggerName("KOTL");
+			LogUtils.enableLogging();
+			LogUtils.log("Initialization started!");
+		}
+
 		exceptionLogHandler = new ExceptionLogHandler(this);
 		exceptionLogHandler.setMainPackage("me.despical");
 		exceptionLogHandler.addBlacklistedClass("me.despical.kotl.user.data.MysqlManager", "me.despical.commons.database.MysqlDatabase");
 		exceptionLogHandler.setRecordMessage("[KOTL] We have found a bug in the code. Contact us at our official Discord server (link: https://discord.gg/rVkaGmyszE) with the following error given above!");
 
 		configPreferences = new ConfigPreferences(this);
 
-		LogUtils.log("Initialization started!");
-
 		long start = System.currentTimeMillis();
 
 		setupFiles();
@@ -254,13 +253,14 @@ public UserManager getUserManager() {
 
 	private void saveAllUserStatistics() {
 		for (Player player : getServer().getOnlinePlayers()) {
-			User user = userManager.getUser(player);
+			final User user = userManager.getUser(player);
 
 			if (userManager.getDatabase() instanceof MysqlManager) {
 				StringBuilder update = new StringBuilder(" SET ");
 
 				for (StatsStorage.StatisticType stat : StatsStorage.StatisticType.values()) {
 					if (!stat.isPersistent()) continue;
+
 					int val = user.getStat(stat);
 
 					if (update.toString().equalsIgnoreCase(" SET ")) {
@@ -270,8 +270,8 @@ private void saveAllUserStatistics() {
 					update.append(", ").append(stat.getName()).append("'='").append(val);
 				}
 
-				String finalUpdate = update.toString();
-				MysqlManager database = ((MysqlManager) userManager.getDatabase());
+				final String finalUpdate = update.toString();
+				final MysqlManager database = ((MysqlManager) userManager.getDatabase());
 				database.getDatabase().executeUpdate("UPDATE " + database.getTableName() + finalUpdate + " WHERE UUID='" + user.getUniqueId().toString() + "';");
 				continue;
 			}

src/main/java/me/despical/kotl/command/CommandHandler.java

@@ -29,11 +29,10 @@ public CommandHandler(Main plugin) {
 		this.plugin = plugin;
 		this.subCommands = new HashSet<>();
 
-		SubCommand[] cmds = {new CreateCommand(), new DeleteCommand(), new EditCommand(), new ListCommand(),
-			new ReloadCommand(), new HelpCommand(), new StatsCommand(), new TopPlayersCommand()};
+		SubCommand[] commands = {new CreateCommand(), new DeleteCommand(), new EditCommand(), new ListCommand(), new ReloadCommand(), new HelpCommand(), new StatsCommand(), new TopPlayersCommand()};
 
-		for (SubCommand cmd : cmds) {
-			registerSubCommand(cmd);
+		for (SubCommand command : commands) {
+			registerSubCommand(command);
 		}
 
 		Optional.ofNullable(plugin.getCommand("kotl")).ifPresent(command -> {
@@ -57,6 +56,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
 			if (sender.hasPermission("kotl.admin")) {
 				sender.sendMessage(plugin.getChatManager().coloredRawMessage("&3Commands: &b/" + label + " help"));
+				sender.sendMessage(plugin.getChatManager().coloredRawMessage("&3If you liked this version then consider buying the premium one with better performance and additional features."));
+				sender.sendMessage(plugin.getChatManager().coloredRawMessage("&3>> &bhttps://www.spigotmc.org/resources/king-of-the-ladder-premium-1-8-1-19.102644/"));
 			}
 
 			return true;
@@ -69,7 +70,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 					return true;
 				}
 
-				if (subCommand.getSenderType() == SubCommand.SenderType.PLAYER && !(sender instanceof Player)) {
+				if (subCommand.getSenderType() == 0 && !(sender instanceof Player)) {
 					sender.sendMessage(plugin.getChatManager().prefixedMessage("commands.only_by_player"));
 					return true;
 				}
@@ -80,15 +81,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 					} catch (CommandException exception) {
 						sender.sendMessage(plugin.getChatManager().coloredRawMessage("&c" + exception.getMessage()));
 					}
-				} else if (subCommand.getType() == SubCommand.CommandType.GENERIC) {
+				} else if (subCommand.getType() == 0) {
 					sender.sendMessage(plugin.getChatManager().coloredRawMessage("&cUsage: /" + label + " " + subCommand.getName() + " " + (subCommand.getPossibleArguments().length() > 0 ? subCommand.getPossibleArguments() : "")));
 				}
 
 				return true;
 			}
 		}
 
-		List<StringMatcher.Match> matches = StringMatcher.match(args[0], subCommands.stream().map(SubCommand::getName).collect(Collectors.toList()));
+		final List<StringMatcher.Match> matches = StringMatcher.match(args[0], subCommands.stream().map(SubCommand::getName).collect(Collectors.toList()));
 
 		if (!matches.isEmpty()) {
 			sender.sendMessage(plugin.getChatManager().message("commands.did_you_mean").replace("%command%", label + " " + matches.get(0).getMatch()));

src/main/java/me/despical/kotl/command/SubCommand.java

@@ -20,6 +20,7 @@ public abstract class SubCommand {
 	protected final Main plugin;
 	protected final FileConfiguration config;
 	protected final ChatManager chatManager;
+	protected final int GENERIC = 0, HIDDEN = 1, PLAYER = 0, BOTH = 1;
 
 	public SubCommand(String name) {
 		this.name = name;
@@ -48,15 +49,7 @@ public final boolean hasPermission(CommandSender sender) {
 
 	public abstract String getTutorial();
 
-	public abstract CommandType getType();
+	public abstract int getType();
 
-	public abstract SenderType getSenderType();
-
-	public enum CommandType {
-		GENERIC, HIDDEN
-	}
-
-	public enum SenderType {
-		PLAYER, BOTH
-	}
+	public abstract int getSenderType();
 }

src/main/java/me/despical/kotl/command/admin/CreateCommand.java

@@ -69,17 +69,17 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.GENERIC;
+	public int getType() {
+		return GENERIC;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.PLAYER;
+	public int getSenderType() {
+		return PLAYER;
 	}
 
 	private void setupDefaultConfiguration(String id) {
-		String path = "instances." + id + ".", def = LocationSerializer.SERIALIZED_LOCATION;
+		final String path = "instances." + id + ".", def = LocationSerializer.SERIALIZED_LOCATION;
 
 		config.set(path + "endlocation", def);
 		config.set(path + "areaMin", def);

src/main/java/me/despical/kotl/command/admin/DeleteCommand.java

@@ -101,12 +101,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.GENERIC;
+	public int getType() {
+		return GENERIC;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.BOTH;
+	public int getSenderType() {
+		return BOTH;
 	}
 }

src/main/java/me/despical/kotl/command/admin/EditCommand.java

@@ -32,7 +32,7 @@ public int getMinimumArguments() {
 
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) {
-		Arena arena = ArenaRegistry.getArena(args[0]);
+		final Arena arena = ArenaRegistry.getArena(args[0]);
 
 		if (arena == null) {
 			sender.sendMessage(chatManager.prefixedMessage("commands.no_arena_like_that"));
@@ -48,12 +48,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.GENERIC;
+	public int getType() {
+		return GENERIC;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.PLAYER;
+	public int getSenderType() {
+		return PLAYER;
 	}
 }

src/main/java/me/despical/kotl/command/admin/HelpCommand.java

@@ -40,11 +40,9 @@ public void execute(CommandSender sender, String label, String[] args) {
 		sender.sendMessage("");
 		sender.sendMessage(chatManager.coloredRawMessage("&3&l---- King of the Ladder Admin Commands ----"));
 		sender.sendMessage("");
-		sender.sendMessage(chatManager.coloredRawMessage("&3Join our Discord server: &bhttps://discord.gg/rVkaGmyszE"));
-		sender.sendMessage("");
 
 		for (SubCommand subCommand : plugin.getCommandHandler().getSubCommands()) {
-			if (subCommand.getType() == SubCommand.CommandType.GENERIC) {
+			if (subCommand.getType() == GENERIC) {
 				String usage = "/" + label + " " + subCommand.getName() + (subCommand.getPossibleArguments() != null ? " " + subCommand.getPossibleArguments() : "");
 
 				if (sender instanceof Player) {
@@ -85,12 +83,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.HIDDEN;
+	public int getType() {
+		return HIDDEN;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.BOTH;
+	public int getSenderType() {
+		return BOTH;
 	}
 }

src/main/java/me/despical/kotl/command/admin/ListCommand.java

@@ -33,14 +33,14 @@ public int getMinimumArguments() {
 
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) {
-		Set<Arena> arenas = ArenaRegistry.getArenas();
+		final Set<Arena> arenas = ArenaRegistry.getArenas();
 
 		if (arenas.isEmpty()) {
 			sender.sendMessage(chatManager.prefixedMessage("commands.list_command.no_arenas_created"));
 			return;
 		}
 
-		String arenaNames = arenas.stream().map(Arena::getId).collect(Collectors.joining(", "));
+		final String arenaNames = arenas.stream().map(Arena::getId).collect(Collectors.joining(", "));
 		sender.sendMessage(chatManager.prefixedMessage("commands.list_command.format").replace("%list%", arenaNames));
 	}
 
@@ -50,12 +50,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.GENERIC;
+	public int getType() {
+		return GENERIC;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.BOTH;
+	public int getSenderType() {
+		return BOTH;
 	}
 }

src/main/java/me/despical/kotl/command/admin/ReloadCommand.java

@@ -37,7 +37,7 @@ public int getMinimumArguments() {
 	public void execute(CommandSender sender, String label, String[] args) {
 		LogUtils.log("Initialized plugin reload by {0}.", sender.getName());
 
-		long start = System.currentTimeMillis();
+		final long start = System.currentTimeMillis();
 
 		plugin.reloadConfig();
 		plugin.getChatManager().reloadConfig();
@@ -46,6 +46,7 @@ public void execute(CommandSender sender, String label, String[] args) {
 			LogUtils.log("Stopping arena called {0}.", arena.getId());
 
 			arena.deleteHologram();
+			arena.getScoreboardManager().stopAllScoreboards();
 
 			for (Player player : arena.getPlayers()) {
 				player.setWalkSpeed(0.2f);
@@ -59,7 +60,6 @@ public void execute(CommandSender sender, String label, String[] args) {
 				}
 
 				arena.doBarAction(Arena.BarAction.REMOVE, player);
-				arena.getScoreboardManager().removeScoreboard(player);
 				AttributeUtils.resetAttackCooldown(player);
 			}
 
@@ -79,12 +79,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.GENERIC;
+	public int getType() {
+		return GENERIC;
 	}
 
 	@Override
-	public SenderType getSenderType() {
-		return SenderType.BOTH;
+	public int getSenderType() {
+		return BOTH;
 	}
 }

src/main/java/me/despical/kotl/command/player/StatsCommand.java

@@ -29,15 +29,15 @@ public int getMinimumArguments() {
 
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) {
-		Player player = args.length == 0 ? (Player) sender : plugin.getServer().getPlayer(args[0]);
+		final Player player = args.length == 0 ? (Player) sender : plugin.getServer().getPlayer(args[0]);
 
 		if (player == null) {
 			sender.sendMessage(chatManager.prefixedMessage("commands.player_not_found"));
 			return;
 		}
 
-		User user = plugin.getUserManager().getUser(player);
-		String path = "commands.stats_command.";
+		final User user = plugin.getUserManager().getUser(player);
+		final String path = "commands.stats_command.";
 
 		if (player.equals(sender)) {
 			sender.sendMessage(chatManager.message(path + "header", player));
@@ -56,12 +56,12 @@ public String getTutorial() {
 	}
 
 	@Override
-	public CommandType getType() {
-		return CommandType.HIDDEN;
+	public int getType() {
+		return HIDDEN;
 	}
 
 	@Override
-	public SubCommand.SenderType getSenderType() {
-		return SubCommand.SenderType.PLAYER;
+	public int getSenderType() {
+		return PLAYER;
 	}
 }