Changes synced with 1.14.4 branch.

Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>

Author: MairwunNx

.gitignore

@@ -151,3 +151,5 @@ fabric.properties
 .idea/sonarlint
 !/gradle/wrapper/gradle-wrapper.jar
 gradle/wrapper/gradle-wrapper.jar
+
+!/libs/*

build.gradle

@@ -69,12 +69,11 @@ minecraft {
 repositories {
     jcenter()
     mavenCentral()
-    maven { url("https://minecraft.curseforge.com/api/maven/") }
     maven { url("https://libraries.minecraft.net") }
-    maven { url("https://jitpack.io") }
 }
 
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     minecraft(group: "net.minecraftforge", name: "forge", version: forge_version)
     compile(group: "com.mojang", name: "brigadier", version: brigadier_version)
     compile(
@@ -87,21 +86,6 @@ dependencies {
         name: "kotlin-stdlib-$kotlin_jdk_version_target",
         version: kotlin_version
     )
-    compile(
-        group: "com.github.projectessentials",
-        name: "ProjectEssentials-Permissions",
-        version: ess_perm_version
-    )
-    compile(
-        group: "com.github.projectessentials",
-        name: "ProjectEssentials-Core",
-        version: ess_core_version
-    )
-    compile(
-        group: "com.github.projectessentials",
-        name: "ProjectEssentials-Cooldown",
-        version: ess_cooldown_version
-    )
 }
 
 jar {

changelog.md

@@ -6,6 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.15.2-1.1.1] - 2020-03-14
+
+### Added
+- Libraries as dependencies added.
+- Compatibility with safe-localization messages added.
+
+### Changed
+- Kotlin dependency updated to `1.3.70`.
+- KotlinX Serialization version updated to `0.20.0`.
+- Forge API version updated to `28.2.0`.
+- `.gitignore` unignored `libs` directory.
+- `@UseExperimental` annotation replaced with `@OptIn` in `ChatCooldown.kt`.
+
+### Removed
+- Essentials modules removed from `gradle.properties`.
+- Essentials modules removed from dependencies in `build.gradle`.
+- `jitpack.io` maven repository removed from repositories in `build.gradle`.
+- `curseforge` maven repository removed from repositories in `build.gradle`.
+
 ## [1.15.2-1.1.0] - 2020-02-11
 
 ### Added

gradle.properties

@@ -11,12 +11,9 @@ forge_mappings_channel_version=20190719-1.14.3
 brigadier_version=1.0.17
 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.15.2-1.0.0
-ess_perm_version=v1.15.2-1.0.0
-ess_cooldown_version=v1.15.2-1.0.0
-module_version=1.15.2-1.1.0
+kotlin_version=1.3.70
+kotlinx_serialization_version=0.20.0
+module_version=1.15.2-1.1.1
 module_name=Project Essentials Chat
 module_id=project_essentials_chat
 module_vendor=MairwunNx (Pavel Erokhin)

libs/Project Essentials Cooldown-1.15.2-1.0.1.jar

@@ -1,6 +1,6 @@
 <img align="center" src="assets/chat_social.png"/>
 
-<h4 align="center"><a href="https://github.com/ProjectEssentials/ProjectEssentials-Chat/releases/download/v1.15.2-1.1.0/Project.Essentials.Chat-1.15.2-1.1.0.jar">Download mod</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#how-to-install">How to install</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#permissions">Permissions</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#configuration">Configuration</a> · <a href="https://github.com/ProjectEssentials/ProjectEssentials-Chat/issues/new/choose">Troubleshooting</a> · <a href="https://t.me/minecraftforge">News & updates</a> · <a href="changelog.md">Change log</a></h4>
+<h4 align="center"><a href="https://github.com/ProjectEssentials/ProjectEssentials-Chat/releases/download/v1.15.2-1.1.1/Project.Essentials.Chat-1.15.2-1.1.1.jar">Download mod</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#how-to-install">How to install</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#permissions">Permissions</a> · <a href="https://mairwunnx.gitbook.io/project-essentials/project-essentials-chat#configuration">Configuration</a> · <a href="https://github.com/ProjectEssentials/ProjectEssentials-Chat/issues/new/choose">Troubleshooting</a> · <a href="https://t.me/minecraftforge">News & updates</a> · <a href="changelog.md">Change log</a></h4>
 
 <h4 align="center">lightweight chat manager for forge, with simple anti-spam and anti-advertising and anti-swearing protection, also with configuration.</h4>
 

libs/Project Essentials Permissions-1.15.2-1.0.1.jar

@@ -23,7 +23,7 @@ object ChatCooldown {
         minSecondsDuration: Int = DEFAULT_COOLDOWN
     ): Boolean = getCooldownTimeLeft(nickname) >= minSecondsDuration
 
-    @UseExperimental(ExperimentalTime::class)
+    @OptIn(ExperimentalTime::class)
     fun getCooldownTimeLeft(nickname: String): Double {
         if (cooldownMap[nickname] != null) {
             val commandExecutionTime = cooldownMap[nickname]

libs/ProjectEssentials-Core-API-1.15.2-1.1.0.jar

@@ -3,7 +3,6 @@ package com.mairwunnx.projectessentials.chat
 import com.mairwunnx.projectessentials.chat.EntryPoint.Companion.hasPermission
 import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
 import com.mairwunnx.projectessentials.core.extensions.empty
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
 import net.minecraft.util.Tuple
 import net.minecraftforge.event.ServerChatEvent
 
@@ -33,8 +32,7 @@ object ChatUtils {
                         fixedMessage = newMessage
                     }
                 } else {
-                    sendMsg(
-                        "chat",
+                    sendMessage(
                         event.player.commandSource,
                         "chat.blocked_word",
                         it
@@ -55,8 +53,7 @@ object ChatUtils {
         val blockedChars = ChatModelUtils.chatModel.moderation.blockedChars
         blockedChars.forEach {
             if (event.message.contains(it)) {
-                sendMsg(
-                    "chat",
+                sendMessage(
                     event.player.commandSource,
                     "chat.blocked_char"
                 )
@@ -74,8 +71,8 @@ object ChatUtils {
 
         val maxLength = ChatModelUtils.chatModel.moderation.maxMessageLength
         if (event.message.length > maxLength) {
-            sendMsg(
-                "chat", event.player.commandSource, "chat.message_maxlength"
+            sendMessage(
+                event.player.commandSource, "chat.message_maxlength"
             )
             return false
         }

readme.md

@@ -5,8 +5,9 @@ import com.mairwunnx.projectessentials.chat.commands.*
 import com.mairwunnx.projectessentials.chat.models.ChatModelUtils
 import com.mairwunnx.projectessentials.chat.models.MuteModelUtils
 import com.mairwunnx.projectessentials.core.EssBase
+import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
 import com.mairwunnx.projectessentials.core.extensions.empty
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
+import com.mairwunnx.projectessentials.core.localization.processLocalizations
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraft.util.math.AxisAlignedBB
@@ -28,13 +29,30 @@ class EntryPoint : EssBase() {
 
     init {
         modInstance = this
-        modVersion = "1.15.2-1.1.0"
+        modVersion = "1.15.2-1.1.1"
         logBaseInfo()
         validateForgeVersion()
         MinecraftForge.EVENT_BUS.register(this)
         loadAdditionalModules()
         ChatModelUtils.loadData()
         MuteModelUtils.loadData()
+        loadLocalization()
+    }
+
+    private fun loadLocalization() {
+        if (LocalizationConfigurationUtils.getConfig().enabled) {
+            processLocalizations(
+                EntryPoint::class.java, listOf(
+                    "/assets/projectessentialschat/lang/ru_ru.json",
+                    "/assets/projectessentialschat/lang/en_us.json",
+                    "/assets/projectessentialschat/lang/de_de.json",
+                    "/assets/projectessentialschat/lang/es_cl.json",
+                    "/assets/projectessentialschat/lang/fr_fr.json",
+                    "/assets/projectessentialschat/lang/pt_br.json",
+                    "/assets/projectessentialschat/lang/sv_se.json"
+                )
+            )
+        }
     }
 
     private fun loadAdditionalModules() {
@@ -114,8 +132,7 @@ class EntryPoint : EssBase() {
             val mutedBy = MuteAPI.getMuteInitiator(event.username)!!
             val reason = MuteAPI.getMuteReason(event.username)!!
 
-            sendMsg(
-                "chat",
+            sendMessage(
                 event.player.commandSource,
                 "chat.muted",
                 mutedBy,
@@ -126,13 +143,13 @@ class EntryPoint : EssBase() {
         }
 
         if (!ChatModelUtils.chatModel.messaging.chatEnabled) {
-            sendMsg("chat", event.player.commandSource, "chat.disabled")
+            sendMessage(event.player.commandSource, "chat.disabled")
             event.isCanceled = true
             return
         }
 
         if (!hasPermission(event.player, "ess.chat")) {
-            sendMsg("chat", event.player.commandSource, "chat.restricted")
+            sendMessage(event.player.commandSource, "chat.restricted")
             event.isCanceled = true
             return
         }
@@ -146,8 +163,7 @@ class EntryPoint : EssBase() {
                 ) {
                     ChatCooldown.addCooldown(event.player.name.string)
                 } else {
-                    sendMsg(
-                        "chat",
+                    sendMessage(
                         event.player.commandSource,
                         "chat.cooldown_not_expired"
                     )
@@ -166,8 +182,7 @@ class EntryPoint : EssBase() {
                         )
                     )
                 ) {
-                    sendMsg(
-                        "chat",
+                    sendMessage(
                         event.player.commandSource,
                         "chat.advertising_not_allowed"
                     )
@@ -183,7 +198,7 @@ class EntryPoint : EssBase() {
                     event.message.replace("&", "§")
                 }
             } else {
-                sendMsg("chat", event.player.commandSource, "chat.color_restricted")
+                sendMessage(event.player.commandSource, "chat.color_restricted")
                 event.isCanceled = true
                 return
             }
@@ -289,8 +304,7 @@ class EntryPoint : EssBase() {
                         }
                         return
                     } else {
-                        sendMsg(
-                            "chat",
+                        sendMessage(
                             event.player.commandSource,
                             "chat.mention_all_aborted"
                         )

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

@@ -0,0 +1,23 @@
+package com.mairwunnx.projectessentials.chat
+
+import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
+import com.mairwunnx.projectessentials.core.extensions.sendMsg
+import com.mairwunnx.projectessentials.core.localization.sendMsgV2
+import net.minecraft.command.CommandSource
+
+internal fun sendMessage(
+    source: CommandSource,
+    message: String,
+    vararg args: String
+) {
+    if (LocalizationConfigurationUtils.getConfig().enabled) {
+        sendMsgV2(
+            source.asPlayer(),
+            "project_essentials_chat.$message", *args
+        )
+    } else {
+        sendMsg(
+            "chat", source, message, *args
+        )
+    }
+}

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

@@ -1,11 +1,11 @@
 package com.mairwunnx.projectessentials.chat.commands
 
 import com.mairwunnx.projectessentials.chat.EntryPoint
+import com.mairwunnx.projectessentials.chat.sendMessage
 import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
 import com.mairwunnx.projectessentials.core.extensions.playerName
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
-import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.BoolArgumentType
 import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -65,12 +65,8 @@ object ClearChatCommand {
                         }
                     }
                 } else {
-                    logger.warn(
-                        PERMISSION_LEVEL
-                            .replace("%0", context.playerName())
-                            .replace("%1", "clear-chat")
-                    )
-                    sendMsg("chat", context.source, "chat.clear_restricted")
+                    throwPermissionLevel(context.playerName(), "clear-chat")
+                    sendMessage(context.source, "chat.clear_restricted")
                 }
             } else {
                 logger.info("Command with parameter `clearOnlyForSender` can't be executed from server. Type `cls` if you use windows or `/clear` if you use mac os or linux.")
@@ -99,7 +95,7 @@ object ClearChatCommand {
                     }
                 }
             } else {
-                sendMsg("chat", context.source, "chat.clear_other_restricted")
+                sendMessage(context.source, "chat.clear_other_restricted")
                 return 0
             }
         }