Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 09:08:01 +01:00
Code Issues Projects Releases Wiki Activity

Update to MC 1.18.1

Browse Source
This commit is contained in:
Josh Roy 2021-12-10 14:09:16 -05:00 committed by MD
parent 41861a8551
commit dc27af78bf
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
View File

@ -34,9 +34,9 @@ public final class VersionUtil {
public static final BukkitVersion v1_16_5_R01 = BukkitVersion.fromString("1.16.5-R0.1-SNAPSHOT"); public static final BukkitVersion v1_16_5_R01 = BukkitVersion.fromString("1.16.5-R0.1-SNAPSHOT");
public static final BukkitVersion v1_17_R01 = BukkitVersion.fromString("1.17-R0.1-SNAPSHOT"); public static final BukkitVersion v1_17_R01 = BukkitVersion.fromString("1.17-R0.1-SNAPSHOT");
public static final BukkitVersion v1_17_1_R01 = BukkitVersion.fromString("1.17.1-R0.1-SNAPSHOT"); public static final BukkitVersion v1_17_1_R01 = BukkitVersion.fromString("1.17.1-R0.1-SNAPSHOT");
public static final BukkitVersion v1_18_R01 = BukkitVersion.fromString("1.18-R0.1-SNAPSHOT"); public static final BukkitVersion v1_18_1_R01 = BukkitVersion.fromString("1.18.1-R0.1-SNAPSHOT");
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_R01); 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);
private static final Map<String, SupportStatus> unsupportedServerClasses; private static final Map<String, SupportStatus> unsupportedServerClasses;

2
EssentialsDiscord/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
} }
implementation 'com.vdurmont:emoji-java:5.1.1' implementation 'com.vdurmont:emoji-java:5.1.1'
implementation 'club.minnced:discord-webhooks:0.7.2' implementation 'club.minnced:discord-webhooks:0.7.2'
compileOnly 'org.apache.logging.log4j:log4j-core:2.0-beta9' compileOnly 'org.apache.logging.log4j:log4j-core:2.15.0'
compileOnly 'me.clip:placeholderapi:2.10.9' compileOnly 'me.clip:placeholderapi:2.10.9'
} }

2
README.md
View File

@ -26,7 +26,7 @@ EssentialsX is almost a completely drop-in replacement for Essentials. However,
* **EssentialsX requires Java 8 or higher.** On older versions, the plugin may not work properly. * **EssentialsX requires Java 8 or higher.** On older versions, the plugin may not work properly.
* **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** * **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**
Support Support

2
build-logic/src/main/kotlin/constants.kt
View File

@ -1 +1 @@
const val RUN_PAPER_MINECRAFT_VERSION = "1.17.1" const val RUN_PAPER_MINECRAFT_VERSION = "1.18.1"

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

@ -10,7 +10,7 @@ plugins {
val baseExtension = extensions.create<EssentialsBaseExtension>("essentials", project) val baseExtension = extensions.create<EssentialsBaseExtension>("essentials", project)
val checkstyleVersion = "8.36.2" val checkstyleVersion = "8.36.2"
val spigotVersion = "1.18-R0.1-SNAPSHOT" val spigotVersion = "1.18.1-R0.1-SNAPSHOT"
val junit5Version = "5.7.0" val junit5Version = "5.7.0"
val mockitoVersion = "3.2.0" val mockitoVersion = "3.2.0"

2
providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflPersistentDataProvider.java
View File

@ -12,7 +12,7 @@ import java.lang.reflect.Field;
import java.util.Locale; import java.util.Locale;
/** /**
* Stores persistent data on 1.18-1.13 in a manner that's consistent with PDC on 1.14+ to enable * Stores persistent data on 1.8-1.13 in a manner that's consistent with PDC on 1.14+ to enable
* seamless upgrades. * seamless upgrades.
*/ */
public class ReflPersistentDataProvider implements PersistentDataProvider { public class ReflPersistentDataProvider implements PersistentDataProvider {

1
settings.gradle.kts
View File

@ -19,6 +19,7 @@ dependencyResolutionManagement {
} }
mavenCentral { mavenCentral {
content { includeGroup("net.kyori") } content { includeGroup("net.kyori") }
content { includeGroup("org.apache.logging.log4j") }
} }
} }
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)