diff --git a/build.gradle b/build.gradle index c2d8a44..c586179 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.18.1' + compileOnly 'com.willfp:eco:6.20.0' compileOnly fileTree(dir: '../../lib', include: ['*.jar']) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java index 7699a67..519375d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java @@ -1,6 +1,7 @@ package com.willfp.ecoskills.skills; import com.google.common.collect.ImmutableSet; +import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.updating.ConfigUpdater; import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry; import com.willfp.eco.util.NumberUtils; @@ -59,8 +60,9 @@ public class Skills { } @ConfigUpdater - public static void update() { + public static void update(@NotNull final EcoPlugin plugin) { new PlaceholderEntry( + plugin, "skill_multiplier", (player -> NumberUtils.format(EcoSkillsPlayerKt.getSkillExperienceMultiplier(player))), true diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt index def767c..27dae87 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt @@ -11,7 +11,7 @@ import com.willfp.ecoskills.SkillObject import com.willfp.ecoskills.getEffectLevel import org.bukkit.NamespacedKey import org.bukkit.event.Listener -import java.util.UUID +import java.util.* abstract class Effect( id: String @@ -51,18 +51,21 @@ abstract class Effect( fun update() { PlaceholderEntry( + plugin, id, { player -> player.getEffectLevel(this).toString() }, true ).register() PlaceholderEntry( + plugin, "${id}_numeral", { player -> NumberUtils.toNumeral(player.getEffectLevel(this)) }, true ).register() PlaceholderEntry( + plugin, "${id}_description", { player -> this.getDescription(player.getEffectLevel(this)) }, true diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt index 39d27f2..356e6a6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt @@ -7,14 +7,10 @@ import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry import com.willfp.eco.util.NumberUtils import com.willfp.eco.util.StringUtils -import com.willfp.ecoskills.EcoSkillsPlugin -import com.willfp.ecoskills.SkillObject +import com.willfp.ecoskills.* import com.willfp.ecoskills.config.SkillConfig import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.effects.Effects -import com.willfp.ecoskills.getAverageSkillLevel -import com.willfp.ecoskills.getSkillLevel -import com.willfp.ecoskills.getTotalSkillLevel import com.willfp.ecoskills.stats.Stats import org.bukkit.Bukkit import org.bukkit.NamespacedKey @@ -86,24 +82,28 @@ abstract class Skill( } PlaceholderEntry( + plugin, id, { player -> player.getSkillLevel(this).toString() }, true ).register() PlaceholderEntry( + plugin, "${id}_numeral", { player -> NumberUtils.toNumeral(player.getSkillLevel(this)) }, true ).register() PlaceholderEntry( + plugin, "average_skill_level", { player -> NumberUtils.format(player.getAverageSkillLevel()) }, true ).register() PlaceholderEntry( + plugin, "total_skill_level", { player -> player.getTotalSkillLevel().toString() }, true diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt index 253f5be..4d7f9c4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt @@ -6,15 +6,11 @@ import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry import com.willfp.eco.util.NumberUtils -import com.willfp.ecoskills.EcoSkillsPlugin -import com.willfp.ecoskills.SkillObject -import com.willfp.ecoskills.getBaseStatLevel -import com.willfp.ecoskills.getBonusStatLevel -import com.willfp.ecoskills.getStatLevel +import com.willfp.ecoskills.* import org.bukkit.NamespacedKey import org.bukkit.entity.Player import org.bukkit.event.Listener -import java.util.UUID +import java.util.* abstract class Stat( id: String @@ -51,30 +47,35 @@ abstract class Stat( name = config.getString("name") PlaceholderEntry( + plugin, id, { player -> player.getStatLevel(this).toString() }, true ).register() PlaceholderEntry( + plugin, "${id}_numeral", { player -> NumberUtils.toNumeral(player.getStatLevel(this)) }, true ).register() PlaceholderEntry( + plugin, "${id}_base", { player -> player.getBaseStatLevel(this).toString() }, true ).register() PlaceholderEntry( + plugin, "${id}_base_numeral", { player -> NumberUtils.toNumeral(player.getBaseStatLevel(this)) }, true ).register() PlaceholderEntry( + plugin, "${id}_bonus", { player -> val bonus = player.getBonusStatLevel(this) @@ -88,6 +89,7 @@ abstract class Stat( ).register() PlaceholderEntry( + plugin, "${id}_name", { this.name }, false diff --git a/gradle.properties b/gradle.properties index 0304645..96d32fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 1.20.5 +version = 1.20.6 plugin-name = EcoSkills \ No newline at end of file