From 108d31ee54962e5935c88cb1d1cc73363d81cb0b Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 12 Nov 2024 14:17:14 +1300 Subject: [PATCH] Change resolution of dependencies for nms --- build.gradle.kts | 1 - nms/nmsModule.gradle | 10 +++++++--- nms/v1_17_R1/build.gradle.kts | 3 --- nms/v1_18_R1/build.gradle.kts | 3 --- nms/v1_18_R2/build.gradle.kts | 3 --- nms/v1_19_R1/build.gradle.kts | 3 --- nms/v1_19_R2/build.gradle.kts | 3 --- nms/v1_19_R3/build.gradle.kts | 3 --- nms/v1_20_R1/build.gradle.kts | 3 --- nms/v1_20_R2/build.gradle.kts | 3 --- nms/v1_20_R3/build.gradle.kts | 3 --- nms/v1_20_R4/build.gradle.kts | 3 --- nms/v1_21_R1/build.gradle.kts | 3 --- nms/v1_21_R2/build.gradle.kts | 3 --- 14 files changed, 7 insertions(+), 40 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c924895f..1c3a2689 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,6 @@ plugins { subprojects { repositories { mavenCentral() - mavenLocal() maven { url = uri("https://repo.md-5.net/content/groups/public/") diff --git a/nms/nmsModule.gradle b/nms/nmsModule.gradle index cd56bcfb..510ecff8 100644 --- a/nms/nmsModule.gradle +++ b/nms/nmsModule.gradle @@ -11,9 +11,13 @@ ext { remapServerCode = true } -dependencies { - implementation project(':shared') - afterEvaluate { +afterEvaluate { + dependencies { + implementation project(':shared') + compileOnly libs.io.netty.netty.buffer + compileOnly libs.it.unimi.dsi.fastutil + compileOnly libs.com.mojang.datafixerupper + if (remapServerCode) { implementation "org.spigotmc:spigot:${craftbukkitVersion}:remapped-mojang" } else { diff --git a/nms/v1_17_R1/build.gradle.kts b/nms/v1_17_R1/build.gradle.kts index 76151fde..75115136 100644 --- a/nms/v1_17_R1/build.gradle.kts +++ b/nms/v1_17_R1/build.gradle.kts @@ -10,7 +10,4 @@ description = "v1_17_R1" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } \ No newline at end of file diff --git a/nms/v1_18_R1/build.gradle.kts b/nms/v1_18_R1/build.gradle.kts index 19b41dd0..c14458a1 100644 --- a/nms/v1_18_R1/build.gradle.kts +++ b/nms/v1_18_R1/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_18_R1" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_18_R2/build.gradle.kts b/nms/v1_18_R2/build.gradle.kts index ae6ca5aa..69b0ed47 100644 --- a/nms/v1_18_R2/build.gradle.kts +++ b/nms/v1_18_R2/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_18_R2" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_19_R1/build.gradle.kts b/nms/v1_19_R1/build.gradle.kts index f20e501d..040c5179 100644 --- a/nms/v1_19_R1/build.gradle.kts +++ b/nms/v1_19_R1/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_19_R1" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_19_R2/build.gradle.kts b/nms/v1_19_R2/build.gradle.kts index a890d704..702c84c9 100644 --- a/nms/v1_19_R2/build.gradle.kts +++ b/nms/v1_19_R2/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_19_R2" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_19_R3/build.gradle.kts b/nms/v1_19_R3/build.gradle.kts index 626a7665..cee1de08 100644 --- a/nms/v1_19_R3/build.gradle.kts +++ b/nms/v1_19_R3/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_19_R3" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_20_R1/build.gradle.kts b/nms/v1_20_R1/build.gradle.kts index 249a9077..eee4460e 100644 --- a/nms/v1_20_R1/build.gradle.kts +++ b/nms/v1_20_R1/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_20_R1" dependencies { compileOnly(libs.com.mojang.authlib.old) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_20_R2/build.gradle.kts b/nms/v1_20_R2/build.gradle.kts index e65104a6..119ac219 100644 --- a/nms/v1_20_R2/build.gradle.kts +++ b/nms/v1_20_R2/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_20_R2" dependencies { compileOnly(libs.com.mojang.authlib.new) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_20_R3/build.gradle.kts b/nms/v1_20_R3/build.gradle.kts index 401fd46e..4dde680d 100644 --- a/nms/v1_20_R3/build.gradle.kts +++ b/nms/v1_20_R3/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_20_R3" dependencies { compileOnly(libs.com.mojang.authlib.new) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_20_R4/build.gradle.kts b/nms/v1_20_R4/build.gradle.kts index d39036c1..c5b09883 100644 --- a/nms/v1_20_R4/build.gradle.kts +++ b/nms/v1_20_R4/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_20_R4" dependencies { compileOnly(libs.com.mojang.authlib.new) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_21_R1/build.gradle.kts b/nms/v1_21_R1/build.gradle.kts index 489e20b4..87d1d4e0 100644 --- a/nms/v1_21_R1/build.gradle.kts +++ b/nms/v1_21_R1/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_21_R1" dependencies { compileOnly(libs.com.mojang.authlib.new) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java { diff --git a/nms/v1_21_R2/build.gradle.kts b/nms/v1_21_R2/build.gradle.kts index c56d15df..423ecf02 100644 --- a/nms/v1_21_R2/build.gradle.kts +++ b/nms/v1_21_R2/build.gradle.kts @@ -10,9 +10,6 @@ description = "v1_21_R2" dependencies { compileOnly(libs.com.mojang.authlib.new) - compileOnly(libs.io.netty.netty.buffer) - compileOnly(libs.it.unimi.dsi.fastutil) - compileOnly(libs.com.mojang.datafixerupper) } java {