diff --git a/build.gradle b/build.gradle index baf45e4..e220c0b 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.43.6' - implementation 'com.willfp:libreforge:3.111.1' + implementation 'com.willfp:libreforge:3.112.0' implementation 'org.joml:joml:1.10.4' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt index ad43c62..72edd3e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/commands/CommandEcojobs.kt +++ b/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) { @@ -17,4 +31,4 @@ class CommandEcojobs(plugin: EcoPlugin) : PluginCommand(plugin, "ecojobs", "ecoj plugin.langYml.getMessage("invalid-command") ) } -} \ No newline at end of file +} diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index b95b0d4..5141445 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -270,6 +270,4 @@ potions: 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. \ No newline at end of file + triggered: true \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/lang.yml b/eco-core/core-plugin/src/main/resources/lang.yml index 2c1a1b4..93ed005 100644 --- a/eco-core/core-plugin/src/main/resources/lang.yml +++ b/eco-core/core-plugin/src/main/resources/lang.yml @@ -24,6 +24,13 @@ messages: 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!" + 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%" menu: title: "Jobs" diff --git a/eco-core/core-plugin/src/main/resources/lrcdb.yml b/eco-core/core-plugin/src/main/resources/lrcdb.yml new file mode 100644 index 0000000..bd9b840 --- /dev/null +++ b/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 . \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index f963c9e..1b58c91 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/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 diff --git a/gradle.properties b/gradle.properties index 2627f99..820a075 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ #libreforge-updater -#Mon Oct 10 21:03:58 BST 2022 -version=1.16.1 +#Thu Oct 13 20:11:59 BST 2022 +version=1.17.0 plugin-name=EcoJobs