@@ -64,7 +64,7 @@ public BuilderCommand(@NotNull CommandBuilder commandBuilder, List<String> usage
64
64
if (size >= 1 ) {
65
65
if (nodes .isEmpty ()) return Result .error (Collections .singletonList ("Expected no parameters, but got parameters instead" ));
66
66
67
- BuilderCommand . CurrentNode current = findCurrentNode (reader );
67
+ CurrentNode current = findCurrentNode (reader );
68
68
Result <CommandNode <?>, List <String >> resultNode = current .node ;
69
69
if (resultNode .isError ()) {
70
70
if (current .extraInput ) {
@@ -112,7 +112,7 @@ public BuilderCommand(@NotNull CommandBuilder commandBuilder, List<String> usage
112
112
String matchingString = args .getString (args .size () - 1 );
113
113
114
114
if (args .size () != 1 ) {
115
- BuilderCommand . CurrentNode current = findCurrentNode (reader );
115
+ CurrentNode current = findCurrentNode (reader );
116
116
List <CommandNode <?>> nodeList = current .nodes ;
117
117
if (nodeList .size () != 0 ) {
118
118
CommandNode <?> node = nodeList .get (nodeList .size () - 1 );
@@ -156,11 +156,11 @@ public boolean hasDescription() {
156
156
}
157
157
158
158
@ Contract ("_, _ -> new" )
159
- private @ NotNull CommandContext buildContext (@ NotNull CommandContext context , @ NotNull BuilderCommand . CurrentNode result ) {
159
+ private @ NotNull CommandContext buildContext (@ NotNull CommandContext context , @ NotNull CurrentNode result ) {
160
160
return CommandCore .createContext (context .getSource (), context .getCommand (), context .getLabel (), new ListArguments (result .args ));
161
161
}
162
162
163
- private @ NotNull Result <BuilderCommand . ApplicableNode , List <String >> checkApplicable (@ NotNull ArgumentReader reader , @ NotNull Set <CommandNode <?>> nodes ) {
163
+ private @ NotNull Result <ApplicableNode , List <String >> checkApplicable (@ NotNull ArgumentReader reader , @ NotNull Set <CommandNode <?>> nodes ) {
164
164
List <CommandNode <?>> options = new ArrayList <>();
165
165
List <String > exceptions = new ArrayList <>();
166
166
if (reader .index () != 0 ) reader .next ();
@@ -177,11 +177,11 @@ public boolean hasDescription() {
177
177
String arg ;
178
178
if (reader .atEnd ()) arg = reader .splice (beforeIndex );
179
179
else arg = reader .splice (beforeIndex , reader .index ());
180
- return Result .ok (new BuilderCommand . ApplicableNode (options .get (0 ), arg ));
180
+ return Result .ok (new ApplicableNode (options .get (0 ), arg ));
181
181
}
182
182
183
183
@ Contract ("_ -> new" )
184
- private @ NotNull BuilderCommand . CurrentNode findCurrentNode (@ NotNull ArgumentReader reader ) {
184
+ private @ NotNull CurrentNode findCurrentNode (@ NotNull ArgumentReader reader ) {
185
185
Set <CommandNode <?>> nodeSet = nodes ;
186
186
List <String > args = new ArrayList <>();
187
187
List <CommandNode <?>> nodeList = new ArrayList <>();
@@ -193,9 +193,9 @@ public boolean hasDescription() {
193
193
System .out .println ("errors: " + String .join ("," , parseResult .unwrapError ()));
194
194
System .out .println ("args is " + String .join ("," , args ));
195
195
args .add (reader .splice (reader .index ()));
196
- return new BuilderCommand . CurrentNode (Result .error (parseResult .unwrapError ()), nodeList , args , false );
196
+ return new CurrentNode (Result .error (parseResult .unwrapError ()), nodeList , args , false );
197
197
}
198
- BuilderCommand . ApplicableNode applicableNode = parseResult .unwrap ();
198
+ ApplicableNode applicableNode = parseResult .unwrap ();
199
199
node = applicableNode .node ;
200
200
nodeSet = node .getChildren ();
201
201
nodeList .add (node );
@@ -205,7 +205,7 @@ public boolean hasDescription() {
205
205
}
206
206
if (node == null ) throw new IllegalArgumentException ("reader must not be at end" );
207
207
System .out .println ("args is " + String .join ("," , args ));
208
- return new BuilderCommand . CurrentNode (Result .ok (node ), nodeList , args , false );
208
+ return new CurrentNode (Result .ok (node ), nodeList , args , false );
209
209
}
210
210
211
211
private static class ApplicableNode {
0 commit comments