From b5748eb32f962bc866a2013f678ea8da899365b7 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Sat, 1 Mar 2025 07:21:48 -0500 Subject: [PATCH 1/3] Update various dependencies (#6078) Mainly Configurate, JDA, and Adventure --- Essentials/build.gradle | 8 ++++---- EssentialsDiscord/build.gradle | 2 +- build-logic/build.gradle.kts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Essentials/build.gradle b/Essentials/build.gradle index 3b91c946ebf..d04d2800dca 100644 --- a/Essentials/build.gradle +++ b/Essentials/build.gradle @@ -10,12 +10,12 @@ dependencies { api 'io.papermc:paperlib:1.0.6' - implementation 'org.spongepowered:configurate-yaml:4.1.2' - implementation 'org.checkerframework:checker-qual:3.21.0' + implementation 'org.spongepowered:configurate-yaml:4.2.0' + implementation 'org.checkerframework:checker-qual:3.49.0' implementation 'nu.studer:java-ordered-properties:1.0.4' - implementation 'net.kyori:adventure-api:4.18.0' - implementation 'net.kyori:adventure-text-minimessage:4.18.0' + implementation 'net.kyori:adventure-api:4.19.0' + implementation 'net.kyori:adventure-text-minimessage:4.19.0' implementation 'net.kyori:adventure-platform-bukkit:4.3.4' // Providers diff --git a/EssentialsDiscord/build.gradle b/EssentialsDiscord/build.gradle index 854011f8da3..3fc6ee8064d 100644 --- a/EssentialsDiscord/build.gradle +++ b/EssentialsDiscord/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { compileOnly project(':EssentialsX') - implementation('net.dv8tion:JDA:5.1.2') { + implementation('net.dv8tion:JDA:5.3.0') { exclude(module: 'opus-java') } implementation 'com.github.MinnDevelopment:emoji-java:v6.1.0' diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index cf08d3dacf4..55f9b33098e 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -8,6 +8,6 @@ repositories { dependencies { implementation("net.kyori", "indra-common", "3.1.3") - implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.3") + implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6") implementation("xyz.jpenilla", "run-task", "2.3.1") } From 1531cf4146ee17e93a768c1f4b6abcb21a4ebdf4 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Sat, 1 Mar 2025 09:16:56 -0500 Subject: [PATCH 2/3] Fix exception sending a chat with discord module (#6075) We do not want or need to set the renderer, EssXChat or the server will do that. --- .../discord/listeners/PaperChatListener.java | 1 + .../provider/providers/PaperChatListenerProvider.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java index 6f5588fe450..ed178ba6b24 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java @@ -12,6 +12,7 @@ public class PaperChatListener extends PaperChatListenerProvider { private final JDADiscordService jda; public PaperChatListener(JDADiscordService jda) { + super(false); this.jda = jda; } diff --git a/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java b/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java index 87968213a99..282e548fe93 100644 --- a/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java +++ b/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java @@ -14,10 +14,16 @@ import java.util.Map; public abstract class PaperChatListenerProvider implements Listener { + private final boolean formatParsing; private final LegacyComponentSerializer serializer; private final Map eventMap = new IdentityHashMap<>(); public PaperChatListenerProvider() { + this(true); + } + + public PaperChatListenerProvider(final boolean formatParsing) { + this.formatParsing = formatParsing; this.serializer = LegacyComponentSerializer.builder() .flattener(ComponentFlattener.basic()) .extractUrls(AbstractChatEvent.URL_PATTERN) @@ -59,6 +65,10 @@ public final void onHighest(final AsyncChatEvent event) { return; } + if (!formatParsing) { + return; + } + final TextComponent format = serializer.deserialize(paperChatEvent.getFormat()); final TextComponent eventMessage = serializer.deserialize(paperChatEvent.getMessage()); From 5bf158c1d44eeec272e6113382080e751fe82f47 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Sat, 1 Mar 2025 13:59:46 -0500 Subject: [PATCH 3/3] Fix negative playtime stat breaking /baltop (#6074) Unclear how this happens, possibly a division error? Fixes #6043 --- .../com/earth2me/essentials/commands/Commandbalancetop.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java index 6ded4a197aa..baba65c5722 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java @@ -128,12 +128,12 @@ public void run() { playtime = user.getBase().getStatistic(PLAY_ONE_TICK); } // Play time in seconds - final long playTimeSecs = playtime / 20; + final long playTimeSecs = Math.max(playtime / 20, 0); // Checking if player meets the requirements of minimum balance and minimum playtime to be listed in baltop list if ((ess.getSettings().showZeroBaltop() || balance.compareTo(BigDecimal.ZERO) > 0) && balance.compareTo(ess.getSettings().getBaltopMinBalance()) >= 0 && - playTimeSecs > ess.getSettings().getBaltopMinPlaytime()) { + playTimeSecs >= ess.getSettings().getBaltopMinPlaytime()) { newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("balanceTopLine", pos, entry.getValue().getDisplayName(), AdventureUtil.parsed(NumberUtil.displayCurrency(balance, ess))))); } pos++;