From b4cd82af292c65f0441629a504c5cf5f0d9cf34a Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Sun, 24 Feb 2019 13:36:31 -0800 Subject: [PATCH] remove some old unused stuff --- .../java/net/aufdemrand/denizen/Denizen.java | 13 -- .../denizen/DenizenCommandHandler.java | 12 +- .../exceptions/RequirementCheckException.java | 10 - .../commands/core/CooldownCommand.java | 3 +- .../scripts/commands/core/EventCommand.java | 3 +- .../scripts/commands/core/FailCommand.java | 3 +- .../commands/core/FileCopyCommand.java | 3 +- .../scripts/commands/core/FinishCommand.java | 3 +- .../scripts/commands/core/FlagCommand.java | 6 +- .../scripts/commands/core/InjectCommand.java | 3 +- .../scripts/commands/core/LogCommand.java | 3 +- .../scripts/commands/core/NoteCommand.java | 7 +- .../scripts/commands/core/QueueCommand.java | 3 +- .../scripts/commands/core/RandomCommand.java | 7 +- .../scripts/commands/core/RepeatCommand.java | 28 +-- .../scripts/commands/core/ResetCommand.java | 3 +- .../scripts/commands/core/RunCommand.java | 3 +- .../scripts/commands/core/SQLCommand.java | 3 +- .../scripts/commands/core/WaitCommand.java | 3 +- .../scripts/commands/core/WhileCommand.java | 28 +-- .../scripts/commands/core/YamlCommand.java | 3 +- .../scripts/commands/core/ZapCommand.java | 13 +- .../scripts/commands/entity/AgeCommand.java | 3 +- .../commands/entity/AnimateCommand.java | 3 +- .../commands/entity/AttackCommand.java | 3 +- .../scripts/commands/entity/BurnCommand.java | 3 +- .../scripts/commands/entity/CastCommand.java | 3 +- .../scripts/commands/entity/EquipCommand.java | 3 +- .../scripts/commands/entity/FeedCommand.java | 3 +- .../scripts/commands/entity/FlyCommand.java | 3 +- .../commands/entity/FollowCommand.java | 3 +- .../scripts/commands/entity/HeadCommand.java | 3 +- .../scripts/commands/entity/HealCommand.java | 3 +- .../commands/entity/HealthCommand.java | 3 +- .../scripts/commands/entity/HurtCommand.java | 3 +- .../commands/entity/InvisibleCommand.java | 7 +- .../scripts/commands/entity/LeashCommand.java | 3 +- .../scripts/commands/entity/LookCommand.java | 3 +- .../scripts/commands/entity/MountCommand.java | 3 +- .../scripts/commands/entity/PushCommand.java | 3 +- .../commands/entity/RemoveCommand.java | 3 +- .../commands/entity/RotateCommand.java | 3 +- .../scripts/commands/entity/ShootCommand.java | 3 +- .../scripts/commands/entity/SpawnCommand.java | 3 +- .../commands/entity/TeleportCommand.java | 3 +- .../scripts/commands/entity/WalkCommand.java | 3 +- .../commands/item/DisplayItemCommand.java | 3 +- .../commands/item/FakeItemCommand.java | 3 +- .../scripts/commands/item/GiveCommand.java | 3 +- .../commands/item/InventoryCommand.java | 3 +- .../scripts/commands/item/MapCommand.java | 9 +- .../scripts/commands/item/NBTCommand.java | 7 +- .../scripts/commands/item/ScribeCommand.java | 3 +- .../scripts/commands/item/TakeCommand.java | 3 +- .../scripts/commands/npc/ActionCommand.java | 3 +- .../scripts/commands/npc/AnchorCommand.java | 3 +- .../commands/npc/AssignmentCommand.java | 7 +- .../scripts/commands/npc/BreakCommand.java | 7 +- .../scripts/commands/npc/CreateCommand.java | 3 +- .../scripts/commands/npc/DespawnCommand.java | 3 +- .../commands/npc/DisengageCommand.java | 3 +- .../scripts/commands/npc/EngageCommand.java | 7 +- .../scripts/commands/npc/FishCommand.java | 7 +- .../commands/npc/LookcloseCommand.java | 3 +- .../scripts/commands/npc/PauseCommand.java | 3 +- .../scripts/commands/npc/PoseCommand.java | 9 +- .../scripts/commands/npc/PushableCommand.java | 6 +- .../scripts/commands/npc/RenameCommand.java | 7 +- .../scripts/commands/npc/SitCommand.java | 3 +- .../scripts/commands/npc/StandCommand.java | 7 +- .../scripts/commands/npc/TraitCommand.java | 3 +- .../scripts/commands/npc/TriggerCommand.java | 3 +- .../commands/npc/VulnerableCommand.java | 7 +- .../commands/player/ActionBarCommand.java | 3 +- .../commands/player/AdvancementCommand.java | 3 +- .../commands/player/BlockCrackCommand.java | 3 +- .../scripts/commands/player/ChatCommand.java | 3 +- .../commands/player/CompassCommand.java | 3 +- .../commands/player/ExperienceCommand.java | 3 +- .../scripts/commands/player/GlowCommand.java | 3 +- .../scripts/commands/player/GroupCommand.java | 7 +- .../commands/player/ItemCooldownCommand.java | 3 +- .../scripts/commands/player/KickCommand.java | 3 +- .../scripts/commands/player/MoneyCommand.java | 3 +- .../commands/player/NarrateCommand.java | 3 +- .../commands/player/OpenTradesCommand.java | 3 +- .../commands/player/OxygenCommand.java | 3 +- .../commands/player/PermissionCommand.java | 3 +- .../commands/player/ShowFakeCommand.java | 3 +- .../commands/player/SidebarCommand.java | 3 +- .../commands/player/StatisticCommand.java | 3 +- .../scripts/commands/player/TeamCommand.java | 3 +- .../scripts/commands/player/TitleCommand.java | 3 +- .../scripts/commands/player/ToastCommand.java | 3 +- .../commands/server/AnnounceCommand.java | 3 +- .../scripts/commands/server/BanCommand.java | 3 +- .../commands/server/BossBarCommand.java | 3 +- .../commands/server/ExecuteCommand.java | 3 +- .../commands/server/ScoreboardCommand.java | 3 +- .../commands/world/AnimateChestCommand.java | 3 +- .../commands/world/ChunkLoadCommand.java | 3 +- .../commands/world/CopyBlockCommand.java | 3 +- .../commands/world/CreateWorldCommand.java | 3 +- .../scripts/commands/world/DropCommand.java | 3 +- .../commands/world/ExplodeCommand.java | 3 +- .../commands/world/FireworkCommand.java | 3 +- .../commands/world/GameRuleCommand.java | 3 +- .../scripts/commands/world/LightCommand.java | 6 +- .../scripts/commands/world/MidiCommand.java | 3 +- .../commands/world/ModifyBlockCommand.java | 3 +- .../commands/world/PlayEffectCommand.java | 3 +- .../commands/world/PlaySoundCommand.java | 3 +- .../commands/world/SchematicCommand.java | 3 +- .../scripts/commands/world/SignCommand.java | 3 +- .../scripts/commands/world/StrikeCommand.java | 3 +- .../scripts/commands/world/SwitchCommand.java | 3 +- .../scripts/commands/world/TimeCommand.java | 3 +- .../commands/world/WeatherCommand.java | 3 +- .../commands/world/WorldBorderCommand.java | 3 +- .../denizen/tags/core/ServerTags.java | 18 -- .../denizen/utilities/ReflectionUtil.java | 166 ----------------- .../denizen/utilities/RuntimeCompiler.java | 172 ------------------ .../denizen/utilities/dExternalRunnable.java | 8 - 123 files changed, 170 insertions(+), 706 deletions(-) delete mode 100644 plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java delete mode 100644 plugin/src/main/java/net/aufdemrand/denizen/utilities/ReflectionUtil.java delete mode 100644 plugin/src/main/java/net/aufdemrand/denizen/utilities/RuntimeCompiler.java delete mode 100644 plugin/src/main/java/net/aufdemrand/denizen/utilities/dExternalRunnable.java diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java index 71b6a5ed13..2350791543 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java @@ -51,7 +51,6 @@ import net.aufdemrand.denizencore.DenizenImplementation; import net.aufdemrand.denizencore.events.OldEventManager; import net.aufdemrand.denizencore.events.ScriptEvent; -import net.aufdemrand.denizencore.interfaces.dExternal; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.ObjectFetcher; import net.aufdemrand.denizencore.objects.aH; @@ -320,8 +319,6 @@ public NotableManager notableManager() { public Depends depends = new Depends(); - public RuntimeCompiler runtimeCompiler; - private BukkitWorldScriptHelper ws_helper; public final static long startTime = System.currentTimeMillis(); @@ -528,10 +525,6 @@ public void onEnable() { // Register Speech AI CitizensAPI.getSpeechFactory().register(DenizenChat.class, "denizen_chat"); } - - // Compile and load Denizen externals - runtimeCompiler = new RuntimeCompiler(this); - runtimeCompiler.loader(); } catch (Exception e) { dB.echoError(e); @@ -1013,12 +1006,6 @@ public void onDisable() { // Save offline player inventories InventoryScriptHelper._savePlayerInventories(); - // Unload loaded dExternals - for (dExternal external : RuntimeCompiler.loadedExternals) { - external.unload(); - } - RuntimeCompiler.loadedExternals.clear(); - //Disable core members getCommandRegistry().disableCoreMembers(); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java b/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java index ab09e4c7dd..36e8174cd2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java @@ -317,7 +317,7 @@ public void save(CommandContext args, CommandSender sender) throws CommandExcept /* * DENIZEN RELOAD */ - @Command(aliases = {"denizen"}, usage = "reload (saves|notables|config|scripts|externals) (-a)", + @Command(aliases = {"denizen"}, usage = "reload (saves|notables|config|scripts) (-a)", desc = "Reloads various Denizen files from disk to memory.", modifiers = {"reload"}, min = 1, max = 3, permission = "denizen.basic", flags = "a") public void reload(CommandContext args, CommandSender sender) throws CommandException { @@ -325,12 +325,11 @@ public void reload(CommandContext args, CommandSender sender) throws CommandExce // Get reload type if (args.hasFlag('a')) { denizen.reloadConfig(); - denizen.runtimeCompiler.reload(); DenizenCore.reloadScripts(); denizen.notableManager().reloadNotables(); denizen.reloadSaves(); CommandScriptHelper.syncDenizenCommands(); - Messaging.send(sender, "Denizen/saves.yml, Denizen/notables.yml, Denizen/config.yml, Denizen/scripts/..., and Denizen/externals/... reloaded from disk to memory."); + Messaging.send(sender, "Denizen/saves.yml, Denizen/notables.yml, Denizen/config.yml, and Denizen/scripts/... reloaded from disk to memory."); if (ScriptHelper.hadError()) { Messaging.sendError(sender, "There was an error loading your scripts, check the console for details!"); } @@ -376,15 +375,10 @@ else if (args.getString(1).equalsIgnoreCase("scripts")) { ReloadScriptsScriptEvent.instance.fire(); return; } - else if (args.getString(1).equalsIgnoreCase("externals")) { - denizen.runtimeCompiler.reload(); - Messaging.send(sender, "Denizen/externals/... reloaded from disk to memory."); - return; - } } Messaging.send(sender, ""); - Messaging.send(sender, "Specify which parts to reload. Valid options are: SAVES, NOTABLES, CONFIG, SCRIPTS, EXTERNALS"); + Messaging.send(sender, "Specify which parts to reload. Valid options are: SAVES, NOTABLES, CONFIG, SCRIPTS"); Messaging.send(sender, "Example: /denizen reload scripts"); Messaging.send(sender, "Use '-a' to reload all parts."); Messaging.send(sender, ""); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java b/plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java deleted file mode 100644 index 797581dfe7..0000000000 --- a/plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.aufdemrand.denizen.exceptions; - -public class RequirementCheckException extends Exception { - - private static final long serialVersionUID = 3159123423217792068L; - - public RequirementCheckException(String msg) { - super(msg); - } -} diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java index 365847107d..75af78af6b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -66,7 +65,7 @@ else if (arg.matchesPrefix("script", "s")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects dScript script = (dScript) scriptEntry.getObject("script"); Duration duration = (Duration) scriptEntry.getObject("duration"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java index 6387c2ee27..d6c81c6f77 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.events.OldEventManager; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.ObjectFetcher; import net.aufdemrand.denizencore.objects.aH; @@ -44,7 +43,7 @@ else if (!scriptEntry.hasObject("events")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dList events = (dList) scriptEntry.getObject("events"); dList context = (dList) scriptEntry.getObject("context"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java index bfe0c18755..4cf6993a02 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.scripts.ScriptEntry; import net.aufdemrand.denizencore.scripts.commands.AbstractCommand; @@ -14,7 +13,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dB.echoError("The 'FAIL' command is deprecated. Use flags instead!"); } } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java index 906eb1396f..7126334dce 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -51,7 +50,7 @@ else if (!scriptEntry.hasObject("overwrite") } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element origin = scriptEntry.getElement("origin"); Element destination = scriptEntry.getElement("destination"); Element overwrite = scriptEntry.getElement("overwrite"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java index 6257dc4a0b..50ce999a57 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.scripts.ScriptEntry; import net.aufdemrand.denizencore.scripts.commands.AbstractCommand; @@ -14,7 +13,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dB.echoError("The 'FINISH' command is deprecated. Use flags instead!"); } } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java index b57502ee34..2409072cf5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.DenizenCore; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -195,7 +194,7 @@ else if (flagArgs[1].equals("//") || flagArgs[1].equals("/")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dObject flag_target = scriptEntry.getdObject("flag_target"); Duration duration = (Duration) scriptEntry.getObject("duration"); @@ -242,7 +241,8 @@ else if (flag_target instanceof dEntity) { flag = DenizenAPI.getCurrentInstance().flagManager().getEntityFlag((dEntity) flag_target, name.asString()); } else { - throw new CommandExecutionException("Could not fetch a flag for this entity: " + flag_target.debug()); + dB.echoError("Could not fetch a flag for this entity: " + flag_target.debug()); + return; } // Do the action! diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java index 068ab6ed0c..881edc57bb 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -140,7 +139,7 @@ else if (!scriptEntry.hasObject("path")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { if (scriptEntry.dbCallShouldDebug()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java index 908b442fc1..37bf59fee3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.DebugLog; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -56,7 +55,7 @@ else if (!scriptEntry.hasObject("message")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { if (!Settings.allowLogging()) { dB.echoError("Logging disabled by administrator."); return; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java index fe10ed2798..d0848f9ae7 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.objects.notable.NotableManager; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.ObjectFetcher; @@ -48,15 +47,15 @@ else if (arg.matches("remove")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { String object = (String) scriptEntry.getObject("object"); Element id = scriptEntry.getElement("id"); Element remove = scriptEntry.getElement("remove"); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), aH.debugObj("object", object) + id.debug() + remove.debug()); + dB.report(scriptEntry, getName(), aH.debugObj("object", object) + id.debug() + remove.debug()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java index 78ed76dc06..ad8f0984da 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -58,7 +57,7 @@ else if ((arg.matchesArgumentType(ScriptQueue.class) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { ScriptQueue queue = (ScriptQueue) scriptEntry.getObject("queue"); Action action = (Action) scriptEntry.getObject("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java index 0a4cbe3c5c..6cef149bb9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -62,7 +61,7 @@ else if (!scriptEntry.hasObject("possibilities") @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { int possibilities = 0; ScriptQueue queue = scriptEntry.getResidingQueue(); @@ -90,9 +89,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { scriptEntry.addObject("possibilities", new Element(possibilities)); scriptEntry.addObject("selected", new Element(selected)); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), aH.debugObj("possibilities", possibilities) + aH.debugObj("choice", selected + 1)); + dB.report(scriptEntry, getName(), aH.debugObj("possibilities", possibilities) + aH.debugObj("choice", selected + 1)); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java index 2853279b2c..c354bc4755 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java @@ -1,9 +1,7 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; -import net.aufdemrand.denizencore.exceptions.ScriptEntryCreationException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -75,7 +73,7 @@ else if (arg.matchesOne("{")) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element stop = scriptEntry.getElement("stop"); Element next = scriptEntry.getElement("next"); @@ -152,15 +150,9 @@ else if (callback != null && callback.asBoolean()) { dB.echoDebug(scriptEntry, DebugElement.Header, "Repeat loop " + data.index); scriptEntry.getResidingQueue().addDefinition(as_name.asString(), String.valueOf(data.index)); List bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get(0).value; - ScriptEntry callbackEntry = null; - try { - callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()}, - (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); - callbackEntry.copyFrom(scriptEntry); - } - catch (ScriptEntryCreationException e) { - dB.echoError(e); - } + ScriptEntry callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()}, + (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); + callbackEntry.copyFrom(scriptEntry); callbackEntry.setOwner(scriptEntry.getOwner()); bracedCommands.add(callbackEntry); for (int i = 0; i < bracedCommands.size(); i++) { @@ -205,15 +197,9 @@ else if (callback != null && callback.asBoolean()) { datum.target = target; datum.index = 1; scriptEntry.setData(datum); - ScriptEntry callbackEntry = null; - try { - callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()}, - (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); - callbackEntry.copyFrom(scriptEntry); - } - catch (ScriptEntryCreationException e) { - dB.echoError(e); - } + ScriptEntry callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()}, + (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); + callbackEntry.copyFrom(scriptEntry); callbackEntry.setOwner(scriptEntry); bracedCommandsList.add(callbackEntry); scriptEntry.getResidingQueue().addDefinition(as_name.asString(), "1"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java index 84760375a1..ce25a3e5ad 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -63,7 +62,7 @@ else if (arg.matchesArgumentList(dPlayer.class)) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // We allow players to be a single player or multiple players dObject player = scriptEntry.getdObject("players"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java index 27c5105a42..60e7c95a5b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.DenizenCore; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.scripts.ScriptBuilder; @@ -155,7 +154,7 @@ else if (!scriptEntry.hasObject("path")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { if (scriptEntry.dbCallShouldDebug()) { dB.report(scriptEntry, getName(), (scriptEntry.hasObject("script") ? scriptEntry.getdObject("script").debug() : scriptEntry.getScript().debug()) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java index 2cd68dce4a..1deef9bc94 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -95,7 +94,7 @@ else if (!scriptEntry.hasObject("ssl") } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); final Element server = scriptEntry.getElement("server"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java index aabb180094..d0d7d62ffd 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -42,7 +41,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { ScriptQueue queue = (ScriptQueue) scriptEntry.getObject("queue"); Duration delay = (Duration) scriptEntry.getObject("delay"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java index 5e1dc260e4..9961b3f809 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java @@ -2,9 +2,7 @@ import net.aufdemrand.denizen.Settings; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; -import net.aufdemrand.denizencore.exceptions.ScriptEntryCreationException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -64,7 +62,7 @@ else if (arg.equals("\0CALLBACK")) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element stop = scriptEntry.getElement("stop"); Element next = scriptEntry.getElement("next"); @@ -151,15 +149,9 @@ else if (callback != null && callback.asBoolean()) { dB.echoDebug(scriptEntry, DebugElement.Header, "While loop " + data.index); scriptEntry.getResidingQueue().addDefinition("loop_index", String.valueOf(data.index)); List bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get(0).value; - ScriptEntry callbackEntry = null; - try { - callbackEntry = new ScriptEntry("WHILE", new String[] {"\0CALLBACK"}, - (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); - callbackEntry.copyFrom(scriptEntry); - } - catch (ScriptEntryCreationException e) { - dB.echoError(scriptEntry.getResidingQueue(), e); - } + ScriptEntry callbackEntry = new ScriptEntry("WHILE", new String[] {"\0CALLBACK"}, + (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); + callbackEntry.copyFrom(scriptEntry); callbackEntry.setOwner(scriptEntry.getOwner()); bracedCommands.add(callbackEntry); for (int i = 0; i < bracedCommands.size(); i++) { @@ -206,15 +198,9 @@ else if (callback != null && callback.asBoolean()) { datum.LastChecked = System.currentTimeMillis(); datum.instaTicks = 1; scriptEntry.setData(datum); - ScriptEntry callbackEntry = null; - try { - callbackEntry = new ScriptEntry("WHILE", new String[] {"\0CALLBACK"}, - (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); - callbackEntry.copyFrom(scriptEntry); - } - catch (ScriptEntryCreationException e) { - dB.echoError(scriptEntry.getResidingQueue(), e); - } + ScriptEntry callbackEntry = new ScriptEntry("WHILE", new String[] {"\0CALLBACK"}, + (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null)); + callbackEntry.copyFrom(scriptEntry); callbackEntry.setOwner(scriptEntry); bracedCommandsList.add(callbackEntry); scriptEntry.getResidingQueue().addDefinition("loop_index", "1"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java index 55c3224ffb..6f8c785413 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizencore.scripts.commands.Holdable; import net.aufdemrand.denizencore.utilities.CoreUtilities; import net.aufdemrand.denizencore.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.scripts.ScriptEntry; import net.aufdemrand.denizencore.scripts.ScriptHelper; @@ -207,7 +206,7 @@ else if (flagArgs[1].equals("//") || flagArgs[1].equals("/")) { @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element filename = scriptEntry.getElement("filename"); Element rawText = scriptEntry.getElement("raw_text"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java index c2d2c960c7..d7c4bf2614 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -68,7 +67,7 @@ else if (!scriptEntry.hasObject("duration") private static Map durations = new ConcurrentHashMap(8, 0.9f, 1); @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { final dScript script = (dScript) scriptEntry.getObject("script"); Duration duration = (Duration) scriptEntry.getObject("duration"); @@ -140,14 +139,8 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept @Override public void run() { dB.log("Running delayed task 'RESET ZAP' for '" + script.identify() + "'"); - try { - durations.remove(((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getSaveName() + "," + script.getName().toUpperCase()); - execute(scriptEntry); - } - catch (CommandExecutionException e) { - dB.echoError(scriptEntry.getResidingQueue(), "Could not run delayed task!"); - dB.echoError(scriptEntry.getResidingQueue(), e); - } + durations.remove(((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getSaveName() + "," + script.getName().toUpperCase()); + execute(scriptEntry); } }, delay)); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AgeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AgeCommand.java index 3666aa11a5..170a6830cd 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AgeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AgeCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.objects.properties.entity.EntityAge; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -115,7 +114,7 @@ else if (!scriptEntry.hasObject("lock") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AnimateCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AnimateCommand.java index 0fc89b9fd6..1ed2010138 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AnimateCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AnimateCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.nms.interfaces.EntityAnimation; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -61,7 +60,7 @@ else if (animationHelper.hasEntityAnimation(arg.getValue())) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java index c254c1bf5e..8c17b7c95a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -65,7 +64,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/BurnCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/BurnCommand.java index f93e876629..68b3c1e320 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/BurnCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/BurnCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -47,7 +46,7 @@ else if (!scriptEntry.hasObject("duration") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/CastCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/CastCommand.java index 1bf3756e9f..b0b2af9cee 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/CastCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/CastCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -82,7 +81,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects List entities = (List) scriptEntry.getObject("entities"); PotionEffectType effect = (PotionEffectType) scriptEntry.getObject("effect"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java index 2072610192..0c791948fe 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/EquipCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dItem; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -97,7 +96,7 @@ else if (arg.matches("player") && ((BukkitScriptEntryData) scriptEntry.entryData @SuppressWarnings("unchecked") @Override public void execute(ScriptEntry scriptEntry) - throws CommandExecutionException { + { Map equipment = (Map) scriptEntry.getObject("equipment"); List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FeedCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FeedCommand.java index 75b5b848c9..8548521640 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FeedCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FeedCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -72,7 +71,7 @@ else if (((BukkitScriptEntryData) scriptEntry.entryData).hasNPC()) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dPlayer player = (dPlayer) scriptEntry.getObject("targetplayer"); dNPC npc = (dNPC) scriptEntry.getObject("targetnpc"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java index f015837ffb..dafde7864e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.entity.Position; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -97,7 +96,7 @@ else if (!scriptEntry.hasObject("speed") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects dLocation origin = (dLocation) scriptEntry.getObject("origin"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FollowCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FollowCommand.java index 24afa736c1..62ec7b41a3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FollowCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FollowCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -78,7 +77,7 @@ else if (!scriptEntry.hasObject("target") && } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects Element stop = scriptEntry.getElement("stop"); Element lead = scriptEntry.getElement("lead"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HeadCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HeadCommand.java index 22ad268d55..2edd285b5f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HeadCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HeadCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dMaterial; import net.aufdemrand.denizen.utilities.MaterialCompat; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -62,7 +61,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List entities = (List) scriptEntry.getObject("entities"); Element skin = scriptEntry.getElement("skin"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java index 4d1cc335cb..5527ba7cb7 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -67,7 +66,7 @@ else if (((BukkitScriptEntryData) scriptEntry.entryData).getNPC() != null) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List entities = (List) scriptEntry.getObject("entities"); if (entities == null) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealthCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealthCommand.java index 54c6f0be8b..d3a4fbf29f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealthCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealthCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.npc.traits.HealthTrait; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -66,7 +65,7 @@ else if (!scriptEntry.hasObject("action") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element qty = scriptEntry.getElement("qty"); Element action = scriptEntry.getElement("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java index ba5cff3ac3..740c928041 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -73,7 +72,7 @@ else if (((BukkitScriptEntryData) scriptEntry.entryData).getNPC() != null) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List entities = (List) scriptEntry.getObject("entities"); dEntity source = (dEntity) scriptEntry.getObject("source"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/InvisibleCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/InvisibleCommand.java index a09ebeec1a..d963cd04b4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/InvisibleCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/InvisibleCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.npc.traits.InvisibleTrait; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -56,14 +55,14 @@ else if (!scriptEntry.hasObject("target") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects Element state = scriptEntry.getElement("state"); dEntity target = (dEntity) scriptEntry.getObject("target"); // Report to dB - if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), state.debug() + target.debug()); + if (scriptEntry.dbCallShouldDebug()) { + dB.report(scriptEntry, getName(), state.debug() + target.debug()); } if (target.isCitizensNPC()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LeashCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LeashCommand.java index 0b3fca5fe1..e17f91a618 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LeashCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LeashCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.MaterialCompat; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -62,7 +61,7 @@ else if (arg.matchesArgumentType(dLocation.class)) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LookCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LookCommand.java index e5737cff19..4959ebe197 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LookCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/LookCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -58,7 +57,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { final dLocation loc = (dLocation) scriptEntry.getObject("location"); final List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/MountCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/MountCommand.java index 3112ab3589..3098d640d8 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/MountCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/MountCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.utilities.Conversion; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.entity.Position; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -63,7 +62,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects dLocation location = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java index 20698bff9e..2675d1bd25 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.entity.Position; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -126,7 +125,7 @@ else if (arg.matchesPrefix("def", "define", "context")) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { dEntity originEntity = (dEntity) scriptEntry.getObject("originentity"); dLocation originLocation = scriptEntry.hasObject("originlocation") ? diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RemoveCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RemoveCommand.java index 78c6ffad60..bd141581af 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RemoveCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RemoveCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.entity.DenizenEntityType; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -58,7 +57,7 @@ else if (!scriptEntry.hasObject("world") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RotateCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RotateCommand.java index 5c7b524662..3a1b8537c9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RotateCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/RotateCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -89,7 +88,7 @@ else if (!scriptEntry.hasObject("entities") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { final List entities = new ArrayList((List) scriptEntry.getObject("entities")); final Duration duration = (Duration) scriptEntry.getObject("duration"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java index d5480859c6..e072e15f12 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.Velocity; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.entity.Position; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -150,7 +149,7 @@ else if (arg.matchesPrefix("def", "define", "context")) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { dEntity originEntity = (dEntity) scriptEntry.getObject("originentity"); dLocation originLocation = scriptEntry.hasObject("originlocation") ? diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java index ed7ecad7ed..0222636f39 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -70,7 +69,7 @@ else if (!scriptEntry.hasObject("persistent") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List entities = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java index d6955d361d..5570a67694 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -59,7 +58,7 @@ else if (arg.matches("npc") && ((BukkitScriptEntryData) scriptEntry.entryData).h @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects dLocation location = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/WalkCommand.java index 6ed3c2754f..21c267ef75 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/WalkCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/WalkCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -97,7 +96,7 @@ else if (!scriptEntry.hasObject("entities") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch required objects diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/DisplayItemCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/DisplayItemCommand.java index 1f26deea7f..d640d8fac4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/DisplayItemCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/DisplayItemCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -54,7 +53,7 @@ else if (arg.matchesArgumentType(dItem.class) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dItem item = (dItem) scriptEntry.getObject("item"); Duration duration = (Duration) scriptEntry.getObject("duration"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java index 7d82e49834..f1a722215b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.inventory.SlotHelper; import net.aufdemrand.denizencore.DenizenCore; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -73,7 +72,7 @@ else if (!scriptEntry.hasObject("player_only") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List items = (List) scriptEntry.getObject("item"); final Element elSlot = scriptEntry.getElement("slot"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java index de7e21a823..21605bfe26 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.inventory.SlotHelper; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -96,7 +95,7 @@ else if (!scriptEntry.hasObject("slot") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element engrave = scriptEntry.getElement("engrave"); Element unlimit_stack_size = scriptEntry.getElement("unlimit_stack_size"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/InventoryCommand.java index c72a2fc20f..d91ce06560 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/InventoryCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/InventoryCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.Conversion; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.inventory.SlotHelper; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.Mechanism; @@ -137,7 +136,7 @@ else if (!scriptEntry.hasObject("mechanism") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List actions = (List) scriptEntry.getObject("actions"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/MapCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/MapCommand.java index 867bca4408..0b2f3b9110 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/MapCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/MapCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.maps.DenizenMapRenderer; import net.aufdemrand.denizen.utilities.maps.MapAnimatedImage; import net.aufdemrand.denizen.utilities.maps.MapImage; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -101,7 +100,7 @@ else if (!scriptEntry.hasObject("map-id") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element id = scriptEntry.getElement("map-id"); dWorld create = scriptEntry.getdObject("new"); @@ -132,11 +131,13 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { else if (id != null) { map = Bukkit.getServer().getMap((short) id.asInt()); if (map == null) { - throw new CommandExecutionException("No map found for ID '" + id.asInt() + "'!"); + dB.echoError("No map found for ID '" + id.asInt() + "'!"); + return; } } else { - throw new CommandExecutionException("The map command failed somehow! Report this to a developer!"); + dB.echoError("The map command failed somehow! Report this to a developer!"); + return; } if (reset.asBoolean()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/NBTCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/NBTCommand.java index 966fe498a0..fa3cba3094 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/NBTCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/NBTCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.objects.dItem; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -44,15 +43,15 @@ else if (!scriptEntry.hasObject("item") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dItem item = scriptEntry.getdObject("item"); Element key = scriptEntry.getElement("key"); Element value = scriptEntry.getElement("value"); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), item.debug() + key.debug() + value.debug()); + dB.report(scriptEntry, getName(), item.debug() + key.debug() + value.debug()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/ScribeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/ScribeCommand.java index db43115581..b379cc3c70 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/ScribeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/ScribeCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.scripts.containers.core.BookScriptContainer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.TagRunnable; import net.aufdemrand.denizencore.objects.aH; @@ -74,7 +73,7 @@ else if (!scriptEntry.hasObject("item") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Retrieve objects from ScriptEntry BookAction action = (BookAction) scriptEntry.getObject("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java index b48f047fd5..f95e24b1dc 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.inventory.SlotHelper; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -105,7 +104,7 @@ else if (!scriptEntry.hasObject("inventory") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dInventory inventory = (dInventory) scriptEntry.getObject("inventory"); Element qty = scriptEntry.getElement("qty"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/ActionCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/ActionCommand.java index 0cd566865f..7071e486c9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/ActionCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/ActionCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.ObjectFetcher; import net.aufdemrand.denizencore.objects.aH; @@ -59,7 +58,7 @@ else if (!scriptEntry.hasObject("actions")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dList actions = (dList) scriptEntry.getObject("actions"); dList context = (dList) scriptEntry.getObject("context"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AnchorCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AnchorCommand.java index f120206360..76dfb5cd65 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AnchorCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AnchorCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -62,7 +61,7 @@ else if (!scriptEntry.hasObject("location") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects Action action = (Action) scriptEntry.getObject("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AssignmentCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AssignmentCommand.java index 1484201ea1..e846ddea2a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AssignmentCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/AssignmentCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.npc.traits.AssignmentTrait; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dScript; @@ -56,13 +55,13 @@ else if (arg.matchesArgumentType(dScript.class) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dScript script = scriptEntry.getdObject("script"); // Report to dB - if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), aH.debugObj("action", scriptEntry.getObject("action")) + (script != null ? script.debug() : "")); + if (scriptEntry.dbCallShouldDebug()) { + dB.report(scriptEntry, getName(), aH.debugObj("action", scriptEntry.getObject("action")) + (script != null ? script.debug() : "")); } // Perform desired action diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/BreakCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/BreakCommand.java index 0075a47a3c..b65cf54341 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/BreakCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/BreakCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -75,7 +74,7 @@ else if (!scriptEntry.hasObject("radius") // // --> @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { final dLocation location = (dLocation) scriptEntry.getObject("location"); final dNPC npc = (dNPC) scriptEntry.getObject("npc"); @@ -86,9 +85,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { context.put("location", location); context.put("material", material); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), location.debug() + npc.debug() + radius.debug()); + dB.report(scriptEntry, getName(), location.debug() + npc.debug() + radius.debug()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/CreateCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/CreateCommand.java index 3876fc3efb..f52edf54e6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/CreateCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/CreateCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.Mechanism; @@ -57,7 +56,7 @@ else if (!scriptEntry.hasObject("traits") } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element name = (Element) scriptEntry.getObject("name"); dEntity type = (dEntity) scriptEntry.getObject("entity_type"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DespawnCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DespawnCommand.java index 9d27a975f8..5593436c57 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DespawnCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DespawnCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.objects.dList; @@ -44,7 +43,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List npcs = (List) scriptEntry.getObject("npcs"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DisengageCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DisengageCommand.java index ed0f596e28..da1a67243a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DisengageCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/DisengageCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.scripts.ScriptEntry; import net.aufdemrand.denizencore.scripts.commands.AbstractCommand; @@ -27,7 +26,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Report to dB if (scriptEntry.dbCallShouldDebug()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java index 71044d9508..8f74541fa6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/EngageCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.Settings; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -43,14 +42,14 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Duration duration = scriptEntry.getdObject("duration"); dNPC npc = ((BukkitScriptEntryData) scriptEntry.entryData).getNPC(); // Report to dB - if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), npc.debug() + duration.debug()); + if (scriptEntry.dbCallShouldDebug()) { + dB.report(scriptEntry, getName(), npc.debug() + duration.debug()); } if (duration.getSecondsAsInt() > 0) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/FishCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/FishCommand.java index 077e148de4..58b71e5f3a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/FishCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/FishCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -58,7 +57,7 @@ else if (!scriptEntry.hasObject("percent") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dLocation location = scriptEntry.getdObject("location"); Element catchtype = scriptEntry.getElement("catch"); @@ -68,9 +67,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { dNPC npc = ((BukkitScriptEntryData) scriptEntry.entryData).getNPC(); FishingTrait trait = npc.getFishingTrait(); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), location.debug() + catchtype.debug() + percent.debug() + stop.debug()); + dB.report(scriptEntry, getName(), location.debug() + catchtype.debug() + percent.debug() + stop.debug()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/LookcloseCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/LookcloseCommand.java index fdb628e4d4..58833806f2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/LookcloseCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/LookcloseCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -46,7 +45,7 @@ else if (arg.matchesArgumentType(dNPC.class)) // TODO: better way of handling th } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { if (scriptEntry.dbCallShouldDebug()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PauseCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PauseCommand.java index c27248bd69..54a30a9482 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PauseCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PauseCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -62,7 +61,7 @@ else if (aH.matchesArg("WAYPOINTS", arg) || aH.matchesArg("NAVIGATION", arg) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { pause(dNPC, pauseType, !scriptEntry.getCommandName().equalsIgnoreCase("RESUME")); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PoseCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PoseCommand.java index 0dec49d46b..ed35670d25 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PoseCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PoseCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -68,7 +67,7 @@ else if (!((BukkitScriptEntryData) scriptEntry.entryData).hasPlayer()) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects TargetType target = (TargetType) scriptEntry.getObject("target"); @@ -98,7 +97,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { case ASSUME: if (!poses.hasPose(id)) { - throw new CommandExecutionException("Pose \"" + id + "\" doesn't exist for " + npc.toString()); + dB.echoError("Pose \"" + id + "\" doesn't exist for " + npc.toString()); } if (target.name().equals("NPC")) { @@ -118,13 +117,13 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { case ADD: if (!poses.addPose(id, pose_loc)) { - throw new CommandExecutionException(npc.toString() + " already has that pose!"); + dB.echoError(npc.toString() + " already has that pose!"); } break; case REMOVE: if (!poses.removePose(id)) { - throw new CommandExecutionException(npc.toString() + " does not have that pose!"); + dB.echoError(npc.toString() + " does not have that pose!"); } break; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java index cf2b931105..64600422aa 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.npc.traits.PushableTrait; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -41,11 +40,12 @@ else if (!scriptEntry.hasObject("return") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dNPC denizenNPC = ((BukkitScriptEntryData) scriptEntry.entryData).getNPC(); if (denizenNPC == null) { - throw new CommandExecutionException("No valid NPC attached to this queue!"); + dB.echoError("No valid NPC attached to this queue!"); + return; } PushableTrait trait = denizenNPC.getPushableTrait(); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/RenameCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/RenameCommand.java index eced4c3f2c..13c536a145 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/RenameCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/RenameCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -35,13 +34,13 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element name = (Element) scriptEntry.getObject("name"); - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), name.debug()); + dB.report(scriptEntry, getName(), name.debug()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/SitCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/SitCommand.java index 8b091d7cfa..5c24c3871a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/SitCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/SitCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.npc.traits.SittingTrait; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -34,7 +33,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dLocation location = (dLocation) scriptEntry.getObject("location"); if (((BukkitScriptEntryData) scriptEntry.entryData).getNPC().getEntityType() != EntityType.PLAYER && ((BukkitScriptEntryData) scriptEntry.entryData).getNPC().getEntityType() != EntityType.OCELOT diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/StandCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/StandCommand.java index 19dc78073c..d5944269d9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/StandCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/StandCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.npc.traits.SittingTrait; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -29,7 +28,7 @@ public void parseArgs(ScriptEntry scriptEntry) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { if (((BukkitScriptEntryData) scriptEntry.entryData).getNPC().getEntityType() != EntityType.PLAYER && ((BukkitScriptEntryData) scriptEntry.entryData).getNPC().getEntityType() != EntityType.OCELOT @@ -38,9 +37,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { return; } - if (scriptEntry.dbCallShouldDebug()) { + if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), aH.debugObj("npc", ((BukkitScriptEntryData) scriptEntry.entryData).getNPC())); + dB.report(scriptEntry, getName(), aH.debugObj("npc", ((BukkitScriptEntryData) scriptEntry.entryData).getNPC())); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TraitCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TraitCommand.java index 11c3bc2a10..fcb8b1ed03 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TraitCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TraitCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -45,7 +44,7 @@ else if (!scriptEntry.hasObject("trait")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element toggle = scriptEntry.getElement("state"); Element traitName = scriptEntry.getElement("trait"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TriggerCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TriggerCommand.java index 07f81a71e9..5831d96e29 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TriggerCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TriggerCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.npc.traits.TriggerTrait; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -62,7 +61,7 @@ else if (!scriptEntry.hasObject("trigger")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element toggle = scriptEntry.getElement("toggle"); Element trigger = scriptEntry.getElement("trigger"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/VulnerableCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/VulnerableCommand.java index f781cf83e5..00fc86194e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/VulnerableCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/VulnerableCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -34,15 +33,15 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects Element action = scriptEntry.getElement("action"); BukkitScriptEntryData entryData = (BukkitScriptEntryData) scriptEntry.entryData; // Report to dB - if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), entryData.getNPC().debug() + action.debug()); + if (scriptEntry.dbCallShouldDebug()) { + dB.report(scriptEntry, getName(), entryData.getNPC().debug() + action.debug()); } NPC npc = entryData.getNPC().getCitizen(); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ActionBarCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ActionBarCommand.java index fddf410b0c..37fb460123 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ActionBarCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ActionBarCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -63,7 +62,7 @@ else if (!scriptEntry.hasObject("text")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element text = scriptEntry.getElement("text"); FormatScriptContainer format = (FormatScriptContainer) scriptEntry.getObject("format"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/AdvancementCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/AdvancementCommand.java index bad0b8e3de..91f57fded8 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/AdvancementCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/AdvancementCommand.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -127,7 +126,7 @@ else if (!scriptEntry.hasObject("y") public static final Map customRegistered = new HashMap(); @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element id = scriptEntry.getElement("id"); Element parent = scriptEntry.getElement("parent"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrackCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrackCommand.java index 2a4dfd6d54..121694a903 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrackCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/BlockCrackCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -70,7 +69,7 @@ private static class IntHolder { private static int lastBase; @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List players = (List) scriptEntry.getObject("players"); Element progress = scriptEntry.getElement("progress"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java index 961fee5467..00424752b1 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ChatCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.npc.speech.DenizenSpeechController; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -85,7 +84,7 @@ else if (!scriptEntry.hasObject("message")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dList talkers = scriptEntry.getdObject("talkers"); dList targets = scriptEntry.getdObject("targets"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java index aa8c71b2ef..20d2c64763 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -45,7 +44,7 @@ else if (!scriptEntry.hasObject("reset") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch required objects diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ExperienceCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ExperienceCommand.java index 17eb2e3731..7a14ce5d28 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ExperienceCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ExperienceCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.aH; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -76,7 +75,7 @@ else if (arg.matches("SILENT")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Type type = (Type) scriptEntry.getObject("type"); int quantity = (int) scriptEntry.getObject("quantity"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GlowCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GlowCommand.java index 082d896f0a..6c8b5387cb 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GlowCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GlowCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -64,7 +63,7 @@ else if (!scriptEntry.hasObject("glowing") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { final ArrayList entities = (ArrayList) scriptEntry.getObject("entities"); Element glowing = scriptEntry.getElement("glowing"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GroupCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GroupCommand.java index 403752c96f..8f608aacd1 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GroupCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/GroupCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -55,15 +54,15 @@ else if (!scriptEntry.hasObject("group")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); dWorld world = (dWorld) scriptEntry.getObject("world"); Element group = scriptEntry.getElement("group"); // Report to dB - if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), action.debug() + (world != null ? world.debug() : "") + group.debug()); + if (scriptEntry.dbCallShouldDebug()) { + dB.report(scriptEntry, getName(), action.debug() + (world != null ? world.debug() : "") + group.debug()); } World bukkitWorld = null; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ItemCooldownCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ItemCooldownCommand.java index 058a50779c..547b6e4f63 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ItemCooldownCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ItemCooldownCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dMaterial; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.aH; @@ -44,7 +43,7 @@ else if (!scriptEntry.hasObject("duration") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { ArrayList materials = (ArrayList) scriptEntry.getObject("materials"); Duration duration = scriptEntry.getdObject("duration"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/KickCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/KickCommand.java index 84b3a6267f..60f2b8f4b9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/KickCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/KickCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -37,7 +36,7 @@ else if (arg.matchesPrefix("targets", "target", "players") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element reason = scriptEntry.getElement("reason"); List targets = (List) scriptEntry.getObject("targets"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/MoneyCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/MoneyCommand.java index 882c3e2db6..93ed1c92f6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/MoneyCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/MoneyCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -60,7 +59,7 @@ else if (!scriptEntry.hasObject("action")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); Element quantity = scriptEntry.getElement("quantity"); List players = (List) scriptEntry.getObject("players"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java index 48a1d204a7..9762eb45ee 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/NarrateCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -71,7 +70,7 @@ else if (!scriptEntry.hasObject("text")) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects List targets = (List) scriptEntry.getObject("targets"); String text = scriptEntry.getElement("text").asString(); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OpenTradesCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OpenTradesCommand.java index 43826009f3..d2f2cb1306 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OpenTradesCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OpenTradesCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.objects.dTrade; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -58,7 +57,7 @@ else if (arg.matchesPrefix("players") } - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { String title = scriptEntry.getElement("title").asString(); dEntity entity = scriptEntry.getdObject("entity"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OxygenCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OxygenCommand.java index 011c9886e1..9dc19d1ed5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OxygenCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/OxygenCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -51,7 +50,7 @@ else if (!scriptEntry.hasObject("amount") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element type = scriptEntry.getElement("type"); Element mode = scriptEntry.getElement("mode"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/PermissionCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/PermissionCommand.java index 03c3c180ac..5091571c1a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/PermissionCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/PermissionCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -59,7 +58,7 @@ else if (!scriptEntry.hasObject("permission")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); Element permission = scriptEntry.getElement("permission"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ShowFakeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ShowFakeCommand.java index d45db7ae2b..95a0405cfd 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ShowFakeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ShowFakeCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.blocks.FakeBlock; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -94,7 +93,7 @@ else if (arg.matches("cancel")) { @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Duration duration = scriptEntry.getdObject("duration"); dList material_list = scriptEntry.getdObject("materials"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java index 0e8cf5ff00..d05bd86d23 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/SidebarCommand.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizen.tags.BukkitTagContext; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -102,7 +101,7 @@ else if (!scriptEntry.hasObject("per_player") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); Element elTitle = scriptEntry.getElement("title"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/StatisticCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/StatisticCommand.java index c8c0badcae..b211254609 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/StatisticCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/StatisticCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dMaterial; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -91,7 +90,7 @@ else if (type == Statistic.Type.ENTITY && !scriptEntry.hasObject("entity")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); dList players = scriptEntry.getdObject("players"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TeamCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TeamCommand.java index f25e0c63fb..150505df0d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TeamCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TeamCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.ScoreboardHelper; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -74,7 +73,7 @@ else if (arg.matchesPrefix("suffix") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element id = scriptEntry.getElement("id"); Element name = scriptEntry.getElement("name"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TitleCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TitleCommand.java index 739314dbff..29b7ba6f0d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TitleCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/TitleCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.nms.NMSHandler; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -59,7 +58,7 @@ else if (arg.matchesPrefix("targets", "target") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element title = scriptEntry.getElement("title"); Element subtitle = scriptEntry.getElement("subtitle"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ToastCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ToastCommand.java index 286a96222b..3f19370537 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ToastCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/player/ToastCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -78,7 +77,7 @@ else if (!scriptEntry.hasObject("text")) { @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element text = scriptEntry.getElement("text"); Element frame = scriptEntry.getElement("frame"); Element background = scriptEntry.getElement("background"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/AnnounceCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/AnnounceCommand.java index 9d4d2f5dba..cbdd6c17d2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/AnnounceCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/AnnounceCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -69,7 +68,7 @@ else if (!scriptEntry.hasObject("text")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects Element text = scriptEntry.getElement("text"); AnnounceType type = (AnnounceType) scriptEntry.getObject("type"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BanCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BanCommand.java index 16721f9540..427ee6e001 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BanCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BanCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -69,7 +68,7 @@ else if (!scriptEntry.hasObject("source") && arg.matchesPrefix("source")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element action = scriptEntry.getElement("action"); List targets = (List) scriptEntry.getObject("targets"); dList addresses = (dList) scriptEntry.getObject("addresses"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BossBarCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BossBarCommand.java index 57ad5688d9..d4c3b5f7ef 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BossBarCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/BossBarCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -95,7 +94,7 @@ else if (!scriptEntry.hasObject("id")) { public final static Map bossBarMap = new HashMap(); @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element id = scriptEntry.getElement("id"); Element action = scriptEntry.getElement("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java index 4121a01b7a..fac883775c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.DenizenCommandSender; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -87,7 +86,7 @@ else if (!scriptEntry.hasObject("command")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element cmd = scriptEntry.getElement("command"); Element type = scriptEntry.getElement("type"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ScoreboardCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ScoreboardCommand.java index a4c1a9a997..97bff4ec59 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ScoreboardCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ScoreboardCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.utilities.FakeOfflinePlayer; import net.aufdemrand.denizen.utilities.ScoreboardHelper; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -84,7 +83,7 @@ public static OfflinePlayer getOfflinePlayer(String name) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects List viewers = (List) scriptEntry.getObject("viewers"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java index c6f4cfba42..a88c39efff 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -73,7 +72,7 @@ else if (!scriptEntry.hasObject("players") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dLocation location = (dLocation) scriptEntry.getObject("location"); Element action = scriptEntry.getElement("action"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ChunkLoadCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ChunkLoadCommand.java index ab8f60f83d..ed4ac83a08 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ChunkLoadCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ChunkLoadCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -82,7 +81,7 @@ else if (arg.matchesArgumentType(Duration.class) } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects Element action = scriptEntry.getElement("action"); dLocation chunkloc = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CopyBlockCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CopyBlockCommand.java index 3e6f0b5400..5e279a82bf 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CopyBlockCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CopyBlockCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dCuboid; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -66,7 +65,7 @@ else if (arg.matches("remove_original")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dLocation copy_location = (dLocation) scriptEntry.getObject("location"); dLocation destination = (dLocation) scriptEntry.getObject("destination"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CreateWorldCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CreateWorldCommand.java index c6267f42d8..1f98b4bb49 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CreateWorldCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/CreateWorldCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -68,7 +67,7 @@ else if (!scriptEntry.hasObject("world_name")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { Element worldName = scriptEntry.getElement("world_name"); Element generator = scriptEntry.getElement("generator"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/DropCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/DropCommand.java index a6b726ef7c..eba1b0e992 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/DropCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/DropCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dItem; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.scripts.ScriptEntry; @@ -98,7 +97,7 @@ else if (!scriptEntry.hasObject("delay") && arg.matchesArgumentType(Duration.cla @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Get objects dLocation location = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ExplodeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ExplodeCommand.java index ac43bd3228..4ee0e6fc24 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ExplodeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ExplodeCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -56,7 +55,7 @@ else if (!scriptEntry.hasObject("fire") } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects final dLocation location = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java index 0c31cd19d8..0d1113ab6f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.Conversion; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -81,7 +80,7 @@ else if (!scriptEntry.hasObject("fade") @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects final dLocation location = scriptEntry.hasObject("location") ? diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/GameRuleCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/GameRuleCommand.java index 4dacb34a71..160afd0182 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/GameRuleCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/GameRuleCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -48,7 +47,7 @@ else if (!scriptEntry.hasObject("value")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects dWorld world = scriptEntry.getdObject("world"); Element gamerule = scriptEntry.getElement("gamerule"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/LightCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/LightCommand.java index f5f59249af..8d88c4de26 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/LightCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/LightCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.nms.abstracts.BlockLight; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -48,7 +47,7 @@ else if (!scriptEntry.hasObject("duration") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dLocation location = scriptEntry.getdObject("location"); Element light = scriptEntry.getElement("light"); @@ -74,7 +73,8 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { if (!reset.asBoolean()) { int brightness = light.asInt(); if (brightness < 0 || brightness > 15) { - throw new CommandExecutionException("Light brightness must be between 0 and 15, inclusive!"); + dB.echoError("Light brightness must be between 0 and 15, inclusive!"); + return; } NMSHandler.getInstance().createBlockLight(location, brightness, duration == null ? 0 : duration.getTicks()); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/MidiCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/MidiCommand.java index 0c530856fa..48b22504b0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/MidiCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/MidiCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.midi.MidiUtil; import net.aufdemrand.denizen.utilities.midi.NoteBlockReceiver; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -92,7 +91,7 @@ else if (!scriptEntry.hasObject("file")) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { boolean cancel = scriptEntry.hasObject("cancel"); File file = !cancel ? new File(scriptEntry.getElement("file").asString()) : null; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java index 23a86da5a4..cca74d17d0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.objects.dMaterial; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -122,7 +121,7 @@ else if (!scriptEntry.hasObject("percents")) { @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { final dList materials = scriptEntry.getdObject("materials"); final List locations = (List) scriptEntry.getObject("locations"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java index 9054c27e70..fe7b399408 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizen.nms.interfaces.Particle; import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -206,7 +205,7 @@ else if (!scriptEntry.hasObject("targets") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Extract objects from ScriptEntry List locations = (List) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlaySoundCommand.java index bbc3f789ab..679942b678 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlaySoundCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlaySoundCommand.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -77,7 +76,7 @@ else if (!scriptEntry.hasObject("sound_category") @SuppressWarnings("unchecked") @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { List locations = (List) scriptEntry.getObject("locations"); List players = (List) scriptEntry.getObject("entities"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SchematicCommand.java index b482ed55bd..a703fa16ad 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SchematicCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SchematicCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.blocks.CuboidBlockSet; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.TagRunnable; @@ -115,7 +114,7 @@ else if (!scriptEntry.hasObject("noair") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { Element angle = scriptEntry.getElement("angle"); Element type = scriptEntry.getElement("type"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SignCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SignCommand.java index 464f13aa8d..dd50db8470 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SignCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SignCommand.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.blocks.DirectionalBlocksHelper; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -79,7 +78,7 @@ public void setWallSign(Block sign, BlockFace bf) { @SuppressWarnings("unchecked") @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { // Get objects String direction = scriptEntry.hasObject("direction") ? ((Element) scriptEntry.getObject("direction")).asString() : null; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/StrikeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/StrikeCommand.java index adf89f5e87..31c75ef706 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/StrikeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/StrikeCommand.java @@ -2,7 +2,6 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -40,7 +39,7 @@ else if (arg.matches("no_damage") || arg.matches("nodamage")) { } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Extract objects from ScriptEntry dLocation location = (dLocation) scriptEntry.getObject("location"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java index 729bd4c554..cd8b8396b6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.MaterialCompat; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -64,7 +63,7 @@ else if (!scriptEntry.hasObject("state") && } @Override - public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(final ScriptEntry scriptEntry) { final dList interactLocations = scriptEntry.getdObject("locations"); long duration = ((Duration) scriptEntry.getObject("duration")).getTicks(); final SwitchState switchState = SwitchState.valueOf(scriptEntry.getElement("switchstate").asString()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/TimeCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/TimeCommand.java index 1d22a846d9..3b0627d0e4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/TimeCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/TimeCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -61,7 +60,7 @@ else if (!scriptEntry.hasObject("world") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects Duration value = (Duration) scriptEntry.getObject("value"); dWorld world = (dWorld) scriptEntry.getObject("world"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WeatherCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WeatherCommand.java index 13564ec298..faf0268cbc 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WeatherCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WeatherCommand.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.aH; @@ -56,7 +55,7 @@ else if (!scriptEntry.hasObject("value") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { // Fetch objects Value value = Value.valueOf(((Element) scriptEntry.getObject("value")) .asString().toUpperCase()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WorldBorderCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WorldBorderCommand.java index 7e314f732e..7bcaa1c970 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WorldBorderCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/world/WorldBorderCommand.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.objects.dWorld; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizencore.objects.Duration; import net.aufdemrand.denizencore.objects.Element; @@ -101,7 +100,7 @@ else if (!scriptEntry.hasObject("reset") } @Override - public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + public void execute(ScriptEntry scriptEntry) { dWorld world = (dWorld) scriptEntry.getObject("world"); List players = (List) scriptEntry.getObject("players"); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java b/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java index 988051700f..7855e81f75 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java @@ -1495,24 +1495,6 @@ public static void adjustServer(Mechanism mechanism) { } } - // <--[mechanism] - // @object server - // @name run_java - // @input Element - // @description - // Executes an arbitrary Java method (input as the text of Java code to run). Warning: EXTREMELY DANGEROUS. - // Require config setting 'Commands.Java.Allow Running java'. - // @tags - // None - // --> - if (mechanism.matches("run_java") && mechanism.hasValue()) { - if (!Settings.allowRunningJava()) { - dB.echoError("Java execution disabled by administrator."); - return; - } - DenizenAPI.getCurrentInstance().runtimeCompiler.runString(mechanism.getValue().asString()); - } - // Deprecated in favor of SYSTEM.redirect_logging (Core) if (mechanism.matches("redirect_logging") && mechanism.hasValue()) { if (!Settings.allowConsoleRedirection()) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/ReflectionUtil.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/ReflectionUtil.java deleted file mode 100644 index 6cccd7c715..0000000000 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/ReflectionUtil.java +++ /dev/null @@ -1,166 +0,0 @@ -package net.aufdemrand.denizen.utilities; - -import org.bukkit.Bukkit; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -/** - * ReflectionUtil v1.1 - *

- * You are welcome to use it, modify it and redistribute it under the condition to not claim this class as your own - * - * @author DarkBlade12 - */ -public abstract class ReflectionUtil { - private static final Map, Class> CORRESPONDING_TYPES = new HashMap, Class>(); - - static { - CORRESPONDING_TYPES.put(Byte.class, byte.class); - CORRESPONDING_TYPES.put(Short.class, short.class); - CORRESPONDING_TYPES.put(Integer.class, int.class); - CORRESPONDING_TYPES.put(Long.class, long.class); - CORRESPONDING_TYPES.put(Character.class, char.class); - CORRESPONDING_TYPES.put(Float.class, float.class); - CORRESPONDING_TYPES.put(Double.class, double.class); - CORRESPONDING_TYPES.put(Boolean.class, boolean.class); - } - - public enum DynamicPackage { - MINECRAFT_SERVER { - @Override - public String toString() { - return "net.minecraft.server." + Bukkit.getServer().getClass().getPackage().getName().substring(23, 30); - } - }, - CRAFTBUKKIT { - @Override - public String toString() { - return Bukkit.getServer().getClass().getPackage().getName(); - } - } - } - - public static class FieldEntry { - String key; - Object value; - - public FieldEntry(String key, Object value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return this.key; - } - - public Object getValue() { - return this.value; - } - } - - private static Class getPrimitiveType(Class clazz) { - return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz; - } - - private static Class[] toPrimitiveTypeArray(Object[] objects) { - int a = objects != null ? objects.length : 0; - Class[] types = new Class[a]; - for (int i = 0; i < a; i++) { - types[i] = getPrimitiveType(objects[i].getClass()); - } - return types; - } - - private static Class[] toPrimitiveTypeArray(Class[] classes) { - int a = classes != null ? classes.length : 0; - Class[] types = new Class[a]; - for (int i = 0; i < a; i++) { - types[i] = getPrimitiveType(classes[i]); - } - return types; - } - - private static boolean equalsTypeArray(Class[] a, Class[] o) { - if (a.length != o.length) { - return false; - } - for (int i = 0; i < a.length; i++) { - if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) { - return false; - } - } - return true; - } - - public static Class getClass(String name, DynamicPackage pack, String subPackage) throws Exception { - return Class.forName(pack + (subPackage != null && subPackage.length() > 0 ? "." + subPackage : "") + "." + name); - } - - public static Class getClass(String name, DynamicPackage pack) throws Exception { - return getClass(name, pack, null); - } - - public static Constructor getConstructor(Class clazz, Class... paramTypes) { - Class[] t = toPrimitiveTypeArray(paramTypes); - for (Constructor c : clazz.getConstructors()) { - Class[] types = toPrimitiveTypeArray(c.getParameterTypes()); - if (equalsTypeArray(types, t)) { - return c; - } - } - return null; - } - - public static Object newInstance(Class clazz, Object... args) throws Exception { - return getConstructor(clazz, toPrimitiveTypeArray(args)).newInstance(args); - } - - public static Object newInstance(String name, DynamicPackage pack, String subPackage, Object... args) throws Exception { - return newInstance(getClass(name, pack, subPackage), args); - } - - public static Object newInstance(String name, DynamicPackage pack, Object... args) throws Exception { - return newInstance(getClass(name, pack, null), args); - } - - public static Method getMethod(String name, Class clazz, Class... paramTypes) { - Class[] t = toPrimitiveTypeArray(paramTypes); - for (Method m : clazz.getMethods()) { - Class[] types = toPrimitiveTypeArray(m.getParameterTypes()); - if (m.getName().equals(name) && equalsTypeArray(types, t)) { - return m; - } - } - return null; - } - - public static Object invokeMethod(String name, Class clazz, Object obj, Object... args) throws Exception { - return getMethod(name, clazz, toPrimitiveTypeArray(args)).invoke(obj, args); - } - - public static Field getField(String name, Class clazz) throws Exception { - return clazz.getDeclaredField(name); - } - - public static Object getValue(String name, Object obj) throws Exception { - Field f = getField(name, obj.getClass()); - f.setAccessible(true); - return f.get(obj); - } - - public static void setValue(Object obj, FieldEntry entry) throws Exception { - Field f = getField(entry.getKey(), obj.getClass()); - f.setAccessible(true); - f.set(obj, entry.getValue()); - } - - public static void setValues(Object obj, FieldEntry... entrys) throws Exception { - for (FieldEntry f : entrys) { - setValue(obj, f); - } - } -} diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/RuntimeCompiler.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/RuntimeCompiler.java deleted file mode 100644 index a4238cee47..0000000000 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/RuntimeCompiler.java +++ /dev/null @@ -1,172 +0,0 @@ -package net.aufdemrand.denizen.utilities; - -import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.interfaces.dExternal; -import net.aufdemrand.denizencore.utilities.CoreUtilities; -//import org.abstractmeta.toolbox.compilation.compiler.JavaSourceCompiler; -//import org.abstractmeta.toolbox.compilation.compiler.impl.JavaSourceCompilerImpl; - -import java.io.*; -import java.util.ArrayList; -import java.util.List; - -public class RuntimeCompiler { - - Denizen denizen; - - public RuntimeCompiler(Denizen denizen) { - this.denizen = denizen; - this.externalsFolder = new File(denizen.getDataFolder() + File.separator + "externals"); - } - - private final File externalsFolder; - private final static File pluginsFolder = new File("plugins"); - - private final static FilenameFilter jarFilter = new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return (CoreUtilities.toLowerCase(name).endsWith(".jar")); - } - }; - - private final static FilenameFilter javaFilter = new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return (CoreUtilities.toLowerCase(name).endsWith(".java")); - } - }; - - public static ArrayList loadedExternals = new ArrayList(); - List dependencies; - - @SuppressWarnings("unchecked") - public void loader() { - - /* - dB.log("Loading external dependencies for run-time compiler."); - dependencies = new ArrayList(); - try { - File file = new File(denizen.getDataFolder() + File.separator + "externals" + File.separator + "dependencies"); - for (File f : file.listFiles(jarFilter)) { - dependencies.add(f.getPath()); - dB.log("Loaded " + f.getName()); - } - } - catch (Exception error) { - dB.log("No dependencies to load or error loading dependencies: " + error.getMessage()); - } - dB.log("Loading plugins as dependencies for run-time compiler."); - for (File f : pluginsFolder.listFiles(jarFilter)) { - dependencies.add(f.getPath()); - dB.log("Loaded " + f.getName()); - } - dB.log("Attempting to add CraftBukkit as dependency for run-time compiler."); - try { - File file = new File("."); - for (File f : file.listFiles(jarFilter)) { - dependencies.add(f.getPath()); - dB.log("Loaded " + f.getName()); - } - } - catch (Exception error) { - dB.log("Could not find CraftBukkit jar or error reading it: " + error.getMessage()); - } - - if (!externalsFolder.exists() || externalsFolder.list().length == 0) { - return; - } - try { - File file = new File(denizen.getDataFolder() + File.separator + "externals"); - File[] files = file.listFiles(javaFilter); - if (files != null && files.length > 0) { - for (File f : files) { - String fileName = f.getName(); - - dB.log("Processing '" + fileName + "'... "); - - JavaSourceCompiler javaSourceCompiler = new JavaSourceCompilerImpl(); - JavaSourceCompiler.CompilationUnit compilationUnit = javaSourceCompiler.createCompilationUnit(); - if (!dependencies.isEmpty()) { - compilationUnit.addClassPathEntries(dependencies); - } - - try { - compilationUnit.addJavaSource(fileName.replace(".java", ""), readFile(f.getAbsolutePath())); - ClassLoader classLoader = javaSourceCompiler.compile(compilationUnit); - Class load = (Class) classLoader.loadClass(fileName.replace(".java", "")); - dExternal loadedClass = load.newInstance(); - loadedClass.load(); - loadedExternals.add(loadedClass); - } - catch (Exception e) { - if (e instanceof IllegalStateException) { - dB.echoError("No JDK found! External .java files will not be loaded."); - dB.echoError(e); - } - else { - dB.echoError(ChatColor.RED + "Error compiling " + fileName + "!"); - dB.echoError(e); - } - } - } - dB.echoApproval("All externals loaded!"); - } - } - catch (Exception error) { - dB.echoError(error); - } - */ - } - - public int i = 0; - - public void runString(String input) { - try { - /* - i++; - JavaSourceCompiler javaSourceCompiler = new JavaSourceCompilerImpl(); - JavaSourceCompiler.CompilationUnit compilationUnit = javaSourceCompiler.createCompilationUnit(); - if (!dependencies.isEmpty()) { - compilationUnit.addClassPathEntries(dependencies); - } - String complete = "import net.aufdemrand.denizen.utilities.debugging.dB;\npublic class CodeTester" + i + - " extends net.aufdemrand.denizen.utilities.dExternalRunnable {\n" - + "public void unload() {}\npublic void load() {}\n" - + "public void run() {\n" + input + "\n}\n}"; - compilationUnit.addJavaSource("CodeTester" + i, complete); - ClassLoader classLoader = javaSourceCompiler.compile(compilationUnit); - Class load = (Class) classLoader.loadClass("CodeTester" + i); - dExternalRunnable loadedClass = load.newInstance(); - loadedClass.load(); - loadedClass.run(); - loadedClass.unload(); - */ - dB.echoError("Run time compiler is temporarily disabled. If you need this functionality, please post an issue on GitHub or speak to mcmonkey on Discord."); - } - catch (Exception e) { - dB.echoError(e); - } - } - - public void reload() { - for (dExternal external : loadedExternals) { - external.unload(); - } - loadedExternals.clear(); - loader(); - } - - private String readFile(String file) throws IOException { - BufferedReader reader = new BufferedReader(new FileReader(file)); - String line = null; - StringBuilder stringBuilder = new StringBuilder(); - String ls = System.getProperty("line.separator"); - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - stringBuilder.append(ls); - } - reader.close(); - return stringBuilder.toString(); - } -} diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/dExternalRunnable.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/dExternalRunnable.java deleted file mode 100644 index 1c4c89fadb..0000000000 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/dExternalRunnable.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.aufdemrand.denizen.utilities; - -import net.aufdemrand.denizencore.interfaces.dExternal; - -public abstract class dExternalRunnable implements dExternal { - - public abstract void run(); -}