zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Lookup command correctly in /vsu ci

Browse source
This commit is contained in:
Frank van der Heijden 2021-07-21 01:19:28 +02:00
parent 13d27e81dd
commit 6c5c298195
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Velocity/src/main/java/net/frankheijden/serverutils/velocity/commands/CommandServerUtils.java
View file

@ -260,7 +260,7 @@ public class CommandServerUtils extends BaseCommand {
FormatBuilder builder = FormatBuilder.create(format) FormatBuilder builder = FormatBuilder.create(format)
.orderedKeys("%key%", "%value%") .orderedKeys("%key%", "%value%")
.add("Name", node.getName()) .add("Name", node.getName())
.add("Plugin", "<UNKNOWN>"); // TODO: fix plugin command .add("Plugin", plugin.getPluginCommandManager().findPluginId(command).orElse("<UNKNOWN>"));
builder.sendTo(sender); builder.sendTo(sender);
Messenger.sendMessage(sender, "serverutils.commandinfo.footer"); Messenger.sendMessage(sender, "serverutils.commandinfo.footer");

13
Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginCommandManager.java
View file

@ -12,6 +12,7 @@ import java.nio.file.Path;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public class VelocityPluginCommandManager { public class VelocityPluginCommandManager {
@ -41,6 +42,18 @@ public class VelocityPluginCommandManager {
return manager; return manager;
} }
/**
* Attempts to find the plugin id for a given command alias.
*/
public Optional<String> findPluginId(String alias) {
for (Map.Entry<String, String> entry : pluginCommands.entries()) {
if (alias.equals(entry.getValue())) {
return Optional.of(entry.getKey());
}
}
return Optional.empty();
}
public Multimap<String, String> getPluginCommands() { public Multimap<String, String> getPluginCommands() {
return pluginCommands; return pluginCommands;
} }