Make pets able to be moved out of the pets menu

build.gradle

@@ -43,12 +43,14 @@ allprojects {
 
     shadowJar {
         relocate('com.willfp.libreforge', 'com.willfp.ecopets.libreforge')
+        relocate('com.willfp.ecomponent', 'com.willfp.ecopets.ecomponent')
         relocate('org.joml', 'com.willfp.ecopets.libreforge.joml')
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.42.0'
-        implementation 'com.willfp:libreforge:3.111.0'
+        compileOnly 'com.willfp:eco:6.44.0'
+        implementation 'com.willfp:libreforge:3.119.0'
+        implementation 'com.willfp:ecomponent:1.0.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'

eco-core/core-plugin/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'net.kyori:adventure-api:4.10.1'
     compileOnly 'net.essentialsx:EssentialsX:2.19.0'
     compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
-    compileOnly 'com.ticxo.modelengine:api:R3.0.0'
+    compileOnly 'com.ticxo.modelengine:api:R3.0.1'
 }
 
 build.dependsOn publishToMavenLocal

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt

@@ -17,6 +17,10 @@ internal object EcoPetsAPIImpl : EcoPetsAPI {
 
     override fun getActivePet(player: OfflinePlayer): Pet? = player.activePet
 
+    override fun setActivePet(player: OfflinePlayer, pet: Pet?) {
+        player.activePet = pet
+    }
+
     override fun getPetLevel(player: OfflinePlayer, pet: Pet) = player.getPetLevel(pet)
 
     override fun givePetExperience(player: Player, pet: Pet, amount: Double) =

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsPlugin.kt

@@ -77,10 +77,6 @@ class EcoPetsPlugin : LibReforgePlugin() {
         )
     }
 
-    override fun getMinimumEcoVersion(): String {
-        return "6.37.0"
-    }
-
     companion object {
         @JvmStatic
         lateinit var instance: EcoPetsPlugin

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt

@@ -10,7 +10,7 @@ interface EcoPetsAPI {
      * Get if a player has a pet.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @return If the player has the pet unlocked
      */
     fun hasPet(
@@ -28,11 +28,22 @@ interface EcoPetsAPI {
         player: OfflinePlayer
     ): Pet?
 
+    /**
+     * Set a player's active pet.
+     *
+     * @param player The player.
+     * @param pet The pet.
+     */
+    fun setActivePet(
+        player: OfflinePlayer,
+        pet: Pet?
+    )
+
     /**
      * Get a player's level of a certain pet.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @return The level.
      */
     fun getPetLevel(
@@ -44,7 +55,7 @@ interface EcoPetsAPI {
      * Give pet experience to a player.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @param amount The amount of experience to give.
      */
     fun givePetExperience(
@@ -56,9 +67,9 @@ interface EcoPetsAPI {
     /**
      * Give pet experience to a player.
      *
-     * @param player           The player.
-     * @param pet              The pet.
-     * @param amount           The amount of experience to give.
+     * @param player The player.
+     * @param pet The pet.
+     * @param amount The amount of experience to give.
      * @param applyMultipliers If multipliers should be applied.
      */
     fun givePetExperience(
@@ -69,10 +80,11 @@ interface EcoPetsAPI {
     )
 
     /**
-     * Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
+     * Get progress to next level between 0 and 1, where 0 is none and 1 is
+     * complete.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @return The progress.
      */
     fun getPetProgress(
@@ -84,7 +96,7 @@ interface EcoPetsAPI {
      * Get the experience required to advance to the next level.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @return The experience required.
      */
     fun getPetXPRequired(
@@ -96,7 +108,7 @@ interface EcoPetsAPI {
      * Get experience to the next level.
      *
      * @param player The player.
-     * @param pet    The pet.
+     * @param pet The pet.
      * @return The experience.
      */
     fun getPetXP(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandActivate.kt

@@ -53,7 +53,7 @@ class CommandActivate(plugin: EcoPlugin) : Subcommand(plugin, "activate", "ecope
 
         if (args.size == 1) {
             StringUtil.copyPartialMatches(
-                args[1],
+                args[0],
                 Pets.values().filter { sender.hasPet(it) }.map { it.id },
                 completions
             )

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandEcopets.kt

@@ -11,6 +11,7 @@ class CommandEcopets(plugin: EcoPlugin) : PluginCommand(plugin, "ecopets", "ecop
             .addSubcommand(CommandGiveEgg(plugin))
             .addSubcommand(CommandGiveXP(plugin))
             .addSubcommand(CommandReset(plugin))
+            .addSubcommand(CommandTake(plugin))
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandGive.kt

@@ -28,7 +28,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.comma
         @Suppress("DEPRECATION")
         val player = Bukkit.getOfflinePlayer(playerName)
 
-        if (!player.hasPlayedBefore()) {
+        if (!player.hasPlayedBefore() && !Bukkit.getOnlinePlayers().contains(player)) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandReset.kt

@@ -49,14 +49,11 @@ class CommandReset(plugin: EcoPlugin) : Subcommand(plugin, "reset", "ecopets.com
             return
         }
 
-        if (player.activePet == pet) {
-            player.activePet = null
-        }
         player.setPetXP(pet, 0.0)
-        player.setPetLevel(pet, 0)
+        player.setPetLevel(pet, 1)
 
         sender.sendMessage(
-            plugin.langYml.getMessage("reset-xp", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+            plugin.langYml.getMessage("reset", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
                 .replace("%player%", player.savedDisplayName)
                 .replace("%pet%", pet.name)
         )