Changes synced with 1.14.4 branch.

MairwunNx · MairwunNx · commit 2af90c606b07 · 2020-03-13T21:53:57.000+03:00
Signed-off-by: Pavel Erokhin (MairwunNx) &lt;MairwunNx@gmail.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -150,3 +150,4 @@ fabric.properties
 # Sonarlint plugin
 .idea/sonarlint
 !/gradle/wrapper/gradle-wrapper.jar
+!/libs/*
diff --git a/build.gradle b/build.gradle
@@ -72,12 +72,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(
@@ -90,16 +89,6 @@ dependencies {
         name: "kotlin-stdlib-$kotlin_jdk_version_target",
         version: kotlin_version
     )
-    compile(
-        group: "com.github.projectessentials",
-        name: "ProjectEssentials-Core",
-        version: ess_core_version
-    )
-    compile(
-        group: "com.github.projectessentials",
-        name: "ProjectEssentials-Permissions",
-        version: ess_permissions_version
-    )
 }
 
 dokka {
@@ -130,9 +119,3 @@ sourceCompatibility = targetCompatibility =
 compileKotlin.kotlinOptions.jvmTarget =
     compileTestKotlin.kotlinOptions.jvmTarget = project_jvm_version_target
 
-//noinspection GroovyAssignabilityCheck
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.15.2-1.0.1] - 2020-03-13
+
+### Added
+- `sendMessage` in `Messaging.kt` implemented.
+- Localization processing.
+- Libraries added as dependency in `build.gradle`.
+- Libraries added for `1.14.4` branch.
+
+### Changed
+- `CooldownCommand.kt` cleanup. Now usings new messaging API.
+- `UseExperimental` annotation replaced with `OptIn` in `CooldownConfig` `CooldownAPI.getCooldownTimeLeft`.
+- `sendMsg` replaced with `sendMessage`.
+- Forge updated to `28.2.0` version.
+- Kotlin updated to `1.3.70` version.
+- dokka updated to `0.10.1`.
+- kotlinx serialization updated to `0.20.0`.
+
+### Fixed
+- Incorrect permissions checking.
+
+### Removed
+- `UseExperimental` annotation from `CooldownConfig` class.
+- curseforge removed from dependency repositories.
+- `jitpack.io` maven repo removed from repositories in `build.gradle`.
+- `kotlin.Experimental` compiler arg removed from buildscript.
+- `Project Essentials` dependencies removed from buildscript.
+
 ## [1.15.2-1.0.0] - 2020-02-07
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
@@ -11,12 +11,10 @@ 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
-dokka_version=0.10.0
-ess_core_version=v1.15.2-1.0.0
-ess_permissions_version=v1.15.2-1.0.0
-module_version=1.15.2-1.0.0
+kotlin_version=1.3.70
+kotlinx_serialization_version=0.20.0
+dokka_version=0.10.1
+module_version=1.15.2-1.0.1
 module_name=Project Essentials Cooldown
 module_id=project_essentials_cooldown
 module_vendor=MairwunNx (Pavel Erokhin)
diff --git a/libs/Project Essentials Permissions-1.15.2-1.0.1.jar b/libs/Project Essentials Permissions-1.15.2-1.0.1.jar
diff --git a/libs/ProjectEssentials-Core-API-1.15.2-1.1.0.jar b/libs/ProjectEssentials-Core-API-1.15.2-1.1.0.jar
diff --git a/readme.md b/readme.md
@@ -10,7 +10,7 @@ You can also use the API, for example, as a delay in the use of an item or the l
 
 ### One more step
 
-#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/releases/download/v1.15.2-1.0.0/Project.Essentials.Cooldown-1.15.2-1.0.0.jar) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#how-to-install) · [Commands](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#commands) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#configuration) · [API Usage](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#applying-aliases) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/issues/new/choose) · [Change log](./changelog.md)
+#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/releases/download/v1.15.2-1.0.1/Project.Essentials.Cooldown-1.15.2-1.0.1.jar) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#how-to-install) · [Commands](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#commands) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#configuration) · [API Usage](https://mairwunnx.gitbook.io/project-essentials/project-essentials-cooldown#applying-aliases) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/issues/new/choose) · [Change log](./changelog.md)
 
 <a href="https://ko-fi.com/mairwunnx" target="_blank"><img src="./assets/support_social.png"></a>
 
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownAPI.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownAPI.kt
@@ -21,6 +21,7 @@ object CooldownAPI {
      * @since 1.14.4-1.0.0.0
      */
     const val DEFAULT_COOLDOWN = 5
