Merge branch 'dev/dev' into fix/nullcommandsender-exception

Author: SB2DD

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = CommandAPI
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 9.5.1
+PROJECT_NUMBER         = 9.6.0-SNAPSHOT
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

README.md

@@ -408,6 +408,15 @@ This is the current roadmap for the CommandAPI (as of 30th April 2024):
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td valign="top"><b>9.6.0</b></td>
+            <td valign="top">???</td>
+            <td valign="top">
+                <ul>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/577 Adds a <code>CommandAPIBukkit#failWithAdventureComponent(ComponentLike)</code> method</li>
+                </ul>
+            </td>
+        </tr>
         <tr>
             <td valign="top"><b>9.5.1</b></td>
             <td valign="top">June 2024</td>

commandapi-annotations/pom.xml

@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>dev.jorel</groupId>
 		<artifactId>commandapi</artifactId>
-		<version>9.5.1</version>
+		<version>9.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>commandapi-annotations</artifactId>

commandapi-codecov/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>dev.jorel</groupId>
 		<artifactId>commandapi</artifactId>
-		<version>9.5.1</version>
+		<version>9.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>commandapi-codecov</artifactId>

commandapi-core/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<artifactId>commandapi</artifactId>
 		<groupId>dev.jorel</groupId>
-		<version>9.5.1</version>
+		<version>9.6.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandAPICommand.java

