Now opped players have all permissions.

Simplified JsonConfiguration in PermissionBase.kt.
Removed redundant logger messages.
Simplified permissions command to /permissions or /perm.
Added compatibility with future versions of Cooldowns module.
Added CurseForge link for `/perm about` command.

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

Author: MairwunNx

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

@@ -1,8 +1,9 @@
 package com.mairwunnx.projectessentials.permissions
 
-import com.mairwunnx.projectessentialscore.EssBase
 import com.mairwunnx.projectessentials.permissions.commands.PermissionsCommand
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionBase
+import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
+import com.mairwunnx.projectessentialscore.EssBase
 import com.mojang.brigadier.CommandDispatcher
 import net.minecraft.command.CommandSource
 import net.minecraftforge.common.MinecraftForge
@@ -32,6 +33,7 @@ internal class EntryPoint : EssBase() {
     internal fun onServerStarting(it: FMLServerStartingEvent) {
         logger.info("$modName starting mod loading ...")
         registerCommands(it.server.commandManager.dispatcher)
+        PermissionsAPI.oppedPlayers.addAll(it.server.playerList.oppedPlayerNames)
     }
 
     private fun registerCommands(
@@ -44,8 +46,8 @@ internal class EntryPoint : EssBase() {
     @Suppress("UNUSED_PARAMETER")
     @SubscribeEvent
     internal fun onServerStopping(it: FMLServerStoppingEvent) {
-        logger.info("Shutting down $modName mod ...")
-        logger.info("    - Saving permission users data ...")
+        logger.info("Shutting down $modName mod")
+        logger.info("Saving permission users data")
         PermissionBase.saveData()
     }
 

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

@@ -1,13 +1,13 @@
 package com.mairwunnx.projectessentials.permissions.commands
 
+import com.mairwunnx.projectessentials.permissions.EntryPoint
+import com.mairwunnx.projectessentials.permissions.permissions.PermissionBase
+import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
 import com.mairwunnx.projectessentialscore.extensions.playerName
 import com.mairwunnx.projectessentialscore.extensions.sendMsg
 import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
-import com.mairwunnx.projectessentials.permissions.EntryPoint
-import com.mairwunnx.projectessentials.permissions.permissions.PermissionBase
-import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
@@ -19,37 +19,44 @@ import org.apache.logging.log4j.LogManager
 
 @Suppress("DuplicatedCode")
 internal object PermissionsCommand {
-    private val aliases = listOf("essentials", "ess")
+    private val aliases = listOf("permissions", "permission", "perm")
     private val logger = LogManager.getLogger()
 
     internal fun register(dispatcher: CommandDispatcher<CommandSource>) {
-        assignAliases()
+        tryAssignAliases()
         aliases.forEach { command ->
             dispatcher.register(
-                literal<CommandSource>(command).then(
-                    buildAboutCommand()
-                        .then(buildGroupCommand())
-                        .then(buildUserCommand())
-                        .then(buildReloadCommand())
-                        .then(buildSaveCommand())
-                )
+                literal<CommandSource>(command)
+                    .then(buildAboutCommand())
+                    .then(buildGroupCommand())
+                    .then(buildUserCommand())
+                    .then(buildReloadCommand())
+                    .then(buildSaveCommand())
             )
         }
     }
 
-    private fun assignAliases() {
+    private fun tryAssignAliases() {
         try {
             Class.forName(
                 "com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases"
             )
-            CommandsAliases.aliases["essentials"] = aliases.toMutableList()
+            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
         }
     }
 
     private fun buildAboutCommand(): LiteralArgumentBuilder<CommandSource> {
-        return Commands.literal("permissions").executes {
+        return Commands.literal("about").executes {
             return@executes aboutCommandExecute(it)
         }
     }
@@ -69,14 +76,15 @@ internal object PermissionsCommand {
                     EntryPoint.modInstance.modTargetForge,
                     EntryPoint.modInstance.modTargetMC,
                     EntryPoint.modInstance.modSources,
-                    EntryPoint.modInstance.modTelegram
+                    EntryPoint.modInstance.modTelegram,
+                    EntryPoint.modInstance.modCurseForge
                 )
             } else {
                 sendMsg("permissions", c.source, "perm.about.restricted")
                 logger.info(
                     PERMISSION_LEVEL
                         .replace("%0", c.playerName())
-                        .replace("%1", "essentials permissions")
+                        .replace("%1", "permissions")
                 )
             }
         } else {
@@ -87,6 +95,7 @@ internal object PermissionsCommand {
             logger.info("Target Minecraft version: ${EntryPoint.modInstance.modTargetMC}")
             logger.info("Source code: ${EntryPoint.modInstance.modSources}")
             logger.info("Telegram chat: ${EntryPoint.modInstance.modTelegram}")
+            logger.info("CurseForge: ${EntryPoint.modInstance.modCurseForge}")
         }
         return 0
     }
@@ -108,13 +117,15 @@ internal object PermissionsCommand {
                 logger.info(
                     PERMISSION_LEVEL
                         .replace("%0", c.playerName())
-                        .replace("%1", "essentials permissions reload")
+                        .replace("%1", "permissions reload")
                 )
                 0
             }
             else -> {
                 PermissionBase.loadData()
-                assignAliases()
+                PermissionsAPI.oppedPlayers.clear()
+                PermissionsAPI.oppedPlayers.addAll(c.source.server.playerList.oppedPlayerNames)
+                tryAssignAliases()
                 when {
                     c.isPlayerSender() -> sendMsg(
                         "permissions", c.source, "perm.reload.success"
@@ -143,7 +154,7 @@ internal object PermissionsCommand {
                 logger.info(
                     PERMISSION_LEVEL
                         .replace("%0", c.playerName())
-                        .replace("%1", "essentials permissions save")
+                        .replace("%1", "permissions save")
                 )
                 0
             }
@@ -202,7 +213,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions group [...]")
+                    .replace("%1", "permissions group [...]")
             )
             return 0
         }
@@ -223,7 +234,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions group [...]")
+                    .replace("%1", "permissions group [...]")
             )
             return 0
         }
@@ -252,7 +263,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions group [...]")
+                    .replace("%1", "permissions group [...]")
             )
             return 0
         }
@@ -326,7 +337,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions user [...]")
+                    .replace("%1", "permissions user [...]")
             )
             return 0
         }
