ChromaGaming/ChromaCore
1
0
Fork 0
Code Issues 23 Pull requests 1 Packages Projects Releases 11 Wiki Activity

Fixed argument tabcomplete

Browse source 
The issue was that I was adding to a builder after it was used to build
With the command class passed, it only works with /plugin:cmd and doesn't give hints for the arguments
Without the command class, it doesn't show the next argument until it's typed in and also accepts invalid subcommands
#82
This commit is contained in:
Norbi Peti 2020-03-07 03:01:01 +01:00
parent 00738fe820
commit 425cbcd9d2
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2MC.java
View file

@ -5,9 +5,9 @@ import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.architecture.ButtonPlugin; import buttondevteam.lib.architecture.ButtonPlugin;
import buttondevteam.lib.architecture.Component; import buttondevteam.lib.architecture.Component;
import com.mojang.brigadier.arguments.*; import com.mojang.brigadier.arguments.*;
import com.mojang.brigadier.builder.ArgumentBuilder;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.tree.CommandNode;
import lombok.val; import lombok.val;
import me.lucko.commodore.Commodore; import me.lucko.commodore.Commodore;
import me.lucko.commodore.CommodoreProvider; import me.lucko.commodore.CommodoreProvider;
@ -317,22 +317,22 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
} }
System.out.println("Registering tabcomplete for path: " + command2MC.getCommandPath()); System.out.println("Registering tabcomplete for path: " + command2MC.getCommandPath());
String[] path = command2MC.getCommandPath().split(" "); String[] path = command2MC.getCommandPath().split(" ");
var maincmd = LiteralArgumentBuilder.literal(path[0]); var maincmd = LiteralArgumentBuilder.literal(path[0]).build();
var cmd = maincmd; var cmd = maincmd;
for (int i = 1; i < path.length; i++) { for (int i = 1; i < path.length; i++) {
var subcmd = LiteralArgumentBuilder.literal(path[i]); var subcmd = LiteralArgumentBuilder.literal(path[i]).build();
System.out.println(cmd.build() + " -> " + subcmd.build()); System.out.println(cmd + " -> " + subcmd);
cmd.then(subcmd); cmd.addChild(subcmd);
cmd = subcmd; //Add each part of the path as a child of the previous one cmd = subcmd; //Add each part of the path as a child of the previous one
} }
for (SubcommandData<ICommand2MC> subcmd : subcmds) { for (SubcommandData<ICommand2MC> subcmd : subcmds) {
String[] subpath = ButtonPlugin.getCommand2MC().getCommandPath(subcmd.method.getName(), ' ').trim().split(" "); String[] subpath = ButtonPlugin.getCommand2MC().getCommandPath(subcmd.method.getName(), ' ').trim().split(" ");
ArgumentBuilder<Object, ?> scmd = cmd; CommandNode<Object> scmd = cmd;
if (subpath[0].length() > 0) { //If the method is def, it will contain one empty string if (subpath[0].length() > 0) { //If the method is def, it will contain one empty string
for (String s : subpath) { for (String s : subpath) {
var subsubcmd = LiteralArgumentBuilder.literal(s); var subsubcmd = LiteralArgumentBuilder.literal(s).build();
System.out.println(scmd.build() + " -> " + subsubcmd.build()); System.out.println(scmd + " -> " + subsubcmd);
scmd.then(subsubcmd); scmd.addChild(subsubcmd);
scmd = subsubcmd; //Add method name part of the path (could_be_multiple()) scmd = subsubcmd; //Add method name part of the path (could_be_multiple())
} }
} }
@ -346,7 +346,9 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
type = StringArgumentType.greedyString(); type = StringArgumentType.greedyString();
else else
type = StringArgumentType.word(); type = StringArgumentType.word();
else if (ptype == int.class || ptype == Integer.class) else if (ptype == int.class || ptype == Integer.class
|| ptype == byte.class || ptype == Byte.class
|| ptype == short.class || ptype == Short.class)
type = IntegerArgumentType.integer(); //TODO: Min, max type = IntegerArgumentType.integer(); //TODO: Min, max
else if (ptype == long.class || ptype == Long.class) else if (ptype == long.class || ptype == Long.class)
type = LongArgumentType.longArg(); type = LongArgumentType.longArg();
@ -360,16 +362,16 @@ public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implemen
type = BoolArgumentType.bool(); type = BoolArgumentType.bool();
else //TODO: Custom parameter types else //TODO: Custom parameter types
type = StringArgumentType.word(); type = StringArgumentType.word();
var arg = RequiredArgumentBuilder.argument(parameter.getName(), type); var arg = RequiredArgumentBuilder.argument(parameter.getName(), type).build();
System.out.println("Adding arg: " + arg.build() + " to " + scmd.build()); System.out.println("Adding arg: " + arg + " to " + scmd);
scmd.then(arg); scmd.addChild(arg);
scmd = arg; scmd = arg;
} }
} }
System.out.println("maincmd: " + maincmd.build()); System.out.println("maincmd: " + maincmd);
System.out.println("Children:"); System.out.println("Children:");
maincmd.build().getChildren().forEach(System.out::println); maincmd.getChildren().forEach(System.out::println);
commodore.register(bukkitCommand, maincmd, p -> true); commodore.register(maincmd);
} }
} }
} }