Skip to content

Commit 4584e1c

Browse files
committed
Adds support for Minecraft 1.20.6. Update main website to have 9.4.0 links
1 parent 9702e7d commit 4584e1c

File tree

6 files changed

+23
-12
lines changed

6 files changed

+23
-12
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The list of what version of the CommandAPI you'll need to run on a specific vers
6767
| **1.20.1** | 9.0.3 - 9.4.0 | 9.4.0 | 16 |
6868
| **1.20.2** | 9.2.0 - 9.4.0 | 9.4.0 | 16 |
6969
| **1.20.3, 1.20.4** | 9.3.0 - 9.4.0 | 9.4.0 | 16 |
70-
| **1.20.5** | 9.4.0 | 9.4.0 | 16 |
70+
| **1.20.5, 1.20.6** | 9.4.0 | 9.4.0 | 16 |
7171

7272
-----
7373

@@ -380,7 +380,7 @@ The resulting compiled documentation is found in `docs/X.X.X`, where `X.X.X` is
380380
381381
## CommandAPI Project Timeline
382382
383-
This is the current roadmap for the CommandAPI (as of 11th May 2023):
383+
This is the current roadmap for the CommandAPI (as of 30th April 2024):
384384
385385
- **10.0.0:**
386386
@@ -434,6 +434,8 @@ This is the current roadmap for the CommandAPI (as of 11th May 2023):
434434
<b>Minecraft Version Changes:</b>
435435
<ul>
436436
<li>Drops support for version 1.15.x</li>
437+
<li>Adds support for version 1.20.5</li>
438+
<li>Adds support for version 1.20.6</li>
437439
</ul>
438440
</td>
439441
</tr>

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<artifactId>commandapi-bukkit-1.20.5</artifactId>
2929

3030
<properties>
31-
<minecraft.mappings>1.20.5-R0.1-SNAPSHOT</minecraft.mappings>
32-
<spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
31+
<minecraft.mappings>1.20.6-R0.1-SNAPSHOT</minecraft.mappings>
32+
<spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
3333
<paper.version>1.20.4-R0.1-SNAPSHOT</paper.version>
3434
</properties>
3535

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@
197197

198198
// Mojang-Mapped reflection
199199
/**
200-
* NMS implementation for Minecraft 1.20.5
200+
* NMS implementation for Minecraft 1.20.5, 1.20.6
201201
*/
202-
@NMSMeta(compatibleWith = { "1.20.5" })
202+
@NMSMeta(compatibleWith = { "1.20.5", "1.20.6" })
203203
@RequireField(in = SimpleHelpMap.class, name = "helpTopics", ofType = Map.class)
204204
@RequireField(in = EntitySelector.class, name = "usesSelector", ofType = boolean.class)
205205
// @RequireField(in = ItemInput.class, name = "tag", ofType = CompoundTag.class)
@@ -295,7 +295,7 @@ public final Map<String, HelpTopic> getHelpMap() {
295295

296296
@Override
297297
public String[] compatibleVersions() {
298-
return new String[] { "1.20.5" };
298+
return new String[] { "1.20.5", "1.20.6" };
299299
};
300300

301301
private static String serializeNMSItemStack(ItemStack is) {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/MCVersion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
public enum MCVersion {
1010

1111
// 1.20
12+
V1_20_6(Version.valueOf("1.20.6")),
1213
V1_20_5(Version.valueOf("1.20.5")),
1314
V1_20_4(Version.valueOf("1.20.4")),
1415
V1_20_3(Version.valueOf("1.20.3")),

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-vh/src/main/java/dev/jorel/commandapi/CommandAPIVersionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public interface CommandAPIVersionHandler {
6969
case "1.20", "1.20.1" -> new NMS_1_20_R1();
7070
case "1.20.2" -> new NMS_1_20_R2();
7171
case "1.20.3", "1.20.4" -> new NMS_1_20_R3();
72-
case "1.20.5" -> new NMS_1_20_R4();
72+
case "1.20.5", "1.20.6" -> new NMS_1_20_R4();
7373
default -> throw new UnsupportedVersionException(version);
7474
};
7575
}

docs/index.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ <h2>Latest Downloads, Documentation & JavaDocs</h2>
8686
<div class="col-sm">
8787
<div class="card no-hover color">
8888
<a
89-
href="https://github.com/JorelAli/CommandAPI/releases/download/9.3.0/CommandAPI-9.3.0.jar">
89+
href="https://github.com/JorelAli/CommandAPI/releases/download/9.4.0/CommandAPI-9.4.0.jar">
9090
<div class="card-body d-flex flex-column align-items-center">
91-
<div class="swatch">9.3.0</div>
91+
<div class="swatch">9.4.0</div>
9292
<div class="title"><i class="fa fa-download" style="margin-right: 0.5em"></i>Latest
9393
Download (direct)</div>
9494
</div>
@@ -99,7 +99,7 @@ <h2>Latest Downloads, Documentation & JavaDocs</h2>
9999
<div class="card no-hover color">
100100
<a href="./latest.html">
101101
<div class="card-body d-flex flex-column align-items-center">
102-
<div class="swatch">9.3.0</div>
102+
<div class="swatch">9.4.0</div>
103103
<div class="title"><i class="fa fa-book" style="margin-right: 0.5em"></i>Latest
104104
Documentation</div>
105105
</div>
@@ -110,7 +110,7 @@ <h2>Latest Downloads, Documentation & JavaDocs</h2>
110110
<div class="card no-hover color">
111111
<a href="./javadocs/html/annotated.html">
112112
<div class="card-body d-flex flex-column align-items-center">
113-
<div class="swatch">9.3.0</div>
113+
<div class="swatch">9.4.0</div>
114114
<div class="title"><i class="fab fa-java" style="margin-right: 0.5em"></i>Latest
115115
JavaDocs</div>
116116
</div>
@@ -122,6 +122,14 @@ <h2>Latest Downloads, Documentation & JavaDocs</h2>
122122
<div class="col-12 col-sm-6 col-lg-6" style="margin: 1.5rem 0rem;">
123123
<h3>Older Documentation</h2>
124124
<div class="list-group">
125+
<a href="./9.3.0/index.html" class="list-group-item list-group-item-action"
126+
aria-current="true">
127+
<div class="d-flex w-100 justify-content-between">
128+
<h5 class="mb-1"><i class="fa fa-book" style="margin-right: 0.5em"></i>9.3.0
129+
Documentation</h5>
130+
<small>December 2023</small>
131+
</div>
132+
</a>
125133
<a href="./9.2.0/index.html" class="list-group-item list-group-item-action"
126134
aria-current="true">
127135
<div class="d-flex w-100 justify-content-between">

0 commit comments

Comments
 (0)