From a95bc5434dabdaed3c9c7b08f116ccd1ed9647e4 Mon Sep 17 00:00:00 2001
From: LartyHD <lartyhd@gmail.com>
Date: Wed, 28 Aug 2019 21:58:08 +0200
Subject: [PATCH] Fixed ChatModule message not displayed bug

---
 modules/Chat/build.gradle                     |  5 ++++
 .../servercore/modules/chat/ChatModule.kt     | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 modules/Chat/build.gradle

diff --git a/modules/Chat/build.gradle b/modules/Chat/build.gradle
new file mode 100644
index 0000000..ddc7e7d
--- /dev/null
+++ b/modules/Chat/build.gradle
@@ -0,0 +1,5 @@
+/*
+ * © Copyright - Lars Artmann aka. LartyHD 2019.
+ */
+
+version = "1.0.1"
\ No newline at end of file
diff --git a/modules/Chat/src/main/kotlin/de/astride/servercore/modules/chat/ChatModule.kt b/modules/Chat/src/main/kotlin/de/astride/servercore/modules/chat/ChatModule.kt
index f193a81..d0c135c 100644
--- a/modules/Chat/src/main/kotlin/de/astride/servercore/modules/chat/ChatModule.kt
+++ b/modules/Chat/src/main/kotlin/de/astride/servercore/modules/chat/ChatModule.kt
@@ -7,8 +7,8 @@ import net.darkdevelopers.darkbedrock.darkness.general.modules.Module
 import net.darkdevelopers.darkbedrock.darkness.general.modules.ModuleDescription
 import net.darkdevelopers.darkbedrock.darkness.spigot.functions.events.setChatFormat
 import net.darkdevelopers.darkbedrock.darkness.spigot.functions.events.unregisterChatFormat
+import net.darkdevelopers.darkbedrock.darkness.spigot.functions.translateColors
 import org.bukkit.Bukkit
-import org.bukkit.ChatColor
 
 /**
  * @author Lars Artmann | LartyHD
@@ -21,23 +21,20 @@ class ChatModule : Module {
         get() = Bukkit.getServicesManager().getRegistration(LuckPermsApi::class.java)?.provider.toNonNull("LuckPermsAPI Service can not be null")
 
     override val description: ModuleDescription = ModuleDescription(
-        javaClass.canonicalName,
-        "1.0.0",
+        javaClass.simpleName,
+        "1.0.1",
         "DevSnox & Lars Artmann | LartyHD",
         "Definiert die Darstellung der Nachrichten!"
     )
 
     override fun start() = setChatFormat { event ->
         val player = event.player
-        var message = event.message
+        var message: String = event.message
 
         if (!player.hasPermission("chatmodule.color.all")) {
-            if (player.hasPermission("chatmodule.color.basic")) {
-                message = ChatColor.translateAlternateColorCodes('&', message)
+            if (player.hasPermission("chatmodule.color.basic"))
                 message = message.replace("\u00A7((?i)[fk-or])".toRegex(), "")
-            } else {
-                message.replace("&", "")
-            }
+            message = message.translateColors()
         }
 
         val stringBuilder = StringBuilder()
@@ -46,7 +43,13 @@ class ChatModule : Module {
         val prefix =
             luckPermsApi.userManager.getUser(player.uniqueId)?.cachedData?.getMetaData(Contexts.allowAll())?.prefix
 
-        stringBuilder.append(prefix).append("§8- ").append(prefix?.substring(0, 2)).append(player.name).append(" §8» ")
+        stringBuilder
+            .append(prefix)
+            .append("§8- ")
+            .append(prefix?.substring(0, 2))
+            .append(player.name)
+            .append(" §8» ")
+
 
         when (group?.name) {
             "owner", "admin" -> stringBuilder.append("§4§l")
@@ -57,7 +60,7 @@ class ChatModule : Module {
             }
         }
 
-        ChatColor.translateAlternateColorCodes('&', stringBuilder.toString())
+        stringBuilder.append(message).toString().translateColors()
     }
 
     override fun stop() = unregisterChatFormat()