Apply placeholders on custom GUI items (closes #235, closes #246)

3 files changed, 8 insertions, 4 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java
index e6f1335e..d924a71f 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java
@@ -51,7 +51,7 @@ public class CategoryQMenu implements QMenu {
                 MenuElement menuElement;
                 if (config.getConfig().contains("custom-elements.categories." + s + ".display")) {
                     ItemStack is = config.getItem("custom-elements.categories." + s + ".display");
-                    menuElement = new CustomMenuElement(is);
+                    menuElement = new CustomMenuElement(plugin, owner.getPlayerUUID(), is);
                 } else if (config.getBoolean("custom-elements.categories." + s + ".spacer", false)) {
                     menuElement = new SpacerMenuElement();
                 } else continue; // user = idiot
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
index d4e6d5ce..1387cd44 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
@@ -68,7 +68,7 @@ public class QuestQMenu implements QMenu {
                 MenuElement menuElement;
                 if (plugin.getConfig().contains(path + "." + s + ".display")) {
                     ItemStack is = plugin.getConfiguredItemStack(path + "." + s + ".display", plugin.getConfig());
-                    menuElement = new CustomMenuElement(is);
+                    menuElement = new CustomMenuElement(plugin, owner.getPlayerUUID(), is);
                 } else if (plugin.getConfig().getBoolean(path + "." + s + ".spacer", false)) {
                     menuElement = new SpacerMenuElement();
                 } else continue; // user = idiot
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/CustomMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/CustomMenuElement.java
index f5874d35..440ac217 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/CustomMenuElement.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/CustomMenuElement.java
@@ -1,13 +1,17 @@
 package com.leonardobishop.quests.bukkit.menu.element;
 
+import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
+import com.leonardobishop.quests.bukkit.util.MenuUtils;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.UUID;
+
 public class CustomMenuElement extends MenuElement{
 
     private final ItemStack itemStack;
 
-    public CustomMenuElement(ItemStack itemStack) {
-        this.itemStack = itemStack;
+    public CustomMenuElement(BukkitQuestsPlugin plugin, UUID owner, ItemStack itemStack) {
+        this.itemStack = MenuUtils.applyPlaceholders(plugin, owner, itemStack);
     }
 
     @Override