diff --git a/build.gradle b/build.gradle index d65a1b5..ecf2c27 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.38.0' + implementation 'com.willfp:libreforge:3.39.0' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt index 73be3af..69b0f6d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt @@ -27,8 +27,7 @@ import org.bukkit.Bukkit import org.bukkit.Sound import org.bukkit.inventory.ItemStack import org.bukkit.persistence.PersistentDataType -import java.util.Locale -import java.util.Objects +import java.util.* import java.util.stream.Collectors class ArmorSet( @@ -123,8 +122,8 @@ class ArmorSet( advancedEffects.add(conf) } } - regularHolder = SimpleHolder(conditions, effects) - advancedHolder = SimpleHolder(conditions, advancedEffects) + regularHolder = SimpleHolder(conditions, effects, id) + advancedHolder = SimpleHolder(conditions, advancedEffects, "${id}_advanced") ArmorSets.addNewSet(this) for (slot in ArmorSlot.values()) { val item = construct(slot, config.getSubsection(slot.name.lowercase(Locale.getDefault())), false) @@ -332,5 +331,6 @@ class ArmorSet( class SimpleHolder( override val conditions: Set, - override val effects: Set + override val effects: Set, + override val id: String? ) : Holder \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 312a993..5f16d86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.54.0 +version = 7.55.0 plugin-name = EcoArmor \ No newline at end of file