diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 697755cc..d5ee964f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,8 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -com-mojang-authlib = "6.0.54" +com-mojang-authlib-old = "3.5.41" +com-mojang-authlib-new = "6.0.54" commons-lang-commons-lang = "2.6" io-netty-netty-buffer = "4.1.90.Final" io-netty-netty-codec = "4.1.90.Final" @@ -21,7 +22,8 @@ junit-jupiter-version = "5.9.3" mockito-version = "5.12.0" [libraries] -com-mojang-authlib = { module = "com.mojang:authlib", version.ref = "com-mojang-authlib" } +com-mojang-authlib-old = { module = "com.mojang:authlib", version.ref = "com-mojang-authlib-old" } +com-mojang-authlib-new = { module = "com.mojang:authlib", version.ref = "com-mojang-authlib-new" } commons-lang-commons-lang = { module = "commons-lang:commons-lang", version.ref = "commons-lang-commons-lang" } io-netty-netty-buffer = { module = "io.netty:netty-buffer", version.ref = "io-netty-netty-buffer" } io-netty-netty-codec = { module = "io.netty:netty-codec", version.ref = "io-netty-netty-codec" } diff --git a/nms/v1_17_R1/build.gradle.kts b/nms/v1_17_R1/build.gradle.kts index 91c4e379..8571af8b 100644 --- a/nms/v1_17_R1/build.gradle.kts +++ b/nms/v1_17_R1/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.17.1-R0.1-SNAPSHOT" description = "v1_17_R1" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_18_R1/build.gradle.kts b/nms/v1_18_R1/build.gradle.kts index ee381726..c765e9b8 100644 --- a/nms/v1_18_R1/build.gradle.kts +++ b/nms/v1_18_R1/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.18.1-R0.1-SNAPSHOT" description = "v1_18_R1" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_18_R2/build.gradle.kts b/nms/v1_18_R2/build.gradle.kts index c494d8dd..58178158 100644 --- a/nms/v1_18_R2/build.gradle.kts +++ b/nms/v1_18_R2/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.18.2-R0.1-SNAPSHOT" description = "v1_18_R2" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_19_R1/build.gradle.kts b/nms/v1_19_R1/build.gradle.kts index ad64c1d5..f9200780 100644 --- a/nms/v1_19_R1/build.gradle.kts +++ b/nms/v1_19_R1/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.19.1-R0.1-SNAPSHOT" description = "v1_19_R1" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_19_R2/build.gradle.kts b/nms/v1_19_R2/build.gradle.kts index f5fd2a29..5ec1e58b 100644 --- a/nms/v1_19_R2/build.gradle.kts +++ b/nms/v1_19_R2/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.19.3-R0.1-SNAPSHOT" description = "v1_19_R2" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_19_R3/build.gradle.kts b/nms/v1_19_R3/build.gradle.kts index 32b8dceb..1d959227 100644 --- a/nms/v1_19_R3/build.gradle.kts +++ b/nms/v1_19_R3/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.19.4-R0.1-SNAPSHOT" description = "v1_19_R3" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_20_R1/build.gradle.kts b/nms/v1_20_R1/build.gradle.kts index c7785e89..4856ae8a 100644 --- a/nms/v1_20_R1/build.gradle.kts +++ b/nms/v1_20_R1/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.20-R0.1-SNAPSHOT" description = "v1_20_R1" + +dependencies { + compileOnly(libs.com.mojang.authlib.old) +} diff --git a/nms/v1_20_R2/build.gradle.kts b/nms/v1_20_R2/build.gradle.kts index 3b9385c1..fb0ae7e3 100644 --- a/nms/v1_20_R2/build.gradle.kts +++ b/nms/v1_20_R2/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.20.2-R0.1-SNAPSHOT" description = "v1_20_R2" + +dependencies { + compileOnly(libs.com.mojang.authlib.new) +} diff --git a/nms/v1_20_R3/build.gradle.kts b/nms/v1_20_R3/build.gradle.kts index eb0fda5c..43a096df 100644 --- a/nms/v1_20_R3/build.gradle.kts +++ b/nms/v1_20_R3/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.20.3-R0.1-SNAPSHOT" description = "v1_20_R3" + +dependencies { + compileOnly(libs.com.mojang.authlib.new) +} diff --git a/nms/v1_20_R4/build.gradle.kts b/nms/v1_20_R4/build.gradle.kts index 2312f7e0..4c73ad23 100644 --- a/nms/v1_20_R4/build.gradle.kts +++ b/nms/v1_20_R4/build.gradle.kts @@ -7,3 +7,7 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.20.6-R0.1-SNAPSHOT" description = "v1_20_R4" + +dependencies { + compileOnly(libs.com.mojang.authlib.new) +} diff --git a/nms/v1_21_R1/build.gradle.kts b/nms/v1_21_R1/build.gradle.kts index 2f3ef310..2e8ca20f 100644 --- a/nms/v1_21_R1/build.gradle.kts +++ b/nms/v1_21_R1/build.gradle.kts @@ -6,4 +6,8 @@ apply(from = rootProject.file("nms/nmsModule.gradle")) extra["craftbukkitVersion"] = "1.21-R0.1-SNAPSHOT"; -description = "v1_21_R1" \ No newline at end of file +description = "v1_21_R1" + +dependencies { + compileOnly(libs.com.mojang.authlib.new) +} \ No newline at end of file diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index a545cb3c..fb2a4bf2 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compileOnly(libs.io.netty.netty.buffer) compileOnly(libs.io.netty.netty.codec) compileOnly(libs.commons.lang.commons.lang) - compileOnly(libs.com.mojang.authlib) + compileOnly(libs.com.mojang.authlib.new) compileOnly(libs.org.spigotmc.spigot.api) compileOnly(libs.com.retro.packetevents) compileOnly(libs.libsdisguises.minimessage) diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index e53adac4..89440a5b 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { compileOnly(libs.org.spigotmc.spigot) compileOnly(libs.org.spigotmc.spigot.api) - compileOnly(libs.com.mojang.authlib) + compileOnly(libs.com.mojang.authlib.new) compileOnly(libs.io.papermc.paper.paper.api) compileOnly(libs.io.netty.netty.buffer) compileOnly(libs.com.retro.packetevents)