libreforge-updater

README.md

@@ -1,27 +1,27 @@
 <h1 align="center">
   <br>
-  <img src="https://i.imgur.com/FHqL960.png" alt="EcoJobs logo" width="256">
+  <img src="https://i.imgur.com/Qd617BL.png" alt="EcoJobs logo" width="256">
   <br>
 </h1>
 
 <h4 align="center">Source code for EcoJobs, a premium spigot plugin.</h4>
 
 <p align="center">
-    <a href="https://polymart.org/resource/ecojobs.1351">
+    <a href="https://polymart.org/resource/ecojobs.2857">
         <img alt="spigot" src="https://img.shields.io/badge/polymart-EcoJobs-964B00?style=for-the-badge"/>
     </a>
     <a href="https://bstats.org/plugin/bukkit/EcoJobs" alt="bstats servers">
-        <img src="https://img.shields.io/bstats/servers/15502?color=964B00&style=for-the-badge"/>
+        <img src="https://img.shields.io/bstats/servers/16394?color=964B00&style=for-the-badge"/>
     </a>
     <a href="https://bstats.org/plugin/bukkit/EcoJobs" alt="bstats players">
-        <img src="https://img.shields.io/bstats/players/15502?color=964B00&style=for-the-badge"/>
+        <img src="https://img.shields.io/bstats/players/16394?color=964B00&style=for-the-badge"/>
     </a>
     <a href="https://discord.gg/ZcwpSsE/" alt="Discord">
         <img src="https://img.shields.io/discord/452518336627081236?label=discord&style=for-the-badge&color=964B00"/>
     </a>
 </p>
 
-[![Docs](https://i.imgur.com/4JciYrQ.png)](https://discord.gg/ZcwpSsE/)
+[![Docs](https://i.imgur.com/7Ac2KTg.png)](https://discord.gg/ZcwpSsE/)
 
 ## License
 *Click here to read [the entire license](https://github.com/Auxilor/EcoJobs/blob/master/LICENSE.md).*

build.gradle

@@ -47,7 +47,7 @@ allprojects {
 
     dependencies {
         compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.96.0'
+        implementation 'com.willfp:libreforge:3.97.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/CommandGiveXP.kt

@@ -6,6 +6,7 @@ import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.savedDisplayName
 import com.willfp.eco.util.toNiceString
 import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.ecojobs.jobs.giveExactJobExperience
 import com.willfp.ecojobs.jobs.giveJobExperience
 import com.willfp.ecojobs.jobs.hasJob
 import org.bukkit.Bukkit
@@ -56,7 +57,7 @@ class CommandGiveXP(plugin: EcoPlugin) : Subcommand(plugin, "givexp", "ecojobs.c
             return
         }
 
-        player.giveJobExperience(
+        player.giveExactJobExperience(
             job,
             amount
         )

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

@@ -1,3 +1,3 @@
-resource-id: 0
+resource-id: 2857
 bstats-id: 16394
 color: "&#964B00"

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

@@ -97,4 +97,4 @@ effects:
 
 conditions: [ ]
 
-icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmM4ZWJhZDcyYjc3ZGYzOTkwZTA3YmM4NjlhOTlhOGY4OTYyZDNjMTljNzZlMzlkOTk1NTNjYWU0MTMxY2M4In19fQ==
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTBiYmVmMGE0YmNmMDNlMDQ5ZDU1NmRhMGJlZDZiNDFkZDkyOGI4OTdhNDJhZTAxZWZlYTY4NGI1NjFjNDMyZiJ9fX0=

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

@@ -0,0 +1,119 @@
+name: "&eFarmer"
+description: "&8&oLevel up by farming crops"
+
+unlocked-by-default: true
+
+level-xp-requirements:
+  - 100
+  - 120
+  - 150
+  - 180
+  - 210
+  - 250
+  - 300
+  - 360
+  - 430
+  - 520
+  - 620
+  - 740
+  - 890
+  - 1000
+  - 1300
+  - 1500
+  - 1900
+  - 2200
+  - 2700
+  - 3200
+  - 3800
+  - 4600
+  - 5500
+  - 6600
+  - 7900
+  - 9500
+  - 11500
+  - 14000
+  - 17000
+  - 19000
+  - 24000
+  - 29000
+  - 34000
+  - 41000
+  - 50000
+  - 60000
+  - 70000
+  - 85000
+  - 100000
+  - 120000
+  - 150000
+  - 180000
+  - 210000
+  - 250000
+  - 300000
+  - 360000
+  - 440000
+  - 580000
+  - 750000
+
+xp-gain-methods:
+  - trigger: mine_block
+    multiplier: 0.5
+    conditions: [ ]
+    filters:
+      blocks:
+        - "wheat"
+        - "potatoes"
+        - "beetroots"
+        - "carrots"
+        - "melon"
+        - "pumpkin"
+        - "cactus"
+        - "sugar_cane"
+        - "cocoa"
+        - "nether_wart"
+        - "bamboo"
+        - "sweet_berries"
+        - "glow_berries"
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 0.25"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%level% * 0.25"
+    filters:
+      blocks:
+        - "wheat"
+        - "potatoes"
+        - "beetroots"
+        - "carrots"
+        - "melon"
+        - "pumpkin"
+        - "cactus"
+        - "sugar_cane"
+        - "cocoa"
+        - "nether_wart"
+        - "bamboo"
+        - "sweet_berries"
+        - "glow_berries"
+    triggers:
+      - mine_block
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODMzNmUzMTVlMWFlOTk1NzJkYzljNzJhNjJhMTRiODU3Nzc0MWRjMzQ3MmM3NDEzZDdlYWE2NjdhMzA3YTNkNyJ9fX0=

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

@@ -0,0 +1,92 @@
+name: "&#8a0303Slayer"
+description: "&8&oLevel up by killing mobs"
+
+unlocked-by-default: true
+
+level-xp-requirements:
+  - 100
+  - 120
+  - 150
+  - 180
+  - 210
+  - 250
+  - 300
+  - 360
+  - 430
+  - 520
+  - 620
+  - 740
+  - 890
+  - 1000
+  - 1300
+  - 1500
+  - 1900
+  - 2200
+  - 2700
+  - 3200
+  - 3800
+  - 4600
+  - 5500
+  - 6600
+  - 7900
+  - 9500
+  - 11500
+  - 14000
+  - 17000
+  - 19000
+  - 24000
+  - 29000
+  - 34000
+  - 41000
+  - 50000
+  - 60000
+  - 70000
+  - 85000
+  - 100000
+  - 120000
+  - 150000
+  - 180000
+  - 210000
+  - 250000
+  - 300000
+  - 360000
+  - 440000
+  - 580000
+  - 750000
+
+xp-gain-methods:
+  - trigger: kill
+    multiplier: 0.05
+    conditions: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% / 10"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 per heart of health that"
+    - "  &8mobs you kill have"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 per heart of health that"
+    - "  &8mobs you kill have"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 per heart of health that"
+    - "  &8mobs you kill have"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%v% * %level% * 0.1"
+    triggers:
+      - kill
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDY5MTllMGFjYzFiMjkzYThkNWY5NzI4NjkzMzZhN2VmZWRiMGJhNmY0YzdlMTkzODhkOGZiODEyNjBmMzIzYyJ9fX0=

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Sat Sep 10 12:58:46 BST 2022
+#Sun Sep 11 19:27:54 BST 2022
-version=1.0.0
+version=1.1.0
 plugin-name=EcoJobs