Skip to content

Commit

Permalink
ex command tab completion
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Oct 28, 2019
1 parent 6ea2990 commit 9a0bd6c
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 21 deletions.
23 changes: 13 additions & 10 deletions plugin/src/main/java/com/denizenscript/denizen/Denizen.java
View file
Expand Up @@ -407,7 +407,8 @@ public void onEnable() {
supportsPaper = false;
Debug.echoError(ex);
}
new ExCommandHandler().enableFor(getCommand("ex"));
ExCommandHandler exCommand = new ExCommandHandler();
exCommand.enableFor(getCommand("ex"));

// Load script files without processing.
DenizenCore.preloadScripts();
Expand All @@ -419,10 +420,12 @@ public void onEnable() {
ServerPrestartScriptEvent.instance.specialHackRunEvent();

// Run everything else on the first server tick
getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
@Override
public void run() {
try {
exCommand.processTagList();

// Process script files (events, etc).
DenizenCore.postLoadScripts();

Expand All @@ -441,21 +444,21 @@ public void run() {
Debug.echoError("Don't screw with bad config values.");
Bukkit.shutdown();
}

Bukkit.getScheduler().scheduleSyncRepeatingTask(Denizen.this, new Runnable() {
@Override
public void run() {
Debug.outputThisTick = 0;
DenizenCore.tick(50); // Sadly, minecraft has no delta timing, so a tick is always 50ms.
}
}, 1, 1);
}
catch (Exception e) {
Debug.echoError(e);
}
}
}, 1);

getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
@Override
public void run() {
Debug.outputThisTick = 0;
DenizenCore.tick(50); // Sadly, minecraft has no delta timing, so a tick is always 50ms.
}
}, 1, 1);

new BukkitRunnable() {
@Override
public void run() {
Expand Down
125 changes: 114 additions & 11 deletions plugin/src/main/java/com/denizenscript/denizen/utilities/command/ExCommandHandler.java
View file
Expand Up @@ -7,23 +7,30 @@
import com.denizenscript.denizen.utilities.debugging.Debug;
import com.denizenscript.denizen.utilities.depends.Depends;
import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
import com.denizenscript.denizencore.DenizenCore;
import com.denizenscript.denizencore.objects.ArgumentHelper;
import com.denizenscript.denizencore.objects.ObjectFetcher;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.properties.PropertyParser;
import com.denizenscript.denizencore.scripts.ScriptBuilder;
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
import com.denizenscript.denizencore.scripts.queues.core.InstantQueue;
import com.denizenscript.denizencore.tags.TagManager;
import com.denizenscript.denizencore.utilities.CoreUtilities;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.*;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;

public class ExCommandHandler implements CommandExecutor {
public class ExCommandHandler implements CommandExecutor, TabCompleter {

public void enableFor(PluginCommand command) {
command.setExecutor(this);
command.setTabCompleter(this);
}

@Override
Expand Down Expand Up @@ -52,19 +59,16 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
// Examples:
// /ex narrate player:p@NLBlackEagle 'Your health is <player.health.formatted>.'
// /ex walk npc:n@fred <player.location.cursor_on>

//
// -->

if (cmdName.equalsIgnoreCase("ex")) {
List<Object> entries = new ArrayList<>();
String entry = String.join(" ", args);
boolean quiet = false;
boolean quiet = !Settings.showExDebug();
if (entry.length() > 3 && entry.startsWith("-q ")) {
quiet = true;
entry = entry.substring("-q ".length());
}
if (!Settings.showExDebug()) {
quiet = !quiet;
entry = entry.substring("-q ".length());
}

if (entry.length() < 2) {
Expand Down Expand Up @@ -102,4 +106,103 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
}
return false;
}

public HashSet<String> allTagsEver = new HashSet<>();

public void processTagList() {
allTagsEver.clear();
for (ObjectFetcher.ObjectType<? extends ObjectTag> type : ObjectFetcher.objectsByClass.values()) {
if (type.tagProcessor == null) {
continue;
}
allTagsEver.addAll(type.tagProcessor.registeredObjectTags.keySet());
}
for (PropertyParser.ClassPropertiesInfo properties : PropertyParser.propertiesByClass.values()) {
allTagsEver.addAll(properties.propertiesByTag.keySet());
}
}

@Override
public List<String> onTabComplete(CommandSender sender, Command cmd, String cmdName, String[] rawArgs) {
if (!cmdName.equalsIgnoreCase("ex") || !sender.hasPermission("denizen.ex")) {
return null;
}
String entry = String.join(" ", rawArgs);
if (entry.length() > 3 && entry.startsWith("-q ")) {
entry = entry.substring("-q ".length());
}
String[] args = ArgumentHelper.buildArgs(entry);
boolean isNewArg = rawArgs.length == 0 || rawArgs[rawArgs.length - 1].isEmpty();
boolean isCommandArg = args.length == 0 || (args.length == 1 && !isNewArg) || args[args.length - (isNewArg ? 1 : 2)].equals("-");
if (isCommandArg) {
if (isNewArg || args.length == 0) {
return new ArrayList<>(DenizenCore.getCommandRegistry().instances.keySet());
}
ArrayList<String> output = new ArrayList<>();
String startOfName = CoreUtilities.toLowerCase(args[args.length - 1]);
for (String command : DenizenCore.getCommandRegistry().instances.keySet()) {
if (command.startsWith(startOfName)) {
output.add(command);
}
}
return output;
}
if (!isNewArg) {
String lastArg = rawArgs[rawArgs.length - 1];
int tagStartIndex = lastArg.lastIndexOf('<');
if (tagStartIndex > lastArg.lastIndexOf('>')) {
String actualTag = lastArg.substring(tagStartIndex + 1);
String beforeTag = lastArg.substring(0, tagStartIndex + 1);
if (!actualTag.contains("[") && !actualTag.contains(".")) {
String tagText = CoreUtilities.toLowerCase(actualTag);
ArrayList<String> output = new ArrayList<>();
for (String tagBase : TagManager.properTagBases) {
if (tagBase.startsWith(tagText)) {
output.add(beforeTag + tagBase);
}
}
return output;
}
int lastDot = actualTag.lastIndexOf('.');
if (lastDot <= 0) {
return new ArrayList<>();
}
beforeTag += actualTag.substring(0, lastDot + 1);
String lastPart = CoreUtilities.toLowerCase(actualTag.substring(lastDot + 1));
if (lastPart.contains("[") || lastPart.isEmpty()) {
return new ArrayList<>();
}
ArrayList<String> output = new ArrayList<>();
for (String singleTag : allTagsEver) {
if (singleTag.startsWith(lastPart)) {
output.add(beforeTag + singleTag);
}
}
return output;
}

}
AbstractCommand dcmd = DenizenCore.getCommandRegistry().get(args[0]);
for (int i = args.length - 2; i >= 0; i--) {
if (args[i].equals("-")) {
dcmd = DenizenCore.getCommandRegistry().get(args[i + 1]);
}
}
if (dcmd == null) {
return null;
}
String lowArg = CoreUtilities.toLowerCase(rawArgs[rawArgs.length - 1]);
ArrayList<String> output = new ArrayList<>();
for (String flat : dcmd.getOptions().flatArgs) {
if (flat.startsWith(lowArg)) {
output.add(flat);
}
}
for (String prefix : dcmd.getOptions().prefixes) {
if (prefix.startsWith(lowArg)) {
output.add(prefix + ":");
}
}
return output;
}
}

0 comments on commit 9a0bd6c

Please sign in to comment.