conform command handling to Denizen standard

src/main/java/com/denizenscript/depenizen/bukkit/bridges/BattleNightBridge.java

@@ -5,13 +5,14 @@
 import me.limebyte.battlenight.api.BattleNightAPI;
 import me.limebyte.battlenight.core.BattleNight;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.TagRunnable;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
 import net.aufdemrand.denizencore.tags.ReplaceableTagEvent;
 import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.tags.Attribute;
-import com.denizenscript.depenizen.bukkit.commands.BattleNightCommands;
+import com.denizenscript.depenizen.bukkit.commands.battlenight.BattleNightCommand;
 import net.aufdemrand.denizencore.tags.TagManager;
 
 public class BattleNightBridge extends Bridge {
@@ -25,7 +26,7 @@ public void run(ReplaceableTagEvent event) {
                 tagEvent(event);
             }
         }, "battle");
-        new BattleNightCommands().activate().as("BN").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(BattleNightCommand.class, "BN", "bn [add/kick/start/end]", 1);
     }
 
     public void tagEvent(ReplaceableTagEvent event) {

src/main/java/com/denizenscript/depenizen/bukkit/bridges/BossShopBridge.java

@@ -4,6 +4,7 @@
 import com.denizenscript.depenizen.bukkit.properties.bossshop.BossShopInventoryProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import net.aufdemrand.denizen.objects.dInventory;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
 
 public class BossShopBridge extends Bridge {
@@ -13,7 +14,7 @@ public class BossShopBridge extends Bridge {
     @Override
     public void init() {
         instance = this;
-        new BossShopCommand().activate().as("bossshop").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(BossShopCommand.class, "BOSSSHOP", "bosshop [<shop name>] (target:<player>)", 1);
         PropertyParser.registerProperty(BossShopInventoryProperties.class, dInventory.class);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/bridges/EffectLibBridge.java

@@ -2,6 +2,7 @@
 
 import com.denizenscript.depenizen.bukkit.commands.effectlib.EffectLibCommand;
 import com.denizenscript.depenizen.bukkit.Bridge;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 
 public class EffectLibBridge extends Bridge {
 
@@ -10,6 +11,7 @@ public class EffectLibBridge extends Bridge {
     @Override
     public void init() {
         instance = this;
-        new EffectLibCommand().activate().as("effectlib").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(EffectLibCommand.class,
+                "EFFECTLIB", "effectlib (type:<effect name>) (duration:<duration>) (target:<entity>)", 1);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/bridges/JobsBridge.java

@@ -2,11 +2,12 @@
 
 import com.denizenscript.depenizen.bukkit.properties.jobs.JobPlayer;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.depenizen.bukkit.commands.JobsCommands;
+import com.denizenscript.depenizen.bukkit.commands.jobs.JobsCommand;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJob;
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.container.Job;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.TagRunnable;
 import net.aufdemrand.denizencore.objects.dList;
@@ -30,7 +31,8 @@ public void run(ReplaceableTagEvent event) {
                 tagEvent(event);
             }
         }, "jobs");
-        new JobsCommands().activate().as("jobs").withOptions("See Documentation.", 2);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(JobsCommand.class,
+                "JOBS", "jobs [promote/demote/join/quit] [<job>] (<#>)", 2);
     }
 
     public void tagEvent(ReplaceableTagEvent event) {

src/main/java/com/denizenscript/depenizen/bukkit/bridges/LibsDisguisesBridge.java

@@ -7,6 +7,7 @@
 import com.denizenscript.depenizen.bukkit.objects.libsdisguises.LibsDisguise;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import net.aufdemrand.denizen.objects.dEntity;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
@@ -19,6 +20,7 @@ public void init() {
         ScriptEvent.registerScriptEvent(new EntityUndisguisesScriptEvent());
         ObjectFetcher.registerWithObjectFetcher(LibsDisguise.class);
         PropertyParser.registerProperty(LibsDisguiseEntityProperties.class, dEntity.class);
-        new DisguiseCommand().activate().as("DISGUISE").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(DisguiseCommand.class, "DISGUISE",
+                "disguise [remove/player/mob/misc] (type:<entity type>) (target:<entity>) (name:<text>) (baby:true/false) (id:<number>) (data:<number>) (self:true/false)", 1);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/bridges/McMMOBridge.java

@@ -1,11 +1,12 @@
 package com.denizenscript.depenizen.bukkit.bridges;
 
-import com.denizenscript.depenizen.bukkit.commands.McMMOCommands;
+import com.denizenscript.depenizen.bukkit.commands.mcmmo.McMMOCommand;
 import com.denizenscript.depenizen.bukkit.events.mcmmo.*;
 import com.denizenscript.depenizen.bukkit.properties.mcmmo.McMMOPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.dParty;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
@@ -27,7 +28,8 @@ public void run(ReplaceableTagEvent event) {
             }
         }, "party");
         PropertyParser.registerProperty(McMMOPlayerProperties.class, dPlayer.class);
-        new McMMOCommands().activate().as("MCMMO").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(McMMOCommand.class,
+                "MCMMO", "mcmmo [add/remove/set] [levels/xp/xprate/vampirism/hardcore/leader] (skill:<skill>) (state:{toggle}/true/false) (qty:<#>) (party:<party>)", 1);
         ScriptEvent.registerScriptEvent(new mcMMOPlayerLevelChangeScriptEvent());
         ScriptEvent.registerScriptEvent(new mcMMOPlayerLevelUpScriptEvent());
         ScriptEvent.registerScriptEvent(new mcMMOPlayerLevelDownScriptEvent());

src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java

@@ -9,6 +9,7 @@
 import com.denizenscript.depenizen.bukkit.properties.mobarena.MobArenaPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.mobarena.MobArenaArena;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
@@ -34,7 +35,8 @@ public void run(ReplaceableTagEvent event) {
                 tagEvent(event);
             }
         }, "mobarena");
-        new MobArenaCommand().activate().as("mobarena").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(MobArenaCommand.class,
+                "MOBARENA", "mobarena [<mobarena>] (add:<player>|...) (remove:<player>|...) (spectate:<player>|...)", 1);
         ScriptEvent.registerScriptEvent(new MobArenaStartsScriptEvent());
         ScriptEvent.registerScriptEvent(new MobArenaEndsScriptEvent());
         ScriptEvent.registerScriptEvent(new MobArenaWaveChangesScriptEvent());

src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java

@@ -10,6 +10,7 @@
 import io.lumine.xikage.mythicmobs.mobs.MythicMob;
 import com.denizenscript.depenizen.bukkit.events.mythicmobs.MythicMobsDeathEvent;
 import io.lumine.xikage.mythicmobs.MythicMobs;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
@@ -25,7 +26,8 @@ public void init() {
         ObjectFetcher.registerWithObjectFetcher(MythicMobsMob.class);
         PropertyParser.registerProperty(MythicMobsEntityProperties.class, dEntity.class);
         ScriptEvent.registerScriptEvent(new MythicMobsDeathEvent());
-        new MythicSpawnCommand().activate().as("mythicspawn").withOptions("See Documentation", 2);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(MythicSpawnCommand.class,
+                "MYTHICSPAWN", "mythicspawn [<name>] [<location>] (level:<#>)", 2);
     }
 
     public static boolean isMythicMob(Entity entity) {

src/main/java/com/denizenscript/depenizen/bukkit/bridges/NoteBlockAPIBridge.java

@@ -4,6 +4,7 @@
 import com.denizenscript.depenizen.bukkit.properties.noteblockapi.NoteBlockAPIPlayerProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
 
 public class NoteBlockAPIBridge extends Bridge {
@@ -12,6 +13,7 @@ public class NoteBlockAPIBridge extends Bridge {
     public void init() {
 
         PropertyParser.registerProperty(NoteBlockAPIPlayerProperties.class, dPlayer.class);
-        new NBSCommand().activate().as("NBS").withOptions("See Documentation.", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(NBSCommand.class,
+                "NBS", "nbs [play/stop] (file:<file path>) [targets:<entity>|...]", 1);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlayerPointsBridge.java

@@ -4,6 +4,7 @@
 import com.denizenscript.depenizen.bukkit.properties.playerpoints.PlayerPointsPlayerProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
 
 public class PlayerPointsBridge extends Bridge {
@@ -13,7 +14,8 @@ public class PlayerPointsBridge extends Bridge {
     @Override
     public void init() {
         instance = this;
-        new PlayerPointsCommand().activate().as("playerpoints").withOptions("See Documentation.", 2);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(PlayerPointsCommand.class,
+                "PLAYERPOINTS", "playerpoints [set/give/take] (amount:<amount>) (target:<player>)", 2);
         PropertyParser.registerProperty(PlayerPointsPlayerProperties.class, dPlayer.class);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/bridges/WorldGuardBridge.java

@@ -8,6 +8,7 @@
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.objects.dWorld;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.TagRunnable;
@@ -31,7 +32,8 @@ public void init() {
         PropertyParser.registerProperty(WorldGuardPlayerProperties.class, dPlayer.class);
         PropertyParser.registerProperty(WorldGuardCuboidProperties.class, dCuboid.class);
         PropertyParser.registerProperty(WorldGuardWorldProperties.class, dWorld.class);
-        new RegionCommand().activate().as("REGION").withOptions("See Documentation.", 2);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(RegionCommand.class,
+                "REGION", "region [{add} <cuboid>/remove <world>] [id:<name>]", 2);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {

src/main/java/com/denizenscript/depenizen/bukkit/bridges/dtlTradersBridge.java

@@ -2,11 +2,13 @@
 
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.depenizen.bukkit.commands.dtltraders.TraderCommand;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
 
 public class dtlTradersBridge extends Bridge {
 
     @Override
     public void init() {
-        new TraderCommand().activate().as("trader").withOptions("trader [open/close] ({buy}/sell) ({stock}/relation)", 1);
+        DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(TraderCommand.class,
+                "TRADER", "trader [open/close] ({buy}/sell) ({stock}/relation)", 1);
     }
 }

src/main/java/com/denizenscript/depenizen/bukkit/commands/BattleNightCommands.java → src/main/java/com/denizenscript/depenizen/bukkit/commands/battlenight/BattleNightCommand.java

@@ -1,4 +1,4 @@
-package com.denizenscript.depenizen.bukkit.commands;
+package com.denizenscript.depenizen.bukkit.commands.battlenight;
 
 import me.limebyte.battlenight.core.BattleNight;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
@@ -9,7 +9,7 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 
-public class BattleNightCommands extends AbstractCommand {
+public class BattleNightCommand extends AbstractCommand {
 
     // <--[command]
     // @Name BN

src/main/java/com/denizenscript/depenizen/bukkit/commands/JobsCommands.java → src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java

@@ -1,4 +1,4 @@
-package com.denizenscript.depenizen.bukkit.commands;
+package com.denizenscript.depenizen.bukkit.commands.jobs;
 
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.container.JobsPlayer;
@@ -10,7 +10,7 @@
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJob;
 
-public class JobsCommands extends AbstractCommand {
+public class JobsCommand extends AbstractCommand {
 
     // <--[command]
     // @Name Jobs
@@ -43,7 +43,7 @@ public class JobsCommands extends AbstractCommand {
 
     private enum Action {PROMOTE, DEMOTE, JOIN, QUIT}
 
-    public JobsCommands() {
+    public JobsCommand() {
 
     }
 

src/main/java/com/denizenscript/depenizen/bukkit/commands/McMMOCommands.java → src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java

@@ -1,4 +1,4 @@
-package com.denizenscript.depenizen.bukkit.commands;
+package com.denizenscript.depenizen.bukkit.commands.mcmmo;
 
 import com.gmail.nossr50.api.ExperienceAPI;
 import com.gmail.nossr50.api.PartyAPI;
@@ -16,7 +16,7 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 
-public class McMMOCommands extends AbstractCommand {
+public class McMMOCommand extends AbstractCommand {
 
     // <--[command]
     // @Name mcMMO
@@ -54,7 +54,7 @@ private enum State {TRUE, FALSE, TOGGLE}
 
     private enum Type {XP, LEVELS, TOGGLE, XPRATE, LEADER, VAMPIRISM, HARDCORE}
 
-    public McMMOCommands() {
+    public McMMOCommand() {
 
     }
 

src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java

@@ -7,7 +7,6 @@
 import com.xxmicloxx.NoteBlockAPI.utils.NBSDecoder;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dPlayer;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;

src/main/java/com/denizenscript/depenizen/bukkit/commands/TownyCommands.java → src/main/java/com/denizenscript/depenizen/bukkit/commands/towny/TownyCommand.java

@@ -1,4 +1,4 @@
-package com.denizenscript.depenizen.bukkit.commands;
+package com.denizenscript.depenizen.bukkit.commands.towny;
 
 import com.denizenscript.depenizen.bukkit.objects.dNation;
 import com.denizenscript.depenizen.bukkit.objects.dTown;
@@ -10,7 +10,7 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 
-public class TownyCommands extends AbstractCommand {
+public class TownyCommand extends AbstractCommand {
 
     // TODO: make this work
 
@@ -25,7 +25,7 @@ private enum Type {
         CAPITAL, OPEN, PUBLIC, MAYOR, SURNAME, TITLE, RANK, BOARD, WAR, MAXSIZE, TAXES, TAG, SPAWN, PERM, RELATION
     }
 
-    public TownyCommands() {
+    public TownyCommand() {
 
     }
 

src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java

@@ -8,7 +8,6 @@
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizencore.objects.properties.Property;
-import net.aufdemrand.denizencore.objects.Mechanism;
 import com.denizenscript.depenizen.bukkit.bridges.EssentialsBridge;
 
 import java.util.GregorianCalendar;