Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2026-01-06 15:51:52 +00:00
Code Issues Releases 1 Activity

Renamed new stat conditions

Browse Source
This commit is contained in:
Will FP
2023-12-11 11:54:14 +00:00
parent 6caabf95e1
commit 5fde2bc357
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt
View File

@@ -2,7 +2,6 @@ package com.willfp.ecoskills
import com.willfp.eco.core.command.impl.PluginCommand
import com.willfp.eco.core.packet.PacketListener
import com.willfp.eco.util.containsIgnoreCase
import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy
import com.willfp.ecoskills.actionbar.ActionBarGamemodeListener
import com.willfp.ecoskills.actionbar.ActionBarHandler
@@ -30,7 +29,6 @@ import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.filters.Filters
import com.willfp.libreforge.loader.LibreforgePlugin
import com.willfp.libreforge.loader.configs.ConfigCategory
import com.willfp.libreforge.registerHolderProvider
import com.willfp.libreforge.registerSpecificHolderProvider
import com.willfp.libreforge.triggers.Triggers
import org.bukkit.entity.Player
@@ -73,8 +71,8 @@ class EcoSkillsPlugin : LibreforgePlugin() {
com.willfp.libreforge.effects.Effects.register(EffectAddStatTemporarily(this))
com.willfp.libreforge.effects.Effects.register(EffectMultiplyStatTemporarily(this))
com.willfp.libreforge.effects.Effects.register(EffectMagicRegenMultiplier)
Conditions.register(ConditionAboveStat)
Conditions.register(ConditionBelowStat)
Conditions.register(ConditionStatAbove)
Conditions.register(ConditionStatBelow)
Conditions.register(ConditionStatEquals)
Conditions.register(ConditionHasSkillLevel)
Conditions.register(ConditionBelowMagic)

8
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/ConditionAboveStat.kt → eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/ConditionStatAbove.kt
View File

@@ -1,9 +1,7 @@
package com.willfp.ecoskills.libreforge
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.ecoskills.api.getMagic
import com.willfp.ecoskills.api.getStatLevel
import com.willfp.ecoskills.magic.MagicTypes
import com.willfp.ecoskills.stats.Stats
import com.willfp.libreforge.Dispatcher
import com.willfp.libreforge.NoCompileData
@@ -13,10 +11,10 @@ import com.willfp.libreforge.conditions.Condition
import com.willfp.libreforge.get
import org.bukkit.entity.Player
object ConditionAboveStat : Condition<NoCompileData>("above_stat") {
object ConditionStatAbove : Condition<NoCompileData>("stat_above") {
override val arguments = arguments {
require("stat", "You must specify the stat!")
require("amount", "You must specify the amount!")
require("level", "You must specify the level!")
}
override fun isMet(
@@ -29,6 +27,6 @@ object ConditionAboveStat : Condition<NoCompileData>("above_stat") {
val type = Stats.getByID(config.getString("stat").lowercase()) ?: return false
return player.getStatLevel(type) >= config.getIntFromExpression("amount", player)
return player.getStatLevel(type) >= config.getIntFromExpression("level", player)
}
}

8
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/ConditionBelowStat.kt → eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/ConditionStatBelow.kt
View File

@@ -1,9 +1,7 @@
package com.willfp.ecoskills.libreforge
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.ecoskills.api.getMagic
import com.willfp.ecoskills.api.getStatLevel
import com.willfp.ecoskills.magic.MagicTypes
import com.willfp.ecoskills.stats.Stats
import com.willfp.libreforge.Dispatcher
import com.willfp.libreforge.NoCompileData
@@ -13,10 +11,10 @@ import com.willfp.libreforge.conditions.Condition
import com.willfp.libreforge.get
import org.bukkit.entity.Player
object ConditionBelowStat : Condition<NoCompileData>("below_stat") {
object ConditionStatBelow : Condition<NoCompileData>("stat_below") {
override val arguments = arguments {
require("stat", "You must specify the stat!")
require("amount", "You must specify the amount!")
require("level", "You must specify the level!")
}
override fun isMet(
@@ -29,6 +27,6 @@ object ConditionBelowStat : Condition<NoCompileData>("below_stat") {
val type = Stats.getByID(config.getString("stat").lowercase()) ?: return false
return player.getStatLevel(type) < config.getIntFromExpression("amount", player)
return player.getStatLevel(type) < config.getIntFromExpression("level", player)
}
}

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/ConditionStatEquals.kt
View File

@@ -1,9 +1,7 @@
package com.willfp.ecoskills.libreforge
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.ecoskills.api.getMagic
import com.willfp.ecoskills.api.getStatLevel
import com.willfp.ecoskills.magic.MagicTypes
import com.willfp.ecoskills.stats.Stats
import com.willfp.libreforge.Dispatcher
import com.willfp.libreforge.NoCompileData
@@ -16,7 +14,7 @@ import org.bukkit.entity.Player
object ConditionStatEquals : Condition<NoCompileData>("stat_equals") {
override val arguments = arguments {
require("stat", "You must specify the stat!")
require("amount", "You must specify the amount!")
require("level", "You must specify the level!")
}
override fun isMet(