Uses BentoBox default player and admin command classes.

#47

pom.xml

@@ -58,13 +58,13 @@
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.16.1-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.14.0</bentobox.version>
+        <bentobox.version>1.16.0-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.14.2</build.version>
+        <build.version>1.16.0</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->

src/main/java/world/bentobox/skygrid/Settings.java

@@ -34,12 +34,12 @@ public class Settings implements WorldSettings {
     @ConfigComment("Island Command. What command users will run to access their island.")
     @ConfigComment("To define alias, just separate commands with white space.")
     @ConfigEntry(path = "skygrid.command.island")
-    private String islandCommand = "skygrid sg";
+    private String playerCommandAliases = "skygrid sg";
 
     @ConfigComment("The island admin command.")
     @ConfigComment("To define alias, just separate commands with white space.")
     @ConfigEntry(path = "skygrid.command.admin")
-    private String adminCommand = "sgadmin sga";
+    private String adminCommandAliases = "sgadmin sga";
 
     /* Chests */
     @ConfigComment("Number of unique items per chest")
@@ -1148,46 +1148,34 @@ public boolean isWaterUnsafe() {
         return false;
     }
 
-
     /**
-     * This method returns the islandCommand object.
-     * @return the islandCommand object.
+     * @return the playerCommandAliases
      */
-    public String getIslandCommand()
-    {
-        return islandCommand;
+    @Override
+    public String getPlayerCommandAliases() {
+        return playerCommandAliases;
     }
 
-
     /**
-     * This method returns the adminCommand object.
-     * @return the adminCommand object.
+     * @param playerCommandAliases the playerCommandAliases to set
      */
-    public String getAdminCommand()
-    {
-        return adminCommand;
+    public void setPlayerCommandAliases(String playerCommandAliases) {
+        this.playerCommandAliases = playerCommandAliases;
     }
 
-
     /**
-     * This method sets the islandCommand object value.
-     * @param islandCommand the islandCommand object new value.
-     *
+     * @return the adminCommandAliases
      */
-    public void setIslandCommand(String islandCommand)
-    {
-        this.islandCommand = islandCommand;
+    @Override
+    public String getAdminCommandAliases() {
+        return adminCommandAliases;
     }
 
-
     /**
-     * This method sets the adminCommand object value.
-     * @param adminCommand the adminCommand object new value.
-     *
+     * @param adminCommandAliases the adminCommandAliases to set
      */
-    public void setAdminCommand(String adminCommand)
-    {
-        this.adminCommand = adminCommand;
+    public void setAdminCommandAliases(String adminCommandAliases) {
+        this.adminCommandAliases = adminCommandAliases;
     }
 
     /**

src/main/java/world/bentobox/skygrid/SkyGrid.java

@@ -7,12 +7,12 @@
 import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.commands.admin.DefaultAdminCommand;
+import world.bentobox.bentobox.api.commands.island.DefaultPlayerCommand;
 import world.bentobox.bentobox.api.configuration.Config;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag.Type;
 import world.bentobox.bentobox.lists.Flags;
-import world.bentobox.skygrid.commands.AdminCommand;
-import world.bentobox.skygrid.commands.SkyGridCommand;
 import world.bentobox.skygrid.generators.SkyGridGen;
 import world.bentobox.skygrid.generators.WorldStyles;
 
@@ -54,8 +54,8 @@ private void loadSettings() {
         gen = new SkyGridGen(this);
 
         // Register commands
-        playerCommand = new SkyGridCommand(this);
-        adminCommand = new AdminCommand(this);
+        playerCommand = new DefaultPlayerCommand(this) {};
+        adminCommand = new DefaultAdminCommand(this) {};
 
     }