From f7b7b93251f381eff6b66d549a6a140c137a5a51 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Mon, 28 Jun 2021 02:13:48 -0700 Subject: [PATCH] Various minor cleanup --- .../arguments/CommandArgument.java | 2 +- cloud-minecraft/README.md | 2 +- .../bukkit/data/ProtoItemStack.java | 2 ++ .../bukkit/internal/MinecraftArgumentTypes.java | 10 ++++++++-- .../commandframework/bukkit/package-info.java | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../src/testmod/resources/fabric.mod.json | 2 +- .../velocity/VelocityCommandManager.java | 6 +++--- .../velocity/VelocityCommandPreprocessor.java | 2 +- .../velocity/VelocityExecutor.java | 2 +- .../VelocityPluginRegistrationHandler.java | 16 ++++++++-------- .../examples/bungee/ExamplePlugin.java | 2 +- 12 files changed, 29 insertions(+), 21 deletions(-) diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java index d4d7cc89..75de73c1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java @@ -746,7 +746,7 @@ public class CommandArgument implements Comparable>, } /** - * A variant of builders designed for subclassing, that returns a self type . + * A variant of builders designed for subclassing, that returns a self type. * * @param sender type * @param argument value type diff --git a/cloud-minecraft/README.md b/cloud-minecraft/README.md index e42e3d7a..6f556719 100644 --- a/cloud-minecraft/README.md +++ b/cloud-minecraft/README.md @@ -212,7 +212,7 @@ cloud mappings for the Fabric mod loader for Minecraft 1.16+ **gradle**: ```groovy dependencies { - modImplementation 'cloud.commandframework:cloud-fabric:1.3.0-SNAPSHOT' + modImplementation 'cloud.commandframework:cloud-fabric:1.5.0-SNAPSHOT' } ``` diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java index ee2e07c5..36e74e7a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java @@ -46,6 +46,7 @@ public interface ProtoItemStack { * Get whether this {@link ProtoItemStack} contains extra data besides the {@link Material}. * * @return whether there is extra data + * @since 1.5.0 */ boolean hasExtraData(); @@ -56,6 +57,7 @@ public interface ProtoItemStack { * @param respectMaximumStackSize whether to respect the maximum stack size for the material * @return the created {@link ItemStack} * @throws IllegalArgumentException if the {@link ItemStack} could not be created, due to max stack size or other reasons + * @since 1.5.0 */ @NonNull ItemStack createItemStack(int stackSize, boolean respectMaximumStackSize) throws IllegalArgumentException; diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java index 328085e6..c17946f9 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java @@ -47,6 +47,7 @@ */ package cloud.commandframework.bukkit.internal; +import com.google.common.annotations.Beta; import com.mojang.brigadier.arguments.ArgumentType; import org.bukkit.NamespacedKey; import org.checkerframework.checker.nullness.qual.NonNull; @@ -58,9 +59,12 @@ import java.util.Arrays; /** * A registry of the {@link ArgumentType}s provided by Minecraft. - * + *

* This file is taken from MIT licensed code in commodore (https://github.com/lucko/commodore). + * + *

This is not API, and as such, may break, change, or be removed without any notice.

*/ +@Beta public final class MinecraftArgumentTypes { private MinecraftArgumentTypes() { @@ -116,7 +120,9 @@ public final class MinecraftArgumentTypes { * @throws IllegalArgumentException if no such argument is registered */ @SuppressWarnings("unchecked") - public static Class> getClassByKey(final @NonNull NamespacedKey key) throws IllegalArgumentException { + public static Class> getClassByKey( + final @NonNull NamespacedKey key + ) throws IllegalArgumentException { try { Object minecraftKey = MINECRAFT_KEY_CONSTRUCTOR.newInstance(key.getNamespace(), key.getKey()); Object entry = ARGUMENT_REGISTRY_GET_BY_KEY_METHOD.invoke(null, minecraftKey); diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/package-info.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/package-info.java index 1cd35870..029fa781 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/package-info.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/package-info.java @@ -22,6 +22,6 @@ // SOFTWARE. // /** - * cloud implementation for Bukkit 1.8-1.16 + * cloud implementation for Bukkit 1.8-1.17 */ package cloud.commandframework.bukkit; diff --git a/cloud-minecraft/cloud-fabric/src/main/resources/fabric.mod.json b/cloud-minecraft/cloud-fabric/src/main/resources/fabric.mod.json index e46204f6..59ba843c 100644 --- a/cloud-minecraft/cloud-fabric/src/main/resources/fabric.mod.json +++ b/cloud-minecraft/cloud-fabric/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "cloud-v1", + "id": "cloud", "version": "${version}", "name": "Cloud", diff --git a/cloud-minecraft/cloud-fabric/src/testmod/resources/fabric.mod.json b/cloud-minecraft/cloud-fabric/src/testmod/resources/fabric.mod.json index 5007bc4e..fc0ab379 100644 --- a/cloud-minecraft/cloud-fabric/src/testmod/resources/fabric.mod.json +++ b/cloud-minecraft/cloud-fabric/src/testmod/resources/fabric.mod.json @@ -30,6 +30,6 @@ "fabricloader": ">=0.7.4", "fabric-command-api-v1": "*", "minecraft": ">=1.14", - "cloud-v1": "*" + "cloud": "*" } } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java index d837d20a..80df0ea4 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java @@ -167,15 +167,15 @@ public class VelocityCommandManager extends CommandManager implements Brig return ((VelocityPluginRegistrationHandler) this.getCommandRegistrationHandler()).brigadierManager(); } - final @NonNull ProxyServer getProxyServer() { + final @NonNull ProxyServer proxyServer() { return this.proxyServer; } - final @NonNull Function<@NonNull CommandSource, @NonNull C> getCommandSenderMapper() { + final @NonNull Function<@NonNull CommandSource, @NonNull C> commandSenderMapper() { return this.commandSenderMapper; } - final @NonNull Function<@NonNull C, @NonNull CommandSource> getBackwardsCommandSenderMapper() { + final @NonNull Function<@NonNull C, @NonNull CommandSource> backwardsCommandSenderMapper() { return this.backwardsCommandSenderMapper; } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java index 1614c9a0..0aac58c5 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java @@ -51,7 +51,7 @@ final class VelocityCommandPreprocessor implements CommandPreprocessor { public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store( VelocityContextKeys.PROXY_SERVER_KEY, - this.mgr.getProxyServer() + this.mgr.proxyServer() ); } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java index 57726fd4..7d2e36bb 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java @@ -59,7 +59,7 @@ final class VelocityExecutor implements Command { public int run(final @NonNull CommandContext commandContext) { final CommandSource source = commandContext.getSource(); final String input = commandContext.getInput(); - final C sender = this.manager.getCommandSenderMapper().apply( + final C sender = this.manager.commandSenderMapper().apply( source); this.manager.executeCommand(sender, input).whenComplete(this.getResultConsumer(source, sender)); return com.mojang.brigadier.Command.SINGLE_SUCCESS; diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java index 083bacf7..d636e7e3 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java @@ -46,16 +46,16 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH this.brigadierManager = new CloudBrigadierManager<>( velocityCommandManager, () -> new CommandContext<>( - velocityCommandManager.getCommandSenderMapper() - .apply(velocityCommandManager.getProxyServer() + velocityCommandManager.commandSenderMapper() + .apply(velocityCommandManager.proxyServer() .getConsoleCommandSource()), velocityCommandManager ) ); this.brigadierManager.brigadierSenderMapper( - sender -> this.manager.getCommandSenderMapper().apply(sender) + sender -> this.manager.commandSenderMapper().apply(sender) ); - this.brigadierManager.backwardsBrigadierSenderMapper(this.manager.getBackwardsCommandSenderMapper()); + this.brigadierManager.backwardsBrigadierSenderMapper(this.manager.backwardsCommandSenderMapper()); } @Override @@ -68,18 +68,18 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH command.getArguments().get(0).getName(), (Command) command, (c, p) -> this.manager.hasPermission( - this.manager.getCommandSenderMapper().apply(c), + this.manager.commandSenderMapper().apply(c), p ), true, new VelocityExecutor<>(this.manager) ) ); - final CommandMeta commandMeta = this.manager.getProxyServer().getCommandManager() + final CommandMeta commandMeta = this.manager.proxyServer().getCommandManager() .metaBuilder(brigadierCommand) .aliases(aliases.toArray(new String[0])).build(); - aliases.forEach(this.manager.getProxyServer().getCommandManager()::unregister); - this.manager.getProxyServer().getCommandManager().register(commandMeta, brigadierCommand); + aliases.forEach(this.manager.proxyServer().getCommandManager()::unregister); + this.manager.proxyServer().getCommandManager().register(commandMeta, brigadierCommand); return true; } diff --git a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java index 66570bec..0e25c57b 100644 --- a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java +++ b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java @@ -70,7 +70,7 @@ public final class ExamplePlugin extends Plugin { mapperFunction ); } catch (final Exception e) { - this.getLogger().severe("Failed to initialize the command this.manager"); + this.getLogger().severe("Failed to initialize the command manager"); return; }