Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/main/java/net/greenwoodmc/helpcommand/commands/help.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
Expand All @@ -29,8 +30,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String s, String[] a
}

Player player = (Player) sender;
String ver;
String ver2;
String pageText = config.getString("pagePrompt.page");
Pattern pattern = Pattern.compile("\\$\\[(.*?)\\]");
Matcher matcherPageText = pattern.matcher(pageText);
Expand Down Expand Up @@ -60,9 +59,22 @@ public boolean onCommand(CommandSender sender, Command cmd, String s, String[] a

if (currPageNumber >= 1 && currPageNumber <= lastPage) {
if (enabledPages.contains(currPageNumber)) {
ver = config.getStringList("help." + currPageNumber).stream().collect(Collectors.joining("\n"));
ver2 = papiInstalled ? PlaceholderAPI.setPlaceholders(player, ver) : ver;
player.sendMessage(TextUtil.color(ver2));
for (String line : config.getStringList("help." + currPageNumber)) {
if (papiInstalled) {
line = PlaceholderAPI.setPlaceholders(player, line);
}
String processed = TextUtil.color(line);
Matcher m = Pattern.compile("/([\\w-]+(?:\\s+[\\w-]+)*)").matcher(processed);
if (m.find()) {
TextComponent tc = new TextComponent(processed);
tc.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, m.group(0)));
tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
new ComponentBuilder("\u00a7aClick to run \u00a7f" + m.group(0)).create()));
player.spigot().sendMessage(tc);
} else {
player.sendMessage(processed);
}
}

if (pagePromptEnabled && enabledPages.size() > 1) { // Only show page prompt if more than one page
ComponentBuilder pagePromptBuilder = new ComponentBuilder();
Expand Down