From d7910262be0d6527d705c675f5da4691cf7bb60e Mon Sep 17 00:00:00 2001 From: Intelli Date: Tue, 8 Aug 2023 15:46:45 -0600 Subject: [PATCH] Added support for displaying lore in item tooltips (#420) --- .../utility/serialize/ItemMetaHandler.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java index 3b225df..33f66b7 100644 --- a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java +++ b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.Map.Entry; import org.bukkit.Bukkit; -import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.bukkit.attribute.Attribute; @@ -28,6 +27,7 @@ import org.bukkit.inventory.meta.SuspiciousStewMeta; import org.bukkit.potion.PotionEffect; import net.coreprotect.bukkit.BukkitAdapter; +import net.coreprotect.utility.Color; import net.coreprotect.utility.Util; public class ItemMetaHandler { @@ -96,7 +96,8 @@ public class ItemMetaHandler { public static List getEnchantments(ItemStack item, String displayName) { List result = new ArrayList<>(); - Map enchantments = getEnchantments(item.getItemMeta()); + ItemMeta itemMeta = item.getItemMeta(); + Map enchantments = getEnchantments(itemMeta); for (Entry entry : enchantments.entrySet()) { Enchantment enchantment = entry.getKey(); @@ -105,6 +106,12 @@ public class ItemMetaHandler { result.add(getEnchantmentName(enchantment, level)); } + if (itemMeta.hasLore()) { + for (String lore : itemMeta.getLore()) { + result.add(Color.DARK_PURPLE + Color.ITALIC + lore); + } + } + return result; } @@ -284,11 +291,11 @@ public class ItemMetaHandler { List> fadeList = new ArrayList<>(); List> list = new ArrayList<>(); - for (Color color : effect.getColors()) { + for (org.bukkit.Color color : effect.getColors()) { colorList.add(color.serialize()); } - for (Color color : effect.getFadeColors()) { + for (org.bukkit.Color color : effect.getFadeColors()) { fadeList.add(color.serialize()); }