From 1efeff90269b5fc9b0b1c58ada3e27991f1a893a Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Sun, 21 Aug 2022 14:42:03 +0200 Subject: [PATCH 1/8] Start v3.5.4-SNAPSHOT --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 21d237f..d9bab11 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.4-SNAPSHOT" java { sourceCompatibility = JavaVersion.VERSION_1_8 From 990a50389642a6545426f329c8ab725ff41c8677 Mon Sep 17 00:00:00 2001 From: d0by Date: Sun, 21 Aug 2022 15:51:32 +0200 Subject: [PATCH 2/8] Update adventure --- Bukkit/build.gradle.kts | 13 ++++++++++--- Common/build.gradle.kts | 6 ++++-- buildSrc/src/main/kotlin/VersionConstants.kt | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) 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/Common/build.gradle.kts b/Common/build.gradle.kts index 3187980..1a52969 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -15,8 +15,10 @@ repositories { } dependencies { - compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") - compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") + compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") { + exclude("net.kyori", "adventure-api") + exclude("net.kyori", "adventure-text-minimessage") + } compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") testImplementation("net.kyori:adventure-text-serializer-plain:${VersionConstants.adventureVersion}") diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 42c9a55..6a888ce 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 adventureVersion = "4.11.0" + const val adventurePlatformVersion = "4.1.2" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val bstatsVersion = "3.0.0" } From a879b69f61cbf9c64c6137d4ab3264799a0babda Mon Sep 17 00:00:00 2001 From: d0by Date: Mon, 22 Aug 2022 13:21:50 +0200 Subject: [PATCH 3/8] Add minimessage to Common --- Common/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 1a52969..5290a6b 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { 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") testImplementation("net.kyori:adventure-text-serializer-plain:${VersionConstants.adventureVersion}") From 7b49addd51108c10f9a2e7a097b39904847ce526 Mon Sep 17 00:00:00 2001 From: d0by Date: Mon, 22 Aug 2022 14:51:29 +0200 Subject: [PATCH 4/8] Bungee exclusions --- Bungee/build.gradle.kts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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") } From a4ae9f9b940968082cc495eaa1a6b2ba3cbae2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Barbi=C4=87?= Date: Mon, 26 Dec 2022 08:46:04 +0100 Subject: [PATCH 5/8] Fix typo Fix uwp saying it started watching the plugin --- .../frankheijden/serverutils/common/managers/WatchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 9a779eed79bd2317b06f35ae0c7b6d284d72a089 Mon Sep 17 00:00:00 2001 From: multirp Date: Thu, 29 Dec 2022 16:27:07 -0500 Subject: [PATCH 6/8] 1.19.3 Support; Updated cloudCommand to 1.8.0 (#63) * Updated to MC1.19.3; updated cloudCommand to 1.8.0 * Delete Bukkit/bin/main directory * Delete Bungee/bin/main directory * Delete Velocity/bin directory * Delete Common/bin/main directory --- buildSrc/src/main/kotlin/VersionConstants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 6a888ce..3c4f43e 100644 --- a/buildSrc/src/main/kotlin/VersionConstants.kt +++ b/buildSrc/src/main/kotlin/VersionConstants.kt @@ -1,5 +1,5 @@ object VersionConstants { - const val cloudVersion = "1.8.0-SNAPSHOT" + 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" From 76f7f0792cdbb065596366245ed5b70654a9b163 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Thu, 29 Dec 2022 13:28:49 -0800 Subject: [PATCH 7/8] release 3.5.4 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d9bab11..4975245 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.4-SNAPSHOT" +version = "3.5.4" java { sourceCompatibility = JavaVersion.VERSION_1_8 From dfec660fc751ade57aefb10c012d08b082486eca Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Thu, 29 Dec 2022 13:35:07 -0800 Subject: [PATCH 8/8] start 3.5.5-SNAPSHOT --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4975245..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.4" +version = "3.5.5-SNAPSHOT" java { sourceCompatibility = JavaVersion.VERSION_1_8