diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index 9f66b8d2d..de02095c7 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -50,6 +50,7 @@ public class SlimefunItem { private boolean replacing = false; private boolean addon = false; private String permission = ""; + private List noPermissionTooltip; private Set itemhandlers = new HashSet<>(); private boolean ticking = false; private BlockTicker blockTicker; @@ -178,6 +179,7 @@ public class SlimefunItem { * @since 4.1.11 */ public String getPermission() { return permission; } + public List getNoPermissionTooltip() { return noPermissionTooltip; } public Set getHandlers() { return itemhandlers; } public boolean isTicking() { return ticking; } /** @@ -244,6 +246,7 @@ public class SlimefunItem { this.enchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-enchanting"); this.disenchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-disenchanting"); this.permission = SlimefunPlugin.getItemCfg().getString(this.id + ".required-permission"); + this.noPermissionTooltip = SlimefunPlugin.getItemCfg().getStringList(this.id + ".permission-message"); SlimefunPlugin.getUtilities().enabledItems.add(this); if (slimefun) SlimefunPlugin.getUtilities().vanillaItems++; SlimefunPlugin.getUtilities().itemIDs.put(this.id, this); @@ -337,6 +340,15 @@ public class SlimefunItem { return null; } + public static List getNoPermissionTooltip(ItemStack item) { + for (SlimefunItem i: SlimefunPlugin.getUtilities().allItems) { + if (i.isItem(item)) { + return i.noPermissionTooltip; + } + } + return null; + } + public boolean isItem(ItemStack item) { if (item == null) return false; if (this instanceof ChargableItem && SlimefunManager.isItemSimiliar(item, this.item, false)) return true; diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 20a378032..9f31df0da 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -713,7 +713,7 @@ public final class SlimefunGuide { index++; } else { - List message = SlimefunPlugin.getItemCfg().getStringList(sfitem.getID() + ".permission-message"); + List message = SlimefunItem.getNoPermissionTooltip(sfitem.getItem()); menu.addItem(index, new CustomItem(Material.BARRIER, StringUtils.formatItemName(sfitem.getItem(), false), message.toArray(new String[message.size()]))); menu.addMenuClickHandler(index, (pl, slot, item, action) -> false); index++;