Some more reorganising

2 files changed, 11 insertions, 8 deletions

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
index ebcc3e8..5920bd5 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
@@ -34,7 +34,7 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Stream;
 
-public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
+public class BukkitSparkPlugin extends JavaPlugin implements SparkPlugin {
 
     private CommandExecutor tpsCommand = null;
     private SparkPlatform platform;
@@ -90,12 +90,12 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
     }
 
     @Override
-    public Path getPluginFolder() {
+    public Path getPluginDirectory() {
         return getDataFolder().toPath();
     }
 
     @Override
-    public String getLabel() {
+    public String getCommandName() {
         return "spark";
     }
 
@@ -108,8 +108,8 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
     }
 
     @Override
-    public void runAsync(Runnable r) {
-        getServer().getScheduler().runTaskAsynchronously(SparkBukkitPlugin.this, r);
+    public void executeAsync(Runnable task) {
+        getServer().getScheduler().runTaskAsynchronously(BukkitSparkPlugin.this, task);
     }
 
     @Override
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
index 66a1568..c65bc23 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
@@ -44,7 +44,7 @@ import java.util.Map;
 /**
  * Utility for interacting with the server's {@link CommandMap} instance.
  */
-public final class CommandMapUtil {
+final class CommandMapUtil {
 
     private static final Constructor<PluginCommand> COMMAND_CONSTRUCTOR;
     private static final Field COMMAND_MAP_FIELD;
@@ -96,8 +96,11 @@ public final class CommandMapUtil {
                 PluginCommand cmd = COMMAND_CONSTRUCTOR.newInstance(alias, plugin);
 
                 getCommandMap().register(plugin.getDescription().getName(), cmd);
-                getKnownCommandMap().put(plugin.getDescription().getName().toLowerCase() + ":" + alias.toLowerCase(), cmd);
-                getKnownCommandMap().put(alias.toLowerCase(), cmd);
+
+                Map<String, Command> knownCommandMap = getKnownCommandMap();
+                knownCommandMap.put(plugin.getDescription().getName().toLowerCase() + ":" + alias.toLowerCase(), cmd);
+                knownCommandMap.put(alias.toLowerCase(), cmd);
+
                 cmd.setLabel(alias.toLowerCase());
 
                 cmd.setExecutor(command);