zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge pull request #57 from d0by1/adventure-fix

Browse source 
Update adventure
This commit is contained in:
Frank van der Heijden 2022-08-22 14:58:15 +02:00 • committed by GitHub
commit 37ecfa0d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Bukkit/build.gradle.kts
View file

@ -14,14 +14,21 @@ base {
dependencies { dependencies {
implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}") implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}")
implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") {
implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") {
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") {
exclude("net.kyori", "adventure-api") exclude("net.kyori", "adventure-api")
} }
implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}") implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}")
implementation(project(":Common")) implementation(project(":Common"))
compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") {
exclude("net.kyori", "*")
}
} }
tasks.withType<ShadowJar> { tasks.withType<ShadowJar> {

9
Bungee/build.gradle.kts
View file

@ -18,8 +18,13 @@ repositories {
dependencies { dependencies {
implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}") implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}")
implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") {
implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") {
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") {
exclude("net.kyori", "adventure-api") exclude("net.kyori", "adventure-api")
} }

5
Common/build.gradle.kts
View file

@ -15,7 +15,10 @@ repositories {
} }
dependencies { dependencies {
compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") {
exclude("net.kyori", "adventure-api")
exclude("net.kyori", "adventure-text-minimessage")
}
compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}")
compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1")

4
buildSrc/src/main/kotlin/VersionConstants.kt
View file

@ -1,7 +1,7 @@
object VersionConstants { object VersionConstants {
const val cloudVersion = "1.8.0-SNAPSHOT" const val cloudVersion = "1.8.0-SNAPSHOT"
const val adventureVersion = "4.9.3" const val adventureVersion = "4.11.0"
const val adventurePlatformVersion = "4.0.1" const val adventurePlatformVersion = "4.1.2"
const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT"
const val bstatsVersion = "3.0.0" const val bstatsVersion = "3.0.0"
} }