Make the CommandAPI complain less about command registered in the plugin.yml (#391)

DerEchtePilz · web-flow · commit 9a2315edc98e · 2023-01-01T19:15:58.000Z
* Make the CommandAPI only complain about commands registered in the plugin.yml if the plugin.yml belongs to the plugin calling the CommandAPI

* still log an information that the command is registered by Bukkit

* make the information about a command being registered by Bukkit not dependent of verbose outputs

* include plugin name in the information message
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java
@@ -378,10 +378,18 @@ public void preCommandRegistration(String commandName) {
 		// Warn if the command we're registering already exists in this plugin's
 		// plugin.yml file
 		final PluginCommand pluginCommand = Bukkit.getPluginCommand(commandName);
-		if (pluginCommand != null) {
+		if (pluginCommand == null) {
+			return;
+		}
+		String pluginName = pluginCommand.getPlugin().getName();
+		if (config.getPlugin().getName().equals(pluginName)) {
 			CommandAPI.logWarning(
 				"Plugin command /%s is registered by Bukkit (%s). Did you forget to remove this from your plugin.yml file?"
-					.formatted(commandName, pluginCommand.getPlugin().getName()));
+					.formatted(commandName, pluginName));
+		} else {
+			CommandAPI.logNormal(
+				"Plugin command /%s is registered by Bukkit (%s). You may have to use /minecraft:%s to execute your command."
+					.formatted(commandName, pluginName, commandName));
 		}
 	}
 
