From eebcd49cb806e1681a8990f3066d0d14158082e7 Mon Sep 17 00:00:00 2001 From: Zak Shearman <34372536+ZakShearman@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:39:21 +0100 Subject: [PATCH] Update protos, add fleet to current server cmd --- build.gradle.kts | 2 +- .../command/currentserver/CurrentServerCommand.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ee9453c..d3fd483 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { // APIs api("dev.emortal.api:module-system:1.0.0") api("dev.emortal.api:agones-sdk:1.0.7") - api("dev.emortal.api:common-proto-sdk:fa39fcf") + api("dev.emortal.api:common-proto-sdk:dd3214d") api("dev.emortal.api:live-config-parser:e1f5d21") api("io.kubernetes:client-java:18.0.1") diff --git a/src/main/java/dev/emortal/minestom/core/module/kubernetes/command/currentserver/CurrentServerCommand.java b/src/main/java/dev/emortal/minestom/core/module/kubernetes/command/currentserver/CurrentServerCommand.java index ad18be8..d516a09 100644 --- a/src/main/java/dev/emortal/minestom/core/module/kubernetes/command/currentserver/CurrentServerCommand.java +++ b/src/main/java/dev/emortal/minestom/core/module/kubernetes/command/currentserver/CurrentServerCommand.java @@ -24,7 +24,8 @@ public final class CurrentServerCommand extends Command { private static final String MESSAGE = """ Proxy: - Server: """; + Server: + Fleet: """; private static final String COPY_MESSAGE = """ Proxy: %s Server: %s @@ -60,8 +61,9 @@ private void onExecute(@NotNull CommandSender sender, @NotNull CommandContext co var serverId = Placeholder.unparsed("server_id", currentServer.getServerId()); var proxyId = Placeholder.unparsed("proxy_id", currentServer.getProxyId()); + var fleetId = Placeholder.unparsed("fleet_id", currentServer.getFleetName()); - var message = MiniMessage.miniMessage().deserialize(MESSAGE, serverId, proxyId) + var message = MiniMessage.miniMessage().deserialize(MESSAGE, serverId, proxyId, fleetId) .clickEvent(ClickEvent.copyToClipboard(this.createCopyableData(currentServer, player))) .hoverEvent(HoverEvent.showText(Component.text("Click to copy", NamedTextColor.GREEN))); sender.sendMessage(message);