Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-02 22:47:41 +01:00
Code Issues Projects Releases Wiki Activity

Use tree for all /ess subcommands

Browse Source
This commit is contained in:
MD 2023-06-07 01:25:14 +01:00
parent 6d9b04f0db
commit 56973926d7
1 changed files with 29 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
View File

@ -15,7 +15,6 @@ import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.PasteUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
@ -26,7 +25,6 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -57,7 +55,6 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;
import static com.earth2me.essentials.I18n.tl;
@ -114,94 +111,38 @@ public class Commandessentials extends EssentialsCommand {
private transient TuneRunnable currentTune = null;
private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
root.literal("debug", debug -> debug.execute(this::runDebug), "verbose");
// Info commands
root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
root.literal("dump", ctx -> ctx.execute(this::runDump));
// Config commands
root.literal("reload", ctx -> ctx.execute(this::runReload));
root.literal("locale", locale -> {
// TODO
locale.execute(ctx -> {}, Arrays.asList("not", "yet", "implemented"));
locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
}, "lang");
// TODO: start moving things to literals
// Data commands
root.literal("reset", ctx -> ctx.execute(this::runReset));
root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
root.literal("homes", ctx -> ctx.execute(this::runHomes));
root.literal("usermap", usermap -> {
// TODO: split these out from #runUsermap
usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
});
// fallback while we move things over
root.execute(ctx -> {
final Server server = ctx.server();
final CommandSource sender = ctx.sender();
final String commandLabel = ctx.label();
final String[] args = ctx.args();
if (args.length == 0) {
showUsage(sender);
}
switch (args[0]) {
// Info commands
case "ver":
case "version":
runVersion(server, sender, commandLabel, args);
break;
case "cmd":
case "commands":
runCommands(server, sender, commandLabel, args);
break;
case "dump":
runDump(server, sender, commandLabel, args);
break;
// Data commands
case "reload":
runReload(server, sender, commandLabel, args);
break;
case "reset":
runReset(server, sender, commandLabel, args);
break;
case "cleanup":
runCleanup(server, sender, commandLabel, args);
break;
case "homes":
runHomes(server, sender, commandLabel, args);
break;
case "usermap":
runUserMap(sender, args);
break;
case "itemtest":
runItemTest(server, sender, commandLabel, args);
break;
// "#EasterEgg"
case "nya":
case "nyan":
runNya(server, sender, commandLabel, args);
break;
case "moo":
runMoo(server, sender, commandLabel, args);
break;
default:
showUsage(sender);
break;
}
}, ctx -> {
final Server server = ctx.server();
final CommandSource sender = ctx.sender();
final String commandLabel = ctx.label();
final String[] args = ctx.args();
if (args.length == 1) {
final List<String> options = Lists.newArrayList();
options.add("reload");
options.add("version");
options.add("dump");
options.add("commands");
options.add("reset");
options.add("cleanup");
options.add("homes");
//options.add("uuidconvert");
//options.add("nya");
//options.add("moo");
return options;
}
// Internal debugging and #EasterEgg
root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
// TODO: hide from tab-complete
root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");
// TODO: missing tab completions
/*
switch (args[0]) {
case "moo":
if (args.length == 2) {
@ -240,7 +181,8 @@ public class Commandessentials extends EssentialsCommand {
}
return Collections.emptyList();
});
*/
});
public Commandessentials() {
@ -252,7 +194,7 @@ public class Commandessentials extends EssentialsCommand {
tree.run(server, sender, commandLabel, args);
}
public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (!sender.isAuthorized("essentials.itemtest", ess) || args.length < 2 || !sender.isPlayer()) {
return;
}
@ -303,6 +245,7 @@ public class Commandessentials extends EssentialsCommand {
}
// Displays the command's usage.
// todo: remove
private void showUsage(final CommandSource sender) throws Exception {
throw new NotEnoughArgumentsException();
}