Skip to content

Commit

Permalink
Update the trigger command
Browse files Browse the repository at this point in the history 
Simple commit, just updating the Trigger command to the 0.9 standards
This also fixes a bug in which the 'cooldown:' argument didn't work at
all. (NPE on usage, due to improper argument handling)
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Nov 20, 2013
1 parent 8eaec13 commit d658ad1
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 57 deletions.
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
View file
Expand Up @@ -2416,8 +2416,8 @@ public void registerCoreMembers() {

// <--[command]
// @Name Trigger
// @Syntax trigger [name:chat/click/damage/proximity] (state:true/false) (cooldown:<#.#>) (radius:<#>)
// @Required 2
// @Syntax trigger [name:chat/click/damage/proximity] (state:{toggle}/true/false) (cooldown:<#.#>) (radius:<#>)
// @Required 1
// @Stable stable
// @Short Enables or disables a trigger.
// @Author aufdemrand
Expand All @@ -2429,7 +2429,7 @@ public void registerCoreMembers() {
// Todo
// -->
registerCoreMember(TriggerCommand.class,
"TRIGGER", "trigger [name:chat/click/damage/proximity] (state:true/false) (cooldown:<#.#>) (radius:<#>)", 2);
"TRIGGER", "trigger [name:chat/click/damage/proximity] (state:{toggle}/true/false) (cooldown:<#.#>) (radius:<#>)", 1);

// <--[command]
// @Name Viewer
Expand Down
102 changes: 48 additions & 54 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/npc/TriggerCommand.java
View file
Expand Up @@ -3,13 +3,12 @@
import net.aufdemrand.denizen.exceptions.CommandExecutionException;
import net.aufdemrand.denizen.exceptions.InvalidArgumentsException;
import net.aufdemrand.denizen.npc.traits.TriggerTrait;
import net.aufdemrand.denizen.objects.Element;
import net.aufdemrand.denizen.scripts.ScriptEntry;
import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
import net.aufdemrand.denizen.objects.Duration;
import net.aufdemrand.denizen.objects.aH;
import net.aufdemrand.denizen.objects.aH.ArgumentType;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.citizensnpcs.api.npc.NPC;

/**
* Configures the TriggerTrait for a NPC.
Expand All @@ -24,44 +23,36 @@ private enum Toggle {TOGGLE, TRUE, FALSE}
@Override
public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {

// Initialize required fields
String trigger = null;
Toggle toggle = Toggle.TOGGLE;
Duration cooldown = new Duration(-1d);
int radius = -1;
for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) {

// Parse arguments
for (String arg : scriptEntry.getArguments()) {
if (!scriptEntry.hasObject("cooldown")
&& arg.matchesPrefix("cooldown")
&& arg.matchesArgumentType(Duration.class))
scriptEntry.addObject("cooldown", arg.asType(Duration.class));

if (aH.matchesValueArg("COOLDOWN", arg, ArgumentType.Duration)) {
cooldown = aH.getDurationFrom(arg);
cooldown.setPrefix("Cooldown");
}
else if (!scriptEntry.hasObject("radius")
&& arg.matchesPrefix("radius")
&& arg.matchesPrimitive(aH.PrimitiveType.Integer))
scriptEntry.addObject("radius", arg.asElement());

else if (aH.matchesValueArg("RADIUS", arg, ArgumentType.Integer))
radius = aH.getIntegerFrom(arg);
else if (!scriptEntry.hasObject("trigger")
&& arg.matchesPrefix("name"))
scriptEntry.addObject("trigger", arg.asElement());

else if (aH.matchesState(arg))
toggle = Toggle.valueOf(aH.getStringFrom(arg.toUpperCase()));

else if (aH.matchesValueArg("NAME", arg, ArgumentType.String))
trigger = aH.getStringFrom(arg);

else if (denizen.getTriggerRegistry().get(arg) != null)
trigger = aH.getStringFrom(arg);
else if (!scriptEntry.hasObject("toggle")
&& arg.matchesEnum(Toggle.values()))
scriptEntry.addObject("toggle", arg.asElement());

else
dB.echoError("Unknown argument '" + arg + "'");
arg.reportUnhandled();
}

// Check required arguments
if (trigger == null) throw new InvalidArgumentsException("Missing name argument!");
if (!scriptEntry.hasObject("trigger"))
throw new InvalidArgumentsException("Missing name argument!");

if (!scriptEntry.hasObject("toggle"))
scriptEntry.addObject("toggle", new Element("TOGGLE"));

// Store objects in ScriptEntry for execute()
scriptEntry.addObject("trigger", trigger);
scriptEntry.addObject("cooldown", cooldown);
scriptEntry.addObject("toggle", toggle);
scriptEntry.addObject("radius", radius);
if (!scriptEntry.hasNPC())
throw new InvalidArgumentsException("This command requires a linked NPC!");

Expand All @@ -70,35 +61,38 @@ else if (denizen.getTriggerRegistry().get(arg) != null)
@Override
public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {

Toggle toggle = (Toggle) scriptEntry.getObject("toggle");
String trigger = (String) scriptEntry.getObject("trigger");
Integer radius = (Integer) scriptEntry.getObject("radius");
Element toggle = scriptEntry.getElement("toggle");
Element trigger = scriptEntry.getElement("trigger");
Element radius = scriptEntry.getElement("radius");
Duration cooldown = (Duration) scriptEntry.getObject("cooldown");
NPC npc = scriptEntry.getNPC().getCitizen();

dB.echoApproval("Executing '" + getName() + "': "
+ "Trigger='" + trigger + "', "
+ "Toggle='" + toggle.toString() + "', "
+ (radius > 0 ? "Radius='" + radius + "', " : "Radius='Unchanged', ")
+ (cooldown.getSeconds() > 0 ? "Cooldown='" + cooldown.debug() + "', " : "Cooldown='Unchanged', ")
+ "NPC='" + scriptEntry.getNPC() + "'");
dB.report(scriptEntry, getName(),
trigger.debug() + toggle.debug() +
(radius != null ? radius.debug(): "") +
(cooldown != null ? cooldown.debug(): ""));

// Add trigger trait
if (!npc.hasTrait(TriggerTrait.class)) npc.addTrait(TriggerTrait.class);

TriggerTrait trait = npc.getTrait(TriggerTrait.class);

if (toggle == Toggle.TOGGLE)
trait.toggleTrigger(trigger);
else if (toggle == Toggle.TRUE)
trait.toggleTrigger(trigger, true);
else trait.toggleTrigger(trigger, false);
if (!scriptEntry.getNPC().getCitizen().hasTrait(TriggerTrait.class)) scriptEntry.getNPC().getCitizen().addTrait(TriggerTrait.class);

TriggerTrait trait = scriptEntry.getNPC().getCitizen().getTrait(TriggerTrait.class);

switch (Toggle.valueOf(toggle.asString().toUpperCase())) {
case TOGGLE:
trait.toggleTrigger(trigger.asString());
break;
case TRUE:
trait.toggleTrigger(trigger.asString(), true);
break;
case FALSE:
trait.toggleTrigger(trigger.asString(), false);
break;
}

if (radius > 0)
trait.setLocalRadius(trigger, radius);
if (radius != null)
trait.setLocalRadius(trigger.asString(), radius.asInt());

if (cooldown.getSeconds() > 0)
trait.setLocalCooldown(trigger, cooldown.getSeconds());
if (cooldown != null && cooldown.getSeconds() > 0)
trait.setLocalCooldown(trigger.asString(), cooldown.getSeconds());
}

}

0 comments on commit d658ad1

Please sign in to comment.