+
     /**
      * Default cooldown literals.
      * It literals what replaced cooldowns for
@@ -88,7 +89,7 @@ object CooldownAPI {
      * @return left cooldown time in seconds for command.
      * @since 1.14.4-1.0.0.0
      */
-    @UseExperimental(ExperimentalTime::class)
+    @OptIn(ExperimentalTime::class)
     fun getCooldownTimeLeft(nickname: String, command: String): Double {
         if (cooldownTable.get(nickname, command) != null) {
             val commandExecutionTime = cooldownTable.get(nickname, command)
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownConfig.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownConfig.kt
@@ -3,12 +3,10 @@ package com.mairwunnx.projectessentials.cooldown
 import com.mairwunnx.projectessentials.cooldown.models.CooldownModel
 import com.mairwunnx.projectessentials.core.helpers.MOD_CONFIG_FOLDER
 import com.mairwunnx.projectessentials.core.helpers.jsonInstance
-import kotlinx.serialization.UnstableDefault
 import org.apache.logging.log4j.LogManager
 import java.io.File
 import java.io.FileNotFoundException
 
-@UseExperimental(UnstableDefault::class)
 internal object CooldownConfig {
     private val logger = LogManager.getLogger()
     internal var config = CooldownModel()
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownUtils.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/CooldownUtils.kt
@@ -2,7 +2,6 @@ package com.mairwunnx.projectessentials.cooldown
 
 import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.extensions.empty
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
 import com.mairwunnx.projectessentials.core.extensions.source
 import com.mairwunnx.projectessentials.core.helpers.COOLDOWN_NOT_EXPIRED
 import net.minecraftforge.event.CommandEvent
@@ -65,8 +64,7 @@ internal object CooldownUtils {
                     .replace("%0", commandSenderNickName)
                     .replace("%1", command)
             )
-            sendMsg(
-                "cooldown",
+            sendMessage(
                 commandEvent.source,
                 "not_expired",
                 commandCooldown.minus(
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/EntryPoint.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/EntryPoint.kt
@@ -2,6 +2,8 @@ package com.mairwunnx.projectessentials.cooldown
 
 import com.mairwunnx.projectessentials.cooldown.commands.CooldownCommand
 import com.mairwunnx.projectessentials.core.EssBase
+import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
+import com.mairwunnx.projectessentials.core.localization.processLocalizations
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraftforge.common.MinecraftForge
@@ -20,11 +22,24 @@ internal class EntryPoint : EssBase() {
 
     init {
         modInstance = this
-        modVersion = "1.15.2-1.0.0"
+        modVersion = "1.15.2-1.0.1"
         logBaseInfo()
         validateForgeVersion()
         MinecraftForge.EVENT_BUS.register(this)
         CooldownConfig.load()
+        loadLocalization()
+    }
+
+    private fun loadLocalization() {
+        if (LocalizationConfigurationUtils.getConfig().enabled) {
+            processLocalizations(
+                EntryPoint::class.java, listOf(
+                    "/assets/projectessentialscooldown/lang/de_de.json",
+                    "/assets/projectessentialscooldown/lang/en_us.json",
+                    "/assets/projectessentialscooldown/lang/ru_ru.json"
+                )
+            )
+        }
     }
 
     internal companion object {
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/Messaging.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/Messaging.kt
@@ -0,0 +1,23 @@
+package com.mairwunnx.projectessentials.cooldown
+
+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_cooldown.$message", *args
+        )
+    } else {
+        sendMsg(
+            "cooldown", source, message, *args
+        )
+    }
+}
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/commands/CooldownCommand.kt b/src/main/kotlin/com/mairwunnx/projectessentials/cooldown/commands/CooldownCommand.kt
@@ -3,9 +3,9 @@ package com.mairwunnx.projectessentials.cooldown.commands
 import com.mairwunnx.projectessentials.cooldown.CooldownConfig
 import com.mairwunnx.projectessentials.cooldown.EntryPoint
 import com.mairwunnx.projectessentials.cooldown.EntryPoint.Companion.hasPermission
+import com.mairwunnx.projectessentials.cooldown.sendMessage
 import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
-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.builder.LiteralArgumentBuilder.literal
 import com.mojang.brigadier.context.CommandContext
@@ -56,8 +56,7 @@ object CooldownCommand {
                 logger.info("Telegram chat: ${EntryPoint.modInstance.modTelegram}")
                 logger.info("CurseForge: ${EntryPoint.modInstance.modCurseForge}")
             } else {
-                sendMsg(
-                    "cooldown",
+                sendMessage(
                     commandSender,
                     "version.success",
                     EntryPoint.modInstance.modName,
@@ -72,12 +71,8 @@ object CooldownCommand {
             }
             return 0
         } else {
-            logger.warn(
-                PERMISSION_LEVEL
-                    .replace("%0", commandSenderPlayer!!.name.string)
-                    .replace("%1", "/cooldown")
-            )
-            sendMsg("cooldown", commandSender, "version.restricted")
+            throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown")
+            sendMessage(commandSender, "version.restricted")
             return 0
         }
     }
@@ -99,16 +94,12 @@ object CooldownCommand {
             if (isServerSender) {
                 logger.info("Successfully reloaded Cooldown configuration")
             } else {
-                sendMsg("cooldown", commandSender, "reload.success")
+                sendMessage(commandSender, "reload.success")
             }
             return 0
         } else {
-            logger.warn(
-                PERMISSION_LEVEL
-                    .replace("%0", commandSenderPlayer!!.name.string)
-                    .replace("%1", "/cooldown reload")
-            )
-            sendMsg("cooldown", commandSender, "reload.restricted")
+            throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown reload")
+            sendMessage(commandSender, "reload.restricted")
             return 0
         }
     }
@@ -130,16 +121,12 @@ object CooldownCommand {
             if (isServerSender) {
                 logger.info("Successfully saved Cooldown configuration")
             } else {
-                sendMsg("cooldown", commandSender, "save.success")
+                sendMessage(commandSender, "save.success")
             }
             return 0
         } else {
-            logger.warn(
-                PERMISSION_LEVEL
-                    .replace("%0", commandSenderPlayer!!.name.string)
-                    .replace("%1", "/cooldown save")
-            )
-            sendMsg("cooldown", commandSender, "save.restricted")
+            throwPermissionLevel(commandSenderPlayer!!.name.string, "cooldown save")
+            sendMessage(commandSender, "save.restricted")
             return 0
         }
     }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Cooldown
 
 [[mods]]
     modId="project_essentials_cooldown"
-    version="1.15.2-1.0.0"
+    version="1.15.2-1.0.1"
     displayName="Project Essentials Cooldown"
     updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Cooldown/MC-1.15.2/update.json"
     displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Cooldown"
diff --git a/update.json b/update.json
@@ -1,10 +1,11 @@
 {
   "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Cooldown",
   "1.15.2": {
+    "1.15.2-1.0.1": "Changelog for 1.0.1 https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/blob/MC-1.15.2/changelog.md#1152-101---2020-03-13",
     "1.15.2-1.0.0": "Changelog for 1.0.0 https://github.com/ProjectEssentials/ProjectEssentials-Cooldown/blob/MC-1.15.2/changelog.md#1152-100---2020-02-07"
   },
   "promos": {
-    "1.15.2-latest": "1.15.2-1.0.0",
-    "1.15.2-recommended": "1.15.2-1.0.0"
+    "1.15.2-latest": "1.15.2-1.0.1",
+    "1.15.2-recommended": "1.15.2-1.0.1"
   }
 }
