Fixed compiler errors.

Version changed to semver.
Updated dependencies.

Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>

Author: MairwunNx

gradle.properties

@@ -13,10 +13,10 @@ kotlin_jdk_version_target=jdk8
 project_jvm_version_target=1.8
 kotlin_version=1.3.61
 kotlinx_serialization_version=0.14.0
-ess_core_version=v1.14.4-1.+
-ess_perm_version=v1.14.4-0.+
-ess_cooldown_version=v1.14.4-1.+
-module_version=1.14.4-0.2.0.0
+ess_core_version=v1.14.4-1.1.0.0
+ess_perm_version=v1.14.4-1.1.0.0
+ess_cooldown_version=v1.14.4-1.0.2.0
+module_version=1.14.4-0.2.0
 module_name=Project Essentials Chat
 module_id=project_essentials_chat
 module_vendor=MairwunNx (Pavel Erokhin)

src/main/kotlin/com/mairwunnx/projectessentials/chat/ChatUtils.kt

@@ -2,8 +2,8 @@ package com.mairwunnx.projectessentials.chat
 
 import com.mairwunnx.projectessentials.chat.EntryPoint.Companion.hasPermission
 import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
-import com.mairwunnx.projectessentialscore.extensions.empty
-import com.mairwunnx.projectessentialscore.extensions.sendMsg
+import com.mairwunnx.projectessentials.core.extensions.empty
+import com.mairwunnx.projectessentials.core.extensions.sendMsg
 import net.minecraft.util.Tuple
 import net.minecraftforge.event.ServerChatEvent
 

src/main/kotlin/com/mairwunnx/projectessentials/chat/EntryPoint.kt

@@ -1,10 +1,10 @@
 package com.mairwunnx.projectessentials.chat
 
 import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
-import com.mairwunnx.projectessentialscore.EssBase
-import com.mairwunnx.projectessentialscore.extensions.empty
-import com.mairwunnx.projectessentialscore.extensions.sendMsg
-import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
+import com.mairwunnx.projectessentials.core.EssBase
+import com.mairwunnx.projectessentials.core.extensions.empty
+import com.mairwunnx.projectessentials.core.extensions.sendMsg
+import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraft.util.math.AxisAlignedBB
 import net.minecraft.util.text.TextComponentUtils
@@ -23,10 +23,9 @@ class EntryPoint : EssBase() {
 
     init {
         modInstance = this
-        modVersion = "1.14.4-0.2.0.0"
+        modVersion = "1.14.4-0.2.0"
         logBaseInfo()
         validateForgeVersion()
-        logger.debug("Register event bus for $modName mod ...")
         MinecraftForge.EVENT_BUS.register(this)
         loadAdditionalModules()
         ChatModelUtils.loadData()
@@ -59,7 +58,6 @@ class EntryPoint : EssBase() {
     @Suppress("UNUSED_PARAMETER")
     @SubscribeEvent
     fun onServerStopping(it: FMLServerStoppingEvent) {
-        logger.info("Shutting down $modName mod ...")
         ChatModelUtils.saveData()
     }
 
@@ -100,7 +98,10 @@ class EntryPoint : EssBase() {
         if (!ChatModelUtils.chatModel.moderation.advertisingAllowed) {
             if (!hasPermission(event.player, "ess.chat.advertising.bypass", 3)) {
                 if (event.message.matches(
-                        Regex(ChatModelUtils.chatModel.moderation.advertisingRegex)
+                        Regex(
+                            ChatModelUtils.chatModel.moderation.advertisingRegex,
+                            RegexOption.IGNORE_CASE
+                        )
                     )
                 ) {
                     sendMsg(
@@ -184,7 +185,9 @@ class EntryPoint : EssBase() {
         val mentionSettings = ChatModelUtils.chatModel.mentions
         val mentions = mutableListOf<String>()
         if (mentionSettings.mentionsEnabled) {
-            Regex("@\\S[a-zA-Z0-9]*").findAll(event.component.formattedText).forEach {
+            Regex(
+                "@\\S[a-zA-Z0-9]*", RegexOption.IGNORE_CASE
+            ).findAll(event.component.formattedText).forEach {
                 if (it.value != "@e" &&
                     it.value != "@a" &&
                     it.value != "@p" &&

src/main/kotlin/com/mairwunnx/projectessentials/chat/models/ChatModelUtils.kt

@@ -1,56 +1,34 @@
 package com.mairwunnx.projectessentials.chat.models
 
-import com.mairwunnx.projectessentialscore.helpers.MOD_CONFIG_FOLDER
-import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
+import com.mairwunnx.projectessentials.core.helpers.MOD_CONFIG_FOLDER
+import com.mairwunnx.projectessentials.core.helpers.jsonInstance
 import org.apache.logging.log4j.LogManager
 import java.io.File
 
-@UseExperimental(UnstableDefault::class)
 object ChatModelUtils {
     private val warpsConfig = MOD_CONFIG_FOLDER + File.separator + "chat.json"
     private val logger = LogManager.getLogger()
     var chatModel = ChatModel()
-    private val json = Json(
-        JsonConfiguration(
-            strictMode = false,
-            allowStructuredMapKeys = true,
-            prettyPrint = true
-        )
-    )
 
     fun loadData() {
         logger.info("Loading chat configuration")
         if (!File(warpsConfig).exists()) {
             logger.warn("Chat configuration file not exist! creating it now!")
-            createConfigDirs(MOD_CONFIG_FOLDER)
-            val defaultConfig = json.stringify(
-                ChatModel.serializer(),
-                chatModel
+            File(MOD_CONFIG_FOLDER).mkdirs()
+            val defaultConfig = jsonInstance.stringify(
+                ChatModel.serializer(), chatModel
             )
             File(warpsConfig).writeText(defaultConfig)
         }
         val warpsConfigRaw = File(warpsConfig).readText()
-        chatModel = json.parse(ChatModel.serializer(), warpsConfigRaw)
-        logger.info("Chat configuration loading done")
+        chatModel = jsonInstance.parse(ChatModel.serializer(), warpsConfigRaw)
     }
 
     fun saveData() {
-        logger.info("Saving chat configuration to file")
-        createConfigDirs(MOD_CONFIG_FOLDER)
-        val spawnConfig = json.stringify(
-            ChatModel.serializer(),
-            chatModel
+        File(MOD_CONFIG_FOLDER).mkdirs()
+        val spawnConfig = jsonInstance.stringify(
+            ChatModel.serializer(), chatModel
         )
         File(warpsConfig).writeText(spawnConfig)
-        logger.info("Saving chat configuration done")
-    }
-
-    @Suppress("SameParameterValue")
-    private fun createConfigDirs(path: String) {
-        logger.info("Creating config directory for chat configuration")
-        val configDirectory = File(path)
-        if (!configDirectory.exists()) configDirectory.mkdirs()
     }
 }

src/main/resources/META-INF/mods.toml

@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Chat/iss
 
 [[mods]]
     modId="project_essentials_chat"
-    version="1.14.4-0.2.0.0"
+    version="1.14.4-0.2.0"
     displayName="Project Essentials Chat"
     updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Chat/MC-1.14.4/update.json"
     displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Chat"