Set-home command re-written.

Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentials/home/commands/HomeCommand.kt

@@ -16,7 +16,7 @@ object HomeCommand : CommandBase(homeLiteral, false) {
     override val name = "home"
     override fun process(context: CommandContext<CommandSource>) = 0.also {
         fun out(status: String, vararg args: String) = MessagingAPI.sendMessage(
-            context.getPlayer()!!, "${MESSAGE_MODULE_PREFIX}home.$status", args = *args
+            context.getPlayer()!!, "${MESSAGE_MODULE_PREFIX}home.home.$status", args = *args
         )
 
         validateAndExecute(context, "ess.home.teleport", 0) { isServer ->

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

@@ -1,87 +1,60 @@
 package com.mairwunnx.projectessentials.home.commands
 
-import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
-import com.mairwunnx.projectessentials.core.extensions.isPlayerSender
-import com.mairwunnx.projectessentials.core.extensions.sendMsg
-import com.mairwunnx.projectessentials.core.helpers.throwOnlyPlayerCan
-import com.mairwunnx.projectessentials.core.helpers.throwPermissionLevel
-import com.mairwunnx.projectessentials.home.EntryPoint
-import com.mairwunnx.projectessentials.home.EntryPoint.Companion.hasPermission
-import com.mairwunnx.projectessentials.home.HomeAPI
-import com.mairwunnx.projectessentials.home.sendMessage
-import com.mojang.brigadier.CommandDispatcher
-import com.mojang.brigadier.arguments.BoolArgumentType
-import com.mojang.brigadier.arguments.StringArgumentType
-import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
+import com.mairwunnx.projectessentials.core.api.v1.MESSAGE_MODULE_PREFIX
+import com.mairwunnx.projectessentials.core.api.v1.commands.CommandAPI
+import com.mairwunnx.projectessentials.core.api.v1.commands.CommandBase
+import com.mairwunnx.projectessentials.core.api.v1.extensions.currentDimensionId
+import com.mairwunnx.projectessentials.core.api.v1.extensions.getPlayer
+import com.mairwunnx.projectessentials.core.api.v1.messaging.MessagingAPI
+import com.mairwunnx.projectessentials.core.api.v1.messaging.ServerMessagingAPI
+import com.mairwunnx.projectessentials.home.configurations.HomeConfigurationModel
+import com.mairwunnx.projectessentials.home.helpers.validateAndExecute
+import com.mairwunnx.projectessentials.home.homeConfiguration
 import com.mojang.brigadier.context.CommandContext
 import net.minecraft.command.CommandSource
-import net.minecraft.command.Commands
-import org.apache.logging.log4j.LogManager
 
-internal object SetHomeCommand {
-    private val aliases = arrayOf("sethome", "esethome")
-    private val logger = LogManager.getLogger()
+object SetHomeCommand : CommandBase(setHomeLiteral, false) {
+    override val name = "set-home"
+    override fun process(context: CommandContext<CommandSource>) = 0.also {
+        fun out(status: String, vararg args: String) = MessagingAPI.sendMessage(
+            context.getPlayer()!!, "${MESSAGE_MODULE_PREFIX}home.sethome.$status", args = *args
+        )
 
-    fun register(dispatcher: CommandDispatcher<CommandSource>) {
-        logger.info("Register \"/sethome\" command")
-        applyCommandAliases()
-
-        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)
-                    }.then(
-                        Commands.argument(
-                            "override", BoolArgumentType.bool()
-                        ).executes {
-                            return@executes execute(
-                                it, BoolArgumentType.getBool(it, "override")
+        validateAndExecute(context, "ess.home.set", 0) { isServer ->
+            if (isServer) {
+                ServerMessagingAPI.throwOnlyPlayerCan()
+            } else {
+                val player = context.getPlayer()!!
+                val name = if (CommandAPI.getStringExisting(context, "home")) {
+                    CommandAPI.getString(context, "home")
+                } else "home"
+
+                fun commit(user: HomeConfigurationModel.User?) {
+                    fun fromUser() = HomeConfigurationModel.User.Home(
+                        name, player.currentDimensionId,
+                        player.position.x, player.position.y, player.position.z,
+                        player.rotationYaw, player.rotationPitch
+                    ).also { out("success", name).also { super.process(context) } }
+
+                    user?.homes?.add(fromUser()) ?: run {
+                        homeConfiguration.users.add(
+                            HomeConfigurationModel.User(
+                                player.name.string,
+                                player.uniqueID.toString(),
+                                mutableListOf(fromUser())
                             )
-                        }
-                    )
-                )
-            )
-        }
-    }
-
-    private fun applyCommandAliases() {
-        if (!EntryPoint.cooldownsInstalled) return
-        CommandsAliases.aliases["sethome"] = aliases.toMutableList()
-    }
-
-    private fun execute(
-        c: CommandContext<CommandSource>,
-        override: Boolean = false
-    ): Int {
-        if (c.isPlayerSender()) {
-            val player = c.source.asPlayer()
-            if (hasPermission(player, "ess.home.set")) {
-                val homeName: String = try {
-                    StringArgumentType.getString(c, "home name")
-                } catch (_: IllegalArgumentException) {
-                    "home"
+                        )
+                    }
                 }
 
-                val result = HomeAPI.create(player, homeName, override)
-                if (!result) {
-                    sendMessage(c.source, "set.already_exist", homeName)
-                    return 0
-                }
-
-                sendMessage(c.source, "set.success", homeName)
-                logger.info("Executed command \"/sethome\" from ${player.name.string}")
-            } else {
-                sendMsg("home", c.source, "home.set.restricted")
-                throwPermissionLevel(player.name.string, "sethome")
+                homeConfiguration.users.asSequence().find {
+                    it.name == player.name.string || it.uuid == player.uniqueID.toString()
+                }?.let { user ->
+                    user.homes.asSequence().find {
+                        it.home == name
+                    }?.let { out("exist", name) } ?: run { commit(user) }
+                } ?: run { commit(null) }
             }
-        } else {
-            throwOnlyPlayerCan("sethome")
         }
-        return 0
     }
 }