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

Reformat.

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-06 18:06:08 +02:00
parent 3ec124aac4
commit a5748444ce
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
9 changed files with 48 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // 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.CommandSender;
import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.command.PluginIdentifiableCommand;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -34,7 +36,8 @@ public class BukkitCommand extends org.bukkit.command.Command implements PluginI
private final CommandComponent<BukkitCommandSender, ?> command; private final CommandComponent<BukkitCommandSender, ?> command;
private final BukkitCommandManager bukkitCommandManager; private final BukkitCommandManager bukkitCommandManager;
BukkitCommand(@Nonnull final CommandComponent<BukkitCommandSender, ?> command, @Nonnull final BukkitCommandManager bukkitCommandManager) { BukkitCommand(@Nonnull final CommandComponent<BukkitCommandSender, ?> command,
@Nonnull final BukkitCommandManager bukkitCommandManager) {
super(command.getName()); super(command.getName());
this.command = command; this.command = command;
this.bukkitCommandManager = bukkitCommandManager; this.bukkitCommandManager = bukkitCommandManager;
@ -47,19 +50,21 @@ public class BukkitCommand extends org.bukkit.command.Command implements PluginI
for (final String string : strings) { for (final String string : strings) {
builder.append(" ").append(string); builder.append(" ").append(string);
} }
this.bukkitCommandManager.executeCommand(BukkitCommandSender.of(commandSender), builder.toString()).whenComplete(((commandResult, throwable) -> { this.bukkitCommandManager.executeCommand(BukkitCommandSender.of(commandSender), builder.toString())
if (throwable != null) { .whenComplete(((commandResult, throwable) -> {
throwable.printStackTrace(); if (throwable != null) {
} else { throwable.printStackTrace();
// Do something... } else {
commandSender.sendMessage("All good!"); // Do something...
} commandSender.sendMessage("All good!");
})); }
}));
return true; return true;
} }
@Override @Override
public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args) throws IllegalArgumentException { public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args) throws
IllegalArgumentException {
final StringBuilder builder = new StringBuilder(this.command.getName()); final StringBuilder builder = new StringBuilder(this.command.getName());
for (final String string : args) { for (final String string : args) {
builder.append(" ").append(string); builder.append(" ").append(string);

9
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // 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 org.bukkit.plugin.Plugin;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -33,14 +35,15 @@ public class BukkitCommandManager extends CommandManager<BukkitCommandSender> {
public BukkitCommandManager(@Nonnull final Plugin owningPlugin, public BukkitCommandManager(@Nonnull final Plugin owningPlugin,
@Nonnull final Function<CommandTree<BukkitCommandSender>, @Nonnull final Function<CommandTree<BukkitCommandSender>,
CommandExecutionCoordinator<BukkitCommandSender>> commandExecutionCoordinator) CommandExecutionCoordinator<BukkitCommandSender>> commandExecutionCoordinator)
throws Exception { throws Exception {
super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler()); super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler());
((BukkitPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); ((BukkitPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this);
this.owningPlugin = owningPlugin; this.owningPlugin = owningPlugin;
} }
@Nonnull public Plugin getOwningPlugin() { @Nonnull
public Plugin getOwningPlugin() {
return this.owningPlugin; return this.owningPlugin;
} }

10
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // 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 com.intellectualsites.commands.sender.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -70,12 +72,14 @@ public abstract class BukkitCommandSender implements CommandSender {
return Objects.hashCode(internalSender); return Objects.hashCode(internalSender);
} }
@Nonnull public org.bukkit.command.CommandSender getInternalSender() { @Nonnull
public org.bukkit.command.CommandSender getInternalSender() {
return this.internalSender; return this.internalSender;
} }
public abstract boolean isPlayer(); public abstract boolean isPlayer();
@Nonnull public abstract Player asPlayer(); @Nonnull
public abstract Player asPlayer();
} }

4
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// //
package com.intellectualsites.commands;import org.bukkit.Bukkit; package com.intellectualsites.commands;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

4
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// //
package com.intellectualsites.commands;import org.bukkit.entity.Player; package com.intellectualsites.commands;
import org.bukkit.entity.Player;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

10
commands-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java
View file

@ -21,7 +21,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // 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 com.intellectualsites.commands.internal.CommandRegistrationHandler;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;
@ -50,7 +52,8 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHandl
final Field knownCommands = SimpleCommandMap.class.getDeclaredField("knownCommands"); final Field knownCommands = SimpleCommandMap.class.getDeclaredField("knownCommands");
knownCommands.setAccessible(true); knownCommands.setAccessible(true);
@SuppressWarnings("ALL") @SuppressWarnings("ALL")
final Map<String, org.bukkit.command.Command> bukkitCommands = (Map<String, org.bukkit.command.Command>) knownCommands.get(commandMap); final Map<String, org.bukkit.command.Command> bukkitCommands = (Map<String, org.bukkit.command.Command>) knownCommands.get(
commandMap);
this.bukkitCommands = bukkitCommands; this.bukkitCommands = bukkitCommands;
this.bukkitCommandManager = bukkitCommandManager; this.bukkitCommandManager = bukkitCommandManager;
} }
@ -68,7 +71,8 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHandl
} else { } else {
label = commandComponent.getName(); label = commandComponent.getName();
} }
this.bukkitCommands.put(label, new BukkitCommand((CommandComponent<BukkitCommandSender, ?>) commandComponent, this.bukkitCommandManager)); this.bukkitCommands.put(label, new BukkitCommand((CommandComponent<BukkitCommandSender, ?>) commandComponent,
this.bukkitCommandManager));
return true; return true;
} }

4
commands-core/pom.xml
View file

@ -25,8 +25,8 @@
~ ~
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>Commands</artifactId> <artifactId>Commands</artifactId>

3
commands-core/src/main/java/com/intellectualsites/commands/CommandManager.java
View file

@ -109,7 +109,8 @@ public abstract class CommandManager<C extends CommandSender> {
this.commandSyntaxFormatter = commandSyntaxFormatter; this.commandSyntaxFormatter = commandSyntaxFormatter;
} }
@Nonnull protected CommandRegistrationHandler getCommandRegistrationHandler() { @Nonnull
protected CommandRegistrationHandler getCommandRegistrationHandler() {
return this.commandRegistrationHandler; return this.commandRegistrationHandler;
} }

3
commands-core/src/main/java/com/intellectualsites/commands/CommandTree.java
View file

@ -94,7 +94,8 @@ public class CommandTree<C extends CommandSender> {
/* Not enough arguments */ /* Not enough arguments */
throw new InvalidSyntaxException(this.commandManager.getCommandSyntaxFormatter() throw new InvalidSyntaxException(this.commandManager.getCommandSyntaxFormatter()
.apply(Objects.requireNonNull( .apply(Objects.requireNonNull(
child.getValue().getOwningCommand()).getComponents()), child.getValue().getOwningCommand())
.getComponents()),
commandContext.getCommandSender(), this.getChain(root) commandContext.getCommandSender(), this.getChain(root)
.stream() .stream()
.map(Node::getValue) .map(Node::getValue)