Skip to content

Commit

Permalink
refactor: swap to brigadier logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Boy0000 committed Jun 8, 2024
1 parent e136db9 commit dd44b88
Show file tree
Hide file tree
Showing 7 changed files with 357 additions and 389 deletions.
383 changes: 0 additions & 383 deletions chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyCommands.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.mineinabyss.chatty

import com.mineinabyss.chatty.commands.ChattyBrigadierCommands
import com.mineinabyss.chatty.components.ChannelData
import com.mineinabyss.chatty.components.ChattyNickname
import com.mineinabyss.chatty.helpers.DiscordEmoteFixer
Expand Down Expand Up @@ -41,7 +42,8 @@ class ChattyPlugin : JavaPlugin() {
// Register the proxy listener
registerProxyChannels()

ChattyCommands()
//ChattyCommands()
ChattyBrigadierCommands.registerCommands()
listeners(ChatListener(), PlayerListener())
if (chatty.isPlaceholderApiLoaded)
PlaceholderAPIHook().register()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,331 @@
package com.mineinabyss.chatty.commands

import com.github.shynixn.mccoroutine.bukkit.asyncDispatcher
import com.github.shynixn.mccoroutine.bukkit.launch
import com.github.shynixn.mccoroutine.bukkit.minecraftDispatcher
import com.mineinabyss.chatty.ChattyChannel
import com.mineinabyss.chatty.chatty
import com.mineinabyss.chatty.components.*
import com.mineinabyss.chatty.helpers.*
import com.mineinabyss.geary.papermc.tracking.entities.toGeary
import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
import com.mineinabyss.geary.serialization.getOrSetPersisting
import com.mineinabyss.geary.serialization.setPersisting
import com.mineinabyss.idofront.commands.brigadier.IdoRootCommand
import com.mineinabyss.idofront.commands.brigadier.commands
import com.mineinabyss.idofront.entities.toPlayer
import com.mineinabyss.idofront.events.call
import com.mineinabyss.idofront.textcomponents.miniMsg
import com.mojang.brigadier.arguments.StringArgumentType
import io.papermc.paper.command.brigadier.argument.ArgumentTypes
import io.papermc.paper.event.player.AsyncChatDecorateEvent
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import org.bukkit.Sound
import org.bukkit.command.CommandSender
import org.bukkit.entity.Player

object ChattyBrigadierCommands {

fun registerCommands() {
chatty.plugin.commands {
"chatty" {
"reload" {
executes {
chatty.plugin.createChattyContext()
sender.sendMessage(Component.text("Chatty has been reloaded!", NamedTextColor.GREEN))
}
}
"ping" {
"toggle" {
playerExecutes {
val gearyPlayer = player.toGeary()
val oldData = gearyPlayer.get<ChannelData>() ?: return@playerExecutes
gearyPlayer.setPersisting(oldData.copy(disablePingSound = !oldData.disablePingSound))
player.sendFormattedMessage(chatty.messages.ping.toggledPingSound)
}
}
"sound" {
val soundName by StringArgumentType.word().suggests {
suggest(
chatty.config.ping.alternativePingSounds
.takeUnless { "all" in it } ?: Sound.entries.map { it.key.asString() }
)
}
playerExecutes {
val gearyPlayer = player.toGeary()
val oldData = gearyPlayer.get<ChannelData>() ?: return@playerExecutes
if (soundName() in alternativePingSounds) {
gearyPlayer.setPersisting(oldData.copy(pingSound = soundName()))
player.sendFormattedMessage(chatty.messages.ping.changedPingSound)
} else player.sendFormattedMessage(chatty.messages.ping.invalidPingSound)
}
}
}
"channels" {
executes {
(sender as? Player)?.sendFormattedMessage(chatty.messages.channels.availableChannels)
?: sender.sendRichMessage(chatty.messages.channels.availableChannels)
}
}
"channel" {
val channel by ChattyChannelArgument().suggests {
suggest(chatty.config.channels.entries
.filter {
it.value.permission.isEmpty() || context.source.sender.hasPermission(it.value.permission)
}.sortedBy {
it.key in setOf(defaultChannel().key, radiusChannel()?.key, adminChannel()?.key).filterNotNull()
}.map { it.key }
)
}
playerExecutes {
swapChannel(player, channel())
}
}
"commandspy" {
playerExecutes {
val gearyPlayer = player.toGeary()
if (gearyPlayer.has<CommandSpy>()) {
gearyPlayer.remove<CommandSpy>()
player.sendFormattedMessage(chatty.messages.spying.commandSpyOff)
} else {
gearyPlayer.getOrSetPersisting { CommandSpy() }
player.sendFormattedMessage(chatty.messages.spying.commandSpyOn)
}
}
}
"spy" {
val channel by ChattyChannelArgument().suggests {
suggest(chatty.config.channels.entries
.filter {
it.value.permission.isEmpty() || context.source.sender.hasPermission(it.value.permission)
}.sortedBy {
it.key in setOf(defaultChannel().key, radiusChannel()?.key, adminChannel()?.key).filterNotNull()
}.map { it.key }
)
}
playerExecutes {
val channel = channel() ?: run {
player.sendFormattedMessage(chatty.messages.channels.noChannelWithName)
return@playerExecutes
}
val spy = player.toGeary().getOrSetPersisting { SpyOnChannels() }

when {
channel.channelType == ChannelType.GLOBAL ->
player.sendFormattedMessage(chatty.messages.spying.cannotSpyOnChannel)

!player.hasPermission(channel.permission) ->
player.sendFormattedMessage(chatty.messages.spying.cannotSpyOnChannel)

channel.key in spy.channels -> {
player.sendFormattedMessage(chatty.messages.spying.stopSpyingOnChannel)
spy.channels.remove(channel.key)
}

else -> {
spy.channels.add(channel.key)
player.sendFormattedMessage(chatty.messages.spying.startSpyingOnChannel)
}
}
}
}
"nickname" {
val nickname by StringArgumentType.greedyString().suggests {
(context.source.executor as? Player)?.chattyNickname?.let {
suggestFiltering(it)
}
}
playerExecutes {
val nickname = nickname()
val nickMessage = chatty.messages.nicknames
val bypassFormatPerm = sender.hasPermission(ChattyPermissions.BYPASS_TAG_PERM)

when {
!sender.hasPermission(ChattyPermissions.NICKNAME) ->
sender.sendFormattedMessage(nickMessage.selfDenied)

player.uniqueId != (sender as? Player)?.uniqueId -> {
when {
!sender.hasPermission(ChattyPermissions.NICKNAME_OTHERS) ->
sender.sendFormattedMessage(nickMessage.otherDenied, player)

nickname.isNullOrEmpty() -> {
player.chattyNickname = null
player.sendFormattedMessage(nickMessage.selfEmpty)
sender.sendFormattedMessage(nickMessage.otherEmpty, player)
}

!bypassFormatPerm && !nickname.verifyNickLength() ->
sender.sendFormattedMessage(nickMessage.tooLong)

nickname.isNotEmpty() -> {
player.chattyNickname = nickname
sender.sendFormattedMessage(nickMessage.otherSuccess, player)
}
}
}

else -> {
when {
nickname.isNullOrEmpty() -> {
player.chattyNickname = null
sender.sendFormattedMessage(nickMessage.selfEmpty)
}

!bypassFormatPerm && !nickname.verifyNickLength() ->
sender.sendFormattedMessage(nickMessage.tooLong)

else -> {
(sender as? Player)?.chattyNickname = nickname
sender.sendFormattedMessage(nickMessage.selfSuccess)
}
}
}
}
}
}
}
("global" / "g") { handleShortCutChannel(globalChannel()) }
("local" / "l") { handleShortCutChannel(radiusChannel()) }
("admin" / "a") { handleShortCutChannel(adminChannel()) }
("message" / "msg") { handleMessage() }
("reply" / "r") { handleReply() }

}
}

private fun IdoRootCommand.handleShortCutChannel(channel: MutableMap.MutableEntry<String, ChattyChannel>?) {
playerExecutes {
swapChannel(player, channel?.value)
}
val message by StringArgumentType.greedyString()
playerExecutes {
player.shortcutCommand(channel, message())
}
}

private fun IdoRootCommand.handleMessage() {
val player by ArgumentTypes.player()
val message by StringArgumentType.greedyString()
playerExecutes {
this.player.handleSendingPrivateMessage(context.getArgument("player", Player::class.java), message(), false)
}
}

private fun IdoRootCommand.handleReply() {
val message by StringArgumentType.greedyString()
playerExecutes {
val player = sender as? Player ?: return@playerExecutes
player.toGeary().get<ChannelData>()?.lastMessager?.toPlayer()
?.let { player.handleSendingPrivateMessage(it, message(), true) }
?: player.sendFormattedMessage(chatty.messages.privateMessages.emptyReply)
}
}

private fun Player.shortcutCommand(
channel: Map.Entry<String, ChattyChannel>?,
message: String
) {
val chattyData = toGeary().get<ChannelData>() ?: return
val currentChannel = chattyData.channelId
when {
channel == null -> sendFormattedMessage(chatty.messages.channels.noChannelWithName)
channel.value.permission.isNotBlank() && !hasPermission(channel.value.permission) ->
sendFormattedMessage(chatty.messages.channels.missingChannelPermission)

message.isEmpty() || !chatty.config.chat.disableChatSigning -> swapChannel(this, channel.value)
else -> {
toGeary().setPersisting(chattyData.copy(channelId = channel.key, lastChannelUsedId = channel.key))
chatty.plugin.launch(chatty.plugin.asyncDispatcher) {
AsyncChatDecorateEvent(this@shortcutCommand, message.miniMsg()).call<AsyncChatDecorateEvent> {
GenericChattyChatEvent(this@shortcutCommand, result()).callEvent()
}
withContext(chatty.plugin.minecraftDispatcher) {
// chance that player logged out by now
toGearyOrNull()?.setPersisting(chattyData.copy(channelId = currentChannel))
}
}
}
}
}

fun swapChannel(player: Player, newChannel: ChattyChannel?) {
when {
newChannel == null ->
player.sendFormattedMessage(chatty.messages.channels.noChannelWithName)

newChannel.permission.isNotBlank() && !player.hasPermission(newChannel.permission) ->
player.sendFormattedMessage(chatty.messages.channels.missingChannelPermission)

else -> {
val gearyPlayer = player.toGeary()
val chattyData = gearyPlayer.get<ChannelData>() ?: return
gearyPlayer.setPersisting(
chattyData.copy(
channelId = newChannel.key,
lastChannelUsedId = newChannel.key
)
)
player.sendFormattedMessage(chatty.messages.channels.channelChanged)
}
}
}

private fun CommandSender.sendFormattedMessage(message: String, optionalPlayer: Player? = null) =
(optionalPlayer ?: this as? Player)?.let { player ->
this.sendMessage(translatePlaceholders(player, message).miniMsg(player.buildTagResolver(true)))
}

private fun Player.sendFormattedPrivateMessage(messageFormat: String, message: String, receiver: Player) =
this.sendMessage(
Component.textOfChildren(
translatePlaceholders(receiver, messageFormat).miniMsg(receiver.buildTagResolver(true)),
message.miniMsg(receiver.buildTagResolver(true))
)
)

private val replyMap = mutableMapOf<Player, Job>()
private fun handleReplyTimer(player: Player, chattyData: ChannelData): Job {
replyMap[player]?.let { return it }
replyMap[player]?.cancel()
return chatty.plugin.launch {
delay(chatty.config.privateMessages.messageReplyTime)
replyMap[player]?.cancel()
replyMap.remove(player)
player.toGeary().setPersisting(chattyData.copy(lastMessager = null))
}
}

private fun Player.handleSendingPrivateMessage(other: Player, message: String, isReply: Boolean = false) {
val chattyData = toGeary().get<ChannelData>() ?: return
when {
!chatty.config.privateMessages.enabled ->
sendFormattedMessage(chatty.messages.privateMessages.disabled)

isReply && chattyData.lastMessager == null ->
sendFormattedMessage(chatty.messages.privateMessages.emptyReply)

else -> {
if (message.isEmpty() || this == other) return

replyMap[other] = handleReplyTimer(other, chattyData)

this.sendFormattedPrivateMessage(chatty.config.privateMessages.messageSendFormat, message, other)
other.sendFormattedPrivateMessage(chatty.config.privateMessages.messageReceiveFormat, message, this)
val gearyOther = other.toGeary()
val otherChannelData = gearyOther.get<ChannelData>()
if (otherChannelData != null) {
gearyOther.setPersisting(otherChannelData.copy(lastMessager = uniqueId))
}
if (chatty.config.privateMessages.messageSendSound.isNotEmpty())
this.playSound(other.location, chatty.config.privateMessages.messageSendSound, 1f, 1f)
if (chatty.config.privateMessages.messageReceivedSound.isNotEmpty())
other.playSound(other.location, chatty.config.privateMessages.messageReceivedSound, 1f, 1f)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.mineinabyss.chatty.commands

import com.mineinabyss.chatty.ChattyChannel
import com.mineinabyss.chatty.chatty
import com.mojang.brigadier.arguments.StringArgumentType
import io.papermc.paper.command.brigadier.argument.CustomArgumentType

class ChattyChannelArgument : CustomArgumentType.Converted<ChattyChannel, String> {

override fun getExamples() = nativeType.examples

override fun getNativeType() = StringArgumentType.greedyString()

override fun convert(nativeType: String) = chatty.config.channels[nativeType]!!


}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ import net.kyori.adventure.text.Component
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import org.bukkit.entity.Player

fun GenericChattyDecorateEvent(player: Player, msg: Component) =
AsyncChatDecorateEvent(player, msg)
fun GenericChattyChatEvent(player: Player, msg: Component) =
AsyncChatEvent(true, player, mutableSetOf(), ChatRenderer.defaultRenderer(), msg, msg, SignedMessage.system(msg.serialize(), null))
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import com.mineinabyss.geary.modules.geary
import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
import com.mineinabyss.geary.systems.builders.cache
import com.mineinabyss.geary.systems.query.GearyQuery
import com.mineinabyss.idofront.messaging.broadcast
import com.mineinabyss.idofront.messaging.broadcastVal
import com.mineinabyss.idofront.textcomponents.serialize
import io.papermc.paper.chat.ChatRenderer
import io.papermc.paper.event.player.AsyncChatCommandDecorateEvent
import io.papermc.paper.event.player.AsyncChatDecorateEvent
import io.papermc.paper.event.player.AsyncChatEvent
Expand Down Expand Up @@ -80,9 +83,9 @@ class ChatListener : Listener {
handleProxyMessage(player, channelId, channel, message(), simpleMessage)

val pingedPlayer = originalMessage().serialize().checkForPlayerPings(channelId)
val playerViewers = viewers().filterIsInstance<Player>().toSet()
val playerViewers = viewers().mapNotNull { it as? Player }.toSet()
when {
viewers().isEmpty() -> player.sendFormattedMessage(chatty.messages.channels.emptyChannelMessage)
playerViewers.isEmpty() -> player.sendFormattedMessage(chatty.messages.channels.emptyChannelMessage)
chatty.config.chat.disableChatSigning -> {
playerViewers.forEach { receiver ->
var finalMessage = message()
Expand Down
Loading

0 comments on commit dd44b88

Please sign in to comment.