diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt index 389dd35681..a14114d803 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt @@ -78,10 +78,10 @@ class EnchantDisplay(private val plugin: EcoEnchantsPlugin) : DisplayModule(plug val enchantLevel = enchant.getLevel(level) val holder = ItemProvidedHolder(enchantLevel, itemStack) - val enchantNotMetLines = enchantLevel.conditions.getNotMetLines(player, holder).map { Display.PREFIX + it } + val enchantNotMetLines = holder.getNotMetLines(player).map { Display.PREFIX + it } notMetLines.addAll(enchantNotMetLines) - if (enchantNotMetLines.isNotEmpty() || enchantLevel.conditions.isShowingAnyNotMet(player, holder)) { + if (enchantNotMetLines.isNotEmpty() || holder.isShowingAnyNotMet(player)) { showNotMet = true } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantmentFormatting.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantmentFormatting.kt index af73817484..a122a89692 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantmentFormatting.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantmentFormatting.kt @@ -25,7 +25,8 @@ object DisplayCache { data class DisplayableEnchant( val enchant: EcoEnchantLike, - val level: Int + val level: Int, + val showNotMet: Boolean = false ) @JvmOverloads @@ -35,7 +36,7 @@ fun EcoEnchantLike.getFormattedName( ): String { val plugin = EcoEnchantsPlugin.instance - return DisplayCache.nameCache.get(DisplayableEnchant(this, level)) { + return DisplayCache.nameCache.get(DisplayableEnchant(this, level, showNotMet)) { val numerals = plugin.configYml.getBool("display.numerals.enabled") && level <= plugin.configYml.getInt("display.numerals.threshold") diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index 42113918c3..4dbae1fb2e 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -72,7 +72,7 @@ display: enabled: true # If enchantments should be collapsed in lore threshold: 9 # Above this amount, enchantments will be collapsed per-line: 2 # The amount of enchantments to put in each line - delimiter: ", " # The delimiter between enchantments + delimiter: ",&r " # The delimiter between enchantments descriptions: enabled: true # If enchantment descriptions should be shown in lore diff --git a/gradle.properties b/gradle.properties index ecc8857028..ebe0ebc3e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Fri Nov 10 13:59:43 GMT 2023 +#Sat Nov 11 17:59:12 GMT 2023 kotlin.code.style=official -libreforge-version=4.41.0 -version=10.43.0 +libreforge-version=4.42.0 +version=10.44.0