Merge pull request CommandAPI#550 from JorelAli/release/9.4.0

Release/9.4.0

Author: JorelAli

.editorconfig

@@ -9,3 +9,6 @@ indent_style = space
 
 [commandapi-documentation-code/**{.java,.kt}]
 indent_style = space
+
+[commandapi-documentation-velocity-code/**{.java,.kt}]
+indent_style = space

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,6 +20,7 @@ body:
       description: What version of Minecraft are you using? _(If using a minor version that isn't specified, such as 1.18.1, just select the latest version below it such as 1.18)_
       multiple: false
       options:
+        - "1.20.5"
         - "1.20.4"
         - "1.20.3"
         - "1.20.2"

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         # os: [ubuntu-20.04, windows-2022]
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
@@ -131,7 +131,7 @@ jobs:
       ### Upload .jar artifacts ###
 
       - name: Upload CommandAPI (Bukkit) plugin artifact
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v3
         with:
           name: CommandAPI (Bukkit plugin)
@@ -141,7 +141,7 @@ jobs:
             !commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/target/*javadoc.jar
 
       - name: Upload CommandAPI (Velocity) plugin artifact
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v3
         with:
           name: CommandAPI (Velocity plugin)
@@ -157,10 +157,10 @@ jobs:
 
       ### Save PR information for 'SonarAnalyze'
       - name: Save PR number to file
-        if: github.event_name == 'pull_request' && ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.java_version }} == '17'
+        if: github.event_name == 'pull_request' && ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.java_version }} == '21'
         run: echo ${{ github.event.number }} > PR_NUMBER.txt
       - name: Archive PR number
-        if: github.event_name == 'pull_request' && ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.java_version }} == '17'
+        if: github.event_name == 'pull_request' && ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.java_version }} == '21'
         uses: actions/upload-artifact@v3
         with:
             name: PR_NUMBER
@@ -175,14 +175,14 @@ jobs:
       - name: Checkout the CommandAPI repository
         uses: actions/checkout@v3
 
-      - name: Setup JDK 17
-        uses: actions/setup-java@v3
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           server-id: ossrh # Needs to match the id in the main pom.xml file
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
-          java-version: 17
+          java-version: 21
           cache: maven
 
       - name: Deploy snapshot version of the CommandAPI (Bukkit+Velocity) to the Sonatype snapshot repository

.github/workflows/sonar.yml

@@ -66,11 +66,11 @@ jobs:
                   echo "PR targets $branchTarget"
                   echo "sonar.branch.target=$branchTarget" >> $GITHUB_ENV
 
-            - name: Setup JDK 17
-              uses: actions/setup-java@v3
+            - name: Setup JDK 21
+              uses: actions/setup-java@v4
               with:
                   distribution: temurin
-                  java-version: 17
+                  java-version: 21
                   cache: maven
 
             - name: Cache SonarCloud packages

.gitignore

@@ -15,3 +15,4 @@ build
 docssrc/src/.markdownlint-cli2.yaml
 .gradle
 *.versionsBackup
+dependency-reduced-pom.xml

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.3.0
+PROJECT_NUMBER         = 9.4.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

README.md

@@ -49,24 +49,25 @@ The list of what version of the CommandAPI you'll need to run on a specific vers
 | **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0  - 8.8.0 | 8.8.0                        | 16                                                        |
 | **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0  - 8.8.0 | 8.8.0                        | 16                                                        |
 | **1.15.x**         | v2.3a - 5.12, 8.3.0 - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.16.1**         | v3.0 - 5.12, 8.3.0  - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.16.2**         | v4.0 - 5.12, 8.3.0  - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.16.3**         | v4.2 - 5.12, 8.3.0  - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.16.4**         | v5.2 - 5.12, 8.3.0  - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.16.5**         | v5.7 - 7.0.0, 8.3.0 - 9.3.0 | 9.3.0                        | 16                                                        |
-| **1.17**           | 6.0.x - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.17.1**         | 6.1.x - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.18, 1.18.1**   | 6.5.2 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.18.2**         | 6.5.4 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.19**           | 8.3.0 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.19.1**         | 8.5.0 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.19.2**         | 8.5.1 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.19.3**         | 8.7.0 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.19.4**         | 8.8.0 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.20**           | 9.0.2 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.20.1**         | 9.0.3 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.20.2**         | 9.2.0 - 9.3.0               | 9.3.0                        | 16                                                        |
-| **1.20.3, 1.20.4** | 9.3.0                       | 9.3.0                        | 16                                                        |
+| **1.16.1**         | v3.0 - 5.12, 8.3.0  - 9.4.0 | 9.4.0                        | 16                                                        |
+| **1.16.2**         | v4.0 - 5.12, 8.3.0  - 9.4.0 | 9.4.0                        | 16                                                        |
+| **1.16.3**         | v4.2 - 5.12, 8.3.0  - 9.4.0 | 9.4.0                        | 16                                                        |
+| **1.16.4**         | v5.2 - 5.12, 8.3.0  - 9.4.0 | 9.4.0                        | 16                                                        |
+| **1.16.5**         | v5.7 - 7.0.0, 8.3.0 - 9.4.0 | 9.4.0                        | 16                                                        |
+| **1.17**           | 6.0.x - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.17.1**         | 6.1.x - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.18, 1.18.1**   | 6.5.2 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.18.2**         | 6.5.4 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.19**           | 8.3.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.19.1**         | 8.5.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.19.2**         | 8.5.1 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.19.3**         | 8.7.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.19.4**         | 8.8.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.20**           | 9.0.2 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.20.1**         | 9.0.3 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.20.2**         | 9.2.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.20.3, 1.20.4** | 9.3.0 - 9.4.0               | 9.4.0                        | 16                                                        |
+| **1.20.5, 1.20.6** | 9.4.0                       | 9.4.0                        | 16                                                        |
 
 -----
 
@@ -379,7 +380,7 @@ The resulting compiled documentation is found in `docs/X.X.X`, where `X.X.X` is
 
 ## CommandAPI Project Timeline
 
-This is the current roadmap for the CommandAPI (as of 11th May 2023):
+This is the current roadmap for the CommandAPI (as of 30th April 2024):
 
 - **10.0.0:**
 
@@ -414,6 +415,30 @@ This is the current roadmap for the CommandAPI (as of 11th May 2023):
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td valign="top"><b>9.4.0</b></td>
+            <td valign="top">April 2024</td>
+            <td valign="top">
+                <b>CommandAPI Changes:</b>
+                <ul>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/495 Adds a parameter to <code>EntitySelectorArgument</code> to allow failure when no entity lists are empty</li>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/367, https://github.com/JorelAli/CommandAPI/pull/509 Adds the ability to register commands with a custom namespace</li>
+                    <li>https://github.com/JorelAli/CommandAPI/pull/523 Exposed more details of the <code>CommandPermission</code></li>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/536, https://github.com/JorelAli/CommandAPI/pull/537 Fixes <code>MultiLiteralArgument</code> help displaying the node name instead of the literal text</li>
+                    <li>Fixed implementation issues with <code>FunctionArgument</code></li>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/490 Adds (experimental) support for Mojang-mapped servers via the CommandAPI config</li>
+                    <li>https://github.com/JorelAli/CommandAPI/issues/524 Fixes <code>CommandAPIBukkit.get().getTags()</code> erroring in 1.20.4</li>
+                    <li>https://github.com/JorelAli/CommandAPI/pull/540 Add methods to "safe-cast" arguments to <code>CommandArguments</code></li>
+                    <li>https://github.com/JorelAli/CommandAPI/pull/541 Adds support for a <code>NamespacedKey</code> variant for the <code>PotionEffectArgument</code></li>
+                </ul>
+                <b>Minecraft Version Changes:</b>
+                <ul>
+                    <li>Drops support for version 1.15.x</li>
+                    <li>Adds support for version 1.20.5</li>
+                    <li>Adds support for version 1.20.6</li>
+                </ul>
+            </td>
+        </tr>
         <tr>
             <td valign="top"><b>9.3.0</b></td>
             <td valign="top">December 2023</td>

commandapi-annotations/pom.xml

@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>dev.jorel</groupId>
 		<artifactId>commandapi</artifactId>
-		<version>9.3.0</version>
+		<version>9.4.0</version>
 	</parent>
 
 	<artifactId>commandapi-annotations</artifactId>

commandapi-annotations/src/main/java/dev/jorel/commandapi/annotations/Annotations.java

@@ -183,7 +183,13 @@ private SortedSet<String> calculateImports(Element classElement) {
 				for(VariableElement parameter : method.getParameters()) {
 					Annotation argument = getArgument(parameter);
 					if(argument != null) {
-						imports.addAll(Arrays.asList(getPrimitive(argument).value()));
+						
+						if (argument instanceof ANBTCompoundArgument) {
+							// Get NBTCompoundArgument type from type mirror
+							imports.add(parameter.asType().toString());
+						} else {
+							imports.addAll(Arrays.asList(getPrimitive(argument).value()));
+						}
 
 						if(argument.annotationType().getEnclosingClass() == null) {
 							// Normal arguments
@@ -299,8 +305,12 @@ private <T extends Annotation> Map<Integer, String> emitArgumentsAndGenerateArgu
 
 			// Handle return types
 			Primitive primitive = getPrimitive(argumentAnnotation);
-			if(primitive.value().length == 1) {
-				argumentMapping.put(i - 1, primitive.value()[0]);
+			if (argumentAnnotation instanceof ANBTCompoundArgument) {
+				argumentMapping.put(i - 1, parameter.asType().toString());
+			} else {
+				if(primitive.value().length == 1) {
+					argumentMapping.put(i - 1, primitive.value()[0]);
+				}
 			}
 		}
 

commandapi-annotations/src/main/java/dev/jorel/commandapi/annotations/arguments/ANBTCompoundArgument.java

@@ -30,7 +30,7 @@
 /**
  * Annotation equivalent of the {@link NBTCompoundArgument}
  */
-@Primitive("dev.jorel.commandapi.nbtapi.NBTContainer")
+@Primitive({})
 @Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.PARAMETER)
 public @interface ANBTCompoundArgument {