Updated eco to 6.24.0

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoosterHandlers.kt

@@ -56,12 +56,12 @@ fun Player.activateBooster(booster: Booster): Boolean {
         Bukkit.broadcastMessage(activationMessage)
     }
 
-    plugin.scheduler.runLater ({
+    plugin.scheduler.runLater(booster.duration.toLong()) {
         for (expiryMessage in booster.getExpiryMessages()) {
             Bukkit.broadcastMessage(expiryMessage)
         }
         Bukkit.getServer().activeBooster = null
-    }, booster.duration.toLong())
+    }
 
     active = booster
 

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt

@@ -30,7 +30,7 @@ class BoostersPlugin : EcoPlugin() {
     }
 
     override fun getMinimumEcoVersion(): String {
-        return "6.12.0"
+        return "6.24.0"
     }
 
     init {

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/Booster.kt

@@ -10,10 +10,10 @@ import org.bukkit.event.Listener
 abstract class Booster(
     private val plugin: BoostersPlugin,
     val id: String
-): Listener {
+) : Listener {
     abstract val duration: Int
 
-    val dataKey = PersistentDataKey<Int>(
+    val dataKey = PersistentDataKey(
         plugin.namespacedKeyFactory.create(id),
         PersistentDataKeyType.INT,
         0
@@ -35,6 +35,10 @@ abstract class Booster(
         return other.id == this.id
     }
 
+    override fun hashCode(): Int {
+        return this.id.hashCode()
+    }
+
     fun getActivationMessages(player: Player): List<String> {
         val messages = mutableListOf<String>()
 

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandBoosters.kt

@@ -2,7 +2,6 @@ package com.willfp.boosters.commands
 
 import com.willfp.boosters.gui.BoosterGUI
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
 import com.willfp.eco.core.command.impl.PluginCommand
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
@@ -20,14 +19,12 @@ class CommandBoosters(plugin: EcoPlugin) :
             .addSubcommand(CommandReload(plugin))
     }
 
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(sender: CommandSender, args: List<String>) {
-        return CommandHandler { sender: CommandSender, _: List<String> ->
         if (sender !is Player) {
             sender.sendMessage(this.plugin.langYml.getMessage("not-player"))
-                return@CommandHandler
+            return
         }
 
         BoosterGUI.open(sender)
     }
-    }
 }

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

@@ -4,8 +4,6 @@ import com.willfp.boosters.boosters.Boosters
 import com.willfp.boosters.getAmountOfBooster
 import com.willfp.boosters.setAmountOfBooster
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
-import com.willfp.eco.core.command.TabCompleteHandler
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
 import org.bukkit.Bukkit
@@ -19,23 +17,23 @@ class CommandGive(plugin: EcoPlugin) :
         "boosters.command.give",
         false
     ) {
-    override fun getHandler(): CommandHandler {
+
-        return CommandHandler { sender: CommandSender, args: List<String> ->
+    override fun onExecute(sender: CommandSender, args: List<String>) {
         if (args.isEmpty()) {
             sender.sendMessage(plugin.langYml.getMessage("requires-player"))
-                return@CommandHandler
+            return
         }
 
         if (args.size == 1) {
             sender.sendMessage(plugin.langYml.getMessage("requires-booster"))
-                return@CommandHandler
+            return
         }
 
         val booster = Boosters.getById(args[1].lowercase())
 
         if (booster == null) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-booster"))
-                return@CommandHandler
+            return
         }
 
         this.plugin.scheduler.runAsync {
@@ -52,15 +50,13 @@ class CommandGive(plugin: EcoPlugin) :
 
             sender.sendMessage(
                 plugin.langYml.getMessage("gave-booster", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
-                        .replace("%player%", player.name?: return@runAsync)
+                    .replace("%player%", player.name ?: return@runAsync)
                     .replace("%booster%", booster.id)
             )
         }
     }
-    }
 
-    override fun getTabCompleter(): TabCompleteHandler {
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
-        return TabCompleteHandler { _, args ->
         val completions = mutableListOf<String>()
 
         if (args.size == 1) {
@@ -69,7 +65,7 @@ class CommandGive(plugin: EcoPlugin) :
                 Bukkit.getOnlinePlayers().map { player -> player.name }.toCollection(ArrayList()),
                 completions
             )
-                return@TabCompleteHandler completions
+            return completions
         }
 
         if (args.size == 2) {
@@ -78,10 +74,9 @@ class CommandGive(plugin: EcoPlugin) :
                 Boosters.names(),
                 completions
             )
-                return@TabCompleteHandler completions
+            return completions
         }
 
-            return@TabCompleteHandler emptyList<String>()
+        return emptyList<String>()
-        }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/commands/CommandReload.kt

@@ -1,7 +1,6 @@
 package com.willfp.boosters.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
 import com.willfp.eco.core.command.impl.Subcommand
 import org.bukkit.command.CommandSender
 
@@ -12,10 +11,9 @@ class CommandReload(plugin: EcoPlugin) :
         "boosters.command.reload",
         false
     ) {
-    override fun getHandler(): CommandHandler {
+
-        return CommandHandler { sender: CommandSender, _: List<String> ->
+    override fun onExecute(sender: CommandSender, args: List<String>) {
         plugin.reload()
         sender.sendMessage(plugin.langYml.getMessage("reloaded"))
     }
-    }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/gui/BoosterGUI.kt

@@ -6,12 +6,13 @@ import com.willfp.boosters.activeBooster
 import com.willfp.boosters.boosters.Booster
 import com.willfp.boosters.boosters.Boosters
 import com.willfp.boosters.getAmountOfBooster
-import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu
+import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.FillerMask
-import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.core.gui.slot.functional.SlotHandler
 import com.willfp.eco.core.items.builder.SkullBuilder
 import com.willfp.eco.util.StringUtils
+import com.willfp.eco.util.formatEco
 import com.willfp.ecoskills.tryAsPlayer
 import org.bukkit.Bukkit
 import org.bukkit.Material
@@ -51,8 +52,8 @@ object BoosterGUI {
         }
     }
 
-    private val gui = Menu.builder(3)
+    private val gui = menu(3) {
-        .setMask(
+        setMask(
             FillerMask(
                 Material.BLACK_STAINED_GLASS_PANE,
                 "111111111",
@@ -60,16 +61,16 @@ object BoosterGUI {
                 "111111111"
             )
         )
-        .setSlot(
+        setSlot(
             2,
             2,
-            Slot.builder(
+            slot(
                 SkullBuilder()
                     .setSkullTexture("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTM0YjI3YmZjYzhmOWI5NjQ1OTRiNjE4YjExNDZhZjY5ZGUyNzhjZTVlMmUzMDEyY2I0NzFhOWEzY2YzODcxIn19fQ==")
                     .build()
-            )
+            ) {
-                .setModifier { player, _, previous ->
+                setUpdater { player, _, previous ->
-                    val meta = previous.itemMeta ?: return@setModifier
+                    val meta = previous.itemMeta ?: return@setUpdater previous
                     val lore = mutableListOf<String>()
 
                     lore.add("")
@@ -87,25 +88,23 @@ object BoosterGUI {
 
                     meta.setDisplayName(StringUtils.format("&d1.5x Sell Multiplier"))
 
-                    meta.lore = lore.apply {
+                    meta.lore = lore.formatEco()
-                        replaceAll { StringUtils.format(it) }
-                    }
                     previous.itemMeta = meta
-
+                    previous
                 }
-                .onLeftClick(makeHandler(Boosters.SELL_MULTIPLIER_LOW))
+                onLeftClick(makeHandler(Boosters.SELL_MULTIPLIER_LOW))
-                .build()
+            })
-        )
+
-        .setSlot(
+        setSlot(
             2,
             5,
-            Slot.builder(
+            slot(
                 SkullBuilder()
                     .setSkullTexture("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBhN2I5NGM0ZTU4MWI2OTkxNTlkNDg4NDZlYzA5MTM5MjUwNjIzN2M4OWE5N2M5MzI0OGEwZDhhYmM5MTZkNSJ9fX0=")
                     .build()
-            )
+            ) {
-                .setModifier { player, _, previous ->
+                setUpdater { player, _, previous ->
-                    val meta = previous.itemMeta ?: return@setModifier
+                    val meta = previous.itemMeta ?: return@setUpdater previous
                     val lore = mutableListOf<String>()
 
                     lore.add("")
@@ -127,21 +126,22 @@ object BoosterGUI {
                         replaceAll { StringUtils.format(it) }
                     }
                     previous.itemMeta = meta
-
+                    previous
+                }
+                onLeftClick(makeHandler(Boosters.SELL_MULTIPLIER_HIGH))
+                build()
             }
-                .onLeftClick(makeHandler(Boosters.SELL_MULTIPLIER_HIGH))
-                .build()
         )
-        .setSlot(
+        setSlot(
             2,
             8,
-            Slot.builder(
+            slot(
                 SkullBuilder()
                     .setSkullTexture("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODkyNmMxZjJjM2MxNGQwODZjNDBjZmMyMzVmZTkzODY5NGY0YTUxMDY3YWRhNDcyNmI0ODZlYTFjODdiMDNlMiJ9fX0=")
                     .build()
-            )
+            ) {
-                .setModifier { player, _, previous ->
+                setUpdater { player, _, previous ->
-                    val meta = previous.itemMeta ?: return@setModifier
+                    val meta = previous.itemMeta ?: return@setUpdater previous
                     val lore = mutableListOf<String>()
 
                     lore.add("")
@@ -163,13 +163,13 @@ object BoosterGUI {
                         replaceAll { StringUtils.format(it) }
                     }
                     previous.itemMeta = meta
-
+                    previous
+                }
+                onLeftClick(makeHandler(Boosters.SKILL_XP))
             }
-                .onLeftClick(makeHandler(Boosters.SKILL_XP))
-                .build()
         )
-        .setTitle("Boosters")
+        setTitle("Boosters")
-        .build()
+    }
 
     fun open(player: Player) {
         gui.open(player)

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -10,8 +10,6 @@ depend:
   - PlaceholderAPI
   - EcoSkills
   - ShopGUIPlus
-libraries:
-  - org.jetbrains.kotlin:kotlin-stdlib:1.5.21
 
 commands:
   boosters:

gradle.properties

@@ -1,2 +1,2 @@
-version = 1.1.2
+version = 1.2.0
 plugin-name = Boosters