From 28304307d3d6d179bfb48e2579a7865b351e9079 Mon Sep 17 00:00:00 2001 From: TheCrowStudios Date: Sun, 7 Sep 2025 12:34:57 +0100 Subject: [PATCH 1/2] resolve dependencies for compilation --- Bukkit/build.gradle.kts | 5 ++++- Bungee/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index b084459d..4fe23666 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -26,11 +26,14 @@ repositories { maven("https://ci.frostcast.net/plugin/repository/everything/") maven("https://jitpack.io/") maven("https://repo.extendedclip.com/content/repositories/placeholderapi/"); + maven { + url = uri("https://repo.dmulloy2.net/repository/public/") + } } dependencies { compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") - compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") { isTransitive = false } + compileOnly("com.comphenix.protocol:ProtocolLib:5.3.0") { isTransitive = false } compileOnly("me.confuser.banmanager:BanManagerCommon:7.6.0") { isTransitive = false } compileOnly("com.github.seancfoley:ipaddress:5.3.3") /* For BanManager */ diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index b2c5d4e9..ad28b9d6 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -27,7 +27,7 @@ repositories { } dependencies { - compileOnly("net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT") + compileOnly("net.md-5:bungeecord-api:1.16-R0.3") compileOnly("com.github.lucavinci:bungeeban:v2.7.0") { isTransitive = false } } diff --git a/build.gradle.kts b/build.gradle.kts index 4b1e12d0..a5f8306e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ allprojects { plugins.apply("java") java { - sourceCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 } repositories { From cd320228ceebbed0c65f7f142296e46063a5dbe0 Mon Sep 17 00:00:00 2001 From: TheCrowStudios Date: Sun, 7 Sep 2025 12:35:13 +0100 Subject: [PATCH 2/2] suppress console spam error --- .../bukkit/handlers/PaperEventHandler.java | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/handlers/PaperEventHandler.java b/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/handlers/PaperEventHandler.java index c0648de5..48de9bab 100644 --- a/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/handlers/PaperEventHandler.java +++ b/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/handlers/PaperEventHandler.java @@ -54,7 +54,8 @@ public void onServerListPing(ServerListPingEvent event) { protected abstract void setPlayerHover(PaperServerListPingEvent event, String playerHover); private void handlePaperServerListPing(final PaperServerListPingEvent event) { - if (bukkit.getCore() == null) return; // Too early, we haven't finished initializing yet + if (bukkit.getCore() == null) + return; // Too early, we haven't finished initializing yet StatusRequest request = bukkit.getCore().createRequest(event.getAddress()); request.setProtocolVersion(event.getClient().getProtocolVersion()); @@ -80,43 +81,51 @@ public Integer getMaxPlayers() { public int getProtocolVersion() { return event.getProtocolVersion(); } - } - ); + }); // Description String description = response.getDescription(); - if (description != null) event.setMotd(description); + if (description != null) + event.setMotd(description); // Version name String version = response.getVersion(); - if (version != null) event.setVersion(version); + if (version != null) + event.setVersion(version); // Protocol version Integer protocol = response.getProtocolVersion(); - if (protocol != null) event.setProtocolVersion(protocol); + if (protocol != null) + event.setProtocolVersion(protocol); if (response.hidePlayers()) { event.setHidePlayers(true); } else { // Online players Integer onlinePlayers = response.getOnlinePlayers(); - if (onlinePlayers != null) event.setNumPlayers(onlinePlayers); + if (onlinePlayers != null) + event.setNumPlayers(onlinePlayers); // Max players Integer maxPlayers = response.getMaxPlayers(); - if (maxPlayers != null) event.setMaxPlayers(maxPlayers); + if (maxPlayers != null) + event.setMaxPlayers(maxPlayers); // Player hover String playerHover = response.getPlayerHover(); - if (playerHover != null) setPlayerHover(event, playerHover); + if (playerHover != null) + setPlayerHover(event, playerHover); } // Favicon - FaviconSource favicon = response.getFavicon(); - if (favicon == FaviconSource.NONE) { - event.setServerIcon(null); - } else if (favicon != null) { - CachedServerIcon icon = bukkit.getFavicon(favicon); - if (icon != null) - event.setServerIcon(icon); + try { + FaviconSource favicon = response.getFavicon(); + if (favicon == FaviconSource.NONE) { + event.setServerIcon(null); + } else if (favicon != null) { + CachedServerIcon icon = bukkit.getFavicon(favicon); + if (icon != null) + event.setServerIcon(icon); + } + } catch (Exception ignore) { } }