Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
12 changes: 12 additions & 0 deletions src/main/java/ch/njol/skript/command/CommandUsage.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import ch.njol.skript.lang.VariableString;
import ch.njol.skript.util.Utils;
import net.kyori.adventure.text.Component;
import org.bukkit.event.Event;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.bukkit.text.TextComponentParser;

/**
* Holds info about the usage of a command.
Expand Down Expand Up @@ -63,6 +65,16 @@ public String getUsage(@Nullable Event event) {
return defaultUsage;
}

/**
* @param event The event used to evaluate the usage message.
* @return The evaluated usage message as an Adventure {@link Component} with
* Skript color tags ({@code <red>}, {@code &c}, etc.) parsed into real
* chat formatting via {@link TextComponentParser#parseSafe(Object)}.
*/
public Component getUsageComponent(@Nullable Event event) {
return TextComponentParser.instance().parseSafe(getUsage(event));
Comment thread
APickledWalrus marked this conversation as resolved.
Outdated
}

@Override
public String toString() {
return getUsage();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/command/ScriptCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ boolean execute2(final ScriptCommandEvent event, final CommandSender sender, fin
final LogEntry e = log.getError();
if (e != null)
sender.sendMessage(ChatColor.DARK_RED + e.toString());
sender.sendMessage(usage.getUsage(event));
sender.sendMessage(usage.getUsageComponent(event));
log.clear();
return false;
}
Expand Down