Implemented HomeAPI.remove method.

Implemented HomeAPI.takeAll method.
Implemented HomeAPI.take method.
Implemented HomeAPI.contains method.

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

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentials/home/api/HomeAPI.kt

@@ -38,18 +38,14 @@ object HomeAPI {
         val zPos = owner.posZ.toInt()
         val yaw = owner.rotationYaw
         val pitch = owner.rotationPitch
-        val homes = StorageBase.getData(playerUUID).homes
-
-        if (homes.isNotEmpty()) {
-            if (override) {
-                homes.removeAll {
-                    it.home == name
-                }
-            } else {
-                homes.forEach {
-                    if (it.home == name) return false
-                }
+        val homes = takeAll(owner)
+
+        if (override) {
+            homes.removeAll {
+                it.home == name
             }
+        } else {
+            if (contains(homes, name)) return false
         }
 
         homes.add(
@@ -60,4 +56,80 @@ object HomeAPI {
         StorageBase.setData(playerUUID, HomeModel(homes))
         return true
     }
+
+    /**
+     * Remove home for target player with specified name.
+     *
+     * @param owner ServerPlayerEntity class instance,
+     * target home owner.
+     * @param name home name to remove with default value `home`.
+     *
+     * @return true if home removing successful otherwise false.
+     *
+     * @since 1.14.4-1.2.0
+     */
+    fun remove(
+        owner: ServerPlayerEntity,
+        name: String = "home"
+    ): Boolean {
+        val playerUUID = owner.uniqueID.toString()
+        val homes = takeAll(owner)
+
+        take(owner, name)?.let {
+            homes.remove(it)
+            StorageBase.setData(playerUUID, HomeModel(homes))
+            return true
+        }
+        return false
+    }
+
+    /**
+     * @param owner ServerPlayerEntity class instance,
+     * target home owner.
+     *
+     * @return all player registered homes.
+     *
+     * @since 1.14.4-1.2.0
+     */
+    fun takeAll(owner: ServerPlayerEntity): MutableList<HomeModel.Home> =
+        StorageBase.getData(owner.uniqueID.toString()).homes
+
+    /**
+     * @param owner ServerPlayerEntity class instance,
+     * target home owner.
+     * @param name home name with default value `home`.
+     *
+     * @return null if home not exist otherwise home instance.
+     *
+     * @since 1.14.4-1.2.0
+     */
+    fun take(
+        owner: ServerPlayerEntity,
+        name: String = "home"
+    ): HomeModel.Home? {
+        val homes = takeAll(owner)
+        homes.forEach {
+            if (it.home == name) return it
+        }
+        return null
+    }
+
+    /**
+     * @param homeCollection player home collection. Can
+     * be taken with `takeAll` method.
+     * @param name home name.
+     *
+     * @return true if home exist otherwise false.
+     *
+     * @since 1.14.4-1.2.0
+     */
+    fun contains(
+        homeCollection: List<HomeModel.Home>,
+        name: String
+    ): Boolean {
+        homeCollection.forEach {
+            if (it.home == name) return true
+        }
+        return false
+    }
 }

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

@@ -6,9 +6,8 @@ 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.models.HomeModel
+import com.mairwunnx.projectessentials.home.api.HomeAPI
 import com.mairwunnx.projectessentials.home.sendMessage
-import com.mairwunnx.projectessentials.home.storage.StorageBase
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.builder.LiteralArgumentBuilder.literal
@@ -48,22 +47,19 @@ object DelHomeCommand {
         if (c.isPlayerSender()) {
             val player = c.source.asPlayer()
             if (hasPermission(player, "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))
-                        sendMessage(c.source, "remove.success", homeName)
-                        logger.info("Executed command \"/delhome\" from ${player.name.string}")
-                        return 0
-                    }
+
+                val result = HomeAPI.remove(player, homeName)
+                if (result) {
+                    sendMessage(c.source, "remove.success", homeName)
+                    logger.info("Executed command \"/delhome\" from ${player.name.string}")
+                    return 0
                 }
+
                 sendMessage(c.source, "not_found", homeName)
             } else {
                 sendMessage(c.source, "remove.restricted")