From 1be9ec472a9f07006a2acddf06918c30ebe0c15c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 8 May 2022 16:14:27 +0100 Subject: [PATCH] Updated libreforge --- build.gradle | 2 +- .../com/willfp/ecoarmor/display/ArmorDisplay.kt | 13 +++++++++++++ .../kotlin/com/willfp/ecoarmor/sets/ArmorSet.kt | 4 ++-- gradle.properties | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ecf2c27..10a37ba 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.39.0' + implementation 'com.willfp:libreforge:3.40.1' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt index 0889df5..80be598 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt @@ -6,12 +6,14 @@ import com.willfp.eco.core.display.DisplayPriority import com.willfp.eco.core.fast.FastItemStack import com.willfp.ecoarmor.sets.ArmorSlot import com.willfp.ecoarmor.sets.ArmorUtils +import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.LeatherArmorMeta class ArmorDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LOWEST) { override fun display( itemStack: ItemStack, + player: Player?, vararg args: Any ) { val meta = itemStack.itemMeta ?: return @@ -59,6 +61,17 @@ class ArmorDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LO lore.addAll(fis.lore) } + if (player != null) { + lore.add("") + lore.addAll( + if (ArmorUtils.isAdvanced(meta)) { + set.advancedHolder.getNotMetLines(player) + } else { + set.regularHolder.getNotMetLines(player) + } + ) + } + if (this.plugin.configYml.getBool("update-item-names")) { meta.setDisplayName(slotMeta.displayName) } 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 69b0f6d..3aa59bc 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 @@ -332,5 +332,5 @@ class ArmorSet( class SimpleHolder( override val conditions: Set, override val effects: Set, - override val id: String? -) : Holder \ No newline at end of file + override val id: String +) : Holder diff --git a/gradle.properties b/gradle.properties index 5f16d86..05f91ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.55.0 +version = 7.56.0 plugin-name = EcoArmor \ No newline at end of file