Allow console to execute some commands.

Author: NoMathExpectation

src/main/kotlin/NoMathExpectation/chatExchange/neoForged/NeoForgeEvents.kt

@@ -169,10 +169,9 @@ object NeoForgeEvents {
             .then(
                 Commands.literal("send").then(
                     Commands.argument("message", StringArgumentType.greedyString()).executes { context ->
-                        val player = context.source.player ?: return@executes 0
                         val message = StringArgumentType.getString(context, "message")
 
-                        val name = ExchangeServer.componentToString(player.name)
+                        val name = ExchangeServer.componentToString(context.source.displayName)
 
                         val component = kotlin.runCatching {
                             val formatted = ChatExchangeConfig.commandBroadcastFormat
@@ -184,15 +183,15 @@ object NeoForgeEvents {
                             formatted.parseJsonToComponent()
                         }.getOrElse {
                             logger.error("Unable to resolve component from command broadcast format. Using default.", it)
-                            player.sendSystemMessage("chatexchange.const.exception".toExchangeServerTranslatedLiteral())
+                            context.source.sendSystemMessage("chatexchange.const.exception".toExchangeServerTranslatedLiteral())
                             Component.literal("<$name> $message")
                         }
 
                         logger.info(component.getStringWithLanguage(ExchangeServer.language))
                         ExchangeServer.sendEvent(
                             MessageEvent(name, message)
                         )
-                        player.server.playerList.players.forEach {
+                        context.source.server.playerList.players.forEach {
                             it.sendSystemMessage(component)
                         }
 
@@ -201,12 +200,10 @@ object NeoForgeEvents {
                 )
             ).then(
                 Commands.literal("status").executes { context ->
-                    val player = context.source.player ?: return@executes 0
-
                     fun Boolean.toProperLiteral() =
                         (if (this) "chatexchange.const.enabled" else "chatexchange.const.disabled").toTranslatableComponent()
 
-                    player.sendSystemMessage(
+                    context.source.sendSystemMessage(
                         "chatexchange.command.chatexchange.status".toExchangeServerTranslatedLiteral(
                             ChatExchangeConfig.chat.get().toProperLiteral(),
                             ChatExchangeConfig.joinLeave.get().toProperLiteral(),
@@ -220,7 +217,11 @@ object NeoForgeEvents {
             ).then(
                 Commands.literal("broadcastme").then(
                     Commands.argument("toggle", BoolArgumentType.bool()).executes { context ->
-                        val player = context.source.player ?: return@executes 0
+                        val player = context.source.player ?: kotlin.run {
+                            context.source.sendSystemMessage("chatexchange.const.onlyPlayer".toExchangeServerTranslatedLiteral())
+                            return@executes 0
+                        }
+
                         val data = player.server.chatExchangeData
                         val toggle = BoolArgumentType.getBool(context, "toggle")
                         if (toggle) {
@@ -234,7 +235,11 @@ object NeoForgeEvents {
                         1
                     }
                 ).executes { context ->
-                    val player = context.source.player ?: return@executes 0
+                    val player = context.source.player ?: kotlin.run {
+                        context.source.sendSystemMessage("chatexchange.const.onlyPlayer".toExchangeServerTranslatedLiteral())
+                        return@executes 0
+                    }
+
                     val data = player.server.chatExchangeData
                     if (data.isIgnoredPlayer(player.uuid)) {
                         player.sendSystemMessage("chatexchange.command.chatexchange.broadcastme.isoff".toExchangeServerTranslatedLiteral())
@@ -245,10 +250,10 @@ object NeoForgeEvents {
                     1
                 }
             ).executes { context ->
-                val player = context.source.player ?: return@executes 0
-
-                player.sendSystemMessage(
-                    "chatexchange.command.chatexchange.description".toExchangeServerTranslatedLiteral()
+                context.source.sendSystemMessage(
+                    "chatexchange.command.chatexchange.description".toExchangeServerTranslatedLiteral(
+                        ChatExchangeConfig.broadcastTriggerPrefix.get().joinToString("/")
+                    )
                 )
                 1
             }

src/main/resources/assets/chatexchange/lang/en_us.json

@@ -3,6 +3,7 @@
   "chatexchange.const.enabled": "§2Enabled§r",
   "chatexchange.const.disabled": "§cDisabled§r",
   "chatexchange.const.exception": "§4Internal exception occurred.§r",
+  "chatexchange.const.onlyPlayer": "§4Only players can use this command.§r",
   "modid.config.host": "Host",
   "modid.config.port": "Port",
   "modid.config.token": "Token",
@@ -16,7 +17,7 @@
   "modid.config.broadcastPrefix": "Broadcast Prefix",
   "modid.config.commandBroadcastFormat": "Command Broadcast Format",
   "modid.config.receiveMessageFormat": "Receive Message Format",
-  "chatexchange.command.chatexchange.description": "§3§lChatExchange Help§r\nIf the server has enabled broadcasting chat messages, your chat messages will be broadcast to an external port by default.\nYou can use /chatexchange broadcastme to control whether your chat messages will be broadcast.\nAlso, you can broadcast your messages by prefixing @broadcast/@bc.",
+  "chatexchange.command.chatexchange.description": "§3§lChatExchange Help§r\nIf the server has enabled broadcasting chat messages, your chat messages will be broadcast to an external port by default.\nYou can use /chatexchange broadcastme to control whether your chat messages will be broadcast.\nAlso, you can broadcast your messages by prefixing %s.",
   "chatexchange.command.chatexchange.status": "Chat: %s\nJoin/Leave: %s\nDeath: %s\nAdvancement: %s",
   "chatexchange.command.chatexchange.broadcastme.on": "Your chat messages will now be broadcast.",
   "chatexchange.command.chatexchange.broadcastme.off": "Your chat messages will not be broadcast.",

src/main/resources/assets/chatexchange/lang/zh_cn.json

@@ -3,6 +3,7 @@
   "chatexchange.const.enabled": "§2已启用§r",
   "chatexchange.const.disabled": "§c已禁用§r",
   "chatexchange.const.exception": "§4发生了内部错误。§r",
+  "chatexchange.const.onlyPlayer": "§4只有玩家可以使用这个命令。§r",
   "modid.config.host": "主机",
   "modid.config.port": "端口",
   "modid.config.token": "令牌",
@@ -16,7 +17,7 @@
   "modid.config.broadcastPrefix": "广播前缀",
   "modid.config.commandBroadcastFormat": "命令广播格式",
   "modid.config.receiveMessageFormat": "接收消息格式",
-  "chatexchange.command.chatexchange.description": "§3§lChatExchange 帮助§r\n若服务器开启了广播聊天消息，你的聊天消息默认会被自动广播到外部端口。\n你可以使用 /chatexchange broadcastme 来控制你的消息是否被广播。\n同时，在发送消息前加上@广播/@broadcast/@bc前缀也可以广播你的消息。",
+  "chatexchange.command.chatexchange.description": "§3§lChatExchange 帮助§r\n若服务器开启了广播聊天消息，你的聊天消息默认会被自动广播到外部端口。\n你可以使用 /chatexchange broadcastme 来控制你的消息是否被广播。\n同时，在发送消息前加上 %s 前缀也可以广播你的消息。",
   "chatexchange.command.chatexchange.status": "聊天消息: %s\n加入/离开消息: %s\n死亡消息: %s\n进度消息: %s",
   "chatexchange.command.chatexchange.broadcastme.on": "你的聊天消息现在会被广播了。",
   "chatexchange.command.chatexchange.broadcastme.off": "你的聊天消息现在不会被广播了。",