Add Pushable command, fixes #1061

DenizenScript · Aug 4, 2015 · 72c2795 · 72c2795
1 parent 344bbc6
commit 72c2795
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -313,6 +313,13 @@ public net.citizensnpcs.api.trait.trait.Inventory getInventoryTrait() {
         return npc.getTrait(net.citizensnpcs.api.trait.trait.Inventory.class);
     }
 
+    public PushableTrait getPushableTrait() {
+        NPC npc = getCitizen();
+        if (!npc.hasTrait(PushableTrait.class))
+            npc.addTrait(PushableTrait.class);
+        return npc.getTrait(PushableTrait.class);
+    }
+
     public LookClose getLookCloseTrait() {
         NPC npc = getCitizen();
         if (!npc.hasTrait(LookClose.class))

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
@@ -2045,6 +2045,29 @@ public void registerCoreMembers() {
                 "PUSH", "push [<entity>|...] (origin:<entity>/<location>) (destination:<location>) (speed:<#.#>) (<duration>) (<script>) (force_along) (precision:<#>) (no_rotate) (no_damage)", 1);
 
 
+        // <--[command]
+        // @Name Pushable
+        // @Syntax pushable (state:true/false/{toggle}) (delay:<duration>) (returnable:true/false)
+        // @Required 0
+        // @Stable stable
+        // @Short Edits the pushable trait for NPCs.
+        // @Author Morphan1
+        // @Group npc
+        // @Description
+        // Enables, disables, toggles, or edits the Pushable trait on the attached NPC.
+        // @Tags
+        // None
+        // @Usage
+        // Use to toggle the Pushable trait for a specified NPC.
+        // - pushable npc:n@321
+        // @Usage
+        // Use to enable the Pushable trait and return after 2 seconds.
+        // - pushable state:true delay:2s returnable:true
+        // -->
+        registerCoreMember(PushableCommand.class,
+                "PUSHABLE", "pushable (state:true/false/{toggle}) (delay:<duration>) (returnable:true/false)", 0);
+
+
         // <--[command]
         // @Name Queue
         // @Syntax queue (<queue>) [clear/stop/pause/resume/delay:<#>]

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/PushableCommand.java
@@ -0,0 +1,95 @@
+package net.aufdemrand.denizen.scripts.commands.npc;
+
+import net.aufdemrand.denizen.BukkitScriptEntryData;
+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;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.scripts.ScriptEntry;
+import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
+
+public class PushableCommand extends AbstractCommand {
+
+    private enum Toggle {TOGGLE, TRUE, FALSE, ON, OFF}
+
+    @Override
+    public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
+
+        for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {
+
+            if (!scriptEntry.hasObject("state")
+                    && arg.matchesPrefix("state", "s")
+                    && arg.matchesEnum(Toggle.values())) {
+                scriptEntry.addObject("state", arg.asElement());
+            }
+
+            else if (!scriptEntry.hasObject("delay")
+                    && arg.matchesPrefix("delay", "d")
+                    && arg.matchesArgumentType(Duration.class)) {
+                scriptEntry.addObject("delay", arg.asType(Duration.class));
+            }
+
+            else if (!scriptEntry.hasObject("return")
+                    && arg.matchesPrefix("return", "r")
+                    && arg.matchesPrimitive(aH.PrimitiveType.Boolean)) {
+                scriptEntry.addObject("return", arg.asElement());
+            }
+
+        }
+    }
+
+    @Override
+    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+
+        dNPC denizenNPC = ((BukkitScriptEntryData) scriptEntry.entryData).getNPC();
+        if (denizenNPC == null) {
+            throw new CommandExecutionException("No valid NPC attached to this queue!");
+        }
+        PushableTrait trait = denizenNPC.getPushableTrait();
+
+        Element state = scriptEntry.getElement("state");
+        Duration delay = scriptEntry.getdObject("delay");
+        Element returnable = scriptEntry.getElement("return");
+
+        if (state == null && delay == null && returnable == null) {
+            state = new Element("TOGGLE");
+        }
+
+        dB.report(scriptEntry, getName(),
+                (state != null ? state.debug() : "") +
+                (delay != null ? delay.debug() : "") +
+                (returnable != null ? returnable.debug() : ""));
+
+        if (delay != null) {
+            trait.setDelay(delay.getSecondsAsInt());
+        }
+
+        if (returnable != null) {
+            trait.setReturnable(returnable.asBoolean());
+        }
+
+        if (state != null) {
+            switch (Toggle.valueOf(state.asString().toUpperCase())) {\
+
+                case TRUE:
+                case ON:
+                    trait.setPushable(true);
+                    break;
+
+                case FALSE:
+                case OFF:
+                    trait.setPushable(false);
+                    break;
+
+                case TOGGLE:
+                    trait.setPushable(!trait.isPushable());
+                    break;
+
+            }
+        }
+    }
+}