From a8c70933e77660cdea05dafc5eb8b4a30c50a9c5 Mon Sep 17 00:00:00 2001 From: Focusvity Date: Wed, 5 Nov 2025 18:34:12 +1100 Subject: [PATCH] Uplift Paper version to 1.21.10 Use the ListedPlayer method to set messages under online players for the server list Upgrade Gradle to 9.2.0 Update the getBuildNumber function in build.gradle.kts to use non-deprecated method to fetch build numbers --- build.gradle.kts | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- server/build.gradle.kts | 28 ++++++++----------- .../plex/listener/impl/ServerListener.java | 12 +++++--- .../main/java/dev/plex/util/PlexUtils.java | 6 +--- 5 files changed, 24 insertions(+), 28 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6c3410a..df106c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,11 @@ plugins { id("maven-publish") id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10" id("net.kyori.blossom") version "2.1.0" - id("com.gradleup.shadow") version "9.0.0-rc1" + id("com.gradleup.shadow") version "9.2.2" } group = "dev.plex" -version = "1.5" +version = "1.6" description = "Plex" subprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..bad7c24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 8043ab0..c75ea72 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -1,5 +1,4 @@ import net.minecrell.pluginyml.paper.PaperPluginDescription -import java.io.ByteArrayOutputStream import java.text.SimpleDateFormat import java.util.* @@ -14,15 +13,15 @@ repositories { } dependencies { - library("org.projectlombok:lombok:1.18.38") - library("org.json:json:20250107") - library("commons-io:commons-io:2.19.0") - library("redis.clients:jedis:6.0.0") - library("org.mariadb.jdbc:mariadb-java-client:3.5.4") - library("com.zaxxer:HikariCP:6.3.0") + library("org.projectlombok:lombok:1.18.42") + library("org.json:json:20250517") + library("commons-io:commons-io:2.20.0") + library("redis.clients:jedis:7.0.0") + library("org.mariadb.jdbc:mariadb-java-client:3.5.6") + library("com.zaxxer:HikariCP:6.3.3") library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.24") library("org.jetbrains:annotations:26.0.2") - compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude("org.bukkit", "bukkit") } @@ -34,7 +33,7 @@ dependencies { implementation("org.bstats:bstats-bukkit:3.1.0") - annotationProcessor("org.projectlombok:lombok:1.18.38") + annotationProcessor("org.projectlombok:lombok:1.18.42") } group = rootProject.group @@ -94,17 +93,14 @@ paper { } fun getBuildNumber(): String { - val stdout = ByteArrayOutputStream() - try { - exec { + return try { + providers.exec { commandLine("git", "rev-list", "HEAD", "--count") - standardOutput = stdout - isIgnoreExitValue = true - } + }.standardOutput.asText.get().trim() } catch (e: GradleException) { logger.error("Couldn't determine build number because Git is not installed. " + e.message) + "unknown" } - return if (stdout.size() > 0) stdout.toString().trim() else "unknown" } tasks { diff --git a/server/src/main/java/dev/plex/listener/impl/ServerListener.java b/server/src/main/java/dev/plex/listener/impl/ServerListener.java index 4366916..76ffaaa 100644 --- a/server/src/main/java/dev/plex/listener/impl/ServerListener.java +++ b/server/src/main/java/dev/plex/listener/impl/ServerListener.java @@ -1,9 +1,12 @@ package dev.plex.listener.impl; import com.destroystokyo.paper.event.server.PaperServerListPingEvent; +import com.destroystokyo.paper.event.server.PaperServerListPingEvent.ListedPlayerInfo; import dev.plex.listener.PlexListener; import dev.plex.util.PlexUtils; import dev.plex.util.RandomUtil; +import java.util.List; +import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; @@ -32,15 +35,16 @@ public class ServerListener extends PlexListener { event.motd(PlexUtils.mmDeserialize(baseMotd.trim())); } - /* - Broken on 1.20.6 + if (plugin.config.contains("server.sample")) { List samples = plugin.config.getStringList("server.sample"); if (!samples.isEmpty()) { - event.getPlayerSample().clear(); - event.getPlayerSample().addAll(samples.stream().map(string -> string.replace("&", "§")).map(Bukkit::createProfile).toList()); + event.getListedPlayers().clear(); + event.getListedPlayers().addAll(samples.stream().map(string -> string.replace("&", "§")) + .map(str -> new ListedPlayerInfo(str, UUID.randomUUID())).toList()); } - }*/ + } } } diff --git a/server/src/main/java/dev/plex/util/PlexUtils.java b/server/src/main/java/dev/plex/util/PlexUtils.java index f617cfa..b2084e4 100644 --- a/server/src/main/java/dev/plex/util/PlexUtils.java +++ b/server/src/main/java/dev/plex/util/PlexUtils.java @@ -119,11 +119,7 @@ public class PlexUtils implements PlexBase public static boolean hasVanishPlugin() { - if (Bukkit.getPluginManager().isPluginEnabled("SuperVanish") || Bukkit.getPluginManager().isPluginEnabled("PremiumVanish")) - { - return true; - } - return false; + return Bukkit.getPluginManager().isPluginEnabled("SuperVanish") || Bukkit.getPluginManager().isPluginEnabled("PremiumVanish"); } public static boolean isPluginCMD(String cmd, String pluginName)