From fed6a350a80f6daa8c170770e5f300a0d5aa0894 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 26 Jun 2022 18:59:02 +0100 Subject: Include info about number of ticks in a profile --- .../main/java/me/lucko/spark/common/command/modules/SamplerModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spark-common/src/main/java/me/lucko/spark/common/command') diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java index 970d062..fd5cd67 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java @@ -266,7 +266,7 @@ public class SamplerModule implements CommandModule { if (this.activeSampler == null) { resp.replyPrefixed(text("There isn't an active profiler running.")); } else { - long timeout = this.activeSampler.getEndTime(); + long timeout = this.activeSampler.getAutoEndTime(); if (timeout == -1) { resp.replyPrefixed(text("There is an active profiler currently running, with no defined timeout.")); } else { -- cgit From d5d5cb10714b0993ec91d6a2b523b661c1314917 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 26 Jun 2022 19:19:49 +0100 Subject: Update adventure version --- spark-bukkit/build.gradle | 8 +------- spark-bungeecord/build.gradle | 8 +------- spark-common/build.gradle | 9 ++++++--- .../me/lucko/spark/common/command/modules/ActivityLogModule.java | 1 + 4 files changed, 9 insertions(+), 17 deletions(-) (limited to 'spark-common/src/main/java/me/lucko/spark/common/command') diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index 8e111e8..7144291 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -4,13 +4,7 @@ plugins { dependencies { implementation project(':spark-common') - implementation('me.lucko:adventure-platform-bukkit:4.9.4') { - exclude(module: 'adventure-api') - exclude(module: 'checker-qual') - exclude(module: 'annotations') - exclude(module: 'adventure-text-serializer-gson') - exclude(module: 'adventure-text-serializer-legacy') - } + implementation 'net.kyori:adventure-platform-bukkit:4.1.1' compileOnly 'com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT' // placeholders diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle index ccea89d..1e92621 100644 --- a/spark-bungeecord/build.gradle +++ b/spark-bungeecord/build.gradle @@ -4,13 +4,7 @@ plugins { dependencies { implementation project(':spark-common') - implementation('me.lucko:adventure-platform-bungeecord:4.9.4') { - exclude(module: 'adventure-api') - exclude(module: 'checker-qual') - exclude(module: 'annotations') - exclude(module: 'adventure-text-serializer-gson') - exclude(module: 'adventure-text-serializer-legacy') - } + implementation 'net.kyori:adventure-platform-bungeecord:4.1.1' compileOnly 'net.md-5:bungeecord-api:1.16-R0.4' } diff --git a/spark-common/build.gradle b/spark-common/build.gradle index 554eec2..bc493f3 100644 --- a/spark-common/build.gradle +++ b/spark-common/build.gradle @@ -15,15 +15,18 @@ dependencies { implementation 'com.squareup.okio:okio:1.17.3' implementation 'net.bytebuddy:byte-buddy-agent:1.11.0' implementation 'org.tukaani:xz:1.8' - api('net.kyori:adventure-api:4.9.3') { + api('net.kyori:adventure-api:4.11.0') { + exclude(module: 'adventure-bom') exclude(module: 'checker-qual') exclude(module: 'annotations') } - api('net.kyori:adventure-text-serializer-gson:4.9.3') { + api('net.kyori:adventure-text-serializer-gson:4.11.0') { + exclude(module: 'adventure-bom') exclude(module: 'adventure-api') exclude(module: 'gson') } - api('net.kyori:adventure-text-serializer-legacy:4.9.3') { + api('net.kyori:adventure-text-serializer-legacy:4.11.0') { + exclude(module: 'adventure-bom') exclude(module: 'adventure-api') } implementation('net.kyori:adventure-text-feature-pagination:4.0.0-SNAPSHOT') { diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java index b777f3e..6252ac7 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java @@ -50,6 +50,7 @@ import static net.kyori.adventure.text.format.TextDecoration.BOLD; public class ActivityLogModule implements CommandModule, RowRenderer { private final Pagination.Builder pagination = Pagination.builder() + .width(45) .renderer(new Renderer() { @Override public Component renderEmpty() { -- cgit