From 21adeee08c2510f6b7ebfb85ce5ff54cf30822b3 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Sun, 5 Jan 2025 19:02:58 -0500 Subject: [PATCH] Change donor chat to premium chat --- src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt | 7 +++-- .../nl/skbotnl/chatog/ChatSystemHelper.kt | 14 +++++----- src/main/kotlin/nl/skbotnl/chatog/Config.kt | 18 ++++++------- .../kotlin/nl/skbotnl/chatog/DiscordBridge.kt | 26 +++++++++---------- src/main/kotlin/nl/skbotnl/chatog/Events.kt | 4 +-- .../chatog/commands/ChatConfigReload.kt | 4 +-- .../commands/{DonorChat.kt => PremiumChat.kt} | 16 ++++++------ src/main/resources/config.yml | 8 +++--- src/main/resources/plugin.yml | 9 +++---- 9 files changed, 51 insertions(+), 55 deletions(-) rename src/main/kotlin/nl/skbotnl/chatog/commands/{DonorChat.kt => PremiumChat.kt} (79%) diff --git a/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt b/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt index 50625d4..1270d2b 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt @@ -52,8 +52,8 @@ class ChatOG : JavaPlugin() { @JvmStatic @Suppress("unused") - fun sendDonorMessage(message: String, player: String, uuid: UUID?) { - GlobalScope.launch { DiscordBridge.sendDonorMessage(message, player, uuid) } + fun sendPremiumMessage(message: String, player: String, uuid: UUID?) { + GlobalScope.launch { DiscordBridge.sendPremiumMessage(message, player, uuid) } } @JvmStatic @@ -88,8 +88,7 @@ class ChatOG : JavaPlugin() { this.getCommand("translatesettings")?.tabCompleter = TranslateSettingsTabCompleter() this.getCommand("chatconfigreload")?.setExecutor(ChatConfigReload()) this.getCommand("sc")?.setExecutor(StaffChat()) - this.getCommand("dc")?.setExecutor(DonorChat()) - this.getCommand("d")?.setExecutor(DonorChat()) + this.getCommand("p")?.setExecutor(PremiumChat()) if (Config.discordEnabled) { GlobalScope.launch { diff --git a/src/main/kotlin/nl/skbotnl/chatog/ChatSystemHelper.kt b/src/main/kotlin/nl/skbotnl/chatog/ChatSystemHelper.kt index 24f0573..88ff5ef 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/ChatSystemHelper.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/ChatSystemHelper.kt @@ -20,7 +20,7 @@ import java.util.* object ChatSystemHelper { object ChatType { const val STAFFCHAT = "staffchat" - const val DONORCHAT = "donorchat" + const val PREMIUMCHAT = "premiumchat" } var inChat: MutableMap = HashMap() @@ -74,19 +74,19 @@ object ChatSystemHelper { } } - fun sendMessageInDonorChat(player: Player, text: String) { + fun sendMessageInPremiumChat(player: Player, text: String) { var chatString = "${ChatOG.chat.getPlayerPrefix(player)}${player.name}" if (PlaceholderAPI.setPlaceholders(player, "%simpleclans_clan_color_tag%") != "") { chatString = PlaceholderAPI.setPlaceholders(player, "&8[%simpleclans_clan_color_tag%&8] $chatString") } - chatString = "&aDONOR | $chatString" + chatString = "&aPREMIUM | $chatString" - if (Config.donorDiscordEnabled) { + if (Config.premiumDiscordEnabled) { val discordMessageString = Helper.convertEmojis(text) GlobalScope.launch { - DiscordBridge.sendDonorMessage(discordMessageString, removeColor(chatString), player.uniqueId) + DiscordBridge.sendPremiumMessage(discordMessageString, removeColor(chatString), player.uniqueId) } } @@ -117,9 +117,9 @@ object ChatSystemHelper { TranslateMessage.chatMessages[randomUUID] = TranslateMessage.SentChatMessage(text, player) for (p in Bukkit.getOnlinePlayers()) { - if (p.hasPermission("chat-og.donors")) { + if (p.hasPermission("chat-og.premium")) { p.sendMessage(textComponent) } } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/nl/skbotnl/chatog/Config.kt b/src/main/kotlin/nl/skbotnl/chatog/Config.kt index 0abb298..29c31a6 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/Config.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/Config.kt @@ -9,18 +9,18 @@ object Config { lateinit var redisUrl: String var discordEnabled = false var staffDiscordEnabled = false - var donorDiscordEnabled = false + var premiumDiscordEnabled = false lateinit var status: String lateinit var serverHasStartedMessage: String lateinit var serverHasStoppedMessage: String lateinit var botToken: String lateinit var channelId: String lateinit var staffChannelId: String - lateinit var donorChannelId: String + lateinit var premiumChannelId: String lateinit var guildId: String lateinit var webhook: String lateinit var staffWebhook: String - lateinit var donorWebhook: String + lateinit var premiumWebhook: String lateinit var listCommandName: String lateinit var listCommandText: String lateinit var colorCodeRoles: List @@ -66,9 +66,9 @@ object Config { } try { - donorDiscordEnabled = config.get("donorDiscordEnabled") as Boolean + premiumDiscordEnabled = config.get("premiumDiscordEnabled") as Boolean } catch (_: Exception) { - ChatOG.plugin.logger.severe("Failed to parse config option \"donorDiscordEnabled\" as a boolean") + ChatOG.plugin.logger.severe("Failed to parse config option \"premiumDiscordEnabled\" as a boolean") return true } @@ -122,9 +122,9 @@ object Config { } try { - donorChannelId = (config.get("donorChannelId") as Long).toString() + premiumChannelId = (config.get("premiumChannelId") as Long).toString() } catch (_: Exception) { - ChatOG.plugin.logger.severe("Failed to parse config option \"donorChannelId\" as a long") + ChatOG.plugin.logger.severe("Failed to parse config option \"premiumChannelId\" as a long") return true } @@ -143,9 +143,9 @@ object Config { } try { - donorWebhook = config.get("donorWebhook") as String + premiumWebhook = config.get("premiumWebhook") as String } catch (_: Exception) { - ChatOG.plugin.logger.severe("Failed to parse config option \"donorWebhook\" as a string") + ChatOG.plugin.logger.severe("Failed to parse config option \"premiumWebhook\" as a string") return true } diff --git a/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt b/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt index f662cae..b6a046c 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt @@ -37,7 +37,7 @@ object DiscordBridge { var jda: JDA? = null var webhook: WebhookClient? = null var staffWebhook: WebhookClient? = null - var donorWebhook: WebhookClient? = null + var premiumWebhook: WebhookClient? = null private val urlRegex = Regex("(.*)((https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;()]*[-a-zA-Z0-9+&@#/%=~_|()])(.*)") @@ -54,9 +54,9 @@ object DiscordBridge { ChatOG.plugin.logger.warning("Config option \"staffWebhook\" is invalid") } try { - donorWebhook = WebhookClient.withUrl(Config.donorWebhook) + premiumWebhook = WebhookClient.withUrl(Config.premiumWebhook) } catch (e: IllegalArgumentException) { - ChatOG.plugin.logger.warning("Config option \"donorWebhook\" is invalid") + ChatOG.plugin.logger.warning("Config option \"premiumWebhook\" is invalid") } jda = light(Config.botToken, enableCoroutines = true) { @@ -97,7 +97,7 @@ object DiscordBridge { } jda?.listener { - if (it.channel.id != Config.channelId && (if (Config.staffDiscordEnabled) it.channel.id != Config.staffChannelId else true) && (if (Config.donorDiscordEnabled) it.channel.id != Config.donorChannelId else true)) { + if (it.channel.id != Config.channelId && (if (Config.staffDiscordEnabled) it.channel.id != Config.staffChannelId else true) && (if (Config.premiumDiscordEnabled) it.channel.id != Config.premiumChannelId else true)) { return@listener } @@ -272,12 +272,12 @@ object DiscordBridge { ) } - Config.donorChannelId -> { - val donorComponent = Component.text("DONOR | ").color(NamedTextColor.GREEN) + Config.premiumChannelId -> { + val premiumComponent = Component.text("PREMIUM | ").color(NamedTextColor.GREEN) Component.join( JoinConfiguration.noSeparators(), discordComponent, - donorComponent, + premiumComponent, replyComponent, userComponent, contentComponent @@ -319,9 +319,9 @@ object DiscordBridge { } } - Config.donorChannelId -> { + Config.premiumChannelId -> { for (p in Bukkit.getOnlinePlayers()) { - if (p.hasPermission("chat-og.donors")) { + if (p.hasPermission("chat-og.premium")) { p.sendMessage(messageComponent) } } @@ -382,9 +382,9 @@ object DiscordBridge { staffWebhook?.send(webhookMessage.build()) } - suspend fun sendDonorMessage(message: String, player: String, uuid: UUID?) { - if (donorWebhook == null) { - ChatOG.plugin.logger.warning("donorWebhook has not been set or is invalid") + suspend fun sendPremiumMessage(message: String, player: String, uuid: UUID?) { + if (premiumWebhook == null) { + ChatOG.plugin.logger.warning("premiumWebhook has not been set or is invalid") return } @@ -395,7 +395,7 @@ object DiscordBridge { webhookMessage.setAvatarUrl("https://minotar.net/helm/$uuid.png") } - donorWebhook?.send(webhookMessage.build()) + premiumWebhook?.send(webhookMessage.build()) } fun sendEmbed(message: String, uuid: UUID?, color: Int) { diff --git a/src/main/kotlin/nl/skbotnl/chatog/Events.kt b/src/main/kotlin/nl/skbotnl/chatog/Events.kt index 138c01a..c0d6647 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/Events.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/Events.kt @@ -186,8 +186,8 @@ class Events : Listener { ChatSystemHelper.sendMessageInStaffChat(event.player, oldTextComponent.content()) return } - if (ChatSystemHelper.inChat[event.player.uniqueId] == ChatType.DONORCHAT) { - ChatSystemHelper.sendMessageInDonorChat(event.player, oldTextComponent.content()) + if (ChatSystemHelper.inChat[event.player.uniqueId] == ChatType.PREMIUMCHAT) { + ChatSystemHelper.sendMessageInPremiumChat(event.player, oldTextComponent.content()) return } diff --git a/src/main/kotlin/nl/skbotnl/chatog/commands/ChatConfigReload.kt b/src/main/kotlin/nl/skbotnl/chatog/commands/ChatConfigReload.kt index 7f07fff..a06825c 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/commands/ChatConfigReload.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/commands/ChatConfigReload.kt @@ -23,10 +23,10 @@ class ChatConfigReload : CommandExecutor { DiscordBridge.webhook = WebhookClient.withUrl(Config.webhook) DiscordBridge.staffWebhook = WebhookClient.withUrl(Config.staffWebhook) - DiscordBridge.donorWebhook = WebhookClient.withUrl(Config.donorWebhook) + DiscordBridge.premiumWebhook = WebhookClient.withUrl(Config.premiumWebhook) DiscordBridge.jda?.presence?.setPresence(Activity.playing(Config.status), false) sender.sendMessage(ChatOG.mm.deserialize("${Config.prefix}: Successfully reloaded the config.")) return true } -} \ No newline at end of file +} diff --git a/src/main/kotlin/nl/skbotnl/chatog/commands/DonorChat.kt b/src/main/kotlin/nl/skbotnl/chatog/commands/PremiumChat.kt similarity index 79% rename from src/main/kotlin/nl/skbotnl/chatog/commands/DonorChat.kt rename to src/main/kotlin/nl/skbotnl/chatog/commands/PremiumChat.kt index 7b9ac68..58d9641 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/commands/DonorChat.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/commands/PremiumChat.kt @@ -9,30 +9,30 @@ import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandSender import org.bukkit.entity.Player -class DonorChat : CommandExecutor { +class PremiumChat : CommandExecutor { override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array?): Boolean { if (sender !is Player) { - sender.sendMessage("You can only execute this command as a player") + sender.sendMessage("You can only execute this command as a player.") return true } - if (!sender.hasPermission("chat-og.donors")) { + if (!sender.hasPermission("chat-og.premium")) { sender.sendMessage(ChatOG.mm.deserialize("${Config.prefix}: You do not have permission to run this command.")) return true } if (args == null || args.isEmpty()) { - if (ChatSystemHelper.inChat[sender.uniqueId] == ChatType.DONORCHAT) { + if (ChatSystemHelper.inChat[sender.uniqueId] == ChatType.PREMIUMCHAT) { ChatSystemHelper.inChat[sender.uniqueId] = "" sender.sendMessage(ChatOG.mm.deserialize("${Config.prefix}: You are now talking in normal chat.")) return true } - ChatSystemHelper.inChat[sender.uniqueId] = ChatType.DONORCHAT - sender.sendMessage(ChatOG.mm.deserialize("${Config.prefix}: You are now talking in donor chat.")) + ChatSystemHelper.inChat[sender.uniqueId] = ChatType.PREMIUMCHAT + sender.sendMessage(ChatOG.mm.deserialize("${Config.prefix}: You are now talking in premium chat.")) return true } - ChatSystemHelper.sendMessageInDonorChat(sender, args.joinToString(separator = " ")) + ChatSystemHelper.sendMessageInPremiumChat(sender, args.joinToString(separator = " ")) return true } -} \ No newline at end of file +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a5869c7..08f8966 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -6,10 +6,10 @@ prefix: [Chat-OG] redisUrl: 127.0.0.1:6379 # ---Discord--- -# discordEnabled needs to be true for staffDiscordEnabled and donorDiscordEnabled to have any effect +# discordEnabled needs to be true for staffDiscordEnabled and premiumDiscordEnabled to have any effect discordEnabled: false staffDiscordEnabled: false -donorDiscordEnabled: false +premiumDiscordEnabled: false status: Minecraft serverHasStartedMessage: The server has started serverHasStoppedMessage: The server has stopped @@ -17,10 +17,10 @@ botToken: guildId: channelId: staffChannelId: -donorChannelId: +premiumChannelId: webhook: staffWebhook: -donorWebhook: +premiumWebhook: listCommandName: list # Available placeholders: %onlineplayers%, %maxplayers% listCommandText: "%onlineplayers% player(s) online:" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7d34c80..44edf51 100755 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -20,9 +20,6 @@ commands: s: description: Toggle or talk in staff chat usage: /s OR /s - dc: - description: Toggle or talk in donor chat - usage: /dc OR /dc - d: - description: Toggle or talk in donor chat - usage: /d OR /d + p: + description: Toggle or talk in premium chat + usage: /p OR /p