@@ -349,7 +360,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions user [...]")
+                    .replace("%1", "permissions user [...]")
             )
             return 0
         }
@@ -378,7 +389,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions user [...]")
+                    .replace("%1", "permissions user [...]")
             )
             return 0
         }
@@ -418,7 +429,7 @@ internal object PermissionsCommand {
             logger.info(
                 PERMISSION_LEVEL
                     .replace("%0", c.playerName())
-                    .replace("%1", "essentials permissions user [...]")
+                    .replace("%1", "permissions user [...]")
             )
             return 0
         }

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

@@ -13,21 +13,18 @@ internal object PermissionBase {
     internal var permissionData = PermissionModel()
     private val json = Json(
         JsonConfiguration(
-            encodeDefaults = true,
-            strictMode = true,
-            unquoted = false,
+            strictMode = false,
             allowStructuredMapKeys = true,
-            prettyPrint = true,
-            useArrayPolymorphism = false
+            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 ...")
+        logger.debug("Setup json configuration for parsing ...")
         if (!File(permissionConfig).exists()) {
-            logger.warn("        - permission config not exist! creating it now!")
+            logger.warn("Permission config not exist! creating it now!")
             createConfigDirs(MOD_CONFIG_FOLDER)
             val defaultConfig = json.stringify(
                 PermissionModel.serializer(),
@@ -36,24 +33,17 @@ internal object PermissionBase {
             File(permissionConfig).writeText(defaultConfig)
         }
         val permConfigRaw = File(permissionConfig).readText()
-        permissionData = Json.parse(PermissionModel.serializer(), permConfigRaw)
+        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}): first 17 users!")
-        val maxUsers = if (permissionData.users.size - 1 >= 16) 16 else permissionData.users.size -1
-        permissionData.users.slice(0..maxUsers).forEach {
-            logger.info(
-                "        - name: ${it.nickname}; group: ${it.group}; nodes: ${it.permissions.size}"
-            )
-        }
+        logger.info("    - loaded users (${permissionData.users.size})")
     }
 
     internal fun saveData() {
         val permissionConfig = MOD_CONFIG_FOLDER + File.separator + "permissions.json"
-        logger.info("    - saving user permissions data ...")
         createConfigDirs(MOD_CONFIG_FOLDER)
         val permConfig = json.stringify(
             PermissionModel.serializer(),
@@ -64,7 +54,7 @@ internal object PermissionBase {
 
     @Suppress("SameParameterValue")
     private fun createConfigDirs(path: String) {
-        logger.info("        - creating config directory for user data ($path)")
+        logger.info("Creating config directory for user data ($path)")
         val configDirectory = File(path)
         if (!configDirectory.exists()) configDirectory.mkdirs()
     }

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

@@ -8,6 +8,12 @@ import com.mairwunnx.projectessentialscore.extensions.empty
  */
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 object PermissionsAPI {
+    /**
+     * Contain all opped players, for advanced permission checking.
+     * @since 1.14.4-1.0.0.0
+     */
+    var oppedPlayers: MutableList<String> = mutableListOf()
+
     /**
      * @param playerNickName nickname of target player.
      * @return instance of the class of the rights group
@@ -148,6 +154,10 @@ object PermissionsAPI {
         }
         val groupPerms = getAllGroupPermissions(groupName)
         val userPerms = getUserPermissions(playerNickName)
+
+        // if player has operator right, then return ALL permissions.
+        if (playerNickName in oppedPlayers) return listOf("*")
+
         return listOf(defaultPerms, groupPerms, userPerms).flatten()
     }
 

src/main/resources/assets/projectessentialspermissions/lang/de_de.json

@@ -1,5 +1,5 @@
 {
-  "project_essentials_permissions.perm.about.out": "§6%s\n§cVersion: §7%s\n§cMaintainer: §7%s\n§cForge Zielversion: §7%s\n§Minecraft Zielversion: §7%s\n§cSource Code: §7%s§7\n§cTelegram Chat: §7%s",
+  "project_essentials_permissions.perm.about.out": "§6%s\n§cVersion: §7%s\n§cMaintainer: §7%s\n§cForge Zielversion: §7%s\n§Minecraft Zielversion: §7%s\n§cSource Code: §7%s§7\n§cTelegram Chat: §7%s\n§cCurseForge: §7%s",
   "project_essentials_permissions.perm.about.restricted": "§cDu §7bist nicht berechtigt §cum den Befehl /essentials auszuführen.",
   "project_essentials_permissions.perm.reload.restricted": "§cDu §7bist nicht berechtigt §cum die Berechtigungskonfigurationen neu zu laden.",
   "project_essentials_permissions.perm.reload.success": "§6Berechtigungskonfigurationen §7neu geladen§6.",

src/main/resources/assets/projectessentialspermissions/lang/en_us.json

@@ -1,5 +1,5 @@
 {
-  "project_essentials_permissions.perm.about.out": "          §6%s\n§cVersion: §7%s\n§cMaintainer: §7%s\n§cTarget Forge version: §7%s\n§cTarget Minecraft version: §7%s\n§cSource code: §7%s§7\n§cTelegram chat: §7%s",
+  "project_essentials_permissions.perm.about.out": "          §6%s\n§cVersion: §7%s\n§cMaintainer: §7%s\n§cTarget Forge version: §7%s\n§cTarget Minecraft version: §7%s\n§cSource code: §7%s§7\n§cTelegram chat: §7%s\n§cCurseForge: §7%s",
   "project_essentials_permissions.perm.about.restricted": "§cYou §7don't have permission §cto execute /essentials permission command.",
   "project_essentials_permissions.perm.reload.restricted": "§cYou §7don't have permission §cto reload permission configuration.",
   "project_essentials_permissions.perm.reload.success": "§6Permission configuration §7reloaded§6.",

src/main/resources/assets/projectessentialspermissions/lang/ru_ru.json

@@ -1,5 +1,5 @@
 {
-  "project_essentials_permissions.perm.about.out": "          §6%s\n§cВерсия: §7%s\n§cСопровождающий: §7%s\n§cНацеленная Forge версия: §7%s\n§cНацеленная Minecraft версия: §7%s\n§cИсходный код: §7%s§7\n§cTelegram чат: §7%s",
+  "project_essentials_permissions.perm.about.out": "          §6%s\n§cВерсия: §7%s\n§cСопровождающий: §7%s\n§cНацеленная Forge версия: §7%s\n§cНацеленная Minecraft версия: §7%s\n§cИсходный код: §7%s§7\n§cTelegram чат: §7%s\n§cCurseForge: §7%s",
   "project_essentials_permissions.perm.about.restricted": "§cУ вас §7нет прав §cна выполнение /essentials permission команды.",
   "project_essentials_permissions.perm.reload.restricted": "§cУ вас §7нет прав §cна перезагрузку конфигурации прав.",
   "project_essentials_permissions.perm.reload.success": "§6Конфигурация прав §7перезагружена§6.",

src/main/resources/assets/projectessentialspermissions/lang/sr_rs.json

@@ -1,5 +1,5 @@
 {
-	"project_essentials_permissions.perm.about.out": "          §6%s\n§cVerzija: §7%s\n§cAdmin: §7%s\n§cCiljana Forge verzija: §7%s\n§cCiljana Minecraft verzija: §7%s\n§cIzvorni kod: §7%s§7\n§cTelegram čet: §7%s",
+	"project_essentials_permissions.perm.about.out": "          §6%s\n§cVerzija: §7%s\n§cAdmin: §7%s\n§cCiljana Forge verzija: §7%s\n§cCiljana Minecraft verzija: §7%s\n§cIzvorni kod: §7%s§7\n§cTelegram čet: §7%s\n§cCurseForge: §7%s",
 	"project_essentials_permissions.perm.about.restricted": "§cNemate §7prava §cda pokrenete /essentials komandu konfiguracije prava.",
 	"project_essentials_permissions.perm.reload.restricted": "§cNemate §7prava §cda učitate konfiguracije prava.",
 	"project_essentials_permissions.perm.reload.success": "§6Konfiguracija prava §7učitana§6.",