reformat

MeiNanziiii · Jan 15, 2025 · d468b83 · d468b83
1 parent 11923a1
commit d468b83
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 33 deletions.
diff --git a/src/main/kotlin/ua/mei/minekord/Minekord.kt b/src/main/kotlin/ua/mei/minekord/Minekord.kt
@@ -53,8 +53,7 @@ object Minekord : ModInitializer {
         }
 
         ServerMessageEvents.CHAT_MESSAGE.register { message, sender, type ->
-            ChatMessageEvent.EVENT.invoker()
-                .message(message.content, MessageSender(sender.gameProfile.name, sender.avatarUrl))
+            ChatMessageEvent.EVENT.invoker().message(message.content, MessageSender(sender.gameProfile.name, sender.avatarUrl))
         }
         ServerMessageEvents.COMMAND_MESSAGE.register { message, source, parameters ->
             if (source.isExecutedByPlayer) {
@@ -63,8 +62,10 @@ object Minekord : ModInitializer {
                     MessageSender(source.player!!.gameProfile.name, source.player!!.avatarUrl)
                 )
             } else {
-                ChatMessageEvent.EVENT.invoker()
-                    .message(message.content, MessageSender(Chat.Webhook.webhookName, Chat.Webhook.webhookAvatar))
+                ChatMessageEvent.EVENT.invoker().message(
+                    message.content,
+                    MessageSender(Chat.Webhook.webhookName, Chat.Webhook.webhookAvatar)
+                )
             }
         }
         ServerLifecycleEvents.SERVER_STARTING.register(IPCache)

