[2.1.0] Update & Fix

Author: ItsFlicker

build.gradle.kts

@@ -19,7 +19,7 @@ subprojects {
             install(BUKKIT_ALL, BUNGEE, VELOCITY)
         }
         version {
-            taboolib = "6.1.1-beta10"
+            taboolib = "6.1.1-beta18"
             coroutines = null
         }
     }

gradle.properties

@@ -1,7 +1,7 @@
 group=me.arasple.mc.trchat
-version=2.0.16
+version=2.1.0
 kotlin.incremental=true
 kotlin.incremental.java=true
-koltin.incremental.useClasspathSnapshot=true
+kotlin.incremental.useClasspathSnapshot=true
 kotlin.caching.enabled=true
 kotlin.parallel.tasks.in.project=true

plugin/build.gradle.kts

@@ -29,13 +29,13 @@ dependencies {
 tasks {
     jar {
         // 构件名
-        archiveFileName.set("${rootProject.name}-${archiveFileName.get().substringAfter('-')}")
+        archiveBaseName.set(rootProject.name)
         // 打包子项目源代码
         rootProject.subprojects.forEach { from(it.sourceSets["main"].output) }
     }
     sourcesJar {
         // 构件名
-        archiveFileName.set("${rootProject.name}-${archiveFileName.get().substringAfter('-')}")
+        archiveBaseName.set(rootProject.name)
         // 打包子项目源代码
         rootProject.subprojects.forEach { from(it.sourceSets["main"].allSource) }
     }

project/runtime-bukkit/src/main/java/me/arasple/mc/trchat/util/color/HexUtils.java

@@ -226,6 +226,7 @@ public static String parseHex(String message) {
     }
 
     public static String parseLegacy(String message) {
+        message = message.replace("&r", "&f").replace("§r", "§f");
         return ChatColor.translateAlternateColorCodes('&', message);
     }
 

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/impl/BukkitComponentManager.kt

@@ -1,5 +1,7 @@
 package me.arasple.mc.trchat.api.impl
 
+import com.google.common.cache.Cache
+import com.google.common.cache.CacheBuilder
 import me.arasple.mc.trchat.TrChat
 import me.arasple.mc.trchat.api.ComponentManager
 import me.arasple.mc.trchat.api.event.TrChatReceiveEvent
@@ -31,6 +33,10 @@ object BukkitComponentManager : ComponentManager {
     @ConfigNode("Enable.Chat", "filter.yml")
     var isFilterEnabled = true
 
+    private val filteredCache: Cache<ComponentText, ComponentText> = CacheBuilder.newBuilder()
+        .maximumSize(10)
+        .build()
+
     init {
         PlatformFactory.registerAPI<ComponentManager>(this)
     }
@@ -71,7 +77,9 @@ object BukkitComponentManager : ComponentManager {
     }
 
     override fun filterComponent(component: ComponentText, maxLength: Int): ComponentText {
-        return validateComponent(DefaultComponent(listOf(filterComponent(component.toSpigotObject()))), maxLength)
+        return filteredCache.get(component) {
+            validateComponent(DefaultComponent(listOf(filterComponent(component.toSpigotObject()))), maxLength)
+        }
     }
 
     override fun validateComponent(component: ComponentText, maxLength: Int): ComponentText {

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt

@@ -160,7 +160,7 @@ object Loader {
                 val suffix = parseGroups(map["suffix"] as? LinkedHashMap<*, *>)
                 Format(condition, priority, prefix, msg, suffix)
             }.sortedBy { it.priority }
-            val console = conf.getMapList("Console").firstOrNull()?.let { map ->
+            val console = conf.getMapList("Console").map { map ->
                 val prefix = parseGroups(map["prefix"] as LinkedHashMap<*, *>)
                 val msg = parseMsg(map["msg"] as LinkedHashMap<*, *>)
                 val suffix = parseGroups(map["suffix"] as? LinkedHashMap<*, *>)
@@ -177,7 +177,7 @@ object Loader {
                 val suffix = parseGroups(map["suffix"] as? LinkedHashMap<*, *>)
                 Format(condition, priority, prefix, msg, suffix)
             }.sortedBy { it.priority }
-            val console = conf.getMapList("Console").firstOrNull()?.let { map ->
+            val console = conf.getMapList("Console").map { map ->
                 val prefix = parseGroups(map["prefix"] as LinkedHashMap<*, *>)
                 val msg = parseMsg(map["msg"] as LinkedHashMap<*, *>)
                 val suffix = parseGroups(map["suffix"] as? LinkedHashMap<*, *>)

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/channel/Channel.kt

@@ -35,7 +35,7 @@ open class Channel(
     val bindings: ChannelBindings,
     val events: ChannelEvents,
     val formats: List<Format>,
-    val consoleFormat: Format? = null
+    val consoleFormat: List<Format>
 ) {
 
     val listeners: MutableSet<String> = mutableSetOf()
@@ -102,7 +102,7 @@ open class Channel(
             return execute(sender, message)
         }
         val component = Components.empty()
-        consoleFormat?.let { format ->
+        consoleFormat.firstOrNull()?.let { format ->
             format.prefix.forEach { prefix ->
                 component.append(prefix.value[0].content.toTextComponent(sender)) }
             component.append(format.msg.createComponent(sender, message, settings.disabledFunctions))

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/channel/PrivateChannel.kt

@@ -40,7 +40,7 @@ class PrivateChannel(
     events: ChannelEvents,
     val sender: List<Format>,
     val receiver: List<Format>,
-    consoleFormat: Format?
+    consoleFormat: List<Format>
 ) : Channel(id, settings, bindings, events, emptyList(), consoleFormat) {
 
     var consolePrivateTo: String? = null
@@ -104,13 +104,26 @@ class PrivateChannel(
         }
         val to = consolePrivateTo ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.NO_RECEIVER)
         val component = Components.empty()
-        consoleFormat?.let { format ->
-            format.prefix.forEach { prefix ->
-                component.append(prefix.value[0].content.toTextComponent(sender)) }
-            component.append(format.msg.createComponent(sender, message, settings.disabledFunctions))
-            format.suffix.forEach { suffix ->
-                component.append(suffix.value[0].content.toTextComponent(sender)) }
-        } ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.NO_FORMAT)
+        val toPlayer = Bukkit.getPlayer(to)
+        if (toPlayer?.isOnline == true) {
+            consoleFormat.firstOrNull { it.condition.pass(toPlayer) }?.let { format ->
+                format.prefix
+                    .mapNotNull { prefix -> prefix.value.firstOrNull { it.condition.pass(toPlayer) }?.content?.toTextComponent(toPlayer) }
+                    .forEach { prefix -> component.append(prefix) }
+                component.append(format.msg.createComponent(toPlayer, message, settings.disabledFunctions))
+                format.suffix
+                    .mapNotNull { suffix -> suffix.value.firstOrNull { it.condition.pass(toPlayer) }?.content?.toTextComponent(toPlayer) }
+                    .forEach { suffix -> component.append(suffix) }
+            } ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.NO_FORMAT)
+        } else {
+            consoleFormat.firstOrNull()?.let { format ->
+                format.prefix.forEach { prefix ->
+                    component.append(prefix.value[0].content.toTextComponent(sender)) }
+                component.append(format.msg.createComponent(sender, message, settings.disabledFunctions))
+                format.suffix.forEach { suffix ->
+                    component.append(suffix.value[0].content.toTextComponent(sender)) }
+            } ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.NO_FORMAT)
+        }
 
         console().sendComponent(null, component)
         if (settings.proxy && BukkitProxyManager.processor != null) {

project/runtime-bukkit/src/main/resources/channels/Private.yml

@@ -23,7 +23,7 @@ Receiver:
       default-color: 'f'
       hover: '&7日期: %server_time_HH:mm:ss%'
 
-# Can't use placeholders!
+# Placeholders & Conditions are available only when not proxy!
 Console:
   - prefix:
       server: