libreforge-updater

Add %level_numeral% placeholder in Job Main and Job Level Gui

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @WillFP

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Auxilor Community Discord
+  - name: Discord
     url: https://discord.gg/ZcwpSsE/
-    about: Join the Auxilor discord to get help from support staff and the general community!
+    about: Issues have moved to Discord, please join the server to get help!
-  - name: The most common issues people have
-    url: https://github.com/Auxilor/eco/issues/78
-    about: Check the list of known common issues to see if your issue has already been solved

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -4,28 +4,8 @@ about: Report an issue with the plugin
 title: ''
 labels: bug
 assignees: ''
-
 ---
 
-**Describe the bug**
+# Please report bugs on the discord!
-A clear and concise description of what the bug is.
 
-**To Reproduce**
+[Join by clicking here](https://discord.gg/ZcwpSsE/)
-Steps to reproduce the behavior: 
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Server Information (please complete the following information):**
-- Version: (output of `/ver` command)
-- Version of plugin and eco (`/ver eco`, `/ver <plugin>`)
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -1,20 +0,0 @@
----
-name: Request a Feature
-about: Suggest an idea for this plugin
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/publish-release.yml

@@ -0,0 +1,33 @@
+name: Publish Packages
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout latest code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

build.gradle

@@ -1,121 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
-    }
-}
-
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'maven-publish'
-    id 'java'
-}
-
-dependencies {
-    implementation project(":eco-core").getSubprojects()
-}
-
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'kotlin'
-    apply plugin: 'maven-publish'
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-        maven { url 'https://repo.codemc.org/repository/nms/' }
-        maven { url 'https://repo.codemc.io/repository/maven-public/' }
-        maven { url 'https://repo.dmulloy2.net/repository/public/' }
-        maven { url 'https://repo.essentialsx.net/releases/' }
-    }
-
-    jar {
-        onlyIf { !sourceSets.main.allSource.files.isEmpty() }
-    }
-
-    shadowJar {
-        relocate('com.willfp.libreforge', 'com.willfp.ecojobs.libreforge')
-        relocate('org.joml', 'com.willfp.ecojobs.libreforge.joml')
-    }
-
-    dependencies {
-        compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.102.0'
-        implementation 'org.joml:joml:1.10.4'
-
-        compileOnly 'org.jetbrains:annotations:23.0.0'
-
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
-    }
-
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-        options.encoding = 'UTF-8'
-    }
-
-    processResources {
-        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**/jobs/**", "**lang.yml"]) {
-            expand projectVersion: project.version
-        }
-    }
-
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            jvmTarget = "17"
-            freeCompilerArgs = ['-Xjvm-default=all']
-        }
-    }
-
-    java.sourceCompatibility = JavaVersion.VERSION_17
-    java.targetCompatibility = JavaVersion.VERSION_17
-
-    compileJava.options.encoding = 'UTF-8'
-    compileJava.dependsOn clean
-
-    build.dependsOn shadowJar
-}
-
-tasks.withType(Jar) {
-    destinationDirectory = file("$rootDir/bin/")
-}
-
-clean.doLast {
-    file("${rootDir}/bin").deleteDir()
-}
-
-shadowJar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
-}
-
-jar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar"
-}
-
-group = 'com.willfp'
-archivesBaseName = project.name
-version = findProperty("version")
-
-compileJava.options.encoding = 'UTF-8'
-
-
-build.dependsOn shadowJar
-build.dependsOn publishToMavenLocal
-
-task buyThePlugins {
-    dependsOn subprojects.build
-
-    doLast {
-        println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
-        println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
-        println 'Polymart: https://polymart.org/user/auxilor.1107/'
-        println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
-    }
-}
-build.finalizedBy buyThePlugins

build.gradle.kts

@@ -0,0 +1,83 @@
+plugins {
+    java
+    `java-library`
+    `maven-publish`
+    kotlin("jvm") version "1.7.10"
+    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
+}
+
+group = "com.willfp"
+version = findProperty("version")!!
+val libreforgeVersion = findProperty("libreforge-version")
+
+base {
+    archivesName.set(project.name)
+}
+
+dependencies {
+    project(":eco-core").dependencyProject.subprojects {
+        implementation(this)
+    }
+}
+
+allprojects {
+    apply(plugin = "java")
+    apply(plugin = "kotlin")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.johnrengelman.shadow")
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://repo.auxilor.io/repository/maven-public/")
+        maven("https://jitpack.io")
+    }
+
+    dependencies {
+        compileOnly("com.willfp:eco:6.55.0")
+        compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+    }
+
+    java {
+        withSourcesJar()
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
+    tasks {
+        shadowJar {
+            relocate("com.willfp.libreforge.loader", "com.willfp.ecojobs.libreforge.loader")
+            relocate("com.willfp.ecomponent", "com.willfp.ecojobs.ecomponent")
+        }
+
+        compileKotlin {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+
+        compileJava {
+            options.isDeprecation = true
+            options.encoding = "UTF-8"
+
+            dependsOn(clean)
+        }
+
+        processResources {
+            filesMatching(listOf("**plugin.yml", "**eco.yml")) {
+                expand(
+                    "version" to project.version,
+                    "libreforgeVersion" to libreforgeVersion,
+                    "pluginName" to rootProject.name
+                )
+            }
+        }
+
+        build {
+            dependsOn(shadowJar)
+        }
+    }
+}

config/checkstyle/checkstyle.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
-
-    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
-
-    - the Javadoc guidelines at
-      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
-
-    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.org (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-  To suppress certain violations please review suppression filters.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-    <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppression.xml"/>
-    </module>
-
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        https://checkstyle.org/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <property name="severity" value="error"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See https://checkstyle.org/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See https://checkstyle.org/config_sizes.html -->
-    <module name="FileLength"/>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="200"/>
-    </module>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See https://checkstyle.org/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See https://checkstyle.org/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See https://checkstyle.org/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments. -->
-        <!-- See https://checkstyle.org/config_javadoc.html -->
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-        <module name="MissingJavadocMethod"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See https://checkstyle.org/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See https://checkstyle.org/config_imports.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="true"/>
-        </module>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See https://checkstyle.org/config_sizes.html -->
-        <!-- <module name="MethodLength"/> -->
-        <module name="ParameterNumber"/>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See https://checkstyle.org/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See https://checkstyle.org/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See https://checkstyle.org/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See https://checkstyle.org/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See https://checkstyle.org/config_design.html -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-        <!-- <module name="HideUtilityClassConstructor"/> -->
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-        <module name="RequireThis"/>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See https://checkstyle.org/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-</module>

config/checkstyle/suppression.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <!-- Fields don't need javadoc -->
-    <suppress files="Effects.java" checks="JavadocVariable"/>
-    <suppress files="Skills.java" checks="JavadocVariable"/>
-    <suppress files="Stats.java" checks="JavadocVariable"/>
-</suppressions>

eco-core/build.gradle

@@ -1,2 +0,0 @@
-group 'com.willfp'
-version rootProject.version

eco-core/build.gradle.kts

@@ -0,0 +1,2 @@
+group = "com.willfp"
+version = rootProject.version

eco-core/core-plugin/build.gradle

@@ -1,20 +0,0 @@
-group 'com.willfp'
-version rootProject.version
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.0'
-    compileOnly 'net.kyori:adventure-api:4.10.1'
-    compileOnly 'net.essentialsx:EssentialsX:2.19.0'
-    compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
-}
-
-build.dependsOn publishToMavenLocal
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from(components.java)
-        }
-    }
-}

eco-core/core-plugin/build.gradle.kts

@@ -0,0 +1,40 @@
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
+    compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.5")
+
+    implementation("com.willfp:ecomponent:1.3.0")
+}
+
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            groupId = project.group.toString()
+            version = project.version.toString()
+            artifactId = rootProject.name
+
+            artifact(rootProject.tasks.shadowJar.get().archiveFile)
+        }
+    }
+
+    publishing {
+        repositories {
+            maven {
+                name = "auxilor"
+                url = uri("https://repo.auxilor.io/repository/maven-releases/")
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
+tasks {
+    build {
+        dependsOn(publishToMavenLocal)
+    }
+}

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

@@ -1,36 +0,0 @@
-package com.willfp.ecojobs
-
-import com.willfp.ecojobs.api.EcoJobsAPI
-import com.willfp.ecojobs.jobs.Job
-import com.willfp.ecojobs.jobs.activeJob
-import com.willfp.ecojobs.jobs.getJobLevel
-import com.willfp.ecojobs.jobs.getJobProgress
-import com.willfp.ecojobs.jobs.getJobXP
-import com.willfp.ecojobs.jobs.getJobXPRequired
-import com.willfp.ecojobs.jobs.giveJobExperience
-import com.willfp.ecojobs.jobs.hasJob
-import org.bukkit.OfflinePlayer
-import org.bukkit.entity.Player
-
-internal object EcoJobsAPIImpl : EcoJobsAPI {
-    override fun hasJob(player: OfflinePlayer, job: Job) = player.hasJob(job)
-
-    override fun getActiveJob(player: OfflinePlayer): Job? = player.activeJob
-
-    override fun getJobLevel(player: OfflinePlayer, job: Job) = player.getJobLevel(job)
-
-    override fun giveJobExperience(player: Player, job: Job, amount: Double) =
-        player.giveJobExperience(job, amount)
-
-    override fun giveJobExperience(player: Player, job: Job, amount: Double, applyMultipliers: Boolean) =
-        player.giveJobExperience(job, amount, noMultiply = !applyMultipliers)
-
-    override fun getJobProgress(player: OfflinePlayer, job: Job) =
-        player.getJobProgress(job)
-
-    override fun getJobXPRequired(player: OfflinePlayer, job: Job) =
-        player.getJobXPRequired(job)
-
-    override fun getJobXP(player: OfflinePlayer, job: Job) =
-        player.getJobXP(job)
-}

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

@@ -1,42 +1,116 @@
 package com.willfp.ecojobs
 
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.core.placeholder.DynamicPlaceholder
 import com.willfp.eco.core.placeholder.PlayerPlaceholder
-import com.willfp.eco.util.toSingletonList
+import com.willfp.eco.util.savedDisplayName
-import com.willfp.ecojobs.commands.CommandEcojobs
+import com.willfp.eco.util.toNiceString
+import com.willfp.ecojobs.api.activeJobs
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.ecojobs.api.jobLimit
+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.Jobs
 import com.willfp.ecojobs.jobs.PriceHandler
 import com.willfp.ecojobs.jobs.ResetOnQuitListener
-import com.willfp.ecojobs.jobs.activeJob
+import com.willfp.ecojobs.libreforge.ConditionHasActiveJob
-import com.willfp.ecojobs.jobs.activeJobLevel
+import com.willfp.ecojobs.libreforge.ConditionHasJobLevel
-import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.ecojobs.libreforge.EffectGiveJobXp
+import com.willfp.ecojobs.libreforge.EffectJobXpMultiplier
+import com.willfp.ecojobs.libreforge.FilterJob
+import com.willfp.ecojobs.libreforge.TriggerGainJobXp
+import com.willfp.ecojobs.libreforge.TriggerJoinJob
+import com.willfp.ecojobs.libreforge.TriggerLeaveJob
+import com.willfp.ecojobs.libreforge.TriggerLevelUpJob
+import com.willfp.libreforge.SimpleProvidedHolder
+import com.willfp.libreforge.conditions.Conditions
+import com.willfp.libreforge.effects.Effects
+import com.willfp.libreforge.filters.Filters
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.registerSpecificHolderProvider
+import com.willfp.libreforge.triggers.Triggers
+import org.bukkit.entity.Player
 import org.bukkit.event.Listener
+import java.util.regex.Pattern
 
-class EcoJobsPlugin : LibReforgePlugin() {
+class EcoJobsPlugin : LibreforgePlugin() {
     init {
         instance = this
-        registerHolderProvider { it.activeJobLevel?.toSingletonList() ?: emptyList() }
     }
 
-    override fun handleEnableAdditional() {
+    override fun loadConfigCategories(): List<ConfigCategory> {
-        this.copyConfigs("jobs")
+        return listOf(
+            Jobs
+        )
+    }
+
+    override fun handleEnable() {
+        Conditions.register(ConditionHasJobLevel)
+        Conditions.register(ConditionHasActiveJob)
+        Effects.register(EffectJobXpMultiplier)
+        Effects.register(EffectGiveJobXp)
+        Triggers.register(TriggerGainJobXp)
+        Triggers.register(TriggerLevelUpJob)
+        Triggers.register(TriggerJoinJob)
+        Triggers.register(TriggerLeaveJob)
+        Filters.register(FilterJob)
+        
+        registerSpecificHolderProvider<Player> { player ->
+            player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map {
+                SimpleProvidedHolder(it)
+            }
+        }
 
         PlayerPlaceholder(
             this,
-            "job"
+            "limit"
-        ) { it.activeJob?.name ?: "" }.register()
+        ) { it.jobLimit.toString() }.register()
 
         PlayerPlaceholder(
             this,
-            "job_id"
+            "in_jobs"
-        ) { it.activeJob?.id ?: "" }.register()
+        ) { it.activeJobs.size.toString() }.register()
+
+        PlayerPlaceholder(
+            this,
+            "total_job_level"
+        ) {
+            var level = 0
+            for (job in Jobs.values()) {
+                level += it.getJobLevel(job)
+            }
+            level.toString()
+        }.register()
+
+        DynamicPlaceholder(
+            this,
+            Pattern.compile("top_[a-z]+_[0-9]+_[a-z]+")
+        ) {
+            val split = it.split("_")
+            val jobId = split.getOrNull(1) ?: return@DynamicPlaceholder "You must specify the job id!"
+            val job = Jobs.getByID(jobId) ?: return@DynamicPlaceholder "Invalid job id!"
+            val placeString = split.getOrNull(2) ?: return@DynamicPlaceholder "You must specify the place!"
+            val place = placeString.toIntOrNull() ?: return@DynamicPlaceholder "Invalid place!"
+            val type = split.getOrNull(3) ?: return@DynamicPlaceholder "You must specify the top type!"
+            val topEntry = job.getTop(place)
+            return@DynamicPlaceholder when (type) {
+                "name" -> topEntry?.player?.savedDisplayName
+                    ?: this.langYml.getFormattedString("top.name-empty")
+
+                "amount" -> topEntry?.amount?.toNiceString()
+                    ?: this.langYml.getFormattedString("top.amount-empty")
+
+                else -> "Invalid type: $type! Available types: name/amount"
+            }
+        }.register()
     }
 
     override fun loadPluginCommands(): List<PluginCommand> {
         return listOf(
-            CommandEcojobs(this),
+            CommandEcoJobs(this),
             CommandJobs(this)
         )
     }
@@ -44,7 +118,6 @@ class EcoJobsPlugin : LibReforgePlugin() {
     override fun loadListeners(): List<Listener> {
         return listOf(
             JobLevelListener(this),
-            JobTriggerXPGainListener,
             ResetOnQuitListener,
             PriceHandler
         )

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

@@ -1,117 +1,192 @@
+@file:JvmName("EcoJobsAPI")
+
 package com.willfp.ecojobs.api
 
-import com.willfp.ecojobs.EcoJobsAPIImpl
+import com.willfp.eco.core.data.keys.PersistentDataKey
+import com.willfp.eco.core.data.keys.PersistentDataKeyType
+import com.willfp.eco.core.data.profile
+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.ecojobs.jobs.Job
+import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.ecojobs.jobs.getNumericalPermission
+import com.willfp.ecojobs.jobs.jobExperienceMultiplier
+import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
+import kotlin.math.abs
 
-interface EcoJobsAPI {
+private val plugin = EcoJobsPlugin.instance
-    /**
-     * Get if a player has a job.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @return If the player has the job unlocked.
-     */
-    fun hasJob(
-        player: OfflinePlayer,
-        job: Job
-    ): Boolean
 
-    /**
+/*
-     * Get a player's active job.
-     *
-     * @param player The player.
-     * @return The active job.
-     */
-    fun getActiveJob(
-        player: OfflinePlayer
-    ): Job?
 
-    /**
+The old key is around for backwards compatibility with 1.x.x.
-     * Get a player's level of a certain job.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @return The level.
-     */
-    fun getJobLevel(
-        player: OfflinePlayer,
-        job: Job
-    ): Int
 
-    /**
-     * Give job experience to a player.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @param amount The amount of experience to give.
  */
-    fun giveJobExperience(
+
-        player: Player,
+private val legacyActiveJobKey: PersistentDataKey<String> = PersistentDataKey(
-        job: Job,
+    plugin.namespacedKeyFactory.create("active_job"), PersistentDataKeyType.STRING, ""
-        amount: Double
+)
+
+private val activeJobsKey: PersistentDataKey<List<String>> = PersistentDataKey(
+    plugin.namespacedKeyFactory.create("active_jobs"), PersistentDataKeyType.STRING_LIST, listOf()
 )
 
 /**
-     * Give job experience to a player.
+ * The job limit.
-     *
-     * @param player           The player.
-     * @param job              The job.
-     * @param amount           The amount of experience to give.
-     * @param applyMultipliers If multipliers should be applied.
  */
-    fun giveJobExperience(
+val Player.jobLimit: Int
-        player: Player,
+    get() {
-        job: Job,
+        return this.getNumericalPermission("ecojobs.limit", plugin.configYml.getDouble("jobs.limit")).toInt()
-        amount: Double,
+    }
-        applyMultipliers: Boolean
-    )
 
 /**
-     * Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
+ * If a player can join a job.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @return The progress.
  */
-    fun getJobProgress(
+fun Player.canJoinJob(job: Job): Boolean {
-        player: OfflinePlayer,
+    return this.activeJobs.size < this.jobLimit && job !in this.activeJobs && this.hasJob(job)
-        job: Job
+}
-    ): Double
+
+/**
+ * Get if a job is unlocked.
+ */
+fun OfflinePlayer.hasJob(job: Job) = this.getJobLevel(job) > 0
+
+/**
+ * Get if a player has a job active.
+ */
+fun OfflinePlayer.hasJobActive(job: Job) = job in this.activeJobs
+
+/**
+ * Get a player's active jobs.
+ */
+val OfflinePlayer.activeJobs: Collection<Job>
+    get() {
+        if (this.profile.read(legacyActiveJobKey).isNotBlank()) {
+            this.profile.write(activeJobsKey, listOf(this.profile.read(legacyActiveJobKey)))
+            this.profile.write(legacyActiveJobKey, "")
+        }
+
+        return this.profile.read(activeJobsKey).mapNotNull { Jobs.getByID(it) }
+
+    }
+
+/**
+ * Join a job.
+ */
+fun OfflinePlayer.joinJob(job: Job) {
+    val event = PlayerJobJoinEvent(this, job)
+    Bukkit.getPluginManager().callEvent(event)
+
+    if (!event.isCancelled) {
+        this.profile.write(activeJobsKey, this.activeJobs.plus(job).map { it.id })
+    }
+}
+
+/**
+ * Leave a job.
+ */
+fun OfflinePlayer.leaveJob(job: Job) {
+    if (job !in this.activeJobs) {
+        return
+    }
+
+    val event = PlayerJobLeaveEvent(this, job)
+    Bukkit.getPluginManager().callEvent(event)
+
+    if (!event.isCancelled) {
+        this.forceLeaveJob(job)
+    }
+}
+
+/**
+ * Leave a job without checking.
+ */
+fun OfflinePlayer.forceLeaveJob(job: Job) {
+    this.profile.write(activeJobsKey, this.activeJobs.minus(job).map { it.id })
+}
+
+/**
+ * Get the level of a certain job.
+ */
+fun OfflinePlayer.getJobLevel(job: Job) = this.profile.read(job.levelKey)
+
+/**
+ * Set the level of a certain job.
+ */
+fun OfflinePlayer.setJobLevel(job: Job, level: Int) = this.profile.write(job.levelKey, level)
+
+/**
+ * Get current job experience.
+ */
+fun OfflinePlayer.getJobXP(job: Job) = this.profile.read(job.xpKey)
+
+/**
+ * Set current job experience.
+ */
+fun OfflinePlayer.setJobXP(job: Job, xp: Double) = this.profile.write(job.xpKey, xp)
+
+/**
+ * Reset a job.
+ */
+fun OfflinePlayer.resetJob(job: Job) {
+    this.setJobLevel(job, 1)
+    this.setJobXP(job, 0.0)
+}
 
 /**
  * Get the experience required to advance to the next level.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @return The experience required.
  */
-    fun getJobXPRequired(
+fun OfflinePlayer.getJobXPRequired(job: Job) = job.getExpForLevel(this.getJobLevel(job) + 1)
-        player: OfflinePlayer,
-        job: Job
-    ): Int
 
 /**
-     * Get experience to the next level.
+ * Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
-     *
-     * @param player The player.
-     * @param job    The job.
-     * @return The experience.
  */
-    fun getJobXP(
+fun OfflinePlayer.getJobProgress(job: Job): Double {
-        player: OfflinePlayer,
+    val currentXP = this.getJobXP(job)
-        job: Job
+    val requiredXP = job.getExpForLevel(this.getJobLevel(job) + 1)
-    ): Double
+    return currentXP / requiredXP
+}
 
-    companion object {
 /**
-         * Get the instance of the API.
+ * Give job experience.
-         *
-         * @return The API.
  */
-        @JvmStatic
+@JvmOverloads
-        val instance: EcoJobsAPI
+fun Player.giveJobExperience(job: Job, experience: Double, withMultipliers: Boolean = true) {
-            get() = EcoJobsAPIImpl
+    val exp = abs(
+        if (withMultipliers) experience * this.jobExperienceMultiplier
+        else experience
+    )
+
+    val gainEvent = PlayerJobExpGainEvent(this, job, exp, !withMultipliers)
+    Bukkit.getPluginManager().callEvent(gainEvent)
+
+    if (gainEvent.isCancelled) {
+        return
+    }
+
+    this.giveExactJobExperience(job, gainEvent.amount)
+}
+
+/**
+ * Give exact job experience, without calling PlayerJobExpGainEvent.
+ */
+fun Player.giveExactJobExperience(job: Job, experience: Double) {
+    val level = this.getJobLevel(job)
+
+    val progress = this.getJobXP(job) + experience
+
+    if (progress >= job.getExpForLevel(level + 1) && level + 1 <= job.maxLevel) {
+        val overshoot = progress - job.getExpForLevel(level + 1)
+        this.setJobXP(job, 0.0)
+        this.setJobLevel(job, level + 1)
+        val levelUpEvent = PlayerJobLevelUpEvent(this, job, level + 1)
+        Bukkit.getPluginManager().callEvent(levelUpEvent)
+        this.giveExactJobExperience(job, overshoot)
+    } else {
+        this.setJobXP(job, progress)
     }
 }

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

@@ -0,0 +1,7 @@
+package com.willfp.ecojobs.api.event
+
+import com.willfp.ecojobs.jobs.Job
+
+interface JobEvent {
+    val job: Job
+}

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

@@ -8,10 +8,10 @@ import org.bukkit.event.Cancellable
 
 class PlayerJobExpGainEvent(
     who: Player,
-    val job: Job,
+    override val job: Job,
     var amount: Double,
     val isMultiply: Boolean
-) : PlayerEvent(who), Cancellable {
+) : PlayerEvent(who), Cancellable, JobEvent {
     private var cancelled = false
 
     override fun setCancelled(cancel: Boolean) {

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

@@ -2,17 +2,14 @@ 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,
+    override val job: Job
-    val oldJob: Job?
+) : Event(), Cancellable, JobEvent {
-) : Event(), Cancellable {
     private var cancelled = false
 
     override fun isCancelled() = this.cancelled

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

@@ -8,8 +8,8 @@ import org.bukkit.event.HandlerList
 
 class PlayerJobLeaveEvent(
     val player: OfflinePlayer,
-    val job: Job
+    override val job: Job
-) : Event(), Cancellable {
+) : Event(), Cancellable, JobEvent {
     private var cancelled = false
 
     override fun isCancelled() = this.cancelled

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

@@ -7,9 +7,9 @@ import org.bukkit.event.HandlerList
 
 class PlayerJobLevelUpEvent(
     who: Player,
-    val job: Job,
+    override val job: Job,
     val level: Int
-) : PlayerEvent(who) {
+) : PlayerEvent(who), JobEvent {
     override fun getHandlers(): HandlerList {
         return handlerList
     }

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

@@ -4,7 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
 import org.bukkit.command.CommandSender
 
-class CommandEcojobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
+class CommandEcoJobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
     init {
         this.addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandUnlock(plugin))

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

@@ -5,10 +5,9 @@ import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.savedDisplayName
 import com.willfp.eco.util.toNiceString
+import com.willfp.ecojobs.api.giveExactJobExperience
+import com.willfp.ecojobs.api.hasJob
 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
 import org.bukkit.command.CommandSender
 

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

@@ -2,13 +2,56 @@ package com.willfp.ecojobs.commands
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.ecojobs.api.hasJob
+import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.ecojobs.jobs.JobsGUI
-import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
 
 class CommandJobs(plugin: EcoPlugin) : PluginCommand(plugin, "jobs", "ecojobs.command.jobs", true) {
-    override fun onExecute(player: CommandSender, args: List<String>) {
+    init {
-        player as Player
+        this.addSubcommand(CommandJoin(plugin))
+            .addSubcommand(CommandLeave(plugin))
+    }
+
+    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

@@ -0,0 +1,73 @@
+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.api.canJoinJob
+import com.willfp.ecojobs.api.hasJob
+import com.willfp.ecojobs.api.hasJobActive
+import com.willfp.ecojobs.api.joinJob
+import com.willfp.ecojobs.jobs.Jobs
+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.hasJobActive(job)) {
+            player.sendMessage(plugin.langYml.getMessage("job-already-joined"))
+            return
+        }
+
+        if (!player.canJoinJob(job)) {
+            player.sendMessage(plugin.langYml.getMessage("cannot-join-job"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("joined-job", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%job%", job.name)
+        )
+
+        player.joinJob(job)
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (sender !is Player) {
+            return emptyList()
+        }
+
+        val completions = mutableListOf<String>()
+
+        if (args.isEmpty()) {
+            return Jobs.values().filter { sender.hasJob(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                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,79 @@
+package com.willfp.ecojobs.commands
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.ecojobs.api.activeJobs
+import com.willfp.ecojobs.api.hasJob
+import com.willfp.ecojobs.api.hasJobActive
+import com.willfp.ecojobs.api.leaveJob
+import com.willfp.ecojobs.jobs.Jobs
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandLeave(plugin: EcoPlugin) : Subcommand(plugin, "leave", "ecojobs.command.leave", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (args.isEmpty()) {
+            player.sendMessage(plugin.langYml.getMessage("needs-job"))
+            return
+        }
+
+        if (player.activeJobs.isEmpty()) {
+            player.sendMessage(plugin.langYml.getMessage("no-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.hasJobActive(job)) {
+            player.sendMessage(plugin.langYml.getMessage("not-in-job"))
+            return
+        }
+
+        player.leaveJob(job)
+
+        if (!player.hasJobActive(job)) {
+            player.sendMessage(
+                plugin.langYml.getMessage("left-job")
+                    .replace("%job%", job.name)
+            )
+        } else {
+            player.sendMessage(
+                plugin.langYml.getMessage("cant-leave-job")
+                    .replace("%job%", job.name)
+            )
+        }
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (sender !is Player) {
+            return emptyList()
+        }
+
+        val completions = mutableListOf<String>()
+
+        if (args.isEmpty()) {
+            return Jobs.values().filter { sender.hasJobActive(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                Jobs.values().filter { sender.hasJobActive(it) }.map { it.id },
+                completions
+            )
+            return completions
+        }
+
+        return emptyList()
+    }
+}

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

@@ -4,12 +4,10 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.savedDisplayName
+import com.willfp.ecojobs.api.forceLeaveJob
+import com.willfp.ecojobs.api.hasJob
+import com.willfp.ecojobs.api.resetJob
 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
 import org.bukkit.command.CommandSender
 
@@ -46,9 +44,7 @@ class CommandReset(plugin: EcoPlugin) : Subcommand(plugin, "reset", "ecojobs.com
             return
         }
 
-        if (player.activeJob == job) {
+        player.forceLeaveJob(job)
-            player.activeJob = null
-        }
         player.resetJob(job)
 
         sender.sendMessage(

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

@@ -4,9 +4,9 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.savedDisplayName
+import com.willfp.ecojobs.api.hasJob
+import com.willfp.ecojobs.api.setJobLevel
 import com.willfp.ecojobs.jobs.Jobs
-import com.willfp.ecojobs.jobs.hasJob
-import com.willfp.ecojobs.jobs.setJobLevel
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.util.StringUtil

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

@@ -4,45 +4,62 @@ import com.github.benmanes.caffeine.cache.Caffeine
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.data.keys.PersistentDataKey
 import com.willfp.eco.core.data.keys.PersistentDataKeyType
-import com.willfp.eco.core.data.profile
 import com.willfp.eco.core.items.Items
 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.core.registry.Registrable
 import com.willfp.eco.util.NumberUtils
 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.activeJobs
-import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
+import com.willfp.ecojobs.api.canJoinJob
-import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
+import com.willfp.ecojobs.api.getJobLevel
-import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.ecojobs.api.getJobProgress
+import com.willfp.ecojobs.api.getJobXP
+import com.willfp.ecojobs.api.getJobXPRequired
+import com.willfp.ecojobs.api.hasJobActive
+import com.willfp.ecojobs.api.jobLimit
+import com.willfp.libreforge.ViolationContext
+import com.willfp.libreforge.conditions.ConditionList
 import com.willfp.libreforge.conditions.Conditions
-import com.willfp.libreforge.conditions.ConfiguredCondition
+import com.willfp.libreforge.counters.Counters
-import com.willfp.libreforge.effects.ConfiguredEffect
+import com.willfp.libreforge.effects.EffectList
 import com.willfp.libreforge.effects.Effects
-import com.willfp.libreforge.events.TriggerPreProcessEvent
-import com.willfp.libreforge.triggers.Counters
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import java.util.*
+import java.time.Duration
+import java.util.Objects
 import java.util.concurrent.TimeUnit
-import kotlin.math.abs
+import kotlin.math.max
 
 class Job(
     val id: String,
     val config: Config,
     private val plugin: EcoJobsPlugin
-) {
+) : Registrable {
+    private val topCache = Caffeine.newBuilder()
+        .expireAfterWrite(Duration.ofSeconds(plugin.configYml.getInt("leaderboard-cache-lifetime").toLong()))
+        .build<Int, LeaderboardCacheEntry?>()
+
     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 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"),
@@ -51,9 +68,7 @@ class Job(
     )
 
     val xpKey: PersistentDataKey<Double> = PersistentDataKey(
-        EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_xp"),
+        EcoJobsPlugin.instance.namespacedKeyFactory.create("${id}_xp"), PersistentDataKeyType.DOUBLE, 0.0
-        PersistentDataKeyType.DOUBLE,
-        0.0
     )
 
     private val levelXpRequirements = listOf(0) + config.getInts("level-xp-requirements")
@@ -62,54 +77,50 @@ 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>
+    private val effects: EffectList
-    private val conditions: Set<ConfiguredCondition>
+    private val conditions: ConditionList
 
-    private val levels = Caffeine.newBuilder()
+    private val levels = Caffeine.newBuilder().build<Int, JobLevel>()
-        .build<Int, JobLevel>()
+    private val effectsDescription = Caffeine.newBuilder().build<Int, List<String>>()
-    private val effectsDescription = Caffeine.newBuilder()
+    private val rewardsDescription = Caffeine.newBuilder().build<Int, List<String>>()
-        .build<Int, List<String>>()
+    private val levelUpMessages = Caffeine.newBuilder().build<Int, List<String>>()
-    private val rewardsDescription = Caffeine.newBuilder()
-        .build<Int, List<String>>()
-    private val levelUpMessages = Caffeine.newBuilder()
-        .build<Int, List<String>>()
 
     private val levelCommands = mutableMapOf<Int, MutableList<String>>()
 
-    private val levelPlaceholders = config.getSubsections("level-placeholders")
+    private val levelPlaceholders = config.getSubsections("level-placeholders").map { sub ->
-        .map { sub ->
         LevelPlaceholder(
             sub.getString("id")
         ) {
             NumberUtils.evaluateExpression(
-                    sub.getString("value")
+                sub.getString("value").replace("%level%", it.toString())
-                        .replace("%level%", it.toString())
             ).toNiceString()
         }
     }
 
     private val jobXpGains = config.getSubsections("xp-gain-methods").mapNotNull {
-        Counters.compile(it, "Job $id")
+        Counters.compile(it, ViolationContext(plugin, "Job $id"))
     }
 
     init {
-        config.injectPlaceholders(
+        config.injectPlaceholders(PlayerStaticPlaceholder(
-            PlayerStaticPlaceholder(
             "level"
         ) { p ->
             p.getJobLevel(this).toString()
-            }
+        })
+
+        effects = Effects.compile(
+            config.getSubsections("effects"),
+            ViolationContext(plugin, "Job $id")
         )
 
-        effects = config.getSubsections("effects").mapNotNull {
+        conditions = Conditions.compile(
-            Effects.compile(it, "Job $id")
+            config.getSubsections("conditions"),
-        }.toSet()
+            ViolationContext(plugin, "Job $id")
-
+        )
-        conditions = config.getSubsections("conditions").mapNotNull {
-            Conditions.compile(it, "Job $id")
-        }.toSet()
 
         for (string in config.getStrings("level-commands")) {
             val split = string.split(":")
@@ -131,50 +142,64 @@ class Job(
         }
 
         PlayerPlaceholder(
-            plugin,
+            plugin, "${id}_percentage_progress"
-            "${id}_percentage_progress"
         ) {
             (it.getJobProgress(this) * 100).toNiceString()
         }.register()
 
         PlayerPlaceholder(
-            plugin,
+            plugin, id
-            id
         ) {
             it.getJobLevel(this).toString()
         }.register()
 
         PlayerPlaceholder(
-            plugin,
+            plugin, "${id}_current_xp"
-            "${id}_current_xp"
         ) {
             NumberUtils.format(it.getJobXP(this))
         }.register()
 
         PlayerPlaceholder(
-            plugin,
+            plugin, "${id}_required_xp"
-            "${id}_required_xp"
         ) {
             it.getJobXPRequired(this).toString()
         }.register()
 
         PlayerlessPlaceholder(
-            plugin,
+            plugin, "${id}_name"
-            "${id}_name"
         ) {
             this.name
         }.register()
 
         PlayerPlaceholder(
-            plugin,
+            plugin, "${id}_level"
-            "${id}_level"
         ) {
             it.getJobLevel(this).toString()
         }.register()
+
+        PlayerPlaceholder(
+            plugin, "${id}_active"
+        ) {
+            it.hasJobActive(this).toString()
+        }.register()
+
+        PlayerPlaceholder(
+            plugin, "${id}_total_players"
+        ) {
+            Bukkit.getOfflinePlayers().count { this in it.activeJobs }.toString()
+        }.register()
+    }
+
+    override fun onRegister() {
+        jobXpGains.forEach { it.bind(JobXPAccumulator(this)) }
+    }
+
+    override fun onRemove() {
+        jobXpGains.forEach { it.unbind() }
     }
 
     fun getLevel(level: Int): JobLevel = levels.get(level) {
-        JobLevel(this, it, effects, conditions)
+        JobLevel(plugin, this, it, effects, conditions)
     }
 
     private fun getLevelUpMessages(level: Int, whitespace: Int = 0): List<String> = levelUpMessages.get(level) {
@@ -189,11 +214,9 @@ class Job(
             }
         }
 
-        this.config.getStrings("level-up-messages.$highestConfiguredLevel")
+        this.config.getStrings("level-up-messages.$highestConfiguredLevel").map {
-            .map {
             levelPlaceholders.format(it, level)
-            }
+        }.map {
-            .map {
             " ".repeat(whitespace) + it
         }
     }
@@ -210,11 +233,9 @@ class Job(
             }
         }
 
-        this.config.getStrings("effects-description.$highestConfiguredLevel")
+        this.config.getStrings("effects-description.$highestConfiguredLevel").map {
-            .map {
             levelPlaceholders.format(it, level)
-            }
+        }.map {
-            .map {
             " ".repeat(whitespace) + it
         }
     }
@@ -231,18 +252,27 @@ class Job(
             }
         }
 
-        this.config.getStrings("rewards-description.$highestConfiguredLevel")
+        this.config.getStrings("rewards-description.$highestConfiguredLevel").map {
-            .map {
             levelPlaceholders.format(it, level)
-            }
+        }.map {
-            .map {
             " ".repeat(whitespace) + it
         }
     }
 
+    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
+        val withPlaceholders = lore.map {
-            .map {
             it.replace("%percentage_progress%", (player.getJobProgress(this) * 100).toNiceString())
                 .replace("%current_xp%", player.getJobXP(this).toNiceString())
                 .replace("%required_xp%", this.getExpForLevel(player.getJobLevel(this) + 1).let { req ->
@@ -251,15 +281,12 @@ class Job(
                     } else {
                         req.toNiceString()
                     }
-                    }
+                }).replace("%description%", this.description).replace("%job%", this.name)
-                    )
-                    .replace("%description%", this.description)
-                    .replace("%job%", this.name)
                 .replace("%level%", (forceLevel ?: player.getJobLevel(this)).toString())
-                    .replace("%join_price%", NumberUtils.format(this.joinPrice))
+                .replace("%level_numeral%", NumberUtils.toNumeral(forceLevel ?: player.getJobLevel(this)))
-                    .replace("%leave_price%", NumberUtils.format(this.leavePrice))
+                .replace("%join_price%", this.joinPrice.getDisplay(player))
-            }
+                .replace("%leave_price%", this.leavePrice.getDisplay(player))
-            .toMutableList()
+        }.toMutableList()
 
         val processed = mutableListOf<List<String>>()
 
@@ -273,6 +300,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)
                 }
@@ -286,34 +317,34 @@ class Job(
         val base = baseItem.clone()
 
         val level = player.getJobLevel(this)
-        val isActive = player.activeJob == this
 
-        return ItemStackBuilder(base)
+        return ItemStackBuilder(base).setDisplayName(
-            .setDisplayName(
+            plugin.configYml.getFormattedString("gui.job-icon.name").replace("%level%", level.toString())
-                plugin.configYml.getFormattedString("gui.job-icon.name")
+                .replace("%level_numeral%", NumberUtils.toNumeral(level)).replace("%job%", this.name)
-                    .replace("%level%", level.toString())
+        ).addLoreLines {
-                    .replace("%job%", this.name)
+            injectPlaceholdersInto(
-            )
+                plugin.configYml.getStrings("gui.job-icon.lore"), player
-            .addLoreLines {
+            ) + if (player.hasJobActive(this)) {
-                injectPlaceholdersInto(plugin.configYml.getStrings("gui.job-icon.lore"), player) +
+                plugin.configYml.getStrings("gui.job-icon.active-lore")
-                        if (isActive) plugin.configYml.getStrings("gui.job-icon.active-lore") else
+            } else if (player.canJoinJob(this)) {
-                            plugin.configYml.getStrings("gui.job-icon.not-active-lore")
+                plugin.configYml.getStrings("gui.job-icon.join-lore")
+            } else if (player.activeJobs.size == player.jobLimit) {
+                plugin.configYml.getStrings("gui.job-icon.too-many-jobs-lore")
+            } else {
+                emptyList()
             }
-            .build()
+        }.build()
     }
 
     fun getJobInfoIcon(player: Player): ItemStack {
         val base = baseItem.clone()
-        return ItemStackBuilder(base)
+        return ItemStackBuilder(base).setDisplayName(
-            .setDisplayName(
             plugin.configYml.getFormattedString("gui.job-info.active.name")
                 .replace("%level%", player.getJobLevel(this).toString())
-                    .replace("%job%", this.name)
+                .replace("%level_numeral%", NumberUtils.toNumeral(player.getJobLevel(this))).replace("%job%", this.name)
-            )
+        ).addLoreLines {
-            .addLoreLines {
             injectPlaceholdersInto(plugin.configYml.getStrings("gui.job-info.active.lore"), player)
-            }
+        }.build()
-            .build()
     }
 
     fun getExpForLevel(level: Int): Int {
@@ -332,8 +363,16 @@ class Job(
         }
     }
 
-    fun getXP(event: TriggerPreProcessEvent): Double {
+    fun getTop(place: Int): LeaderboardCacheEntry? {
-        return jobXpGains.sumOf { it.getCount(event) }
+        return topCache.get(place) {
+            val players = Bukkit.getOfflinePlayers().sortedByDescending { it.getJobLevel(this) }
+            val target = players.getOrNull(place - 1) ?: return@get null
+            return@get LeaderboardCacheEntry(target, target.getJobLevel(this))
+        }
+    }
+
+    override fun getID(): String {
+        return this.id
     }
 
     override fun equals(other: Any?): Boolean {
@@ -350,12 +389,16 @@ class Job(
 }
 
 private class LevelPlaceholder(
-    val id: String,
+    val id: String, private val function: (Int) -> String
-    private val function: (Int) -> String
 ) {
     operator fun invoke(level: Int) = function(level)
 }
 
+data class LeaderboardCacheEntry(
+    val player: OfflinePlayer,
+    val amount: Int
+)
+
 private fun Collection<LevelPlaceholder>.format(string: String, level: Int): String {
     var process = string
     for (placeholder in this) {
@@ -364,83 +407,9 @@ private fun Collection<LevelPlaceholder>.format(string: String, level: Int): Str
     return process
 }
 
-private val activeJobKey: PersistentDataKey<String> = PersistentDataKey(
+fun OfflinePlayer.getJobLevelObject(job: Job): JobLevel = job.getLevel(this.getJobLevel(job))
-    EcoJobsPlugin.instance.namespacedKeyFactory.create("active_job"),
-    PersistentDataKeyType.STRING,
-    ""
-)
 
-var OfflinePlayer.activeJob: Job?
+private val expMultiplierCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).build<Player, Double> {
-    get() = Jobs.getByID(this.profile.read(activeJobKey))
-    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() {
-        val active = this.activeJob ?: return null
-        return this.getJobLevelObject(active)
-    }
-
-fun OfflinePlayer.getJobLevel(job: Job): Int =
-    this.profile.read(job.levelKey)
-
-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)
-    return currentXP / requiredXP
-}
-
-fun OfflinePlayer.getJobLevelObject(job: Job): JobLevel =
-    job.getLevel(this.getJobLevel(job))
-
-fun OfflinePlayer.hasJob(job: Job): Boolean =
-    this.getJobLevel(job) > 0
-
-fun OfflinePlayer.getJobXP(job: Job): Double =
-    this.profile.read(job.xpKey)
-
-fun OfflinePlayer.setJobXP(job: Job, xp: Double) =
-    this.profile.write(job.xpKey, xp)
-
-fun OfflinePlayer.getJobXPRequired(job: Job): Int =
-    job.getExpForLevel(this.getJobLevel(job) + 1)
-
-private val expMultiplierCache = Caffeine.newBuilder()
-    .expireAfterWrite(10, TimeUnit.SECONDS)
-    .build<Player, Double> {
     it.cacheJobExperienceMultiplier()
 }
 
@@ -464,43 +433,19 @@ private fun Player.cacheJobExperienceMultiplier(): Double {
         return 1.5
     }
 
-    val prefix = "ecojobs.xpmultiplier."
+    return 1 + getNumericalPermission("ecojobs.xpmultiplier", 0.0) / 100
+}
+
+fun Player.getNumericalPermission(permission: String, default: Double): Double {
+    var highest: Double? = null
+
     for (permissionAttachmentInfo in this.effectivePermissions) {
-        val permission = permissionAttachmentInfo.permission
+        val perm = permissionAttachmentInfo.permission
-        if (permission.startsWith(prefix)) {
+        if (perm.startsWith(permission)) {
-            return ((permission.substring(permission.lastIndexOf(".") + 1).toDoubleOrNull() ?: 100.0) / 100) + 1
+            val found = perm.substring(perm.lastIndexOf(".") + 1).toDoubleOrNull() ?: continue
+            highest = max(highest ?: Double.MIN_VALUE, found)
         }
     }
 
-    return 1.0
+    return highest ?: default
-}
-
-fun Player.giveJobExperience(job: Job, experience: Double, noMultiply: Boolean = false) {
-    val exp = abs(if (noMultiply) experience else experience * this.jobExperienceMultiplier)
-
-    val gainEvent = PlayerJobExpGainEvent(this, job, exp, !noMultiply)
-    Bukkit.getPluginManager().callEvent(gainEvent)
-
-    if (gainEvent.isCancelled) {
-        return
-    }
-
-    this.giveExactJobExperience(job, gainEvent.amount)
-}
-
-fun Player.giveExactJobExperience(job: Job, experience: Double) {
-    val level = this.getJobLevel(job)
-
-    val progress = this.getJobXP(job) + experience
-
-    if (progress >= job.getExpForLevel(level + 1) && level + 1 <= job.maxLevel) {
-        val overshoot = progress - job.getExpForLevel(level + 1)
-        this.setJobXP(job, 0.0)
-        this.setJobLevel(job, level + 1)
-        val levelUpEvent = PlayerJobLevelUpEvent(this, job, level + 1)
-        Bukkit.getPluginManager().callEvent(levelUpEvent)
-        this.giveExactJobExperience(job, overshoot)
-    } else {
-        this.setJobXP(job, progress)
-    }
 }

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

@@ -0,0 +1,87 @@
+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 com.willfp.ecojobs.api.hasJobActive
+import com.willfp.ecojobs.api.leaveJob
+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.leaveJob(job)
+
+                    if (!player.hasJobActive(job)) {
+                        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/JobLevel.kt

@@ -1,14 +1,16 @@
 package com.willfp.ecojobs.jobs
 
+import com.willfp.eco.core.EcoPlugin
 import com.willfp.libreforge.Holder
-import com.willfp.libreforge.conditions.ConfiguredCondition
+import com.willfp.libreforge.conditions.ConditionList
-import com.willfp.libreforge.effects.ConfiguredEffect
+import com.willfp.libreforge.effects.EffectList
 
 class JobLevel(
+    plugin: EcoPlugin,
     val job: Job,
     val level: Int,
-    override val effects: Set<ConfiguredEffect>,
+    override val effects: EffectList,
-    override val conditions: Set<ConfiguredCondition>
+    override val conditions: ConditionList
 ) : Holder {
-    override val id = "${job.id}_$level"
+    override val id = plugin.createNamespacedKey("${job.id}_$level")
 }

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

@@ -3,69 +3,75 @@ 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
 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.eco.util.formatEco
+import com.willfp.ecojobs.api.getJobLevel
+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
+                return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
-        for (row in progressionPattern) {
+                    .setDisplayName(
-            x++
+                        plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
-            var y = 0
+                            .replace("%job%", job.name)
-            for (char in row) {
+                            .replace("%level%", level.toString())
-                y++
+                            .replace("%level_numeral%", NumberUtils.toNumeral(level))
-                if (char == '0') {
+                    )
-                    continue
+                    .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()
             }
 
-                val pos = progressionOrder.indexOf(char)
+            override fun getLevelState(player: Player, level: Int): LevelState {
-
+                return when {
-                if (pos == -1) {
+                    level <= player.getJobLevel(job) -> LevelState.UNLOCKED
-                    continue
+                    level == player.getJobLevel(job) + 1 -> LevelState.IN_PROGRESS
-                }
+                    else -> LevelState.LOCKED
-
+                }
-                progressionSlots[pos + 1] = Pair(x, y)
             }
         }
-
-        levelsPerPage = progressionSlots.size
-        pages = ceil(job.maxLevel.toDouble() / levelsPerPage).toInt()
 
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
-            setTitle(job.name)
+            title = plugin.configYml.getString("level-gui.title")
+                .replace("%job%", job.name)
+                .formatEco()
+
+            maxPages(component.pages)
+
             setMask(
                 FillerMask(
                     maskItems,
@@ -73,58 +79,11 @@ class JobLevelGUI(
                 )
             )
 
-            for ((level, value) in progressionSlots) {
+            addComponent(1, 1, component)
-                setSlot(
-                    value.first,
-                    value.second,
-                    slot(ItemStack(Material.BLACK_STAINED_GLASS_PANE)) {
-                        setUpdater { player, menu, _ ->
-                            val page = getPage(menu, player)
 
-                            val slotLevel = ((page - 1) * levelsPerPage) + level
+            // Instead of the page changer, this will show up when on the first page
-
+            addComponent(
-                            fun getItem(section: String) =
+                MenuLayer.LOWER,
-                                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(
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
                 slot(
@@ -132,39 +91,32 @@ class JobLevelGUI(
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
                         .build()
                 ) {
-                    onLeftClick { event, _, menu ->
+                    onLeftClick { player, _, _, _ -> JobsGUI.open(player) }
-                        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.addState(player, pageKey, newPage)
-                        }
-                    }
                 }
             )
-            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()
+                        .build(),
-                ) {
+                    PageChanger.Direction.FORWARDS
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-
-                        val page = getPage(menu, player)
-
-                        val newPage = min(pages, page + 1)
-
-                        menu.addState(player, pageKey, newPage)
-                    }
-                }
                 )
+            )
+
             setSlot(
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.column"),
@@ -178,8 +130,18 @@ class JobLevelGUI(
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 
-    fun open(player: Player) = menu.open(player)
+    fun open(player: Player) {
+        menu.open(player)
+    }
 }

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

@@ -1,22 +0,0 @@
-package com.willfp.ecojobs.jobs
-
-import com.willfp.libreforge.events.TriggerPreProcessEvent
-import org.bukkit.event.EventHandler
-import org.bukkit.event.Listener
-
-object JobTriggerXPGainListener : Listener {
-    @EventHandler(ignoreCancelled = true)
-    fun handle(event: TriggerPreProcessEvent) {
-        val player = event.player
-
-        val job = event.player.activeJob ?: return
-
-        val amount = job.getXP(event)
-
-        if (amount <= 0.0) {
-            return
-        }
-
-        player.giveJobExperience(job, amount)
-    }
-}

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

@@ -0,0 +1,18 @@
+package com.willfp.ecojobs.jobs
+
+import com.willfp.ecojobs.api.giveJobExperience
+import com.willfp.ecojobs.api.hasJobActive
+import com.willfp.libreforge.counters.Accumulator
+import org.bukkit.entity.Player
+
+class JobXPAccumulator(
+    private val job: Job
+) : Accumulator {
+    override fun accept(player: Player, count: Double) {
+        if (!player.hasJobActive(job)) {
+            return
+        }
+
+        player.giveJobExperience(job, count)
+    }
+}

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

@@ -1,14 +1,17 @@
 package com.willfp.ecojobs.jobs
 
-import com.google.common.collect.BiMap
-import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
+import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.config.updating.ConfigUpdater
+import com.willfp.eco.core.registry.Registry
 import com.willfp.ecojobs.EcoJobsPlugin
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
 import org.bukkit.OfflinePlayer
 
-object Jobs {
+object Jobs : ConfigCategory("job", "jobs") {
-    private val BY_ID: BiMap<String, Job> = HashBiMap.create()
+    private val registry = Registry<Job>()
 
     /**
      * Get all registered [Job]s.
@@ -17,7 +20,7 @@ object Jobs {
      */
     @JvmStatic
     fun values(): List<Job> {
-        return ImmutableList.copyOf(BY_ID.values)
+        return ImmutableList.copyOf(registry.values())
     }
 
     /**
@@ -28,45 +31,15 @@ object Jobs {
      */
     @JvmStatic
     fun getByID(name: String): Job? {
-        return BY_ID[name]
+        return registry[name]
     }
 
-    /**
+    override fun clear(plugin: LibreforgePlugin) {
-     * Update all [Job]s.
+        registry.clear()
-     *
-     * @param plugin Instance of EcoJobs.
-     */
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: EcoJobsPlugin) {
-        for (job in values()) {
-            removeJob(job)
     }
 
-        for ((id, jobConfig) in plugin.fetchConfigs("jobs")) {
+    override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
-            addNewJob(Job(id, jobConfig, plugin))
+        registry.register(Job(id, config, plugin as EcoJobsPlugin))
-        }
-    }
-
-    /**
-     * Add new [Job] to EcoJobs.
-     *
-     * @param job The [Job] to add.
-     */
-    @JvmStatic
-    fun addNewJob(job: Job) {
-        BY_ID.remove(job.id)
-        BY_ID[job.id] = job
-    }
-
-    /**
-     * Remove [Job] from EcoJobs.
-     *
-     * @param job The [Job] to remove.
-     */
-    @JvmStatic
-    fun removeJob(job: Job) {
-        BY_ID.remove(job.id)
     }
 
     /**

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

@@ -3,17 +3,29 @@ 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.onRightClick
+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
 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.core.items.builder.SkullBuilder
+import com.willfp.eco.util.formatEco
 import com.willfp.ecojobs.EcoJobsPlugin
+import com.willfp.ecojobs.api.activeJobs
+import com.willfp.ecojobs.api.canJoinJob
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.ecojobs.api.hasJobActive
+import com.willfp.ecojobs.api.joinJob
 import com.willfp.ecojobs.jobs.Jobs.unlockedJobs
 import org.bukkit.Material
 import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.SkullMeta
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
@@ -21,17 +33,6 @@ import kotlin.math.min
 object JobsGUI {
     private lateinit var menu: Menu
     private val jobAreaSlots = mutableListOf<Pair<Int, Int>>()
-    private const val pageKey = "page"
-
-    private fun getPage(menu: Menu, player: Player): Int {
-        val pages = ceil(Jobs.values()
-            .filter { player.getJobLevel(it) > 0 }
-            .size.toDouble() / jobAreaSlots.size).toInt()
-
-        val page = menu.getState(player, pageKey) ?: 1
-
-        return max(min(pages, page + 1), 1)
-    }
 
     @JvmStatic
     @ConfigUpdater
@@ -52,21 +53,8 @@ object JobsGUI {
     }
 
     private fun buildMenu(plugin: EcoJobsPlugin): Menu {
-        val jobInfoItemBuilder = { player: Player, _: Menu ->
-            val job = player.activeJob
-
-            if (job == null) {
-                ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.job-info.no-active.item")))
-                    .setDisplayName(plugin.configYml.getFormattedString("gui.job-info.no-active.name"))
-                    .addLoreLines(plugin.configYml.getFormattedStrings("gui.job-info.no-active.lore"))
-                    .build()
-            } else {
-                job.getJobInfoIcon(player)
-            }
-        }
-
         val jobIconBuilder = { player: Player, menu: Menu, index: Int ->
-            val page = getPage(menu, player)
+            val page = menu.getPage(player)
 
             val unlockedJobs = player.unlockedJobs
 
@@ -77,7 +65,7 @@ object JobsGUI {
         }
 
         return menu(plugin.configYml.getInt("gui.rows")) {
-            setTitle(plugin.langYml.getString("menu.title"))
+            title = plugin.langYml.getString("menu.title")
 
             setMask(
                 FillerMask(
@@ -87,13 +75,47 @@ object JobsGUI {
             )
 
             setSlot(
-                plugin.configYml.getInt("gui.job-info.row"),
+                plugin.configYml.getInt("gui.player-info.row"),
-                plugin.configYml.getInt("gui.job-info.column"),
+                plugin.configYml.getInt("gui.player-info.column"),
-                slot(jobInfoItemBuilder) {
+                slot { player, _ ->
-                    onLeftClick { event, _, _ ->
+                    @Suppress("DEPRECATION")
-                        val player = event.whoClicked as Player
+                    val skullBuilder = SkullBuilder()
-                        player.activeJob?.levelGUI?.open(player)
+                        .setDisplayName(
+                            plugin.configYml.getString("gui.player-info.name")
+                                .replace("%player%", player.displayName)
+                                .formatEco(player, true)
+                        )
+
+                    if (player.activeJobs.isEmpty()) {
+                        skullBuilder.addLoreLines(
+                            plugin.configYml.getStrings("gui.player-info.no-jobs")
+                                .formatEco(player, true)
+                        )
+                    } else {
+                        skullBuilder.addLoreLines(
+                            plugin.configYml.getStrings("gui.player-info.has-jobs")
+                                .flatMap {
+                                    if (it == "%jobs%") {
+                                        player.activeJobs.flatMap { job ->
+                                            job.injectPlaceholdersInto(
+                                                plugin.configYml.getStrings("gui.player-info.job-line"),
+                                                player
+                                            )
                                         }
+                                    } else {
+                                        listOf(it)
+                                    }
+                                }
+                                .formatEco(player, true)
+                        )
+                    }
+
+                    val skull = skullBuilder.build()
+
+                    val meta = skull.itemMeta as SkullMeta
+                    meta.owningPlayer = player
+                    skull.itemMeta = meta
+                    skull
                 }
             )
 
@@ -101,14 +123,8 @@ object JobsGUI {
                 val (row, column) = pair
 
                 setSlot(row, column, slot({ p, m -> jobIconBuilder(p, m, index) }) {
-                    setUpdater { p, m, _ ->
+                    onLeftClick { player, _, _, menu ->
-                        jobIconBuilder(p, m, index)
+                        val page = menu.getPage(player)
-                    }
-
-                    onLeftClick { event, _, _ ->
-                        val player = event.whoClicked as Player
-
-                        val page = getPage(menu, player)
 
                         val unlockedJobs = player.unlockedJobs
 
@@ -116,8 +132,22 @@ object JobsGUI {
 
                         val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onLeftClick
 
-                        if (player.activeJob != job) {
+                        if (player.hasJobActive(job)) {
-                            player.activeJob = job
+                            job.levelGUI.open(player)
+                        } else {
+                            if (player.canJoinJob(job)) {
+                                player.joinJob(job)
+
+                                if (player.hasJobActive(job)) {
+                                    player.sendMessage(
+                                        plugin.langYml.getMessage("joined-job")
+                                            .replace("%job%", job.name)
+                                    )
+                                }
+                            } else {
+                                player.sendMessage(plugin.langYml.getMessage("cannot-join-job"))
+                                return@onLeftClick
+                            }
                         }
 
                         player.playSound(
@@ -127,51 +157,57 @@ object JobsGUI {
                             plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
                         )
                     }
+
+                    onRightClick { player, _, _, menu ->
+                        val page = menu.getPage(player)
+
+                        val unlockedJobs = player.unlockedJobs
+
+                        val pagedIndex = ((page - 1) * jobAreaSlots.size) + index
+
+                        val job = unlockedJobs.getOrNull(pagedIndex) ?: return@onRightClick
+
+                        if (player.hasJobActive(job)) {
+                            job.leaveGUI.open(player)
+
+                            player.playSound(
+                                player.location,
+                                Sound.valueOf(plugin.configYml.getString("gui.job-icon.click.sound").uppercase()),
+                                1f,
+                                plugin.configYml.getDouble("gui.job-icon.click.pitch").toFloat()
+                            )
+                        }
+                    }
                 })
             }
 
-            setSlot(
+            addComponent(
                 plugin.configYml.getInt("gui.prev-page.location.row"),
                 plugin.configYml.getInt("gui.prev-page.location.column"),
-                slot(
+                PageChanger(
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.prev-page.item")))
                         .setDisplayName(plugin.configYml.getString("gui.prev-page.name"))
-                        .build()
+                        .build(),
-                ) {
+                    PageChanger.Direction.BACKWARDS
-                    onLeftClick { event, _, menu ->
+                )
-                        val player = event.whoClicked as Player
-                        val page = getPage(menu, player)
-
-                        val newPage = max(1, page - 1)
-
-                        menu.addState(player, pageKey, newPage)
-                    }
-                }
             )
 
-            setSlot(
+            addComponent(
                 plugin.configYml.getInt("gui.next-page.location.row"),
                 plugin.configYml.getInt("gui.next-page.location.column"),
-                slot(
+                PageChanger(
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.next-page.item")))
                         .setDisplayName(plugin.configYml.getString("gui.next-page.name"))
-                        .build()
+                        .build(),
-                ) {
+                    PageChanger.Direction.FORWARDS
-                    onLeftClick { event, _, menu ->
+                )
-                        val player = event.whoClicked as Player
+            )
 
-                        val pages = ceil(Jobs.values()
+            maxPages { player ->
+                ceil(Jobs.values()
                     .filter { player.getJobLevel(it) > 0 }
                     .size.toDouble() / jobAreaSlots.size).toInt()
-
-                        val page = getPage(menu, player)
-
-                        val newPage = min(pages, page + 1)
-
-                        menu.addState(player, pageKey, newPage)
             }
-                }
-            )
 
             setSlot(plugin.configYml.getInt("gui.close.location.row"),
                 plugin.configYml.getInt("gui.close.location.column"),
@@ -184,21 +220,15 @@ object JobsGUI {
                 }
             )
 
-            setSlot(plugin.configYml.getInt("gui.deactivate-job.location.row"),
+            for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
-                plugin.configYml.getInt("gui.deactivate-job.location.column"),
+                setSlot(
-                slot(
+                    config.getInt("row"),
-                    ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.deactivate-job.item")))
+                    config.getInt("column"),
-                        .setDisplayName(plugin.configYml.getString("gui.deactivate-job.name"))
+                    ConfigSlot(config)
-                        .build()
-                ) {
-                    onLeftClick { event, _ ->
-                        val player = event.whoClicked as Player
-                        player.activeJob = null
-                    }
-                }
                 )
             }
         }
+    }
 
     @JvmStatic
     fun open(player: 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) {
+        if (!price.canAfford(player)) {
-            val hasMoney = player.balance >= price
-
-            if (!hasMoney) {
             event.isCancelled = true
+            return
         }
 
-            player.balance -= price
+        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) {
+        if (!price.canAfford(player)) {
-            val hasMoney = player.balance >= price
-
-            if (!hasMoney) {
             event.isCancelled = true
+            return
         }
 
-            player.balance -= price
+        price.pay(player)
-        }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.willfp.ecojobs.jobs
 
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
+import com.willfp.ecojobs.api.resetJob
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 

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

@@ -0,0 +1,28 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecojobs.api.activeJobs
+import com.willfp.libreforge.Dispatcher
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
+import com.willfp.libreforge.arguments
+import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
+import org.bukkit.entity.Player
+
+object ConditionHasActiveJob : Condition<NoCompileData>("has_active_job") {
+    override val arguments = arguments {
+        require("job", "You must specify the job!")
+    }
+
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
+        return player.activeJobs.any { it.id == config.getString("job").lowercase() }
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.Dispatcher
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
+import com.willfp.libreforge.arguments
+import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.updateEffects
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+
+object ConditionHasJobLevel : Condition<NoCompileData>("has_job_level") {
+    override val arguments = arguments {
+        require("job", "You must specify the job!")
+        require("level", "You must specify the level!")
+    }
+
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
+        return player.getJobLevel(
+            Jobs.getByID(config.getString("job").lowercase()) ?: return false
+        ) >= config.getIntFromExpression("level", player)
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    fun handle(event: PlayerJobLevelUpEvent) {
+        event.player.toDispatcher().updateEffects()
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecojobs.api.giveJobExperience
+import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.arguments
+import com.willfp.libreforge.effects.Effect
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+
+object EffectGiveJobXp : Effect<NoCompileData>("give_job_xp") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER
+    )
+
+    override val arguments = arguments {
+        require("amount", "You must specify the amount of xp to give!")
+        require("job", "You must specify the job to give xp for!")
+    }
+
+    override fun onTrigger(config: Config, data: TriggerData, compileData: NoCompileData): Boolean {
+        val player = data.player ?: return false
+
+        player.giveJobExperience(
+            Jobs.getByID(config.getString("job")) ?: return false,
+            config.getDoubleFromExpression("amount", player)
+        )
+
+        return true
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
+import com.willfp.ecojobs.jobs.Job
+import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import com.willfp.libreforge.toDispatcher
+import org.bukkit.event.EventHandler
+
+object EffectJobXpMultiplier : MultiMultiplierEffect<Job>("job_xp_multiplier") {
+    override val key = "jobs"
+
+    override fun getElement(key: String): Job? {
+        return Jobs.getByID(key)
+    }
+
+    override fun getAllElements(): Collection<Job> {
+        return Jobs.values()
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerJobExpGainEvent) {
+        event.amount *= getMultiplier(event.player.toDispatcher(), event.job)
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecojobs.api.event.JobEvent
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.filters.Filter
+import com.willfp.libreforge.triggers.TriggerData
+
+object FilterJob : Filter<NoCompileData, Collection<String>>("job") {
+    override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
+        return config.getStrings(key)
+    }
+
+    override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
+        val event = data.event as? JobEvent ?: return true
+
+        return value.any { jobName ->
+            jobName.equals(event.job.id, ignoreCase = true)
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.event.EventHandler
+
+object TriggerGainJobXp : Trigger("gain_job_xp") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerJobExpGainEvent) {
+        val player = event.player
+
+        this.dispatch(
+            player.toDispatcher(),
+            TriggerData(
+                player = player,
+                location = player.location,
+                event = event,
+                value = event.amount
+            )
+        )
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+
+object TriggerJoinJob : Trigger("join_job") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerJobJoinEvent) {
+        val player = event.player as? Player ?: return
+
+        this.dispatch(
+            player.toDispatcher(),
+            TriggerData(
+                player = player,
+                location = player.location,
+                event = event,
+                value = player.getJobLevel(event.job).toDouble()
+            )
+        )
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
+import com.willfp.ecojobs.api.getJobLevel
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+
+object TriggerLeaveJob : Trigger("leave_job") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerJobLeaveEvent) {
+        val player = event.player as? Player ?: return
+
+        this.dispatch(
+            player.toDispatcher(),
+            TriggerData(
+                player = player,
+                location = player.location,
+                value = player.getJobLevel(event.job).toDouble()
+            )
+        )
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.willfp.ecojobs.libreforge
+
+import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.event.EventHandler
+
+object TriggerLevelUpJob : Trigger("level_up_job") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerJobLevelUpEvent) {
+        val player = event.player
+
+        this.dispatch(
+            player.toDispatcher(),
+            TriggerData(
+                player = player,
+                location = player.location,
+                event = event,
+                value = event.level.toDouble()
+            )
+        )
+    }
+}

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

@@ -1,21 +0,0 @@
-# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
-
-chains:
-  - id: example_chain
-    effects:
-      - id: teleport
-      - id: potion_effect
-        args:
-          effect: blindness
-          level: 3
-          duration: 30
-          apply_to_player: true
-      - id: send_message
-        args:
-          message: "&fYou have been teleported!"
-          action_bar: true
-      - id: play_sound
-        args:
-          sound: entity_dragon_fireball_explode
-          pitch: 1.5
-          volume: 4

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

@@ -3,6 +3,15 @@
 # by Auxilor
 #
 
+# Even if eco is set up to use a database, you can
+# force EcoJobs to save to local storage to disable
+# cross-server sync.
+use-local-storage: false
+
+jobs:
+  limit: 3 # The most jobs a player can have at once.
+  # You can set custom limits with the ecojobs.limit.<number> permission
+
 gui:
   rows: 6
 
@@ -20,49 +29,43 @@ gui:
     materials:
       - black_stained_glass_pane
     pattern:
+      - "111101111"
       - "111111111"
-      - "101000001"
+      - "100000001"
-      - "111000001"
+      - "100000001"
-      - "101000001"
+      - "100000001"
-      - "111111111"
+      - "111101111"
-      - "111100011"
 
   job-area:
     top-left:
-      row: 2
+      row: 3
-      column: 4
+      column: 2
     bottom-right:
-      row: 4
+      row: 5
       column: 8
 
-  job-info:
+  player-info:
-    row: 2
+    row: 1
-    column: 2
+    column: 5
 
-    no-active:
+    name: "&r%player%&f's Jobs:"
-      name: "&cNo Active Job"
+
-      lore:
+    no-jobs:
       - ""
       - "&cYou do not currently have a job active"
       - "&fPick one from the options below!"
       - ""
-      item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmFkYzA0OGE3Y2U3OGY3ZGFkNzJhMDdkYTI3ZDg1YzA5MTY4ODFlNTUyMmVlZWQxZTNkYWYyMTdhMzhjMWEifX19
+      - "&fYou can have up to &a%ecojobs_limit% &fjobs at once!"
-
-    # %join_price% and %leave_price% are also available as placeholders
-
-    active:
-      name: "%job% &fLvl. &a%level%"
-      lore:
-        - "%description%"
-        - "&f"
-        - "&fJob Rewards:"
-        - "%effects%"
       - ""
-        - "&fProgress:"
+
-        - "&8» &e%percentage_progress%%"
+    has-jobs:
-        - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
       - ""
-        - "&eClick to view Level Progression!"
+      - "%jobs%"
+      - ""
+      - "&fJob slots in use: &a%ecojobs_in_jobs%&8/&a%ecojobs_limit%"
+
+    job-line:
+      - " %job% &fLvl. &a%level%"
 
   job-icon:
     name: "%job% &fLvl. &a%level%"
@@ -76,13 +79,20 @@ gui:
       - "&8» &e%percentage_progress%%"
       - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
 
+    # %join_price% and %leave_price% are also available as placeholders
+
     active-lore:
       - ""
-      - "&cThis job is already active!"
+      - "&eClick to view Level Progression!"
+      - "&eRight-click to leave this job!"
 
-    not-active-lore:
+    too-many-jobs-lore:
       - ""
-      - "&eClick to activate this job!"
+      - "&cYou have too many jobs already!"
+
+    join-lore:
+      - ""
+      - "&eClick to join this job!"
 
     click:
       sound: ui_button_click
@@ -93,31 +103,28 @@ gui:
     name: "&fPrevious Page"
     location:
       row: 6
-      column: 5
+      column: 4
 
   next-page:
     item: arrow
     name: "&fNext Page"
     location:
       row: 6
-      column: 7
+      column: 6
 
   close:
     item: barrier
     name: "&cClose"
     location:
       row: 6
-      column: 6
+      column: 5
 
-  deactivate-job:
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
-    item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0=
+  custom-slots: [ ]
-    name: "&cDeactivate Job"
-    location:
-      row: 4
-      column: 2
 
 level-gui:
   rows: 6
+  title: "%job%"
 
   mask:
     # The way the mask works is by having a list of materials
@@ -210,6 +217,56 @@ 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: [ ]
+
+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:
     enabled: true
@@ -227,43 +284,3 @@ level-up:
     id: entity_player_levelup
     # Pitch between 0.5 and 2
     pitch: 1.3
-
-cannot-afford:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cooldown:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cannot-afford-type:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
-  example_point: "Nicely Formatted Point"
-
-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
-
-potions:
-  icon:
-    permanent: true
-    triggered: true
-  ambient:
-    permanent: false
-    triggered: true
-  particles:
-    permanent: false
-    triggered: true
-
-share-configs: true # If your configs are allowed to be used to gather data and improve the plugin. Nothing identifying (IP, Name, etc) is shared.

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

@@ -1,3 +1,8 @@
+environment:
+  - name: libreforge version
+    value: ${libreforgeVersion}
+
+options:
   resource-id: 2857
   bstats-id: 16394
   color: "&#964B00"

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)
+# The price to join this job (set to 0 to disable)
-join-price: 0
+# Read here for more: https://plugins.auxilor.io/all-plugins/prices
-leave-price: 0
+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

@@ -0,0 +1,123 @@
+name: "&#FD9113Beekeeper"
+description: "&8&oLevelling up by breeding bees, but don't drink any honey!"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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: breed
+    multiplier: 20.0
+    filters:
+      entities: 
+       - bee
+    conditions: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 5"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each bee you breed"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each bee you breed"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each bee you breed"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%v% * %level% * 2.0"
+    triggers:
+      - breed
+    filters:
+      entities:
+       - bee
+
+  - id: take_money
+    args: 
+      amount: "%v% * %level% * 5.0"
+    triggers:
+      - consume 
+    filters:
+      items:
+        - honey_bottle
+
+      
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjY0MjgyZWQxOTc4NzQ4YjM5OTUwOTkxNDAwZjBiN2U0YTM5ZjJlN2Q5ZWNlNjA3NmFmNWQxMzUxYzExNzc3ZiJ9fX0=

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
+join-price:
-leave-price: 0
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100
@@ -89,14 +101,6 @@ effects:
     args:
       every: "ceil(12 - %level% / 8)"
       amount: "1.2 * %level%"
-    filters:
-      items:
-        - "*wooden_pickaxe"
-        - "*stone_pickaxe"
-        - "*iron_pickaxe"
-        - "*golden_pickaxe"
-        - "*diamond_pickaxe"
-        - "*netherite_pickaxe"
     triggers:
       - place_block
 

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

@@ -0,0 +1,106 @@
+name: "&#7A54FBEnchanter"
+description: "&8&oLevel up by enchanting items"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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: enchant_item
+    multiplier: 0.5
+    conditions: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 0.25"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each enchanted item"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each enchanted item"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each enchanted item"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%level% * 0.25"
+    triggers:
+      - enchant_item
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDJjOGU3NmZjZGRlOWExNWFlMzkyOWI4NGJmNmZmYTRjMTc3N2IxZTI2YjdkNmQ4OTM4ZjBlZjA0ZTg0ODc0YyJ9fX0=

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
+join-price:
-leave-price: 0
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+join-lore: []
+
+leave-price:
+  value: 0
+  type: coins
+  display: "&a$%value%"
+
+leave-lore:
+  - ""
 
 level-xp-requirements:
   - 100
@@ -85,15 +97,15 @@ level-placeholders:
 
 effects-description:
   1:
-    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+    - "&8» &8Earn &a$%money%&8 for each crop farmed"
 
 rewards-description:
   1:
-    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+    - "&8» &8Earn &a$%money%&8 for each crop farmed"
 
 level-up-messages:
   1:
-    - "&8» &8Earn &a$%money%&8 for each crop you farm"
+    - "&8» &8Earn &a$%money%&8 for each crop farmed"
 
 level-commands: [ ]
 

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

@@ -0,0 +1,106 @@
+name: "&#adf3fdFisherman"
+description: "&8&oLevel up by fishing"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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: catch_fish
+    multiplier: 20.0
+    conditions: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 5"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each fish caught"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each fish caught"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each fish caught"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%v% * %level% * 2.0"
+    triggers:
+      - catch_fish
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDgwNGU0MmVjOWIwN2ZjZTFjZTAwNThiNzhkZjU3NjNmNmU0MTBkOWNlODJlZjFlYmI5NTk3YTE1MmI2ZDRjOCJ9fX0=

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

@@ -0,0 +1,130 @@
+name: "&#FD9113Lumberjack"
+description: "&7&oLevel up by chopping wood"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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
+    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: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 3.0"
+
+effects-description:
+  1:
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
+
+rewards-description:
+  1:
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
+
+level-up-messages:
+  1:
+    - "&8» &7Earn &a$%money%&7 for each log chopped."
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      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: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
+join-price:
-leave-price: 0
+  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
+join-price:
-leave-price: 0
+  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

@@ -0,0 +1,106 @@
+name: "&#4B4736Smelter"
+description: "&8&oLevel up by smelting items"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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: smelt
+    multiplier: 0.5
+    conditions: [ ]
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 0.25"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each smelted item"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each smelted item"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each smelted item"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "%level% * 0.25"
+    triggers:
+      - smelt
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdjMDc0ODM2MmU5YTYzZTA3YWEyYjA4YjVmN2QxMDFlNTM5NWFhMjE1MzJhNDc2NzIyZGJkZDk4YzJmMiJ9fX0=

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

@@ -0,0 +1,180 @@
+# The ID of the job is the name of the .yml file,
+# for example miner.yml has the ID of miner
+# You can place jobs anywhere in this folder,
+# including in subfolders if you want to organize your job configs
+# _example.yml is not loaded.
+
+# The display name of the job
+name: "&#0047b3Toolsmith"
+
+description: "&8&oLevel up by crafting tools"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+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
+  - 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: craft
+    multiplier: 2
+    conditions: [ ]
+    filters:
+      items:
+        - "*wooden_pickaxe"
+        - "*stone_pickaxe"
+        - "*iron_pickaxe"
+        - "*golden_pickaxe"
+        - "*diamond_pickaxe"
+        - "*netherite_pickaxe"
+        - "*wooden_axe"
+        - "*stone_axe"
+        - "*iron_axe"
+        - "*golden_axe"
+        - "*diamond_axe"
+        - "*netherite_axe"
+        - "*wooden_shovel"
+        - "*stone_shovel"
+        - "*iron_shovel"
+        - "*golden_shovel"
+        - "*diamond_shovel"
+        - "*netherite_shovel"
+        - "*wooden_hoe"
+        - "*stone_hoe"
+        - "*iron_hoe"
+        - "*golden_hoe"
+        - "*diamond_hoe"
+        - "*netherite_hoe"
+        - "*fishing_rod"
+        - "*flint_and_steel"
+        - "*clock"
+        - "*compass"
+        - "*lead"
+        - "*shears"
+        - "*spyglass"
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 2"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each tool crafted"
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each tool crafted"
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each tool crafted"
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      amount: "2 * %level%"
+    filters:
+      items:
+        - "*wooden_pickaxe"
+        - "*stone_pickaxe"
+        - "*iron_pickaxe"
+        - "*golden_pickaxe"
+        - "*diamond_pickaxe"
+        - "*netherite_pickaxe"
+        - "*wooden_axe"
+        - "*stone_axe"
+        - "*iron_axe"
+        - "*golden_axe"
+        - "*diamond_axe"
+        - "*netherite_axe"
+        - "*wooden_shovel"
+        - "*stone_shovel"
+        - "*iron_shovel"
+        - "*golden_shovel"
+        - "*diamond_shovel"
+        - "*netherite_shovel"
+        - "*wooden_hoe"
+        - "*stone_hoe"
+        - "*iron_hoe"
+        - "*golden_hoe"
+        - "*diamond_hoe"
+        - "*netherite_hoe"
+        - "*fishing_rod"
+        - "*flint_and_steel"
+        - "*clock"
+        - "*compass"
+        - "*lead"
+        - "*shears"
+        - "*spyglass"
+    triggers:
+      - craft
+
+conditions: [ ]
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODk2ZDRjODM4YTE2MDZhYzc1Nzc1NDIzMjA4NjE0OTcwOGI3OWFiYTAxYmU5NTNjNjUzOTkxMDFlODk0M2RhZiJ9fX0=

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

@@ -4,10 +4,7 @@ messages:
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"
   reloaded: "Reloaded!"
-  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
+
-  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
-  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
-  cannot-transmit: "&cYou can't transmit here!"
   needs-player: "&cYou must specify a player!"
   gave-xp: "&fYou have given &a%xp% &fXP to %player%&f's %job%&f!"
   reset-xp: "&fYou have reset %player%&f's %job%&f XP!"
@@ -20,8 +17,20 @@ 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!"
+  cannot-join-job: "&cYou are already in too many jobs, please leave one!"
+  cant-leave-job: "&cYou can't leave the %job%&f job!"
+  dont-have-job: "&cYou don't have this job unlocked!"
+  not-in-job: "&cYou are not in this job!"
 
 menu:
   title: "Jobs"
 
 infinity: "∞"
+
+top:
+  name-empty: "&cEmpty"
+  amount-empty: "0"

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

@@ -0,0 +1,75 @@
+name: ${pluginName}
+version: ${version}
+main: com.willfp.ecojobs.EcoJobsPlugin
+api-version: 1.19
+
+dependencies:
+  - name: eco
+    required: true
+    bootstrap: false
+
+  - name: libreforge
+    required: false
+    bootstrap: false
+
+load-after:
+  - name: eco
+    bootstrap: false
+
+
+permissions:
+  ecojobs.*:
+    description: All EcoJobs permissions
+    default: op
+    children:
+      ecojobs.command.*: true
+  ecojobs.command.*:
+    description: All commands
+    default: op
+    children:
+      ecojobs.command.ecojobs: true
+      ecojobs.command.reload: true
+      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:
+    description: Allows reloading the config
+    default: op
+  ecojobs.command.ecojobs:
+    description: Allows the use of /ecojobs.
+    default: true
+  ecojobs.command.jobs:
+    description: Allows the use of /jobs.
+    default: true
+  ecojobs.command.unlock:
+    description: Allows the use of /ecojobs unlock.
+    default: op
+  ecojobs.command.givexp:
+    description: Allows the use of /ecojobs givexp.
+    default: op
+  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
+    default: false
+  ecojobs.xpmultiplier.double:
+    description: Gives the player 2x job experience
+    default: false
+  ecojobs.xpmultiplier.triple:
+    description: Gives the player 3x job experience
+    default: false
+  ecojobs.xpmultiplier.quadruple:
+    description: Gives the player 4x job experience
+    default: false

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

@@ -1,28 +1,13 @@
-name: EcoJobs
+name: ${pluginName}
-version: ${projectVersion}
+version: ${version}
 main: com.willfp.ecojobs.EcoJobsPlugin
 api-version: 1.17
 authors: [ Auxilor ]
 website: willfp.com
-load: STARTUP
 depend:
   - eco
-  - ProtocolLib
-  - PlaceholderAPI
 softdepend:
-  - AureliumSkills
+  - libreforge
-  - Vault
-  - mcMMO
-  - Jobs
-  - TMMobcoins
-  - EcoEnchants
-  - EcoBosses
-  - Talismans
-  - EcoArmor
-  - EcoItems
-  - Boosters
-  - EcoSkills
-  - Reforges
 commands:
   ecojobs:
     description: Base Command
@@ -49,6 +34,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 +56,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,5 @@
 #libreforge-updater
-#Sat Sep 17 15:45:43 BST 2022
+#Thu Nov 23 13:20:15 GMT 2023
-version=1.6.0
+kotlin.code.style=official
-plugin-name=EcoJobs
+libreforge-version=4.45.0
+version=3.44.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

settings.gradle

@@ -1,5 +0,0 @@
-rootProject.name = 'EcoJobs'
-
-// Core
-include ':eco-core'
-include ':eco-core:core-plugin'

settings.gradle.kts

@@ -0,0 +1,14 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenLocal()
+        maven("https://repo.jpenilla.xyz/snapshots/")
+        maven("https://repo.auxilor.io/repository/maven-public/")
+    }
+}
+
+rootProject.name = "EcoJobs"
+
+// Core
+include(":eco-core")
+include(":eco-core:core-plugin")