diff --git a/build.gradle b/build.gradle index e79024c..e0b2749 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.34.0' - implementation 'com.willfp:libreforge:3.36.2' + implementation 'com.willfp:libreforge:3.37.0' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt index 9bf1453..74f2c80 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt @@ -5,7 +5,6 @@ import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.items.Items import com.willfp.eco.util.ListUtils import com.willfp.ecoarmor.commands.CommandEcoarmor -import com.willfp.ecoarmor.conditions.ConditionIsWearingSet import com.willfp.ecoarmor.config.EcoArmorYml import com.willfp.ecoarmor.display.ArmorDisplay import com.willfp.ecoarmor.sets.ArmorSets @@ -58,14 +57,11 @@ class EcoArmorPlugin : LibReforgePlugin(687, 10002, "&c") { } override fun getMinimumEcoVersion(): String { - return "6.31.0" + return "6.35.1" } companion object { @JvmStatic lateinit var instance: EcoArmorPlugin - - @JvmStatic - val IS_WEARING_SET = ConditionIsWearingSet() } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/conditions/ConditionIsWearingSet.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/conditions/ConditionIsWearingSet.kt deleted file mode 100644 index 3902df9..0000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/conditions/ConditionIsWearingSet.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.willfp.ecoarmor.conditions - -import com.willfp.eco.core.config.interfaces.Config -import com.willfp.ecoarmor.sets.ArmorSets -import com.willfp.ecoarmor.sets.ArmorUtils -import com.willfp.libreforge.ConfigViolation -import com.willfp.libreforge.conditions.Condition -import org.bukkit.entity.Player - -class ConditionIsWearingSet: Condition( - "is_wearing_set" -) { - override fun isConditionMet(player: Player, config: Config): Boolean { - val set = ArmorSets.getByID(config.getString("set")) - if (set != null) { - return ArmorUtils.getSetOnPlayer(player) == set - } - return true - } - - override fun validateConfig(config: Config): List { - val violations = mutableListOf() - if (!config.has("set")) { - violations += ConfigViolation("set", "You must specify an armor set!") - } - return violations - } -} \ 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 4bac393..847cfea 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -13,8 +13,6 @@ softdepend: - Jobs - mcMMO - Vault - - DeluxeSellwands - - ShopGUIPlus commands: ecoarmor: diff --git a/gradle.properties b/gradle.properties index 043001b..02a6f68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.52.2 +version = 7.53.0 plugin-name = EcoArmor \ No newline at end of file