Upstream

FreshSMP · Mar 3, 2025 · 859b91c · 859b91c
2 parents 9e3b106 + 5bf158c
commit 859b91c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git 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/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++;

diff --git 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/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/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")
 }
diff --git a/...rs/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java b/...rs/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<AsyncChatEvent, PaperChatEvent> 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());