Now cooldowns work based on sub commands

Author: Despical

.github/README.md

@@ -39,7 +39,7 @@ To add this project as a dependency to your project, add the following to your p
 <dependency>
     <groupId>com.github.Despical</groupId>
     <artifactId>CommandFramework</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -52,7 +52,7 @@ repositories {
 ```
 ```
 dependencies {
-    compileOnly group: "com.github.Despical", name: "CommandFramework", version: "1.1.6";
+    compileOnly group: "com.github.Despical", name: "CommandFramework", version: "1.1.7";
 }
 ```
 
@@ -132,7 +132,7 @@ I accept Pull Requests via GitHub. There are some guidelines which will make app
 You can learn more about contributing via GitHub in [contribution guidelines](../CONTRIBUTING.md).
 
 ## Known issues
-* Cooldowns are not working command based.
+* ~~Cooldowns are not working command based.~~
 * ~~Framework can't detect the sub commands when a sub command registered with the name of main command.~~
 * ~~Sub-commands aren't compatible with tab completions.~~
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.despical</groupId>
     <artifactId>command-framework</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 
     <properties>
         <java.version>8</java.version>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.github.Despical</groupId>
             <artifactId>Commons</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 

src/main/java/me/despical/commandframework/CommandFramework.java

@@ -73,7 +73,7 @@ public class CommandFramework implements CommandExecutor, TabCompleter {
 	 * Map of registered command cooldowns by framework.
 	 */
 	@NotNull
-	private final Map<CommandSender, Long> cooldowns = new HashMap<>();
+	private final Map<CommandSender, Map<Command, Long>> cooldowns = new HashMap<>();
 	/**
 	 * Consumer to accept if there is no matched commands related framework.
 	 */
@@ -133,7 +133,7 @@ public void registerCommands(@NotNull Object instance) {
 				}
 
 				registerCommand(command, method, instance);
-			}else if (method.getAnnotation(Completer.class) != null) {
+			} else if (method.getAnnotation(Completer.class) != null) {
 				if (!List.class.isAssignableFrom(method.getReturnType())) {
 					plugin.getLogger().log(Level.WARNING, "Skipped registration of {0} because it is not returning java.util.List type.", method.getName());
 					continue;
@@ -143,7 +143,7 @@ public void registerCommands(@NotNull Object instance) {
 
 				if (completer.name().contains(".")) {
 					subCommandCompletions.put(completer, me.despical.commons.util.Collections.mapEntry(method, instance));
-				}else {
+				} else {
 					commandCompletions.put(completer, me.despical.commons.util.Collections.mapEntry(method, instance));
 				}
 			}
@@ -160,7 +160,7 @@ public void registerCommands(@NotNull Object instance) {
 	private void registerCommand(Command command, Method method, Object instance) {
 		if (command.name().contains(".")) {
 			subCommands.put(command, me.despical.commons.util.Collections.mapEntry(method, instance));
-		}else {
+		} else {
 			commands.put(command, me.despical.commons.util.Collections.mapEntry(method, instance));
 		}
 
@@ -224,14 +224,40 @@ private Map.Entry<Command, Map.Entry<Method, Object>> getAssociatedCommand(@NotN
 		return null;
 	}
 
+	private boolean hasCooldown(final CommandSender sender, final Command command) {
+		if (command.cooldown() < 1) return false;
+
+		final Map<Command, Long> cooldownMap = cooldowns.get(sender);
+
+		if (cooldownMap == null) {
+			cooldowns.put(sender, me.despical.commons.util.Collections.mapOf(command, System.currentTimeMillis()));
+			return false;
+		} else if (!cooldownMap.containsKey(command)) {
+			cooldownMap.put(command, System.currentTimeMillis());
+
+			cooldowns.replace(sender, cooldownMap);
+			return false;
+		}
+
+		final int remainingTime = (int) ((System.currentTimeMillis() - cooldownMap.get(command)) / 1000) % 60;
+
+		if (remainingTime <= command.cooldown()) {
+			sender.sendMessage(String.format(WAIT_BEFORE_USING_AGAIN, command.cooldown() - remainingTime));
+			return true;
+		} else {
+			cooldownMap.put(command, System.currentTimeMillis());
+
+			cooldowns.replace(sender, cooldownMap);
+			return false;
+		}
+	}
+
 	@Override
 	public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command cmd, @NotNull String label, String[] args) {
 		final Map.Entry<Command, Map.Entry<Method, Object>> entry = this.getAssociatedCommand(cmd.getName(), args);
 
 		if (entry == null) {
-			if (anyMatchConsumer != null) {
-				anyMatchConsumer.accept(new CommandArguments(sender, cmd, label, args));
-			}
+			if (anyMatchConsumer != null) anyMatchConsumer.accept(new CommandArguments(sender, cmd, label, args));
 
 			return true;
 		}
@@ -254,18 +280,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
 			return true;
 		}
 
-		if (cooldowns.containsKey(sender)) {
-			final int remainingTime = (int) ((System.currentTimeMillis() - cooldowns.get(sender)) / 1000) % 60;
-
-			if (command.cooldown() > 0 && remainingTime <= command.cooldown()) {
-				sender.sendMessage(String.format(WAIT_BEFORE_USING_AGAIN, command.cooldown() - remainingTime));
-				return true;
-			}else {
-				cooldowns.put(sender, System.currentTimeMillis());
-			}
-		}else {
-			cooldowns.put(sender, System.currentTimeMillis());
-		}
+		if (this.hasCooldown(sender, command)) return true;
 
 		final String[] splitted = command.name().split("\\."), newArgs = Arrays.copyOfRange(args, splitted.length - 1, args.length);
 
@@ -277,7 +292,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
 				e.printStackTrace();
 				return true;
 			}
-		}else {
+		} else {
 			sender.sendMessage(SHORT_OR_LONG_ARG_SIZE);
 			return true;
 		}