Changes synced with 1.14-4 branch.

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

Author: MairwunNx

.gitignore

@@ -160,3 +160,4 @@ fabric.properties
 # Sonarlint plugin
 .idea/sonarlint
 !/gradle/wrapper/gradle-wrapper.jar
+!/libs/ProjectEssentials-Core-API-1.15.2-1.1.0.jar

build.gradle

@@ -72,12 +72,12 @@ 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,11 +90,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-Cooldown",
@@ -129,10 +124,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"
-    }
-}

changelog.md

@@ -6,6 +6,17 @@ 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
+- Server-side only safe localization.
+- Default user `#server` with all permissions.
+
+### Changed
+- Improved internal code.
+- Dependencies: Kotlin, KotlinxSerialization updated.
+- Dokka and Forge API updated.
+
 ## [1.15.2-1.0.0] - 2020-02-07
 
 ### Added

gradle.properties

@@ -11,12 +11,11 @@ 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
+kotlin_version=1.3.70
+kotlinx_serialization_version=0.20.0
+dokka_version=0.10.1
 ess_cooldown_version=v1.15.2-1.0.0
-module_version=1.15.2-1.0.0
+module_version=1.15.2-1.0.1
 module_name=Project Essentials Permissions
 module_id=project_essentials_permissions
 module_vendor=MairwunNx (Pavel Erokhin)

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

@@ -8,7 +8,7 @@ This modification serves as a command permissions provider for players. It is ve
 
 ### Explore
 
-#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/download/v1.15.2-1.0.0/Project.Essentials.Permissions-1.15.2-1.0.0.jar) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#how-to-install) · [Commands](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#commands-and-permissions) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#configuration) · [API Using](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#api-in-using) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/issues/new/choose) · [News & updates](https://t.me/minecraftforge) · [Change log](changelog.md)
+#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/download/v1.15.2-1.0.1/Project.Essentials.Permissions-1.15.2-1.0.1.jar) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#how-to-install) · [Commands](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#commands-and-permissions) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#configuration) · [API Using](https://mairwunnx.gitbook.io/project-essentials/project-essentials-permissions#api-in-using) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/issues/new/choose) · [News & updates](https://t.me/minecraftforge) · [Change log](changelog.md)
 
 <a href="https://ko-fi.com/mairwunnx" target="_blank"><img src="./assets/support_social.png"></a>
 

readme.md

@@ -1,7 +1,8 @@
 package com.mairwunnx.projectessentials.permissions
 
 import com.mairwunnx.projectessentials.core.EssBase
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
+import com.mairwunnx.projectessentials.core.configuration.localization.LocalizationConfigurationUtils
+import com.mairwunnx.projectessentials.core.localization.processLocalizations
 import com.mairwunnx.projectessentials.permissions.commands.PermissionsCommand
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionBase
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
@@ -21,11 +22,25 @@ 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)
         PermissionBase.loadData()
+        loadLocalization()
+    }
+
+    private fun loadLocalization() {
+        if (LocalizationConfigurationUtils.getConfig().enabled) {
+            processLocalizations(
+                EntryPoint::class.java, listOf(
+                    "/assets/projectessentialspermissions/lang/de_de.json",
+                    "/assets/projectessentialspermissions/lang/en_us.json",
+                    "/assets/projectessentialspermissions/lang/ru_ru.json",
+                    "/assets/projectessentialspermissions/lang/sr_rs.json"
+                )
+            )
+        }
     }
 
     @SubscribeEvent
@@ -51,11 +66,7 @@ internal class EntryPoint : EssBase() {
                 ) && !PermissionsAPI.hasPermission(
                     player.name.string, "native.event.block.place"
                 ) -> {
-                    sendMsg(
-                        "permissions",
-                        player.commandSource,
-                        "perm.block_break.place"
-                    )
+                    sendMessage(player.commandSource, "block_break.place")
                     event.isCanceled = true
                     return
                 }
@@ -71,11 +82,7 @@ internal class EntryPoint : EssBase() {
             ) && !PermissionsAPI.hasPermission(
                 event.player.name.string, "native.event.block.break"
             ) -> {
-                sendMsg(
-                    "permissions",
-                    event.player.commandSource,
-                    "perm.block_break.restricted"
-                )
+                sendMessage(event.player.commandSource, "block_break.restricted")
                 event.isCanceled = true
                 return
             }

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

@@ -0,0 +1,23 @@
+package com.mairwunnx.projectessentials.permissions
+
+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_permissions.perm.$message", *args
+        )
+    } else {
+        sendMsg(
+            "permissions", source, "perm.$message", *args
+        )
+    }
+}