updating branch to support new project structure

CommandAPI · JorelAli · Dec 17, 2022 · Nov 24, 2022 · Nov 25, 2022 · Nov 25, 2022
commit e6d8cab43f61c679c4a63e6abdb06fceb178acb6
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: maven
       - name: build CommandAPI using maven
-        run: mvn clean install --batch-mode
+        run: mvn clean install --batch-mode -PPlatform.Bukkit
       - name: CommandAPI plugin artifact
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
@@ -57,4 +57,4 @@ jobs:
             !commandapi-shade/target/*sources.jar
             !commandapi-shade/target/*javadoc.jar
       - name: build CommandAPI examples in examples/
-        run: for folder in examples/*/; do ( cd $folder; mvn clean package ); done
+        run: cd ./examples; ./build.sh;
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.idea/**
+**/.idea/
 *.iml
 build-works/
 libs/
@@ -8,8 +8,5 @@ bin
 .settings
 target
 logs/latest.log
-commandapi-plugin/dependency-reduced-pom.xml
-commandapi-shade/dependency-reduced-pom.xml
 .vscode
-commandapi-plugin-test/command_registration.json
-commandapi-plugin-test/logs/*
+.DS_Store
diff --git a/Doxyfile b/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         = 8.6.1
+PROJECT_NUMBER         = 8.7.0
 
 # 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

diff --git a/README.md b/README.md
@@ -44,22 +44,23 @@ The list of what version of the CommandAPI you'll need to run on a specific vers
 
 | Minecraft version  | Compatible versions         | Latest compatible<br>version | Minimum Java<br>version required<br>to run latest version |
 |--------------------|-----------------------------|------------------------------|-----------------------------------------------------------|
-| **1.13.x**         | v1.0 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.15.x**         | v2.3a - 5.12, 8.3.0 - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.16.1**         | v3.0 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.16.2**         | v4.0 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.16.3**         | v4.2 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.16.4**         | v5.2 - 5.12, 8.3.0  - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.16.5**         | v5.7 - 7.0.0, 8.3.0 - 8.6.0 | 8.6.0                        | 16                                                        |
-| **1.17**           | 6.0.x - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.17.1**         | 6.1.x - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.18, 1.18.1**   | 6.5.2 - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.18.2**         | 6.5.4 - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.19**           | 8.3.0 - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.19.1**         | 8.5.0 - 8.6.0               | 8.6.0                        | 16                                                        |
-| **1.19.2**         | 8.5.1 - 8.6.0               | 8.6.0                        | 16                                                        |
+| **1.13.x**         | v1.0 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.15.x**         | v2.3a - 5.12, 8.3.0 - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.16.1**         | v3.0 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.16.2**         | v4.0 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.16.3**         | v4.2 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.16.4**         | v5.2 - 5.12, 8.3.0  - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.16.5**         | v5.7 - 7.0.0, 8.3.0 - 8.7.0 | 8.7.0                        | 16                                                        |
+| **1.17**           | 6.0.x - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.17.1**         | 6.1.x - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.18, 1.18.1**   | 6.5.2 - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.18.2**         | 6.5.4 - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.19**           | 8.3.0 - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.19.1**         | 8.5.0 - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.19.2**         | 8.5.1 - 8.7.0               | 8.7.0                        | 16                                                        |
+| **1.19.3**         | 8.7.0 - 8.7.0               | 8.7.0                        | 16                                                        |
 
 -----
 
@@ -368,6 +369,17 @@ This is the current roadmap for the CommandAPI (as of 2nd November 2022):
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td valign="top"><b>8.7.0</b></td>
+            <td valign="top">December 2022</td>
+            <td valign="top">
+                <ul>
+                    <li><b>Note: This version is incompatible with any plugin that used the <code>SoundArgument</code> in version 8.6.0! (See documentation for more information)</b></li>
+                    <li>Adds support for Minecraft 1.19.3</li>
+                    <li>Deprecates Argument "type" constructors in favour of static inner classes</li>
+                </ul>
+            </td>
+        </tr>
         <tr>
             <td valign="top"><b>8.6.0</b></td>
             <td valign="top">December 2022</td>

diff --git a/commandapi-annotations/pom.xml b/commandapi-annotations/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>dev.jorel</groupId>
 		<artifactId>commandapi</artifactId>
-		<version>8.6.1-SNAPSHOT</version>
+		<version>9.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>commandapi-annotations</artifactId>
@@ -33,7 +33,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>dev.jorel</groupId>
-			<artifactId>commandapi-core</artifactId>
+			<artifactId>commandapi-bukkit-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

diff --git a/commandapi-annotations/src/main/java/dev/jorel/commandapi/annotations/Annotations.java b/commandapi-annotations/src/main/java/dev/jorel/commandapi/annotations/Annotations.java
@@ -66,7 +66,6 @@
 import dev.jorel.commandapi.annotations.arguments.AEnchantmentArgument;
 import dev.jorel.commandapi.annotations.arguments.AEntitySelectorArgument;
 import dev.jorel.commandapi.annotations.arguments.AEntityTypeArgument;
-import dev.jorel.commandapi.annotations.arguments.AEnvironmentArgument;
 import dev.jorel.commandapi.annotations.arguments.AFloatArgument;
 import dev.jorel.commandapi.annotations.arguments.AFloatRangeArgument;
 import dev.jorel.commandapi.annotations.arguments.AFunctionArgument;
@@ -101,10 +100,8 @@
 import dev.jorel.commandapi.annotations.arguments.ATimeArgument;
 import dev.jorel.commandapi.annotations.arguments.AUUIDArgument;
 import dev.jorel.commandapi.annotations.arguments.Primitive;
-import dev.jorel.commandapi.arguments.EntitySelector;
 import dev.jorel.commandapi.arguments.LocationType;
 import dev.jorel.commandapi.arguments.MultiLiteralArgument;
-import dev.jorel.commandapi.arguments.ScoreHolderArgument.ScoreHolderType;
 
 /**
  * The main annotation processor for annotation-based arguments
@@ -113,19 +110,21 @@
 public class Annotations extends AbstractProcessor {
 
 	private final Class<?>[] ARGUMENT_ANNOTATIONS = new Class<?>[] { AAdvancementArgument.class,
-			AAdventureChatArgument.class, AAdventureChatComponentArgument.class, AAngleArgument.class,
-			AAxisArgument.class, ABiomeArgument.class, ABlockPredicateArgument.class, ABlockStateArgument.class,
-			ABooleanArgument.class, AChatArgument.class, AChatColorArgument.class, AChatComponentArgument.class,
-			ADoubleArgument.class, AEnchantmentArgument.class, AEntitySelectorArgument.class, AEntityTypeArgument.class,
-			AEnvironmentArgument.class, AFloatArgument.class, AFloatRangeArgument.class, AFunctionArgument.class,
-			AGreedyStringArgument.class, AIntegerArgument.class, AIntegerRangeArgument.class, AItemStackArgument.class,
-			AItemStackPredicateArgument.class, ALiteralArgument.class, ALocation2DArgument.class,
-			ALocationArgument.class, ALongArgument.class, ALootTableArgument.class, AMathOperationArgument.class,
-			AMultiLiteralArgument.class, ANamespacedKeyArgument.class, ANBTCompoundArgument.class, AObjectiveArgument.class,
-			AObjectiveCriteriaArgument.class, AOfflinePlayerArgument.class, AParticleArgument.class, APlayerArgument.class,
-			APotionEffectArgument.class, ARecipeArgument.class, ARotationArgument.class, AScoreboardSlotArgument.class,
-			AScoreHolderArgument.class, ASoundArgument.class, AStringArgument.class, ATeamArgument.class,
-			ATextArgument.class, ATimeArgument.class, AUUIDArgument.class };
+		AAdventureChatArgument.class, AAdventureChatComponentArgument.class, AAngleArgument.class,
+		AAxisArgument.class, ABiomeArgument.class, ABlockPredicateArgument.class, ABlockStateArgument.class,
+		ABooleanArgument.class, AChatArgument.class, AChatColorArgument.class, AChatComponentArgument.class,
+		ADoubleArgument.class, AEnchantmentArgument.class, AEntitySelectorArgument.ManyEntities.class,
+		AEntitySelectorArgument.ManyPlayers.class, AEntitySelectorArgument.OneEntity.class,
+		AEntitySelectorArgument.OnePlayer.class, AEntityTypeArgument.class,
+		AFloatArgument.class, AFloatRangeArgument.class, AFunctionArgument.class,
+		AGreedyStringArgument.class, AIntegerArgument.class, AIntegerRangeArgument.class, AItemStackArgument.class,
+		AItemStackPredicateArgument.class, ALiteralArgument.class, ALocation2DArgument.class,
+		ALocationArgument.class, ALongArgument.class, ALootTableArgument.class, AMathOperationArgument.class,
+		AMultiLiteralArgument.class, ANamespacedKeyArgument.class, ANBTCompoundArgument.class, AObjectiveArgument.class,
+		AObjectiveCriteriaArgument.class, AOfflinePlayerArgument.class, AParticleArgument.class, APlayerArgument.class,
+		APotionEffectArgument.class, ARecipeArgument.class, ARotationArgument.class, AScoreboardSlotArgument.class,
+		AScoreHolderArgument.Single.class, AScoreHolderArgument.Multiple.class, ASoundArgument.class, AStringArgument.class, ATeamArgument.class,
+		ATextArgument.class, ATimeArgument.class, AUUIDArgument.class };
 
 	// List of stu
F438
ff we can deal with
 	@Override
@@ -187,15 +186,20 @@ private SortedSet<String> calculateImports(Element classElement) {
 			if(methodElement instanceof ExecutableElement) {
 				ExecutableElement method = (ExecutableElement) methodElement;
 				for(VariableElement parameter : method.getParameters()) {
-					if(getArgument(parameter) != null) {
-						imports.addAll(Arrays.asList(getPrimitive(getArgument(parameter)).value()));
-						imports.add("dev.jorel.commandapi.arguments." + getArgument(parameter).annotationType().getSimpleName().substring(1));
-						if(getArgument(parameter) instanceof ALocationArgument || getArgument(parameter) instanceof ALocation2DArgument) {
+					Annotation argument = getArgument(parameter);
+					if(argument != null) {
+						imports.addAll(Arrays.asList(getPrimitive(argument).value()));
+
+						if(argument.annotationType().getEnclosingClass() == null) {
+							// Normal arguments
+							imports.add("dev.jorel.commandapi.arguments." + argument.annotationType().getSimpleName().substring(1));
+						} else {
+							// Nested arguments, like EntitySelectorArgument
+							imports.add("dev.jorel.commandapi.arguments." + argument.annotationType().getEnclosingClass().getSimpleName().substring(1));
+						}
+
+						if(argument instanceof ALocationArgument || argument instanceof ALocation2DArgument) {
 							imports.add(LocationType.class.getCanonicalName());
-						} else if(getArgument(parameter) instanceof AScoreHolderArgument) {
-							imports.add(ScoreHolderType.class.getCanonicalName());
-						} else if(getArgument(parameter) instanceof AEntitySelectorArgument) {
-							imports.add(EntitySelector.class.getCanonicalName());
 						}
 					}
 
@@ -303,22 +307,6 @@ private <T extends Annotation> Map<Integer, String> emitArgumentsAndGenerateArgu
 			Primitive primitive = getPrimitive(argumentAnnotation);
 			if(primitive.value().length == 1) {
 				argumentMapping.put(i - 1, primitive.value()[0]);
-			} else {
-				if(argumentAnnotation instanceof AEntitySelectorArgument argument) {
-					switch(argument.value()) {
-					case MANY_ENTITIES -> argumentMapping.put(i - 1, primitive.value()[0]);
-					case MANY_PLAYERS  -> argumentMapping.put(i - 1, primitive.value()[1]);
-					case ONE_ENTITY    -> argumentMapping.put(i - 1, primitive.value()[2]);
-					case ONE_PLAYER    -> argumentMapping.put(i - 1, primitive.value()[3]);
-					default            -> throw new IllegalArgumentException("Unexpected value: " + argument.value());
-					}
-				} else if (argumentAnnotation instanceof AScoreHolderArgument argument) {
-					switch(argument.value()) {
-					case MULTIPLE -> argumentMapping.put(i - 1, primitive.value()[0]);
-					case SINGLE   -> argumentMapping.put(i - 1, primitive.value()[1]);
-					default       -> throw new IllegalArgumentException("Unexpected value: " + argument.value());
-					}
-				}
 			}
 		}
 
@@ -492,7 +480,15 @@ private <T extends Annotation> void processCommand(RoundEnvironment roundEnv, El
 	private <T extends Annotation> void emitArgument(PrintWriter out, T argumentAnnotation, VariableElement parameter, int indent) {
 		out.print(indent(indent) + ".withArguments(new ");
 		// We're assuming that the name of the argument MUST be "A" + the same name
-		out.print(argumentAnnotation.annotationType().getSimpleName().substring(1));
+		if(argumentAnnotation.annotationType().getEnclosingClass() == null) {
+			// Normal arguments
+			out.print(argumentAnnotation.annotationType().getSimpleName().substring(1));
+		} else {
+			// Nested arguments, like EntitySelectorArgument
+			out.print(argumentAnnotation.annotationType().getEnclosingClass().getSimpleName().substring(1));
+			out.print(".");
+			out.print(argumentAnnotation.annotationType().getSimpleName());
+		}
 
 		// Node name
 		if(argumentAnnotation instanceof AMultiLiteralArgument || argumentAnnotation instanceof ALiteralArgument) {
@@ -521,10 +517,6 @@ else if(argumentAnnotation instanceof ALocation2DArgument argument) {
 			out.print(", " + LocationType.class.getSimpleName() + "." + argument.value().toString());
 		} else if(argumentAnnotation instanceof ALocationArgument argument) {
 			out.print(", " + LocationType.class.getSimpleName() + "." + argument.value().toString());
-		} else if(argumentAnnotation instanceof AEntitySelectorArgument argument) {
-			out.print(", " + EntitySelector.class.getSimpleName() + "." + argument.value().toString());
-		} else if(argumentAnnotation instanceof AScoreHolderArgument argument) {
-			out.print(", " + ScoreHolderType.class.getSimpleName() + "." + argument.value().toString());
 		} else if(argumentAnnotation instanceof AMultiLiteralArgument argument) {
 			out.print(Arrays.stream(argument.value()).map(s -> "\"" + s + "\"&quo
10000
t;).collect(Collectors.joining(", ")));
 		} else if(argumentAnnotation instanceof ALiteralArgument argument) {
@@ -557,11 +549,22 @@ private <T extends Annotation> Primitive getPrimitive(T annotation) {
 	private <T extends Annotation> T getArgument(VariableElement tMirror) {
 		for(AnnotationMirror mirror : tMirror.getAnnotationMirrors()) {
 			if(isArgument(mirror)) {
+				T argumentAnnotation = null;
+				String mirrorCanonicalName = mirror.getAnnotationType().toString();
 				try {
-					return tMirror.getAnnotationsByType((Class<T>) Class.forName(mirror.getAnnotationType().toString()))[0];
+					argumentAnnotation = tMirror.getAnnotationsByType((Class<T>) Class.forName(mirrorCanonicalName))[0];
 				} catch (ClassNotFoundException e) {
-					e.printStackTrace();
+					// We might be in a nested class. Let's try accessing that
+					try {
+						// Replace final . with $
+						mirrorCanonicalName = mirrorCanonicalName.substring(0, mirrorCanonicalName.lastIndexOf(".")) + "$" + mirrorCanonicalName.substring(mirrorCanonicalName.lastIndexOf(".") + 1);
+						argumentAnnotation = tMirror.getAnnotationsByType((Class<T>) Class.forName(mirrorCanonicalName))[0];
+					} catch (ClassNotFoundException e1) {
+						e1.printStackTrace();
+					}
 				}
+
+				return argumentAnnotation;
 			}
 		}
 		return null;

diff --git a/...ons/src/main/java/dev/jorel/commandapi/annotations/arguments/AEntitySelectorArgument.java b/...ons/src/main/java/dev/jorel/commandapi/annotations/arguments/AEntitySelectorArgument.java
@@ -25,24 +25,41 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import dev.jorel.commandapi.arguments.EntitySelector;
 import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 
-/**
- * Annotation equivalent of the {@link EntitySelectorArgument}
- */
-@Primitive({ "java.util.Collection<org.bukkit.entity.Entity>", // MANY_ENTITIES
-		"java.util.Collection<org.bukkit.entity.Player>", // MANY_PLAYERS
-		"org.bukkit.entity.Entity", // ONE_ENTITY
-		"org.bukkit.entity.Player" // ONE_PLAYER
-})
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.PARAMETER)
-public @interface AEntitySelectorArgument {
+public interface AEntitySelectorArgument {
+
+	/**
+	 * Annotation equivalent of the {@link EntitySelectorArgument} for one entity
+	 */
+	@Primitive("org.bukkit.entity.Entity")
+	@Retention(RetentionPolicy.SOURCE)
+	@Target(ElementType.PARAMETER)
+	public @interface OneEntity { }
+
+	/**
+	 * Annotation equivalent of the {@link EntitySelectorArgument} for one player
+	 */
+	@Primitive("org.bukkit.entity.Player")
+	@Retention(RetentionPolicy.SOURCE)
+	@Target(ElementType.PARAMETER)
+	public @interface OnePlayer { }
 
 	/**
-	 * @return the entity selector for this argument
+	 * Annotation equivalent of the {@link EntitySelectorArgument} for many entities
 	 */
-	EntitySelector value() default EntitySelector.ONE_ENTITY;
+	@Primitive("java.util.Collection<org.bukkit.entity.Entity>")
+	@Retention(RetentionPolicy.SOURCE)
+	@Target(ElementType.PARAMETER)
+	public @interface ManyEntities { }
+
+	/**
+	 * Annotation equivalent of the {@link EntitySelectorArgument} for many players
+	 */
+	@Primitive("java.util.Collection<org.bukkit.entity.Player>")
+	@Retention(RetentionPolicy.SOURCE)
+	@Target(ElementType.PARAMETER)
+	public @interface ManyPlayers { }
+
 
 }