diff --git a/pom.xml b/pom.xml index 699e04a..01b9382 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHeads 4.0.0 - 3.2.11 + 3.2.12 clean install EpicHeads-${project.version} diff --git a/src/main/java/com/songoda/epicheads/gui/GUIHeads.java b/src/main/java/com/songoda/epicheads/gui/GUIHeads.java index e596251..6599645 100644 --- a/src/main/java/com/songoda/epicheads/gui/GUIHeads.java +++ b/src/main/java/com/songoda/epicheads/gui/GUIHeads.java @@ -238,6 +238,7 @@ public class GUIHeads extends Gui { ChatPrompt.showPrompt(plugin, player, plugin.getLocale().getMessage("general.search.global").getPrefixedMessage(), response -> { List searchHeads = plugin.getHeadManager().getHeads().stream() .filter(head -> head.getName().toLowerCase().contains(response.getMessage().toLowerCase())) + .filter(head -> player.hasPermission("epicheads.category." + head.getCategory().getName().replace(" ", "_"))) .collect(Collectors.toList()); Bukkit.getScheduler().scheduleSyncDelayedTask(EpicHeads.getInstance(), () -> guiManager.showGUI(player, new GUIHeads(plugin, player, response.getMessage(), QueryTypes.SEARCH, searchHeads)), 0L); diff --git a/src/main/java/com/songoda/epicheads/head/Head.java b/src/main/java/com/songoda/epicheads/head/Head.java index 34c1a0f..7a856a2 100644 --- a/src/main/java/com/songoda/epicheads/head/Head.java +++ b/src/main/java/com/songoda/epicheads/head/Head.java @@ -1,6 +1,7 @@ package com.songoda.epicheads.head; import com.songoda.core.compatibility.CompatibleMaterial; +import com.songoda.core.hooks.EconomyManager; import com.songoda.core.utils.ItemUtils; import com.songoda.epicheads.EpicHeads; import com.songoda.epicheads.settings.Settings; @@ -100,9 +101,13 @@ public class Head { lore.add(plugin.getLocale().getMessage("general.head.staffpicked").getMessage()); lore.add(plugin.getLocale().getMessage("general.head.id") .processPlaceholder("id", this.id).getMessage()); - if (!free) + if (!free) { + String fcost = Settings.ECONOMY_PLUGIN.getString().equalsIgnoreCase("item") + ? cost + " " + Settings.ITEM_TOKEN_TYPE.getString() + : EconomyManager.formatEconomy(cost); lore.add(plugin.getLocale().getMessage("general.head.cost") - .processPlaceholder("cost", cost).getMessage()); + .processPlaceholder("cost", fcost).getMessage()); + } return lore; } diff --git a/src/main/resources/en_US.lang b/src/main/resources/en_US.lang index 8eaedbd..4e0ca31 100644 --- a/src/main/resources/en_US.lang +++ b/src/main/resources/en_US.lang @@ -20,7 +20,7 @@ general: head: staffpicked: '&8Staff Favorite' id: '&8ID: &7%id%' - cost: '&8Cost: &7$%cost%' + cost: '&8Cost: &7%cost%' gui: heads: refine: '&9Refine Search'