From f1e3ab0aa798c1c104906f544b01b5c2056d6a74 Mon Sep 17 00:00:00 2001 From: Sven Date: Mon, 9 Mar 2026 17:14:11 +0100 Subject: [PATCH 1/2] Remove unneeded DelicateCoroutinesApi opt-ins --- src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt | 2 -- src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt | 7 +------ src/main/kotlin/nl/skbotnl/chatog/Events.kt | 2 -- .../kotlin/nl/skbotnl/chatog/commands/TranslateMessage.kt | 2 -- .../kotlin/nl/skbotnl/chatog/commands/TranslateSettings.kt | 2 -- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt b/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt index d3262db..018167d 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/ChatOG.kt @@ -13,7 +13,6 @@ import org.bukkit.plugin.ServicePriority import org.bukkit.plugin.java.JavaPlugin internal class ChatOG : JavaPlugin() { - @OptIn(DelicateCoroutinesApi::class) companion object { val scope = CoroutineScope(Dispatchers.Default + SupervisorJob()) @@ -31,7 +30,6 @@ internal class ChatOG : JavaPlugin() { fun isLanguageDatabaseInitialized() = ::languageDatabase.isInitialized } - @OptIn(DelicateCoroutinesApi::class) override fun onEnable() { plugin = this diff --git a/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt b/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt index 9ad9b3e..fb879c3 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt @@ -2,7 +2,6 @@ package nl.skbotnl.chatog import java.util.* import kotlin.concurrent.read -import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.launch import net.kyori.adventure.text.Component import net.kyori.adventure.text.JoinConfiguration @@ -16,7 +15,6 @@ import nl.skbotnl.chatog.commands.TranslateMessage import org.bukkit.Bukkit import org.bukkit.entity.Player -@OptIn(DelicateCoroutinesApi::class) internal object ChatSystem { enum class ChatType { GENERAL_CHAT, @@ -41,10 +39,7 @@ internal object ChatSystem { } } - val messageComponent = ChatUtil.processText(text, player) - if (messageComponent == null) { - return - } + val messageComponent = ChatUtil.processText(text, player) ?: return val chatComponent = UtilitiesOG.trueogColorize(legacyToMm("$playerPartString${PlayerAffix.getSuffix(player.uniqueId)}")) diff --git a/src/main/kotlin/nl/skbotnl/chatog/Events.kt b/src/main/kotlin/nl/skbotnl/chatog/Events.kt index 863be70..2644f3c 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/Events.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/Events.kt @@ -4,7 +4,6 @@ import io.papermc.paper.advancement.AdvancementDisplay.Frame.* import io.papermc.paper.event.player.AsyncChatEvent import java.util.* import kotlin.concurrent.read -import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.launch import me.clip.placeholderapi.PlaceholderAPI import net.ess3.api.events.VanishStatusChangeEvent @@ -31,7 +30,6 @@ import org.bukkit.event.player.* import org.bukkit.event.server.BroadcastMessageEvent import xyz.jpenilla.announcerplus.listener.JoinQuitListener -@OptIn(DelicateCoroutinesApi::class) internal class Events : Listener { @EventHandler fun onJoin(event: PlayerJoinEvent) { diff --git a/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateMessage.kt b/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateMessage.kt index 2825fbf..5adbb0f 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateMessage.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateMessage.kt @@ -1,7 +1,6 @@ package nl.skbotnl.chatog.commands import java.util.* -import kotlinx.coroutines.DelicateCoroutinesApi import me.clip.placeholderapi.PlaceholderAPI import net.kyori.adventure.text.Component import net.kyori.adventure.text.JoinConfiguration @@ -40,7 +39,6 @@ internal class TranslateMessage : CommandExecutor { val pmMessages: MutableMap = HashMap() } - @OptIn(DelicateCoroutinesApi::class) override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array?): Boolean { if (sender !is Player) { return false diff --git a/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateSettings.kt b/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateSettings.kt index b327b46..af8de74 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateSettings.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/commands/TranslateSettings.kt @@ -1,6 +1,5 @@ package nl.skbotnl.chatog.commands -import kotlinx.coroutines.DelicateCoroutinesApi import net.trueog.utilitiesog.UtilitiesOG import nl.skbotnl.chatog.ChatOG import nl.skbotnl.chatog.ChatOG.Companion.config @@ -59,7 +58,6 @@ internal class TranslateSettings : CommandExecutor { ) } - @OptIn(DelicateCoroutinesApi::class) override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array?): Boolean { if (sender !is Player) { return false -- 2.47.3 From 3740d3d2120062a6274dca3554abd5807b91490d Mon Sep 17 00:00:00 2001 From: Sven Date: Mon, 9 Mar 2026 17:18:02 +0100 Subject: [PATCH 2/2] Fix developer chat sending --- .../kotlin/nl/skbotnl/chatog/ChatSystem.kt | 10 ++-------- .../kotlin/nl/skbotnl/chatog/DiscordBridge.kt | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt b/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt index fb879c3..6bd9bdc 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/ChatSystem.kt @@ -82,10 +82,7 @@ internal object ChatSystem { } } - val messageComponent = ChatUtil.processText(text, player) - if (messageComponent == null) { - return - } + val messageComponent = ChatUtil.processText(text, player) ?: return val chatComponent = UtilitiesOG.trueogColorize(legacyToMm("$playerPartString${PlayerAffix.getSuffix(player.uniqueId)}")) @@ -128,10 +125,7 @@ internal object ChatSystem { } } - val messageComponent = ChatUtil.processText(text, player) - if (messageComponent == null) { - return - } + val messageComponent = ChatUtil.processText(text, player) ?: return val chatComponent = UtilitiesOG.trueogColorize(legacyToMm("$playerPartString${PlayerAffix.getSuffix(player.uniqueId)}")) diff --git a/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt b/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt index 878f5e2..fad52a0 100755 --- a/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/DiscordBridge.kt @@ -341,7 +341,7 @@ internal class DiscordBridge private constructor() { ) } - else -> { + config.channelId -> { Component.join( JoinConfiguration.noSeparators(), discordComponent, @@ -350,6 +350,10 @@ internal class DiscordBridge private constructor() { contentComponent, ) } + + else -> { + throw RuntimeException("Invalid channel id") + } } messageComponent = @@ -383,11 +387,23 @@ internal class DiscordBridge private constructor() { } } - else -> { + config.developerChannelId -> { + for (p in Bukkit.getOnlinePlayers()) { + if (p.hasPermission("chat-og.developer")) { + p.sendMessage(messageComponent) + } + } + } + + config.channelId -> { for (p in Bukkit.getOnlinePlayers()) { p.sendMessage(messageComponent) } } + + else -> { + throw RuntimeException("Invalid channel id") + } } TranslateMessage.customMessages[randomUUID] = -- 2.47.3