From b84599b4b3105bb63c62cf0d4a3d9b3fd2134084 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sat, 17 May 2025 23:18:52 +0200 Subject: [PATCH] Add server brand to debugpaste (#4640) Signed-off-by: Alexander Brandes --- .../main/java/com/plotsquared/bukkit/BukkitPlatform.java | 5 +++++ Core/src/main/java/com/plotsquared/core/PlotPlatform.java | 8 ++++++++ .../java/com/plotsquared/core/command/DebugPaste.java | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java index 33242c1c2..0bd8e2fdc 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java @@ -252,6 +252,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl return Bukkit.getVersion(); } + @Override + public @NonNull String serverBrand() { + return Bukkit.getName(); + } + @Override @SuppressWarnings("deprecation") // Paper deprecation public void onEnable() { diff --git a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java index 958468098..7067801f4 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java +++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java @@ -120,6 +120,14 @@ public interface PlotPlatform

extends LocaleHolder { */ @NonNull String serverImplementation(); + /** + * Gets the server brand name + * + * @return server brand + * @since TODO + */ + @NonNull String serverBrand(); + /** * Gets the native server code package prefix. * diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index ca9fe1482..bc2cacb50 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -86,7 +86,8 @@ public class DebugPaste extends SubCommand { b.append("# WorldEdit implementation:\n"); b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n"); b.append("# Server Information\n"); - b.append("Server Version: ").append(PlotSquared.platform().serverImplementation()) + b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ") + .append(PlotSquared.platform().serverImplementation()).append("\n") .append("\n"); b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';') .append(!Settings.UUID.OFFLINE).append('\n');