Removed redundant information logging.

Simplified code for creating directory.
Usings optimal `JsonConfiguration` from core module.

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

Author: MairwunNx

changelog.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.14.4-1.0.1.0] - 2020-01-15
+
+### Added
+- Added compatibility with core module `1.0.3.2`.
+- Added compatibility with cooldown module `1.0.2.0`.
+
+### Changed
+- Simplified code for creating directory.
+- Usings optimal `JsonConfiguration` from core module.
+- Updated gradle wrapper version to `5.6.4`.
+- CHANGELOG.md renamed to changelog.md.
+- Updated core module and cooldown module.
+- Updated version number to `1.0.1.0`.
+
+### Removed
+- Comments from [gradle.properties](gradle.properties).
+- Redundant information logging.
+
 ## [1.14.4-1.0.0.0] - 2020-01-12
 
 ### Added

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

@@ -4,8 +4,6 @@ import com.mairwunnx.projectessentials.core.EssBase
 import com.mairwunnx.projectessentials.permissions.commands.PermissionsCommand
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionBase
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
-import com.mojang.brigadier.CommandDispatcher
-import net.minecraft.command.CommandSource
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod
@@ -23,35 +21,36 @@ internal class EntryPoint : EssBase() {
         modVersion = "1.14.4-1.0.1.0"
         logBaseInfo()
         validateForgeVersion()
-        logger.debug("Register event bus for $modName mod ...")
         MinecraftForge.EVENT_BUS.register(this)
-        logger.info("Loading $modName permissions data ...")
         PermissionBase.loadData()
     }
 
     @SubscribeEvent
     internal fun onServerStarting(it: FMLServerStartingEvent) {
-        logger.info("$modName starting mod loading ...")
-        registerCommands(it.server.commandManager.dispatcher)
+        loadAdditionalModules()
+        PermissionsCommand.register(it.server.commandManager.dispatcher)
         PermissionsAPI.oppedPlayers.addAll(it.server.playerList.oppedPlayerNames)
     }
 
-    private fun registerCommands(
-        cmdDispatcher: CommandDispatcher<CommandSource>
-    ) {
-        logger.info("Command registering is starting ...")
-        PermissionsCommand.register(cmdDispatcher)
-    }
-
     @Suppress("UNUSED_PARAMETER")
     @SubscribeEvent
     internal fun onServerStopping(it: FMLServerStoppingEvent) {
-        logger.info("Shutting down $modName mod")
-        logger.info("Saving permission users data")
         PermissionBase.saveData()
     }
 
     internal companion object {
         internal lateinit var modInstance: EntryPoint
+        var cooldownsInstalled: Boolean = false
+    }
+
+    private fun loadAdditionalModules() {
+        try {
+            Class.forName(
+                "com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases"
+            )
+            cooldownsInstalled = true
+        } catch (_: ClassNotFoundException) {
+            // ignored
+        }
     }
 }

src/main/kotlin/com/mairwunnx/projectessentials/permissions/commands/PermissionsCommand.kt

