From 23fcbd55faa100f812566bd66f8edf1320ef9b43 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 8 May 2022 16:17:32 +0100 Subject: [PATCH] Updated libreforge --- build.gradle | 2 +- .../com/willfp/talismans/display/TalismanDisplay.kt | 11 +++++++++++ gradle.properties | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c475f24..9eb5086 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.35.1' - 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/talismans/display/TalismanDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/display/TalismanDisplay.kt index 1466e56..fb0a750 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/display/TalismanDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/display/TalismanDisplay.kt @@ -5,11 +5,13 @@ import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayPriority import com.willfp.talismans.talismans.util.TalismanChecks import com.willfp.talismans.talismans.util.TalismanUtils +import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack class TalismanDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LOWEST) { override fun display( itemStack: ItemStack, + player: Player?, vararg args: Any ) { if (!TalismanUtils.isTalismanMaterial(itemStack.type)) { @@ -31,6 +33,15 @@ class TalismanDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority lore.addAll(talisman.description) lore.addAll(itemLore) + if (player != null) { + val lines = talisman.getNotMetLines(player) + + if (lines.isNotEmpty()) { + lore.add("") + lore.addAll(lines) + } + } + meta.lore = lore itemStack.itemMeta = meta } diff --git a/gradle.properties b/gradle.properties index 1e37102..f8f1772 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 5.47.0 +version = 5.48.0 plugin-name = Talismans \ No newline at end of file