libreforge-updater

/jobs join tabcompletion fix (hardest fix in my life)

build.gradle

@@ -42,12 +42,14 @@ allprojects {
 
     shadowJar {
         relocate('com.willfp.libreforge', 'com.willfp.ecojobs.libreforge')
+        relocate('com.willfp.ecomponent', 'com.willfp.ecojobs.ecomponent')
         relocate('org.joml', 'com.willfp.ecojobs.libreforge.joml')
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.43.6'
+        compileOnly 'com.willfp:eco:6.44.0'
-        implementation 'com.willfp:libreforge:3.111.1'
+        implementation 'com.willfp:libreforge:3.118.0'
+        implementation 'com.willfp:ecomponent:1.0.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'

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/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt

@@ -7,10 +7,12 @@ 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.jobs.activeJobLevel
+import com.willfp.ecojobs.jobs.getJobLevel
 import com.willfp.libreforge.LibReforgePlugin
 import org.bukkit.event.Listener
 
@@ -31,12 +33,23 @@ class EcoJobsPlugin : LibReforgePlugin() {
         PlayerPlaceholder(
             this,
             "job_level"
-        ) { it.activeJobLevel?.level.toString() ?: "" }.register()
+        ) { it.activeJobLevel?.level?.toString() ?: "" }.register()
 
         PlayerPlaceholder(
             this,
             "job_id"
         ) { it.activeJob?.id ?: "" }.register()
+
+        PlayerPlaceholder(
+            this,
+            "total_job_level"
+        ) {
+            var level = 0
+            for (job in Jobs.values()) {
+                level += it.getJobLevel(job)
+            }
+            level.toString()
+        }.register()
     }
 
     override fun loadPluginCommands(): List<PluginCommand> {

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

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

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

@@ -2,14 +2,28 @@ package com.willfp.ecojobs.commands
 
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.ecojobs.jobs.Jobs
+import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.libreforge.lrcdb.CommandExport
+import com.willfp.libreforge.lrcdb.CommandImport
+import com.willfp.libreforge.lrcdb.ExportableConfig
 import org.bukkit.command.CommandSender
 
-class CommandEcojobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
+class CommandEcojobs(plugin: LibReforgePlugin) : PluginCommand(plugin, "ecojobs", "ecojobs.command.ecojobs", false) {
     init {
         this.addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandUnlock(plugin))
             .addSubcommand(CommandGiveXP(plugin))
             .addSubcommand(CommandReset(plugin))
+            .addSubcommand(CommandImport("jobs", plugin))
+            .addSubcommand(CommandExport(plugin) {
+                Jobs.values().map {
+                    ExportableConfig(
+                        it.id,
+                        it.config
+                    )
+                }
+            })
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

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

@@ -7,7 +7,6 @@ import com.willfp.eco.util.savedDisplayName
 import com.willfp.eco.util.toNiceString
 import com.willfp.ecojobs.jobs.Jobs
 import com.willfp.ecojobs.jobs.giveExactJobExperience
-import com.willfp.ecojobs.jobs.giveJobExperience
 import com.willfp.ecojobs.jobs.hasJob
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender

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

@@ -53,7 +53,7 @@ class CommandJoin(plugin: EcoPlugin) : Subcommand(plugin, "join", "ecojobs.comma
 
         if (args.size == 1) {
             StringUtil.copyPartialMatches(
-                args[1],
+                args[0],
                 Jobs.values().filter { sender.hasJob(it) }.map { it.id },
                 completions
             )

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

@@ -8,8 +8,6 @@ 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
 

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

@@ -18,6 +18,7 @@ import com.willfp.ecojobs.api.event.PlayerJobExpGainEvent
 import com.willfp.ecojobs.api.event.PlayerJobJoinEvent
 import com.willfp.ecojobs.api.event.PlayerJobLeaveEvent
 import com.willfp.ecojobs.api.event.PlayerJobLevelUpEvent
+import com.willfp.ecojobs.jobs.Jobs.unlockedJobs
 import com.willfp.libreforge.conditions.Conditions
 import com.willfp.libreforge.conditions.ConfiguredCondition
 import com.willfp.libreforge.effects.ConfiguredEffect
@@ -166,11 +167,18 @@ class Job(
         }.register()
 
         PlayerPlaceholder(
-            plugin,
+                plugin,
-            "${id}_level"
+        "${id}_level"
         ) {
             it.getJobLevel(this).toString()
         }.register()
+
+        PlayerPlaceholder(
+            plugin,
+            "${id}_total_players"
+        ) {
+            Bukkit.getOfflinePlayers().count { it.activeJob == this }.toString()
+        }.register()
     }
 
     fun getLevel(level: Int): JobLevel = levels.get(level) {

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

@@ -3,6 +3,9 @@ package com.willfp.ecojobs.jobs
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu.MenuLayer
+import com.willfp.eco.core.gui.onLeftClick
+import com.willfp.eco.core.gui.page.PageChanger
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
@@ -10,63 +13,61 @@ import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.util.NumberUtils
-import org.bukkit.Material
+import com.willfp.ecomponent.components.LevelComponent
+import com.willfp.ecomponent.components.LevelState
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.properties.Delegates
 
 class JobLevelGUI(
     plugin: EcoPlugin,
     private val job: Job
 ) {
     private val menu: Menu
-    private val pageKey = "page"
-    private var levelsPerPage by Delegates.notNull<Int>()
-    private var pages by Delegates.notNull<Int>()
-
-    private fun getPage(menu: Menu, player: Player): Int {
-        val page = menu.getState(player, pageKey) ?: 1
-
-        return min(pages, max(page, 1))
-    }
 
     init {
         val maskPattern = plugin.configYml.getStrings("level-gui.mask.pattern").toTypedArray()
         val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("level-gui.mask.materials"))
 
-        val progressionOrder = "123456789abcdefghijklmnopqrstuvwxyz"
         val progressionPattern = plugin.configYml.getStrings("level-gui.progression-slots.pattern")
 
-        val progressionSlots = mutableMapOf<Int, Pair<Int, Int>>()
+        val component = object : LevelComponent(progressionPattern, job.maxLevel) {
+            override fun getLevelItem(player: Player, menu: Menu, level: Int, levelState: LevelState): ItemStack {
+                val key = levelState.name.lowercase().replace("_", "-")
 
-        var x = 0
+                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()
+            }
+
+            override fun getLevelState(player: Player, level: Int): LevelState {
+                return when {
+                    level <= player.getJobLevel(job) -> LevelState.UNLOCKED
+                    level == player.getJobLevel(job) + 1 -> LevelState.IN_PROGRESS
+                    else -> LevelState.LOCKED
                 }
-
-                val pos = progressionOrder.indexOf(char)
-
-                if (pos == -1) {
-                    continue
-                }
-
-                progressionSlots[pos + 1] = Pair(x, y)
             }
         }
 
-        levelsPerPage = progressionSlots.size
-        pages = ceil(job.maxLevel.toDouble() / levelsPerPage).toInt()
-
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
-            setTitle(job.name)
+            title = job.name
+
+            maxPages(component.pages)
+
             setMask(
                 FillerMask(
                     maskItems,
@@ -74,58 +75,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(
@@ -133,38 +87,30 @@ 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(
@@ -191,5 +137,7 @@ class JobLevelGUI(
         }
     }
 
-    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/JobsGUI.kt

@@ -56,14 +56,11 @@ object JobsGUI {
         val jobInfoItemBuilder = { player: Player, _: Menu ->
             val job = player.activeJob
 
-            if (job == null) {
+            job?.getJobInfoIcon(player)
-                ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.job-info.no-active.item")))
+                ?: 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 ->
@@ -78,7 +75,7 @@ object JobsGUI {
         }
 
         return menu(plugin.configYml.getInt("gui.rows")) {
-            setTitle(plugin.langYml.getString("menu.title"))
+            title = plugin.langYml.getString("menu.title")
 
             setMask(
                 FillerMask(
@@ -145,7 +142,7 @@ object JobsGUI {
 
                         val newPage = max(1, page - 1)
 
-                        menu.addState(player, pageKey, newPage)
+                        menu.setState(player, pageKey, newPage)
                     }
                 }
             )
@@ -169,7 +166,7 @@ object JobsGUI {
 
                         val newPage = min(pages, page + 1)
 
-                        menu.addState(player, pageKey, newPage)
+                        menu.setState(player, pageKey, newPage)
                     }
                 }
             )

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

@@ -255,6 +255,13 @@ cannot-afford-type:
     sound: "BLOCK_NOTE_BLOCK_PLING"
     pitch: 0.5
 
+cannot-afford-price:
+  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"
 
@@ -271,5 +278,3 @@ potions:
   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/jobs/beekeeper.yml

@@ -92,7 +92,7 @@ effects:
     triggers:
       - breed
     filters:
-      entites:
+      entities:
        - bee
 
   - id: take_money
@@ -101,7 +101,7 @@ effects:
     triggers:
       - consume 
     filters:
-      imems: 
+      items:
         - honey_bottle
 
       

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

@@ -0,0 +1,94 @@
+name: "&#7A54FBEnchanter"
+description: "&7&oLevel up by enchanting items"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
+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/lumberjack.yml

@@ -0,0 +1,117 @@
+name: "&#FB8810Lumberjack"
+description: "&7&oLevel up by chopping wood"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
+level-xp-requirements:
+  - 100
+  - 120
+  - 150
+  - 180
+  - 210
+  - 250
+  - 300
+  - 360
+  - 430
+  - 520
+  - 620
+  - 740
+  - 890
+  - 1000
+  - 1300
+  - 1500
+  - 1900
+  - 2200
+  - 2700
+  - 3200
+  - 3800
+  - 4600
+  - 5500
+  - 6600
+  - 7900
+  - 9500
+  - 11500
+  - 14000
+  - 17000
+  - 19000
+  - 24000
+  - 29000
+  - 34000
+  - 41000
+  - 50000
+  - 60000
+  - 70000
+  - 85000
+  - 100000
+  - 120000
+  - 150000
+  - 180000
+  - 210000
+  - 250000
+  - 300000
+  - 360000
+  - 440000
+  - 580000
+  - 750000
+
+xp-gain-methods:
+  - trigger: mine_block
+    multiplier: 0.5
+    conditions: [ ]
+    filters:
+      items:
+        - "*oak_log"
+        - "*spruce_log"
+        - "*birch_log"
+        - "*jungle_log"
+        - "*acacia_log"
+        - "*dark_oak_log"
+        - "*mangrove_log"
+        - "*crimson_stem"
+        - "*warped_stem"
+
+level-placeholders:
+  - id: "money"
+    value: "%level% * 0.4"
+
+effects-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each log chopped."
+
+rewards-description:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each log chopped."
+
+level-up-messages:
+  1:
+    - "&8» &8Earn &a$%money%&8 for each log chopped."
+
+level-commands: [ ]
+
+effects:
+  - id: give_money
+    args:
+      every: "ceil(10 - %level% / 10)"
+      amount: "0.4 * %level%"
+    filters:
+      items:
+        - "*oak_log"
+        - "*spruce_log"
+        - "*birch_log"
+        - "*jungle_log"
+        - "*acacia_log"
+        - "*dark_oak_log"
+        - "*mangrove_log"
+        - "*crimson_stem"
+        - "*warped_stem"
+    triggers:
+      - mine_block
+
+conditions: [ ]
+
+icon: player_head texture:basehead-eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E2MjA3MDJmODBiZDJjMjI0MmUyZjEzMWMzZjlhMjU5NDAyYjdmYTg5NzRjODZjZjM0NTBmZjczZTc3MDU5NSJ9fX0=

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

@@ -0,0 +1,94 @@
+name: "&#4B4736Smelter"
+description: "&7&oLevel up by smelting items"
+
+unlocked-by-default: true
+
+reset-on-quit: false
+
+join-price: 0
+leave-price: 0
+
+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/lang.yml

@@ -6,8 +6,17 @@ messages:
   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%"
+  cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
   on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
   cannot-transmit: "&cYou can't transmit here!"
+  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
+  lrcdb-import-error: "&cError importing config: &f%message%"
+  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
+  must-specify-config-name: "&cYou must specify the config name!"
+  invalid-config-name: "&cInvalid config name!"
+  lrcdb-export-error: "&cError exporting config: &f%message%"
+  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
+
   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!"

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

@@ -0,0 +1,19 @@
+# Options for lrcdb (https://lrcdb.auxilor.io), a website to share configs
+# with other server owners, so you can get more configs without making them
+# yourself!
+
+author: "Unknown Author" # The name attached to configs you export
+
+# Options about automatically sharing configs you create
+share-configs:
+  # If you want all your configs to automatically be publicly available,
+  # set this to true. This really helps out other users!
+  publicly: false
+
+  # If you don't want your configs to be usable to gather information about
+  # plugin usage or to improve the plugins in the future, disable this.
+  # Nothing identifying is shared.
+  enabled: true
+
+# If you disable share-configs, you can still share select configs publicly
+# with /ecojobs export <config>.

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

@@ -52,6 +52,8 @@ permissions:
       ecojobs.command.join: true
       ecojobs.command.leave: true
       ecojobs.command.reset: true
+      ecojobs.command.import: true
+      ecojobs.command.export: true
 
   ecojobs.command.reload:
     description: Allows reloading the config
@@ -71,6 +73,12 @@ permissions:
   ecojobs.command.reset:
     description: Allows the use of /ecojobs reset.
     default: op
+  ecojobs.command.import:
+    description: Allows the use of /ecojobs import.
+    default: op
+  ecojobs.command.export:
+    description: Allows the use of /ecojobs export.
+    default: op
   ecojobs.command.join:
     description: Allows the use of /jobs join.
     default: true

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Mon Oct 10 21:03:58 BST 2022
+#Sun Nov 06 19:51:41 GMT 2022
-version=1.16.1
+version=1.23.0
 plugin-name=EcoJobs