libreforge-updater

build.gradle

@@ -46,8 +46,8 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.99.1'
+        compileOnly 'com.willfp:eco:6.42.0'
+        implementation 'com.willfp:libreforge:3.108.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/EcoJobsPlugin.kt

@@ -7,6 +7,8 @@ import com.willfp.ecojobs.commands.CommandEcojobs
 import com.willfp.ecojobs.commands.CommandJobs
 import com.willfp.ecojobs.jobs.JobLevelListener
 import com.willfp.ecojobs.jobs.JobTriggerXPGainListener
+import com.willfp.ecojobs.jobs.PriceHandler
+import com.willfp.ecojobs.jobs.ResetOnQuitListener
 import com.willfp.ecojobs.jobs.activeJob
 import com.willfp.ecojobs.jobs.activeJobLevel
 import com.willfp.libreforge.LibReforgePlugin
@@ -42,7 +44,9 @@ class EcoJobsPlugin : LibReforgePlugin() {
     override fun loadListeners(): List<Listener> {
         return listOf(
             JobLevelListener(this),
-            JobTriggerXPGainListener
+            JobTriggerXPGainListener,
+            ResetOnQuitListener,
+            PriceHandler
         )
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobJoinEvent.kt

@@ -0,0 +1,32 @@
+package com.willfp.ecojobs.api.event
+
+import com.willfp.ecojobs.jobs.Job
+import org.bukkit.OfflinePlayer
+import org.bukkit.entity.Player
+import org.bukkit.event.Cancellable
+import org.bukkit.event.Event
+import org.bukkit.event.HandlerList
+import org.bukkit.event.player.PlayerEvent
+
+class PlayerJobJoinEvent(
+    val player: OfflinePlayer,
+    val job: Job,
+    val oldJob: Job?
+) : Event(), Cancellable {
+    private var cancelled = false
+
+    override fun isCancelled() = this.cancelled
+
+    override fun setCancelled(cancelled: Boolean) {
+        this.cancelled = cancelled
+    }
+
+    override fun getHandlers(): HandlerList {
+        return handlerList
+    }
+
+    companion object {
+        @JvmStatic
+        val handlerList = HandlerList()
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/api/event/PlayerJobLeaveEvent.kt

@@ -0,0 +1,29 @@
+package com.willfp.ecojobs.api.event
+
+import com.willfp.ecojobs.jobs.Job
+import org.bukkit.OfflinePlayer
+import org.bukkit.event.Cancellable
+import org.bukkit.event.Event
+import org.bukkit.event.HandlerList
+
+class PlayerJobLeaveEvent(
+    val player: OfflinePlayer,
+    val job: Job
+) : Event(), Cancellable {
+    private var cancelled = false
+
+    override fun isCancelled() = this.cancelled
+
+    override fun setCancelled(cancelled: Boolean) {
+        this.cancelled = cancelled
+    }
+
+    override fun getHandlers(): HandlerList {
+        return handlerList
+    }
+
+    companion object {
+        @JvmStatic
+        val handlerList = HandlerList()
+    }
+}

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

@@ -7,6 +7,11 @@ import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.command.jobs", true) {
+    init {
+        this.addSubcommand(CommandJoin(plugin))
+            .addSubcommand(CommandLeave(plugin))
+    }
+
     override fun onExecute(player: CommandSender, args: List<String>) {
         player as Player
         JobsGUI.open(player)

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

@@ -0,0 +1,65 @@
+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.Jobs
+import com.willfp.ecojobs.jobs.activeJob
+import com.willfp.ecojobs.jobs.hasJob
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.command.join", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (args.isEmpty()) {
+            player.sendMessage(plugin.langYml.getMessage("needs-job"))
+            return
+        }
+
+        val id = args[0]
+
+        val job = Jobs.getByID(id)
+
+        if (job == null || !player.hasJob(job)) {
+            player.sendMessage(plugin.langYml.getMessage("invalid-job"))
+            return
+        }
+
+        if (player.activeJob == job) {
+            player.sendMessage(plugin.langYml.getMessage("job-already-joined"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("joined-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%job%", job.name)
+        )
+        player.activeJob = job
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (sender !is Player) {
+            return emptyList()
+        }
+
+        val completions = mutableListOf<String>()
+        if (args.isEmpty()) {
+            // Currently, this case is not ever reached
+            return Jobs.values().filter { sender.hasJob(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[1],
+                Jobs.values().filter { sender.hasJob(it) }.map { it.id },
+                completions
+            )
+            return completions
+        }
+
+        return emptyList()
+    }
+}

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

@@ -0,0 +1,26 @@
+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
+
+class CommandLeave(plugin: EcoPlugin) : Subcommand(plugin, "leave", "ecojobs.command.leave", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (player.activeJob == null) {
+            player.sendMessage(plugin.langYml.getMessage("no-job"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("left-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%job%", player.activeJob?.name ?: "")
+        )
+
+        player.activeJob = null
+    }
+}

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

@@ -7,6 +7,7 @@ import com.willfp.eco.util.savedDisplayName
 import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.ecojobs.jobs.activeJob
 import com.willfp.ecojobs.jobs.hasJob
+import com.willfp.ecojobs.jobs.resetJob
 import com.willfp.ecojobs.jobs.setJobLevel
 import com.willfp.ecojobs.jobs.setJobXP
 import org.bukkit.Bukkit
@@ -48,8 +49,7 @@ class CommandReset(plugin: EcoPlugin) : Subcommand(plugin, "reset", "ecojobs.com
         if (player.activeJob == job) {
             player.activeJob = null
         }
-        player.setJobXP(job, 0.0)
-        player.setJobLevel(job, 1)
+        player.resetJob(job)
 
         sender.sendMessage(
             plugin.langYml.getMessage("reset-xp", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)

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

@@ -15,6 +15,8 @@ import com.willfp.eco.util.formatEco
 import com.willfp.eco.util.toNiceString
 import com.willfp.ecojobs.EcoJobsPlugin
 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.libreforge.conditions.Conditions
 import com.willfp.libreforge.conditions.ConfiguredCondition
@@ -38,6 +40,9 @@ class Job(
     val name = config.getFormattedString("name")
     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 levelKey: PersistentDataKey<Int> = PersistentDataKey(
         EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_level"),
@@ -251,6 +256,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))
             }
             .toMutableList()
 
@@ -365,7 +372,33 @@ private val activeJobKey: PersistentDataKey<String> = PersistentDataKey(
 
 var OfflinePlayer.activeJob: Job?
     get() = Jobs.getByID(this.profile.read(activeJobKey))
-    set(value) = this.profile.write(activeJobKey, value?.id ?: "")
+    set(job) {
+        val oldJob = this.activeJob
+
+        if (oldJob != job) {
+            // Have to check for oldJob too to have null safety
+            if (job == null && oldJob != null) {
+                val event = PlayerJobLeaveEvent(this, oldJob)
+                Bukkit.getPluginManager().callEvent(event)
+
+                if (event.isCancelled) {
+                    return
+                }
+            }
+
+            // Not using else because null safety as well
+            if (job != null) {
+                val event = PlayerJobJoinEvent(this, job, oldJob)
+                Bukkit.getPluginManager().callEvent(event)
+
+                if (event.isCancelled) {
+                    return
+                }
+            }
+        }
+
+        this.profile.write(activeJobKey, job?.id ?: "")
+    }
 
 val OfflinePlayer.activeJobLevel: JobLevel?
     get() {
@@ -379,6 +412,11 @@ fun OfflinePlayer.getJobLevel(job: Job): Int =
 fun OfflinePlayer.setJobLevel(job: Job, level: Int) =
     this.profile.write(job.levelKey, level)
 
+fun OfflinePlayer.resetJob(job: Job) {
+    this.setJobLevel(job, 1)
+    this.setJobXP(job, 0.0)
+}
+
 fun OfflinePlayer.getJobProgress(job: Job): Double {
     val currentXP = this.getJobXP(job)
     val requiredXP = job.getExpForLevel(this.getJobLevel(job) + 1)

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

@@ -4,6 +4,7 @@ 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.slot
+import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
@@ -165,6 +166,7 @@ class JobLevelGUI(
                     }
                 }
             )
+
             setSlot(
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.column"),
@@ -178,6 +180,14 @@ class JobLevelGUI(
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 

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

@@ -4,6 +4,7 @@ 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.slot
+import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
@@ -197,6 +198,14 @@ object JobsGUI {
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 

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

@@ -0,0 +1,50 @@
+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.event.EventHandler
+import org.bukkit.event.EventPriority
+import org.bukkit.event.Listener
+
+object PriceHandler : Listener {
+    @EventHandler(
+        priority = EventPriority.LOW,
+        ignoreCancelled = true
+    )
+    fun onJoin(event: PlayerJobJoinEvent) {
+        val player = event.player
+        val job = event.job
+        val price = job.joinPrice
+
+        if (price > 0) {
+            val hasMoney = player.balance >= price
+
+            if (!hasMoney) {
+                event.isCancelled = true
+            }
+
+            player.balance -= price
+        }
+    }
+
+    @EventHandler(
+        priority = EventPriority.LOW,
+        ignoreCancelled = true
+    )
+    fun onLeave(event: PlayerJobLeaveEvent) {
+        val player = event.player
+        val job = event.job
+        val price = job.leavePrice
+
+        if (price > 0) {
+            val hasMoney = player.balance >= price
+
+            if (!hasMoney) {
+                event.isCancelled = true
+            }
+
+            player.balance -= price
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.willfp.ecojobs.jobs
+
+import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+
+object ResetOnQuitListener : Listener {
+    @EventHandler(
+        ignoreCancelled = true
+    )
+    fun onQuit(event: PlayerJobLeaveEvent) {
+        val player = event.player
+        val job = event.job
+
+        if (job.resetsOnQuit) {
+            player.resetJob(job)
+        }
+    }
+}

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

@@ -48,12 +48,14 @@ gui:
         - ""
       item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmFkYzA0OGE3Y2U3OGY3ZGFkNzJhMDdkYTI3ZDg1YzA5MTY4ODFlNTUyMmVlZWQxZTNkYWYyMTdhMzhjMWEifX19
 
+    # %join_price% and %leave_price% are also available as placeholders
+
     active:
       name: "%job% &fLvl. &a%level%"
       lore:
         - "%description%"
         - "&f"
-        - "&fEffects:"
+        - "&fJob Rewards:"
         - "%effects%"
         - ""
         - "&fProgress:"
@@ -67,7 +69,7 @@ gui:
     lore:
       - "%description%"
       - "&f"
-      - "&fEffects:"
+      - "&fJob Rewards:"
       - "%effects%"
       - ""
       - "&fProgress:"
@@ -114,6 +116,9 @@ gui:
       row: 4
       column: 2
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: []
+
 level-gui:
   rows: 6
 
@@ -208,6 +213,9 @@ level-gui:
       row: 6
       column: 5
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: []
+
 level-up:
   message:
     enabled: true
@@ -252,7 +260,6 @@ point-names: # If you have point names that look ugly (eg g_souls) then you can
 
 use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
 raytrace-distance: 80 # The distance that alt_click should check for a location
-block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
 
 potions:
   icon:

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

@@ -13,6 +13,13 @@ description: "&8&oLevel up by mining blocks"
 # 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
+
 # The xp requirements for each job level - add new levels by adding more to this list
 level-xp-requirements:
   - 100

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

@@ -3,6 +3,11 @@ description: "&8&oLevel up by placing blocks"
 
 unlocked-by-default: true
 
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
 level-xp-requirements:
   - 100
   - 120

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

@@ -3,6 +3,11 @@ description: "&8&oLevel up by farming crops"
 
 unlocked-by-default: true
 
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
 level-xp-requirements:
   - 100
   - 120

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

@@ -3,6 +3,11 @@ description: "&8&oLevel up by mining blocks"
 
 unlocked-by-default: true
 
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
 level-xp-requirements:
   - 100
   - 120

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

@@ -3,6 +3,11 @@ description: "&8&oLevel up by killing mobs"
 
 unlocked-by-default: true
 
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
 level-xp-requirements:
   - 100
   - 120

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

@@ -20,6 +20,10 @@ messages:
   unlocked-job: "&fSuccessfully unlocked the %job%&f job for %player%!"
   cannot-spawn-job: "&cYou already have this job unlocked!"
   invalid-amount: "&cInvalid amount!"
+  no-job: "&cYou don't have a job!"
+  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!"
 
 menu:
   title: "Jobs"

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

@@ -49,6 +49,8 @@ permissions:
       ecojobs.command.jobs: true
       ecojobs.command.unlock: true
       ecojobs.command.givexp: true
+      ecojobs.command.join: true
+      ecojobs.command.leave: true
       ecojobs.command.reset: true
 
   ecojobs.command.reload:
@@ -69,6 +71,12 @@ permissions:
   ecojobs.command.reset:
     description: Allows the use of /ecojobs reset.
     default: op
+  ecojobs.command.join:
+    description: Allows the use of /jobs join.
+    default: true
+  ecojobs.command.leave:
+    description: Allows the use of /jobs leave.
+    default: true
 
   ecojobs.xpmultiplier.50percent:
     description: Gives the player 50% more job experience

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Wed Sep 14 12:59:56 BST 2022
-version=1.3.1
+#Mon Oct 03 18:28:55 BST 2022
+version=1.13.0
 plugin-name=EcoJobs