Added "/delhome" command and command aliases.

Fixed empty command argument for sethome command.

Author: MairwunNx

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

@@ -1,5 +1,6 @@
 package com.mairwunnx.projectessentials.projectessentialshome
 
+import com.mairwunnx.projectessentials.projectessentialshome.commands.DelHomeCommand
 import com.mairwunnx.projectessentials.projectessentialshome.commands.HomeCommand
 import com.mairwunnx.projectessentials.projectessentialshome.commands.SetHomeCommand
 import com.mairwunnx.projectessentials.projectessentialshome.storage.StorageBase
@@ -41,6 +42,7 @@ class EntryPoint : EssBase() {
         logger.info("Command registering is starting ...")
         HomeCommand.register(cmdDispatcher)
         SetHomeCommand.register(cmdDispatcher)
+        DelHomeCommand.register(cmdDispatcher)
     }
 
     @Suppress("UNUSED_PARAMETER")

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialshome/commands/DelHomeCommand.kt

@@ -0,0 +1,88 @@
+package com.mairwunnx.projectessentials.projectessentialshome.commands
+
+import com.mairwunnx.projectessentials.projectessentialshome.models.HomeModel
+import com.mairwunnx.projectessentials.projectessentialshome.storage.StorageBase
+import com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases
+import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
+import com.mairwunnx.projectessentialscore.extensions.sendMsg
+import com.mairwunnx.projectessentialscore.helpers.ONLY_PLAYER_CAN
+import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.arguments.StringArgumentType
+import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
+import com.mojang.brigadier.context.CommandContext
+import net.minecraft.command.CommandSource
+import net.minecraft.command.Commands
+import org.apache.logging.log4j.LogManager
+
+@Suppress("DuplicatedCode")
+object DelHomeCommand {
+    private val aliases = arrayOf("delhome", "edelhome", "removehome", "remhome")
+    private val logger = LogManager.getLogger()
+
+    fun register(dispatcher: CommandDispatcher<CommandSource>) {
+        logger.info("    - register \"/delhome\" command ...")
+        aliases.forEach { command ->
+            dispatcher.register(
+                literal<CommandSource>(command).executes {
+                    return@executes execute(it)
+                }.then(
+                    Commands.argument(
+                        "home name", StringArgumentType.string()
+                    ).executes {
+                        return@executes execute(it)
+                    }
+                )
+            )
+        }
+        applyCommandAliases()
+    }
+
+    private fun applyCommandAliases() {
+        try {
+            Class.forName(
+                "com.mairwunnx.projectessentialscooldown.essentials.CommandsAliases"
+            )
+            CommandsAliases.aliases["delhome"] = aliases.toMutableList()
+            logger.info("        - applying aliases: $aliases")
+        } catch (_: ClassNotFoundException) {
+            // ignored
+        }
+    }
+
+    private fun execute(c: CommandContext<CommandSource>): Int {
+        if (c.isPlayerSender()) {
+            val player = c.source.asPlayer()
+            if (PermissionsAPI.hasPermission(player.name.string, "ess.home.remove")) {
+                val playerUUID = player.uniqueID.toString()
+                val homeName: String = try {
+                    StringArgumentType.getString(c, "home name")
+                } catch (_: IllegalArgumentException) {
+                    "home"
+                }
+                val homeModel = StorageBase.getData(playerUUID).homes
+                StorageBase.getData(playerUUID).homes.forEach {
+                    if (it.home == homeName) {
+                        homeModel.remove(it)
+                        StorageBase.setData(playerUUID, HomeModel(homeModel))
+                        sendMsg("home", c.source, "home.remove.success", homeName)
+                        logger.info("Executed command \"/delhome\" from ${player.name.string}")
+                        return 0
+                    }
+                }
+                sendMsg("home", c.source, "home.not_found", homeName)
+            } else {
+                sendMsg("home", c.source, "home.remove.restricted")
+                logger.info(
+                    PERMISSION_LEVEL
+                        .replace("%0", player.name.string)
+                        .replace("%1", "delhome")
+                )
+            }
+        } else {
+            logger.info(ONLY_PLAYER_CAN.replace("%0", "delhome"))
+        }
+        return 0
+    }
+}

src/main/kotlin/com/mairwunnx/projectessentials/projectessentialshome/commands/SetHomeCommand.kt

@@ -75,7 +75,7 @@ object SetHomeCommand {
                     )
                 )
                 StorageBase.setData(playerUUID, HomeModel(homeModel))
-                sendMsg("home", c.source, "home.set.success")
+                sendMsg("home", c.source, "home.set.success", homeName)
                 logger.info("New home point for ${player.name.string} installed with data: ")
                 logger.info("    - name: $homeName")
                 logger.info("    - world / world id: $clientWorld / $worldId")

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

@@ -3,5 +3,7 @@
   "project_essentials_home.home.success": "§6Teleported to home §7%s§6.",
   "project_essentials_home.home.set.restricted": "§cYou §7don't have permission §cto set new home.",
   "project_essentials_home.home.set.success": "§6New home with name §7\"%s\" §6has been saved.",
+  "project_essentials_home.home.remove.restricted": "§cYou §7don't have permission §cto set remove home.",
+  "project_essentials_home.home.remove.success": "§6Home with name §7\"%s\" §6has been removed.",
   "project_essentials_home.home.not_found": "§cHome with name §7\"%s\" §cnot found."
 }

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

@@ -3,5 +3,7 @@
   "project_essentials_home.home.success": "§6Вы телепортированы к дому §7%s§6.",
   "project_essentials_home.home.set.restricted": "§cУ вас §7нет прав §cна установку точки нового дома.",
   "project_essentials_home.home.set.success": "§6Новая точка дома была установлена с именем §7\"%s\"§6.",
+  "project_essentials_home.home.remove.restricted": "§cУ вас §7нет прав §cна удаление точки нового дома.",
+  "project_essentials_home.home.remove.success": "§6Точка дома с именем §7\"%s\"§6 удалена.",
   "project_essentials_home.home.not_found": "§cТочка дома с именем §7\"%s\" §cне найдена."
 }