From 514aa6c725e7343d0db491e932acb67c0fdfa570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Fri, 11 Sep 2020 09:15:12 +0200 Subject: [PATCH] Restructure project and fix JavaDoc generation --- .../intellectualsites/commands/Command.java | 26 +++++++++++-------- .../commands/sender/CommandSender.java | 1 + .../cloud-bukkit}/pom.xml | 1 + .../commands/BukkitCommand.java | 0 .../commands/BukkitCommandManager.java | 0 .../commands/BukkitCommandMeta.java | 0 .../commands/BukkitCommandMetaBuilder.java | 0 .../commands/BukkitCommandSender.java | 0 .../commands/BukkitConsoleSender.java | 0 .../commands/BukkitPlayerSender.java | 0 .../BukkitPluginRegistrationHandler.java | 0 pom.xml | 5 +++- 12 files changed, 21 insertions(+), 12 deletions(-) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/pom.xml (98%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitCommand.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitCommandMeta.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitCommandMetaBuilder.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java (100%) rename {cloud-bukkit => cloud-minecraft/cloud-bukkit}/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java (100%) diff --git a/cloud-core/src/main/java/com/intellectualsites/commands/Command.java b/cloud-core/src/main/java/com/intellectualsites/commands/Command.java index c5c228ae..2e107615 100644 --- a/cloud-core/src/main/java/com/intellectualsites/commands/Command.java +++ b/cloud-core/src/main/java/com/intellectualsites/commands/Command.java @@ -31,11 +31,7 @@ import com.intellectualsites.commands.sender.CommandSender; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import java.util.function.Consumer; /** @@ -100,6 +96,9 @@ public class Command { * Create a new command builder * * @param commandName Base command component + * @param commandMeta Command meta instance + * @param Command sender type + * @param Command meta type * @return Command builder */ @Nonnull @@ -163,6 +162,7 @@ public class Command { * Get the longest chain of similar components for * two commands * + * @param other Command to compare to * @return List containing the longest shared component chain */ public List> getSharedComponentChain(@Nonnull final Command other) { @@ -216,7 +216,8 @@ public class Command { public Builder withComponent(@Nonnull final CommandComponent component) { final List> commandComponents = new LinkedList<>(this.commandComponents); commandComponents.add(component); - return new Builder<>(this.commandMeta, this.senderType, commandComponents, this.commandExecutionHandler, this.commandPermission); + return new Builder<>(this.commandMeta, this.senderType, commandComponents, this.commandExecutionHandler, + this.commandPermission); } /** @@ -230,8 +231,8 @@ public class Command { */ @Nonnull public Builder withComponent(@Nonnull final Class clazz, - @Nonnull final String name, - @Nonnull final Consumer> builderConsumer) { + @Nonnull final String name, + @Nonnull final Consumer> builderConsumer) { final CommandComponent.Builder builder = CommandComponent.ofType(clazz, name); builderConsumer.accept(builder); return this.withComponent(builder.build()); @@ -245,7 +246,8 @@ public class Command { */ @Nonnull public Builder withHandler(@Nonnull final CommandExecutionHandler commandExecutionHandler) { - return new Builder<>(this.commandMeta, this.senderType, this.commandComponents, commandExecutionHandler, this.commandPermission); + return new Builder<>(this.commandMeta, this.senderType, this.commandComponents, commandExecutionHandler, + this.commandPermission); } /** @@ -256,7 +258,8 @@ public class Command { */ @Nonnull public Builder withSenderType(@Nonnull final Class senderType) { - return new Builder<>(this.commandMeta, senderType, this.commandComponents, this.commandExecutionHandler, this.commandPermission); + return new Builder<>(this.commandMeta, senderType, this.commandComponents, this.commandExecutionHandler, + this.commandPermission); } /** @@ -267,7 +270,8 @@ public class Command { */ @Nonnull public Builder withPermission(@Nonnull final String permission) { - return new Builder<>(this.commandMeta, this.senderType, this.commandComponents, this.commandExecutionHandler, permission); + return new Builder<>(this.commandMeta, this.senderType, this.commandComponents, this.commandExecutionHandler, + permission); } /** diff --git a/cloud-core/src/main/java/com/intellectualsites/commands/sender/CommandSender.java b/cloud-core/src/main/java/com/intellectualsites/commands/sender/CommandSender.java index 672c3fec..87844df9 100644 --- a/cloud-core/src/main/java/com/intellectualsites/commands/sender/CommandSender.java +++ b/cloud-core/src/main/java/com/intellectualsites/commands/sender/CommandSender.java @@ -31,6 +31,7 @@ public interface CommandSender { * Check if the command sender has a given permission node * * @param permission Permission node + * @return {@code true} if the sender has the given permission node, else {@code false} */ boolean hasPermission(@Nonnull String permission); diff --git a/cloud-bukkit/pom.xml b/cloud-minecraft/cloud-bukkit/pom.xml similarity index 98% rename from cloud-bukkit/pom.xml rename to cloud-minecraft/cloud-bukkit/pom.xml index 4bc9e0cf..6a69f5c5 100644 --- a/cloud-bukkit/pom.xml +++ b/cloud-minecraft/cloud-bukkit/pom.xml @@ -29,6 +29,7 @@ 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"> + ../../ cloud com.intellectualsites 1.0-SNAPSHOT diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommand.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandManager.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMeta.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMeta.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMeta.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMeta.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMetaBuilder.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMetaBuilder.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMetaBuilder.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandMetaBuilder.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitCommandSender.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitConsoleSender.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPlayerSender.java diff --git a/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java similarity index 100% rename from cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java rename to cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/BukkitPluginRegistrationHandler.java diff --git a/pom.xml b/pom.xml index 00c2a3d8..eb4397a9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1.0-SNAPSHOT cloud-jline - cloud-bukkit + cloud-minecraft/cloud-bukkit cloud-core pom @@ -95,6 +95,9 @@ + + 1.8 + org.apache.maven.plugins