Skip to content

Commit 43d31e0

Browse files
authored
Merge pull request CommandAPI#553 from JorelAli/release/9.4.1
Release/9.4.1
2 parents 5e1b22c + e333007 commit 43d31e0

File tree

1,060 files changed

+57369
-3198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,060 files changed

+57369
-3198
lines changed

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = CommandAPI
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 9.4.0
41+
PROJECT_NUMBER = 9.4.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

README.md

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@ The list of what version of the CommandAPI you'll need to run on a specific vers
4949
| **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0 - 8.8.0 | 8.8.0 | 16 |
5050
| **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0 - 8.8.0 | 8.8.0 | 16 |
5151
| **1.15.x** | v2.3a - 5.12, 8.3.0 - 9.3.0 | 9.3.0 | 16 |
52-
| **1.16.1** | v3.0 - 5.12, 8.3.0 - 9.4.0 | 9.4.0 | 16 |
53-
| **1.16.2** | v4.0 - 5.12, 8.3.0 - 9.4.0 | 9.4.0 | 16 |
54-
| **1.16.3** | v4.2 - 5.12, 8.3.0 - 9.4.0 | 9.4.0 | 16 |
55-
| **1.16.4** | v5.2 - 5.12, 8.3.0 - 9.4.0 | 9.4.0 | 16 |
56-
| **1.16.5** | v5.7 - 7.0.0, 8.3.0 - 9.4.0 | 9.4.0 | 16 |
57-
| **1.17** | 6.0.x - 9.4.0 | 9.4.0 | 16 |
58-
| **1.17.1** | 6.1.x - 9.4.0 | 9.4.0 | 16 |
59-
| **1.18, 1.18.1** | 6.5.2 - 9.4.0 | 9.4.0 | 16 |
60-
| **1.18.2** | 6.5.4 - 9.4.0 | 9.4.0 | 16 |
61-
| **1.19** | 8.3.0 - 9.4.0 | 9.4.0 | 16 |
62-
| **1.19.1** | 8.5.0 - 9.4.0 | 9.4.0 | 16 |
63-
| **1.19.2** | 8.5.1 - 9.4.0 | 9.4.0 | 16 |
64-
| **1.19.3** | 8.7.0 - 9.4.0 | 9.4.0 | 16 |
65-
| **1.19.4** | 8.8.0 - 9.4.0 | 9.4.0 | 16 |
66-
| **1.20** | 9.0.2 - 9.4.0 | 9.4.0 | 16 |
67-
| **1.20.1** | 9.0.3 - 9.4.0 | 9.4.0 | 16 |
68-
| **1.20.2** | 9.2.0 - 9.4.0 | 9.4.0 | 16 |
69-
| **1.20.3, 1.20.4** | 9.3.0 - 9.4.0 | 9.4.0 | 16 |
70-
| **1.20.5, 1.20.6** | 9.4.0 | 9.4.0 | 16 |
52+
| **1.16.1** | v3.0 - 5.12, 8.3.0 - 9.4.1 | 9.4.1 | 16 |
53+
| **1.16.2** | v4.0 - 5.12, 8.3.0 - 9.4.1 | 9.4.1 | 16 |
54+
| **1.16.3** | v4.2 - 5.12, 8.3.0 - 9.4.1 | 9.4.1 | 16 |
55+
| **1.16.4** | v5.2 - 5.12, 8.3.0 - 9.4.1 | 9.4.1 | 16 |
56+
| **1.16.5** | v5.7 - 7.0.0, 8.3.0 - 9.4.1 | 9.4.1 | 16 |
57+
| **1.17** | 6.0.x - 9.4.1 | 9.4.1 | 16 |
58+
| **1.17.1** | 6.1.x - 9.4.1 | 9.4.1 | 16 |
59+
| **1.18, 1.18.1** | 6.5.2 - 9.4.1 | 9.4.1 | 16 |
60+
| **1.18.2** | 6.5.4 - 9.4.1 | 9.4.1 | 16 |
61+
| **1.19** | 8.3.0 - 9.4.1 | 9.4.1 | 16 |
62+
| **1.19.1** | 8.5.0 - 9.4.1 | 9.4.1 | 16 |
63+
| **1.19.2** | 8.5.1 - 9.4.1 | 9.4.1 | 16 |
64+
| **1.19.3** | 8.7.0 - 9.4.1 | 9.4.1 | 16 |
65+
| **1.19.4** | 8.8.0 - 9.4.1 | 9.4.1 | 16 |
66+
| **1.20** | 9.0.2 - 9.4.1 | 9.4.1 | 16 |
67+
| **1.20.1** | 9.0.3 - 9.4.1 | 9.4.1 | 16 |
68+
| **1.20.2** | 9.2.0 - 9.4.1 | 9.4.1 | 16 |
69+
| **1.20.3, 1.20.4** | 9.3.0 - 9.4.1 | 9.4.1 | 16 |
70+
| **1.20.5, 1.20.6** | 9.4.0 - 9.4.1 | 9.4.1 | 16 |
7171

