From 753aeb6dc1cce3b75340b893119de50f3641d99b Mon Sep 17 00:00:00 2001 From: TDSTOS Date: Sun, 12 Apr 2026 20:38:23 +0200 Subject: [PATCH] Display variant and style in UI and Discord Include the configured lunarclient.variantName in the game start Discord embed and expose both the lunar variant and the player's selected playstyle on the lobby/ingame scoreboards. Added placeholders to language file for variant and style. Files changed: GameManager.kt, ScoreboardManager.kt, and en_US.yml. --- src/main/kotlin/club/mcscrims/speedhg/game/GameManager.kt | 4 +++- .../club/mcscrims/speedhg/scoreboard/ScoreboardManager.kt | 7 +++++-- src/main/resources/languages/en_US.yml | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/GameManager.kt b/src/main/kotlin/club/mcscrims/speedhg/game/GameManager.kt index a1ec7a6..42e9d79 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/GameManager.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/GameManager.kt @@ -226,8 +226,10 @@ class GameManager( player.sendMsg( "game.invincibility-start", "time" to invincibilityTime.toString() ) } + val variantName = plugin.config.getString( "lunarclient.variantName" ) + plugin.discordWebhookManager.broadcastEmbed( - title = "🎮 Spiel gestartet!", + title = "🎮 Spiel gestartet! (${variantName})", description = "Eine neue Runde SpeedHG mit **${Bukkit.getOnlinePlayers().size}** Spielern hat begonnen!", colorHex = 0x55FF55 // Grün ) diff --git a/src/main/kotlin/club/mcscrims/speedhg/scoreboard/ScoreboardManager.kt b/src/main/kotlin/club/mcscrims/speedhg/scoreboard/ScoreboardManager.kt index 0afcea6..7f89c5f 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/scoreboard/ScoreboardManager.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/scoreboard/ScoreboardManager.kt @@ -65,7 +65,10 @@ class ScoreboardManager( val online = Bukkit.getOnlinePlayers().size.toString() val max = Bukkit.getMaxPlayers().toString() + val variantName = plugin.config.getString( "lunarclient.variantName" ).toString() + val kitName = plugin.kitManager.getSelectedKit( player )?.displayName ?: Component.text( "None" ) + val styleName = plugin.kitManager.getSelectedPlaystyle( player ).displayName val stats = plugin.statsManager.getCachedStats( player.uniqueId ) val score = stats?.scrimScore ?: 0 @@ -80,7 +83,7 @@ class ScoreboardManager( lines = plugin.languageManager.getMessageList( player, "scoreboard.lobby", - mapOf( "online" to online, "max" to max, "time" to timeString ), + mapOf( "online" to online, "max" to max, "time" to timeString, "style" to styleName, "variant" to variantName ), mapOf( "kit" to kitName, "rank" to rankComponent ) ) } @@ -93,7 +96,7 @@ class ScoreboardManager( lines = plugin.languageManager.getMessageList( player, "scoreboard.ingame", - mapOf( "timer" to timeString, "alive" to alive, "kills" to kills, "border" to border ), + mapOf( "timer" to timeString, "alive" to alive, "kills" to kills, "border" to border, "style" to styleName, "variant" to variantName ), mapOf( "kit" to kitName, "rank" to rankComponent ) ) } diff --git a/src/main/resources/languages/en_US.yml b/src/main/resources/languages/en_US.yml index fb565ac..2c21784 100644 --- a/src/main/resources/languages/en_US.yml +++ b/src/main/resources/languages/en_US.yml @@ -176,9 +176,11 @@ commands: scoreboard: title: 'SpeedHG' lobby: + - " " - " " - "Players: /" - "Kit: " + - "Style: