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

🐛 Fix merge conflict

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-30 10:49:09 +02:00
parent 09e3e7aa13
commit 144ac02778
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java
View file

@ -24,8 +24,6 @@
package cloud.commandframework.arguments.parser; package cloud.commandframework.arguments.parser;
import cloud.commandframework.arguments.standard.UUIDArgument; import cloud.commandframework.arguments.standard.UUIDArgument;
import com.google.common.collect.ImmutableMap;
import com.google.common.reflect.TypeToken;
import cloud.commandframework.annotations.specifier.Completions; import cloud.commandframework.annotations.specifier.Completions;
import cloud.commandframework.annotations.specifier.Range; import cloud.commandframework.annotations.specifier.Range;
import cloud.commandframework.arguments.standard.BooleanArgument; import cloud.commandframework.arguments.standard.BooleanArgument;
@ -107,8 +105,8 @@ public final class StandardParserRegistry<C> implements ParserRegistry<C> {
StringArgument.StringMode.SINGLE, (context, s) -> StringArgument.StringMode.SINGLE, (context, s) ->
Arrays.asList(options.get(StandardParameters.COMPLETIONS, new String[0])))); Arrays.asList(options.get(StandardParameters.COMPLETIONS, new String[0]))));
/* Add options to this */ /* Add options to this */
this.registerParserSupplier(TypeToken.of(Boolean.class), options -> new BooleanArgument.BooleanParser<>(false)); this.registerParserSupplier(TypeToken.get(Boolean.class), options -> new BooleanArgument.BooleanParser<>(false));
this.registerParserSupplier(TypeToken.of(UUID.class), options -> new UUIDArgument.UUIDParser<>()); this.registerParserSupplier(TypeToken.get(UUID.class), options -> new UUIDArgument.UUIDParser<>());
} }
@Override @Override

2
cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java
View file

@ -92,7 +92,7 @@ public final class BukkitTest extends JavaPlugin {
final BukkitAudiences bukkitAudiences = BukkitAudiences.create(this); final BukkitAudiences bukkitAudiences = BukkitAudiences.create(this);
final MinecraftHelp<CommandSender> minecraftHelp = new MinecraftHelp<>("/cloud help", final MinecraftHelp<CommandSender> minecraftHelp = new MinecraftHelp<>("/cloud help",
bukkitAudiences::sender, bukkitAudiences::audience,
mgr); mgr);
try { try {

4
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
View file

@ -92,9 +92,9 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
this.getParserRegistry().registerParserSupplier(TypeToken.get(Material.class), this.getParserRegistry().registerParserSupplier(TypeToken.get(Material.class),
params -> new MaterialArgument.MaterialParser<>()); params -> new MaterialArgument.MaterialParser<>());
this.getParserRegistry() this.getParserRegistry()
.registerParserSupplier(TypeToken.of(Player.class), params -> new PlayerArgument.PlayerParser<>()); .registerParserSupplier(TypeToken.get(Player.class), params -> new PlayerArgument.PlayerParser<>());
this.getParserRegistry() this.getParserRegistry()
.registerParserSupplier(TypeToken.of(OfflinePlayer.class), .registerParserSupplier(TypeToken.get(OfflinePlayer.class),
params -> new OfflinePlayerArgument.OfflinePlayerParser<>()); params -> new OfflinePlayerArgument.OfflinePlayerParser<>());
/* Try to determine the Minecraft version */ /* Try to determine the Minecraft version */