From a5748444ce9697e7281e5b55bcc447bfc0f2790d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Sun, 6 Sep 2020 18:06:08 +0200 Subject: [PATCH] Reformat. --- .../commands/BukkitCommand.java | 27 +++++++++++-------- .../commands/BukkitCommandManager.java | 9 ++++--- .../commands/BukkitCommandSender.java | 10 ++++--- .../commands/BukkitConsoleSender.java | 4 ++- .../commands/BukkitPlayerSender.java | 4 ++- .../BukkitPluginRegistrationHandler.java | 10 ++++--- commands-core/pom.xml | 4 +-- .../commands/CommandManager.java | 3 ++- .../commands/CommandTree.java | 3 ++- 9 files changed, 48 insertions(+), 26 deletions(-) diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java index e853a091..b57d64db 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import com.intellectualsites.commands.components.CommandComponent; +package com.intellectualsites.commands; + +import com.intellectualsites.commands.components.CommandComponent; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.plugin.Plugin; @@ -34,7 +36,8 @@ public class BukkitCommand extends org.bukkit.command.Command implements PluginI private final CommandComponent command; private final BukkitCommandManager bukkitCommandManager; - BukkitCommand(@Nonnull final CommandComponent command, @Nonnull final BukkitCommandManager bukkitCommandManager) { + BukkitCommand(@Nonnull final CommandComponent command, + @Nonnull final BukkitCommandManager bukkitCommandManager) { super(command.getName()); this.command = command; this.bukkitCommandManager = bukkitCommandManager; @@ -47,19 +50,21 @@ public class BukkitCommand extends org.bukkit.command.Command implements PluginI for (final String string : strings) { builder.append(" ").append(string); } - this.bukkitCommandManager.executeCommand(BukkitCommandSender.of(commandSender), builder.toString()).whenComplete(((commandResult, throwable) -> { - if (throwable != null) { - throwable.printStackTrace(); - } else { - // Do something... - commandSender.sendMessage("All good!"); - } - })); + this.bukkitCommandManager.executeCommand(BukkitCommandSender.of(commandSender), builder.toString()) + .whenComplete(((commandResult, throwable) -> { + if (throwable != null) { + throwable.printStackTrace(); + } else { + // Do something... + commandSender.sendMessage("All good!"); + } + })); return true; } @Override - public List tabComplete(final CommandSender sender, final String alias, final String[] args) throws IllegalArgumentException { + public List tabComplete(final CommandSender sender, final String alias, final String[] args) throws + IllegalArgumentException { final StringBuilder builder = new StringBuilder(this.command.getName()); for (final String string : args) { builder.append(" ").append(string); diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java index 484da82b..421a7554 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import com.intellectualsites.commands.execution.CommandExecutionCoordinator; +package com.intellectualsites.commands; + +import com.intellectualsites.commands.execution.CommandExecutionCoordinator; import org.bukkit.plugin.Plugin; import javax.annotation.Nonnull; @@ -33,14 +35,15 @@ public class BukkitCommandManager extends CommandManager { public BukkitCommandManager(@Nonnull final Plugin owningPlugin, @Nonnull final Function, - CommandExecutionCoordinator> commandExecutionCoordinator) + CommandExecutionCoordinator> commandExecutionCoordinator) throws Exception { super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler()); ((BukkitPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); this.owningPlugin = owningPlugin; } - @Nonnull public Plugin getOwningPlugin() { + @Nonnull + public Plugin getOwningPlugin() { return this.owningPlugin; } diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java index b0cc7d02..2268aede 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import com.google.common.base.Objects; +package com.intellectualsites.commands; + +import com.google.common.base.Objects; import com.intellectualsites.commands.sender.CommandSender; import org.bukkit.entity.Player; @@ -70,12 +72,14 @@ public abstract class BukkitCommandSender implements CommandSender { return Objects.hashCode(internalSender); } - @Nonnull public org.bukkit.command.CommandSender getInternalSender() { + @Nonnull + public org.bukkit.command.CommandSender getInternalSender() { return this.internalSender; } public abstract boolean isPlayer(); - @Nonnull public abstract Player asPlayer(); + @Nonnull + public abstract Player asPlayer(); } diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java index cbca92cd..ebad23f5 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import org.bukkit.Bukkit; +package com.intellectualsites.commands; + +import org.bukkit.Bukkit; import org.bukkit.entity.Player; import javax.annotation.Nonnull; diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java index 6206a50c..f81f7c8f 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import org.bukkit.entity.Player; +package com.intellectualsites.commands; + +import org.bukkit.entity.Player; import javax.annotation.Nonnull; diff --git a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java index b5f4bdd1..a59e2851 100644 --- a/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java +++ b/commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java @@ -21,7 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package com.intellectualsites.commands;import com.intellectualsites.commands.components.CommandComponent; +package com.intellectualsites.commands; + +import com.intellectualsites.commands.components.CommandComponent; import com.intellectualsites.commands.internal.CommandRegistrationHandler; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; @@ -50,7 +52,8 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHandl final Field knownCommands = SimpleCommandMap.class.getDeclaredField("knownCommands"); knownCommands.setAccessible(true); @SuppressWarnings("ALL") - final Map bukkitCommands = (Map) knownCommands.get(commandMap); + final Map bukkitCommands = (Map) knownCommands.get( + commandMap); this.bukkitCommands = bukkitCommands; this.bukkitCommandManager = bukkitCommandManager; } @@ -68,7 +71,8 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHandl } else { label = commandComponent.getName(); } - this.bukkitCommands.put(label, new BukkitCommand((CommandComponent) commandComponent, this.bukkitCommandManager)); + this.bukkitCommands.put(label, new BukkitCommand((CommandComponent) commandComponent, + this.bukkitCommandManager)); return true; } diff --git a/commands-core/pom.xml b/commands-core/pom.xml index 97ab9e3c..2861f788 100644 --- a/commands-core/pom.xml +++ b/commands-core/pom.xml @@ -25,8 +25,8 @@ ~ --> - Commands diff --git a/commands-core/src/main/java/com/intellectualsites/commands/CommandManager.java b/commands-core/src/main/java/com/intellectualsites/commands/CommandManager.java index 103fadb4..8ab9633a 100644 --- a/commands-core/src/main/java/com/intellectualsites/commands/CommandManager.java +++ b/commands-core/src/main/java/com/intellectualsites/commands/CommandManager.java @@ -109,7 +109,8 @@ public abstract class CommandManager { this.commandSyntaxFormatter = commandSyntaxFormatter; } - @Nonnull protected CommandRegistrationHandler getCommandRegistrationHandler() { + @Nonnull + protected CommandRegistrationHandler getCommandRegistrationHandler() { return this.commandRegistrationHandler; } diff --git a/commands-core/src/main/java/com/intellectualsites/commands/CommandTree.java b/commands-core/src/main/java/com/intellectualsites/commands/CommandTree.java index 277b6fb8..037232a1 100644 --- a/commands-core/src/main/java/com/intellectualsites/commands/CommandTree.java +++ b/commands-core/src/main/java/com/intellectualsites/commands/CommandTree.java @@ -94,7 +94,8 @@ public class CommandTree { /* Not enough arguments */ throw new InvalidSyntaxException(this.commandManager.getCommandSyntaxFormatter() .apply(Objects.requireNonNull( - child.getValue().getOwningCommand()).getComponents()), + child.getValue().getOwningCommand()) + .getComponents()), commandContext.getCommandSender(), this.getChain(root) .stream() .map(Node::getValue)