Added leave price

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

@@ -7,7 +7,7 @@ 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.JoinPriceHandler
+import com.willfp.ecojobs.jobs.PriceHandler
 import com.willfp.ecojobs.jobs.ResetOnQuitListener
 import com.willfp.ecojobs.jobs.activeJob
 import com.willfp.ecojobs.jobs.activeJobLevel
@@ -46,7 +46,7 @@ class EcoJobsPlugin : LibReforgePlugin() {
             JobLevelListener(this),
             JobTriggerXPGainListener,
             ResetOnQuitListener,
-            JoinPriceHandler
+            PriceHandler
         )
     }
 

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

@@ -42,6 +42,7 @@ class Job(
     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"),
@@ -255,7 +256,8 @@ class Job(
                     .replace("%description%", this.description)
                     .replace("%job%", this.name)
                     .replace("%level%", (forceLevel ?: player.getJobLevel(this)).toString())
-                    .replace("%cost%", NumberUtils.format(this.joinPrice))
+                    .replace("%join_price%", NumberUtils.format(this.joinPrice))
+                    .replace("%leave_price%", NumberUtils.format(this.leavePrice))
             }
             .toMutableList()
 

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

@@ -1,25 +0,0 @@
-package com.willfp.ecojobs.jobs
-
-import com.willfp.eco.core.integrations.economy.balance
-import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
-import org.bukkit.event.EventHandler
-import org.bukkit.event.Listener
-
-object JoinPriceHandler : Listener {
-    @EventHandler
-    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
-        }
-    }
-}

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

@@ -4,8 +4,10 @@ import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 
-object ResetOnQuitListener: Listener {
+object ResetOnQuitListener : Listener {
-    @EventHandler
+    @EventHandler(
+        ignoreCancelled = true
+    )
     fun onQuit(event: PlayerJobLeaveEvent) {
         val player = event.player
         val job = event.job

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

@@ -48,6 +48,8 @@ gui:
         - ""
       item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmFkYzA0OGE3Y2U3OGY3ZGFkNzJhMDdkYTI3ZDg1YzA5MTY4ODFlNTUyMmVlZWQxZTNkYWYyMTdhMzhjMWEifX19
 
+    # %join_price% and %leave_price% are also available as placeholders
+
     active:
       name: "%job% &fLvl. &a%level%"
       lore:
@@ -78,7 +80,7 @@ gui:
       - ""
       - "&cThis job is already active!"
 
-    not-active-lore: # If using join cost, you can use %cost% as a placeholder.
+    not-active-lore:
       - ""
       - "&eClick to activate this job!"
 

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

@@ -16,8 +16,9 @@ unlocked-by-default: true
 # If job progress should be reset when quitting
 reset-on-quit: false
 
-# The price to join this job (set to 0 to disable)
+# 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:

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

@@ -4,7 +4,9 @@ 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

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

@@ -4,7 +4,9 @@ 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

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

@@ -4,7 +4,9 @@ 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

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

@@ -4,7 +4,9 @@ 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