zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🐛 Fix argument flags

Browse source
This commit is contained in:
Alexander Söderberg 2020-10-07 23:28:56 +02:00
parent 2bad5759c6
commit 63dce244aa
No known key found for this signature in database
GPG key ID: FACEA5B0F4C1BF80
4 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java
View file

@ -163,6 +163,7 @@ public final class FlagArgument<C> extends CommandArgument<C, Object> {
final CommandFlag erasedFlag = currentFlag;
final Object value = result.getParsedValue().get();
commandContext.flags().addValueFlag(erasedFlag, value);
currentFlag = null;
}
}
}

15
cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java
View file

@ -25,6 +25,7 @@ package cloud.commandframework;
import cloud.commandframework.arguments.CommandArgument;
import cloud.commandframework.arguments.compound.ArgumentPair;
import cloud.commandframework.arguments.standard.EnumArgument;
import cloud.commandframework.arguments.standard.IntegerArgument;
import cloud.commandframework.arguments.standard.StringArgument;
import cloud.commandframework.context.CommandContext;
@ -117,9 +118,12 @@ class CommandTreeTest {
.build())
.flag(manager.flagBuilder("num")
.withArgument(IntegerArgument.of("num")).build())
.flag(manager.flagBuilder("enum")
.withArgument(EnumArgument.of(FlagEnum.class, "enum")))
.handler(c -> {
System.out.println("Flag present? " + c.flags().isPresent("test"));
System.out.println("Numerical flag: " + c.flags().getValue("num", -10));
System.out.println("Enum: " + c.flags().getValue("enum", FlagEnum.PROXI));
})
.build());
}
@ -222,7 +226,8 @@ class CommandTreeTest {
manager.executeCommand(new TestCommandSender(), "flags --test --test2").join();
Assertions.assertThrows(CompletionException.class, () ->
manager.executeCommand(new TestCommandSender(), "flags --test test2").join());
manager.executeCommand(new TestCommandSender(), "flags --num 500");
manager.executeCommand(new TestCommandSender(), "flags --num 500").join();
manager.executeCommand(new TestCommandSender(), "flags --num 63 --enum potato --test").join();
}
@Test
@ -259,4 +264,12 @@ class CommandTreeTest {
}
public enum FlagEnum {
POTATO,
CARROT,
ONION,
PROXI
}
}

13
examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java
View file

@ -38,6 +38,8 @@ import cloud.commandframework.annotations.specifier.Greedy;
import cloud.commandframework.arguments.CommandArgument;
import cloud.commandframework.arguments.parser.ParserParameters;
import cloud.commandframework.arguments.parser.StandardParameters;
import cloud.commandframework.arguments.standard.EnumArgument;
import cloud.commandframework.arguments.standard.IntegerArgument;
import cloud.commandframework.bukkit.BukkitCommandManager;
import cloud.commandframework.bukkit.BukkitCommandMetaBuilder;
import cloud.commandframework.bukkit.CloudBukkitCapabilities;
@ -254,6 +256,17 @@ public final class ExamplePlugin extends JavaPlugin {
})
.execute(() -> context.getSender().sendMessage("DONE!"))
));
manager.command(manager.commandBuilder("give")
.senderType(Player.class)
.argument(EnumArgument.of(Material.class, "material"))
.argument(IntegerArgument.of("amount"))
.handler(c -> {
final Material material = c.get("material");
final int amount = c.get("amount");
final ItemStack itemStack = new ItemStack(material, amount);
((Player) c.getSender()).getInventory().addItem(itemStack);
c.getSender().sendMessage("You've been given stuff, bro.");
}));
}
@CommandMethod("example help [query]")

1
examples/example-bukkit/src/main/resources/plugin.yml
View file

@ -2,3 +2,4 @@ name: ExamplePlugin
version: 1.0.0
api-version: 1.13
main: cloud.commandframework.examples.bukkit.ExamplePlugin
depends: [Essentials]