mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Changed it again

Browse Source
This commit is contained in:
Alex Mercer 2019-09-08 06:22:15 -07:00
parent 22fcb992fd
commit ead25ceaac
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
View File

@ -50,6 +50,7 @@ public class SlimefunItem {
private boolean replacing = false; private boolean replacing = false;
private boolean addon = false; private boolean addon = false;
private String permission = ""; private String permission = "";
private List<String> noPermissionTooltip;
private Set<ItemHandler> itemhandlers = new HashSet<>(); private Set<ItemHandler> itemhandlers = new HashSet<>();
private boolean ticking = false; private boolean ticking = false;
private BlockTicker blockTicker; private BlockTicker blockTicker;
@ -178,6 +179,7 @@ public class SlimefunItem {
* @since 4.1.11 * @since 4.1.11
*/ */
public String getPermission() { return permission; } public String getPermission() { return permission; }
public List<String> getNoPermissionTooltip() { return noPermissionTooltip; }
public Set<ItemHandler> getHandlers() { return itemhandlers; } public Set<ItemHandler> getHandlers() { return itemhandlers; }
public boolean isTicking() { return ticking; } public boolean isTicking() { return ticking; }
/** /**
@ -244,6 +246,7 @@ public class SlimefunItem {
this.enchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-enchanting"); this.enchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-enchanting");
this.disenchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-disenchanting"); this.disenchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-disenchanting");
this.permission = SlimefunPlugin.getItemCfg().getString(this.id + ".required-permission"); this.permission = SlimefunPlugin.getItemCfg().getString(this.id + ".required-permission");
this.noPermissionTooltip = SlimefunPlugin.getItemCfg().getStringList(this.id + ".permission-message");
SlimefunPlugin.getUtilities().enabledItems.add(this); SlimefunPlugin.getUtilities().enabledItems.add(this);
if (slimefun) SlimefunPlugin.getUtilities().vanillaItems++; if (slimefun) SlimefunPlugin.getUtilities().vanillaItems++;
SlimefunPlugin.getUtilities().itemIDs.put(this.id, this); SlimefunPlugin.getUtilities().itemIDs.put(this.id, this);
@ -337,6 +340,15 @@ public class SlimefunItem {
return null; return null;
} }
public static List<String> getNoPermissionTooltip(ItemStack item) {
for (SlimefunItem i: SlimefunPlugin.getUtilities().allItems) {
if (i.isItem(item)) {
return i.noPermissionTooltip;
}
}
return null;
}
public boolean isItem(ItemStack item) { public boolean isItem(ItemStack item) {
if (item == null) return false; if (item == null) return false;
if (this instanceof ChargableItem && SlimefunManager.isItemSimiliar(item, this.item, false)) return true; if (this instanceof ChargableItem && SlimefunManager.isItemSimiliar(item, this.item, false)) return true;

2
src/me/mrCookieSlime/Slimefun/SlimefunGuide.java
View File

@ -713,7 +713,7 @@ public final class SlimefunGuide {
index++; index++;
} }
else { else {
List<String> message = SlimefunPlugin.getItemCfg().getStringList(sfitem.getID() + ".permission-message"); List<String> message = SlimefunItem.getNoPermissionTooltip(sfitem.getItem());
menu.addItem(index, new CustomItem(Material.BARRIER, StringUtils.formatItemName(sfitem.getItem(), false), message.toArray(new String[message.size()]))); 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); menu.addMenuClickHandler(index, (pl, slot, item, action) -> false);
index++; index++;