diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index b906322..1a86c9e 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -14,14 +14,21 @@ base { dependencies { implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}") - implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") - implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") + implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { + 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}") { exclude("net.kyori", "adventure-api") } implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}") 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 { diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index 6df6fae..a49de7f 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -18,8 +18,13 @@ repositories { dependencies { implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}") - implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") - implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") + implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { + 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}") { exclude("net.kyori", "adventure-api") } diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 3187980..5290a6b 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -15,7 +15,10 @@ repositories { } 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("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java b/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java index 3fb8263..834b64f 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java @@ -63,7 +63,7 @@ public class WatchManager { PluginWatchResults watchResults = new PluginWatchResults(); for (String pluginId : task.pluginIds) { - watchResults.add(WatchResult.START, "plugin", pluginId); + watchResults.add(WatchResult.STOPPED, "plugin", pluginId); } return watchResults; } diff --git a/build.gradle.kts b/build.gradle.kts index 21d237f..22f6c5c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { group = "net.frankheijden.serverutils" val dependencyDir = "${group}.dependencies" -version = "3.5.3" +version = "3.5.5-SNAPSHOT" java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 42c9a55..3c4f43e 100644 --- a/buildSrc/src/main/kotlin/VersionConstants.kt +++ b/buildSrc/src/main/kotlin/VersionConstants.kt @@ -1,7 +1,7 @@ object VersionConstants { - const val cloudVersion = "1.8.0-SNAPSHOT" - const val adventureVersion = "4.9.3" - const val adventurePlatformVersion = "4.0.1" + const val cloudVersion = "1.8.0" + const val adventureVersion = "4.11.0" + const val adventurePlatformVersion = "4.1.2" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val bstatsVersion = "3.0.0" }