Skip to content

Commit c5253bc

Browse files
authored
Update to Minecraft 1.18.2 (#4821)
This PR updates the build setup to Gradle 7.4 and updates EssentialsX to Minecraft 1.18.2.
1 parent 29a2a86 commit c5253bc

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public final class VersionUtil {
3434
public static final BukkitVersion v1_16_5_R01 = BukkitVersion.fromString("1.16.5-R0.1-SNAPSHOT");
3535
public static final BukkitVersion v1_17_R01 = BukkitVersion.fromString("1.17-R0.1-SNAPSHOT");
3636
public static final BukkitVersion v1_17_1_R01 = BukkitVersion.fromString("1.17.1-R0.1-SNAPSHOT");
37-
public static final BukkitVersion v1_18_1_R01 = BukkitVersion.fromString("1.18.1-R0.1-SNAPSHOT");
37+
public static final BukkitVersion v1_18_2_R01 = BukkitVersion.fromString("1.18.2-R0.1-SNAPSHOT");
3838

39-
private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_1_R01);
39+
private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01);
4040

4141
public static final boolean PRE_FLATTENING = VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01);
4242

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EssentialsX is almost a completely drop-in replacement for Essentials. However,
2626

2727
* **EssentialsX requires Java 8 or higher.** On older versions, the plugin may not work properly.
2828

29-
* **EssentialsX supports Minecraft versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, 1.16.5, 1.17.1, and 1.18.1.**
29+
* **EssentialsX supports Minecraft versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, 1.16.5, 1.17.1, and 1.18.2.**
3030

3131

3232
Support

build-logic/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
implementation("net.kyori", "indra-common", "2.0.6")
11-
implementation("gradle.plugin.com.github.jengelman.gradle.plugins", "shadow", "7.0.0")
12-
implementation("xyz.jpenilla", "run-paper", "1.0.4")
10+
implementation("net.kyori", "indra-common", "2.1.1")
11+
implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2")
12+
implementation("xyz.jpenilla", "run-paper", "1.0.6")
1313
}

build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
val baseExtension = extensions.create<EssentialsBaseExtension>("essentials", project)
1111

1212
val checkstyleVersion = "8.36.2"
13-
val spigotVersion = "1.18.1-R0.1-SNAPSHOT"
13+
val spigotVersion = "1.18.2-R0.1-SNAPSHOT"
1414
val junit5Version = "5.7.0"
1515
val mockitoVersion = "3.2.0"
1616

@@ -121,4 +121,4 @@ indra {
121121
}
122122

123123
// undo https://github.com/KyoriPowered/indra/blob/master/indra-common/src/main/kotlin/net/kyori/indra/IndraPlugin.kt#L57
124-
convention.getPlugin<BasePluginConvention>().archivesBaseName = project.name
124+
extensions.getByType<BasePluginExtension>().archivesName.set(project.name)

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)