diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index e4717edc5..0a149bb78 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..6f084d7500d9de76604440bdcc582be1af04fc8c +index 0000000000000000000000000000000000000000..8dea71d371fb31b50da6b53b0f80030ed1c7c484 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,173 @@ @@ -113,8 +113,8 @@ index 0000000000000000000000000000000000000000..6f084d7500d9de76604440bdcc582be1 + + fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack" + ++ relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline")) + sequenceOf( -+ "org.jline:jline-terminal-jansi" to "jline", + "commons-codec:commons-codec" to "org.apache.commons.codec", + "commons-io:commons-io" to "org.apache.commons.io", + "it.unimi.dsi:fastutil" to "it.unimi", diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 7dce892dd..2f6a21304 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 6f084d7500d9de76604440bdcc582be1af04fc8c..d97e9ba4432fc87c84f9f128820ff741464e1e25 100644 +index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5150ffa86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,21 +18,24 @@ repositories { @@ -46,7 +46,7 @@ index 6f084d7500d9de76604440bdcc582be1af04fc8c..d97e9ba4432fc87c84f9f128820ff741 for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) @@ -83,7 +87,7 @@ relocation { - "org.jline:jline-terminal-jansi" to "jline", + sequenceOf( "commons-codec:commons-codec" to "org.apache.commons.codec", "commons-io:commons-io" to "org.apache.commons.io", - "it.unimi.dsi:fastutil" to "it.unimi",