From 46a56ab29265629b6d2e708f6c38f06e9c46eccf Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 29 Apr 2023 17:19:58 +0100 Subject: [PATCH] libreforge-updater --- build.gradle.kts | 2 +- .../kotlin/com/willfp/ecoitems/display/ItemsDisplay.kt | 10 ++++++++-- gradle.properties | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 70204c0..1ca3469 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ allprojects { } dependencies { - compileOnly("com.willfp:eco:6.55.0") + compileOnly("com.willfp:eco:6.56.0") compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10") } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/display/ItemsDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/display/ItemsDisplay.kt index 7e0dfa1..80a0749 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/display/ItemsDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoitems/display/ItemsDisplay.kt @@ -5,6 +5,7 @@ import com.willfp.eco.core.display.Display import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayPriority import com.willfp.eco.core.fast.FastItemStack +import com.willfp.eco.core.placeholder.context.placeholderContext import com.willfp.eco.util.StringUtils import com.willfp.eco.util.formatEco import com.willfp.ecoitems.items.ItemUtils @@ -26,7 +27,12 @@ class ItemsDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LO val itemFast = FastItemStack.wrap(ecoItem.itemStack) - val lore = ecoItem.lore.map { "${Display.PREFIX}${StringUtils.format(it, player)}" }.toMutableList() + val context = placeholderContext( + player = player, + item = itemStack + ) + + val lore = ecoItem.lore.map { "${Display.PREFIX}${StringUtils.format(it, context)}" }.toMutableList() if (player != null) { val lines = ecoItem.conditions.getNotMetLines(player, provided).map { Display.PREFIX + it } @@ -39,7 +45,7 @@ class ItemsDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LO lore.addAll(fis.lore) - fis.displayName = ecoItem.displayName.formatEco(player, true) + fis.displayName = ecoItem.displayName.formatEco(context) fis.addItemFlags(*itemFast.itemFlags.toTypedArray()) fis.lore = lore } diff --git a/gradle.properties b/gradle.properties index ee78aab..3cb1423 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Tue Apr 25 16:06:41 BST 2023 +#Sat Apr 29 17:19:58 BST 2023 kotlin.code.style=official -libreforge-version=4.6.0 -version=4.6.0 +libreforge-version=4.7.0 +version=4.7.0