libreforge-updater

build.gradle

@@ -42,12 +42,14 @@ allprojects {
 
     shadowJar {
         relocate('com.willfp.libreforge', 'com.willfp.ecojobs.libreforge')
+        relocate('com.willfp.ecomponent', 'com.willfp.ecojobs.ecomponent')
         relocate('org.joml', 'com.willfp.ecojobs.libreforge.joml')
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.44.0'
-        implementation 'com.willfp:libreforge:3.117.0'
+        compileOnly 'com.willfp:eco:6.46.0'
+        implementation 'com.willfp:libreforge:3.124.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/src/main/kotlin/com/willfp/ecojobs/commands/CommandJobs.kt

@@ -2,9 +2,11 @@ package com.willfp.ecojobs.commands
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.ecojobs.jobs.JobsGUI
-import org.bukkit.command.CommandSender
+import com.willfp.ecojobs.jobs.hasJob
 import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
 
 class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.command.jobs", true) {
     init {
@@ -12,8 +14,44 @@ class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.co
             .addSubcommand(CommandLeave(plugin))
     }
 
-    override fun onExecute(player: CommandSender, args: List<String>) {
-        player as Player
-        JobsGUI.open(player)
+    override fun onExecute(player: Player, args: List<String>) {
+        if (args.isEmpty()) {
+            JobsGUI.open(player)
+            return
+        }
+
+        val id = args[0].lowercase()
+        val job = Jobs.getByID(id)
+
+        if (job == null) {
+            player.sendMessage(plugin.langYml.getMessage("invalid-job"))
+            return
+        }
+
+        if (!player.hasJob(job)) {
+            player.sendMessage(plugin.langYml.getMessage("dont-have-job"))
+            return
+        }
+
+        job.levelGUI.open(player)
+    }
+
+    override fun tabComplete(player: Player, args: List<String>): List<String> {
+        val completions = mutableListOf<String>()
+
+        if (args.isEmpty()) {
+            return Jobs.values().filter { player.hasJob(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                Jobs.values().filter { player.hasJob(it) }.map { it.id },
+                completions
+            )
+            return completions
+        }
+
+        return emptyList()
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandJoin.kt

@@ -33,6 +33,11 @@ class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.comma
             return
         }
 
+        if (player.activeJob != null) {
+            player.sendMessage(plugin.langYml.getMessage("leave-current-job"))
+            return
+        }
+
         player.sendMessage(
             plugin.langYml.getMessage("joined-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
                 .replace("%job%", job.name)
@@ -47,7 +52,6 @@ class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.comma
 
         val completions = mutableListOf<String>()
         if (args.isEmpty()) {
-            // Currently, this case is not ever reached
             return Jobs.values().filter { sender.hasJob(it) }.map { it.id }
         }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandLeave.kt

@@ -2,7 +2,6 @@ package com.willfp.ecojobs.commands
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
-import com.willfp.eco.util.StringUtils
 import com.willfp.ecojobs.jobs.activeJob
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
@@ -16,11 +15,20 @@ class CommandLeave(plugin: EcoPlugin) : Subcommand(plugin, "leave", "ecojobs.com
             return
         }
 
-        player.sendMessage(
-            plugin.langYml.getMessage("left-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
-                .replace("%job%", player.activeJob?.name ?: "")
-        )
+        val job = player.activeJob ?: return
 
         player.activeJob = null
+
+        if (player.activeJob == null) {
+            player.sendMessage(
+                plugin.langYml.getMessage("left-job")
+                    .replace("%job%", job.name)
+            )
+        } else {
+            player.sendMessage(
+                plugin.langYml.getMessage("cant-leave-job")
+                    .replace("%job%", job.name)
+            )
+        }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/Job.kt

@@ -10,6 +10,8 @@ import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.core.placeholder.PlayerPlaceholder
 import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder
 import com.willfp.eco.core.placeholder.PlayerlessPlaceholder
+import com.willfp.eco.core.price.ConfiguredPrice
+import com.willfp.eco.core.price.impl.PriceEconomy
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.formatEco
 import com.willfp.eco.util.toNiceString
@@ -18,7 +20,6 @@ import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
 import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
-import com.willfp.ecojobs.jobs.Jobs.unlockedJobs
 import com.willfp.libreforge.conditions.Conditions
 import com.willfp.libreforge.conditions.ConfiguredCondition
 import com.willfp.libreforge.effects.ConfiguredEffect
@@ -29,7 +30,7 @@ import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import java.util.*
+import java.util.Objects
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 
@@ -42,8 +43,16 @@ class Job(
     val description = config.getFormattedString("description")
     val isUnlockedByDefault = config.getBool("unlocked-by-default")
     val resetsOnQuit = config.getBool("reset-on-quit")
-    val joinPrice = config.getDouble("join-price")
-    val leavePrice = config.getDouble("leave-price")
+
+    val joinPrice = ConfiguredPrice.create(config.getSubsection("join-price")) ?: ConfiguredPrice(
+        PriceEconomy(config.getDouble("join-price")),
+        ""
+    )
+
+    val leavePrice = ConfiguredPrice.create(config.getSubsection("leave-price")) ?: ConfiguredPrice(
+        PriceEconomy(config.getDouble("leave-price")),
+        ""
+    )
 
     val levelKey: PersistentDataKey<Int> = PersistentDataKey(
         EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_level"),
@@ -63,6 +72,8 @@ class Job(
 
     val levelGUI = JobLevelGUI(plugin, this)
 
+    val leaveGUI = JobLeaveGUI(plugin, this)
+
     private val baseItem: ItemStack = Items.lookup(config.getString("icon")).item
 
     private val effects: Set<ConfiguredEffect>
@@ -167,8 +178,8 @@ class Job(
         }.register()
 
         PlayerPlaceholder(
-                plugin,
-        "${id}_level"
+            plugin,
+            "${id}_level"
         ) {
             it.getJobLevel(this).toString()
         }.register()
@@ -248,6 +259,24 @@ class Job(
             }
     }
 
+    private fun getLeaveLore(level: Int, whitespace: Int = 0): List<String> =
+        this.config.getStrings("leave-lore")
+            .map {
+                levelPlaceholders.format(it, level)
+            }
+            .map {
+                " ".repeat(whitespace) + it
+            }
+
+    private fun getJoinLore(level: Int, whitespace: Int = 0): List<String> =
+        this.config.getStrings("join-lore")
+            .map {
+                levelPlaceholders.format(it, level)
+            }
+            .map {
+                " ".repeat(whitespace) + it
+            }
+
     fun injectPlaceholdersInto(lore: List<String>, player: Player, forceLevel: Int? = null): List<String> {
         val withPlaceholders = lore
             .map {
@@ -264,8 +293,8 @@ class Job(
                     .replace("%description%", this.description)
                     .replace("%job%", this.name)
                     .replace("%level%", (forceLevel ?: player.getJobLevel(this)).toString())
-                    .replace("%join_price%", NumberUtils.format(this.joinPrice))
-                    .replace("%leave_price%", NumberUtils.format(this.leavePrice))
+                    .replace("%join_price%", this.joinPrice.getDisplay(player))
+                    .replace("%leave_price%", this.leavePrice.getDisplay(player))
             }
             .toMutableList()
 
@@ -281,6 +310,10 @@ class Job(
                     getRewardsDescription(forceLevel ?: player.getJobLevel(this), whitespace)
                 } else if (s.contains("%level_up_messages%")) {
                     getLevelUpMessages(forceLevel ?: player.getJobLevel(this), whitespace)
+                } else if (s.contains("%leave_lore%")) {
+                    getLeaveLore(forceLevel ?: player.getJobLevel(this), whitespace)
+                } else if (s.contains("%join_lore%")) {
+                    getJoinLore(forceLevel ?: player.getJobLevel(this), whitespace)
                 } else {
                     listOf(s)
                 }
@@ -294,7 +327,6 @@ class Job(
         val base = baseItem.clone()
 
         val level = player.getJobLevel(this)
-        val isActive = player.activeJob == this
 
         return ItemStackBuilder(base)
             .setDisplayName(
@@ -304,8 +336,11 @@ class Job(
             )
             .addLoreLines {
                 injectPlaceholdersInto(plugin.configYml.getStrings("gui.job-icon.lore"), player) +
-                        if (isActive) plugin.configYml.getStrings("gui.job-icon.active-lore") else
-                            plugin.configYml.getStrings("gui.job-icon.not-active-lore")
+                        when (player.activeJob) {
+                            this -> plugin.configYml.getStrings("gui.job-icon.active-lore")
+                            null -> plugin.configYml.getStrings("gui.job-icon.join-lore")
+                            else -> emptyList()
+                        }
             }
             .build()
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLeaveGUI.kt

@@ -0,0 +1,85 @@
+package com.willfp.ecojobs.jobs
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.gui.menu
+import com.willfp.eco.core.gui.onLeftClick
+import com.willfp.eco.core.gui.slot
+import com.willfp.eco.core.gui.slot.FillerMask
+import com.willfp.eco.core.gui.slot.MaskItems
+import com.willfp.eco.core.items.Items
+import com.willfp.eco.core.items.builder.ItemStackBuilder
+import com.willfp.eco.util.formatEco
+import org.bukkit.entity.Player
+
+class JobLeaveGUI(
+    plugin: EcoPlugin,
+    job: Job
+) {
+    private val menu = menu(plugin.configYml.getInt("leave-gui.rows")) {
+        val maskPattern = plugin.configYml.getStrings("leave-gui.mask.pattern").toTypedArray()
+        val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("leave-gui.mask.materials"))
+
+        title = plugin.configYml.getString("leave-gui.title")
+            .replace("%job%", job.name)
+            .formatEco()
+
+        setMask(
+            FillerMask(
+                maskItems,
+                *maskPattern
+            )
+        )
+
+        setSlot(
+            plugin.configYml.getInt("leave-gui.cancel.location.row"),
+            plugin.configYml.getInt("leave-gui.cancel.location.column"),
+            slot({ player, _ ->
+                ItemStackBuilder(Items.lookup(plugin.configYml.getString("leave-gui.cancel.item")))
+                    .setDisplayName(plugin.configYml.getString("leave-gui.cancel.name").replace("%job%", job.name))
+                    .addLoreLines(
+                        job.injectPlaceholdersInto(plugin.configYml.getStrings("leave-gui.cancel.lore"), player)
+                    )
+                    .build()
+            }) {
+                onLeftClick { player, _, _, _ ->
+                    JobsGUI.open(player)
+                }
+            }
+        )
+
+        setSlot(
+            plugin.configYml.getInt("leave-gui.confirm.location.row"),
+            plugin.configYml.getInt("leave-gui.confirm.location.column"),
+            slot({ player, _ ->
+                ItemStackBuilder(Items.lookup(plugin.configYml.getString("leave-gui.confirm.item")))
+                    .setDisplayName(plugin.configYml.getString("leave-gui.confirm.name").replace("%job%", job.name))
+                    .addLoreLines(
+                        job.injectPlaceholdersInto(plugin.configYml.getStrings("leave-gui.confirm.lore"), player)
+                    )
+                    .build()
+            }) {
+                onLeftClick { player, _, _, _ ->
+                    player.activeJob = null
+
+                    if (player.activeJob == null) {
+                        player.sendMessage(
+                            plugin.langYml.getMessage("left-job")
+                                .replace("%job%", job.name)
+                        )
+                    } else {
+                        player.sendMessage(
+                            plugin.langYml.getMessage("cant-leave-job")
+                                .replace("%job%", job.name)
+                        )
+                    }
+
+                    JobsGUI.open(player)
+                }
+            }
+        )
+    }
+
+    fun open(player: Player) {
+        menu.open(player)
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt

@@ -3,6 +3,9 @@ package com.willfp.ecojobs.jobs
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu.MenuLayer
+import com.willfp.eco.core.gui.onLeftClick
+import com.willfp.eco.core.gui.page.PageChanger
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
@@ -10,63 +13,61 @@ import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.util.NumberUtils
-import org.bukkit.Material
+import com.willfp.ecomponent.components.LevelComponent
+import com.willfp.ecomponent.components.LevelState
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.properties.Delegates
 
 class JobLevelGUI(
     plugin: EcoPlugin,
     private val job: Job
 ) {
     private val menu: Menu
-    private val pageKey = "page"
-    private var levelsPerPage by Delegates.notNull<Int>()
-    private var pages by Delegates.notNull<Int>()
-
-    private fun getPage(menu: Menu, player: Player): Int {
-        val page = menu.getState(player, pageKey) ?: 1
-
-        return min(pages, max(page, 1))
-    }
 
     init {
         val maskPattern = plugin.configYml.getStrings("level-gui.mask.pattern").toTypedArray()
         val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("level-gui.mask.materials"))
 
-        val progressionOrder = "123456789abcdefghijklmnopqrstuvwxyz"
         val progressionPattern = plugin.configYml.getStrings("level-gui.progression-slots.pattern")
 
-        val progressionSlots = mutableMapOf<Int, Pair<Int, Int>>()
+        val component = object : LevelComponent(progressionPattern, job.maxLevel) {
+            override fun getLevelItem(player: Player, menu: Menu, level: Int, levelState: LevelState): ItemStack {
+                val key = levelState.name.lowercase().replace("_", "-")
 
-        var x = 0
-        for (row in progressionPattern) {
-            x++
-            var y = 0
-            for (char in row) {
-                y++
-                if (char == '0') {
-                    continue
+                return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
+                    .setDisplayName(
+                        plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
+                            .replace("%job%", job.name)
+                            .replace("%level%", level.toString())
+                            .replace("%level_numeral%", NumberUtils.toNumeral(level))
+                    )
+                    .addLoreLines(
+                        job.injectPlaceholdersInto(
+                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$key.lore"),
+                            player,
+                            forceLevel = level
+                        )
+                    )
+                    .setAmount(
+                        if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) level else 1
+                    )
+                    .build()
+            }
+
+            override fun getLevelState(player: Player, level: Int): LevelState {
+                return when {
+                    level <= player.getJobLevel(job) -> LevelState.UNLOCKED
+                    level == player.getJobLevel(job) + 1 -> LevelState.IN_PROGRESS
+                    else -> LevelState.LOCKED
                 }
-
-                val pos = progressionOrder.indexOf(char)
-
-                if (pos == -1) {
-                    continue
-                }
-
-                progressionSlots[pos + 1] = Pair(x, y)
             }
         }
 
-        levelsPerPage = progressionSlots.size
-        pages = ceil(job.maxLevel.toDouble() / levelsPerPage).toInt()
-
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
             title = job.name
+
+            maxPages(component.pages)
+
             setMask(
                 FillerMask(
                     maskItems,
@@ -74,58 +75,11 @@ class JobLevelGUI(
                 )
             )
 
-            for ((level, value) in progressionSlots) {
-                setSlot(
-                    value.first,
-                    value.second,
-                    slot(ItemStack(Material.BLACK_STAINED_GLASS_PANE)) {
-                        setUpdater { player, menu, _ ->
-                            val page = getPage(menu, player)
+            addComponent(1, 1, component)
 
-                            val slotLevel = ((page - 1) * levelsPerPage) + level
-
-                            fun getItem(section: String) =
-                                ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$section.item")))
-                                    .setDisplayName(
-                                        plugin.configYml.getFormattedString("level-gui.progression-slots.$section.name")
-                                            .replace("%job%", job.name)
-                                            .replace("%level%", slotLevel.toString())
-                                            .replace("%level_numeral%", NumberUtils.toNumeral(slotLevel))
-                                    )
-                                    .addLoreLines(
-                                        job.injectPlaceholdersInto(
-                                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$section.lore"),
-                                            player,
-                                            forceLevel = slotLevel
-                                        )
-                                    )
-                                    .build()
-
-                            if (slotLevel > job.maxLevel) {
-                                maskItems.items[0].item
-                            } else {
-                                val item = when {
-                                    slotLevel <= player.getJobLevel(job) -> {
-                                        getItem("unlocked")
-                                    }
-                                    slotLevel == player.getJobLevel(job) + 1 -> {
-                                        getItem("in-progress")
-                                    }
-                                    else -> {
-                                        getItem("locked")
-                                    }
-                                }
-
-                                if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) {
-                                    item.amount = slotLevel
-                                }
-                                item
-                            }
-                        }
-                    }
-                )
-            }
-            setSlot(
+            // Instead of the page changer, this will show up when on the first page
+            addComponent(
+                MenuLayer.LOWER,
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
                 slot(
@@ -133,38 +87,30 @@ class JobLevelGUI(
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
                         .build()
                 ) {
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-                        val page = getPage(menu, player)
-
-                        val newPage = max(0, page - 1)
-
-                        if (newPage == 0) {
-                            JobsGUI.open(player)
-                        } else {
-                            menu.setState(player, pageKey, newPage)
-                        }
-                    }
+                    onLeftClick { player, _, _, _ -> JobsGUI.open(player) }
                 }
             )
-            setSlot(
+
+            addComponent(
+                plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
+                plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
+                PageChanger(
+                    ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.prev-page.material")))
+                        .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
+                        .build(),
+                    PageChanger.Direction.BACKWARDS
+                )
+            )
+
+            addComponent(
                 plugin.configYml.getInt("level-gui.progression-slots.next-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.next-page.location.column"),
-                slot(
+                PageChanger(
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.next-page.material")))
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.next-page.name"))
-                        .build()
-                ) {
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-
-                        val page = getPage(menu, player)
-
-                        val newPage = min(pages, page + 1)
-
-                        menu.setState(player, pageKey, newPage)
-                    }
-                }
+                        .build(),
+                    PageChanger.Direction.FORWARDS
+                )
             )
 
             setSlot(

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt

@@ -3,6 +3,7 @@ package com.willfp.ecojobs.jobs
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.onLeftClick
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
@@ -99,10 +100,6 @@ object JobsGUI {
                 val (row, column) = pair
 
                 setSlot(row, column, slot({ p, m -> jobIconBuilder(p, m, index) }) {
-                    setUpdater { p, m, _ ->
-                        jobIconBuilder(p, m, index)
-                    }
-
                     onLeftClick { event, _, _ ->
                         val player = event.whoClicked as Player
 
@@ -114,8 +111,10 @@ object JobsGUI {
 
                         val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onLeftClick
 
-                        if (player.activeJob != job) {
+                        if (player.activeJob == null) {
                             player.activeJob = job
+                        } else {
+                            player.sendMessage(plugin.langYml.getMessage("leave-current-job"))
                         }
 
                         player.playSound(
@@ -189,9 +188,8 @@ object JobsGUI {
                         .setDisplayName(plugin.configYml.getString("gui.deactivate-job.name"))
                         .build()
                 ) {
-                    onLeftClick { event, _ ->
-                        val player = event.whoClicked as Player
-                        player.activeJob = null
+                    onLeftClick { player, _, _, _ ->
+                        player.activeJob?.leaveGUI?.open(player)
                     }
                 }
             )

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/PriceHandler.kt

@@ -1,8 +1,8 @@
 package com.willfp.ecojobs.jobs
 
-import com.willfp.eco.core.integrations.economy.balance
 import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
+import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
@@ -13,19 +13,16 @@ object PriceHandler : Listener {
         ignoreCancelled = true
     )
     fun onJoin(event: PlayerJobJoinEvent) {
-        val player = event.player
+        val player = event.player as? Player ?: return
         val job = event.job
         val price = job.joinPrice
 
-        if (price > 0) {
-            val hasMoney = player.balance >= price
-
-            if (!hasMoney) {
-                event.isCancelled = true
-            }
-
-            player.balance -= price
+        if (!price.canAfford(player)) {
+            event.isCancelled = true
+            return
         }
+
+        price.pay(player)
     }
 
     @EventHandler(
@@ -33,18 +30,15 @@ object PriceHandler : Listener {
         ignoreCancelled = true
     )
     fun onLeave(event: PlayerJobLeaveEvent) {
-        val player = event.player
+        val player = event.player as? Player ?: return
         val job = event.job
         val price = job.leavePrice
 
-        if (price > 0) {
-            val hasMoney = player.balance >= price
-
-            if (!hasMoney) {
-                event.isCancelled = true
-            }
-
-            player.balance -= price
+        if (!price.canAfford(player)) {
+            event.isCancelled = true
+            return
         }
+
+        price.pay(player)
     }
 }

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

@@ -78,11 +78,11 @@ gui:
 
     active-lore:
       - ""
-      - "&cThis job is already active!"
+      - "&cYou've already joined this job!"
 
-    not-active-lore:
+    join-lore:
       - ""
-      - "&eClick to activate this job!"
+      - "&eClick to join this job!"
 
     click:
       sound: ui_button_click
@@ -117,7 +117,7 @@ gui:
       column: 2
 
   # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
-  custom-slots: []
+  custom-slots: [ ]
 
 level-gui:
   rows: 6
@@ -214,7 +214,54 @@ level-gui:
       column: 5
 
   # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
-  custom-slots: []
+  custom-slots: [ ]
+
+leave-gui:
+  rows: 3
+
+  title: "Confirm Leaving %job%"
+
+  mask:
+    # The way the mask works is by having a list of materials
+    # And then a pattern to use those materials.
+
+    # The pattern is the rows in the GUI
+    # Each line must be 9 long, and the amount of rows should be the amount of rows in the GUI
+    # A zero represents nothing
+    # A 1 represents the first material
+    # A 2 represents the second material
+    # And so on, you can add up to 9.
+
+    materials:
+      - black_stained_glass_pane
+    pattern:
+      - "111111111"
+      - "110111011"
+      - "111111111"
+
+  cancel:
+    item: arrow
+    name: "&eCancel"
+    lore:
+      - ""
+      - "&fGo back to the Jobs menu"
+    location:
+      row: 2
+      column: 3
+
+  confirm:
+    item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0=
+    name: "&cLeave %job%"
+    lore:
+      - ""
+      - "&cAre you sure?"
+      - "%leave_lore%"
+    location:
+      row: 2
+      column: 7
+
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: [ ]
 
 level-up:
   message:

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

@@ -16,9 +16,28 @@ unlocked-by-default: true
 # If job progress should be reset when quitting
 reset-on-quit: false
 
-# The price to join or leave this job (set to 0 to disable)
-join-price: 0
-leave-price: 0
+# The price to join this job (set to 0 to disable)
+# Read here for more: https://plugins.auxilor.io/all-plugins/prices
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+# Lore shown when clicking on the job icon to join it
+# Reference with %join_lore%
+join-lore: []
+
+# The price to leave this job (set to 0 to disable)
+# Read here for more: https://plugins.auxilor.io/all-plugins/prices
+leave-price:
+  value: 20000
+  type: coins
+  display: "&a$%value%"
+
+# Lore shown on the confirm leave button
+# Reference with %leave_lore%
+leave-lore:
+  - " &8» This will cost %leave_price%"
 
 # The xp requirements for each job level - add new levels by adding more to this list
 level-xp-requirements:

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -1,12 +1,24 @@
 name: "&#7A54FBEnchanter"
-description: "&7&oLevel up by enchanting items"
+description: "&8&oLevel up by enchanting items"
 
 unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -1,12 +1,24 @@
-name: "&#FB8810Lumberjack"
+name: "&#FD9113Lumberjack"
 description: "&7&oLevel up by chopping wood"
 
 unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100
@@ -62,56 +74,57 @@ level-xp-requirements:
 xp-gain-methods:
   - trigger: mine_block
     multiplier: 0.5
-    conditions: [ ]
     filters:
-      items:
-        - "*oak_log"
-        - "*spruce_log"
-        - "*birch_log"
-        - "*jungle_log"
-        - "*acacia_log"
-        - "*dark_oak_log"
-        - "*mangrove_log"
-        - "*crimson_stem"
-        - "*warped_stem"
+      blocks:
+        - oak_log
+        - spruce_log
+        - birch_log
+        - jungle_log
+        - acacia_log
+        - dark_oak_log
+        - mangrove_log
+        - crimson_stem
+        - warped_stem
+      player_placed: false
+    conditions: [ ]
 
 level-placeholders:
   - id: "money"
-    value: "%level% * 0.4"
+    value: "%level% * 3.0"
 
 effects-description:
   1:
-    - "&8» &8Earn &a$%money%&8 for each log chopped."
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
 
 rewards-description:
   1:
-    - "&8» &8Earn &a$%money%&8 for each log chopped."
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
 
 level-up-messages:
   1:
-    - "&8» &8Earn &a$%money%&8 for each log chopped."
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
 
 level-commands: [ ]
 
 effects:
   - id: give_money
     args:
-      every: "ceil(10 - %level% / 10)"
-      amount: "0.4 * %level%"
-    filters:
-      items:
-        - "*oak_log"
-        - "*spruce_log"
-        - "*birch_log"
-        - "*jungle_log"
-        - "*acacia_log"
-        - "*dark_oak_log"
-        - "*mangrove_log"
-        - "*crimson_stem"
-        - "*warped_stem"
+      amount: "%level% * 3.0"
     triggers:
       - mine_block
+    filters:
+      blocks:
+        - oak_log
+        - spruce_log
+        - birch_log
+        - jungle_log
+        - acacia_log
+        - dark_oak_log
+        - mangrove_log
+        - crimson_stem
+        - warped_stem
+      player_placed: false
 
 conditions: [ ]
 
-icon: player_head texture:basehead-eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E2MjA3MDJmODBiZDJjMjI0MmUyZjEzMWMzZjlhMjU5NDAyYjdmYTg5NzRjODZjZjM0NTBmZjczZTc3MDU5NSJ9fX0=
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjk4NWEwNWQyYTMzOWExYzFiZDdlMmE3OWFlMDAyNWI5YTEwZTg0ZGI5OWFkZjQzNThkNmViZTgzNThhZDJkOCJ9fX0=

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -5,8 +5,20 @@ unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -1,12 +1,24 @@
 name: "&#4B4736Smelter"
-description: "&7&oLevel up by smelting items"
+description: "&8&oLevel up by smelting items"
 
 unlocked-by-default: true
 
 reset-on-quit: false
 
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100

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

@@ -7,20 +7,27 @@
 # The display name of the job
 name: "&#0047b3Toolsmith"
 
-# The description of the job
 description: "&8&oLevel up by crafting tools"
 
-# If the job should be unlocked by default
 unlocked-by-default: true
 
-# If job progress should be reset when quitting
 reset-on-quit: false
 
-# The price to join or leave this job (set to 0 to disable)
-join-price: 0
-leave-price: 0
+join-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
-# The xp requirements for each job level - add new levels by adding more to this list
 level-xp-requirements:
   - 100
   - 120
@@ -72,9 +79,6 @@ level-xp-requirements:
   - 580000
   - 750000
 
-# An XP Gain method takes a trigger, a multiplier, conditions, and filters.
-# The multiplier takes the value produced by the trigger and multiplies it
-# by some value to calculate the experience that should be given
 xp-gain-methods:
   - trigger: craft
     multiplier: 2
@@ -113,36 +117,24 @@ xp-gain-methods:
         - "*shears"
         - "*spyglass"
 
-# Custom placeholders to be used in descriptions,
-# Don't add % to the IDs, this is done automatically
-# The value takes a %level% placeholder and is a mathematical expression
 level-placeholders:
   - id: "money"
     value: "%level% * 2"
 
-# The text shown with the %effects% placeholder
-# The number dictates the minimum level for this text to show for
-# Adding new levels will override this text on those levels or above
 effects-description:
   1:
     - "&8» &8Earn &a$%money%&8 for each tool crafted"
 
-# Same as above, but for %rewards%
 rewards-description:
   1:
     - "&8» &8Earn &a$%money%&8 for each tool crafted"
 
-# Same as above, but for %level_up_messages%
 level-up-messages:
   1:
     - "&8» &8Earn &a$%money%&8 for each tool crafted"
 
-# Commands to be sent on levelup, can be formatted two ways:
-# level:command (e.g. 10:eco give %player% 1000), which would execute that command for level 10
-# command (e.g. eco give %player% 5000), which would execute that command for all levels
 level-commands: [ ]
 
-# The effects for the job, has %level% as a placeholder
 effects:
   - id: give_money
     args:
@@ -183,8 +175,6 @@ effects:
     triggers:
       - craft
 
-# The conditions for the job, also has %level% as a placeholder
 conditions: [ ]
 
-# The icon in GUIs
 icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODk2ZDRjODM4YTE2MDZhYzc1Nzc1NDIzMjA4NjE0OTcwOGI3OWFiYTAxYmU5NTNjNjUzOTkxMDFlODk0M2RhZiJ9fX0=

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

@@ -33,6 +33,9 @@ messages:
   joined-job: "&fYou have joined the %job%&f job!"
   left-job: "&fYou have left the %job%&f job!"
   job-already-joined: "&cYou already have this job!"
+  leave-current-job: "&cYou must leave your current job before joining a new one!"
+  cant-leave-job: "&cYou can't leave the %job%&f job!"
+  dont-have-job: "&cYou don't have this job unlocked!"
 
 menu:
   title: "Jobs"

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Tue Nov 01 16:22:52 GMT 2022
-version=1.22.0
+#Sun Nov 27 21:43:55 GMT 2022
+version=1.30.0
 plugin-name=EcoJobs