feat: admin target mode for /display on|off <player>

Author: arsmotorin

CHANGELOG.md

@@ -54,7 +54,7 @@ Plugin:
 - [x] Add translation for `/display list` command
 - [x] Improve `/display video` error feedback (separate invalid URL/not owner/wrong target block)
 - [x] Add total value output to `/display stats`
-- [ ] Add admin target mode for `/display on|off <player>`
+- [x] Add admin target mode for `/display on|off <player>`
 - [ ] Improve `/display reload` output with what was reloaded
 
 # Version 1.4.3

spigot/src/main/kotlin/com/dreamdisplays/Config.kt

@@ -221,6 +221,7 @@ class Config(private val plugin: Main) {
         val updates get() = permissions.updates
         val help get() = permissions.help
         val stats get() = permissions.stats
+        val toggleOthers get() = permissions.toggle_others
 
         data class PermissionsConfig(
             val create: String = "dreamdisplays.create",
@@ -233,6 +234,7 @@ class Config(private val plugin: Main) {
             val updates: String = "dreamdisplays.updates",
             val help: String = "dreamdisplays.help",
             val stats: String = "dreamdisplays.stats",
+            val toggle_others: String = "dreamdisplays.toggle.others",
         )
     }
 

spigot/src/main/kotlin/com/dreamdisplays/commands/subcommands/OffCommand.kt

@@ -1,28 +1,79 @@
 package com.dreamdisplays.commands.subcommands
 
+import com.dreamdisplays.Main
 import com.dreamdisplays.managers.PlayerManager.isDisplaysEnabled
 import com.dreamdisplays.managers.PlayerManager.setDisplaysEnabled
+import com.dreamdisplays.utils.Message.sendColoredMessage
 import com.dreamdisplays.utils.Message.sendMessage
 import com.dreamdisplays.utils.net.PacketUtils.sendDisplayEnabled
+import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class OffCommand : SubCommand {
 
     override val name = "off"
     override val permission: String? = null
-    override val playerOnly = true
+    override val playerOnly = false
 
     override fun execute(sender: CommandSender, args: Array<String?>) {
-        val player = (sender as? Player) ?: return
+        val target = resolveTarget(sender, args) ?: return
+        val selfTarget = sender is Player && sender.uniqueId == target.uniqueId
 
-        if (!isDisplaysEnabled(player)) {
-            sendMessage(player, "display.already-disabled")
+        if (!selfTarget && !sender.hasPermission(Main.config.permissions.toggleOthers)) {
+            sendMessage(sender, "displayCommandMissingPermission")
             return
         }
 
-        setDisplaysEnabled(player, false)
-        sendDisplayEnabled(player, false)
-        sendMessage(player, "display.disabled")
+        if (!isDisplaysEnabled(target)) {
+            sendMessage(target, "display.already-disabled")
+            if (!selfTarget) {
+                sendColoredMessage(sender, format(sender, "display.already-disabled.target", target.name))
+            }
+            return
+        }
+
+        setDisplaysEnabled(target, false)
+        sendDisplayEnabled(target, false)
+        sendMessage(target, "display.disabled")
+        if (!selfTarget) {
+            sendColoredMessage(sender, format(sender, "display.disabled.target", target.name))
+        }
+    }
+
+    override fun complete(sender: CommandSender, args: Array<String?>): List<String> {
+        if (args.size != 2) return emptyList()
+        if (!sender.hasPermission(Main.config.permissions.toggleOthers)) return emptyList()
+        return Bukkit.getOnlinePlayers().map { it.name }.sorted()
+    }
+
+    private fun resolveTarget(sender: CommandSender, args: Array<String?>): Player? {
+        if (args.size == 1) {
+            return sender as? Player ?: run {
+                sendMessage(sender, "displayWrongCommand")
+                null
+            }
+        }
+        if (args.size != 2) {
+            sendMessage(sender, "displayWrongCommand")
+            return null
+        }
+
+        val targetName = args[1]?.trim().orEmpty()
+        if (targetName.isBlank()) {
+            sendMessage(sender, "displayWrongCommand")
+            return null
+        }
+
+        val target = Bukkit.getPlayerExact(targetName)
+        if (target != null) return target
+
+        sendColoredMessage(sender, format(sender, "displayTargetNotFound", targetName))
+        return null
+    }
+
+    private fun format(sender: CommandSender, key: String, vararg values: Any): String {
+        val template = Main.config.getMessageForPlayer(sender as? Player, key) as? String ?: key
+        return runCatching { String.format(template, *values) }.getOrElse { template }
     }
 }

spigot/src/main/kotlin/com/dreamdisplays/commands/subcommands/OnCommand.kt

@@ -1,28 +1,79 @@
 package com.dreamdisplays.commands.subcommands
 
+import com.dreamdisplays.Main
 import com.dreamdisplays.managers.PlayerManager.isDisplaysEnabled
 import com.dreamdisplays.managers.PlayerManager.setDisplaysEnabled
+import com.dreamdisplays.utils.Message.sendColoredMessage
 import com.dreamdisplays.utils.Message.sendMessage
 import com.dreamdisplays.utils.net.PacketUtils.sendDisplayEnabled
+import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class OnCommand : SubCommand {
 
     override val name = "on"
     override val permission: String? = null
-    override val playerOnly = true
+    override val playerOnly = false
 
     override fun execute(sender: CommandSender, args: Array<String?>) {
-        val player = (sender as? Player) ?: return
+        val target = resolveTarget(sender, args) ?: return
+        val selfTarget = sender is Player && sender.uniqueId == target.uniqueId
 
-        if (isDisplaysEnabled(player)) {
-            sendMessage(player, "display.already-enabled")
+        if (!selfTarget && !sender.hasPermission(Main.config.permissions.toggleOthers)) {
+            sendMessage(sender, "displayCommandMissingPermission")
             return
         }
 
-        setDisplaysEnabled(player, true)
-        sendDisplayEnabled(player, true)
-        sendMessage(player, "display.enabled")
+        if (isDisplaysEnabled(target)) {
+            sendMessage(target, "display.already-enabled")
+            if (!selfTarget) {
+                sendColoredMessage(sender, format(sender, "display.already-enabled.target", target.name))
+            }
+            return
+        }
+
+        setDisplaysEnabled(target, true)
+        sendDisplayEnabled(target, true)
+        sendMessage(target, "display.enabled")
+        if (!selfTarget) {
+            sendColoredMessage(sender, format(sender, "display.enabled.target", target.name))
+        }
+    }
+
+    override fun complete(sender: CommandSender, args: Array<String?>): List<String> {
+        if (args.size != 2) return emptyList()
+        if (!sender.hasPermission(Main.config.permissions.toggleOthers)) return emptyList()
+        return Bukkit.getOnlinePlayers().map { it.name }.sorted()
+    }
+
+    private fun resolveTarget(sender: CommandSender, args: Array<String?>): Player? {
+        if (args.size == 1) {
+            return sender as? Player ?: run {
+                sendMessage(sender, "displayWrongCommand")
+                null
+            }
+        }
+        if (args.size != 2) {
+            sendMessage(sender, "displayWrongCommand")
+            return null
+        }
+
+        val targetName = args[1]?.trim().orEmpty()
+        if (targetName.isBlank()) {
+            sendMessage(sender, "displayWrongCommand")
+            return null
+        }
+
+        val target = Bukkit.getPlayerExact(targetName)
+        if (target != null) return target
+
+        sendColoredMessage(sender, format(sender, "displayTargetNotFound", targetName))
+        return null
+    }
+
+    private fun format(sender: CommandSender, key: String, vararg values: Any): String {
+        val template = Main.config.getMessageForPlayer(sender as? Player, key) as? String ?: key
+        return runCatching { String.format(template, *values) }.getOrElse { template }
     }
 }

spigot/src/main/resources/assets/dreamdisplays/lang/be.json

@@ -102,6 +102,11 @@
   "display.disabled": "&7D |&f Дысплеі адключаны",
   "display.already-disabled": "&7D |&f Дысплеі ўжо адключаны",
   "display.already-enabled": "&7D |&f Дысплеі ўжо ўключаны",
+  "displayTargetNotFound": "&7D |&f Гулец '%s' не знойдзены анлайн!",
+  "display.enabled.target": "&7D |&f Дысплеі ўключаны для %s",
+  "display.disabled.target": "&7D |&f Дысплеі адключаны для %s",
+  "display.already-enabled.target": "&7D |&f У %s дысплеі ўжо ўключаны",
+  "display.already-disabled.target": "&7D |&f У %s дысплеі ўжо адключаны",
   "displayStatsHeader": "&7D |&f Статыстыка выкарыстання моду:",
   "displayStatsEntry": "&7D |&f Версія %s: %d гульцоў",
   "displayStatsTotal": "&7D |&f Усяго гульцоў з модам: %d",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: Спіс усіх дысплеяў",
   "displayHelpStats": "– /display stats: Пакажыце статыстыку выкарыстання моду",
   "displayHelpReload": "– /display reload: Перазагрузіце канфігурацыю",
-  "displayHelpOn": "– /display on: Уключыце дысплеі",
-  "displayHelpOff": "– /display off: Адключыце дысплеі",
+  "displayHelpOn": "– /display on [гулец]: уключыць дысплеі сабе або абранаму гульцу",
+  "displayHelpOff": "– /display off [гулец]: адключыць дысплеі сабе або абранаму гульцу",
   "displayHelpHelp": "– /display help: Пакажыце гэтую даведку",
   "displayInfoHeader": "&7D |&f Інфармацыя пра дысплей:",
   "displayInfoOwnerLine": "&7D |&7 уладальнік=&f{0} &8| &7uuid=&f{1}",

spigot/src/main/resources/assets/dreamdisplays/lang/cs.json

@@ -102,6 +102,11 @@
   "display.disabled": "&7D |&f Displeje zakázány",
   "display.already-disabled": "&7D |&f Displeje jsou již zakázány",
   "display.already-enabled": "&7D |&f Displeje jsou již povoleny",
+  "displayTargetNotFound": "&7D |&f Hráč '%s' nebyl online nalezen!",
+  "display.enabled.target": "&7D |&f Displeje povoleny pro %s",
+  "display.disabled.target": "&7D |&f Displeje zakázány pro %s",
+  "display.already-enabled.target": "&7D |&f Displeje jsou pro %s již povoleny",
+  "display.already-disabled.target": "&7D |&f Displeje jsou pro %s již zakázány",
   "displayStatsHeader": "&7D |&f Statistiky používání modu:",
   "displayStatsEntry": "&7D |&f Verze %s: %d hráčů",
   "displayStatsTotal": "&7D |&f Celkem hráčů s modem: %d",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: Seznam všech displejů",
   "displayHelpStats": "– /display stats: Zobrazte statistiky používání modu",
   "displayHelpReload": "– /display reload: Znovu načtěte konfiguraci",
-  "displayHelpOn": "– /display on: Povolte displeje",
-  "displayHelpOff": "– /display off: Zakažte displeje",
+  "displayHelpOn": "– /display on [hráč]: povolte displeje sobě nebo vybranému hráči",
+  "displayHelpOff": "– /display off [hráč]: zakažte displeje sobě nebo vybranému hráči",
   "displayHelpHelp": "– /display help: Zobrazte tuto nápovědu",
   "displayInfoHeader": "&7D |&f Informace o displeji:",
   "displayInfoOwnerLine": "&7D |&7 vlastnik=&f{0} &8| &7uuid=&f{1}",

spigot/src/main/resources/assets/dreamdisplays/lang/de.json

@@ -102,6 +102,11 @@
   "display.disabled": "&7D |&f Displays deaktiviert",
   "display.already-disabled": "&7D |&f Displays sind bereits deaktiviert",
   "display.already-enabled": "&7D |&f Displays sind bereits aktiviert",
+  "displayTargetNotFound": "&7D |&f Spieler '%s' wurde online nicht gefunden!",
+  "display.enabled.target": "&7D |&f Displays für %s aktiviert",
+  "display.disabled.target": "&7D |&f Displays für %s deaktiviert",
+  "display.already-enabled.target": "&7D |&f Displays sind für %s bereits aktiviert",
+  "display.already-disabled.target": "&7D |&f Displays sind für %s bereits deaktiviert",
   "displayStatsHeader": "&7D |&f Mod-Nutzungsstatistiken:",
   "displayStatsEntry": "&7D |&f Version %s: %d Spieler",
   "displayStatsTotal": "&7D |&f Gesamt Spieler mit Mod: %d",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: Liste alle Displays auf",
   "displayHelpStats": "– /display stats: Zeige Mod-Nutzungsstatistiken",
   "displayHelpReload": "– /display reload: Lade die Konfiguration neu",
-  "displayHelpOn": "– /display on: Aktiviere Displays",
-  "displayHelpOff": "– /display off: Deaktiviere Displays",
+  "displayHelpOn": "– /display on [spieler]: Aktiviere Displays für dich oder einen Zielspieler",
+  "displayHelpOff": "– /display off [spieler]: Deaktiviere Displays für dich oder einen Zielspieler",
   "displayHelpHelp": "– /display help: Zeige diese Hilfe",
   "displayInfoHeader": "&7D |&f Display-Informationen:",
   "displayInfoOwnerLine": "&7D |&7 besitzer=&f{0} &8| &7uuid=&f{1}",

spigot/src/main/resources/assets/dreamdisplays/lang/en.json

@@ -102,6 +102,11 @@
   "display.disabled": "&7D |&f Displays disabled",
   "display.already-disabled": "&7D |&f Displays are already disabled",
   "display.already-enabled": "&7D |&f Displays are already enabled",
+  "displayTargetNotFound": "&7D |&f Player '%s' was not found online!",
+  "display.enabled.target": "&7D |&f Displays enabled for %s",
+  "display.disabled.target": "&7D |&f Displays disabled for %s",
+  "display.already-enabled.target": "&7D |&f Displays are already enabled for %s",
+  "display.already-disabled.target": "&7D |&f Displays are already disabled for %s",
   "displayStatsHeader": "&7D |&f Mod usage statistics:",
   "displayStatsEntry": "&7D |&f Version %s: %d players",
   "displayStatsTotal": "&7D |&f Total players with mod: %d",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: list all displays",
   "displayHelpStats": "– /display stats: show mod usage statistics",
   "displayHelpReload": "– /display reload: reload the configuration",
-  "displayHelpOn": "– /display on: enable displays",
-  "displayHelpOff": "– /display off: disable displays",
+  "displayHelpOn": "– /display on [player]: enable displays for yourself or a target player",
+  "displayHelpOff": "– /display off [player]: disable displays for yourself or a target player",
   "displayHelpHelp": "– /display help: show this help",
   "displayInfoHeader": "&7D |&f Display info:",
   "displayInfoOwnerLine": "&7D |&7 owner=&f{0} &8| &7uuid=&f{1}",

spigot/src/main/resources/assets/dreamdisplays/lang/he.json

@@ -102,6 +102,11 @@
   "display.disabled": "&7D |&f תצוגות מושבתות",
   "display.already-disabled": "&7D |&f התצוגות כבר מושבתות",
   "display.already-enabled": "&7D |&f התצוגות כבר מופעלות",
+  "displayTargetNotFound": "&7D |&f השחקן '%s' לא נמצא אונליין!",
+  "display.enabled.target": "&7D |&f התצוגות הופעלו עבור %s",
+  "display.disabled.target": "&7D |&f התצוגות הושבתו עבור %s",
+  "display.already-enabled.target": "&7D |&f התצוגות כבר מופעלות עבור %s",
+  "display.already-disabled.target": "&7D |&f התצוגות כבר מושבתות עבור %s",
   "displayStatsHeader": "&7D |&f סטטיסטיקות שימוש במוד:",
   "displayStatsEntry": "&7D |&f גרסה %s: %d שחקנים",
   "displayStatsTotal": "&7D |&f סה\"כ שחקנים עם מוד: %d",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: רשום את כל התצוגות",
   "displayHelpStats": "– /display stats: הצג סטטיסטיקות שימוש במוד",
   "displayHelpReload": "– /display reload: טען מחדש את התצורה",
-  "displayHelpOn": "– /display on: הפעל תצוגות",
-  "displayHelpOff": "– /display off: השבת תצוגות",
+  "displayHelpOn": "– /display on [player]: הפעל תצוגות לעצמך או לשחקן יעד",
+  "displayHelpOff": "– /display off [player]: השבת תצוגות לעצמך או לשחקן יעד",
   "displayHelpHelp": "– /display help: הצג עזרה זו",
   "displayInfoHeader": "&7D |&f מידע על התצוגה:",
   "displayInfoOwnerLine": "&7D |&7 בעלים=&f{0} &8| &7uuid=&f{1}",

spigot/src/main/resources/assets/dreamdisplays/lang/pl.json

@@ -99,6 +99,11 @@
   "display.disabled": "&7D |&f Wyświetlacze wyłączone",
   "display.already-disabled": "&7D |&f Wyświetlacze są już wyłączone",
   "display.already-enabled": "&7D |&f Wyświetlacze są już włączone",
+  "displayTargetNotFound": "&7D |&f Gracz '%s' nie został znaleziony online!",
+  "display.enabled.target": "&7D |&f Wyświetlacze włączone dla %s",
+  "display.disabled.target": "&7D |&f Wyświetlacze wyłączone dla %s",
+  "display.already-enabled.target": "&7D |&f Wyświetlacze są już włączone dla %s",
+  "display.already-disabled.target": "&7D |&f Wyświetlacze są już wyłączone dla %s",
   "displayWrongCommand": "&7D |&f Wprowadziłeś coś nieprawidłowego!",
   "displayCommandMissingPermission": "&7D |&f Nie masz uprawnień do użycia tego polecenia!",
   "commandPlayersOnly": "&7D |&f Tego polecenia może użyć tylko gracz w grze",
@@ -113,8 +118,8 @@
   "displayHelpList": "– /display list: lista wszystkich wyświetlaczy",
   "displayHelpStats": "– /display stats: pokaż statystyki użycia modu",
   "displayHelpReload": "– /display reload: przeładuj konfigurację",
-  "displayHelpOn": "– /display on: włącz wyświetlacze",
-  "displayHelpOff": "– /display off: wyłącz wyświetlacze",
+  "displayHelpOn": "– /display on [gracz]: włącz wyświetlacze sobie lub wybranemu graczowi",
+  "displayHelpOff": "– /display off [gracz]: wyłącz wyświetlacze sobie lub wybranemu graczowi",
   "displayHelpHelp": "– /display help: pokaż tę pomoc",
   "displayInfoHeader": "&7D |&f Informacje o wyświetlaczu:",
   "displayInfoOwnerLine": "&7D |&7 właściciel=&f{0} &8| &7uuid=&f{1}",