@@ -7,6 +7,7 @@ import io.github.rothes.esu.bukkit.plugin
77import io.github.rothes.esu.bukkit.user
88import io.github.rothes.esu.bukkit.user.ConsoleUser
99import io.github.rothes.esu.bukkit.user.PlayerUser
10+ import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.papi
1011import io.github.rothes.esu.bukkit.util.ComponentBukkitUtils.user
1112import io.github.rothes.esu.bukkit.util.version.adapter.PlayerAdapter.Companion.displayName_
1213import io.github.rothes.esu.core.configuration.ConfigurationPart
@@ -81,14 +82,15 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
8182 fun whisper (sender : User , receiver : User , @Argument(parserName = " greedyString" ) message : String ) {
8283 val parsed = parseMessage(sender, message, config.whisper.prefixedMessageModifiers)
8384
85+ val papi = papi(sender)
8486 val msg = component(" message" , parsed)
8587 val pd = mapOf (" sender" to sender, " receiver" to receiver)
8688
87- sender.message(config.whisper.formats.outgoing, msg,
89+ sender.message(config.whisper.formats.outgoing, msg, papi,
8890 playerDisplay(sender, pd),
8991 pLang(sender, locale, { whisper.placeholders })
9092 )
91- receiver.message(config.whisper.formats.incoming, msg,
93+ receiver.message(config.whisper.formats.incoming, msg, papi,
9294 playerDisplay(receiver, pd),
9395 pLang(sender, locale, { whisper.placeholders })
9496 )
@@ -100,7 +102,7 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
100102 if (user.isOnline && user != sender && user != receiver)
101103 user.message(
102104 with (config.whisper.formats.spy) { if (initiative) send else reply },
103- msg,
105+ msg, papi,
104106 playerDisplay(receiver, pd),
105107 pLang(sender, locale, { whisper.spy.placeholders })
106108 )
@@ -220,10 +222,11 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
220222 @Command(" $EMOTE_COMMANDS <message>" )
221223 fun emote (sender : User , @Argument(parserName = " greedyString" ) message : String ) {
222224 val msg = parseMessage(sender, message, config.emote.prefixedMessageModifiers)
225+ val papi = papi(sender)
223226
224227 for (user in Bukkit .getOnlinePlayers().map { it.user }.plus(ConsoleUser )) {
225228 val tags = arrayOf(
226- playerDisplay(user, " sender" , sender), component(" message" , msg)
229+ playerDisplay(user, " sender" , sender), component(" message" , msg), papi
227230 )
228231 user.message(config.emote.format, pLang(user, locale, { emote.placeholders }), * tags)
229232 }
@@ -272,16 +275,17 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
272275 .map { it.user }
273276
274277 val message = component(" message" , msg)
278+ val papi = papi(sender)
275279 for (user in users) {
276280 user.message(
277- format.player, message,
281+ format.player, message, papi,
278282 pLang(user, locale, { chat.placeholders }),
279283 playerDisplay(user, " sender" , sender)
280284 )
281285 }
282286
283287 ConsoleUser .message(
284- format.console, message,
288+ format.console, message, papi,
285289 pLang(ConsoleUser , locale, { chat.placeholders }),
286290 playerDisplay(ConsoleUser , " sender" , sender)
287291 )
@@ -424,6 +428,7 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
424428 if (user != null )
425429 Tag .selfClosingInserting(
426430 viewer.buildMiniMessage(locale, { playerDisplay },
431+ papi(user),
427432 if (user is PlayerUser )
428433 component(" player_key" , user.player.displayName_)
429434 else
0 commit comments