@@ -37,22 +37,8 @@ internal object PermissionsCommand {
     }
 
     private fun tryAssignAliases() {
-        try {
-            Class.forName(
-                "com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases"
-            )
-            CommandsAliases.aliases["permissions"] = aliases.toMutableList()
-        } catch (_: ClassNotFoundException) {
-            try {
-                Class.forName(
-                    "com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases"
-                )
-                CommandsAliases.aliases["permissions"] = aliases.toMutableList()
-            } catch (_: ClassNotFoundException) {
-                // ignored
-            }
-            // ignored
-        }
+        if (!EntryPoint.cooldownsInstalled) return
+        CommandsAliases.aliases["permissions"] = aliases.toMutableList()
     }
 
     private fun buildAboutCommand(): LiteralArgumentBuilder<CommandSource> {

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

@@ -1,61 +1,41 @@
 package com.mairwunnx.projectessentials.permissions.permissions
 
 import com.mairwunnx.projectessentials.core.helpers.MOD_CONFIG_FOLDER
+import com.mairwunnx.projectessentials.core.helpers.jsonInstance
 import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import org.apache.logging.log4j.LogManager
 import java.io.File
 
 @UseExperimental(UnstableDefault::class)
 internal object PermissionBase {
     private val logger = LogManager.getLogger()
     internal var permissionData = PermissionModel()
-    private val json = Json(
-        JsonConfiguration(
-            strictMode = false,
-            allowStructuredMapKeys = true,
-            prettyPrint = true
-        )
-    )
 
     internal fun loadData() {
         val permissionConfig = MOD_CONFIG_FOLDER + File.separator + "permissions.json"
-        logger.info("Loading user permissions data ...")
-        logger.debug("Setup json configuration for parsing ...")
+        logger.info("Loading user permissions data")
         if (!File(permissionConfig).exists()) {
             logger.warn("Permission config not exist! creating it now!")
-            createConfigDirs(MOD_CONFIG_FOLDER)
-            val defaultConfig = json.stringify(
+            File(MOD_CONFIG_FOLDER).mkdirs()
+            val defaultConfig = jsonInstance.stringify(
                 PermissionModel.serializer(),
                 permissionData
             )
             File(permissionConfig).writeText(defaultConfig)
         }
         val permConfigRaw = File(permissionConfig).readText()
-        permissionData = json.parse(PermissionModel.serializer(), permConfigRaw)
-        logger.info("*** PermissionsAPI by Project Essentials!")
-        logger.info("    - loaded groups (${permissionData.groups.size})")
-        permissionData.groups.forEach {
-            logger.info("        - name: ${it.name}; nodes: ${it.permissions.size}")
-        }
-        logger.info("    - loaded users (${permissionData.users.size})")
+        permissionData = jsonInstance.parse(PermissionModel.serializer(), permConfigRaw)
+        logger.info("Loaded permission groups (${permissionData.groups.size})")
+        logger.info("Loaded permission users (${permissionData.users.size})")
     }
 
     internal fun saveData() {
         val permissionConfig = MOD_CONFIG_FOLDER + File.separator + "permissions.json"
-        createConfigDirs(MOD_CONFIG_FOLDER)
-        val permConfig = json.stringify(
+        File(MOD_CONFIG_FOLDER).mkdirs()
+        val permConfig = jsonInstance.stringify(
             PermissionModel.serializer(),
             permissionData
         )
         File(permissionConfig).writeText(permConfig)
     }
-
-    @Suppress("SameParameterValue")
-    private fun createConfigDirs(path: String) {
-        logger.info("Creating config directory for user data ($path)")
-        val configDirectory = File(path)
-        if (!configDirectory.exists()) configDirectory.mkdirs()
-    }
 }

update.json

@@ -1,6 +1,7 @@
 {
-  "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/tag/v1.14.4-1.0.0.0",
+  "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/tag/v1.14.4-1.0.1.0",
   "1.14.4": {
+    "1.14.4-1.0.1.0": " - Added compatibility with core module `1.0.3.2`.\n - Added compatibility with cooldown module `1.0.2.0`.\n - Updated gradle wrapper version to `5.6.4`.\n - CHANGELOG.md renamed to changelog.md.\n - Updated core module and cooldown module.\n - Updated version number to `1.0.1.0`.\n - Removed comments from gradle.properties.\n - Removed redundant information logging.\n - Simplified code for creating directory.\n - Usings optimal `JsonConfiguration` from core module.",
     "1.14.4-1.0.0.0": " - build.gradle little file refactoring.\n - Implemented permission groups inheritance permissions.\n - Removed redundant logger messages.\n - Fixed incorrect permission node for /permission reload command.\n - Fixed grammatical mistakes by @abhiroopwastaken\n - Fixed grammatical mistakes by @Aircoookie\n - PermissionData renamed to PermissionModel.kt\n - build.gradle little file refactoring.\n - Updated forge version, bumped kotlinx serialization.\n - Updated kotlin runtime version.\n - Simplified `JsonConfiguration` in PermissionBase.kt\n - Simplified permissions command to `/permissions` or `/perm`.\n - readme.md changed information for developers.\n - Added CHANGELOG.md file.\n - Implemented permission groups inheritance permissions.\n - Added ability to use shorten permission nodes.\n - Added pull request temple to this repository by @huangyz0918\n - Added Serbian translation by @vr1e\n - Added German translation by @BixelPitch\n - Added detecting opped players (now all opped players have all permissions).\n - Added Compatibility with future versions of `Cooldowns` module.\n - Added CurseForge link for `/perm about` command.",
     "1.14.4-0.2.0.0": " - Improved configuration logging after loading.\n - Fixed incorrect permission removing from user\n - Fixed mod crash on loading permission data for users.\n - Fixed incorrect command aliases registering.",
     "1.14.4-0.1.1.0": " - Code cleanup. Added core module as dependency.",
@@ -9,7 +10,7 @@
     "1.14.4-0.1.0.0": " - Initial release of PermissionsAPI as Project Essentials part."
   },
   "promos": {
-    "1.14.4-latest": "1.14.4-1.0.0.0",
-    "1.14.4-recommended": "1.14.4-1.0.0.0"
+    "1.14.4-latest": "1.14.4-1.0.1.0",
+    "1.14.4-recommended": "1.14.4-1.0.1.0"
   }
 }