diff --git a/src/main/kotlin/ua/mei/minekord/MinekordCommands.kt b/src/main/kotlin/ua/mei/minekord/MinekordCommands.kt
@@ -11,11 +11,7 @@ import net.minecraft.text.Text
 import ua.mei.minekord.config.MinekordConfig
 
 object MinekordCommands : CommandRegistrationCallback {
-    override fun register(
-        dispatcher: CommandDispatcher<ServerCommandSource>,
-        access: CommandRegistryAccess,
-        environment: CommandManager.RegistrationEnvironment
-    ) {
+    override fun register(dispatcher: CommandDispatcher<ServerCommandSource>, access: CommandRegistryAccess, environment: CommandManager.RegistrationEnvironment) {
         dispatcher.register(
             literal<ServerCommandSource>("minekord")
                 .requires(Permissions.require("minekord.main", 4))

diff --git a/src/main/kotlin/ua/mei/minekord/bot/extension/IPCheckExtension.kt b/src/main/kotlin/ua/mei/minekord/bot/extension/IPCheckExtension.kt
@@ -36,9 +36,7 @@ class IPCheckExtension : MinekordExtension() {
 
             MinekordBot.launch {
                 try {
-                    val member: Member = MinekordBot.guild.members.firstOrNull {
-                        it.effectiveName == name && it.roleIds.map { it.value }.containsAll(Auth.requiredRoles)
-                    } ?: return@launch
+                    val member: Member = MinekordBot.guild.members.firstOrNull { it.effectiveName == name && it.roleIds.map { it.value }.containsAll(Auth.requiredRoles) } ?: return@launch
 
                     member.getDmChannelOrNull()?.createMessage {
                         embed {

diff --git a/src/main/kotlin/ua/mei/minekord/bot/extension/MessagesExtension.kt b/src/main/kotlin/ua/mei/minekord/bot/extension/MessagesExtension.kt
@@ -38,7 +38,8 @@ class MessagesExtension : MinekordExtension() {
                 val sender: Member = event.member ?: return@action
 
                 var content: Text = if (Chat.convertMarkdown) {
-                    MinecraftSerializer.INSTANCE.serialize(message.content, MinekordBot.minecraftOptions)
+                    MinecraftSerializer.INSTANCE
+                        .serialize(message.content, MinekordBot.minecraftOptions)
                         .native(server.registryManager)
                 } else {
                     message.content.literal()
@@ -51,8 +52,7 @@ class MessagesExtension : MinekordExtension() {
                     ).native(server.registryManager)
 
                     val reply: Text = Chat.Minecraft.replyFormat.toText(server) {
-                        "sender" to (message.referencedMessage!!.author?.effectiveName
-                            ?: message.referencedMessage!!.data.author.username).literal()
+                        "sender" to (message.referencedMessage!!.author?.effectiveName ?: message.referencedMessage!!.data.author.username).literal()
                         "message" to replyContent
                         "summary" to replyContent.string.summary().literal()
                     }

diff --git a/src/main/kotlin/ua/mei/minekord/event/AdvancementGrantEvent.kt b/src/main/kotlin/ua/mei/minekord/event/AdvancementGrantEvent.kt
@@ -9,13 +9,12 @@ fun interface AdvancementGrantEvent {
     fun grant(player: ServerPlayerEntity, advancement: Advancement)
 
     companion object {
-        val EVENT: Event<AdvancementGrantEvent> =
-            EventFactory.createArrayBacked(AdvancementGrantEvent::class.java) { listeners ->
-                AdvancementGrantEvent { player, advancement ->
-                    listeners.forEach { listener ->
-                        listener.grant(player, advancement)
-                    }
+        val EVENT: Event<AdvancementGrantEvent> = EventFactory.createArrayBacked(AdvancementGrantEvent::class.java) { listeners ->
+            AdvancementGrantEvent { player, advancement ->
+                listeners.forEach { listener ->
+                    listener.grant(player, advancement)
                 }
             }
+        }
     }
 }
diff --git a/src/main/kotlin/ua/mei/minekord/util/Extensions.kt b/src/main/kotlin/ua/mei/minekord/util/Extensions.kt
@@ -41,10 +41,7 @@ fun String.summary(): String {
 
 fun GameProfile.texture(): String {
     return try {
-        JsonParser.parseString(
-            Base64.getDecoder().decode(this.properties.get("textures").firstOrNull()?.value ?: "")
-                .toString(Charsets.UTF_8)
-        )
+        JsonParser.parseString(Base64.getDecoder().decode(this.properties.get("textures").firstOrNull()?.value ?: "").toString(Charsets.UTF_8))
             .asJsonObject
             .getAsJsonObject("textures")
             .getAsJsonObject("SKIN")

diff --git a/src/main/kotlin/ua/mei/minekord/util/LuckPermsUtils.kt b/src/main/kotlin/ua/mei/minekord/util/LuckPermsUtils.kt
@@ -30,10 +30,7 @@ object LuckPermsUtils {
 
     suspend fun syncPlayer(nickname: String) {
         if (!MinekordConfig.LuckPerms.roles.isEmpty() && FabricLoader.getInstance().isModLoaded("luckperms")) {
-            val member: Member = MinekordBot.guild.members.firstOrNull {
-                it.effectiveName == nickname && it.roleIds.map { it.value }
-                    .containsAll(MinekordConfig.Auth.requiredRoles)
-            } ?: return
+            val member: Member = MinekordBot.guild.members.firstOrNull { it.effectiveName == nickname && it.roleIds.map { it.value }.containsAll(MinekordConfig.Auth.requiredRoles) } ?: return
 
             val lp: LuckPerms = LuckPermsProvider.get()
             val user: User = lp.userManager.getUser(nickname) ?: return

diff --git a/src/main/kotlin/ua/mei/minekord/util/MinekordMinecraftRenderer.kt b/src/main/kotlin/ua/mei/minekord/util/MinekordMinecraftRenderer.kt
@@ -39,8 +39,11 @@ object MinekordMinecraftRenderer : DefaultMinecraftRenderer() {
         return runBlocking {
             val role: Role? = MinekordBot.guild.getRoleOrNull(id.asSnowflake)
             val name: String = role?.name ?: "unknown-role"
-            val color: TextColor =
-                if (role != null && Chat.Minecraft.coloredRoles) TextColor.color(role.color.rgb) else Colors.mention
+            val color: TextColor = if (role != null && Chat.Minecraft.coloredRoles) {
+                TextColor.color(role.color.rgb)
+            } else {
+                Colors.mention
+            }
 
             component.append("@$name".adventure().color(color))
         }

diff --git a/src/main/kotlin/ua/mei/minekord/util/SerializerUtils.kt b/src/main/kotlin/ua/mei/minekord/util/SerializerUtils.kt
@@ -12,8 +12,7 @@ object SerializerUtils {
     val pingRegex: Regex = Regex("@(\\S{1,32})")
 
     suspend fun convertMentions(message: String): String {
-        val members: Map<String, Member> =
-            MinekordBot.guild.members.toList().associateBy { it.effectiveName.lowercase() }
+        val members: Map<String, Member> = MinekordBot.guild.members.toList().associateBy { it.effectiveName.lowercase() }
 
         return pingRegex.replace(message) { matchResult ->
             val effectiveName = matchResult.groupValues[1].lowercase()