Rewrite how the commands work with Aikar FW.

The basic /bmv command no longer requires any permission.
The /bmv list command now displays all worlds, including those not currently loaded by BulMultiverse.

Author: AliHaine

pom.xml

@@ -9,7 +9,7 @@
     <name>BulMultiverse</name>
     <description>BulMultiverse is a Minecraft plugin, ultra light and optimized world manager</description>
     <url>https://github.com/BulPlugins/BulMultiverse</url>
-    <version>1.0</version>
+    <version>1.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/com/alihaine/bulmultiverse/BulMultiverse.java

@@ -1,5 +1,6 @@
 package com.alihaine.bulmultiverse;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.PaperCommandManager;
 import com.alihaine.bulmultiverse.addon.AddonManager;
 import com.alihaine.bulmultiverse.addon.BulMultiverseAddon;
@@ -21,11 +22,11 @@ public class BulMultiverse extends JavaPlugin {
     public static final String line = "------------------------------------------------------------------";
 
     private static BulMultiverse bulMultiverse;
-    private WorldsFile worldsFile;
-    private WorldOptionManager worldOptionManager;
-    private WorldDataManager worldDataManager;
-    private AddonManager addonManager;
-    private PaperCommandManager commandManager;
+    private static WorldsFile worldsFile;
+    private static WorldOptionManager worldOptionManager;
+    private static WorldDataManager worldDataManager;
+    private static AddonManager addonManager;
+    private static PaperCommandManager commandManager;
 
 
     @Override
@@ -63,6 +64,7 @@ public void onDisable() {
     }
 
     private void setupDefaultCommands() {
+        commandManager.registerCommand(new BaseBmvCommand());
         commandManager.registerCommand(new AddonsCommand());
         commandManager.registerCommand(new InfoCommand());
         commandManager.registerCommand(new ListCommand());
@@ -92,24 +94,24 @@ public static BulMultiverse getBulMultiverse() {
         return bulMultiverse;
     }
 
-    public WorldsFile getWorldsFile() {
+    public static WorldsFile getWorldsFile() {
         return worldsFile;
     }
 
-    public WorldOptionManager getWorldOptionManager() {
+    public static WorldOptionManager getWorldOptionManager() {
         return worldOptionManager;
     }
 
-    public WorldDataManager getWorldDataManager() {
+    public static WorldDataManager getWorldDataManager() {
         return worldDataManager;
     }
 
-    public AddonManager getAddonManager() { return addonManager; }
+    public static AddonManager getAddonManager() { return addonManager; }
 
     /*
      * Addons must use this function to register additional commands.
      */
-    public void registerCommand(BaseBmvCommand newCommand) {
+    public void registerCommand(BaseCommand newCommand) {
         commandManager.registerCommand(newCommand);
     }
 }

src/main/java/com/alihaine/bulmultiverse/command/AddonsCommand.java

@@ -1,19 +1,20 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import com.alihaine.bulmultiverse.BulMultiverse;
 import com.alihaine.bulmultiverse.addon.BulMultiverseAddon;
 import org.bukkit.command.CommandSender;
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.addon")
-public class AddonsCommand extends BaseBmvCommand {
+public class AddonsCommand extends BaseCommand {
     @Subcommand("addon|addons")
     @Description("Display loaded addons")
     @Syntax("/bmv addon")
     public void onAddonList(CommandSender sender) {
         sender.sendMessage("§eLoaded addons: ");
-        for (BulMultiverseAddon addon : addonManager.getAddonsList())
+        for (BulMultiverseAddon addon :  BulMultiverse.getAddonManager().getAddonsList())
             sender.sendMessage("§e" + addon.getName());
 
     }
@@ -22,7 +23,7 @@ public void onAddonList(CommandSender sender) {
     @Description("Display infos about a specified addon")
     @Syntax("/bmv addon [addon_name]")
     public void onAddonTarget(CommandSender sender, String addonName) {
-        BulMultiverseAddon addon = BulMultiverse.getBulMultiverse().getAddonManager().getAddonFromName(addonName);
+        BulMultiverseAddon addon = BulMultiverse.getAddonManager().getAddonFromName(addonName);
         if (addon == null) {
             sender.sendMessage("Addon with name: " + addonName + " not found");
             return;

src/main/java/com/alihaine/bulmultiverse/command/BaseBmvCommand.java

@@ -4,23 +4,14 @@
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.Default;
 import com.alihaine.bulmultiverse.BulMultiverse;
-import com.alihaine.bulmultiverse.addon.AddonManager;
-import com.alihaine.bulmultiverse.file.WorldsFile;
-import com.alihaine.bulmultiverse.world.WorldDataManager;
-import com.alihaine.bulmultiverse.world.WorldOptionManager;
 import org.bukkit.command.CommandSender;
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 public class BaseBmvCommand extends BaseCommand {
+
     /*
-     * Commands may need to use these instances frequently
-     * To improve readability and make access easier, they are defined here.
+     * All commands must use this variable as the root alias.
      */
-    protected final WorldDataManager worldDataManager = BulMultiverse.getBulMultiverse().getWorldDataManager();
-    protected final WorldsFile worldsFile = BulMultiverse.getBulMultiverse().getWorldsFile();
-    protected final WorldOptionManager worldOptionManager = BulMultiverse.getBulMultiverse().getWorldOptionManager();
-    protected final AddonManager addonManager = BulMultiverse.getBulMultiverse().getAddonManager();
-
     public static final String commandRootAlias = "bmv|bulmv|bulmultiverse";
 
     @Default

src/main/java/com/alihaine/bulmultiverse/command/CreateCommand.java

@@ -1,5 +1,6 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import com.alihaine.bulmultiverse.BulMultiverse;
 import com.alihaine.bulmultiverse.file.ConfigFile;
@@ -14,7 +15,7 @@
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.create")
-public class CreateCommand extends BaseBmvCommand {
+public class CreateCommand extends BaseCommand {
     @Subcommand("create")
     @Description("Create a new world")
     @Syntax("/bmv create [World Name] (Flags)")
@@ -26,15 +27,15 @@ public void onCreate(CommandSender sender, String worldName, String[] flags) {
             return;
         }
 
-        if (BulMultiverse.getBulMultiverse().getWorldDataManager().isWorldAlreadyCreated(worldName) || worldName.equalsIgnoreCase("overworld") ) {
+        if (BulMultiverse.getWorldDataManager().isWorldAlreadyCreated(worldName) || worldName.equalsIgnoreCase("overworld") ) {
             new Message("world_already_exist").sendMessage(sender);
             return;
         }
 
         for (int i = 0; i < flags.length - 1; i+=2) {
             String flag = flags[i];
             try {
-                convertToOptionString.put(worldOptionManager.getOption(flag), flags[i+1]);
+                convertToOptionString.put(BulMultiverse.getWorldOptionManager().getOption(flag), flags[i+1]);
             } catch (Exception exception) {
                 new Message("flag_not_found")
                         .withPlaceHolder("name", flag)
@@ -44,6 +45,6 @@ public void onCreate(CommandSender sender, String worldName, String[] flags) {
 
         WorldData worldData = new WorldData(worldName, convertToOptionString);
         worldData.createWorld(sender);
-        BulMultiverse.getBulMultiverse().getWorldsFile().saveWorldDataToFile(worldData);
+        BulMultiverse.getWorldsFile().saveWorldDataToFile(worldData);
     }
 }

src/main/java/com/alihaine/bulmultiverse/command/FlagsCommand.java

@@ -1,17 +1,19 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
+import com.alihaine.bulmultiverse.BulMultiverse;
 import com.alihaine.bulmultiverse.file.Message;
 import org.bukkit.command.CommandSender;
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.flags")
-public class FlagsCommand extends BaseBmvCommand {
+public class FlagsCommand extends BaseCommand {
     @Subcommand("flag|flags")
     @Description("Display all the available flags")
     @Syntax("/bmv flags")
     public void onFlags(CommandSender sender) {
-        worldOptionManager.getAvailableOptionsList().forEach((value) -> {
+        BulMultiverse.getWorldOptionManager().getAvailableOptionsList().forEach((value) -> {
             new Message("flags_pattern").
                     withPlaceHolder("usage", value.getUsage()).
                     withPlaceHolder("description", value.getDescription()).

src/main/java/com/alihaine/bulmultiverse/command/HelpCommand.java

@@ -1,13 +1,14 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.CommandHelp;
 import co.aikar.commands.HelpEntry;
 import co.aikar.commands.annotation.*;
 import com.alihaine.bulmultiverse.file.Message;
 import org.bukkit.command.CommandSender;
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
-public class HelpCommand extends BaseBmvCommand {
+public class HelpCommand extends BaseCommand {
 
     @Subcommand("help")
     @Description("Display the help menu")

src/main/java/com/alihaine/bulmultiverse/command/InfoCommand.java

@@ -1,5 +1,6 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import com.alihaine.bulmultiverse.BulMultiverse;
 import com.alihaine.bulmultiverse.file.Message;
@@ -9,9 +10,9 @@
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.info")
-public class InfoCommand extends BaseBmvCommand {
+public class InfoCommand extends BaseCommand {
     private WorldData getWorldData(String worldName, CommandSender sender) {
-        WorldData worldData = worldDataManager.getWorldDataFromWorldName(worldName);
+        WorldData worldData = BulMultiverse.getWorldDataManager().getWorldDataFromWorldName(worldName);
         if (worldData == null) {
             new Message("world_not_found").withPlaceHolder("name", worldName).sendMessage(sender);
             return null;

src/main/java/com/alihaine/bulmultiverse/command/ListCommand.java

@@ -1,18 +1,36 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
+import com.alihaine.bulmultiverse.BulMultiverse;
+import com.alihaine.bulmultiverse.world.WorldData;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.list")
-public class ListCommand extends BaseBmvCommand {
+public class ListCommand extends BaseCommand {
     @Subcommand("l|list|lists")
     @Description("List all the loaded worlds")
     @Syntax("/bmv list")
     public void onList(CommandSender commandSender) {
         commandSender.sendMessage("§aLoaded worlds");
-        worldDataManager.getWorldsData().forEach(worldData -> {
-            commandSender.sendMessage(worldData.getWorldName());
+        Set<String> loadedWorlds = BulMultiverse.getWorldDataManager()
+                .getWorldsData()
+                .stream()
+                .map(WorldData::getWorldName)
+                .collect(Collectors.toSet());
+
+        Bukkit.getWorlds().forEach(world -> {
+            if (loadedWorlds.contains(world.getName()))
+                commandSender.sendMessage("§e" + world.getName());
+            else
+                commandSender.sendMessage("§e" + world.getName() + " §o§cnot loaded with BulMultiverse");
         });
     }
 }

src/main/java/com/alihaine/bulmultiverse/command/LoadCommand.java

@@ -1,6 +1,8 @@
 package com.alihaine.bulmultiverse.command;
 
+import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
+import com.alihaine.bulmultiverse.BulMultiverse;
 import com.alihaine.bulmultiverse.file.Message;
 import com.alihaine.bulmultiverse.world.WorldData;
 import org.bukkit.Bukkit;
@@ -10,19 +12,19 @@
 
 @CommandAlias(BaseBmvCommand.commandRootAlias)
 @CommandPermission("bulmultiverse.load")
-public class LoadCommand extends BaseBmvCommand {
+public class LoadCommand extends BaseCommand {
     @Subcommand("load")
     @Description("Load existing world")
     @Syntax("/bmv load [world_name]")
     public void onLoad(CommandSender sender, String targetWorld) {
         Bukkit.getConsoleSender().sendMessage(targetWorld);
 
-        if (!worldsFile.isWorldFolderExisting(targetWorld)) {
+        if (!BulMultiverse.getWorldsFile().isWorldFolderExisting(targetWorld)) {
             new Message("world_not_found").withPlaceHolder("name", targetWorld).sendMessage(sender);
             return;
         }
         WorldData worldData = new WorldData(targetWorld, new HashMap<>());
         worldData.createWorld(sender);
-        worldsFile.saveWorldDataToFile(worldData);
+        BulMultiverse.getWorldsFile().saveWorldDataToFile(worldData);
     }
 }