Merge pull request #19 from kylepls/commands

Merge in commands simplification

Author: kylepls

mcspring-api/mcspring-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mcspring-api</artifactId>
         <groupId>in.kyle.mcspring</groupId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -63,17 +63,4 @@
             <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

mcspring-api/mcspring-jar-loader/pom.xml

@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mcspring-parent</artifactId>
+        <artifactId>mcspring-api</artifactId>
         <groupId>in.kyle.mcspring</groupId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,4 +25,4 @@
             <artifactId>spring-boot-loader</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

mcspring-api/mcspring-subcommands/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mcspring-api</artifactId>
         <groupId>in.kyle.mcspring</groupId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,17 +33,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

mcspring-api/mcspring-subcommands/src/main/java/in/kyle/mcspring/command/TabCommandFactory.java

@@ -1,7 +1,7 @@
 package in.kyle.mcspring.command;
 
+import in.kyle.mcspring.subcommands.PluginCommand;
 import org.bukkit.command.Command;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.plugin.Plugin;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -33,16 +33,16 @@ public TabCommandFactory(SimpleMethodInjection injection,
 
     @Override
     public Command makeCommand(Method method, Object object, String name) {
-        var command = (PluginCommand) super.makeCommand(method, object, name);
+        var command = (org.bukkit.command.PluginCommand) super.makeCommand(method, object, name);
         if (method.getParameterCount() == 1 && method.getParameters()[0].getType()
-                .isAssignableFrom(in.kyle.mcspring.subcommands.PluginCommand.class)) {
+                .isAssignableFrom(PluginCommand.class)) {
             command.setTabCompleter(makeTabCompleter(method, object));
         }
         return command;
     }
 
-    private Consumer<in.kyle.mcspring.subcommands.PluginCommand> methodToConsumer(Method method,
-                                                                                  Object object) {
+    private Consumer<PluginCommand> methodToConsumer(Method method,
+                                                     Object object) {
         return pluginCommand -> {
             method.setAccessible(true);
             invoke(method, object, pluginCommand);
@@ -52,7 +52,7 @@ private Consumer<in.kyle.mcspring.subcommands.PluginCommand> methodToConsumer(Me
     @SneakyThrows
     private Object invoke(Method method,
                           Object object,
-                          in.kyle.mcspring.subcommands.PluginCommand command) {
+                          PluginCommand command) {
         return method.invoke(object, command);
     }