SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2026-02-26 05:51:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.0.7 release, add color code legend on list all and remove dark gray

Browse Source
This commit is contained in:
PiggyPiglet
2026-02-20 20:33:26 +08:00
parent 0067540ec1
commit 3294a2517a
13 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java
View File

@@ -101,7 +101,7 @@ public final class PlaceholderCommandRouter extends AbstractCommand {
final PlaceholderCommand target = commands.get(search);
if (target == null) {
sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw(search).color(Color.GRAY)));
sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw(search).color(Color.LIGHT_GRAY)));
return CompletableFuture.completedFuture(null);
}

10
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloud.java
View File

@@ -78,9 +78,9 @@ public final class CommandECloud extends PlaceholderCommand {
if (params.isEmpty()) {
Message message = Message.empty()
.insert(Message.raw("PlaceholderAPI ").color(Color.CYAN).bold(true))
.insert(Message.raw("- ").color(Color.DARK_GRAY))
.insert(Message.raw("eCloud Help Menu ").color(Color.GRAY))
.insert(Message.raw("-\n").color(Color.DARK_GRAY));
.insert(Message.raw("- ").color(Color.GRAY))
.insert(Message.raw("eCloud Help Menu ").color(Color.LIGHT_GRAY))
.insert(Message.raw("-\n").color(Color.GRAY));
final List<String[]> commands = List.of(
new String[]{"ecloud status", "View status of the eCloud"},
@@ -96,7 +96,7 @@ public final class CommandECloud extends PlaceholderCommand {
for (String[] command : commands) {
message = message.insert(Message.raw("\n/papi ").color(Color.CYAN))
.insert(Message.raw(command[0]).color(Color.WHITE))
.insert(Message.raw("\n " + command[1]).color(Color.GRAY));
.insert(Message.raw("\n " + command[1]).color(Color.LIGHT_GRAY));
}
sender.sendMessage(message);
@@ -128,7 +128,7 @@ public final class CommandECloud extends PlaceholderCommand {
final PlaceholderCommand target = commands.get(search);
if (target == null) {
sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw("ecloud " + search).color(Color.GRAY)));
sender.sendMessage(Message.raw("Unknown command ").color(Color.RED).insert(Message.raw("ecloud " + search).color(Color.LIGHT_GRAY)));
// Msg.msg(sender, "&cUnknown command &7ecloud " + search);
return;
}

2
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloudDownload.java
View File

@@ -90,7 +90,7 @@ public final class CommandECloudDownload extends PlaceholderCommand {
if (version == null) {
sender.sendMessage(Message.raw("Could not find specified version: ").color(Color.RED)
.insert(Message.raw(params.get(0) + "\n").color(Color.WHITE))
.insert(Message.raw("Available versions: ").color(Color.GRAY))
.insert(Message.raw("Available versions: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(expansion.getAvailableVersions().toString()).color(Color.WHITE)));
// Msg.msg(sender,
// "&cCould not find specified version: &f" + params.get(1),

37
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java
View File

@@ -39,15 +39,14 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
private static final int PAGE_SIZE = 10;
@NotNull
private static final Function<CloudExpansion, String> EXPANSION_LATEST_VERSION =
@NotNull
private static final Function<CloudExpansion, String> EXPANSION_LATEST_VERSION =
CloudExpansion::getLatestVersion;
@NotNull
private static final Function<CloudExpansion, String> EXPANSION_CURRENT_VERSION =
@NotNull
private static final Function<CloudExpansion, String> EXPANSION_CURRENT_VERSION =
expansion -> PlaceholderAPIPlugin.instance().localExpansionManager()
.findExpansionByName(expansion.getName()).map(PlaceholderExpansion::getVersion)
.orElse("Unknown");
.findExpansionByName(expansion.getName()).map(PlaceholderExpansion::getVersion)
.orElse("Unknown");
@Unmodifiable
private static final Set<String> OPTIONS = Set.of("all", "installed");
@@ -105,7 +104,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
return title
.insert(Message.raw(" Page").color(Color.CYAN))
.insert(Message.raw(": ").color(Color.GRAY))
.insert(Message.raw(": ").color(Color.LIGHT_GRAY))
.insert(Message.raw(String.valueOf(page)).color(Color.GREEN));
}
@@ -118,7 +117,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
Message line = Message.empty();
final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1;
line = line.insert(Message.raw(expansionNumber + ". ").color(Color.DARK_GRAY));
line = line.insert(Message.raw(expansionNumber + ". ").color(Color.GRAY));
final Color expansionColour;
@@ -128,7 +127,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
if (expansion.hasExpansion()) {
expansionColour = Color.GREEN;
} else {
expansionColour = Color.GRAY;
expansionColour = Color.LIGHT_GRAY;
}
}
@@ -175,7 +174,17 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
// right.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page + 1)));
// }
message = message.insert(Message.raw(" - " + page + " of " + limit + " - ").color(Color.GREEN));
message = message
.insert(Message.raw(" - ").color(Color.LIGHT_GRAY))
.insert(Message.raw(page + " of " + limit).color(Color.GREEN))
.insert(Message.raw(" - ").color(Color.LIGHT_GRAY))
.insert(Message.raw("[").color(Color.GRAY))
.insert(Message.raw("Available").color(Color.LIGHT_GRAY))
.insert(Message.raw(", ").color(Color.GRAY))
.insert(Message.raw("Installed").color(Color.GREEN))
.insert(Message.raw(", ").color(Color.GRAY))
.insert(Message.raw("Update Available").color(Color.YELLOW))
.insert(Message.raw("]").color(Color.GRAY));
}
return message;
@@ -220,7 +229,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
message = message.insert(Message.raw("\n"));
final int separatorLength = Arrays.stream(widths).sum() + (columnCount * 2);
message = message.insert(Message.raw("-".repeat(separatorLength)).color(Color.DARK_GRAY));
message = message.insert(Message.raw("-".repeat(separatorLength)).color(Color.GRAY));
if (rows.size() > 1) {
message = message.insert(Message.raw("\n"));
@@ -232,10 +241,10 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
final Color nameColor = expansion.shouldUpdate()
? Color.YELLOW
: (expansion.hasExpansion() ? Color.GREEN : Color.GRAY);
: (expansion.hasExpansion() ? Color.GREEN : Color.LIGHT_GRAY);
final List<Color> rowColors = List.of(
Color.DARK_GRAY,
Color.GRAY,
nameColor,
Color.WHITE,
expansion.getVersion().isVerified() ? Color.GREEN : Color.RED,

4
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java
View File

@@ -75,7 +75,7 @@ public final class CommandECloudExpansionPlaceholders extends PlaceholderCommand
Message message = Message.raw(" ").color(Color.ORANGE)
.insert(Message.raw(String.valueOf(placeholders.size())).color(Color.ORANGE))
.insert(Message.raw(" placeholders: ").color(Color.GRAY));
.insert(Message.raw(" placeholders: ").color(Color.LIGHT_GRAY));
for (int i = 0; i < partitions.size(); i++) {
if (i == 0) {
@@ -86,7 +86,7 @@ public final class CommandECloudExpansionPlaceholders extends PlaceholderCommand
for (int j = 0; j < partition.size(); j++) {
message = message.insert(Message.raw(partition.get(j)).color(Color.GREEN));
if (j < partition.size() - 1) {
message = message.insert(Message.raw(", ").color(Color.GRAY));
message = message.insert(Message.raw(", ").color(Color.LIGHT_GRAY));
}
}

4
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloudStatus.java
View File

@@ -51,9 +51,9 @@ public final class CommandECloudStatus extends PlaceholderCommand {
Message message = Message.raw("There are ").color(Color.CYAN)
.insert(Message.raw(String.valueOf(expansionCount)).color(Color.GREEN))
.insert(Message.raw(" expansions available on the eCloud.\n").color(Color.CYAN))
.insert(Message.raw("A total of ").color(Color.GRAY))
.insert(Message.raw("A total of ").color(Color.LIGHT_GRAY))
.insert(Message.raw(String.valueOf(authorCount)).color(Color.WHITE))
.insert(Message.raw(" authors have contributed Hytale expansions to the eCloud.\n").color(Color.GRAY));
.insert(Message.raw(" authors have contributed Hytale expansions to the eCloud.\n").color(Color.LIGHT_GRAY));
if (updateCount > 0) {
message = message

12
src/main/java/at/helpch/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java
View File

@@ -90,14 +90,14 @@ public final class CommandECloudUpdate extends PlaceholderCommand {
return;
}
Message expansionList = Message.raw("[").color(Color.DARK_GRAY);
Message expansionList = Message.raw("[").color(Color.GRAY);
for (int i = 0; i < expansions.size(); i++) {
if (i > 0) {
expansionList = expansionList.insert(Message.raw(", ").color(Color.GRAY));
expansionList = expansionList.insert(Message.raw(", ").color(Color.LIGHT_GRAY));
}
expansionList = expansionList.insert(Message.raw(expansions.get(i).getName()).color(Color.ORANGE));
}
expansionList = expansionList.insert(Message.raw("]").color(Color.DARK_GRAY));
expansionList = expansionList.insert(Message.raw("]").color(Color.GRAY));
sender.sendMessage(Message.raw("Updating expansions: ").color(Color.GREEN)
.insert(expansionList));
@@ -124,13 +124,13 @@ public final class CommandECloudUpdate extends PlaceholderCommand {
.map(Optional::get)
.toList();
Message registeredMessage = Message.raw("Registered expansions:\n").color(Color.GRAY);
Message registeredMessage = Message.raw("Registered expansions:\n").color(Color.LIGHT_GRAY);
for (int i = 0; i < registered.size(); i++) {
final PlaceholderExpansion expansion = registered.get(i);
registeredMessage = registeredMessage
.insert(Message.raw(" ").color(Color.GRAY))
.insert(Message.raw(" ").color(Color.LIGHT_GRAY))
.insert(Message.raw(expansion.getName()).color(Color.GREEN))
.insert(Message.raw(" ").color(Color.GRAY))
.insert(Message.raw(" ").color(Color.LIGHT_GRAY))
.insert(Message.raw(expansion.getVersion()).color(Color.WHITE));
if (i < registered.size() - 1) {

10
src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandHelp.java
View File

@@ -48,12 +48,12 @@ public final class CommandHelp extends PlaceholderCommand {
// final PluginDescriptionFile description = plugin.getDescription();
final Message message = Message.raw("PlaceholderAPI ").color(Color.CYAN).bold(true)
.insert(Message.raw("- ").color(Color.DARK_GRAY).bold(false))
.insert(Message.raw("- ").color(Color.GRAY).bold(false))
.insert(Message.raw("Help Menu ").color(Color.WHITE).bold(false))
.insert(Message.raw("- ").color(Color.DARK_GRAY).bold(false))
.insert(Message.raw("(").color(Color.GRAY).bold(false))
.insert(Message.raw("- ").color(Color.GRAY).bold(false))
.insert(Message.raw("(").color(Color.LIGHT_GRAY).bold(false))
.insert(Message.raw(description.getVersion().toString()).color(Color.WHITE).bold(false))
.insert(Message.raw(")").color(Color.GRAY).bold(false))
.insert(Message.raw(")").color(Color.LIGHT_GRAY).bold(false))
.insert(Message.raw("\n"))
.insert(genCommandMsg("bcparse", "<me|--null|player name> <message>", "Parse a message with placeholders and broadcast it"))
.insert(genCommandMsg("cmdparse", "<me|player> <command with placeholders>", "Parse a message with relational placeholders"))
@@ -107,6 +107,6 @@ public final class CommandHelp extends PlaceholderCommand {
}
return message
.insert(Message.raw("\n " + description).color(Color.gray).bold(false));
.insert(Message.raw("\n " + description).color(Color.LIGHT_GRAY).bold(false));
}
}

16
src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandInfo.java
View File

@@ -59,15 +59,15 @@ public final class CommandInfo extends PlaceholderCommand {
}
Message message = Message.empty()
.insert(Message.raw("Placeholder expansion info for:").color(Color.GRAY))
.insert(Message.raw("Placeholder expansion info for:").color(Color.LIGHT_GRAY))
.insert(Message.raw(expansion.getName() + "\n").color(Color.WHITE))
.insert(Message.raw("Status: ").color(Color.GRAY))
.insert(Message.raw("Status: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(expansion.isRegistered() ? "Registered" : "Not Registered").color(expansion.isRegistered() ? Color.GREEN : Color.RED))
.insert("\n");
final String author = expansion.getAuthor();
if (author != null) {
message = message.insert(Message.raw("Author: ").color(Color.GRAY))
message = message.insert(Message.raw("Author: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(author + "\n").color(Color.WHITE));
// builder.append("&7Author: &r")
// .append(author)
@@ -76,7 +76,7 @@ public final class CommandInfo extends PlaceholderCommand {
final String version = expansion.getVersion();
if (version != null) {
message = message.insert(Message.raw("Version: ").color(Color.GRAY))
message = message.insert(Message.raw("Version: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(version + "\n").color(Color.WHITE));
// builder.append("&7Version: &r")
@@ -86,7 +86,7 @@ public final class CommandInfo extends PlaceholderCommand {
final String requiredPlugin = expansion.getRequiredPlugin();
if (requiredPlugin != null) {
message = message.insert(Message.raw("Requires plugin: ").color(Color.GRAY))
message = message.insert(Message.raw("Requires plugin: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(requiredPlugin + '\n').color(Color.WHITE));
// builder.append("&7Requires plugin: &r")
@@ -96,9 +96,9 @@ public final class CommandInfo extends PlaceholderCommand {
final List<String> placeholders = expansion.getPlaceholders();
if (placeholders != null && !placeholders.isEmpty()) {
message = message.insert(Message.raw("-- ").color(Color.DARK_GRAY))
.insert(Message.raw("Placeholders ").color(Color.GRAY))
.insert(Message.raw("--\n").color(Color.DARK_GRAY));
message = message.insert(Message.raw("-- ").color(Color.GRAY))
.insert(Message.raw("Placeholders ").color(Color.LIGHT_GRAY))
.insert(Message.raw("--\n").color(Color.GRAY));
// builder.append("&8&m-- &7Placeholders &8&m--&r")
// .append('\n');

6
src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandList.java
View File

@@ -58,9 +58,9 @@ public final class CommandList extends PlaceholderCommand {
// final List<List<String>> partitions = Lists
// .partition(identifiers.stream().sorted().collect(Collectors.toList()), 10);
Message message = Message.raw("A total of ").color(Color.GRAY)
Message message = Message.raw("A total of ").color(Color.LIGHT_GRAY)
.insert(Message.raw(identifiers.size() + " ").color(Color.WHITE))
.insert(Message.raw("placeholder hook(s) are active: ").color(Color.GRAY));
.insert(Message.raw("placeholder hook(s) are active: ").color(Color.LIGHT_GRAY));
for (int i = 0; i < partitions.size(); ++i) {
final List<String> partition = partitions.get(i);
@@ -69,7 +69,7 @@ public final class CommandList extends PlaceholderCommand {
message = message.insert(Message.raw(partition.get(j)).color(Color.GREEN));
if (j != partition.size() - 1) {
message = message.insert(Message.raw(", ").color(Color.GRAY));
message = message.insert(Message.raw(", ").color(Color.LIGHT_GRAY));
}
}

10
src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandParse.java
View File

@@ -98,7 +98,7 @@ public final class CommandParse extends PlaceholderCommand {
sender.sendMessage(Message.raw("You must provide a target and a message: ").color(Color.RED)
.insert(Message.raw("/papi ").color(Color.CYAN))
.insert(Message.raw(command ? "cmdparse" : (broadcast ? "bcparse" : "parse")).color(Color.CYAN))
.insert(Message.raw(" {target}").color(Color.GRAY))
.insert(Message.raw(" {target}").color(Color.LIGHT_GRAY))
.insert(Message.raw(" {message}").color(Color.GREEN)));
return;
}
@@ -107,7 +107,7 @@ public final class CommandParse extends PlaceholderCommand {
if ("me".equalsIgnoreCase(params.getFirst())) {
if (!(sender instanceof Player) && !(sender instanceof PlayerRef)) {
sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.GRAY)).insert(Message.raw(" as a target!").color(Color.RED)));
sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.LIGHT_GRAY)).insert(Message.raw(" as a target!").color(Color.RED)));
return;
}
@@ -148,7 +148,7 @@ public final class CommandParse extends PlaceholderCommand {
if (params.size() < 3) {
sender.sendMessage(Message.raw("You must supply two targets, and a message: ").color(Color.RED)
.insert(Message.raw("/papi parserel ").color(Color.CYAN))
.insert(Message.raw("{target one} {target two} ").color(Color.GRAY))
.insert(Message.raw("{target one} {target two} ").color(Color.LIGHT_GRAY))
.insert(Message.raw("{message}").color(Color.GREEN)));
return;
}
@@ -158,7 +158,7 @@ public final class CommandParse extends PlaceholderCommand {
if ("me".equalsIgnoreCase(params.get(0))) {
if (!(sender instanceof Player) && !(sender instanceof PlayerRef)) {
sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED)
.insert(Message.raw("me").color(Color.GRAY))
.insert(Message.raw("me").color(Color.LIGHT_GRAY))
.insert(Message.raw(" as a target!").color(Color.RED)));
return;
}
@@ -181,7 +181,7 @@ public final class CommandParse extends PlaceholderCommand {
if ("me".equalsIgnoreCase(params.get(1))) {
if (!(sender instanceof Player) && !(sender instanceof PlayerRef)) {
sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.GRAY)).insert(Message.raw(" as a target!").color(Color.RED)));
sender.sendMessage(Message.raw("You must be a player to use ").color(Color.RED).insert(Message.raw("me").color(Color.LIGHT_GRAY)).insert(Message.raw(" as a target!").color(Color.RED)));
return;
}

10
src/main/java/at/helpch/placeholderapi/commands/impl/local/CommandVersion.java
View File

@@ -49,15 +49,15 @@ public final class CommandVersion extends PlaceholderCommand {
sender.sendMessage(Message.empty()
.insert(Message.raw("PlaceholderAPI ").color(Color.CYAN).bold(true))
.insert(Message.raw("(").color(Color.GRAY))
.insert(Message.raw("(").color(Color.LIGHT_GRAY))
.insert(Message.raw(description.getVersion().toString()).color(Color.WHITE))
.insert(Message.raw(")").color(Color.GRAY))
.insert(Message.raw("\nAuthor: ").color(Color.GRAY))
.insert(Message.raw(")").color(Color.LIGHT_GRAY))
.insert(Message.raw("\nAuthor: ").color(Color.LIGHT_GRAY))
.insert(Message.raw(description.getAuthors().stream().map(AuthorInfo::getName).collect(Collectors.joining(", "))).color(Color.WHITE))
.insert(Message.raw("\nPAPI Commands: ").color(Color.GRAY))
.insert(Message.raw("\nPAPI Commands: ").color(Color.LIGHT_GRAY))
.insert(Message.raw("/papi ").color(Color.CYAN))
.insert(Message.raw("help").color(Color.WHITE))
.insert(Message.raw("\neCloud Commands: ").color(Color.GRAY))
.insert(Message.raw("\neCloud Commands: ").color(Color.LIGHT_GRAY))
.insert(Message.raw("/papi ").color(Color.CYAN))
.insert(Message.raw("ecloud").color(Color.WHITE)));