mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-21 05:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Linked tab completion to implementation on Bukkit

Browse Source
This commit is contained in:
Risto Lahtela 2020-09-09 13:34:33 +03:00
parent b67eea951d
commit 5d6ec8f159
3 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
View File

@ -157,7 +157,7 @@ public class Plan extends BukkitPlugin implements PlanPlugin {
logger.warn("Attempted to register '" + name + "'-command, but it is not in plugin.yml!");
continue;
}
registering.setExecutor(new BukkitCommand(runnableFactory, command));
registering.setExecutor(new BukkitCommand(runnableFactory, system.getErrorLogger(), command));
}
}

47
Plan/bukkit/src/main/java/com/djrapitops/plan/commands/use/BukkitCommand.java
View File

@ -16,20 +16,30 @@
*/
package com.djrapitops.plan.commands.use;
import com.djrapitops.plan.utilities.logging.ErrorContext;
import com.djrapitops.plan.utilities.logging.ErrorLogger;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
public class BukkitCommand implements CommandExecutor {
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class BukkitCommand implements CommandExecutor, TabCompleter {
private final RunnableFactory runnableFactory;
private final ErrorLogger errorLogger;
private final Subcommand command;
public BukkitCommand(RunnableFactory runnableFactory, Subcommand command) {
public BukkitCommand(RunnableFactory runnableFactory, ErrorLogger errorLogger, Subcommand command) {
this.runnableFactory = runnableFactory;
this.errorLogger = errorLogger;
this.command = command;
}
@ -38,13 +48,38 @@ public class BukkitCommand implements CommandExecutor {
runnableFactory.create("", new AbsRunnable() {
@Override
public void run() {
if (sender instanceof Player) {
command.getExecutor().accept(new BukkitPlayerCMDSender((Player) sender), new Arguments(args));
} else {
command.getExecutor().accept(new BukkitCMDSender(sender), new Arguments(args));
try {
if (sender instanceof Player) {
command.getExecutor().accept(new BukkitPlayerCMDSender((Player) sender), new Arguments(args));
} else {
command.getExecutor().accept(new BukkitCMDSender(sender), new Arguments(args));
}
} catch (Exception e) {
errorLogger.log(L.ERROR, e, ErrorContext.builder()
.related(sender.getClass())
.related(label + " " + Arrays.toString(args))
.build());
}
}
}).runTaskAsynchronously();
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command cmd, String label, String[] args) {
try {
if (sender instanceof Player) {
return command.getArgumentResolver().apply(new BukkitPlayerCMDSender((Player) sender), new Arguments(args));
} else {
return command.getArgumentResolver().apply(new BukkitCMDSender(sender), new Arguments(args));
}
} catch (Exception e) {
errorLogger.log(L.ERROR, e, ErrorContext.builder()
.related(sender.getClass())
.related("tab completion")
.related(label + " " + Arrays.toString(args))
.build());
return Collections.emptyList();
}
}
}

6
Plan/common/src/main/java/com/djrapitops/plan/commands/use/CommandWithSubcommands.java
View File

@ -116,12 +116,16 @@ public class CommandWithSubcommands extends Subcommand {
Optional<String> gotAlias = arguments.get(0);
List<String> options = new ArrayList<>();
if (gotAlias.isPresent()) {
subcommandsLoop:
for (Subcommand subcommand : subcommands) {
if (sender.isMissingPermissionsFor(subcommand)) {
continue;
}
for (String alias : subcommand.getAliases()) {
if (alias.startsWith(gotAlias.get())) {
if (alias.equals(gotAlias.get())) {
options.addAll(subcommand.getArgumentResolver().apply(sender, arguments.removeFirst()));
break subcommandsLoop;
} else if (alias.startsWith(gotAlias.get())) {
options.add(alias);
}
}