diff --git a/build.gradle.kts b/build.gradle.kts index ce7b3d5..cad582d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,8 +48,8 @@ allprojects { tasks { shadowJar { - relocate("com.willfp.libreforge.loader", "com.willfp.ecopets.libreforge.loader") - relocate("com.willfp.ecomponent", "com.willfp.ecopets.ecomponent") + relocate("com.willfp.libreforge.loader", "com.willfp.ecojobs.libreforge.loader") + relocate("com.willfp.ecomponent", "com.willfp.ecojobs.ecomponent") } compileKotlin { diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 07be7c5..7662d78 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -4,7 +4,8 @@ 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") - compileOnly("com.willfp:ecomponent:1.3.0") + + implementation("com.willfp:ecomponent:1.3.0") } publishing { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt index 928cefe..f48c96e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/EcoJobsPlugin.kt @@ -24,11 +24,6 @@ import java.util.regex.Pattern class EcoJobsPlugin : LibreforgePlugin() { init { instance = this - registerHolderProvider { player -> - player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map { - SimpleProvidedHolder(it) - } - } } override fun loadConfigCategories(): List { @@ -38,6 +33,12 @@ class EcoJobsPlugin : LibreforgePlugin() { } override fun handleEnable() { + registerHolderProvider { player -> + player.activeJobs.map { it.getLevel(player.getJobLevel(it)) }.map { + SimpleProvidedHolder(it) + } + } + PlayerPlaceholder( this, "limit" diff --git a/eco-core/core-plugin/src/main/resources/paper-plugin.yml b/eco-core/core-plugin/src/main/resources/paper-plugin.yml index 8516707..d82ec88 100644 --- a/eco-core/core-plugin/src/main/resources/paper-plugin.yml +++ b/eco-core/core-plugin/src/main/resources/paper-plugin.yml @@ -1,6 +1,6 @@ name: ${pluginName} version: ${version} -main: com.willfp.ecopets.EcoPetsPlugin +main: com.willfp.ecojobs.EcoJobsPlugin api-version: 1.19 dependencies: diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index 2f953df..c121903 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ${pluginName} version: ${version} -main: com.willfp.ecopets.EcoPetsPlugin +main: com.willfp.ecojobs.EcoJobsPlugin api-version: 1.17 authors: [ Auxilor ] website: willfp.com diff --git a/gradle.properties b/gradle.properties index 102e5d4..6490641 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Mon Mar 13 13:39:16 GMT 2023 +#Tue Mar 28 15:57:37 BST 2023 kotlin.code.style=official libreforge-version=4.0.0 version=3.0.0