7272
-----
7373

@@ -319,14 +319,6 @@ plugins-to-convert:
319319
320320
-----
321321
322-
## Dependencies
323-
324-
Bukkit plugin (shaded) dependencies:
325-
326-
- [Item-NBT-API](https://github.com/tr7zw/Item-NBT-API) (MIT License)
327-
328-
-----
329-
330322
## Building the CommandAPI
331323
332324
The CommandAPI is built using the Maven build tool - if you don't have it, you can download it [here](https://maven.apache.org/download.cgi).
@@ -415,6 +407,17 @@ This is the current roadmap for the CommandAPI (as of 30th April 2024):
415407
</tr>
416408
</thead>
417409
<tbody>
410+
<tr>
411+
<td valign="top"><b>9.4.1</b></td>
412+
<td valign="top">May 2024</td>
413+
<td valign="top">
414+
<b>CommandAPI Changes:</b>
415+
<ul>
416+
<li>https://github.com/JorelAli/CommandAPI/issues/551 Fixes mojang-mapped versions of the CommandAPI causing errors in certain Minecraft versions</li>
417+
<li>https://github.com/JorelAli/CommandAPI/issues/552 Adds a configuration option to disable datapack reloading on server load</li>
418+
</ul>
419+
</td>
420+
</tr>
418421
<tr>
419422
<td valign="top"><b>9.4.0</b></td>
420423
<td valign="top">April 2024</td>

commandapi-annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>dev.jorel</groupId>
2020
<artifactId>commandapi</artifactId>
21-
<version>9.4.0</version>
21+
<version>9.4.1</version>
2222
</parent>
2323

2424
<artifactId>commandapi-annotations</artifactId>

commandapi-codecov/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>dev.jorel</groupId>
2222
<artifactId>commandapi</artifactId>
23-
<version>9.4.0</version>
23+
<version>9.4.1</version>
2424
</parent>
2525

2626
<artifactId>commandapi-codecov</artifactId>

commandapi-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>commandapi</artifactId>
2121
<groupId>dev.jorel</groupId>
22-
<version>9.4.0</version>
22+
<version>9.4.1</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file handles loading the correct platform implementation. The CommandAPIVersionHandler
55
* file within the commandapi-core module is NOT used at run time. Instead, the platform modules
6-
* replace this class with their own version that handles loads the correct class for their version
6+
* replace this class with their own version that handles loads the correct class for their version.
77
*/
88
public interface CommandAPIVersionHandler {
99

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package dev.jorel.commandapi;
2+
3+
/**
4+
* This file handles loading the correct mappings information. The MojangMappedVersionHandler
5+
* file within the commandapi-core module may not be used at run time. Instead, if a platform module
6+
* wants to be mojang-mapped, they can replace this class with one where {@link #isMojangMapped()} returns {@code true}.
7+
*/
8+
public interface MojangMappedVersionHandler {
9+
static boolean isMojangMapped() {
10+
return false;
11+
}
12+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
public class SafeVarHandle<Type, FieldType> {
1515

16-
public static boolean USING_MOJANG_MAPPINGS = false; // This should only be set to true in testing.
16+
public static boolean USING_MOJANG_MAPPINGS = MojangMappedVersionHandler.isMojangMapped();
1717

1818
private VarHandle handle;
1919

commandapi-documentation-code/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>commandapi</artifactId>
99
<groupId>dev.jorel</groupId>
10-
<version>9.4.0</version>
10+
<version>9.4.1</version>
1111
</parent>
1212

1313
<artifactId>commandapi-documentation-code</artifactId>

commandapi-documentation-velocity-code/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>dev.jorel</groupId>
88
<artifactId>commandapi</artifactId>
9-
<version>9.4.0</version>
9+
<version>9.4.1</version>
1010
</parent>
1111

1212
<artifactId>commandapi-documentation-velocity-code</artifactId>

0 commit comments

Comments
 (0)