Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2025-12-31 04:46:31 +00:00
Code Issues Releases 1 Activity

Updated eco

Browse Source
This commit is contained in:
Auxilor
2022-01-17 19:25:09 +00:00
parent 5d365b1353
commit ae5dee1acc
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'])

4
eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java
View File

@@ -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

5
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt
View File

@@ -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

10
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt
View File

@@ -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

14
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt
View File

@@ -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

2
gradle.properties
View File

@@ -1,2 +1,2 @@
version = 1.20.5
version = 1.20.6
plugin-name = EcoSkills