@@ -215,7 +215,7 @@ Impl setConverted(boolean isConverted) {
 	// shouldn't be accessing/depending on any of the contents of the current class instance)
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private static <Impl extends AbstractCommandAPICommand<Impl, Argument, CommandSender>, Argument extends AbstractArgument<?, ?, Argument, CommandSender>, CommandSender>
-	void flatten(Impl rootCommand, List<Argument> prevArguments, Impl subcommand) {
+	void flatten(Impl rootCommand, List<Argument> prevArguments, Impl subcommand, String namespace) {
 		// Get the list of literals represented by the current subcommand. This
 		// includes the subcommand's name and any aliases for this subcommand
 		String[] literals = new String[subcommand.meta.aliases.length + 1];
@@ -243,11 +243,11 @@ void flatten(Impl rootCommand, List<Argument> prevArguments, Impl subcommand) {
 			rootCommand.withArguments(subcommand.arguments);
 			rootCommand.executor = subcommand.executor;
 			rootCommand.subcommands = new ArrayList<>();
-			rootCommand.register();
+			rootCommand.register(namespace);
 		}
 
 		for (Impl subsubcommand : subcommand.getSubcommands()) {
-			flatten(rootCommand, new ArrayList<>(prevArguments), subsubcommand);
+			flatten(rootCommand, new ArrayList<>(prevArguments), subsubcommand, namespace);
 		}
 	}
 
@@ -310,7 +310,7 @@ public void register(String namespace) {
 
 		// Convert subcommands into multiliteral arguments
 		for (Impl subcommand : this.subcommands) {
-			flatten(this.copy(), new ArrayList<>(), subcommand);
+			flatten(this.copy(), new ArrayList<>(), subcommand, namespace);
 		}
 	}
 

commandapi-core/src/main/java/dev/jorel/commandapi/CommandAPI.java

@@ -27,6 +27,7 @@ private CommandAPI() {
 	private static boolean loaded;
 	private static InternalConfig config;
 	private static CommandAPILogger logger;
+	private static String loadedStack;
 
 	// Accessing static variables
 
@@ -96,6 +97,14 @@ public static CommandAPILogger getLogger() {
 	 */
 	public static void onLoad(CommandAPIConfig<?> config) {
 		if (!loaded) {
+			// Store the current stack trace to help diagnose multi-loading errors
+			final StringBuilder currentStack = new StringBuilder();
+			for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
+				currentStack.append(e.toString());
+				currentStack.append("\n");
+			}
+			CommandAPI.loadedStack = currentStack.toString();
+
 			// Setup variables
 			CommandAPI.config = new InternalConfig(config);
 
@@ -124,6 +133,14 @@ public static void onLoad(CommandAPIConfig<?> config) {
 			loaded = true;
 		} else {
 			getLogger().severe("You've tried to call the CommandAPI's onLoad() method more than once!");
+			final StringBuilder currentStack = new StringBuilder();
+			for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
+				currentStack.append(e.toString());
+				currentStack.append("\n");
+			}
+			getLogger().severe("The CommandAPI was first loaded here:\n\n" + CommandAPI.loadedStack +
+				"\n\nBut it is now being loaded here:\n\n" + currentStack.toString());
+			
 		}
 	}
 

commandapi-core/src/main/java/dev/jorel/commandapi/executors/CommandArguments.java

@@ -1,16 +1,17 @@
 package dev.jorel.commandapi.executors;
 
-import dev.jorel.commandapi.arguments.AbstractArgument;
-
-import javax.annotation.Nullable;
-
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import javax.annotation.Nullable;
+
+import dev.jorel.commandapi.arguments.AbstractArgument;
+
 /**
  * This class stores the arguments for this command
  *
@@ -600,4 +601,28 @@ private String buildExceptionMessage(Object argumentNameOrIndex, String expected
 			"contact the developers of the CommandAPI, we'd love to know how you managed to get this error!");
 	}
 
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Arrays.deepHashCode(args);
+		result = prime * result + Arrays.hashCode(rawArgs);
+		result = prime * result + Objects.hash(argsMap, fullInput, rawArgsMap);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		CommandArguments other = (CommandArguments) obj;
+		return Arrays.deepEquals(args, other.args) && Objects.equals(argsMap, other.argsMap)
+				&& Objects.equals(fullInput, other.fullInput) && Arrays.equals(rawArgs, other.rawArgs)
+				&& Objects.equals(rawArgsMap, other.rawArgsMap);
+	}
+
 }

commandapi-documentation-code/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>commandapi</artifactId>
 		<groupId>dev.jorel</groupId>
-		<version>9.5.1</version>
+		<version>9.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>commandapi-documentation-code</artifactId>
@@ -19,7 +19,7 @@
 		</repository>
 		<repository>
 			<id>papermc</id>
-			<url>https://papermc.io/repo/repository/maven-public/</url>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
 		</repository>
 		<repository>
 			<id>codemc-repo</id>

commandapi-documentation-code/src/main/java/dev/jorel/commandapi/examples/java/Examples.java

@@ -460,6 +460,23 @@ void argument_entities() {
 /* ANCHOR_END: argumentEntities1 */
 
 /* ANCHOR: argumentEntities2 */
+Argument<?> noSelectorSuggestions = new PlayerArgument("target")
+    .replaceSafeSuggestions(SafeSuggestions.suggest(info ->
+        Bukkit.getOnlinePlayers().toArray(new Player[0])
+    ));
+/* ANCHOR_END: argumentEntities2 */
+
+/* ANCHOR: argumentEntities3 */
+new CommandAPICommand("warp")
+    .withArguments(noSelectorSuggestions)
+    .executesPlayer((player, args) -> {
+        Player target = (Player) args.get("target");
+        player.teleport(target);
+    })
+    .register();
+/* ANCHOR_END: argumentEntities3 */
+
+/* ANCHOR: argumentEntities4 */
 new CommandAPICommand("spawnmob")
     .withArguments(new EntityTypeArgument("entity"))
     .withArguments(new IntegerArgument("amount", 1, 100)) // Prevent spawning too many entities
@@ -469,7 +486,7 @@ void argument_entities() {
         }
     })
     .register();
-/* ANCHOR_END: argumentEntities2 */
+/* ANCHOR_END: argumentEntities4 */
 }
 
 void argument_function() {
@@ -2685,4 +2702,4 @@ static String getBalance(Player player) {
     static void resetBalance(Player target) {
         throw new UnsupportedOperationException();
     }
-}
+}