From 2052a0cf9358abbb3a24722f0a7cd210921f359d Mon Sep 17 00:00:00 2001
From: Jeremy Schroeder <jeremy@ssdbg.com>
Date: Sun, 8 Sep 2013 12:28:36 -0400
Subject: [PATCH] Add INJECT command to handle last missing part of deprecating
 runtask. INJECT 'runs' a script in the same queue.

---
 .../scripts/commands/CommandRegistry.java     | 31 ++++--
 .../scripts/commands/core/InjectCommand.java  | 95 +++++++++++++++++++
 2 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
index 184be3af81..42bbfa12a6 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
@@ -1008,7 +1008,26 @@ public void registerCoreMembers() {
         // -->
         registerCoreMember(InventoryCommand.class,
                 "INVENTORY", "inventory [open/copy/move/swap/add/remove/keep/exclude/fill/clear] [destination:<inventory>] (origin:<inventory>)", 2);
-        
+
+        // <--[command]
+        // @Name Inject
+        // @Usage inject (locally) [<script>] (path:<name>) (instantly)
+        // @Required 1
+        // @Stable 1.0
+        // @Short Runs a script in the current ScriptQueue.
+        // @Author aufdemrand
+        // @Description
+        // Todo
+        // @Tags
+        // Todo
+        // @Usage
+        // Todo
+        // @Example
+        // Todo
+        // -->
+        registerCoreMember(InjectCommand.class,
+                "INJECT", "inject (locally) [<script>] (path:<name>) (instantly)", 1);
+
         // <--[command]
         // @Name Invisible
         // @Usage invisible [player/npc] [state:true/false/toggle]
@@ -1467,11 +1486,11 @@ public void registerCoreMembers() {
 
         // <--[command]
         // @Name Run
-        // @Usage run [<script>] (path:<name>) (as:<player>/<npc>) (define:<element>|...) (id:<name>) (delay:<value>) (loop) (qty:<#>)
+        // @Usage run (locally) [<script>] (path:<name>) (as:<player>/<npc>) (def:<element>|...) (id:<name>) (instantly) (delay:<value>)
         // @Required 1
-        // @Stable Todo
-        // @Short Todo
-        // @Author Todo
+        // @Stable 1.0
+        // @Short Runs a script in a new ScriptQueue.
+        // @Author aufdemrand
         // @Description
         // Todo
         // @Tags
@@ -1482,7 +1501,7 @@ public void registerCoreMembers() {
         // Todo
         // -->
         registerCoreMember(RunCommand.class,
-                "RUN", "run [<script>] (path:<name>) (as:<player>/<npc>) (define:<element>|...) (id:<name>) (delay:<value>) (loop) (qty:<#>)", 1);
+                "RUN", "run (locally) [<script>] (path:<name>) (as:<player>/<npc>) (def:<element>|...) (id:<name>) (instantly) (delay:<value>)", 1);
 
         // <--[command]
         // @Name RunTask
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java
new file mode 100644
index 0000000000..511b35af43
--- /dev/null
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java
@@ -0,0 +1,95 @@
+package net.aufdemrand.denizen.scripts.commands.core;
+
+import net.aufdemrand.denizen.exceptions.CommandExecutionException;
+import net.aufdemrand.denizen.exceptions.InvalidArgumentsException;
+import net.aufdemrand.denizen.objects.*;
+import net.aufdemrand.denizen.scripts.ScriptEntry;
+import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
+import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
+import net.aufdemrand.denizen.scripts.queues.core.InstantQueue;
+import net.aufdemrand.denizen.scripts.queues.core.TimedQueue;
+import net.aufdemrand.denizen.utilities.debugging.dB;
+
+import java.util.List;
+
+/**
+ * Injects a task script in the current ScriptQueue.
+ * This replaces the now-deprecated runtask command without the queue argument.
+ *
+ * @author Jeremy Schroeder
+ *
+ */
+public class InjectCommand extends AbstractCommand {
+
+    @Override
+    public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
+
+        for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
+
+            if (arg.matches("instant, instantly"))
+                scriptEntry.addObject("instant", new Element(true));
+
+            else if (arg.matches("local, locally"))
+                scriptEntry.addObject("local", new Element(true));
+
+            else if (!scriptEntry.hasObject("script")
+                    && arg.matchesArgumentType(dScript.class))
+                scriptEntry.addObject("script", arg.asType(dScript.class));
+
+            else if (!scriptEntry.hasObject("path"))
+                scriptEntry.addObject("path", arg.asElement());
+
+        }
+
+        if (!scriptEntry.hasObject("script") && !scriptEntry.hasObject("local"))
+            throw new InvalidArgumentsException("Must define a SCRIPT to be injected.");
+
+        if (!scriptEntry.hasObject("path") && scriptEntry.hasObject("local"))
+            throw new InvalidArgumentsException("Must specify a PATH.");
+
+    }
+
+    @Override
+    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+
+        dB.report(getName(),
+                (scriptEntry.hasObject("script") ? scriptEntry.getdObject("script").debug() : scriptEntry.getScript().debug())
+                        + (scriptEntry.hasObject("instant") ? scriptEntry.getdObject("instant").debug() : "")
+                        + (scriptEntry.hasObject("path") ? scriptEntry.getElement("path").debug() : "")
+                        + (scriptEntry.hasObject("local") ? scriptEntry.getElement("local").debug() : ""));
+
+        // Get the script
+        dScript script = (dScript) scriptEntry.getObject("script");
+
+        // Get the entries
+        List<ScriptEntry> entries;
+        // If it's local
+        if (scriptEntry.hasObject("local"))
+            entries = scriptEntry.getScript().getContainer().getEntries(
+                    scriptEntry.getPlayer(),
+                    scriptEntry.getNPC(),
+                    scriptEntry.getElement("path").asString());
+
+        // If it has a path
+        else if (scriptEntry.hasObject("path"))
+            entries = script.getContainer().getEntries(
+                    scriptEntry.getPlayer(),
+                    scriptEntry.getNPC(),
+                    scriptEntry.getElement("path").asString());
+
+        // Else, assume standard path
+        else entries = script.getContainer().getBaseEntries(
+                    scriptEntry.getPlayer(),
+                    scriptEntry.getNPC());
+
+        // If 'instantly' was specified, make each entry 'instant'.
+        if (scriptEntry.hasObject("instant"))
+            for (ScriptEntry entry : entries)
+                    entry.setInstant(true);
+
+        // Inject the entries into the current scriptqueue
+        scriptEntry.getResidingQueue().injectEntries(entries, 0);
+
+    }
+
+}