8000 Fixed 1.18 linking issues in tests. Changed all 1.18 modules to targe… · CommandAPI/CommandAPI@41cda5b · GitHub
[go: up one dir, main page]
Skip to content

Commit 41cda5b

Browse files
JorelAliJorelAli
committed
Fixed 1.18 linking issues in tests. Changed all 1.18 modules to target 1.18.1 instead
1 parent a0dede3 commit 41cda5b

File tree

5 files changed

+10
-14
lines changed
  • commandapi-platforms/commandapi-bukkit

5 files changed

+10
-14
lines changed

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18/pom.xml

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

3030
<properties>
31-
<minecraft.mappings>1.18-R0.1-SNAPSHOT</minecraft.mappings>
31+
<minecraft.mappings>1.18.1-R0.1-SNAPSHOT</minecraft.mappings>
3232
<spigot.version>1.18.1-R0.1-SNAPSHOT</spigot.version>
33+
<paper.version>1.18.1-R0.1-SNAPSHOT</paper.version>
3334
</properties>
3435

3536
<repositories>

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.18/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
<artifactId>commandapi-bukkit-test-impl-1.18</artifactId>
3434

3535
<properties>
36-
<minecraft.mappings>1.18-R0.1-SNAPSHOT</minecraft.mappings>
37-
<spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
36+
<minecraft.mappings>1.18.1-R0.1-SNAPSHOT</minecraft.mappings>
37+
<spigot.version>1.18.1-R0.1-SNAPSHOT</spigot.version>
38+
<paper.version>1.18.1-R0.1-SNAPSHOT</paper.version>
3839
</properties>
3940

4041
<repositories>

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.18/src/main/java/dev/jorel/commandapi/test/Enums.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,6 @@ public Biome[] getBiomes() {
15931593
Biome.FOREST,
15941594
Biome.TAIGA,
15951595
Biome.SWAMP,
1596-
Biome.MANGROVE_SWAMP,
15971596
Biome.RIVER,
15981597
Biome.NETHER_WASTES,
15991598
Biome.THE_END,
@@ -1642,7 +1641,6 @@ public Biome[] getBiomes() {
16421641
Biome.BASALT_DELTAS,
16431642
Biome.DRIPSTONE_CAVES,
16441643
Biome.LUSH_CAVES,
1645-
Biome.DEEP_DARK,
16461644
Biome.MEADOW,
16471645
Biome.GROVE,
16481646
Biome.SNOWY_SLOPES,

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.18/src/main/java/dev/jorel/commandapi/test/MockNMS.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,6 @@ public Collection<String> getCriteria() {
458458
throw new IllegalStateException("getDisplay is unimplemented");
459459
}
460460

461-
@Override
462-
public @NotNull Component displayName() {
463-
throw new IllegalStateException("displayName is unimplemented");
464-
}
465-
466461
@Override
467462
public org.bukkit.advancement.@Nullable Advancement getParent() {
468463
throw new IllegalStateException("getParent is unimplemented");

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
</dependencies>
262262
</profile>
263263
<profile>
264+
<!-- Yes, this is a very very misleading version of Minecraft. We're actually testing 1.18.1 -->
264265
<id>Minecraft_1_18</id>
265266
<dependencies>
266267
<dependency>
@@ -275,15 +276,15 @@
275276
</dependency>
276277
<!-- For reasons beyond my knowledge right now, including paper
277278
1.18 blows things up and causes every test to fail! -->
278-
<!-- <dependency>
279+
<dependency>
279280
<groupId>io.papermc.paper</groupId>
280281
<artifactId>paper-api</artifactId>
281-
<version>1.18-R0.1-SNAPSHOT</version>
282-
</dependency> -->
282+
<version>1.18.1-R0.1-SNAPSHOT</version>
283+
</dependency>
283284
<dependency>
284285
<groupId>org.spigotmc</groupId>
285286
<artifactId>spigot</artifactId>
286-
<version>1.18-R0.1-SNAPSHOT</version>
287+
<version>1.18.1-R0.1-SNAPSHOT</version>
287288
<scope>provided</scope>
288289
</dependency>
289290
</dependencies>

0 commit comments

Comments
 (0)
0